Version bump

Package-Manager: portage-2.1.4_rc14

6 files changed, 62 insertions, 53 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/Manifest b/sci-mathematics/gretl/Manifest
index 04da205af94e..46046830bf21 100644
--- a/sci-mathematics/gretl/Manifest
+++ b/sci-mathematics/gretl/Manifest
@@ -9,38 +9,34 @@ AUX gretl-1.6.5-cli.patch 1040 RMD160 acb538691db639c3afbfe5af1bfb910fe4aa82bc S
 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
 DIST gretl-1.7.0.tar.bz2 4701532 RMD160 8722044b89a3a34f87532cd9b6367cbfb459b6b7 SHA1 8e0a4cc4e97b33b2fc12d1a3906320bef17b3b86 SHA256 388b6d37be3ef5a4f1333a568cbc5566199c2de872853e50216101241148eddc
-EBUILD gretl-1.6.5.ebuild 2378 RMD160 57933845c0a5d7d313b4f3f90888c191d9d6446a SHA1 985cf029a2c651a922280a3dfa20083649d96908 SHA256 22115159aa3251d5fd476db35a29bd664bd56091a694198427bde7311d07c6d9
-MD5 c419ac78e97691b24ab29dc7784c60b8 gretl-1.6.5.ebuild 2378
-RMD160 57933845c0a5d7d313b4f3f90888c191d9d6446a gretl-1.6.5.ebuild 2378
-SHA256 22115159aa3251d5fd476db35a29bd664bd56091a694198427bde7311d07c6d9 gretl-1.6.5.ebuild 2378
+DIST gretl-1.7.1.tar.bz2 4748191 RMD160 fac615136468ac82e0e68b5caec340aae1a35f57 SHA1 427d4b7f95e7ce6fa5f3e6edc73f3a885048168a SHA256 3a9ac36536941a1ac958a154c27e2b4be825e711e52334bb94f4fa0325ce7fec
 EBUILD gretl-1.7.0.ebuild 2917 RMD160 dc27344425776febc16a4aa4729d348460dda23c SHA1 fc6a285d30cc1414430d3fb3880f56fb0dd00b76 SHA256 5d596b78783cb6497ab0ee9cad1bd5b6c3776af2ec570c2ded64c203c4145d26
 MD5 0d18429448acf4e539ffa3c4c070439a gretl-1.7.0.ebuild 2917
 RMD160 dc27344425776febc16a4aa4729d348460dda23c gretl-1.7.0.ebuild 2917
 SHA256 5d596b78783cb6497ab0ee9cad1bd5b6c3776af2ec570c2ded64c203c4145d26 gretl-1.7.0.ebuild 2917
-MISC ChangeLog 1264 RMD160 2b6e669da1596b1b3bcc864ae35a601917e25d6b SHA1 5f85173763c65377dbb5d1eed3073b9031ebf7d9 SHA256 1a3cbcd6fc15090032496cf076eb8a836a73d96b5e5ba23a629db15ee918f614
-MD5 3e4c54a6a6dc0131cfb3c44f8523a4cf ChangeLog 1264
-RMD160 2b6e669da1596b1b3bcc864ae35a601917e25d6b ChangeLog 1264
-SHA256 1a3cbcd6fc15090032496cf076eb8a836a73d96b5e5ba23a629db15ee918f614 ChangeLog 1264
+EBUILD gretl-1.7.1.ebuild 2917 RMD160 3bb1766c6c6fdb35848699ca3d0f87ef7aa68fb6 SHA1 7fe9d5b6441df2261e754590ad751f5d411b4730 SHA256 890f00ca8ba83c7b5f6161c2334d14340bed3510c46edeacb938f7aed746b53e
+MD5 a8f31b2af11528b62951aa76d4615fe5 gretl-1.7.1.ebuild 2917
+RMD160 3bb1766c6c6fdb35848699ca3d0f87ef7aa68fb6 gretl-1.7.1.ebuild 2917
+SHA256 890f00ca8ba83c7b5f6161c2334d14340bed3510c46edeacb938f7aed746b53e gretl-1.7.1.ebuild 2917
+MISC ChangeLog 1437 RMD160 5384ca6f8332f0bb70cd59ec3470a3d8fbcc5779 SHA1 a52a22edb3fb4099f21d95bb3b4ae193682e33c2 SHA256 0bd99014de33f4fc4d50e804ac4baa1ddf990debf264c4af124e5cefdf992554
+MD5 d7ad7151f681406dceadaa51caee2772 ChangeLog 1437
+RMD160 5384ca6f8332f0bb70cd59ec3470a3d8fbcc5779 ChangeLog 1437
+SHA256 0bd99014de33f4fc4d50e804ac4baa1ddf990debf264c4af124e5cefdf992554 ChangeLog 1437
 MISC metadata.xml 839 RMD160 f4b9cac664b9587c3a3aa323e1b4014f0d8ad94b SHA1 f683da43c497a9b61829471d577548472820914a SHA256 4461a2900e096e0c403904531321d68d2c0889632c12cde0ee2ace1151eb7de4
 MD5 5d6b6045843f29da97f5f3b90b1c8b4e metadata.xml 839
 RMD160 f4b9cac664b9587c3a3aa323e1b4014f0d8ad94b metadata.xml 839
 SHA256 4461a2900e096e0c403904531321d68d2c0889632c12cde0ee2ace1151eb7de4 metadata.xml 839
-MD5 c1774d750e8bc08737b918c59e98a411 files/digest-gretl-1.6.5 241
-RMD160 7ba8d0e3eb1cf4a5cf72b1d58a898e5f49ae9ddc files/digest-gretl-1.6.5 241
-SHA256 9ece1a45b6bc3ed94235d6ecebd36f054b1d5a99297fcf30219b4dad396e6896 files/digest-gretl-1.6.5 241
 MD5 d14b8c523c7f7ab825e598ba0a445fa9 files/digest-gretl-1.7.0 241
 RMD160 008713bdc4d88e1958265151469f2b9c16dd917c files/digest-gretl-1.7.0 241
 SHA256 65b9c324448d449adddbfcb07c5e91f36b6165b5c153e3b07cab076e33f96a88 files/digest-gretl-1.7.0 241
+MD5 a1b8ec0f06313512fbd72fe501e1864c files/digest-gretl-1.7.1 241
+RMD160 f25a68155ff1add42c31a1939686983a858fbee0 files/digest-gretl-1.7.1 241
+SHA256 749aacedd1a86b9deb5721a293b76c366fa0f140a28183c80cba6220a9108a65 files/digest-gretl-1.7.1 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHV97t1ycZbhPLE2ARAktkAJwNdXkejiyOxTHOD8lgW39/MbTqkACgmN7d
-ub6pjRcnaRq4wjPP2Jvjf6Y=
-=N7L8
+iD8DBQFHiRsF1ycZbhPLE2ARAo7aAJ9wstg+hqDh4CqtIgZx7JnB3GNilACgglPH
+uCID3pn04EhX/DDeVKsgI6k=
+=w7o0
 -----END PGP SIGNATURE-----
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
+}