Install unit file and drop old.

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

5 files changed, 31 insertions, 90 deletions

diff --git a/x11-misc/virtualgl/ChangeLog b/x11-misc/virtualgl/ChangeLog
index 3f1b0ffffe1b..7a24ee7bc95c 100644
--- a/x11-misc/virtualgl/ChangeLog
+++ b/x11-misc/virtualgl/ChangeLog
@@ -1,6 +1,13 @@
 # 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.14 2013/05/26 18:46:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/ChangeLog,v 1.15 2013/07/05 17:17:29 pacho Exp $
+
+*virtualgl-2.3.2-r3 (05 Jul 2013)
+
+  05 Jul 2013; Pacho Ramos <pacho@gentoo.org> +files/vgl.service,
+  +virtualgl-2.3.2-r3.ebuild, -virtualgl-2.3.2-r1.ebuild,
+  -virtualgl-2.3.2-r2.ebuild:
+  Install unit file and drop old.
 
 *virtualgl-2.3.2-r2 (26 May 2013)
 
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index e69f732220c0..1ec81b610ed1 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -4,15 +4,15 @@ Hash: SHA256
 AUX vgl.confd-r1 636 SHA256 500957c2736f761e763f75e9c3a09bb4f53bcde8a3cd38dd5ec6b34777737fd2 SHA512 f3203bb987d5a99fb63fd11d907235b343b261d945b788dfd17c09999fdb83df3d1a3028c60dd083f6b2ec358df06f321c330ae63a862ec1fa16f816be884ecd WHIRLPOOL af1efbc7ccf18b01e35a4c991be8036f1ed0c34cf040fa7b5b52ebf6441971d952e9577dd9e11656cfc8c673441d083fee5cb4d87dc8876b4cf21cbcc80108ca
 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
-EBUILD virtualgl-2.3.2-r1.ebuild 2023 SHA256 e045d1d1a349cfdeadc619eaf15ed9d5e5861d3dfec04e437f3459f9d2792192 SHA512 305580c958eb89880769132583988bc1272cb4d9c408bb16d88f15acdb314a83a734cdf32c1fbc3b3126eba748f45db28cf5c818083ab779123a52acfb831b17 WHIRLPOOL 891e24be0d96cc3e3e171063bd8b11418ad1d1c4a4a96267ed2fe708626e4d0aacb64a4442b4e0fdf31441c59b0963a110295d5b7be913fe3ad46f01aedbe3c9
-EBUILD virtualgl-2.3.2-r2.ebuild 2023 SHA256 3b085b41e6ae50300ce9ac0e36a8892aa3ea87f861b169e9029da39b755c241b SHA512 7247c0332109c93e99f196c43aadaee180aab0e51be0b299ebddc296821f376d46078c87eee3950a23ed17f3091d75f7710aecfaa7192068633515610732bf1e WHIRLPOOL 0ea4608d9a7340ef7a64d2d4d54ecf2be74001e905580e337f8d2be19f60948382f80a8655952ea795a07771db49176c96d6b997d6a039dd4211969e66a32a38
-MISC ChangeLog 2823 SHA256 68089ae078b18c76156adaed2e69926eda99d7faf58b4d3da2aab235acb3d9a2 SHA512 544c10c21ebec4b240fd9fa5e30332584ea141fb8770a9697073086022d8099ffa972263b7b94e5390827aeac99f173d55bb06194c98da39f042bb64b3d1a0c9 WHIRLPOOL 3a7d30df96e4201b206253209a974081b858878b39c8f072372ecce9016424a75a20076e92c1f8bdb537d7354e4079c9d62c001324f4b6586ac6d6b9e6a62bc4
+EBUILD virtualgl-2.3.2-r3.ebuild 2073 SHA256 5f8adb1c73cc46135e07487f6a6b98c12efdb82b8d72c8888a878c9b6bbd2384 SHA512 02b42da60fd414fee3a513961ee36b35c2dbd8bb18a763ea9f9e3e5f6fa53c47fa039f8d388226d5dbc032c1109181e800f7c9dbfbbbf56ab4847aa21cbace6a WHIRLPOOL d51b60934b228dac5eb919e0f03e33cad32f4584e48de5bc75206918863fb3b72c6358cb9b32d445057f48f1a6523af5b843d89f4c9627d40d10708e1c8b4505
+MISC ChangeLog 3047 SHA256 189135c98bb1caeeb9322f38035e95c447882ab16f6d97bdd2da02b478cfd192 SHA512 8d1f0b9e1be02e1b94a2f2f36941b0ebd4cd6291a7dfa2df272fc40b2032e0c4c70baa2f59e115b3d56ee5dde082516a606b4be2e6cab8323c8bf70c15e5fcff WHIRLPOOL 94d5a96f054779a01831ffc47099ff90758cda77b010c825eb36d5cb810a1f862b33b504ec29ed17e8033fbb19ddc15b13403309b888b15a5829be73b31ad661
 MISC metadata.xml 623 SHA256 316b53ddcecea522ace4b473d03979f84564878170296a7880a1d5474c105a29 SHA512 9904123fcf4f4bae816a0e924ea23f7650696e9b39349e044d4cab398a2c69203544ec8dbd01367b535931e41223b81cdb1d4dc5b80e829b2cde7b58d6c2e25e WHIRLPOOL bcb470a607923f0d79d091d9f7835d232cf15fcb35d4467a43bada39a18f743e0a2b45428f16f7fb8be52a271f075be7e42f477aeae0c5485cb9a23779ae3a97
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGiWIQACgkQCaWpQKGI+9S8kgCfTyvgLeCMMfVW6UPEDEcBFDyL
-MQMAn1ikgJQqExYXhE2xAVWKWEi+tq/2
-=Ur+t
+iEYEAREIAAYFAlHW/6sACgkQCaWpQKGI+9TyXQCghPh8y57/FPQK3DwfcmkImAe4
+b+8An3hN1jMove4/fSQFBvMOihwHKRkG
+=5+xw
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/virtualgl/files/vgl.service b/x11-misc/virtualgl/files/vgl.service
new file mode 100644
index 000000000000..a001e8a1d2f1
--- /dev/null
+++ b/x11-misc/virtualgl/files/vgl.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=VirtualGL service
+After=display-manager.service
+
+[Service]
+RemainAfterExit=yes
+PIDFile=/var/run/named/named.pid
+ExecStart=/usr/libexec/vgl-helper.sh start
+ExecStop=/usr/libexec/vgl-helper.sh stop
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/x11-misc/virtualgl/virtualgl-2.3.2-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.3.2-r1.ebuild
deleted file mode 100644
index 187e8f10c48b..000000000000
--- a/x11-misc/virtualgl/virtualgl-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.2-r1.ebuild,v 1.1 2013/05/09 22:07:32 pacho Exp $
-
-EAPI=5
-inherit cmake-multilib multilib
-
-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[abi_x86_32]
-				x11-libs/libXext[abi_x86_32]
-				x11-libs/libXv[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-r1" vgl
-	newconfd "${FILESDIR}/vgl.confd-r1" vgl
-
-	# 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.2-r2.ebuild b/x11-misc/virtualgl/virtualgl-2.3.2-r3.ebuild
index fedf33c9cfe6..d1e3efd339f7 100644
--- a/x11-misc/virtualgl/virtualgl-2.3.2-r2.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.3.2-r3.ebuild
@@ -1,9 +1,9 @@
 # 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.2-r2.ebuild,v 1.1 2013/05/26 18:46:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.2-r3.ebuild,v 1.1 2013/07/05 17:17:29 pacho Exp $
 
 EAPI=5
-inherit cmake-multilib multilib
+inherit cmake-multilib multilib systemd
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
 HOMEPAGE="http://www.virtualgl.org/"
@@ -74,6 +74,7 @@ src_install() {
 	fperms 0750 /var/lib/VirtualGL
 	newinitd "${FILESDIR}/vgl.initd-r2" vgl
 	newconfd "${FILESDIR}/vgl.confd-r1" vgl
+	systemd_dounit "${FILESDIR}/vgl.service"
 
 	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
 	mv "${D}"/usr/bin/{,v}glxinfo || die