Respect LDFLAGS wrt bug 333873. Thanks to Diego for report. Remove old.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 59 insertions, 123 deletions

diff --git a/sci-mathematics/gretl/ChangeLog b/sci-mathematics/gretl/ChangeLog
index b1f8cd8e1df2..adc54421d4e8 100644
--- a/sci-mathematics/gretl/ChangeLog
+++ b/sci-mathematics/gretl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/gretl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.24 2010/05/11 01:34:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.25 2010/08/22 08:34:34 xarthisius Exp $
+
+*gretl-1.9.0-r1 (22 Aug 2010)
+
+  22 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> -gretl-1.8.6.ebuild,
+  -gretl-1.9.0.ebuild, +gretl-1.9.0-r1.ebuild,
+  +files/gretl-1.9.0-ldflags.patch:
+  Respect LDFLAGS wrt bug 333873. Thanks to Diego for report. Remove old.
 
   11 May 2010; Sébastien Fabbro <bicatali@gentoo.org> gretl-1.9.0.ebuild:
   Removed TODO from dodoc
diff --git a/sci-mathematics/gretl/Manifest b/sci-mathematics/gretl/Manifest
index 01ae35e58527..09d6b4175ba0 100644
--- a/sci-mathematics/gretl/Manifest
+++ b/sci-mathematics/gretl/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50gretl-gentoo.el 473 RMD160 3b16bc41fe78a2e8b02a6d02624e74ae1f9c656e SHA1 c992256afbde18e06f5fc3c70ca7e0c7dafafc87 SHA256 7f5398d85016858044257a900e33d9441aa7a3981ac1d71feff79c26b03aa939
 AUX gretl-1.7.5-locale.patch 223 RMD160 2f20cfdf293e12d739797a0424f825dbc4534547 SHA1 36ca4b139f733672a6935406b6058003db9c03a5 SHA256 4633076ed483a595968cb495ef50f72f1a7c5a398acd8ebda907c89fef87d861
-DIST gretl-1.8.6.tar.bz2 6982571 RMD160 a6eac7f543b60dca6db25618de7ef9093d9f449e SHA1 dc648e86f9f6be4a80faf8e3e89bd8bef0f6b9fa SHA256 bdfbce0c3a8b136a4a06e67da916d57f6155b1b9d4658db7595fe1fb3c6d89d2
+AUX gretl-1.9.0-ldflags.patch 1064 RMD160 d8e4e969168af67b76fb60fa4b150b6351e99f02 SHA1 e833aa9bbf7fd00ec27c90846e039d97aca26636 SHA256 a5883dc6ce46c5892a7c2050689943f886197e23d0cdb106d0a50c354432e81d
 DIST gretl-1.9.0.tar.bz2 7497022 RMD160 91a086e875d5d1eeae6e70e15cf504578ee70924 SHA1 f17a7dcd11633a629367f3018e54c821e1cd66cc SHA256 f95c9dc464559e19837e65cc6fef626e573b76c5213597216214407181109d94
-EBUILD gretl-1.8.6.ebuild 2829 RMD160 eadfce3cfa3654f19440ce2d4a8ad230d3a16e3b SHA1 2947e23089a50bb6ce0f00486e8613b921a7910f SHA256 b1ff9c9642913324a0756e85d0535e3afd57d0fcbe58d5db2cbd15ce68586280
-EBUILD gretl-1.9.0.ebuild 3174 RMD160 904cce7882402d650b71f2fecb2eb31c316fcc3a SHA1 f7da9f66aecf29b0a88447c8e819c6e18c59dc77 SHA256 7cf1431c66940fcb3829e9fe69135f79dcc52f5a2f04a0c00042c91a43a9c54a
-MISC ChangeLog 4519 RMD160 fad4dd98da95d5e040e7c8c1c2d7228a67414f80 SHA1 0205cef48943bf902244c4c0f81e1d2f94e28ea9 SHA256 8bccac4dcd2d5f4da120ea72bf46b42a7731aa3e48fc11c3e13d230b4dfcd7f2
+EBUILD gretl-1.9.0-r1.ebuild 3240 RMD160 53482a0127a1d22e66e18118bc5c7926b07ac51d SHA1 ddc46771f5467de8cd8629bd69713c926ebf70ee SHA256 603428e951b0f4894667d06ddde9fbd99ec58e2ad38baa72465bfeb44e04ba28
+MISC ChangeLog 4785 RMD160 fe888cbccbfa174b6a37b05d1e0d10f39fcf4702 SHA1 e893de470228f1ef72bbc3e06576a659b08a071c SHA256 cb533f95d55fb4ce293d9a8f3f052264fcb835689874858ef12422bccae4ae82
 MISC metadata.xml 1019 RMD160 081129737d01e3b770f502faf5a58f6f7d038b00 SHA1 e4ac0899c6bb566adc9a390be56f81113a13b4db SHA256 ab32034694a6ec3b41bbae6c71eef42c6f64fafd79e79e2542843c5e9d3b8f03
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iJwEAQECAAYFAkxw4SMACgkQIiMqcbOVdxRG4QQAlQJtsc5l0JbDSY43eRlWIriQ
+0VAug42h66n5ezCZqfMsXAVFnZpR9gCETdKRauZxsDwSpNfAVoOxlp7h2VtZLAhA
+c/CWj8zpaJovh80ZaU1k6VJny1hx2Th+y+G6kazITCCfnQ0hwLbvamfjExW9VLj/
+nE7YIYxtjHuVhBIJU1E=
+=6I2o
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/gretl/files/gretl-1.9.0-ldflags.patch b/sci-mathematics/gretl/files/gretl-1.9.0-ldflags.patch
new file mode 100644
index 000000000000..2bfcc96c29aa
--- /dev/null
+++ b/sci-mathematics/gretl/files/gretl-1.9.0-ldflags.patch
@@ -0,0 +1,31 @@
+Respect LDFLAGS
+
+http://bugs.gentoo.org/333873
+https://sourceforge.net/tracker/?func=detail&aid=3050710&group_id=36234&atid=416803
+
+--- lib/Makefile.in
++++ lib/Makefile.in
+@@ -248,7 +248,7 @@
+ 
+ $(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)
+ 	$(LDECHO)
+-	$(AMP)$(LIBTOOL) --mode=link $(CCV) -o $@ $(LOBJS) $(AUX_LOBJ) \
++	$(AMP)$(LIBTOOL) --mode=link $(CCV) $(LDFLAGS) -o $@ $(LOBJS) $(AUX_LOBJ) \
+ 	-rpath $(RPATH) $(LIBS) -version-info $(CURRENT):$(REVISION):$(AGE)
+ 
+ .deps:
+--- plugin/Makefile.in
++++ plugin/Makefile.in
+@@ -54,10 +54,10 @@
+   CCECHO = @echo "  CC    $@"
+   LDECHO = @echo "  LD    $@" 
+   CCV = $(CC) > /dev/null
+-  LINK = $(LDECHO); $(LIBTOOL) --mode=link $(CCV) -module -avoid-version -rpath $(plugindir)
++  LINK = $(LDECHO); $(LIBTOOL) --mode=link $(CCV) $(LDFLAGS) -module -avoid-version -rpath $(plugindir)
+ else
+   CCV = $(CC)
+-  LINK = $(LIBTOOL) --mode=link $(CC) -module -avoid-version -rpath $(plugindir)
++  LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -module -avoid-version -rpath $(plugindir)
+ endif
+ 
+ GRETLINC = -I$(topsrc)/lib/src
diff --git a/sci-mathematics/gretl/gretl-1.8.6.ebuild b/sci-mathematics/gretl/gretl-1.8.6.ebuild
deleted file mode 100644
index a30748c5cf65..000000000000
--- a/sci-mathematics/gretl/gretl-1.8.6.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.8.6.ebuild,v 1.1 2009/12/14 22:33:36 bicatali Exp $
-
-USE_EINSTALL=true
-EAPI=2
-inherit eutils gnome2 elisp-common
-
-DESCRIPTION="Regression, econometrics and time-series library"
-HOMEPAGE="http://gretl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="accessibility emacs gmp gnome gtk nls odbc readline sourceview"
-
-RDEPEND="dev-libs/libxml2
-	dev-libs/glib:2
-	sci-visualization/gnuplot
-	virtual/lapack
-	virtual/latex-base
-	sci-libs/fftw:3.0
-	dev-libs/mpfr
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	accessibility? ( app-accessibility/flite )
-	gtk?  ( sci-visualization/gnuplot[gd]
-			media-libs/gd[png]
-			x11-libs/gtk+:2 )
-	gnome? ( sci-visualization/gnuplot[gd]
-			 media-libs/gd[png]
-			 gnome-base/libgnomeui
-			 gnome-base/libgnomeprint:2.2
-			 gnome-base/libgnomeprintui:2.2
-			 gnome-base/gconf:2 )
-	sourceview? ( x11-libs/gtksourceview )
-	odbc? ( dev-db/unixODBC )
-	emacs? ( virtual/emacs )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.7.5-locale.patch
-	# fix parallel make
-	sed -i \
-		-e 's/make/$(MAKE)/g' \
-		$(find . -name Makefile.in) || die
-}
-
-src_configure() {
-	local myconf
-	if use gtk; then
-		myconf="--enable-gui"
-		myconf="${myconf} $(use_with sourceview gtksourceview)"
-		myconf="${myconf} $(use_with gnome)"
-	else
-		myconf="--disable-gui --without-gnome --without-gtksourceview"
-	fi
-
-	econf \
-		--with-mpfr \
-		$(use_enable nls) \
-		$(use_with readline) \
-		$(use_with gmp) \
-		$(use_with odbc) \
-		$(use_with accessibility audio) \
-		${myconf} \
-		LAPACK_LIBS="$(pkg-config --libs lapack)"
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use emacs; then
-		elisp-compile utils/emacs/gretl.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	if use gnome; then
-		gnome2_src_install gnome_prefix="${D}"/usr svprefix="${D}usr"
-	else
-		einstall svprefix="${D}usr"
-	fi
-	if use gtk && ! use gnome; then
-		doicon gnome/gretl.png
-		make_desktop_entry gretl_x11 gretl
-	fi
-	if use emacs; then
-		elisp-install ${PN} utils/emacs/gretl.{el,elc} \
-			|| die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-	dodoc README README.audio ChangeLog CompatLog TODO \
-		|| die "dodoc failed"
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		elog "To begin using gretl-mode for all \".inp\" files that you edit,"
-		elog "add the following line to your \"~/.emacs\" file:"
-		elog "  (add-to-list 'auto-mode-alist '(\"\\\\.inp\\\\'\" . gretl-mode))"
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/gretl/gretl-1.9.0.ebuild b/sci-mathematics/gretl/gretl-1.9.0-r1.ebuild
index 31c42b837808..cba00413c13c 100644
--- a/sci-mathematics/gretl/gretl-1.9.0.ebuild
+++ b/sci-mathematics/gretl/gretl-1.9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.9.0.ebuild,v 1.2 2010/05/11 01:34:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.9.0-r1.ebuild,v 1.1 2010/08/22 08:34:34 xarthisius Exp $
 
 USE_EINSTALL=true
 EAPI=2
@@ -57,10 +57,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.7.5-locale.patch
-	# fix parallel make
+	epatch "${FILESDIR}"/${PN}-1.7.5-locale.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
+	# fix parallel make reported upstream
 	sed -i \
-		-e 's/make/$(MAKE)/g' \
+		-e 's/make -C/$(MAKE) -C/g' \
 		$(find . -name Makefile.in) || die
 }