Version bump and allow old emul set at the same time of native multilib (#489056 by iamnr3)

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 108 insertions, 17 deletions

diff --git a/x11-misc/virtualgl/ChangeLog b/x11-misc/virtualgl/ChangeLog
index 353ea2e019da..0f09f059b80f 100644
--- a/x11-misc/virtualgl/ChangeLog
+++ b/x11-misc/virtualgl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/virtualgl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/ChangeLog,v 1.17 2013/08/31 09:14:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/ChangeLog,v 1.18 2013/12/11 21:05:38 pacho Exp $
+
+*virtualgl-2.3.3 (11 Dec 2013)
+
+  11 Dec 2013; Pacho Ramos <pacho@gentoo.org> +virtualgl-2.3.3.ebuild:
+  Version bump and allow old emul set at the same time of native multilib
+  (#489056 by iamnr3)
 
   31 Aug 2013; Agostino Sarubbo <ago@gentoo.org> virtualgl-2.3.2-r3.ebuild:
   Stable for amd64, wrt bug #480128
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 3b38528c8abd..47f234d7afbe 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX vgl-helper.sh 881 SHA256 438c928840fbfb9274604296b8178e7f97b42a3428d115e1de6e609ea3146497 SHA512 d3940abb0c52957e8ec4ea15829151876384703ee5cff7a4d306d6de28f839ff76a9090a3af2106e7e8442104f3e16c57a8430b36d718490cd2637ecb99d9c8e WHIRLPOOL 19e5dd127ae329c432a54056bf901e5a62bd31ef5a51e2f2747968194a156405f527520d766d6b616c3ba057066fe05bd40faf24f434de2322e617fbf6fccb63
 AUX vgl.confd-r1 636 SHA256 500957c2736f761e763f75e9c3a09bb4f53bcde8a3cd38dd5ec6b34777737fd2 SHA512 f3203bb987d5a99fb63fd11d907235b343b261d945b788dfd17c09999fdb83df3d1a3028c60dd083f6b2ec358df06f321c330ae63a862ec1fa16f816be884ecd WHIRLPOOL af1efbc7ccf18b01e35a4c991be8036f1ed0c34cf040fa7b5b52ebf6441971d952e9577dd9e11656cfc8c673441d083fee5cb4d87dc8876b4cf21cbcc80108ca
@@ -7,23 +7,15 @@ AUX vgl.initd-r1 881 SHA256 0dc1db0548c627b83c4adb3396aaafdc2d633698e6c89d47fb94
 AUX vgl.initd-r2 886 SHA256 d9337f0f337f291809e8ce7b34b495439c453e9e71e1b8c5623f51be60543707 SHA512 6b12439e504db83d46da2f4521f8d5ec25a5a54fb18469fe9afa96b31c3c02dd4dca95ff8d85becd2db4d86adf4f5c45bd20bd1677aebe9929dc156bce259065 WHIRLPOOL ce8365f468d42549233b910865c560f2a8ecb22e443ae5e0df49b526dc1ce1608b03d6102fb8bfccee84edfabd53a523c54edc055486b685199612831614bda3
 AUX vgl.service 254 SHA256 86fbefb4f77967f7fe7b0ce10915f5d5cf7bac504a9a65dd7f72fa08b9efbaab SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9 WHIRLPOOL 6f7885f6e294ae5db26cd6b9ca048c87ded7d6f805fc08e8ad4f37111709958abdc1eaa7ee780c208eb39d7c7cae777480fe68d61f539a256e0c8352ccb44038
 DIST VirtualGL-2.3.2.tar.gz 2741077 SHA256 bee2abb3225bd1a607036a50e60e2652248d976afdbfcb096423648f1acc5418 SHA512 69cf5082a33d86a3778c147de6296366efd056a8be9d38c3dc41030e832c58025fc2ee535076ae2a66a3ed8ee817109068c9255f9c1e0b9c5ff983450223b53d WHIRLPOOL c0f1fe6629b0020322e7a165025d704091cd6dd88e5ca11037cddf14cdcccf5b50bc7a8b081d5f1d7508369a7d4f55d88aad3b783760ca32daeef1b244c3793e
+DIST VirtualGL-2.3.3.tar.gz 2614988 SHA256 857fd5c51c64016a1687cbda62ca5dcdf7073181df86b57be010501b565e5d45 SHA512 7bab5145be338d9bb2f9b4952ee530e84ae195185d55039cf10c89ced049716756f23f4d9c41c82f032c6e6a57bbbaebf023b3e501011bfd5c6aa3d59b22dd8d WHIRLPOOL e903172545c825b8df1dc6678738ac5e7ac2a104ec979668e522f46e2d2f715a3a07cb3cbac57c9e848a6420873f671737b7bed9acf50556a4aea08c4c1355a3
 EBUILD virtualgl-2.3.2-r3.ebuild 2128 SHA256 bc89be9d2cb0c9cefc999b7de75d3d2e09d6e81cbaff3d3a79503d1b0e077147 SHA512 72b1b60b9e699bc1b6af563278d41f7906a28b954f71df227aa22fcd19a65159fec676287032d0c53a064471af3f5714d42d17c3643e27080e5462618a4b08d7 WHIRLPOOL 94c5a6a9e7be775be2ee9ae57be7e4c9b39fd142df1d3b458bb8c516e336fb363ca14a262793c09d729fde171d8e2822c95b4f0074a55e64d086cbb95ac5e1d2
-MISC ChangeLog 3287 SHA256 dea4e3faec7ba8d224e259e160efe5dc43ee9b149d34e82ae6bccd106cea61d0 SHA512 d40cf8eb25fed9421887c73c2fc9cc917666dc35803189346589cdd40ef78f211a6c536fae8c8bf9678f36c897f7dd686784a34538cfd50b2e9cc3ee29f5a25d WHIRLPOOL 3d1db703f7f8660d1159308cf350a07be0b46e95e889fe7bc09eb5b0743431c415a3db89ec3a2252656a3c73fddaa48052129c3d2f4cffe760fe12f920a2224b
+EBUILD virtualgl-2.3.3.ebuild 2300 SHA256 7add3b60d3c0cbf91e2fdd384b2a620d086938e759ad522f2290e67be2753933 SHA512 de6a8744fa0f0a03ce1fa3f6523246ffa399d397115bae25c2c6f2c658845bf281a8d1ee33bd7df73a858627ea22002f80cbc6125e49e901eec77446d85d4a39 WHIRLPOOL 6b1d9b0cd2f51e02b906e42bfcd3b63e607bf122c1d03d4d846aefcd4ea3e7f9fcae0c008e5d0bb504af00688b0f565c35a77e424fa780465e20f0c575b28b5c
+MISC ChangeLog 3489 SHA256 3e75d95279f79de6ba9b9869a9ebd01e09eee6ea62ceef167fdc897abd5c3d4c SHA512 f228082bb23d4a22537f4455ec616d45b8be9c1a719922cef65188fb4a5e49144434003df204963458c407e0801db2f1ea49f51d96e3b3606e7427752c220c59 WHIRLPOOL e532a4d6b565d335ce19e31b5ec72fb8e2c2883a81ec8ceeb9ef4188a8f16c0d775be4f9e201ef83bc988563bb5ef3fef8357dc10e47981207f8263e28aba9c2
 MISC metadata.xml 623 SHA256 316b53ddcecea522ace4b473d03979f84564878170296a7880a1d5474c105a29 SHA512 9904123fcf4f4bae816a0e924ea23f7650696e9b39349e044d4cab398a2c69203544ec8dbd01367b535931e41223b81cdb1d4dc5b80e829b2cde7b58d6c2e25e WHIRLPOOL bcb470a607923f0d79d091d9f7835d232cf15fcb35d4467a43bada39a18f743e0a2b45428f16f7fb8be52a271f075be7e42f477aeae0c5485cb9a23779ae3a97
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSIbPiAAoJELp701BxlEWfGgQP/RZh/TLCzn+pcs8F7SIyCk/C
-8flQwe/CA6vpQ5mJZ2tgoT4vvkNnhy0wdrveeEKdCpH/01Adf5qe3j2/320NwZ/U
-ur57CU3t2yYLhjO3n/q3LMY8aUJFs1CInwHevFplXXyntt6YL3c/YSnTHR510T4L
-8rQAp+ioFs4u/Z5ScBGHwigUhaUZ3cC5SPdoh+/5nbuTREvBKmTa/KENHNUA9Piv
-TPSbpHYU/vKjhKHkIhrkb2x23aeTyqsrlKBDMW0jv2cVQzmw48AK3lYeGgFINATa
-aI+zzc7KMWjFie5+AIeC8zvSBv0WifagCSdL12F1PIiMltB5WyWv9khUuGn/t6RT
-3XTz46o86uyqCCtE8L8QkT3yfgn4+nhfLRrAfIOmaeVVNoONZZLARep7RirORP3Y
-e7pQc8a7fv+fE/XyungihdJH7OhBqpFB/MwCjYgd6StYQohzYHolfbH4ZYbG8ASf
-o3oMO1qs5zUAeCjuBu5WhnkQNGMSk3dOWgSy7OQGCW+uuL71nUoND4Zy1wk+PV9e
-NaKERFV6so947PsNPncndKIGUNv1Q28MJdJaFWma2D+qp9YB1/pQms7m277zJOPy
-1GKKMHgFSFbD/RAq8H48MoyWMfai5sjv8G8RSKzLN/+vUIFqJgk0uaiySEbaFLmm
-/D3I0PidXdGVE++9/uIU
-=8pQb
+iEYEAREIAAYFAlKo06QACgkQCaWpQKGI+9TXPQCfcJ1z6RKDjY7SQeX24+WI8wjF
+FRcAn24yw3vAJKPubQD0bEV3klWcHQro
+=tHQU
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/virtualgl/virtualgl-2.3.3.ebuild b/x11-misc/virtualgl/virtualgl-2.3.3.ebuild
new file mode 100644
index 000000000000..f2a2388dd0ff
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.3.3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.3.ebuild,v 1.1 2013/12/11 21:05:38 pacho Exp $
+
+EAPI=5
+inherit cmake-multilib multilib systemd
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
+HOMEPAGE="http://www.virtualgl.org/"
+
+MY_PN="VirtualGL"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl )
+	media-libs/libjpeg-turbo
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXv
+	amd64? ( abi_x86_32? (
+		|| (
+			media-libs/libjpeg-turbo[abi_x86_32]
+			app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
+		)
+		|| (
+			(
+				x11-libs/libX11[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+				x11-libs/libXv[abi_x86_32]
+			)
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
+		)
+		|| (
+			(
+				virtual/glu[abi_x86_32]
+				virtual/opengl[abi_x86_32]
+			)
+			app-emulation/emul-linux-x86-opengl[-abi_x86_32]
+		)
+	) )
+	virtual/glu
+	virtual/opengl
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Use /var/lib, bug #428122
+	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
+		server/vglrun server/vglgenkey server/vglserver_config || die
+
+	default
+}
+
+src_configure() {
+	abi_configure() {
+		local mycmakeargs=(
+			$(cmake-utils_use ssl VGL_USESSL)
+			-DVGL_DOCDIR=/usr/share/doc/"${P}"
+			-DTJPEG_INCLUDE_DIR=/usr/include
+			-DVGL_LIBDIR=/usr/$(get_libdir)
+			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+			-DVGL_FAKELIBDIR=/usr/fakelib/${ABI}
+		)
+		cmake-utils_src_configure
+	}
+	multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	# Make config dir
+	dodir /var/lib/VirtualGL
+	fowners root:video /var/lib/VirtualGL
+	fperms 0750 /var/lib/VirtualGL
+	newinitd "${FILESDIR}/vgl.initd-r2" vgl
+	newconfd "${FILESDIR}/vgl.confd-r1" vgl
+
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/vgl-helper.sh"
+	systemd_dounit "${FILESDIR}/vgl.service"
+
+	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+	mv "${D}"/usr/bin/{,v}glxinfo || die
+}