Version bump

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 44 insertions, 27 deletions

diff --git a/sci-mathematics/gretl/ChangeLog b/sci-mathematics/gretl/ChangeLog
index 665fdcb41cf9..de3a74807337 100644
--- a/sci-mathematics/gretl/ChangeLog
+++ b/sci-mathematics/gretl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/gretl
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.15 2008/08/30 16:59:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.16 2008/10/08 21:50:26 bicatali Exp $
+
+*gretl-1.7.9 (08 Oct 2008)
+
+  08 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/gretl-1.7.9-nls.patch, -gretl-1.7.6.ebuild, +gretl-1.7.9.ebuild:
+  Version bump
 
 *gretl-1.7.7 (30 Aug 2008)
 
diff --git a/sci-mathematics/gretl/Manifest b/sci-mathematics/gretl/Manifest
index 02b46f512ce8..e5a7b746659a 100644
--- a/sci-mathematics/gretl/Manifest
+++ b/sci-mathematics/gretl/Manifest
@@ -4,16 +4,17 @@ 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
-DIST gretl-1.7.6.tar.bz2 4988214 RMD160 e3365f99b8f5483e82a61838a4b7c9087231dd7b SHA1 c276fd7643e105dff74a5b84410fc9a071686e34 SHA256 cc9af41dbd4835e07d9ad6eae5ac62c2aa3b8a951e1e12963f387af6f6b283fb
+AUX gretl-1.7.9-nls.patch 407 RMD160 10602ff5982d2c70a14f0d1db695bff84d32451a SHA1 5f35fa2e7434e9ea2ea20f0be9b69bee7859b7ae SHA256 182503ec631f653ed620179ae92d81729d03c7cd7967462a9d59119e4cddf8d8
 DIST gretl-1.7.7.tar.bz2 4990095 RMD160 509d578c067c91584a913beca5ef30e567164fdc SHA1 a4735b0fe1dfc312058b5a08794b30fa42da730f SHA256 b676c855a1d7ab639e99b6c0512426a6fb3861d6ff6ddce78fed0108339f647d
-EBUILD gretl-1.7.6.ebuild 2903 RMD160 9eb3694077c61cf52f91239f810da98b06ad6593 SHA1 c2380ed317b82e59b752d8e0fd1e9c702ed76ab5 SHA256 2d93045ce4ed080ebf3b3c952d2206c760817d18d2acf51bdf8f2407fc3359d4
+DIST gretl-1.7.9.tar.bz2 6220758 RMD160 12220af75a2a1bd8d65397826893218874556ef8 SHA1 7fec10313577a98c9940f48ac644452131272002 SHA256 087ffc78f4fa703cfa99ea8cebfe451c648c1d1ec5c0857b8c13758b7644008b
 EBUILD gretl-1.7.7.ebuild 2910 RMD160 42a468c278b74ab0a6228f00994e1e01e69a41ea SHA1 11a51df9867433bcb5f4a5c394f71140d63187c9 SHA256 864d8bcc062915064b0781de87e19f1be9ce4e6efbf82c55b2ce5120ec36604c
-MISC ChangeLog 2848 RMD160 fe6064072894381550c745245ca050fdf909adef SHA1 c0a82701fab7c7939b1f00e2c281f4ec4f513867 SHA256 8188179847fa24938954256cd35cf848dbf9f623d5ad924c6f032e1e3fd409e7
+EBUILD gretl-1.7.9.ebuild 2816 RMD160 20b2554c7c32cce599c037aa360650c168a43ae3 SHA1 df27767d89dd47a7edcb43666dd0840d4c63d05e SHA256 1b00a397155ceda01b6fd3c0ec690aa15692b9f2a9a20aaba30a7c3e6daaed9d
+MISC ChangeLog 3021 RMD160 a0cc23c2d93c83204018b182820fc16581d35d5e SHA1 f4c31b70a65b615b5b76bb9fec1dde41377ba1d8 SHA256 931ce029d3d3ff98d7768333977c15b908c6324dd15779e96b5973656bf0295e
 MISC metadata.xml 954 RMD160 907c798b9bfe3ca362a255261ba77633e680a940 SHA1 80a02212a2bfe2576d5a209172a730832ede96a2 SHA256 4f4ef8549a7e73d05ae7640a9d847eb96fb343fcf1b0ebd457aaffc2325f5014
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAki5fHcACgkQ1ycZbhPLE2BklgCeIyP69K+Sgax8X5adXfdIS+02
-AKUAn05u4bu7taZ+VJ6NDFz1tvhtU8BI
-=aqk/
+iEYEARECAAYFAkjtKywACgkQ1ycZbhPLE2CVXwCfS38LZdoYvp0Aqt7c2yqONPg0
+7wwAn2PfdFNM1dmmB82o/mbyJg11foD/
+=xm9A
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/gretl/files/gretl-1.7.9-nls.patch b/sci-mathematics/gretl/files/gretl-1.7.9-nls.patch
new file mode 100644
index 000000000000..a961c2dcdf06
--- /dev/null
+++ b/sci-mathematics/gretl/files/gretl-1.7.9-nls.patch
@@ -0,0 +1,13 @@
+--- gui2/gui_recode.c.orig	2008-09-22 17:29:52.000000000 +0100
++++ gui2/gui_recode.c	2008-10-08 21:19:22.000000000 +0100
+@@ -285,6 +285,10 @@
+     return ret;
+ }
+ 
++#else 
++gchar *my_filename_from_utf8 (char *fname) { return fname; }
++gchar *my_filename_to_utf8 (const char *fname) { return g_strdup(fname); }
++int maybe_recode_gp_file_to_utf8 (const char *fname) { return 1; }
+ #endif /* ENABLE_NLS */
+ 
+ 
diff --git a/sci-mathematics/gretl/gretl-1.7.6.ebuild b/sci-mathematics/gretl/gretl-1.7.9.ebuild
index 0439a47be0f9..c7fd9d8a6e97 100644
--- a/sci-mathematics/gretl/gretl-1.7.6.ebuild
+++ b/sci-mathematics/gretl/gretl-1.7.9.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.7.6.ebuild,v 1.1 2008/08/08 13:41:13 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.7.9.ebuild,v 1.1 2008/10/08 21:50:26 bicatali Exp $
 
 USE_EINSTALL=true
-EAPI=1
+EAPI=2
 inherit eutils gnome2 elisp-common
 
 DESCRIPTION="Regression, econometrics and time-series library"
@@ -26,8 +26,12 @@ RDEPEND="dev-libs/libxml2
 	readline? ( sys-libs/readline )
 	gmp? ( dev-libs/gmp )
 	accessibility? ( app-accessibility/flite )
-	gtk? ( >=x11-libs/gtk+-2.10:2 )
-	gnome? ( gnome-base/libgnomeui
+	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 )
@@ -40,22 +44,13 @@ DEPEND="${RDEPEND}
 
 SITEFILE=50${PN}-gentoo.el
 
-pkg_setup() {
-	if use gtk && ! built_with_use sci-visualization/gnuplot gd; then
-		eerror "gretl gtk GUI needs gnuplot with gd and gd with png"
-		die "Please install gnuplot with gd and png use flags enabled"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.7.5-locale.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-1.7.6-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-1.7.9-nls.patch
 }
 
-src_compile() {
-
+src_configure() {
 	local myconf
 	if use gtk; then
 		myconf="--enable-gui"
@@ -73,8 +68,10 @@ src_compile() {
 		$(use_with odbc) \
 		$(use_with accessibility audio) \
 		${myconf} \
-		LAPACK_LIBS="$(pkg-config --libs lapack)" \
-		|| die "econf failed"
+		LAPACK_LIBS="$(pkg-config --libs lapack)"
+}
+
+src_compile() {
 
 	emake || die "emake failed"
 
@@ -91,7 +88,7 @@ src_install() {
 	fi
 	if use gtk && ! use gnome; then
 		doicon gnome/gretl.png
-		make_desktop_entry gretlx11 gretl
+		make_desktop_entry gretl_x11 gretl
 	fi
 	if use emacs; then
 		elisp-install ${PN} utils/emacs/gretl.{el,elc} \