Added patch to have makefile properly honor the user's CFLAGS. See bug #143661.

Package-Manager: portage-2.1.1_pre4-r4

4 files changed, 38 insertions, 10 deletions

diff --git a/sci-visualization/xgraph/ChangeLog b/sci-visualization/xgraph/ChangeLog
index 7540cff02a02..fe51c2637de4 100644
--- a/sci-visualization/xgraph/ChangeLog
+++ b/sci-visualization/xgraph/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/xgraph
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xgraph/ChangeLog,v 1.5 2006/08/12 03:10:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xgraph/ChangeLog,v 1.6 2006/08/12 14:16:21 markusle Exp $
+
+  12 Aug 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/xgraph-makefile-gentoo.patch, xgraph-12.1-r1.ebuild:
+  Added patch to have makefile properly honor the user's CFLAGS.
+  See bug #143661.
 
   12 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org> -xgraph-12.1.ebuild:
   clean out old, non-mod-X ebuild
diff --git a/sci-visualization/xgraph/Manifest b/sci-visualization/xgraph/Manifest
index 8391561be0b2..2b1cfb0f907f 100644
--- a/sci-visualization/xgraph/Manifest
+++ b/sci-visualization/xgraph/Manifest
@@ -1,12 +1,16 @@
+AUX xgraph-makefile-gentoo.patch 514 RMD160 84346d114d2f1180c2daf0c8b1160a53ee072560 SHA1 0d9053fa98de1f05a7427b8dbea332036ed5639f SHA256 9860b8650414d6dcd82b49f465abb050174190f1d08cae63fe99ccf248ed7d2e
+MD5 37ad555a352001757bf8203f7cbdabf6 files/xgraph-makefile-gentoo.patch 514
+RMD160 84346d114d2f1180c2daf0c8b1160a53ee072560 files/xgraph-makefile-gentoo.patch 514
+SHA256 9860b8650414d6dcd82b49f465abb050174190f1d08cae63fe99ccf248ed7d2e files/xgraph-makefile-gentoo.patch 514
 DIST xgraph-12.1.tar.gz 145278 RMD160 54bdc337f98ccdb4ee5e7321d833d71d70391e45 SHA1 413e0790c57b9ce584e38848e652a00e6fd4bc23 SHA256 0aa17d3fa3abfa8b6679fc26812a988332a2a0f1f48973d17429089015672b08
-EBUILD xgraph-12.1-r1.ebuild 988 RMD160 3e1162803745dbcd13ef39139d89231befeeef9f SHA1 bf2f5a1f2410e0cbd868ec5eb87039259501d57d SHA256 de62bda12db404a47308d2cf6d74370410d77791a0deade09c3bd6d35754fb82
-MD5 55b2d082edf2889ff9118617dad1f5b3 xgraph-12.1-r1.ebuild 988
-RMD160 3e1162803745dbcd13ef39139d89231befeeef9f xgraph-12.1-r1.ebuild 988
-SHA256 de62bda12db404a47308d2cf6d74370410d77791a0deade09c3bd6d35754fb82 xgraph-12.1-r1.ebuild 988
-MISC ChangeLog 1335 RMD160 40a9cbacbcd64c40908c78bc6e6d8b703e026fff SHA1 2cf2dce71547eb1e9c454e1d44db738fa4a078bb SHA256 77eaa71fc50ce518aa0df0d8e9a07b32b2098f7c6f30aa0420eb62685e1026e0
-MD5 8799672859b660aac7f7a223c3f3efeb ChangeLog 1335
-RMD160 40a9cbacbcd64c40908c78bc6e6d8b703e026fff ChangeLog 1335
-SHA256 77eaa71fc50ce518aa0df0d8e9a07b32b2098f7c6f30aa0420eb62685e1026e0 ChangeLog 1335
+EBUILD xgraph-12.1-r1.ebuild 1088 RMD160 38111fcfa54f0bb6311caa0190aad02a07a9444c SHA1 09f309a58be72fc1cd098b60b4c5ae11ca0376da SHA256 52d9bc837177276d567275b39c6c23e9c1936f0ebedec6630f19c04946e1a532
+MD5 7903d6dda37b6e67a34478a4e4d0fab4 xgraph-12.1-r1.ebuild 1088
+RMD160 38111fcfa54f0bb6311caa0190aad02a07a9444c xgraph-12.1-r1.ebuild 1088
+SHA256 52d9bc837177276d567275b39c6c23e9c1936f0ebedec6630f19c04946e1a532 xgraph-12.1-r1.ebuild 1088
+MISC ChangeLog 1534 RMD160 a583a496b117e9ccd0970ab1b7edba5df8e631eb SHA1 83fcce89542ff219e2c07f90a7660820f10dce82 SHA256 04aea23bed463bcc711578202529ccd98ee64d049f7f353f69eb63fd6a2cac97
+MD5 6e7d18dd39697f63842d459ae3268e01 ChangeLog 1534
+RMD160 a583a496b117e9ccd0970ab1b7edba5df8e631eb ChangeLog 1534
+SHA256 04aea23bed463bcc711578202529ccd98ee64d049f7f353f69eb63fd6a2cac97 ChangeLog 1534
 MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac
 MD5 0ffcd41aa96cf1bcffd8b539c27957db metadata.xml 157
 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 metadata.xml 157
diff --git a/sci-visualization/xgraph/files/xgraph-makefile-gentoo.patch b/sci-visualization/xgraph/files/xgraph-makefile-gentoo.patch
new file mode 100644
index 000000000000..e863742994d7
--- /dev/null
+++ b/sci-visualization/xgraph/files/xgraph-makefile-gentoo.patch
@@ -0,0 +1,12 @@
+diff -Naur xgraph-12.1/Makefile.in xgraph-12.1-new/Makefile.in
+--- xgraph-12.1/Makefile.in	1999-12-20 16:40:32.000000000 -0500
++++ xgraph-12.1-new/Makefile.in	2006-08-12 10:04:18.000000000 -0400
+@@ -80,7 +80,7 @@
+ 
+ # C_WARNINGS = -Wall
+ C_WARNINGS = 
+-CFLAGS = $(ADDITIONAL_INCLUDES)  $(C_WARNINGS) -g  $(X_CFLAGS) 
++CFLAGS = $(ADDITIONAL_INCLUDES)  $(C_WARNINGS) @CFLAGS@  $(X_CFLAGS) 
+ 
+ xgraph_LDADD = $(ADDITIONAL_LIBS) $(X_LIBS) $(X_PRE_LIBS) $(X_EXTRA_LIBS) -lX11 -lm
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/sci-visualization/xgraph/xgraph-12.1-r1.ebuild b/sci-visualization/xgraph/xgraph-12.1-r1.ebuild
index 80d629ddb79d..b8a9d94f0558 100644
--- a/sci-visualization/xgraph/xgraph-12.1-r1.ebuild
+++ b/sci-visualization/xgraph/xgraph-12.1-r1.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/sci-visualization/xgraph/xgraph-12.1-r1.ebuild,v 1.2 2006/08/12 03:08:09 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xgraph/xgraph-12.1-r1.ebuild,v 1.3 2006/08/12 14:16:21 markusle Exp $
+
+inherit eutils
 
 DESCRIPTION="X11 Plotting Utility"
 HOMEPAGE="http://www.isi.edu/nsnam/xgraph/"
@@ -14,6 +16,11 @@ DEPEND="|| ( ( x11-libs/libSM
 	)
 	virtual/x11 )"
 
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${PN}-makefile-gentoo.patch
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die "Compilation failed."