Add patch to exclude the examples dir from compilation (bug 141780). Thanks to Samuli Suominen <sasuomin@uusikaupunki.fi> for the ebuild and patch.

Package-Manager: portage-2.1.1_pre2-r8

4 files changed, 92 insertions, 10 deletions

diff --git a/media-libs/gle/ChangeLog b/media-libs/gle/ChangeLog
index b07e0639c761..dcedaf83ee69 100644
--- a/media-libs/gle/ChangeLog
+++ b/media-libs/gle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/gle
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/ChangeLog,v 1.20 2006/07/25 18:49:02 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/ChangeLog,v 1.21 2006/07/26 13:23:50 chutzpah Exp $
+
+  26 Jul 2006; Patrick McLean <chutzpah@gentoo.org>
+  +files/gle-3.1.0-amd64-skip-example.patch, gle-3.1.0.ebuild:
+  Add patch to exclude the examples dir from compilation (bug 141780). Thanks
+  to Samuli Suominen <sasuomin@uusikaupunki.fi> for the ebuild and patch.
 
 *gle-3.1.0 (25 Jul 2006)
 
diff --git a/media-libs/gle/Manifest b/media-libs/gle/Manifest
index 42dedd786df4..f413d5e82e45 100644
--- a/media-libs/gle/Manifest
+++ b/media-libs/gle/Manifest
@@ -2,6 +2,10 @@ AUX configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SH
 MD5 e0ebf10eb8bf4542ae57ba591daa68a4 files/configure-LANG.patch 1686
 RMD160 4ff8355af81705058fd411910dfae94887bcd884 files/configure-LANG.patch 1686
 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea files/configure-LANG.patch 1686
+AUX gle-3.1.0-amd64-skip-example.patch 4053 RMD160 0ea2153cd5579409c4bd72bb3ec60617a5aa28e1 SHA1 c63c9c2d567dc3177b68380aa5ffbb27b67b6bfc SHA256 f9bed1ef5144c86db523ed3547cf64a5a5b0f3b7234e33e24e6ecc9bef3213cc
+MD5 9c8a31493753ccd54e8e28bc4eadd80d files/gle-3.1.0-amd64-skip-example.patch 4053
+RMD160 0ea2153cd5579409c4bd72bb3ec60617a5aa28e1 files/gle-3.1.0-amd64-skip-example.patch 4053
+SHA256 f9bed1ef5144c86db523ed3547cf64a5a5b0f3b7234e33e24e6ecc9bef3213cc files/gle-3.1.0-amd64-skip-example.patch 4053
 DIST gle-3.0.1.tar.gz 705509 RMD160 3ee23fa37214273cbca493d6c72554a494c38dda SHA1 c3e2d79af8d2049314a4e31c40c583472c8701e1 SHA256 387d3d91e0493d93d88176fa096ba87b2fb16926719464329dc86b7bf436adbe
 DIST gle-3.1.0.tar.gz 806861 RMD160 49f217cf79ccc3c7e2802ae4347c15498f43db59 SHA1 ed6d7332df85357430b249854d4f2753f1228074 SHA256 dc8a74b5632b2c3fc84d33c2bf6ee43210b71b8ddf0a3166a25aeb46620bfa27
 EBUILD gle-3.0.1-r2.ebuild 908 RMD160 3af55f2b449571f1b4b61d3c41020634bbfb6cba SHA1 77cd8e2ca5e9689b2faf0873ee86a28b6a3cc655 SHA256 aef30dbfb9fe54fbd77d75d07b383d4ab878964e956d6d12f4708f465513a369
@@ -12,14 +16,14 @@ EBUILD gle-3.0.1-r3.ebuild 934 RMD160 0b183c796969896ac65e9ffb2dabff23b1b223a8 S
 MD5 1877d2e6429f72370502cfbe896e8a7d gle-3.0.1-r3.ebuild 934
 RMD160 0b183c796969896ac65e9ffb2dabff23b1b223a8 gle-3.0.1-r3.ebuild 934
 SHA256 344b3d48869845a8077c0246434e315e886c5f28e0ca168fe1affbaddadae01b gle-3.0.1-r3.ebuild 934
-EBUILD gle-3.1.0.ebuild 996 RMD160 0610382b8d48fa47f3bf6a5fec589c6b6bfd51f0 SHA1 506a2ecf44adbbe726d27dcb8b64bdd90f018bf2 SHA256 8af5f3c16bb3954c86081d7e569195b3210458c723db4728686bf4568b03ac9b
-MD5 a0ce5d44ebb6689af3c6b61d7c02b9a7 gle-3.1.0.ebuild 996
-RMD160 0610382b8d48fa47f3bf6a5fec589c6b6bfd51f0 gle-3.1.0.ebuild 996
-SHA256 8af5f3c16bb3954c86081d7e569195b3210458c723db4728686bf4568b03ac9b gle-3.1.0.ebuild 996
-MISC ChangeLog 2591 RMD160 40d593c96278a8c61f8d4ed510f495bb70d7efa9 SHA1 b4a8e168994aa0573b8b87fc5c18ec9b4e9edb87 SHA256 0213f40a6dffaf930657eadefab4a2cd7a2544089c448d66c3a546d7c2fcb412
-MD5 a226bff6e5429047bc0a674ee5754ecf ChangeLog 2591
-RMD160 40d593c96278a8c61f8d4ed510f495bb70d7efa9 ChangeLog 2591
-SHA256 0213f40a6dffaf930657eadefab4a2cd7a2544089c448d66c3a546d7c2fcb412 ChangeLog 2591
+EBUILD gle-3.1.0.ebuild 1106 RMD160 9439d6c2e4495926b832618e11cb326f86192671 SHA1 cf43aa50c4495e8964cb79d9d5b012700c142ed0 SHA256 638b29e36268c65a4eb1b7e0d57ed022b25728451586753ed9a13a85dd29a494
+MD5 fc6f938d85162bc6c6fbca1aaec4409c gle-3.1.0.ebuild 1106
+RMD160 9439d6c2e4495926b832618e11cb326f86192671 gle-3.1.0.ebuild 1106
+SHA256 638b29e36268c65a4eb1b7e0d57ed022b25728451586753ed9a13a85dd29a494 gle-3.1.0.ebuild 1106
+MISC ChangeLog 2859 RMD160 acec5265f985fbff3bb7b63ce87cb14ed6cfe14c SHA1 ea1043c056055a71f0ba5e4c08137ad598d50c84 SHA256 290d7f4647ffc331f188b6a4a7a4c84e27819380fecb9c05637215e850b4974b
+MD5 c605caa7b5824596436ec8549a388fd5 ChangeLog 2859
+RMD160 acec5265f985fbff3bb7b63ce87cb14ed6cfe14c ChangeLog 2859
+SHA256 290d7f4647ffc331f188b6a4a7a4c84e27819380fecb9c05637215e850b4974b ChangeLog 2859
 MISC metadata.xml 232 RMD160 d5631c839d64b79ea7accc9a23ca30d64436b467 SHA1 b156ecba642bb171bc77738f32368a539c073343 SHA256 970b4473653d994ae8485ef08554a47b5751f4d644c3be72505ada89777441d1
 MD5 a0aedff056c6404a3996c7ce04fe2784 metadata.xml 232
 RMD160 d5631c839d64b79ea7accc9a23ca30d64436b467 metadata.xml 232
diff --git a/media-libs/gle/files/gle-3.1.0-amd64-skip-example.patch b/media-libs/gle/files/gle-3.1.0-amd64-skip-example.patch
new file mode 100644
index 000000000000..c6d4c996f1b8
--- /dev/null
+++ b/media-libs/gle/files/gle-3.1.0-amd64-skip-example.patch
@@ -0,0 +1,65 @@
+diff -ur gle-3.1.0.orig/examples/Makefile.in gle-3.1.0/examples/Makefile.in
+--- gle-3.1.0.orig/examples/Makefile.in	2003-03-18 08:12:43.000000000 +0200
++++ gle-3.1.0/examples/Makefile.in	2006-07-26 15:37:25.000000000 +0300
+@@ -74,10 +74,9 @@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ 
+-noinst_PROGRAMS =    alpha		  beam		  candlestick     cone            cylinder        helix           helix2          helix3          helix4          helixtex        horn            joincone        joinoffset      joinstyle       screw           taper           texas           transport       twistoid        twistex         twoid
++noinst_PROGRAMS =    beam		  candlestick     cone            cylinder        helix           helix2          helix3          helix4          helixtex        horn            joincone        joinoffset      joinstyle       screw           taper           texas           transport       twistoid        twistex         twoid
+ 
+ 
+-alpha_SOURCES = alpha.c mainjoin.c
+ beam_SOURCES = beam.c mainsimple.c
+ cone_SOURCES = cone.c mainsimple.c
+ cylinder_SOURCES = cylinder.c mainsimple.c
+@@ -114,7 +113,7 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
+-noinst_PROGRAMS =  alpha$(EXEEXT) beam$(EXEEXT) candlestick$(EXEEXT) \
++noinst_PROGRAMS =  beam$(EXEEXT) candlestick$(EXEEXT) \
+ cone$(EXEEXT) cylinder$(EXEEXT) helix$(EXEEXT) helix2$(EXEEXT) \
+ helix3$(EXEEXT) helix4$(EXEEXT) helixtex$(EXEEXT) horn$(EXEEXT) \
+ joincone$(EXEEXT) joinoffset$(EXEEXT) joinstyle$(EXEEXT) screw$(EXEEXT) \
+@@ -131,10 +130,6 @@
+ X_LIBS = @X_LIBS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-alpha_OBJECTS =  alpha.$(OBJEXT) mainjoin.$(OBJEXT)
+-alpha_LDADD = $(LDADD)
+-alpha_DEPENDENCIES = 
+-alpha_LDFLAGS = 
+ beam_OBJECTS =  beam.$(OBJEXT) mainsimple.$(OBJEXT)
+ beam_LDADD = $(LDADD)
+ beam_DEPENDENCIES = 
+@@ -236,8 +231,8 @@
+ 
+ TAR = tar
+ GZIP_ENV = --best
+-SOURCES = $(alpha_SOURCES) $(beam_SOURCES) candlestick.c $(cone_SOURCES) $(cylinder_SOURCES) $(helix_SOURCES) $(helix2_SOURCES) $(helix3_SOURCES) $(helix4_SOURCES) $(helixtex_SOURCES) $(horn_SOURCES) $(joincone_SOURCES) $(joinoffset_SOURCES) $(joinstyle_SOURCES) $(screw_SOURCES) $(taper_SOURCES) $(texas_SOURCES) transport.c $(twistoid_SOURCES) $(twistex_SOURCES) twoid.c
+-OBJECTS = $(alpha_OBJECTS) $(beam_OBJECTS) candlestick.$(OBJEXT) $(cone_OBJECTS) $(cylinder_OBJECTS) $(helix_OBJECTS) $(helix2_OBJECTS) $(helix3_OBJECTS) $(helix4_OBJECTS) $(helixtex_OBJECTS) $(horn_OBJECTS) $(joincone_OBJECTS) $(joinoffset_OBJECTS) $(joinstyle_OBJECTS) $(screw_OBJECTS) $(taper_OBJECTS) $(texas_OBJECTS) transport.$(OBJEXT) $(twistoid_OBJECTS) $(twistex_OBJECTS) twoid.$(OBJEXT)
++SOURCES = $(beam_SOURCES) candlestick.c $(cone_SOURCES) $(cylinder_SOURCES) $(helix_SOURCES) $(helix2_SOURCES) $(helix3_SOURCES) $(helix4_SOURCES) $(helixtex_SOURCES) $(horn_SOURCES) $(joincone_SOURCES) $(joinoffset_SOURCES) $(joinstyle_SOURCES) $(screw_SOURCES) $(taper_SOURCES) $(texas_SOURCES) transport.c $(twistoid_SOURCES) $(twistex_SOURCES) twoid.c
++OBJECTS = $(beam_OBJECTS) candlestick.$(OBJEXT) $(cone_OBJECTS) $(cylinder_OBJECTS) $(helix_OBJECTS) $(helix2_OBJECTS) $(helix3_OBJECTS) $(helix4_OBJECTS) $(helixtex_OBJECTS) $(horn_OBJECTS) $(joincone_OBJECTS) $(joinoffset_OBJECTS) $(joinstyle_OBJECTS) $(screw_OBJECTS) $(taper_OBJECTS) $(texas_OBJECTS) transport.$(OBJEXT) $(twistoid_OBJECTS) $(twistex_OBJECTS) twoid.$(OBJEXT)
+ 
+ all: all-redirect
+ .SUFFIXES:
+@@ -303,10 +298,6 @@
+ 
+ maintainer-clean-libtool:
+ 
+-alpha$(EXEEXT): $(alpha_OBJECTS) $(alpha_DEPENDENCIES)
+-	@rm -f alpha$(EXEEXT)
+-	$(LINK) $(alpha_LDFLAGS) $(alpha_OBJECTS) $(alpha_LDADD) $(LIBS)
+-
+ beam$(EXEEXT): $(beam_OBJECTS) $(beam_DEPENDENCIES)
+ 	@rm -f beam$(EXEEXT)
+ 	$(LINK) $(beam_LDFLAGS) $(beam_OBJECTS) $(beam_LDADD) $(LIBS)
+@@ -450,7 +441,6 @@
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-alpha.o: alpha.c ../GL/gle.h main.h
+ beam.o: beam.c ../GL/gle.h main.h
+ candlestick.o: candlestick.c ../GL/gle.h main.h
+ cone.o: cone.c ../GL/gle.h main.h
diff --git a/media-libs/gle/gle-3.1.0.ebuild b/media-libs/gle/gle-3.1.0.ebuild
index 432ef3fbce79..3af1bc0faa2b 100644
--- a/media-libs/gle/gle-3.1.0.ebuild
+++ b/media-libs/gle/gle-3.1.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/gle-3.1.0.ebuild,v 1.1 2006/07/25 18:49:02 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/gle-3.1.0.ebuild,v 1.2 2006/07/26 13:23:50 chutzpah Exp $
+
+inherit eutils
 
 DESCRIPTION="GL extrusion library"
 HOMEPAGE="http://www.linas.org/gle"
@@ -22,6 +24,12 @@ DEPEND="virtual/opengl
 	)
 	<virtual/x11-7 )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-amd64-skip-example.patch
+}
+
 src_compile() {
 	# Replace inclusion of malloc.h with stdlib.h as needed by Mac OS X and
 	# FreeBSD.