Removed old, respect user's CFLAGS

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 22 insertions, 43 deletions

diff --git a/sci-visualization/xgraph/ChangeLog b/sci-visualization/xgraph/ChangeLog
index a5b25b36d039..81f239cf34db 100644
--- a/sci-visualization/xgraph/ChangeLog
+++ b/sci-visualization/xgraph/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/xgraph
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xgraph/ChangeLog,v 1.13 2009/12/26 16:19:05 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xgraph/ChangeLog,v 1.14 2010/01/06 01:21:00 bicatali Exp $
+
+  06 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -xgraph-12.1-r1.ebuild, xgraph-12.1-r2.ebuild:
+  Removed old, respect user's CFLAGS
 
   26 Dec 2009; Raúl Porcel <armin76@gentoo.org> xgraph-12.1-r2.ebuild:
   sparc stable wrt #289447
diff --git a/sci-visualization/xgraph/Manifest b/sci-visualization/xgraph/Manifest
index e2a0db2c3a11..eb8586a7d6c0 100644
--- a/sci-visualization/xgraph/Manifest
+++ b/sci-visualization/xgraph/Manifest
@@ -1,8 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xgraph-12.1-glibc-2.10.patch 975 RMD160 6d6c70f0f6e750e6423e2ad4ed2c5a96b2e23030 SHA1 3650cb17abe27d7367592944c13e8048070a110e SHA256 ea2442a072e35c19eda63a606b05e6f3eb0542d6a995662e85341058fbf6f824
 AUX xgraph-makefile-gentoo.patch 514 RMD160 84346d114d2f1180c2daf0c8b1160a53ee072560 SHA1 0d9053fa98de1f05a7427b8dbea332036ed5639f SHA256 9860b8650414d6dcd82b49f465abb050174190f1d08cae63fe99ccf248ed7d2e
 DIST xgraph-12.1.tar.gz 145278 RMD160 54bdc337f98ccdb4ee5e7321d833d71d70391e45 SHA1 413e0790c57b9ce584e38848e652a00e6fd4bc23 SHA256 0aa17d3fa3abfa8b6679fc26812a988332a2a0f1f48973d17429089015672b08
 DIST xgraph_12.1-10.diff.gz 48172 RMD160 df91b059ee1d8079c6f9ce8acdb1fd9722227453 SHA1 0a6a7746d1c40ae0e9d776e64752c7dc86e44373 SHA256 5f0ee8dededaafb054b3d87431acc9b1b6486b8375775aac889d993e35f4e8d5
-EBUILD xgraph-12.1-r1.ebuild 1051 RMD160 789284aa0d177ff04feeee250e3cdfb9d9c68141 SHA1 85482dd8aa0ceda86f99c40b857c4c8a23ff1b34 SHA256 18e96aa25f9f9abc43ed42c12c67b2ae1dae163a3706272ffd87b187936b6051
-EBUILD xgraph-12.1-r2.ebuild 1194 RMD160 91702a267c129e7bcfc7465b37df493cd4cbeeb0 SHA1 a53f0e32e4043f6ac21c5d57d6d5cb8dc810c003 SHA256 3b7ebc68e0578e1c32adac4261ecadcaeef7fe7c447c21f5bd84dd08e76d1ac9
-MISC ChangeLog 2409 RMD160 6415571e78a525db0fc0116cbe2b252293847509 SHA1 212a594017050094eea7e2e7fd4ad2219340641e SHA256 b1adc518c99afb9407910c3ea853f607f28b43ad5a613532b5fb857303805b0c
+EBUILD xgraph-12.1-r2.ebuild 1258 RMD160 ccf185554da4a9f3eec9ba4e667fa63133608aae SHA1 0094ebf118f7bdb38d92c8e2043eea78e3f70f66 SHA256 0df1b5162d314d4dcd8c5bdc213e3ad1a28b73e01ad74b5dfa26c6953455ac8e
+MISC ChangeLog 2552 RMD160 1c5adb6f59842c93b6f1f05ddfc71658a200022c SHA1 cce35b714554c70f6b833cb4cabaa014eb7237e4 SHA256 3f5c2705b53f354672f1f0b7f16dc926bc0db213edef6b5edc409ccf389a855a
 MISC metadata.xml 672 RMD160 814624a42995b899aa96afdc6b7fb8eb83bea5d7 SHA1 ee57db5839bede4a26ed0e137671d83f6834ea78 SHA256 80ef43932386e837edb5e5fbc41a0fe5293f7f4ca100802d92d3f2836f693e93
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktD7jkACgkQ1ycZbhPLE2DGoACfVHaR2vLrc7fzqqha/i3KRx9N
+5JsAnA9nL6yBk42MEgMTfvZ8Ls2YmpMh
+=wn/9
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/xgraph/xgraph-12.1-r1.ebuild b/sci-visualization/xgraph/xgraph-12.1-r1.ebuild
deleted file mode 100644
index 088de255be85..000000000000
--- a/sci-visualization/xgraph/xgraph-12.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 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.5 2008/02/06 21:43:31 grobian Exp $
-
-inherit eutils
-
-DESCRIPTION="X11 Plotting Utility"
-HOMEPAGE="http://www.isi.edu/nsnam/xgraph/"
-SRC_URI="http://www.isi.edu/nsnam/dist/${P}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc ~x86"
-IUSE=""
-DEPEND="x11-libs/libSM
-		x11-libs/libX11"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PN}-makefile-gentoo.patch
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Compilation failed."
-
-	dodoc README* INSTALL || die "Installing documentation failed."
-
-	insinto /usr/share/${PN}/examples
-	doins examples/* || die "Failed to install example files."
-
-	dodir /usr/share/man/man1
-	mv "${D}"/usr/share/man/manm/xgraph.man \
-		"${D}"/usr/share/man/man1/xgraph.1 || \
-		die "Failed to correct man page location."
-	rm -Rf "${D}"/usr/share/man/manm/ || \
-		die "Failed to remove bogus manm directory."
-}
diff --git a/sci-visualization/xgraph/xgraph-12.1-r2.ebuild b/sci-visualization/xgraph/xgraph-12.1-r2.ebuild
index cdb1f45af6c3..e4e0db22233f 100644
--- a/sci-visualization/xgraph/xgraph-12.1-r2.ebuild
+++ b/sci-visualization/xgraph/xgraph-12.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xgraph/xgraph-12.1-r2.ebuild,v 1.5 2009/12/26 16:19:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xgraph/xgraph-12.1-r2.ebuild,v 1.6 2010/01/06 01:21:00 bicatali Exp $
 
 EAPI=2
 inherit eutils autotools
@@ -22,6 +22,8 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	epatch "${WORKDIR}"/${PN}_${PV}-${DEB_PR}.diff
 	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+	# respect user flags
+	sed -i -e "s/-g/${CFLAGS}/" Makefile.am
 	eautoreconf
 }