Convert to multilib.

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

3 files changed, 100 insertions, 10 deletions

diff --git a/media-libs/glew/ChangeLog b/media-libs/glew/ChangeLog
index d7a3408bb5d8..62bf8ee7b576 100644
--- a/media-libs/glew/ChangeLog
+++ b/media-libs/glew/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/glew
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glew/ChangeLog,v 1.94 2013/07/23 23:48:01 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glew/ChangeLog,v 1.95 2013/09/21 17:10:29 mgorny Exp $
+
+*glew-1.10.0-r2 (21 Sep 2013)
+
+  21 Sep 2013; Michał Górny <mgorny@gentoo.org> +glew-1.10.0-r2.ebuild:
+  Convert to multilib.
 
 *glew-1.10.0-r1 (23 Jul 2013)
 
diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest
index ab9e5a1cbdf3..451f6c79fccb 100644
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@@ -4,17 +4,26 @@ Hash: SHA256
 DIST glew-1.10.0.tgz 567605 SHA256 99c41320b63f6860869b5fb9af9a1854b15582796c64ee3dfd7096dc0c89f307 SHA512 0c998fda9fe01c9296a3453966c0449c9968f4f5f989065ca65f0da3830ae8d805699d0ee0362c3b18765420222ba18842b9db20986212afceb36c971ae1bdca WHIRLPOOL 7c931d990b667fc5da79b0b0c11f76693adbd75c730252d5fd1129ff5d54690222a0f0efc0d2abe0535edcde7f72d76bad6de40d02c5a48f0bc4804a248b7d72
 DIST glew-1.9.0.tgz 544440 SHA256 9b36530e414c95d6624be9d6815a5be1531d1986300ae5903f16977ab8aeb787 SHA512 e4b566de6bfc84d73a2c3eedc5eeace30b1d8126f425fbd880dcc3f5850dd445247d6ef950194944cfc71d71155773c47bb593fe2ca9879032d1c65a8a70f5e5 WHIRLPOOL d1c49e13561834c2049f8d5027260b37f5814cf96466f30494d5c2a0251b655c97f9f82a4c9f76ec62513e1408586b1ff8a0ee21258af7e9afa5a7407cf8cdba
 EBUILD glew-1.10.0-r1.ebuild 1861 SHA256 d97e8007269d28ee05d79408f11ea484de547ee32f5c68305c8d95c86f2e38f7 SHA512 bd8150d8767a034cf26787b1d72c4478481ea10ba71b667a5df1100c819d4f3461f99e7efb2c061b8c54086f36771715256ca19919150599a9ab30f495d79fe6 WHIRLPOOL eb2ef1f19c22e7a37fee671671520c556d8926108ec153e455663a24a5b974ad601b1f5cd89baaa01ac512142eb2e8fcc766f62bd6864a534c1daca34e1266e4
+EBUILD glew-1.10.0-r2.ebuild 2127 SHA256 0955258e6f5b65f077e4def715db7beb2c41a26a13cb8231db1a3b8c9b7e44b5 SHA512 29c02939c9fb91029b80a4eb72a412ec9c5e9c8af2b2d2aea310c462ad8b65204f59e357ee6051710b324b47a6b411e7f4b47fc6ef444980f28f709479396b06 WHIRLPOOL f6b4d80e19d0e925f7d786caf98e9d7b97f5ddfe888c0af28438b237da81edbef91ae0373914a4ef820e20661289437380ee7de8b394a4a265d878ff77af1022
 EBUILD glew-1.9.0.ebuild 1728 SHA256 e862b35e5e47bccffd2cc7ccee1f3b987464203dd591b4958e227ad049e51e92 SHA512 7c9f110a897c1a0342cd2b7cb83766c6da521ed1adcd44125865fb47962d210fa1db74644dc6db439965d717678a711ee40815dbca7798e8bd08361584ea1dc9 WHIRLPOOL 62215d7c3c4127c68cf0d771b36b99428aa33a90ede6ae828db8b7f732040b174191a96392801fc817045ece8084774ab60d1fea61108257ba4a5de0a421fc9b
-MISC ChangeLog 11150 SHA256 e61837a386488edc0810d4e132891b5ad3d0ec5d263e7e3bd298f0cc330ed6b7 SHA512 9ba3545010ed75578a3c65344d3311d0f2e63e317c801f59b5219d8a8f8913a9ecdf1f057b87ba1abfb02569c0113b0737494fab240b83a196ed9e6485c84ea3 WHIRLPOOL 05c285dbde8b0d3744e28747a9df5f6e9f804006f88ea498b6610bb404ef9a4ba2c5c25970a7b5ea24eada57ed6a1378de785333d5024b03f8a29ff13fe1de0f
+MISC ChangeLog 11276 SHA256 1ff8b17ef03ee0ef7ac164d3cff15e9359013fcbe82716a80af450c24517e78a SHA512 c23d43abeb3d3cc6d044f1c9cce7858b099bb36813e029201b2f4452018677f95de72a06401cc686925e2758279c88bc44fa7ee7df6bbc1a17a1b0cfcaaef5f7 WHIRLPOOL 36175b24e264dfe2672d7f575cde1ee323326ea7f0d13b0185c0c46e47e82ab5fbacd130d87427225414ec4b5bf998078d9625bcc52af6dba536bc8ee1966c80
 MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR7xY0AAoJEEqz6FtPBkyjZ2IH/jZiRTzJX527I2v78ozZRYSF
-wiOPx6mI8QWMIpmpPyquRwoK9H1ydPhkXDSlMOzYereyZfvy5XmVBFQLQUmH7ZPQ
-p8JdOiNO0X4sOBNQpkyrsLCNElPz3T1QSe8KV+ct5ySBTD7DzfJYDPfzJ9lBoO8K
-cOZZMD75uCuyKNtZFT+TzjiU7e9tVfSje3yKKAcsrAc6+VNva1+7VZzZqYFdm5mG
-HLEOTcWqR6muq6Ml36QosGPiqsxEaQ2HnjnRPBllV+RAC75WvLJGwE/cPfkUjnJc
-8ox/0NIwbLQTEAvjOlwj+kTpSSkThIY0A+NP8yRu6Zm/sZxu4IghxOKBRCWpNrc=
-=9dkW
+iQJ8BAEBCABmBQJSPdMuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOOmEQAI+afOVtI+SUKipDIHSk8M5D
+7Al52uNm+78cffsQwN0VG/nuPG+2cV3tabQ5y5Si8ceRt7PkBpHoyIxiorjjrPJ4
+uic0+KMUaMa+NuME6+6vADrCFkQPmb/8IXydpOEIyg3F7Ok795pVSDvIJkKSD8m6
+qFpH6e01JPiwIJv8DG5GfjASjerZGRP+/+aQZxqxBnmByJFcevnaZjqS07Z1ZEPM
+PxZhbFkePOhtwN8/4qxgMSvNVhI77VMm5a13ytkfPKfv7ER2zNyPuyDiCa0adlsa
+EpBLOLM92B/2RprKddlHFkMNuunEdB2x17+c4e3rqzKmrN0btV1FZ8vOGx20mELU
+BgVhW40Is2Wbs66XkXd4Ru40EevWTTMAK/3aLDAdOU1H3/RkNeHDYeC5Wq/UVuzT
+SrWmz2vqxy24Q5iNEH6BMjmuOqH5gW0rXV5ihOH6NUvjgKDmB6+zz43JkvxzBPR7
+ivF3ARfUOJ/aqgAz7qtF8qTNPE1OGrY5/egGObIaGx+iyJ1YMFnOIJfgfy6i6gEQ
+rrPF0DvZYNHu1Bxcg0IYGhoqbdRLioA5T1+zoV78R5EFoWq3Xb8JfNdjG65WLlrl
+nu4X4ooI21IMvoGhJRp7vRVin9ZzCWHjg2FIrgJqCJEH51+APH3bkdjjFKSlAMAT
+HEKqkFPKAWzbN2zFBQRc
+=gomE
 -----END PGP SIGNATURE-----
diff --git a/media-libs/glew/glew-1.10.0-r2.ebuild b/media-libs/glew/glew-1.10.0-r2.ebuild
new file mode 100644
index 000000000000..e9b54fb0fd50
--- /dev/null
+++ b/media-libs/glew/glew-1.10.0-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glew/glew-1.10.0-r2.ebuild,v 1.1 2013/09/21 17:10:29 mgorny Exp $
+
+EAPI=5
+inherit multilib multilib-minimal toolchain-funcs versionator
+
+DESCRIPTION="The OpenGL Extension Wrangler Library"
+HOMEPAGE="http://glew.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="BSD MIT"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs"
+
+RDEPEND="virtual/glu[${MULTILIB_USEDEP}]
+	virtual/opengl[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXmu[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND=${RDEPEND}
+
+src_prepare() {
+	sed -i \
+		-e '/INSTALL/s:-s::' \
+		-e '/$(CC) $(CFLAGS) -o/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
+		-e '/^.PHONY: .*\.pc$/d' \
+		Makefile || die
+
+	if ! use static-libs ; then
+		sed -i \
+			-e '/glew.lib:/s|lib/$(LIB.STATIC) ||' \
+			-e '/glew.lib.mx:/s|lib/$(LIB.STATIC.MX) ||' \
+			-e '/INSTALL.*LIB.STATIC/d' \
+			Makefile || die
+	fi
+
+	# don't do stupid Solaris specific stuff that won't work in Prefix
+	cp config/Makefile.linux config/Makefile.solaris || die
+	# and let freebsd be built as on linux too
+	cp config/Makefile.linux config/Makefile.freebsd || die
+
+	multilib_copy_sources
+}
+
+set_opts() {
+	myglewopts=(
+		AR="$(tc-getAR)"
+		STRIP=true
+		CC="$(tc-getCC)"
+		LD="$(tc-getCC) ${LDFLAGS}"
+		M_ARCH=""
+		LDFLAGS.EXTRA=""
+		POPT="${CFLAGS}"
+	)
+}
+
+multilib_src_compile() {
+	set_opts
+	emake GLEW_DEST="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" "${myglewopts[@]}"
+}
+
+multilib_src_install() {
+	set_opts
+	emake \
+		GLEW_DEST="${ED}/usr" \
+		LIBDIR="${ED}/usr/$(get_libdir)" \
+		"${myglewopts[@]}" \
+		install.all
+
+	dodoc TODO.txt
+	use doc && dohtml doc/*
+}