Add a bunch of ebuild fixes proposed by Tiziano Müller. (Bug #144528)

Package-Manager: portage-2.1.1_pre5-r3

5 files changed, 89 insertions, 5 deletions

diff --git a/media-libs/glew/ChangeLog b/media-libs/glew/ChangeLog
index 453bde78adda..5c785495ef1d 100644
--- a/media-libs/glew/ChangeLog
+++ b/media-libs/glew/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/glew
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glew/ChangeLog,v 1.16 2006/07/13 13:38:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glew/ChangeLog,v 1.17 2006/08/25 03:44:42 joshuabaergen Exp $
+
+*glew-1.3.4-r2 (25 Aug 2006)
+
+  25 Aug 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/glew-1.3.4-makefile.patch, +glew-1.3.4-r2.ebuild:
+  Add a bunch of ebuild fixes proposed by Tiziano Müller.  (Bug #144528)
 
   13 Jul 2006; Aron Griffis <agriffis@gentoo.org> glew-1.3.4.ebuild:
   Mark 1.3.4 stable on ia64
diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest
index 88625c8bca92..db8801adeddb 100644
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@@ -2,6 +2,10 @@ AUX glew-1.3.3-multilib.patch 2593 RMD160 6994bbfffcd813cc006326cc7bdcc7832d19c7
 MD5 f5ffff1cf39720762bd6cb9f3ed3ee24 files/glew-1.3.3-multilib.patch 2593
 RMD160 6994bbfffcd813cc006326cc7bdcc7832d19c740 files/glew-1.3.3-multilib.patch 2593
 SHA256 308ccb3139d6665def24515d5a55931283a8d9a414f3bba3b945ceef1a508b26 files/glew-1.3.3-multilib.patch 2593
+AUX glew-1.3.4-makefile.patch 490 RMD160 f366fdd83514199b53f865633ac59afb96a9bebd SHA1 b7772a7925eb02d4b6286556ee2a1bc81bee7389 SHA256 42783f3ee20277700bb3048358659ecfd2318d898c73ee61b50d413702ccb5da
+MD5 6c86321465b6c8b26b06b746cffdf40b files/glew-1.3.4-makefile.patch 490
+RMD160 f366fdd83514199b53f865633ac59afb96a9bebd files/glew-1.3.4-makefile.patch 490
+SHA256 42783f3ee20277700bb3048358659ecfd2318d898c73ee61b50d413702ccb5da files/glew-1.3.4-makefile.patch 490
 DIST glew-1.3.3-src.tgz 332493
 DIST glew-1.3.4-src.tgz 362854 RMD160 1f845fddb61c5a679a105aeae9ff21037d9fab6d SHA1 d70fb9fc07b99ec87a192818f73fc31b42c0811b SHA256 0f19a7235df8a3ff7c5f26b6a8dac12255dae8d04229f204eda96a6605948447
 EBUILD glew-1.3.3.ebuild 1006 RMD160 7e4e5294c474a841686f7ea3c283897629efd463 SHA1 090bc36947ef0d3e58d1c0e2c714267b4b610ac3 SHA256 8c38ccf2099b30412dadc113698d61d985ae28ce85681700d78cf86501ae657d
@@ -12,14 +16,18 @@ EBUILD glew-1.3.4-r1.ebuild 1112 RMD160 b106a4a11a38cde17400f9d82b7efc1a118f41ec
 MD5 6956c1cb6adffefe9de71fc85da8f5af glew-1.3.4-r1.ebuild 1112
 RMD160 b106a4a11a38cde17400f9d82b7efc1a118f41ec glew-1.3.4-r1.ebuild 1112
 SHA256 9c1338e122cb21dfe90567d134612f46e4d656ad48475a55b3b32f89a24ea530 glew-1.3.4-r1.ebuild 1112
+EBUILD glew-1.3.4-r2.ebuild 1234 RMD160 508db5cc5abd7698d9bc60d553562f17f1347748 SHA1 53c7bff2d30ff863f1acc2b941bf3a7456a8c3f2 SHA256 30e5d9f41129135c13771fc5b46c2080fc8b2f753c27ab789732d951a37949bc
+MD5 9e959de634eec5f2ad04844202d4a825 glew-1.3.4-r2.ebuild 1234
+RMD160 508db5cc5abd7698d9bc60d553562f17f1347748 glew-1.3.4-r2.ebuild 1234
+SHA256 30e5d9f41129135c13771fc5b46c2080fc8b2f753c27ab789732d951a37949bc glew-1.3.4-r2.ebuild 1234
 EBUILD glew-1.3.4.ebuild 971 RMD160 34d02dcabfba6af58fe23c95e1256af3195ef594 SHA1 55c68990e119d888e467817aabfc53a57e5e67e8 SHA256 c9fd86f97b46254cf8a325f01e9987ee872f2062403a33a563e5979c52d0939f
 MD5 380146b565d4355c2e2a9814265af86e glew-1.3.4.ebuild 971
 RMD160 34d02dcabfba6af58fe23c95e1256af3195ef594 glew-1.3.4.ebuild 971
 SHA256 c9fd86f97b46254cf8a325f01e9987ee872f2062403a33a563e5979c52d0939f glew-1.3.4.ebuild 971
-MISC ChangeLog 2300 RMD160 09802486c6e75f77a7bfc5706e9ce67fd0d03d6f SHA1 41bda6f7ffb5d2350dbfb3876f77ca0b8d9b0ff1 SHA256 442c6ff6e9fcaf7e846e96fa5c0bacbccfac1bb437b256616fea9ffdc25ef417
-MD5 bc6c42fec8ab8cec5ed2872954d4d4b2 ChangeLog 2300
-RMD160 09802486c6e75f77a7bfc5706e9ce67fd0d03d6f ChangeLog 2300
-SHA256 442c6ff6e9fcaf7e846e96fa5c0bacbccfac1bb437b256616fea9ffdc25ef417 ChangeLog 2300
+MISC ChangeLog 2526 RMD160 63dcb5496cd427b3b2f3871ef3ce22e611466887 SHA1 e5c61b7df3a8c2e9069798f7173cf412b65cd2e3 SHA256 f42d875e1cab059c0f69838f2d4755c4d3b2ed767acdbf6b2f5f5e87df4d16fe
+MD5 b717cf3bacccf19fea500f8e55df6a03 ChangeLog 2526
+RMD160 63dcb5496cd427b3b2f3871ef3ce22e611466887 ChangeLog 2526
+SHA256 f42d875e1cab059c0f69838f2d4755c4d3b2ed767acdbf6b2f5f5e87df4d16fe ChangeLog 2526
 MISC metadata.xml 225 RMD160 f4403c0b40fd4dbce74e41493761ccc42854e483 SHA1 e1646bce623e18ab17bd7d5fc0dd816df1f98456 SHA256 e990868f5e1a98c813995e2f202363a2e0b8d8226b7de7b3d64061d86ea3451b
 MD5 1114056da482209c3a0672f9b2c163a4 metadata.xml 225
 RMD160 f4403c0b40fd4dbce74e41493761ccc42854e483 metadata.xml 225
@@ -33,3 +41,6 @@ SHA256 d38e5738ac3153ce4a8780b1cc87b49543f50867066bb3356462a828e5555018 files/di
 MD5 193262246b27ce474b539eed44729648 files/digest-glew-1.3.4-r1 235
 RMD160 31da0de60d23a16b32a942de7f2fed54cf62f064 files/digest-glew-1.3.4-r1 235
 SHA256 2b6db49c89fdf9afd095deb41a25c31ebcd81e6b64ab18cdac263b62fee184cc files/digest-glew-1.3.4-r1 235
+MD5 193262246b27ce474b539eed44729648 files/digest-glew-1.3.4-r2 235
+RMD160 31da0de60d23a16b32a942de7f2fed54cf62f064 files/digest-glew-1.3.4-r2 235
+SHA256 2b6db49c89fdf9afd095deb41a25c31ebcd81e6b64ab18cdac263b62fee184cc files/digest-glew-1.3.4-r2 235
diff --git a/media-libs/glew/files/digest-glew-1.3.4-r2 b/media-libs/glew/files/digest-glew-1.3.4-r2
new file mode 100644
index 000000000000..06b682192d5a
--- /dev/null
+++ b/media-libs/glew/files/digest-glew-1.3.4-r2
@@ -0,0 +1,3 @@
+MD5 9c3911bf30b0ae48fd97d508b21811ca glew-1.3.4-src.tgz 362854
+RMD160 1f845fddb61c5a679a105aeae9ff21037d9fab6d glew-1.3.4-src.tgz 362854
+SHA256 0f19a7235df8a3ff7c5f26b6a8dac12255dae8d04229f204eda96a6605948447 glew-1.3.4-src.tgz 362854
diff --git a/media-libs/glew/files/glew-1.3.4-makefile.patch b/media-libs/glew/files/glew-1.3.4-makefile.patch
new file mode 100644
index 000000000000..f0bcf01fb216
--- /dev/null
+++ b/media-libs/glew/files/glew-1.3.4-makefile.patch
@@ -0,0 +1,15 @@
+--- glew/Makefile.orig	2006-08-20 16:13:12.000000000 +0200
++++ glew/Makefile	2006-08-20 16:13:39.000000000 +0200
+@@ -94,10 +94,10 @@
+ 	$(LN) $(LIB.SHARED) lib/$(LIB.DEVLNK)
+ endif
+ 
+-bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.SRCS)
++bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.SRCS) lib/$(LIB.SHARED)
+ 	$(CC) $(CFLAGS) -o $@ $^ $(BIN.LIBS)
+ 
+-bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.SRCS)
++bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.SRCS) lib/$(LIB.SHARED)
+ 	$(CC) $(CFLAGS) -o $@ $^ $(BIN.LIBS)
+ 
+ %.o: %.c
diff --git a/media-libs/glew/glew-1.3.4-r2.ebuild b/media-libs/glew/glew-1.3.4-r2.ebuild
new file mode 100644
index 000000000000..7a7dcdce6413
--- /dev/null
+++ b/media-libs/glew/glew-1.3.4-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glew/glew-1.3.4-r2.ebuild,v 1.1 2006/08/25 03:44:42 joshuabaergen Exp $
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="The OpenGL Extension Wrangler Library"
+HOMEPAGE="http://glew.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
+
+LICENSE="BSD GLX SGI-B GPL-2"
+
+IUSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND="virtual/opengl
+	virtual/glu"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-makefile.patch"
+
+	# Portage will strip binaries if needed
+	# If we strip here, static library will have no symbols
+	sed -i \
+		-e "s/-s\b//g" \
+		Makefile || die "sed failed"
+}
+
+src_compile(){
+	# Add system's CFLAGS
+	sed -i "s/OPT = \$(POPT)/OPT = ${CFLAGS}/" Makefile
+	emake CC=$(tc-getCC) || die "emake failed"
+}
+
+src_install() {
+	emake GLEW_DEST="${D}/usr" LIBDIR="${D}/usr/$(get_libdir)" install || die "Install failed!"
+
+	dodoc README.txt ChangeLog
+	cd "${S}/doc"
+	dohtml *.{html,css,png,jpg} || die "Documentation install failed"
+	dodoc *.txt || die "Documentation install failed"
+}