summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-mathematics/gretl')
-rw-r--r--sci-mathematics/gretl/ChangeLog10
-rw-r--r--sci-mathematics/gretl/Manifest16
-rw-r--r--sci-mathematics/gretl/files/gretl-1.7.6-ldflags.patch80
-rw-r--r--sci-mathematics/gretl/files/gretl-1.8.0-ldflags.patch20
-rw-r--r--sci-mathematics/gretl/files/gretl-1.8.2-ldflags.patch288
-rw-r--r--sci-mathematics/gretl/gretl-1.8.2.ebuild (renamed from sci-mathematics/gretl/gretl-1.8.0.ebuild)6
6 files changed, 315 insertions, 105 deletions
diff --git a/sci-mathematics/gretl/ChangeLog b/sci-mathematics/gretl/ChangeLog
index d4b4bb9753ec..74ebd5c57aaa 100644
--- a/sci-mathematics/gretl/ChangeLog
+++ b/sci-mathematics/gretl/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for sci-mathematics/gretl
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.18 2009/06/22 18:53:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.19 2009/08/07 15:42:18 bicatali Exp $
+
+*gretl-1.8.2 (07 Aug 2009)
+
+ 07 Aug 2009; SĂ©bastien Fabbro <bicatali@gentoo.org>
+ -files/gretl-1.7.6-ldflags.patch, -gretl-1.8.0.ebuild,
+ files/gretl-1.8.0-ldflags.patch, +gretl-1.8.2.ebuild,
+ +files/gretl-1.8.2-ldflags.patch:
+ Version bump. More flags fixes
*gretl-1.8.1 (22 Jun 2009)
diff --git a/sci-mathematics/gretl/Manifest b/sci-mathematics/gretl/Manifest
index c1c59ff1ffe2..04759c7041ec 100644
--- a/sci-mathematics/gretl/Manifest
+++ b/sci-mathematics/gretl/Manifest
@@ -3,19 +3,19 @@ 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
-AUX gretl-1.7.6-ldflags.patch 2685 RMD160 780b333055b054caf8ad0195dfa2d6081cd0b79a SHA1 e87984593d300dae968c3e0c9cec29e6852216ab SHA256 3abbcfcf5c00850476b4cdb5d3e96a693505cd003b71a1c42d4a2ccdd96abb5a
AUX gretl-1.7.9-nls.patch 407 RMD160 10602ff5982d2c70a14f0d1db695bff84d32451a SHA1 5f35fa2e7434e9ea2ea20f0be9b69bee7859b7ae SHA256 182503ec631f653ed620179ae92d81729d03c7cd7967462a9d59119e4cddf8d8
-AUX gretl-1.8.0-ldflags.patch 2672 RMD160 1f0d8eebea9b49153e859c1c3b55af2589ff62b7 SHA1 7532de44f5e7b9ed6edd756a28610b31f9da1fc5 SHA256 5286b80cebcfe630163385afe85a6076209a5fada5fa6bf60ba6812d2eea64fc
-DIST gretl-1.8.0.tar.bz2 6286262 RMD160 df2fce03e87450572a4875f6fb12569a34d46581 SHA1 ec9f4e8466bef7e64b0916b1d218094da68cc38e SHA256 a5759591f8a456adde25438894367e3809e31e39c53fcb1eea46f934ee06cd71
+AUX gretl-1.8.0-ldflags.patch 2284 RMD160 2d962e9a15037e06684b5d12113e90d5459a3b24 SHA1 596e0552fbda31afa4a774f7cfe662fc46b71297 SHA256 b2d520d04cf977e179a73c6c90211aa108c904757b95722c889f396d982b6f48
+AUX gretl-1.8.2-ldflags.patch 7657 RMD160 097ecad79b848162886efd3304575e915f7c9c89 SHA1 71b8e72c77bc731f22ccea55388e6d999717d9bc SHA256 3685cbf085fd8171194e7f0c2db3b6907e22dbe9133d4c352a4ba3647ec69d73
DIST gretl-1.8.1.tar.bz2 6777140 RMD160 e993e8dea1e2e467b3c572c3f32582311ee89424 SHA1 04e9e42beeafc48470481fe1fcac1fc5b27c1d9a SHA256 62d6b648ceca2a9b89e384b28943da78155873266307c28b7e15e7af5289b426
-EBUILD gretl-1.8.0.ebuild 2829 RMD160 067befb3b8e5696ae52888073c6c4af9e2d900ff SHA1 891dc1e1550490424b613c8cafabb66f570b3286 SHA256 4ad66dee3eac7613e943ef12faeaeec1d5e5f888c5cdbc9ba402ec018d07e5ff
+DIST gretl-1.8.2.tar.bz2 6845908 RMD160 77c8b632f647a90af2efb11d1ddc70de3555c16d SHA1 00d666c059a1290dea0a43657511b6953d32e0ab SHA256 5ab5c4bb191b13723016d3ecbb4c4b29728a6d62eeebabf014c8e1e4dbed2e10
EBUILD gretl-1.8.1.ebuild 2829 RMD160 99f3282e8562de8bc100200e3442fc413db6b756 SHA1 f4592c685bd8cf8ba82b58873517765a7760a91c SHA256 b06568cf340bb3ba9ec400559bdda459db4b1e8e1afe06f0a61360c307c21746
-MISC ChangeLog 3438 RMD160 11fdf4ab8dd2c33cfe16dede10466de3a7563452 SHA1 4645704fb7a19ca06c13672143d26c08aec2d850 SHA256 d0b164555f40e13b2093d665210418d7c36a7522c9830194c40ad0578cb08072
+EBUILD gretl-1.8.2.ebuild 2827 RMD160 bbeb4bfa68bfd49096204d2c50d590fcfa56c969 SHA1 0ef3c3279550753260c630169bfb0a74df7ae4ab SHA256 82cda82e44db3049aae78e8a7caa4c354a299b7d9b9cd05bdb398d6d79ccfa4c
+MISC ChangeLog 3704 RMD160 c82020063459429059f17dcc367ce5eb63aa8264 SHA1 9e8128d95e448e7e65f0f94ea86bf7ce4a553c43 SHA256 733e4215548d4e77807027fb39849931c3a087b6c9ab0fc47acd791c76300dc8
MISC metadata.xml 954 RMD160 907c798b9bfe3ca362a255261ba77633e680a940 SHA1 80a02212a2bfe2576d5a209172a730832ede96a2 SHA256 4f4ef8549a7e73d05ae7640a9d847eb96fb343fcf1b0ebd457aaffc2325f5014
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAko/0ykACgkQ1ycZbhPLE2BvyQCgiPZPo+tinznuwtn2bGVaZK7y
-6y4AmgMbl9kKP9kMBhJmNoajOc8BVW/l
-=LgKC
+iEYEARECAAYFAkp8S2MACgkQ1ycZbhPLE2AQtACfZykD+ZBFjCUFt3KrKADigHZ3
+RgcAn3ksPrXxvIkaTR+sW6OZ0piXSl7q
+=uE+7
-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/gretl/files/gretl-1.7.6-ldflags.patch b/sci-mathematics/gretl/files/gretl-1.7.6-ldflags.patch
deleted file mode 100644
index f0d32d543832..000000000000
--- a/sci-mathematics/gretl/files/gretl-1.7.6-ldflags.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -Naur gretl-1.7.6/cli/Makefile.in gretl-1.7.6.new/cli/Makefile.in
---- gretl-1.7.6/cli/Makefile.in 2008-03-24 08:46:11.000000000 -0400
-+++ gretl-1.7.6.new/cli/Makefile.in 2008-08-08 09:18:44.000000000 -0400
-@@ -3,6 +3,7 @@
-
- CC = @CC@
- CFLAGS = @CFLAGS@
-+LDFLAGS = @LDFLAGS@
- MAKE = @MAKE@
- INSTALL = @INSTALL@
-
-@@ -51,7 +52,7 @@
- $(CC) $(CFLAGS) -MM $< > .deps/$*.d
-
- $(CLI): .deps $(OBJS)
-- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(GRETLLIB) $(READLINE_LIBS)
-+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(GRETLLIB) $(READLINE_LIBS)
-
- .deps:
- mkdir $@
-diff -Naur gretl-1.7.6/gui2/Makefile.in gretl-1.7.6.new/gui2/Makefile.in
---- gretl-1.7.6/gui2/Makefile.in 2008-07-29 13:58:41.000000000 -0400
-+++ gretl-1.7.6.new/gui2/Makefile.in 2008-08-08 09:17:52.000000000 -0400
-@@ -7,6 +7,7 @@
- libdir = @libdir@
- CC = @CC@
- CFLAGS = @CFLAGS@
-+LDFLAGS = @LDFLAGS@
- MAKE = @MAKE@
- INSTALL = @INSTALL@
- LN = @LN_S@
-@@ -175,7 +176,7 @@
- $(CC) $(CFLAGS) -MM $< > .deps/$*.d
-
- $(PROG): .deps $(OBJS) $(HACK_OBJ) $(GTKEXTRA_LITE) $(GTKSOURCEVIEW_LITE)
-- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB) $(CARBONLIB)
-+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB) $(CARBONLIB)
-
- $(HACK_OBJ): $(HACK_SRC) $(HACK_HDR)
- $(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<
-diff -Naur gretl-1.7.6/lib/Makefile.in gretl-1.7.6.new/lib/Makefile.in
---- gretl-1.7.6/lib/Makefile.in 2008-05-24 21:40:28.000000000 -0400
-+++ gretl-1.7.6.new/lib/Makefile.in 2008-08-08 09:16:48.000000000 -0400
-@@ -6,6 +6,7 @@
- bindir = @bindir@
- CC = @CC@
- CFLAGS = @CFLAGS@
-+LDFLAGS = @LDFLAGS@
- MAKE = @MAKE@
- INSTALL = @INSTALL@
- LN = @LN_S@
-@@ -227,7 +228,7 @@
- $(CC) $(CFLAGS) -MM -MT $*.lo $< > .deps/$*.d
-
- $(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)
-- $(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(AUX_LOBJ) \
-+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(LOBJS) $(AUX_LOBJ) \
- -rpath $(prefix)/lib $(LIBS) \
- -version-info $(CURRENT):$(REVISION):$(AGE)
-
-diff -Naur gretl-1.7.6/plugin/Makefile.in gretl-1.7.6.new/plugin/Makefile.in
---- gretl-1.7.6/plugin/Makefile.in 2008-05-26 12:47:52.000000000 -0400
-+++ gretl-1.7.6.new/plugin/Makefile.in 2008-08-08 09:13:25.000000000 -0400
-@@ -7,6 +7,7 @@
-
- CC = @CC@
- CFLAGS = @CFLAGS@
-+LDFLAGS = @LDFLAGS@
- MAKE = @MAKE@
- INSTALL = @INSTALL@
- LN = @LN_S@
-@@ -47,7 +48,7 @@
-
- LIBTOOL = ../libtool
- COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS)
--LINK = $(LIBTOOL) --mode=link $(CC) -module -avoid-version -rpath $(plugindir)
-+LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -module -avoid-version -rpath $(plugindir)
-
- GRETLINC = -I$(topsrc)/lib/src
- GRETLLIB = ../lib/libgretl-1.0.la
diff --git a/sci-mathematics/gretl/files/gretl-1.8.0-ldflags.patch b/sci-mathematics/gretl/files/gretl-1.8.0-ldflags.patch
index ab0960e44247..cce5101716af 100644
--- a/sci-mathematics/gretl/files/gretl-1.8.0-ldflags.patch
+++ b/sci-mathematics/gretl/files/gretl-1.8.0-ldflags.patch
@@ -1,6 +1,5 @@
-diff -Nur gretl-1.8.0.orig/cli/Makefile.in gretl-1.8.0/cli/Makefile.in
---- gretl-1.8.0.orig/cli/Makefile.in 2008-03-24 12:46:11.000000000 +0000
-+++ gretl-1.8.0/cli/Makefile.in 2009-02-02 23:48:16.880402952 +0000
+--- cli/Makefile.in.orig 2008-03-24 12:46:11.000000000 +0000
++++ cli/Makefile.in 2009-02-02 23:48:16.880402952 +0000
@@ -3,6 +3,7 @@
CC = @CC@
@@ -18,9 +17,8 @@ diff -Nur gretl-1.8.0.orig/cli/Makefile.in gretl-1.8.0/cli/Makefile.in
.deps:
mkdir $@
-diff -Nur gretl-1.8.0.orig/gui2/Makefile.in gretl-1.8.0/gui2/Makefile.in
---- gretl-1.8.0.orig/gui2/Makefile.in 2008-12-11 18:44:33.000000000 +0000
-+++ gretl-1.8.0/gui2/Makefile.in 2009-02-02 23:20:16.989339642 +0000
+--- gui2/Makefile.in.orig 2008-12-11 18:44:33.000000000 +0000
++++ gui2/Makefile.in 2009-02-02 23:20:16.989339642 +0000
@@ -7,6 +7,7 @@
libdir = @libdir@
CC = @CC@
@@ -38,9 +36,8 @@ diff -Nur gretl-1.8.0.orig/gui2/Makefile.in gretl-1.8.0/gui2/Makefile.in
$(HACK_OBJ): $(HACK_SRC) $(HACK_HDR)
$(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<
-diff -Nur gretl-1.8.0.orig/lib/Makefile.in gretl-1.8.0/lib/Makefile.in
---- gretl-1.8.0.orig/lib/Makefile.in 2008-12-14 17:35:18.000000000 +0000
-+++ gretl-1.8.0/lib/Makefile.in 2009-02-02 23:21:00.017863458 +0000
+--- lib/Makefile.in.orig 2008-12-14 17:35:18.000000000 +0000
++++ lib/Makefile.in 2009-02-02 23:21:00.017863458 +0000
@@ -6,6 +6,7 @@
bindir = @bindir@
CC = @CC@
@@ -58,9 +55,8 @@ diff -Nur gretl-1.8.0.orig/lib/Makefile.in gretl-1.8.0/lib/Makefile.in
-rpath $(prefix)/lib $(LIBS) \
-version-info $(CURRENT):$(REVISION):$(AGE)
-diff -Nur gretl-1.8.0.orig/plugin/Makefile.in gretl-1.8.0/plugin/Makefile.in
---- gretl-1.8.0.orig/plugin/Makefile.in 2008-12-09 15:49:20.000000000 +0000
-+++ gretl-1.8.0/plugin/Makefile.in 2009-02-02 23:21:36.595339921 +0000
+--- plugin/Makefile.in.orig 2008-12-09 15:49:20.000000000 +0000
++++ plugin/Makefile.in 2009-02-02 23:21:36.595339921 +0000
@@ -7,6 +7,7 @@
CC = @CC@
diff --git a/sci-mathematics/gretl/files/gretl-1.8.2-ldflags.patch b/sci-mathematics/gretl/files/gretl-1.8.2-ldflags.patch
new file mode 100644
index 000000000000..560cd75e17a8
--- /dev/null
+++ b/sci-mathematics/gretl/files/gretl-1.8.2-ldflags.patch
@@ -0,0 +1,288 @@
+--- cli/Makefile.in.orig 2009-07-06 05:26:32.000000000 +0100
++++ cli/Makefile.in 2009-08-07 16:31:37.000000000 +0100
+@@ -3,6 +3,7 @@
+
+ CC = @CC@
+ CFLAGS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
+ MAKE = @MAKE@
+ INSTALL = @INSTALL@
+
+@@ -51,7 +52,7 @@
+ $(CC) $(CFLAGS) -MM $< > .deps/$*.d
+
+ $(CLI): .deps $(OBJS)
+- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(GRETLLIB) \
++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(GRETLLIB) \
+ $(READLINE_LIBS)
+
+ .deps:
+--- doc/Makefile.in.orig 2008-09-21 21:22:59.000000000 +0100
++++ doc/Makefile.in 2009-08-07 16:31:37.000000000 +0100
+@@ -8,12 +8,12 @@
+ subdirs: $(SUBDIRS)
+
+ $(SUBDIRS):
+- make -C $@
++ $(MAKE) -C $@
+
+ clean:
+ for d in $(SUBDIRS) ; do \
+- make -C $$d clean ; done
++ $(MAKE) -C $$d clean ; done
+
+ install:
+ for d in $(SUBDIRS) ; do \
+- make -C $$d install ; done
++ $(MAKE) -C $$d install ; done
+--- doc/tex/Makefile.in.orig 2009-06-13 16:42:16.000000000 +0100
++++ doc/tex/Makefile.in 2009-08-07 16:31:37.000000000 +0100
+@@ -93,16 +93,16 @@
+ if [ ! -f $$f ] ; then ln -sf $(docsrc)/tex/$$f . ; fi ; done
+
+ cmdtex:
+- make -C ../commands cmdtex
++ $(MAKE) -C ../commands cmdtex
+
+ topiclist:
+- make -C ../commands topiclist_en
++ $(MAKE) -C ../commands topiclist_en
+
+ textables:
+- make -C ../commands textables
++ $(MAKE) -C ../commands textables
+
+ functex:
+- make -C ../commands functex
++ $(MAKE) -C ../commands functex
+
+ date.tex:
+ date "+%B, %Y" > $@
+--- doc/tex_pt/Makefile.in.orig 2009-03-28 13:37:17.000000000 +0000
++++ doc/tex_pt/Makefile.in 2009-08-07 16:31:37.000000000 +0100
+@@ -69,16 +69,16 @@
+ if [ ! -f $$f ] ; then ln -sf $(docsrc)/tex_pt/$$f . ; fi ; done
+
+ cmdtex:
+- make -C ../commands cmdtex_pt
++ $(MAKE) -C ../commands cmdtex_pt
+
+ topiclist:
+- make -C ../commands topiclist_pt
++ $(MAKE) -C ../commands topiclist_pt
+
+ textables_pt:
+- make -C ../commands textables_pt
++ $(MAKE) -C ../commands textables_pt
+
+ functex:
+- make -C ../commands functex_pt
++ $(MAKE) -C ../commands functex_pt
+
+ date.tex:
+ LANG=pt_PT date "+%B %Y" | sed 's/^[a-z]/\u&/' > $@
+--- extra/Makefile.in.orig 2003-04-08 19:57:13.000000000 +0100
++++ extra/Makefile.in 2009-08-07 16:31:37.000000000 +0100
+@@ -5,11 +5,11 @@
+ VPATH = $(topsrc)/extra
+
+ ifeq ($(have_gtk),2.0)
+- CFLAGS = -g -O2 -Wall `pkg-config --cflags gretl`
+- LDFLAGS = `pkg-config --libs gretl`
++ CFLAGS := $(CFLAGS) `pkg-config --cflags gretl`
++ LDFLAGS := $(LDFLAGS) `pkg-config --libs gretl`
+ else
+- CFLAGS = -g -O2 -Wall `gretl-config --cflags`
+- LDFLAGS = `gretl-config --libs`
++ CFLAGS := $(CFLAGS) `gretl-config --cflags`
++ LDFLAGS := $(LDFLAGS) `gretl-config --libs`
+ endif
+
+ all: simple_client
+--- gui2/Makefile.in.orig 2009-06-29 15:28:31.000000000 +0100
++++ gui2/Makefile.in 2009-08-07 16:31:37.000000000 +0100
+@@ -7,6 +7,7 @@
+ libdir = @libdir@
+ CC = @CC@
+ CFLAGS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
+ MAKE = @MAKE@
+ INSTALL = @INSTALL@
+ LN = @LN_S@
+@@ -68,7 +69,7 @@
+ endif
+
+ ifeq ($(have_gnome),2.0)
+- query_install_gnome = install-gnome
++ queryOA_install_gnome = install-gnome
+ GNOMEDEF = -DDATADIR=\"$(gnome_prefix)/share\"
+ endif
+
+@@ -161,13 +162,13 @@
+ $(CC) $(CFLAGS) -MM $< > .deps/$*.d
+
+ $(PROG): .deps $(OBJS) $(HACK_OBJ) $(GTKSOURCEVIEW_LITE)
+- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB) $(CARBONLIB)
++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB) $(CARBONLIB)
+
+ $(HACK_OBJ): $(HACK_SRC) $(HACK_HDR)
+ $(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<
+
+ mklang: mklang.o
+- $(LIBTOOL) --mode=link $(CC) -o $@ $< ../lib/libgretl-1.0.la $(XML_LIBS)
++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $< ../lib/libgretl-1.0.la $(XML_LIBS)
+
+ mklang.o: mklang.c $(topsrc)/lib/src/options.c $(topsrc)/lib/src/genlex.c $(topsrc)/lib/src/gretl_commands.c
+ $(CC) -c -I.. -I$(libsrc) $(XML_CFLAGS) $<
+@@ -176,7 +177,7 @@
+ ./mklang $(LANGOPT) > $@
+
+ $(GTKSOURCEVIEW_LITE):
+- make -C gtksourceview
++ $(MAKE) -C gtksourceview
+
+ .deps:
+ mkdir $@
+@@ -220,7 +221,7 @@
+ clean:
+ rm -f *.o $(PROG) mklang gretl.lang gretl.lang.2
+ rm -rf .libs .deps
+- make -C gtksourceview clean
++ $(MAKE) -C gtksourceview clean
+
+ distclean: clean
+ rm -f Makefile debug
+--- lib/Makefile.in.orig 2009-07-06 05:24:20.000000000 +0100
++++ lib/Makefile.in 2009-08-07 16:31:37.000000000 +0100
+@@ -6,6 +6,7 @@
+ bindir = @bindir@
+ CC = @CC@
+ CFLAGS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
+ MAKE = @MAKE@
+ INSTALL = @INSTALL@
+ LN = @LN_S@
+@@ -236,7 +237,7 @@
+ $(CC) $(CFLAGS) -MM -MT $*.lo $< > .deps/$*.d
+
+ $(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)
+- $(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(AUX_LOBJ) \
++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(LOBJS) $(AUX_LOBJ) \
+ -rpath $(prefix)/lib $(LIBS) \
+ -version-info $(CURRENT):$(REVISION):$(AGE)
+
+--- Makefile.in.orig 2009-05-02 21:55:41.000000000 +0100
++++ Makefile.in 2009-08-07 16:31:37.000000000 +0100
+@@ -6,6 +6,7 @@
+ libdir = @libdir@
+ CC = @CC@
+ CFLAGS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
+ MAKE = @MAKE@
+ INSTALL = @INSTALL@
+ LN = @LN_S@
+@@ -85,16 +86,16 @@
+ $(tooldir)/makedist
+
+ distclean: clean
+- make -C win32 clean
++ $(MAKE) -C win32 clean
+ rm -f config.log config.cache config.status config.h gretl.pc
+ rm -f gretl_sh gretl-config libtool Makefile
+ for d in $(ALLSUBDIRS) ; do $(MAKE) -C $$d distclean; done
+
+ check:
+- make -C tests check
++ $(MAKE) -C tests check
+
+ osx-dist:
+- make -C osx postinst
++ $(MAKE) -C osx postinst
+
+ # dependency for parallel builds
+ cli: lib
+--- plugin/Makefile.in.orig 2009-06-22 15:41:31.000000000 +0100
++++ plugin/Makefile.in 2009-08-07 16:31:37.000000000 +0100
+@@ -7,6 +7,7 @@
+
+ CC = @CC@
+ CFLAGS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
+ MAKE = @MAKE@
+ INSTALL = @INSTALL@
+ LN = @LN_S@
+@@ -47,7 +48,7 @@
+
+ LIBTOOL = ../libtool
+ COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS)
+-LINK = $(LIBTOOL) --mode=link $(CC) -module -avoid-version -rpath $(plugindir)
++LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -module -avoid-version -rpath $(plugindir)
+
+ GRETLINC = -I$(topsrc)/lib/src
+ GRETLLIB = ../lib/libgretl-1.0.la
+--- share/Makefile.in.orig 2008-09-21 21:23:15.000000000 +0100
++++ share/Makefile.in 2009-08-07 16:31:37.000000000 +0100
+@@ -41,14 +41,14 @@
+ all: $(query_make_help)
+
+ help:
+- make -C ../doc/commands help-all
++ $(MAKE) -C ../doc/commands help-all
+
+ .PHONY :
+
+ install: installdirs install_datafiles install_scripts install_functions \
+ install_fonts install_help
+ $(INSTALL_DATA) $(sharesrc)/gretl.stamp $(DESTDIR)$(gretldir)/gretl.stamp
+- make -C bcih install
++ $(MAKE) -C bcih install
+
+ install-strip: install
+
+@@ -108,7 +108,7 @@
+ $(tooldir)/mkinstalldirs $(DESTDIR)$(gretldir)/fonts
+
+ clean:
+- make -C bcih clean
++ $(MAKE) -C bcih clean
+
+ textclean:
+ rm -f *.txt
+@@ -118,4 +118,4 @@
+
+ distclean: clean
+ rm -f Makefile
+- make -C bcih distclean
++ $(MAKE) -C bcih distclean
+--- tests/Makefile.in.orig 2006-06-28 20:14:50.000000000 +0100
++++ tests/Makefile.in 2009-08-07 16:31:37.000000000 +0100
+@@ -5,6 +5,7 @@
+
+ CC = @CC@
+ CFLAGS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
+ have_gtk = @have_gtk@
+ GMP_LIBS = @GMP_LIBS@
+ FLIB = @FLIB@
+@@ -35,7 +36,7 @@
+ all: nistcheck
+
+ nistcheck: nistcheck.o $(LIBGRETL)
+- ../libtool --mode=link $(CC) -o $@ $< $(LIBGRETL) $(XML_LIBS)
++ ../libtool --mode=link $(CC) $(LDFLAGS) -o $@ $< $(LIBGRETL) $(XML_LIBS)
+
+ nistcheck.o: nistcheck.c
+ $(CC) $(CFLAGS) $(XML_CFLAGS) -c $<
+@@ -47,10 +48,10 @@
+ ./mtrand && ./diehard
+
+ diehard: diehard.c
+- $(CC) -I$(topsrc)/lib/src -o $@ $< $(FLIB) -lm
++ $(CC) -I$(topsrc)/lib/src $(LDFLAGS) -o $@ $< $(FLIB) -lm
+
+ mtrand: mtrand.o
+- ../libtool --mode=link $(CC) -o $@ $< $(RAND_LIBS)
++ ../libtool --mode=link $(CC) $(LDFLAGS) -o $@ $< $(RAND_LIBS)
+
+ .PHONY :
+
diff --git a/sci-mathematics/gretl/gretl-1.8.0.ebuild b/sci-mathematics/gretl/gretl-1.8.2.ebuild
index eac74dca96a7..6117b711a0a4 100644
--- a/sci-mathematics/gretl/gretl-1.8.0.ebuild
+++ b/sci-mathematics/gretl/gretl-1.8.2.ebuild
@@ -1,6 +1,6 @@
# 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.0.ebuild,v 1.1 2009/02/02 23:52:23 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.8.2.ebuild,v 1.1 2009/08/07 15:42:18 bicatali Exp $
USE_EINSTALL=true
EAPI=2
@@ -46,8 +46,8 @@ SITEFILE=50${PN}-gentoo.el
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.7.5-locale.patch
- epatch "${FILESDIR}"/${PN}-1.8.0-ldflags.patch
epatch "${FILESDIR}"/${PN}-1.7.9-nls.patch
+ epatch "${FILESDIR}"/${PN}-1.8.2-ldflags.patch
}
src_configure() {
@@ -72,9 +72,7 @@ src_configure() {
}
src_compile() {
-
emake || die "emake failed"
-
if use emacs; then
elisp-compile utils/emacs/gretl.el || die "elisp-compile failed"
fi