Build multilib properly (#445784 by mgorny)

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

3 files changed, 91 insertions, 17 deletions

diff --git a/x11-misc/virtualgl/ChangeLog b/x11-misc/virtualgl/ChangeLog
index f5181c9076de..3c177021f8db 100644
--- a/x11-misc/virtualgl/ChangeLog
+++ b/x11-misc/virtualgl/ChangeLog
@@ -1,6 +1,11 @@
 # 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.12 2013/04/21 18:47:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/ChangeLog,v 1.13 2013/05/09 22:07:32 pacho Exp $
+
+*virtualgl-2.3.2-r1 (09 May 2013)
+
+  09 May 2013; Pacho Ramos <pacho@gentoo.org> +virtualgl-2.3.2-r1.ebuild:
+  Build multilib properly (#445784 by mgorny)
 
   21 Apr 2013; Michał Górny <mgorny@gentoo.org> virtualgl-2.3.2.ebuild:
   Support multilib libraries alternatively to emul-linux-x86-xlibs.
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 4fa53899b54a..6086db84b317 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -4,25 +4,14 @@ Hash: SHA256
 AUX vgl.confd-r1 636 SHA256 500957c2736f761e763f75e9c3a09bb4f53bcde8a3cd38dd5ec6b34777737fd2 SHA512 f3203bb987d5a99fb63fd11d907235b343b261d945b788dfd17c09999fdb83df3d1a3028c60dd083f6b2ec358df06f321c330ae63a862ec1fa16f816be884ecd WHIRLPOOL af1efbc7ccf18b01e35a4c991be8036f1ed0c34cf040fa7b5b52ebf6441971d952e9577dd9e11656cfc8c673441d083fee5cb4d87dc8876b4cf21cbcc80108ca
 AUX vgl.initd-r1 881 SHA256 0dc1db0548c627b83c4adb3396aaafdc2d633698e6c89d47fb940904c2f4764c SHA512 e7965844cbc8f58158bb6176eed354b7a0a6da09489aee7b508a59f0fc7529ab7071bd4fa4ee2180cc4b019504f6b8735d7476cbfbc057c9b583ce59394d349e WHIRLPOOL 3a404bd35932c92ffca82b778261876f9e16cd73eb8116d21addf0c7c057faee4d1c8ce09c8e174cee7eea1373f70fb014f5f0412eac049ac7f4bb798cb95334
 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.ebuild 3133 SHA256 66fee9b82c548727e444cbae5e848aa6bfd6fec3222f3c87f48bd94519272d92 SHA512 5c2d59a4919bdd86469b4389a82ed74af8fd7f147cc9bf7739eadd411e524295cb31340bb08649b4b6e84cd1eb7929f4eb5e3b0c914edf917bfe14e785ec2305 WHIRLPOOL 765a53a6b9f827b9008a213ba0246b3695ce50659526d3622de610fb76a475e5bd6275edecb0681beedc7bda32dd0306f61c257ad76292c45ba4836748be60c0
-MISC ChangeLog 2400 SHA256 084a4d1704d19a39cd6aa836904f2554ee71fd8d8e99fa662f0c9333523d184a SHA512 db760511bf4a10e36f4e9906cebe7fdfd7d3bbb0e698c92ea294af46864a2069d11441a10dde842fb0a9e21654de6cea7f69ed1aed78996211c36186309f5e73 WHIRLPOOL 0dfc9fc001bb93d7cff96a7cefe47678b7b9e42c2890b7fd2f3ac9aa05985357c60c6f9e657938f7e04e6b48207628d1877cdfccb4cefd5b7f5e756e2b0e870b
+MISC ChangeLog 2555 SHA256 cf0776bff08cb3f99b40e1ee01eec082bb43dc8393e9eb7c80e6a07bf7b82d76 SHA512 58456eb3e14ee54532e070bbcfeca4240b154142ecf9e6a80b35005813755868bf8e94d4b84aed71afa2ae3992b2f35cbf298492bcbb6ace1dd1656fced1ad55 WHIRLPOOL 45108792ac0d4836d17538efb6db3367825fb22082d6729ebc49552f6329d361de04cd3ad11d9c177669fe74203c5a9e122860a88b7e0815d1bfc73062ed2947
 MISC metadata.xml 623 SHA256 316b53ddcecea522ace4b473d03979f84564878170296a7880a1d5474c105a29 SHA512 9904123fcf4f4bae816a0e924ea23f7650696e9b39349e044d4cab398a2c69203544ec8dbd01367b535931e41223b81cdb1d4dc5b80e829b2cde7b58d6c2e25e WHIRLPOOL bcb470a607923f0d79d091d9f7835d232cf15fcb35d4467a43bada39a18f743e0a2b45428f16f7fb8be52a271f075be7e42f477aeae0c5485cb9a23779ae3a97
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRdDSAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDDg4QAJsf73Effk9nqCyWpuXDp67N
-kZjE+uheB7N6AOus9d7lyM0x4pcB+SMJQ0Jbx22GqfkCTygTt0jnMU1QnA2nsPcI
-ITl9T4BsQUGe2Caa7GpGtSqZGJNZxZj0P2QcUhPfbs/SUwSUZx8ZXT+P4iy+VY3C
-uvfVzNFnWCfMiZAI++ckVcY6Y/eJkG+SwIqrg3X3+powsgcoZUs9YeZQNG1ndCUD
-hvxaOEvVDCYG4rlcBodewTHeI+SkpPbY3epwNZW6tXUAUgdUUCtY7gQa6WeMJPx4
-iA6LPY4L0VcbgtdCZbxleG3pK000nLscE30StRrjrRoVGeiGJK9LBql5NsoNbsEn
-l47WE2PhpdB104D6IYkpml0IXjSv2Uk0bhL1omnlyxlG6nvmDBSQos4iJUT/TxSx
-+v56hluUlzhJuX4SpfjJUg+jx6LmVWWMRHETIelQcnd1rbsX616qh0GTeBLMo7ln
-cJevN4cHrkCi1vg6UmLE+qnKktAcZAB2Z6V8fPkJjFBG1L+asK7p16nfs9JY6Koy
-XEV/7WqZJw0OC/jJAKHScHbQhZuP05BAsZDUPxQYZ5csvfex1PSKG92dQ0WzoDS/
-rCyBEkUujn/xlem1tqZpRPe9y44CjzobRCbeUs0ljC0y6g2TkPisGE5QoLVFpFTJ
-koDYniO04lMGuC7mlL3y
-=vmkU
+iEYEAREIAAYFAlGMHiUACgkQCaWpQKGI+9QXZACaAljU/tI9n059zJMe717hDEJi
+k9UAn1XwwQg/kUnaIproU7INlLnSfaUW
+=tE0M
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/virtualgl/virtualgl-2.3.2-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..187e8f10c48b
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.3.2-r1.ebuild
@@ -0,0 +1,80 @@
+# 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
+}