amd64 stable, bug #508136; drop old

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

4 files changed, 12 insertions, 106 deletions

diff --git a/x11-misc/virtualgl/ChangeLog b/x11-misc/virtualgl/ChangeLog
index 5aa506a0df5a..45e80f6e41d5 100644
--- a/x11-misc/virtualgl/ChangeLog
+++ b/x11-misc/virtualgl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/virtualgl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/ChangeLog,v 1.21 2014/06/18 21:16:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/ChangeLog,v 1.22 2014/07/18 17:35:49 pacho Exp $
+
+  18 Jul 2014; Pacho Ramos <pacho@gentoo.org> -virtualgl-2.3.2-r3.ebuild,
+  virtualgl-2.3.3.ebuild:
+  amd64 stable, bug #508136; drop old
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> virtualgl-2.3.2-r3.ebuild,
   virtualgl-2.3.3.ebuild:
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 8205c623ad82..5d4b6d683d07 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -6,28 +6,14 @@ AUX vgl.confd-r1 636 SHA256 500957c2736f761e763f75e9c3a09bb4f53bcde8a3cd38dd5ec6
 AUX vgl.initd-r1 881 SHA256 0dc1db0548c627b83c4adb3396aaafdc2d633698e6c89d47fb940904c2f4764c SHA512 e7965844cbc8f58158bb6176eed354b7a0a6da09489aee7b508a59f0fc7529ab7071bd4fa4ee2180cc4b019504f6b8735d7476cbfbc057c9b583ce59394d349e WHIRLPOOL 3a404bd35932c92ffca82b778261876f9e16cd73eb8116d21addf0c7c057faee4d1c8ce09c8e174cee7eea1373f70fb014f5f0412eac049ac7f4bb798cb95334
 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 2155 SHA256 12edcffb59cb0db972231f6a91b85f541d712e584a3c69f51b966282e7cc0366 SHA512 fef1d16a75d8e1a7cbd8c0a8a827d1d8623b068ec2346d7710604ff3e924ae16ececbcb8f30f4357f13d43d478183f4ac5be601c11a5ee184aca70cd4450e010 WHIRLPOOL 173edf9d2a9f0e90f702b6a7375639245bbd6b00e6cb9256e2dc2d2846783c5f311a20d6f0a0a56ac4e3cd110eceb2e78b28884f28eb1518cfe4d6a3bd214f06
-EBUILD virtualgl-2.3.3.ebuild 2354 SHA256 db1627b426a08975fb255ec5f946bd15197803a481d14359c48e0e5dc79735be SHA512 a889c2bc9946897797217b9914a9087961fde0ca4ea46acd187723125e91131ce07c3b13b756de2590497aa76ffc86e1c36f8e32d7bf8a4501ec08813261f61d WHIRLPOOL 05341532d5b84e581f7b0371c3cd90be7cf76f4f7ad69b8cf4654c5a0e19e499982cc3924179dc82642fca0bb6421d9fde980723676e80b92e9669e9ab5d75e2
-MISC ChangeLog 3901 SHA256 643816aac3f7592b40813ada99f33321c302e5319252147d276672149494c30c SHA512 ce9890e5ff0d22798064f536cb0be02cdc1659ec751e6eafa638c36d680a940a27be7ebfddc73f78a4203b8613f093e550057b7680d7ce2e71131c0782b74f44 WHIRLPOOL cabb12c450fe7645dd26b825e2d839162ba549cf2b05b6b6e14c027593dc9eb9d683c6447e053141bb5e89bc872a6481ccd5021768f7e8d973e4e660058edd87
+EBUILD virtualgl-2.3.3.ebuild 2352 SHA256 1dbf9f1074b539fa120fcaa33f97c2807e9256f46b845d1c8fff4f7b1d438cc7 SHA512 42666cc312fe886af4a1c4e8847d1795087c837a2c05bee8b7da01750126268006076d0a285a0b77649cdc727559b26e75a4f11d994c47150b0a548f1b129703 WHIRLPOOL 468719bb2e1aa5d2219ec42d98330d352fa87b0eb326787d8938d4c393cf8340563711ffa51aee9dcef86ae97e1b527170c8ed5ab3c0587984bbd51efd00fc0c
+MISC ChangeLog 4039 SHA256 3ce0320ebc60a63c1c260d5ef9332ade307a07dc69a415f020fd67aa1c851e17 SHA512 0f058248c0a4039447b35c7ecd8ad9a7c719c9de9279f345fdc943fb23b553d6fa3a90987982615a325c2ca9de9a298cf8d2343066baf1cd510da775f0525292 WHIRLPOOL a0d3a671bf9cb9a92a23583bdfdf61ab8ec0016d91a6c778bf866abd4beab39869ba286dfe233d4d31531c78cb49e5dbe1eb55e9e0a1d5fc59f112f89b69bedd
 MISC metadata.xml 623 SHA256 316b53ddcecea522ace4b473d03979f84564878170296a7880a1d5474c105a29 SHA512 9904123fcf4f4bae816a0e924ea23f7650696e9b39349e044d4cab398a2c69203544ec8dbd01367b535931e41223b81cdb1d4dc5b80e829b2cde7b58d6c2e25e WHIRLPOOL bcb470a607923f0d79d091d9f7835d232cf15fcb35d4467a43bada39a18f743e0a2b45428f16f7fb8be52a271f075be7e42f477aeae0c5485cb9a23779ae3a97
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTogGbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOggsP/R0bNRQyPQT3jQzYI0bVZOFA
-Xe/nMkhTZ9W6ehIhq69d9ClrMQ/6Xe48OB2/2J+PfUVhQkeRcB0KT1xDeMsK+1zs
-ajgPRu0DNn0i935MCm5sz+piW1LGxxIExJU++1O6zbCZK3JXSlPf0QqP0Ue5Nxrz
-nkyKK2IUrx1sYjKTJPKErma0Y4RrgS2AbgLrh8G1ZyvjbyK5grMK8MUcPF2PM9Or
-bPqGoSIUrpEMeuj5Eq/oSgzEF7xuMsSXYbKXzyD99t6Fgej9lSM5GwNmrdNLcCV6
-aCql/jdKNB23VhWLXECSbBiRDaeJ8oCyMqzLjEXk/JXlQG93LtE5QSQqho4OAaCq
-6AfxG08raHvIniU7liErOx+mJEWWb/r8fOP00r1DmIVUSUIZdEMaWB1cG7o2wETy
-RAs685H2+8tKW+ZAfcloyDI2rkFMWM135ZFIZv6IoL8HePB8cIQ8KPIYuohHYonB
-GER+J7Og0XlZ+cA/QuH1dVJHqWUA2NI5JC/Z7stRENLg0iQlxapNBZTdm5woV7Os
-pSc4NKEPR4aIQ5y565qkC4WQ1uzogtItX5n7zn5/63IrpBv8wfeWjbVqhMsV2GPm
-vOxxc1xuTdrycD5/s2hDGyZN9Rc0kAxVmgxOHHmZ8A7WZdwt0TfiY1a0cthPae6W
-7GcvBrN9dX9ZYgtM/9Jx
-=T4+4
+iEYEAREIAAYFAlPJWvYACgkQCaWpQKGI+9R87QCePS/I6PqIcdVRWC1rEQ8YxIm+
+C/wAmwdLEaY3NfECognMJLSgM2TactHa
+=zj87
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/virtualgl/virtualgl-2.3.2-r3.ebuild b/x11-misc/virtualgl/virtualgl-2.3.2-r3.ebuild
deleted file mode 100644
index 405313ceb4c4..000000000000
--- a/x11-misc/virtualgl/virtualgl-2.3.2-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.2-r3.ebuild,v 1.5 2014/06/18 21:16:07 mgorny 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? (
-		|| (
-			(
-				>=x11-libs/libX11-1.6.2[abi_x86_32]
-				>=x11-libs/libXext-1.3.2[abi_x86_32]
-				>=x11-libs/libXv-1.0.10[abi_x86_32]
-			)
-			app-emulation/emul-linux-x86-xlibs
-		)
-		app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-opengl
-	) )
-	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
-}
diff --git a/x11-misc/virtualgl/virtualgl-2.3.3.ebuild b/x11-misc/virtualgl/virtualgl-2.3.3.ebuild
index 0610121bf972..14a16700e45d 100644
--- a/x11-misc/virtualgl/virtualgl-2.3.3.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.3 2014/06/18 21:16:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.3.ebuild,v 1.4 2014/07/18 17:35:49 pacho Exp $
 
 EAPI=5
 inherit cmake-multilib multilib systemd
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="ssl"
 
 RDEPEND="