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

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 44 insertions, 119 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/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
 }