using shared by default, bug #111896 and modular X for old versions

Package-Manager: portage-2.1_pre7-r2

11 files changed, 126 insertions, 22 deletions

diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog
index 8f2677ba20c4..1797610ebe6a 100644
--- a/media-libs/allegro/ChangeLog
+++ b/media-libs/allegro/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/allegro
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.47 2006/01/13 22:06:26 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.48 2006/03/31 21:15:34 tupone Exp $
+
+*allegro-4.2.0-r1 (31 Mar 2006)
+
+  31 Mar 2006; <Tupone@gentoo.org> allegro-4.0.3.ebuild,
+  allegro-4.1.14.ebuild, allegro-4.1.18.ebuild, -allegro-4.2.0.ebuild,
+  +allegro-4.2.0-r1.ebuild:
+  Modular X dep fixes for all but last ebuild
+  4.2.0 now default to use shared, even when USE="static" from
+  Bug #111896 - David Wang
 
   13 Jan 2006; Stefan Schweizer <genstef@gentoo.org> allegro-4.2.0.ebuild:
   Add modular depends
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index a4708ff97a7f..2c3a8290cb01 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -1,12 +1,46 @@
-MD5 b5fc3f7471ebd66ab84a388c248631c4 ChangeLog 6049
-MD5 364f2f88ed70d3d2c0aa266841da8ccd allegro-4.0.3.ebuild 2176
-MD5 5e224a9b7ff1f816ab68eb06fa1eb087 allegro-4.1.14.ebuild 2031
-MD5 f45bdbfa769efb3649f3af27968bfb84 allegro-4.1.18.ebuild 2279
-MD5 f62c9bb022e04be2245437548f4e3dba allegro-4.2.0.ebuild 2625
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8f42427a8b47cbe81d842c107eb38d3e ChangeLog 6374
+RMD160 44da1884c8439796765655a05d109f59a239fc38 ChangeLog 6374
+SHA256 9a780c66fed2d22529e959f86a6924fc99aa99f48a5f81d33a3cc4ad1813dd49 ChangeLog 6374
+MD5 945c19cdbd668a5fb2c4bacb59d7d2b4 allegro-4.0.3.ebuild 2375
+RMD160 e9d7d30effde15db77c64ace87e577843e918252 allegro-4.0.3.ebuild 2375
+SHA256 03040704acec735b7b4150a7496bd4a2e3b4857f60c7ee83f450a075c1541449 allegro-4.0.3.ebuild 2375
+MD5 35f1dfbac483f5fe216c0d8f047e18f9 allegro-4.1.14.ebuild 2230
+RMD160 c70f8713179773e705ee8532867b3e17e1a12156 allegro-4.1.14.ebuild 2230
+SHA256 63c980a56f9d2f37fae3401878599ff4578fabcc99fc3cacae7c1439a36de79a allegro-4.1.14.ebuild 2230
+MD5 1222cd4ebc3aa38ba52266fb25787ce8 allegro-4.1.18.ebuild 2480
+RMD160 7a52504344357c99fa08feb5b41f17709ca45f26 allegro-4.1.18.ebuild 2480
+SHA256 03ac83d5709b79891616a0a38eafc73f94bfedcdc638e780357c243d0a22ecd4 allegro-4.1.18.ebuild 2480
+MD5 64ef5a58ff1004bf96629542ba94a9d3 allegro-4.2.0-r1.ebuild 2591
+RMD160 0ca6303cf67c438cf3f72842112c07a5640b7782 allegro-4.2.0-r1.ebuild 2591
+SHA256 94cb5928432bd86ceb492f65a09a2fca009a92ebe68686e8e79d440d82961611 allegro-4.2.0-r1.ebuild 2591
 MD5 183ff716610d14fddd546ed17fea27c8 files/allegro-4.1.18-gcc4.patch 705
+RMD160 1729db5d75acc244074cba643ac84fecfee05c3f files/allegro-4.1.18-gcc4.patch 705
+SHA256 86d71b0567201c35ab10e3521cb92a4e5782a9e0302159002be683909596da9e files/allegro-4.1.18-gcc4.patch 705
 MD5 80085d45008c152850633d5746809bd0 files/allegro-4.1.18-m4.patch 468
-MD5 9f28e5d796c572eb801998504cf84fbb files/digest-allegro-4.0.3 66
-MD5 cbde62e7be820f69c7c202d3ff4ac241 files/digest-allegro-4.1.14 67
-MD5 2f5e0d90784068cfc9473e07a4eb1b7f files/digest-allegro-4.1.18 67
-MD5 537878626a9f78b8b89876b308b3ecdc files/digest-allegro-4.2.0 66
+RMD160 3aa877cc8759890c46ea4deca9d454a9177df5ed files/allegro-4.1.18-m4.patch 468
+SHA256 8f747d187f8e72ac79a7605279890eb7b39c631b007bc3f178af6ec011d53729 files/allegro-4.1.18-m4.patch 468
+MD5 5b8917694bab160e413754d1d7e1fd99 files/digest-allegro-4.0.3 244
+RMD160 e80fe3b653ae68107f77f38942d8ed54e8867a70 files/digest-allegro-4.0.3 244
+SHA256 4701348f793595f25b22893d5ce0d0cb4bed25b286cdd668d21fd09b632e2978 files/digest-allegro-4.0.3 244
+MD5 839c3045ec079e1039f9669c1dcb8044 files/digest-allegro-4.1.14 247
+RMD160 ab790244155c1723d7fa0c11079f4704a3d63ad9 files/digest-allegro-4.1.14 247
+SHA256 910866157bc41dd88e0c9d4f97cfc98af336ca1d9c028818c04b005594ccf6d6 files/digest-allegro-4.1.14 247
+MD5 0e85c69a2481b1a5913085ce1833c999 files/digest-allegro-4.1.18 247
+RMD160 8720a15f01c8221ae261c24fee406c60866cf235 files/digest-allegro-4.1.18 247
+SHA256 4f637f4872db689f3bb9c0f3fb622d17187cc848e7bc78b41ea39cb1abb5a6e6 files/digest-allegro-4.1.18 247
+MD5 2ac185f9549cd04da9fe501611ba09a5 files/digest-allegro-4.2.0-r1 244
+RMD160 62ae56f916cfb604276666e75b12d34e7c2413df files/digest-allegro-4.2.0-r1 244
+SHA256 51789d055eb913090d7428c659fd08bfe9af906938fcee59941759f794c0bf99 files/digest-allegro-4.2.0-r1 244
 MD5 69afb3c206fdd20a361ee6dbff286ace metadata.xml 636
+RMD160 b2926813da5e98049d86fa5e2fc4a75d16b12b69 metadata.xml 636
+SHA256 e26af044016a39f2ef99c3796d0cee3e84ca728501af8e71d7f91bd1d9edb3bc metadata.xml 636
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFELZwI2CTtIKiFlQIRAvc/AKDCCk+C0A8zM4P4TcZ7e+bFvLN/igCdHu2X
+WKkDt19L6ipjagwXdUG8zig=
+=07UD
+-----END PGP SIGNATURE-----
diff --git a/media-libs/allegro/allegro-4.0.3.ebuild b/media-libs/allegro/allegro-4.0.3.ebuild
index 65a546a99f7e..8523389c25cb 100644
--- a/media-libs/allegro/allegro-4.0.3.ebuild
+++ b/media-libs/allegro/allegro-4.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.0.3.ebuild,v 1.11 2005/01/19 00:43:00 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.0.3.ebuild,v 1.12 2006/03/31 21:15:34 tupone Exp $
 
 inherit flag-o-matic
 
@@ -16,9 +16,27 @@ IUSE="static mmx sse oss alsa esd arts X fbcon svga tetex doc"
 RDEPEND="alsa? ( media-libs/alsa-lib )
 	esd? ( media-sound/esound )
 	arts? ( kde-base/arts )
-	X? ( virtual/x11 )
+	X? (
+		|| (
+			(
+				x11-libs/libXxf86vm
+				x11-libs/libXxf86dga
+			)
+			virtual/x11
+		)
+	)
 	svga? ( media-libs/svgalib )"
 DEPEND="${RDEPEND}
+	X? (
+		|| (
+			(
+				x11-proto/xextproto
+				x11-proto/xf86dgaproto
+				x11-proto/xf86vidmodeproto
+			)
+			virtual/x11
+		)
+	)
 	tetex? ( virtual/tetex )"
 
 src_unpack() {
diff --git a/media-libs/allegro/allegro-4.1.14.ebuild b/media-libs/allegro/allegro-4.1.14.ebuild
index de7354ed0741..33af28141d06 100644
--- a/media-libs/allegro/allegro-4.1.14.ebuild
+++ b/media-libs/allegro/allegro-4.1.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.1.14.ebuild,v 1.14 2005/10/18 01:32:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.1.14.ebuild,v 1.15 2006/03/31 21:15:34 tupone Exp $
 
 IUSE="static mmx sse oss alsa esd arts X fbcon svga tetex doc"
 
@@ -17,10 +17,28 @@ KEYWORDS="alpha ~amd64 ia64 ppc ~sparc ~x86"
 RDEPEND="alsa? ( media-libs/alsa-lib )
 	esd? ( media-sound/esound )
 	arts? ( kde-base/arts )
-	X? ( virtual/x11 )
+	X? (
+		|| (
+			(
+				x11-libs/libXxf86vm
+				x11-libs/libXxf86dga
+			)
+			virtual/x11
+		)
+	)
 	svga? ( media-libs/svgalib )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
+	X? (
+		|| (
+			(
+				x11-proto/xextproto
+				x11-proto/xf86dgaproto
+				x11-proto/xf86vidmodeproto
+			)
+			virtual/x11
+		)
+	)
 	tetex? ( virtual/tetex )"
 
 src_compile() {
diff --git a/media-libs/allegro/allegro-4.1.18.ebuild b/media-libs/allegro/allegro-4.1.18.ebuild
index 4902b28deace..06d747c334b0 100644
--- a/media-libs/allegro/allegro-4.1.18.ebuild
+++ b/media-libs/allegro/allegro-4.1.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.1.18.ebuild,v 1.5 2005/11/20 08:16:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.1.18.ebuild,v 1.6 2006/03/31 21:15:34 tupone Exp $
 
 inherit flag-o-matic eutils
 
@@ -17,11 +17,29 @@ IUSE="static mmx sse oss alsa esd arts X fbcon svga tetex doc"
 RDEPEND="alsa? ( media-libs/alsa-lib )
 	esd? ( media-sound/esound )
 	arts? ( kde-base/arts )
-	X? ( virtual/x11 )
+	X? (
+		|| (
+			(
+				x11-libs/libXxf86vm
+				x11-libs/libXxf86dga
+			)
+			virtual/x11
+		)
+	)
 	svga? ( media-libs/svgalib )"
 
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
+	X? (
+		|| (
+			(
+				x11-proto/xextproto
+				x11-proto/xf86dgaproto
+				x11-proto/xf86vidmodeproto
+			)
+			virtual/x11
+		)
+	)
 	tetex? ( virtual/tetex )"
 
 src_unpack() {
diff --git a/media-libs/allegro/allegro-4.2.0.ebuild b/media-libs/allegro/allegro-4.2.0-r1.ebuild
index 3c4f7c22d5cb..07e97e0cfa55 100644
--- a/media-libs/allegro/allegro-4.2.0.ebuild
+++ b/media-libs/allegro/allegro-4.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.2.0.ebuild,v 1.2 2006/01/13 22:06:26 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.2.0-r1.ebuild,v 1.1 2006/03/31 21:15:34 tupone Exp $
 
 inherit flag-o-matic eutils
 
@@ -49,7 +49,6 @@ src_compile() {
 		--enable-linux \
 		--enable-vga \
 		$(use_enable static) \
-		$(use_enable static staticprog) \
 		$(use_enable mmx) \
 		$(use_enable sse) \
 		$(use_enable oss ossdigi) \
diff --git a/media-libs/allegro/files/digest-allegro-4.0.3 b/media-libs/allegro/files/digest-allegro-4.0.3
index 9837759186ee..49f3ed389a5a 100644
--- a/media-libs/allegro/files/digest-allegro-4.0.3
+++ b/media-libs/allegro/files/digest-allegro-4.0.3
@@ -1 +1,3 @@
 MD5 4fd1d27c323ba33b6d6cad6c5a1d8a44 allegro-4.0.3.tar.gz 2440083
+RMD160 920b5536c71a7dfc60b0cfa39a7d14a780b270f7 allegro-4.0.3.tar.gz 2440083
+SHA256 fefd91ead73d1e3c3109440e2d465ee7e56eb88f0952199d36b3bc2a2f221f0f allegro-4.0.3.tar.gz 2440083
diff --git a/media-libs/allegro/files/digest-allegro-4.1.14 b/media-libs/allegro/files/digest-allegro-4.1.14
index 7235ae00ea96..474c9248c8ff 100644
--- a/media-libs/allegro/files/digest-allegro-4.1.14
+++ b/media-libs/allegro/files/digest-allegro-4.1.14
@@ -1 +1,3 @@
 MD5 f91225cfd2429b8f0ba01f026981b681 allegro-4.1.14.tar.gz 2774495
+RMD160 511712ca0c4deb81d1426093240261948a71f53c allegro-4.1.14.tar.gz 2774495
+SHA256 ee7c6d04f7e64778baf2c161bc0b564d5298a5dc575c3de3d5fce939c5d11b13 allegro-4.1.14.tar.gz 2774495
diff --git a/media-libs/allegro/files/digest-allegro-4.1.18 b/media-libs/allegro/files/digest-allegro-4.1.18
index 21bb5c0861a3..6a3fadeb84fe 100644
--- a/media-libs/allegro/files/digest-allegro-4.1.18
+++ b/media-libs/allegro/files/digest-allegro-4.1.18
@@ -1 +1,3 @@
 MD5 215b84351f349f5998a77f99bf1218fa allegro-4.1.18.tar.gz 2900486
+RMD160 05dc8ca8783487c9cca694bc22f95a06e77d64fe allegro-4.1.18.tar.gz 2900486
+SHA256 a1d588449d467cd3a0a9c116402f531ef2eb7f8d58836663d12c5188b4cd9982 allegro-4.1.18.tar.gz 2900486
diff --git a/media-libs/allegro/files/digest-allegro-4.2.0 b/media-libs/allegro/files/digest-allegro-4.2.0
deleted file mode 100644
index 2ece27c57d8b..000000000000
--- a/media-libs/allegro/files/digest-allegro-4.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a8b2c85c58b16345fe735f72763f3a6e allegro-4.2.0.tar.gz 3056173
diff --git a/media-libs/allegro/files/digest-allegro-4.2.0-r1 b/media-libs/allegro/files/digest-allegro-4.2.0-r1
new file mode 100644
index 000000000000..9cccac0876ee
--- /dev/null
+++ b/media-libs/allegro/files/digest-allegro-4.2.0-r1
@@ -0,0 +1,3 @@
+MD5 a8b2c85c58b16345fe735f72763f3a6e allegro-4.2.0.tar.gz 3056173
+RMD160 e1602ea2f8bc1761be0ee34001e9d77d3a6ea3ff allegro-4.2.0.tar.gz 3056173
+SHA256 d8df27558bc083298d6933c843d4fdaf9afc0aa1607276acc96ed8fa9a39060c allegro-4.2.0.tar.gz 3056173