Don't move libEGL/libOpenVG as this broke proprietary drivers, bug #374647.

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

4 files changed, 19 insertions, 12 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index ec90336c4808..9ba830b3c19f 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.344 2011/07/09 21:44:06 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.345 2011/07/10 10:17:14 chithanh Exp $
+
+*mesa-7.11_rc1-r1 (10 Jul 2011)
+
+  10 Jul 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -mesa-7.11_rc1.ebuild, +mesa-7.11_rc1-r1.ebuild:
+  Don't move libEGL/libOpenVG as this broke proprietary drivers, bug #374647.
 
 *mesa-7.11_rc1 (09 Jul 2011)
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d11e932dbc27..085f66686ad4 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -15,8 +15,8 @@ EBUILD mesa-7.10.1.ebuild 9505 RMD160 27b888e1a58bcafc4e84f082e7f8046543d7377c S
 EBUILD mesa-7.10.2-r1.ebuild 9742 RMD160 32520243f48c0e40b8668a0f7ec631dacd431141 SHA1 4d45aea58654e7519b1edfe8d70c92831f99cb4c SHA256 90fd24a1149d9177f0522ad1b459a6a6cfb336e1fc4fc9a4101006067f02820a
 EBUILD mesa-7.10.2.ebuild 9734 RMD160 5bca434328ece920aea34a767abca45180baf3e7 SHA1 ecf123f7db0d5e58855c30f95deffbfee52bb5ce SHA256 9145ee77e2d9af4e6817e3eb6189a30d3cc1a0334ce517bae7c8ac545ef6e2b5
 EBUILD mesa-7.10.3.ebuild 9734 RMD160 787ea0dbf48ed413a7a4785afc93dd94851b817f SHA1 0eeba387cfff9f325df2980a9445c641a8553778 SHA256 a44fb365d6e70d6b6561b511b37aee0acfb7ae0b7e3fcc58c1db47646f23c503
-EBUILD mesa-7.11_rc1.ebuild 9840 RMD160 855e51d7073af285945945a885a9813ddeaa1dd4 SHA1 909d9e4895b3f9c6cecbc920e57e8908496e5f2b SHA256 fcc4058718e90be1d4a083efefbc31acff7c825c388ca8bb313c88169dbc2117
+EBUILD mesa-7.11_rc1-r1.ebuild 9822 RMD160 f539d1920c3378c488566d3a62d03c71990795e7 SHA1 3d44b4073b55846575b0fa9f32526c8b9530d5d4 SHA256 6c8327cae4302490e1047e6e8732d1a3714ae101bc7c695b644dad084d24727a
 EBUILD mesa-7.9.1.ebuild 8875 RMD160 7d8affe7e8e5cbdb332e52a0b8b842b37149eb49 SHA1 a85123962651bb07feeb1a70e3f608c49d529211 SHA256 f74f65ca5a94d79d7a8f9017eec41ae0992aa2fa631d17954a9dfeab222101cd
 EBUILD mesa-7.9.2.ebuild 8876 RMD160 58645f5c8ba79e1ec2a08a1bdac329c4b680bd8a SHA1 7b48a4851b6806d01ef0a4f944a5ec734bbc230f SHA256 81d1296f74f02372919a0338ea9bc9aadc6f876ca62fe9cacf2a9833b94e290f
-MISC ChangeLog 57217 RMD160 f6eb07686659b61a03af2067c5917358596dafbd SHA1 d496b20a84ba396dd1e8eef62f4a280e00ee90c4 SHA256 1352b06e4e6c93c4dc0e5e3638a8592273ffe24aaac0db893586e7c3b952879b
+MISC ChangeLog 57449 RMD160 ad0fec5d8213c120375e853bee9ee38ce1222733 SHA1 b98952146d688911e96f12984e808300d559463a SHA256 2a50e83d76db3724e0cb9115a5ef455c33c6a911883922b432266e1b2acb016c
 MISC metadata.xml 860 RMD160 d108595ff01a4508486d4ddc6e5875eb2d6f1277 SHA1 a4a5876ef7be72273d7893a8573b12fb39a50426 SHA256 b8a309225d512ad3848d9bea0b6badd447918bde1ef4489c736f12e6c23970ac
diff --git a/media-libs/mesa/mesa-7.11_rc1.ebuild b/media-libs/mesa/mesa-7.11_rc1-r1.ebuild
index 242ecafff6e0..b4468497928d 100644
--- a/media-libs/mesa/mesa-7.11_rc1.ebuild
+++ b/media-libs/mesa/mesa-7.11_rc1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11_rc1.ebuild,v 1.1 2011/07/09 21:44:06 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11_rc1-r1.ebuild,v 1.1 2011/07/10 10:17:14 chithanh Exp $
 
 EAPI=3
 
@@ -60,7 +60,7 @@ RDEPEND="${EXTERNAL_DEPEND}
 	!<=x11-proto/xf86driproto-2.0.3
 	classic? ( app-admin/eselect-mesa )
 	gallium? ( app-admin/eselect-mesa )
-	>=app-admin/eselect-opengl-1.2.2
+	app-admin/eselect-opengl
 	dev-libs/expat
 	dev-libs/libxml2[python]
 	x11-libs/libICE
@@ -263,7 +263,7 @@ src_install() {
 	ebegin "Moving libGL and friends for dynamic switching"
 		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
 		local x
-		for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL,OpenVG}.{la,a,so*}; do
+		for x in "${ED}"/usr/$(get_libdir)/libGL.{la,a,so*}; do
 			if [ -f ${x} -o -L ${x} ]; then
 				mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \
 					|| die "Failed to move ${x}"
diff --git a/media-libs/vo-aacenc/Manifest b/media-libs/vo-aacenc/Manifest
index ee248daccba4..7b9e1496d9ed 100644
--- a/media-libs/vo-aacenc/Manifest
+++ b/media-libs/vo-aacenc/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX vo-aacenc-0.1.1-neon.patch 1760 RMD160 406ebfeee79bcec0921e05621de4b7ec08f01ccf SHA1 474adfadc41545422fba741e03a3ded4f4c19379 SHA256 6856d7e3bdf168ab37170f4a88fbd8abe6e4f5e4a1129264b18b8ee3c1368134
 DIST vo-aacenc-0.1.0.tar.gz 580369 RMD160 4a2e528a4ade429da7ba8a8395fa507b4e827e6b SHA1 def508450a933de0f51c2adf0807e6fe7c7ca406 SHA256 71f530e4d0c0541f2ae167f3dc7945b579aa41fe75237c2c7191290896e7a8c1
 DIST vo-aacenc-0.1.1.tar.gz 580504 RMD160 756886c1a6efc2fd0bd76c3d3ae7ad590f133f6c SHA1 8c611769c7891709ea9b987142e4499877a86998 SHA256 402bf88febb828e772ccf5015adbafcd36a924e1da15ab836fc35972654d6784
 EBUILD vo-aacenc-0.1.0.ebuild 1222 RMD160 0e63a22ba10a7b379e75f113b4feb063cc1c18a8 SHA1 f5a34db5e151bcbdb9ae83b2afd0b3ddd27dc73d SHA256 175bb2ebaf968d38e402bea12543e03e1f9665133c56c60fa118308f1d2285d7
-EBUILD vo-aacenc-0.1.1.ebuild 1255 RMD160 8045b73f849e46728a680ee98f6ab37d86812272 SHA1 c038377b284aee8bf81c70f576deb95c976643e1 SHA256 4d68c29d2584044e1662e12c16a7ab79ffcf1748708c830fe38a168b1ec3cf17
+EBUILD vo-aacenc-0.1.1.ebuild 1293 RMD160 631bc0edb513b204bc868dcde27303c17670a2ca SHA1 87b3c8143b77f287feef752ca755b1466075c8c7 SHA256 4ca5c5b0824e1b820fd5c4d354c90a3edeb14ed4c8c860541fc233d085701de6
 EBUILD vo-aacenc-9999.ebuild 1250 RMD160 63b7c73e0451e4589fad7ca5fccaba1645652b45 SHA1 65a924ba92bbae3d4cdd33450d3c3c436cff8bd2 SHA256 7b5dd71f1ce54f814e533b2bf07c9adc70b4dd21f23141cfe5271c8faa689e25
-MISC ChangeLog 1721 RMD160 9d6a6697bf2e963b9530806c14d4bdfdf6e5e1c1 SHA1 f9ea9172af03c8bbeeba5eff0c55634c60821c6c SHA256 45fa66f6f2dfaf5d05d0a040ffe047768789a01539d9f6d114d9519bc3bd3d03
+MISC ChangeLog 1862 RMD160 814d942c319f3909efdaa2f43187def4798c36f5 SHA1 c938803c14e32c7cbfbd2d1a7e1e1dcde1cdde41 SHA256 b2e8061a267aa9bfa3134f95f346b005d3883c5b511ab54c183737a1aeadacab
 MISC metadata.xml 529 RMD160 63e4babaf3d435a16c6c2c195747a5cd676004d3 SHA1 6322a7bf4ef7860df8ba338b0b05447ab37de9d2 SHA256 3086f6dad46357c8213b5fd2cf7d5a5eefc1b7dd18ecfbd7b8bc954f9aa44cb8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4LPEgACgkQmWq1bYTyC0NnWgD+NzCIzUtQb+EkjNlXfkoTN25c
-4UwMr8Rs4A9Uowx9CdwA/j9bpM8zS46r/tBx9xcCfjETe2qQV+nCfVya+8rv3e3w
-=zNMK
+iEYEARECAAYFAk4ZfX8ACgkQkKaRLQcq0GIbTwCghB8S2//bM01zV+8w5pFBAFus
+Q38AoI55ngI2o6wfsRz0AdfQmfxZr26y
+=W+U5
 -----END PGP SIGNATURE-----