Version bump

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 50 insertions, 65 deletions

diff --git a/sci-mathematics/gretl/ChangeLog b/sci-mathematics/gretl/ChangeLog
index 66333e5def71..b9fa12e6e296 100644
--- a/sci-mathematics/gretl/ChangeLog
+++ b/sci-mathematics/gretl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/gretl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.45 2014/03/27 03:38:20 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.46 2014/05/28 17:35:31 bicatali Exp $
+
+*gretl-1.9.90 (28 May 2014)
+
+  28 May 2014; Sébastien Fabbro <bicatali@gentoo.org> +gretl-1.9.90.ebuild,
+  -files/gretl-1.9.12-gtksourceview.patch, -gretl-1.9.12.ebuild:
+  Version bump
 
   27 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org>
   +files/gretl-1.9.14-readline.patch, gretl-1.9.14.ebuild, metadata.xml:
diff --git a/sci-mathematics/gretl/Manifest b/sci-mathematics/gretl/Manifest
index 4db8feac3cfb..90984b2e2787 100644
--- a/sci-mathematics/gretl/Manifest
+++ b/sci-mathematics/gretl/Manifest
@@ -2,18 +2,17 @@
 Hash: SHA256
 
 AUX 50gretl-gentoo.el 473 SHA256 7f5398d85016858044257a900e33d9441aa7a3981ac1d71feff79c26b03aa939 SHA512 dff2fd680e295ba8cd722092d5ffe8cb36cd9b79f2ed2be69c8adaa5e414a456abb40c0ec70a6fc0d6b9fb09bf936e3c6ef6804f87bde62d86d3692c34ec595e WHIRLPOOL 6ab37909501bd70482b3b0f0f7febf8930701aafbd227c1bba6c0d9f50be3c46947eb236e1e30b43d7313f739a1b49727d40fc4e055672ce6d4e812a26cfeec8
-AUX gretl-1.9.12-gtksourceview.patch 578 SHA256 321084af77f982af360755662e68cf46fcd62f2975508caaf6ec0058dd111483 SHA512 91bcc3c02bbfc18a5615133f893b9fa26c84caa80f0ce19b032d215a94c37af70b3234d4b0a1070efe0700bae94785f85f3dab8ada07ff3be81c5ffd914f01cc WHIRLPOOL 68e2e829e60bbda50cd292c4a1ddb47c067498160b7d7116d9100796f1a86467e4a2cff1a62e1ddab85688c8bf4b889385258208799382a79a7dcdbe7b76ce5b
 AUX gretl-1.9.14-readline.patch 390 SHA256 be172668e2e85b1ac8490b9aeb3f205189cf270ea65e89d76805fad136e4d987 SHA512 e67dc762b90fa9dee505155452008667916724e669216da09816a2236b863d9798e091237bbb722aea91e42c6ce1fe50deff33cc4148a7b403c1a455f4c74177 WHIRLPOOL 7f02f2638db3bca1edb84ccd3e169f208c8095638c1d1d8516551822684e6198c5d62f0a38769f19ea447d28cb660377b320d23990bdc99041c13b0bef6d3b50
-DIST gretl-1.9.12.tar.bz2 9359175 SHA256 dcca78388b815d56c94eb3fb6ed4d99fa19362aa9e806ab12228f1cf483470c4 SHA512 c50e998b508deae4bd48971a25fb3cef8769e74436fd3e1f2311078c6c2068b73715928becbacccf22e1c1b6dad096cb0c4ceba181e0935c22ecf36c35731811 WHIRLPOOL 3999c57f734aa8e25a171867345a7c9778d30877005eae828c18fc3540c0cda4fb88271819c512b0a13c90dcf4ff3841814f730b94686a7cdd8f5f9dd6b77054
 DIST gretl-1.9.14.tar.xz 7564192 SHA256 ceabb8cbf461ab340093f3d38d9c87d91f6d17c62906d3d8d7bfe58812ba965b SHA512 61ff44cc52f3da971d3cf2cc6e52e0401280521fd761ea098f753acc529c9d35a12fc296b46136d5d257c9a29a83f91a78a77822a00ce3f65776a17f97223ee1 WHIRLPOOL d592d50ba57cfcde2cba6e31199f2d853d300fe5fcc4e2afc6c9906f8f9f6c3ac02a2d24a98c53fb86fb92e7c133717bbdadaa6bd93406d1deb69b3b30be2756
-EBUILD gretl-1.9.12.ebuild 2639 SHA256 da2a1d6226a47fd3fd1f117b0e35472934635130a0d562d381f05f933148b0f6 SHA512 a7f68632bc63bf93ec4782548b487baea87626c28424edffda8bb4c1d2defb32fd2a10dba294e0d60648a5684f6f03c1aa7b53d3b38d5dc716eb28fcc27a5aac WHIRLPOOL 9ad2d74793bcafb3fb77daf698c2b4d9425b6e6a1a2d80684bb83edc13bd95fd6d9e5b61ccc871303d5dfa0e3de116677eb00daed39d26e13d5ad40d74f7d9da
+DIST gretl-1.9.90.tar.xz 7764820 SHA256 f14941786de985e40af8e5f31fb71ee05b17002627055f0f6341b63258c4fdcc SHA512 35ec45fb2ad2dec490567411c1a5d909dc7fc8f0c4a6ca142e6e92b2d95a9efc9581f154a7806cf3f5178b530cdca9508b7c215bca29e1bcaebfa874d476667a WHIRLPOOL c688135030057df291576b5e8e08300d59b183a013064ae9adb7a934e4fd5436b0b2b23d27f340dcd4c0aac24fd16419dd377e3c650a2c90705e5caa8cedf24f
 EBUILD gretl-1.9.14.ebuild 2610 SHA256 cf67ed1911ec426e7054e5e96fa3208ed97abc5c41040f08101fec993f77c8a1 SHA512 f5b25ab84ee8c3df16df4d7fbf4b95c44887e7a478f697fb53b38b9645541bceba8460a78a29a753fdf69d725b2261bad494e7841dd85d508a437c891dc44cfe WHIRLPOOL a327ed39976ea4225978d52bea50f5726fcd9d82a664478cddbfa069ef0f3ca8a3344070a2c467f290a701b965a22c16929a2efb629e8cc154eff63a50cff224
-MISC ChangeLog 7994 SHA256 639a8ee397b8e47886d36851f38959823ec3b8f4c7e7b72c351f4f95dc381291 SHA512 bc1cebc499aefbef6d8b9764efd741ee22da46d9f05c0a5de61bed5ab117cb28c04dfd937b6b1e64832182970b6a9742031b895068481c1fc0b82d674f01aadd WHIRLPOOL f9fecf19a506b006886eb5121f79e0141eb5ef96678e566f2a86178d90028fd2cc7c2f65d5c8b50609052a91c933827b0249f3d5eb0fc68b1b8b883aa7dc6187
+EBUILD gretl-1.9.90.ebuild 2753 SHA256 2e6e8e4ae5b30be4b8a321bca282fa5cc41083053c02e85352a805bde68dbfe2 SHA512 f7ae6ca7a506ea10f95265c87b7d887343b32129402031a17f2f703e1fce0a087becd94e658ef263de779bb96aa4bd9ed0a2f69271c125f8f84352acffb23681 WHIRLPOOL bdb7565b7574578c33aa6b4cda890f4e2e38cc68dc0162eef38d3339a7fa072e73f46cd7986f2355a7c01c4ec1c8804eec3041d2a09a77803641b6aca187469b
+MISC ChangeLog 8181 SHA256 301e8c52129529fdf3ebdc18fff58c859c194619fef66fe82c2e9145ef414a55 SHA512 2286d41780fa75efd05bbfc1d78a77c4f22303e0db5e8238faa602f1b006ebe9adce8ebcfb428370f221ddc252cd8a9f100f4dcd2a247ed4d48cb7a7a3593fa9 WHIRLPOOL 14515295123743573d17688a24349e67cbe225b9acc4a0c0ab9e029881314ab9e39de6aff7470bdadc33fbf1b1088b80afc8fc053834f53b56d11a3b7995e513
 MISC metadata.xml 928 SHA256 8ee4ae236cea89cbce71a8a98b3e8a159a1dc4d57b9ead24b2cb6fe302c790db SHA512 6cbd0b5b38eb0d2ea1758af34e4688f7502749dd7df05b65eef20ef55e361a1e5e91ec644597c0a0d74ab3227bfbc4f935f1407da8f59a9349c3c03762bf5cbb WHIRLPOOL 236cfa68081f090d258494cfab53ccbbaccb89c1c1e0f988fdc93c97b387f6ff781b9b1b7de05383275eacfd370531831e6acfcb3d95e7db9cfae7be42592d9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMznTAACgkQ1ycZbhPLE2C1YQCfXTpxIw2z6qgulxPpGZvU46hz
-FmMAoJUalK1/thCXMYXhPgkqB0QeieXG
-=1afW
+iEYEAREIAAYFAlOGHmcACgkQ1ycZbhPLE2BPSwCeK/hksERAS8cxdWbsKG7mnpjt
+ZGYAn2Z86/7Fwz5Ve++Yf+V3cdJT2GqJ
+=nqLG
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/gretl/files/gretl-1.9.12-gtksourceview.patch b/sci-mathematics/gretl/files/gretl-1.9.12-gtksourceview.patch
deleted file mode 100644
index ce2e4da60c95..000000000000
--- a/sci-mathematics/gretl/files/gretl-1.9.12-gtksourceview.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- gui2/textbuf.c.ORIG	2013-03-03 17:34:35.000000000 +0100
-+++ gui2/textbuf.c	2013-04-17 17:07:40.008278528 +0200
-@@ -37,6 +37,7 @@
- #endif
- 
- #ifdef USE_GTKSOURCEVIEW_3
-+# include <gtksourceview/gtksourcebuffer.h>
- # define GTK_IS_SOURCE_VIEW GTK_SOURCE_IS_VIEW
- #endif
- 
---- gui2/textutil.c.ORIG	2013-02-27 16:45:24.000000000 +0100
-+++ gui2/textutil.c		2013-05-28 12:45:17.346889113 +0200
-@@ -30,6 +30,8 @@
- #include "system.h"
- #include "winstack.h"
- 
-+#include <gtksourceview/gtksourcebuffer.h>
-+
- #if USE_GTKSOURCEVIEW_2
- # include <gtksourceview/gtksourceiter.h>
- #endif
diff --git a/sci-mathematics/gretl/gretl-1.9.12.ebuild b/sci-mathematics/gretl/gretl-1.9.90.ebuild
index ca0948d128b9..87556fe67c47 100644
--- a/sci-mathematics/gretl/gretl-1.9.12.ebuild
+++ b/sci-mathematics/gretl/gretl-1.9.90.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.9.12.ebuild,v 1.2 2013/05/30 17:26:02 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.9.90.ebuild,v 1.1 2014/05/28 17:35:31 bicatali Exp $
 
 EAPI=5
 
@@ -10,59 +10,61 @@ inherit eutils elisp-common toolchain-funcs
 
 DESCRIPTION="Regression, econometrics and time-series library"
 HOMEPAGE="http://gretl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/10"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="accessibility emacs gnome gtk nls odbc openmp readline sse2 R static-libs"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gmp
-	dev-libs/libxml2:2
-	dev-libs/mpfr
-	sci-libs/fftw:3.0
+IUSE="accessibility avx +curl emacs gnome gtk mpi nls odbc openmp python
+	readline sse2 R static-libs"
+
+CDEPEND="
+	dev-libs/glib:2=
+	dev-libs/gmp:0=
+	dev-libs/libxml2:2=
+	dev-libs/mpfr:0=
+	sci-libs/fftw:3.0=
 	sci-visualization/gnuplot
 	virtual/lapack
 	virtual/latex-base
-	accessibility? ( app-accessibility/flite )
+	accessibility? ( app-accessibility/flite:= )
+	curl? ( net-misc/curl:0= )
 	emacs? ( virtual/emacs )
 	gtk? (
-			media-libs/gd[png]
+			media-libs/gd:2=[png]
 			sci-visualization/gnuplot[gd]
-			x11-libs/gtk+:3
-			x11-libs/gtksourceview:3.0 )
-	odbc? ( dev-db/unixODBC )
-	R? ( dev-lang/R )
-	readline? ( sys-libs/readline )"
-
-DEPEND="${RDEPEND}
+			x11-libs/gtk+:3=
+			x11-libs/gtksourceview:3.0= )
+	mpi? ( virtual/mpi )
+	odbc? ( dev-db/unixODBC:0= )
+	R? ( dev-lang/R:0= )
+	readline? ( sys-libs/readline:0= )"
+RDEPEND="${CDEPEND}
+	python? ( dev-python/numpy )"
+DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 
 SITEFILE=50${PN}-gentoo.el
 
-REQUIRED_USE="emacs? ( gtk )"
+REQUIRED_USE="emacs? ( gtk ) !curl? ( !gtk )"
 
 pkg_setup() {
-	if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp
-	then
-		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
+	if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp ; then
+		ewarn "You are using a non capable gcc compiler ( < 4.2 ? )"
 		die "Need an OpenMP capable compiler"
 	fi
 }
 
-src_prepare(){
-	epatch "${FILESDIR}/${PF}-gtksourceview.patch"
-}
-
 src_configure() {
 	econf \
 		--disable-rpath \
 		--enable-shared \
 		--with-mpfr \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		$(use_enable avx) \
+		$(use_enable curl www) \
 		$(use_enable gtk gui) \
-		$(use_enable gtk gtk3) \
 		$(use_enable gtk xdg) \
 		$(use_enable gtk xdg-utils) \
 		$(use_enable nls) \
@@ -70,6 +72,7 @@ src_configure() {
 		$(use_enable sse2) \
 		$(use_enable static-libs static) \
 		$(use_with accessibility audio) \
+		$(use_with mpi) \
 		$(use_with odbc) \
 		$(use_with readline) \
 		$(use_with R libR) \
@@ -81,7 +84,7 @@ src_compile() {
 	emake
 	if use emacs; then
 		cd utils/emacs && emake
-		elisp-compile gretl.el || die "elisp-compile failed"
+		elisp-compile gretl.el
 	fi
 }
 
@@ -89,10 +92,8 @@ src_install() {
 	# to fix
 	emake -j1 DESTDIR="${D}" install
 	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"
+		elisp-install ${PN} utils/emacs/gretl.{el,elc}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 	dodoc README README.audio ChangeLog CompatLog
 }
@@ -100,7 +101,7 @@ src_install() {
 pkg_postinst() {
 	if use emacs; then
 		elisp-site-regen
-		elog "To begin using gretl-mode for all \".inp\" files that you edit,"
+		elog "To use 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