Move files for new eselect-opengl framework.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

diff --git a/app-emulation/emul-linux-x86-opengl/ChangeLog b/app-emulation/emul-linux-x86-opengl/ChangeLog
index 1f55d6ae56528cc742cc8642236b7542de1f050d..1180f9a887c6554a494c649586f1eb5f47e657ef 100644 (file)
--- a/app-emulation/emul-linux-x86-opengl/ChangeLog
+++ b/app-emulation/emul-linux-x86-opengl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-opengl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.42 2014/06/26 09:23:54 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.43 2015/01/03 22:51:23 mgorny Exp $
+
+*emul-linux-x86-opengl-20140508-r1 (03 Jan 2015)
+
+  03 Jan 2015; Michał Górny <mgorny@gentoo.org>
+  +emul-linux-x86-opengl-20140508-r1.ebuild:
+  Move files for new eselect-opengl framework.
 
   26 Jun 2014; Pacho Ramos <pacho@gentoo.org>
   emul-linux-x86-opengl-20140508.ebuild:

diff --git a/app-emulation/emul-linux-x86-opengl/Manifest b/app-emulation/emul-linux-x86-opengl/Manifest
index ea0e3990b252268a388053b7e8cc25b9b3f1001d..c710f233a1db25d2b9105996aa8c73542cad02ee 100644 (file)
--- a/app-emulation/emul-linux-x86-opengl/Manifest
+++ b/app-emulation/emul-linux-x86-opengl/Manifest
@@ -6,13 +6,26 @@ DIST emul-linux-x86-opengl-20140406.tar.xz 76722156 SHA256 356ab424e5ecb136d16c2
 DIST emul-linux-x86-opengl-20140508.tar.xz 49217580 SHA256 ec95363752b345fac84cdedd63cf7741895b3ad43763b5a367847c42d9274f80 SHA512 e9d4458793b086c39afe55a3f21d2d9702b41241b49275c8e70bf859c082ae3222557bf2a524fee0fc0b6f4719b45f325d69c258b4b26a961b5d0464170f8ddc WHIRLPOOL d7fcaa5cbaee3ee9d96a8e12a3ed11d7753ebfbe8c1c43cad2bdafd1a23697c565c79fc27aac05b45086ef2620842f09399ab9f3ce4ddea9b5362679558485d7
 EBUILD emul-linux-x86-opengl-20131008.ebuild 1396 SHA256 62e9b8d1c5136ef0d87d6692b269f09fe938aca7334448d6aa7fc9801993ffc7 SHA512 c042dcac2727f0b84bfe9a996a84c64b27c9279afddcac91c17d58f36b0661c480036e93de4c37441a7f4d68571e53164c895b8e07b1277dea3ccdb806eec514 WHIRLPOOL 82ee6796b159d6429bd74d608500be212d0d14bcd6774b625f26920d4f9d06f7ad7a0881dee2795ffd53283530efa60edf835bad07dc73b96c47ecaacb07d1cc
 EBUILD emul-linux-x86-opengl-20140406.ebuild 1396 SHA256 89cb3ebf1ed7ce1cb55abdcdabfb7f633daf1d404619d36e84f1e0e589033c38 SHA512 bcf7fa88adde2aecec8f030352f481896a3106b877952db91bb27abe0016c16a7271071a334a1583f60d870651fe668596b1edb76c257ae758b36120b772adcc WHIRLPOOL c4c5a67bd5cc2c82a7adaba64d397b1e404f7519e24dac063629f62c5d8045d89490e1dd50aeac3584a39f6989bbe881d9c3137eac5cacba6b774e5633bcacae
+EBUILD emul-linux-x86-opengl-20140508-r1.ebuild 1603 SHA256 f986a66ce3c147770239a6a2afaa9bc6bb8fa4fe7df0e1314e0f884437b0f868 SHA512 a8e6c90a52491bc911701a6f7856ae6a8943053e91768b0624f161f09e47c26516cc55c2356baee36c9317de764c167b692f605176b2d735a9b33b207bea8463 WHIRLPOOL f85b1ccd021ba8d7711a979b3aada43633635dbe3dc74164658d4c6818bfea36573fa46e2ebd62261fe5b60b660bdeab12b4768a5fd5e717566364df0a3af70f
 EBUILD emul-linux-x86-opengl-20140508.ebuild 1423 SHA256 4b640cb636950466f6c2bec7b58987dcb25e4d94b30e9f3bf39decadbe6c0294 SHA512 4d1351340160dd0d136e1f1affe965a5e089cd8bdcd3b014cec80505692fb77681f00b8d9b34d9acce631b6b9bd2a3a0d174f0e2997b4f5f05f7b93ba24259ed WHIRLPOOL f2eb8b2327b2a84e4dee14b3075f515c66fe13596ec7167376a7df22b82475a979368574dc6bbecbf3bd0c1b21d9a6469fbf89592d2a1518c4332871dd500e9e
-MISC ChangeLog 8380 SHA256 5aeefb4a1af3633f99258d58b332428d81c0e91bc64b0e3a64ea9eea85b54a3a SHA512 5509b89aab189a42f8eccec1c8d3026f3b547216c4947f5eee0954013865f0ae6c6ca4a52caeb561e0e70cc1f77049c63e98495b1dbed17cf5deb9bd303c4dd9 WHIRLPOOL 3be052cfec9450af2f68a1cbed368a4caca4c6a9caad4d3c3ef9cde4cbcd8e25800db8facb05954740ef9668573dbec9a5cf9fc48573b6fd60b3750390950014
+MISC ChangeLog 8574 SHA256 35a2464338f85b22257d1dfeae76ed5715766bf8c2ea8d94ee7e9b3a04da9964 SHA512 e8a79a15610e0b7ae05b5ef26d0c248214c586705edc2f65c44a38fb05b230fd6d42140526232cab93fbd22c78d36ec082b9d3193856110e43b2f1fa437019d5 WHIRLPOOL 118345ec59741f36e59599bd2434e4917ca249e1e29348e780086d98b2693aee3bf733d1762f86a079627fa0b67a95d98b5729cc83c9c08594f633d1e58e8e7c
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOr5qsACgkQCaWpQKGI+9Tr1gCfeo+Dvb/aoESQY+6RmCIg7vnL
-oMIAn2VUA7hdypvtayDXjtVkUmlD05uS
-=FHAX
+iQJ8BAEBCABmBQJUqHJsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOdzoP/0de/QihuPi6RAusqSj9wVh3
+yongP0Zk+Bzzw/u0ayiGFiGPNaBSC8+PhpTC4rHVf9CviA/J6QYvP2hOJhpFrt3e
+64X6ssGOTDJDNDAvAADnz8CcW4QEvHeRx0A0GOA6bh2SAV46he6IPplJxi5ySEFW
+4pJsTmbLtH1M+5hyEs2jbbRAkIvFlR1oYlOOPanqhtuZpCFRbkgXGTB2dMPQkJoj
+dFpitI0orRuNVVFL754zzxtuIp51vUlULksN57fbTEuVRfeBID6/m6dkbJBC6a62
+xqYQTL7qiyCcqqHQxH+TsavIDt29KDgzcndNCeJXfX+arW2JGDkHU/rXT698+zfz
+V4SD2IzccrhccfIUialVCBpx6/I6SOLip1lngoceURhqfsBcMx8Ua2Uu1+yvxTp9
+Akq5FYTafnsSWQeJbAYtxrGBM8OU1yGYj5LgwoF5cC8GhskiTPJHvxrAFlqhdKVC
+/kix7ZraIo3FoxhGe3zHsZOxFNAJnV5IPLD72Lv2MeRRTWMuIpyygGSCXXWqL/dU
+tEt/uTCoh1hPfj/RciEQUlQPjTFwbxenIXICWOmgND7RQ7gkhxtzU8Ug4KTjTsP5
+qmUcb7zz56eNqLmq4jLGtIExIVdNdd37o/18p7CxY1FCaUZ7QhsXahqQoOqrAyTk
+/HUolkrTsGdKV/KD8Q/g
+=VwkF
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508-r1.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508-r1.ebuild
new file mode 100644 (file)
index 0000000..2fefba8
--- /dev/null
+++ b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508-r1.ebuild,v 1.1 2015/01/03 22:51:23 mgorny Exp $
+
+EAPI=5
+inherit emul-linux-x86
+
+SRC_URI="!abi_x86_32? ( ${SRC_URI} )"
+LICENSE="!abi_x86_32? ( BSD MIT LGPL-3 SGI-B-2.0 ) abi_x86_32? ( metapackage )"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="abi_x86_32"
+
+DEPEND="
+       !abi_x86_32? (
+               >=app-admin/eselect-opengl-1.3
+               >=app-admin/eselect-mesa-0.0.9
+       )"
+RDEPEND="
+       !abi_x86_32? (
+               >=app-emulation/emul-linux-x86-xlibs-20100611
+               !<app-emulation/emul-linux-x86-xlibs-20100611
+               media-libs/mesa
+
+               !media-libs/freeglut[abi_x86_32(-)]
+               !media-libs/glew[abi_x86_32(-)]
+               !media-libs/glu[abi_x86_32(-)]
+               !media-libs/mesa[abi_x86_32(-)]
+       )
+       abi_x86_32? (
+               >=media-libs/freeglut-2.8.1[abi_x86_32(-)]
+               >=media-libs/glew-1.10.0-r1[abi_x86_32(-)]
+               >=media-libs/glu-9.0.0-r1[abi_x86_32(-)]
+               >=media-libs/mesa-9.1.6[abi_x86_32(-)]
+       )"
+
+src_prepare() {
+       use abi_x86_32 && return
+       emul-linux-x86_src_prepare
+       rm -f "${S}/usr/lib32/libGL.so" || die
+       rm -f "${S}/usr/lib32/libGL.so.1" || die
+
+       # move opengl files for new eselect-opengl design
+       cd "${S}/usr/lib32/opengl/xorg-x11/lib" || die
+       mv * "${S}/usr/lib32/" || die
+       rm -r "${S}/usr/lib32/opengl" || die
+}
+
+src_install() {
+       use abi_x86_32 || emul-linux-x86_src_install
+}
+
+pkg_postinst() {
+       use abi_x86_32 && return
+       # Update GL symlinks
+       eselect opengl set --use-old || die
+       # And the same for mesa (bug #355393)
+       eselect mesa set 32bit --auto || die
+}