Fixed build without nls (bug #198720) and propagate some flags in the command line Makefile.

Package-Manager: portage-2.1.3.16

5 files changed, 91 insertions, 13 deletions

diff --git a/sci-mathematics/gretl/ChangeLog b/sci-mathematics/gretl/ChangeLog
index 93433417be79..5825f8a004c8 100644
--- a/sci-mathematics/gretl/ChangeLog
+++ b/sci-mathematics/gretl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/gretl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.1 2007/11/07 09:13:18 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.2 2007/11/12 18:28:28 bicatali Exp $
+
+  12 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/gretl-1.6.5-cli.patch, +files/gretl-1.6.5-nls.patch,
+  gretl-1.6.5.ebuild:
+  Fixed build without nls (bug #198720) and propagate some flags in the
+  command line Makefile.
 
 *gretl-1.6.5 (07 Nov 2007)
 
diff --git a/sci-mathematics/gretl/Manifest b/sci-mathematics/gretl/Manifest
index c9ecf31f0940..30a97fe94230 100644
--- a/sci-mathematics/gretl/Manifest
+++ b/sci-mathematics/gretl/Manifest
@@ -1,15 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gretl-1.6.5-cli.patch 1040 RMD160 acb538691db639c3afbfe5af1bfb910fe4aa82bc SHA1 9642fcec8ccd10c63f35abf7d6243cf28f8c8b28 SHA256 cd5a24d4227e772d0a544e3f059b12bef627189e1f52de4b9bcddc4dcc32be71
+MD5 7cb1b671b08f871a79ccfeb093ca44b7 files/gretl-1.6.5-cli.patch 1040
+RMD160 acb538691db639c3afbfe5af1bfb910fe4aa82bc files/gretl-1.6.5-cli.patch 1040
+SHA256 cd5a24d4227e772d0a544e3f059b12bef627189e1f52de4b9bcddc4dcc32be71 files/gretl-1.6.5-cli.patch 1040
+AUX gretl-1.6.5-nls.patch 609 RMD160 63d049f7a0f1fb7aa696d777cbb9658139e6181c SHA1 f465d5e4d7b2af20241036e404c7d4033d15d5b4 SHA256 badf6be1808d8cb37eda38d993b98c9849b9724a71981c2b9a37b05090d7dd18
+MD5 f10955bd58508d69eb9d671b09b2e620 files/gretl-1.6.5-nls.patch 609
+RMD160 63d049f7a0f1fb7aa696d777cbb9658139e6181c files/gretl-1.6.5-nls.patch 609
+SHA256 badf6be1808d8cb37eda38d993b98c9849b9724a71981c2b9a37b05090d7dd18 files/gretl-1.6.5-nls.patch 609
 DIST gretl-1.6.5.tar.bz2 4362695 RMD160 0889ef285234ac56f55494748bf401cbb170be37 SHA1 864c1ca433d2d398b541215f24a960a38264c7ed SHA256 c6f40ed667fdc25298724c0aa9ada06d1f6a75f328d6f72a2ee906e92ae8faac
-EBUILD gretl-1.6.5.ebuild 2126 RMD160 a56ee29e3e99ce9bc8205de5316c26e7719ac253 SHA1 4514b1966f1464045f29bd162a98ba9679204b6e SHA256 a4298e8e69b73a9c33951f28909307d0ab6810306b9cf8b379f4862d4799968d
-MD5 1dc14631ab434900929bb245d6995f24 gretl-1.6.5.ebuild 2126
-RMD160 a56ee29e3e99ce9bc8205de5316c26e7719ac253 gretl-1.6.5.ebuild 2126
-SHA256 a4298e8e69b73a9c33951f28909307d0ab6810306b9cf8b379f4862d4799968d gretl-1.6.5.ebuild 2126
-MISC ChangeLog 414 RMD160 61000bc7d34df4a9414fb6eb3819aa57fcb557e3 SHA1 b2ea4888e9f2e1cc4d895ad20241f4ee76394b91 SHA256 b35de3c379c53853b801e903a64d1d6c9521ab6f6f7c22ab53a94d51c7b3240f
-MD5 57a439a005506326bf8c34e1860a54c1 ChangeLog 414
-RMD160 61000bc7d34df4a9414fb6eb3819aa57fcb557e3 ChangeLog 414
-SHA256 b35de3c379c53853b801e903a64d1d6c9521ab6f6f7c22ab53a94d51c7b3240f ChangeLog 414
+EBUILD gretl-1.6.5.ebuild 2326 RMD160 5dcafac3d5853b28f80910d45524f0276e205921 SHA1 0461983865ddc47381085f0ee20b21a015579764 SHA256 c3e4a7336c38708d71ea2e6bcd39e9cb7361b94ffffdc6415f5916560701a737
+MD5 23b862abaf436994ad177c37ae4fa095 gretl-1.6.5.ebuild 2326
+RMD160 5dcafac3d5853b28f80910d45524f0276e205921 gretl-1.6.5.ebuild 2326
+SHA256 c3e4a7336c38708d71ea2e6bcd39e9cb7361b94ffffdc6415f5916560701a737 gretl-1.6.5.ebuild 2326
+MISC ChangeLog 651 RMD160 ef726bdf1fd677d95eea29c9f5f9e7640abe1906 SHA1 28740411583699b3f4bed7f33894be6fa67d10ed SHA256 66659dd0429d804e1153347e3f7820187702468176bc92197b23fb4f0843f218
+MD5 b7b438bfbf1d1218f33530dbaebeccd2 ChangeLog 651
+RMD160 ef726bdf1fd677d95eea29c9f5f9e7640abe1906 ChangeLog 651
+SHA256 66659dd0429d804e1153347e3f7820187702468176bc92197b23fb4f0843f218 ChangeLog 651
 MISC metadata.xml 839 RMD160 f4b9cac664b9587c3a3aa323e1b4014f0d8ad94b SHA1 f683da43c497a9b61829471d577548472820914a SHA256 4461a2900e096e0c403904531321d68d2c0889632c12cde0ee2ace1151eb7de4
 MD5 5d6b6045843f29da97f5f3b90b1c8b4e metadata.xml 839
 RMD160 f4b9cac664b9587c3a3aa323e1b4014f0d8ad94b metadata.xml 839
@@ -20,7 +28,7 @@ SHA256 9ece1a45b6bc3ed94235d6ecebd36f054b1d5a99297fcf30219b4dad396e6896 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHMYG01ycZbhPLE2ARAsIPAJ4y+glenqhV4ui/2mP7sKgWxl266ACgkzPw
-dPzlOqfRweNtjJY8f0xg4M8=
-=uLnS
+iD8DBQFHOJtS1ycZbhPLE2ARAiw6AJ0Vfr1wYanaDA8jlEIvSaoje7WQDwCfXuWp
+jU0KElBOQBKURG6ROVs/Nf0=
+=y4SA
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/gretl/files/gretl-1.6.5-cli.patch b/sci-mathematics/gretl/files/gretl-1.6.5-cli.patch
new file mode 100644
index 000000000000..e7b2516bf8bb
--- /dev/null
+++ b/sci-mathematics/gretl/files/gretl-1.6.5-cli.patch
@@ -0,0 +1,38 @@
+--- cli/Makefile.in.orig	2007-03-09 02:04:36.000000000 +0000
++++ cli/Makefile.in	2007-11-12 18:21:33.174356459 +0000
+@@ -10,12 +10,16 @@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ 
+ have_readline = @have_readline@
+ READLINE_LIBS = @READLINE_LIBS@
+ READLINE_CFLAGS = @READLINE_CFLAGS@
+ 
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++INTL_LIBS = @LTLIBINTL@
++
+ ifeq ($(CC),)
+   CC = gcc
+ endif
+@@ -41,7 +45,7 @@
+ 
+ DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
+ 
+-override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(READLINE_CFLAGS) $(DEFS)
++override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(READLINE_CFLAGS) $(DEFS) $(CPPFLAGS)
+ 
+ CLI = gretlcli
+ LIBTOOL = ../libtool
+@@ -51,7 +55,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) $(INTL_LIBS)
+ 
+ .deps:
+ 	mkdir $@
diff --git a/sci-mathematics/gretl/files/gretl-1.6.5-nls.patch b/sci-mathematics/gretl/files/gretl-1.6.5-nls.patch
new file mode 100644
index 000000000000..7776c17d6ba7
--- /dev/null
+++ b/sci-mathematics/gretl/files/gretl-1.6.5-nls.patch
@@ -0,0 +1,17 @@
+--- lib/src/interact.c.orig	2007-11-12 17:38:54.708866419 +0000
++++ lib/src/interact.c	2007-11-12 17:40:04.540845917 +0000
+@@ -2443,11 +2443,13 @@
+ #ifdef ENABLE_NLS
+ 	if (!strcmp(s, "-e") || !strncmp(s, "--english", 9)) { 
+ 	    *force_lang = ENGLISH;
++	    continue;
+ 	} else if (!strcmp(s, "-q") || !strncmp(s, "--basque", 8)) { 
+ 	    *force_lang = BASQUE;
++	    continue;
+ 	}
+ #endif
+-	else if (!strcmp(s, "-b") || !strncmp(s, "--batch", 7)) { 
++	if (!strcmp(s, "-b") || !strncmp(s, "--batch", 7)) { 
+ 	    opt = OPT_BATCH;
+ 	} else if (!strcmp(s, "-h") || !strcmp(s, "--help")) { 
+ 	    opt = OPT_HELP;
diff --git a/sci-mathematics/gretl/gretl-1.6.5.ebuild b/sci-mathematics/gretl/gretl-1.6.5.ebuild
index 522c6c5e835b..ca97a9327647 100644
--- a/sci-mathematics/gretl/gretl-1.6.5.ebuild
+++ b/sci-mathematics/gretl/gretl-1.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.6.5.ebuild,v 1.1 2007/11/07 09:13:18 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.6.5.ebuild,v 1.2 2007/11/12 18:28:28 bicatali Exp $
 
 inherit eutils gnome2
 
@@ -34,6 +34,15 @@ RDEPEND="dev-libs/libxml2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# fix when nls not selected (bug #198720)
+	epatch "${FILESDIR}"/${P}-nls.patch
+	# makefile in cli not propagating flags
+	epatch "${FILESDIR}"/${P}-cli.patch
+}
+
 src_compile() {
 
 	local myconf