Version bump

(Portage version: 2.1.4_rc14)

5 files changed, 46 insertions, 33 deletions

diff --git a/sci-mathematics/gretl/ChangeLog b/sci-mathematics/gretl/ChangeLog
index cebd398e1a2b..25344eb737b6 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.6 2007/12/06 11:37:10 bicatali Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.7 2008/01/12 19:54:36 bicatali Exp $
+
+*gretl-1.7.1 (12 Jan 2008)
+
+  12 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/gretl-1.6.5-nls.patch, -gretl-1.6.5.ebuild, +gretl-1.7.1.ebuild:
+  Version bump
 
   06 Dec 2007; Sébastien Fabbro <bicatali@gentoo.org>
   +files/50gretl-gentoo.el, gretl-1.7.0.ebuild:
diff --git a/sci-mathematics/gretl/files/digest-gretl-1.6.5 b/sci-mathematics/gretl/files/digest-gretl-1.6.5
deleted file mode 100644
index 23c15d5b47bf..000000000000
--- a/sci-mathematics/gretl/files/digest-gretl-1.6.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ed2ca08e8e06df14bc2d4a071535c3e5 gretl-1.6.5.tar.bz2 4362695
-RMD160 0889ef285234ac56f55494748bf401cbb170be37 gretl-1.6.5.tar.bz2 4362695
-SHA256 c6f40ed667fdc25298724c0aa9ada06d1f6a75f328d6f72a2ee906e92ae8faac gretl-1.6.5.tar.bz2 4362695
diff --git a/sci-mathematics/gretl/files/digest-gretl-1.7.1 b/sci-mathematics/gretl/files/digest-gretl-1.7.1
new file mode 100644
index 000000000000..7d18ce47290e
--- /dev/null
+++ b/sci-mathematics/gretl/files/digest-gretl-1.7.1
@@ -0,0 +1,3 @@
+MD5 85e0890eaf912ef105b6c58978eec1c3 gretl-1.7.1.tar.bz2 4748191
+RMD160 fac615136468ac82e0e68b5caec340aae1a35f57 gretl-1.7.1.tar.bz2 4748191
+SHA256 3a9ac36536941a1ac958a154c27e2b4be825e711e52334bb94f4fa0325ce7fec gretl-1.7.1.tar.bz2 4748191
diff --git a/sci-mathematics/gretl/files/gretl-1.6.5-nls.patch b/sci-mathematics/gretl/files/gretl-1.6.5-nls.patch
deleted file mode 100644
index 7776c17d6ba7..000000000000
--- a/sci-mathematics/gretl/files/gretl-1.6.5-nls.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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.7.1.ebuild
index 7ecfdcd96cef..503e283b6b8d 100644
--- a/sci-mathematics/gretl/gretl-1.6.5.ebuild
+++ b/sci-mathematics/gretl/gretl-1.7.1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.6.5.ebuild,v 1.4 2007/12/04 11:45:18 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.7.1.ebuild,v 1.1 2008/01/12 19:54:36 bicatali Exp $
 
-inherit eutils gnome2
+USE_EINSTALL=true
+
+inherit eutils gnome2 elisp-common
 
 DESCRIPTION="Regression, econometrics and time-series library"
 HOMEPAGE="http://gretl.sourceforge.net/"
@@ -12,9 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-# 1.6.5 too buggy without nls. now forcing.
-#IUSE="accessibility gmp gnome gtk nls png readline sourceview"
-IUSE="accessibility gmp gnome gtk png readline sourceview"
+IUSE="accessibility emacs gmp gnome gtk nls png readline sourceview"
 
 RDEPEND="dev-libs/libxml2
 	>=dev-libs/glib-2
@@ -31,18 +31,19 @@ RDEPEND="dev-libs/libxml2
 			 >=gnome-base/libgnomeprint-2.2
 			 >=gnome-base/libgnomeprintui-2.2
 			 >=gnome-base/gconf-2.0 )
-	sourceview? ( x11-libs/gtksourceview )"
+	sourceview? ( x11-libs/gtksourceview )
+	emacs? ( virtual/emacs )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+SITEFILE=50${PN}-gentoo.el
+
 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
+	epatch "${FILESDIR}"/${PN}-1.6.5-cli.patch
 }
 
 src_compile() {
@@ -61,10 +62,10 @@ src_compile() {
 	fi
 
 	econf \
-		--with-nls \
 		--with-mpfr \
 		--without-libole2 \
 		--without-gtkextra \
+		$(use_enable nls) \
 		$(use_enable png png-comments) \
 		$(use_with readline) \
 		$(use_with gmp) \
@@ -74,6 +75,10 @@ src_compile() {
 		|| die "econf failed"
 
 	emake || die "emake failed"
+
+	if use emacs; then
+		elisp-compile utils/emacs/gretl.el || die "elisp-compile failed"
+	fi
 }
 
 src_install() {
@@ -86,6 +91,25 @@ src_install() {
 		doicon gnome/gretl.png
 		make_desktop_entry gretlx11 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 NEWS README README.audio ChangeLog TODO EXTENDING \
 		|| 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
+}