Added fix so make finds netpbm includes (see bug #210861).

Package-Manager: portage-2.1.4.4

5 files changed, 46 insertions, 9 deletions

diff --git a/sci-libs/gts/ChangeLog b/sci-libs/gts/ChangeLog
index 2f100e9aef08..0ce15c09279c 100644
--- a/sci-libs/gts/ChangeLog
+++ b/sci-libs/gts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/gts
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/ChangeLog,v 1.6 2007/02/22 01:20:21 jokey Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/ChangeLog,v 1.7 2008/02/20 14:23:12 markusle Exp $
+
+  20 Feb 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/gts-0.7.6-include-fix.patch, gts-0.7.6.ebuild:
+  Added fix so make finds netpbm includes (see bug #210861).
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/sci-libs/gts/Manifest b/sci-libs/gts/Manifest
index 5f83bece9e9d..f6acdcf8bba5 100644
--- a/sci-libs/gts/Manifest
+++ b/sci-libs/gts/Manifest
@@ -1,6 +1,7 @@
+AUX gts-0.7.6-include-fix.patch 1250 RMD160 6b804f6545e9441462c07d08de189de809a6206f SHA1 06e4aba9302c764b8bdb4cc14390e52a4e4345e7 SHA256 42f0cbe9f43d0a8605febd2b83a5e5fe08b2e2dfd6edf0a30f767c60e312ce50
 DIST gts-0.7.4.tar.gz 947253 RMD160 f64e0ed8af885c50e0d4e66e33b764e17cdaac87 SHA1 25cf578d1cdd7ad5ba938b5c472ad6dba2cbf250 SHA256 5d6dde8bc4e7fc4ac0495a89153e5ceca3e56ff0c42806ca242882a1628b6cad
 DIST gts-0.7.6.tar.gz 948847 RMD160 2bfd4121412c16d63ee0aca65ccbc2601d6a7d51 SHA1 000720bebecf0b153eb28260bd30fbd979dcc040 SHA256 059c3e13e3e3b796d775ec9f96abdce8f2b3b5144df8514eda0cc12e13e8b81e
-EBUILD gts-0.7.4.ebuild 809 RMD160 58b5ac3df52b4bcd2e89353a2327827199275e0e SHA1 e86d83c63690deeb0b4182cab970657fe932ebea SHA256 506ae92cebc7291c741431859982bdd1cf498c00f2f9fc3257f17eec294713c2
-EBUILD gts-0.7.6.ebuild 1098 RMD160 39d5a2a85c1a8a75f80a3c5eea09e43f514bcf57 SHA1 1ff8315c0c8c6e04a62070616e3811a9bf0cd275 SHA256 8d29a1f6e8824e2fd3a72e31578ecb68d6b7b0c6e1c899dd130418df8218d81d
-MISC ChangeLog 909 RMD160 ce917ca10c498dbfb539e8d0cd968ff3f2d05283 SHA1 8f51d7205974fdb08ab3e762745cdfa22c8b452d SHA256 2fbc6c29a6fcaba8de51e1873cafe46c7cca34b5c1b934d61a7f315213a0fc72
+EBUILD gts-0.7.4.ebuild 808 RMD160 8daab9efcf0d9189f722f002cee19e22521dc9f6 SHA1 a27c16b409ff83ba8d2c9140b5f4911e1e7f794d SHA256 f75a1c13ca163c5b2e5929becfe30fcff0c98b5a062bfacac5b7132d3f27521e
+EBUILD gts-0.7.6.ebuild 1200 RMD160 dac17942d4a0f767683e440499f2feaa5418f11d SHA1 3d621916fbd4ad540ced75d9f3398d76d7ac315f SHA256 201630195d8443be50baad60eb6ee44627c41e7de7e6b06c3b28f8b3543b71b6
+MISC ChangeLog 1083 RMD160 7a9040e736f7058d2bea1a1edf2b73f927e5d714 SHA1 5fea8891f9525fe3d6948df080bd7676434e06c5 SHA256 e6dcb5a75a46c35900dc9ca2bb760d2bdda24dcf7247812d046d106a2b4a8565
 MISC metadata.xml 254 RMD160 991c43f74018cbcaaa60b41290c912a8b61091c8 SHA1 83928b80dc644941d59b64e04e0964b1c1fa3005 SHA256 80784c7acbd54102b4d3fc01c3fb2ae5862732093798671596c67a8350c25454
diff --git a/sci-libs/gts/files/gts-0.7.6-include-fix.patch b/sci-libs/gts/files/gts-0.7.6-include-fix.patch
new file mode 100644
index 000000000000..eec61fafcc4f
--- /dev/null
+++ b/sci-libs/gts/files/gts-0.7.6-include-fix.patch
@@ -0,0 +1,24 @@
+diff -Naur gts-0.7.6/examples/Makefile.in gts-0.7.6.new/examples/Makefile.in
+--- gts-0.7.6/examples/Makefile.in	2006-03-09 19:31:05.000000000 -0500
++++ gts-0.7.6.new/examples/Makefile.in	2008-02-20 09:08:47.000000000 -0500
+@@ -139,7 +139,7 @@
+ volume_OBJECTS = volume.$(OBJEXT)
+ volume_LDADD = $(LDADD)
+ volume_DEPENDENCIES = $(top_builddir)/src/libgts.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I/usr/include/netpbm
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cartesian.Po \
+diff -Naur gts-0.7.6/src/Makefile.in gts-0.7.6.new/src/Makefile.in
+--- gts-0.7.6/src/Makefile.in	2006-03-09 19:31:05.000000000 -0500
++++ gts-0.7.6.new/src/Makefile.in	2008-02-20 09:08:17.000000000 -0500
+@@ -354,7 +354,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libgts.la: $(libgts_la_OBJECTS) $(libgts_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(libdir) $(libgts_la_LDFLAGS) $(libgts_la_OBJECTS) $(libgts_la_LIBADD) $(LIBS)
++	$(LINK) -rpath $(libdir) $(libgts_la_LDFLAGS) $(libgts_la_OBJECTS) $(libgts_la_LIBADD) $(LIBS) -lm
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
diff --git a/sci-libs/gts/gts-0.7.4.ebuild b/sci-libs/gts/gts-0.7.4.ebuild
index f6fe00df1623..a10531211d2f 100644
--- a/sci-libs/gts/gts-0.7.4.ebuild
+++ b/sci-libs/gts/gts-0.7.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-0.7.4.ebuild,v 1.3 2007/07/13 06:57:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-0.7.4.ebuild,v 1.4 2008/02/20 14:23:12 markusle Exp $
 
 DESCRIPTION="GNU Triangulated Surface Library"
 LICENSE="LGPL-2"
diff --git a/sci-libs/gts/gts-0.7.6.ebuild b/sci-libs/gts/gts-0.7.6.ebuild
index 8c8dac966528..e53131a06ecc 100644
--- a/sci-libs/gts/gts-0.7.6.ebuild
+++ b/sci-libs/gts/gts-0.7.6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-0.7.6.ebuild,v 1.3 2007/07/13 06:57:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-0.7.6.ebuild,v 1.4 2008/02/20 14:23:12 markusle Exp $
+
+inherit eutils
 
 DESCRIPTION="GNU Triangulated Surface Library"
 LICENSE="LGPL-2"
@@ -16,6 +18,12 @@ DEPEND=">=dev-libs/glib-2.4.0
 		sys-devel/libtool
 		dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-include-fix.patch
+}
+
 src_compile() {
 	econf || die "Configure failed"
 	emake || die "Make failed"