Added gtk3, sse2 flags. Removed gtksourceview flag, mandatory dependency when gui is installed

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

4 files changed, 31 insertions, 25 deletions

diff --git a/sci-mathematics/gretl/ChangeLog b/sci-mathematics/gretl/ChangeLog
index 4627af0f8666..0e59181d4d3f 100644
--- a/sci-mathematics/gretl/ChangeLog
+++ b/sci-mathematics/gretl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/gretl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.33 2011/11/25 18:15:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.34 2011/12/17 06:25:21 bicatali Exp $
+
+*gretl-1.9.6-r1 (17 Dec 2011)
+
+  17 Dec 2011; Sébastien Fabbro <bicatali@gentoo.org> -gretl-1.9.6.ebuild,
+  +gretl-1.9.6-r1.ebuild:
+  Added gtk3, sse2 flags. Removed gtksourceview flag, mandatory dependency when
+  gui is installed
 
 *gretl-1.9.6 (25 Nov 2011)
 
diff --git a/sci-mathematics/gretl/Manifest b/sci-mathematics/gretl/Manifest
index 913db3b4be81..f0c2bf68375d 100644
--- a/sci-mathematics/gretl/Manifest
+++ b/sci-mathematics/gretl/Manifest
@@ -5,13 +5,13 @@ AUX 50gretl-gentoo.el 473 RMD160 3b16bc41fe78a2e8b02a6d02624e74ae1f9c656e SHA1 c
 DIST gretl-1.9.5.tar.bz2 8843566 RMD160 9ca3fd0bdafa71d9aa8a8dd516018ebf42b1961c SHA1 18bd3fd06c54966b8f8378b0017905af25dcebd2 SHA256 cfc6bc9a7c78c3e6819b42c4e5b892e106203a622b1ae76552aed7cf418eb307
 DIST gretl-1.9.6.tar.bz2 9131807 RMD160 7e9f138371dcb2cd047ef36287cdfb73a41854c9 SHA1 847a30769737ea3b874e99a8f295fc5299c1817b SHA256 2ec972a8c1935b91d2b6334f9aee64f0fe2b2022496679a959efdc577b0dff71
 EBUILD gretl-1.9.5.ebuild 2991 RMD160 15634799abcb8ccfd9a7b02bce71d11cff9b5844 SHA1 b124044f4181d32d317f663a2d1e57946b46eb7c SHA256 23b7f5d21d089fe00fa27742a34d719b1d104ca060c8f8ae154c3b4765c78801
-EBUILD gretl-1.9.6.ebuild 2991 RMD160 6ba57aa369f86ad51e5a8df730abfb4ba120e59a SHA1 2b5b0aa5251c499c424a4877c532065d7dc72c67 SHA256 df1ba2c9b97c13ff08233b79ec5f47836cfedac3b2047b5bbb1d93d63eaae250
-MISC ChangeLog 5967 RMD160 72ca9238d8d3ffcbff513109ae593615edd2d7c6 SHA1 dcee76b064b973d618188da05801896da028bc3b SHA256 acceddc506b15e3c0df3a977fe0562b189d6a07da5f91f0b07063b4b10fbd006
-MISC metadata.xml 1019 RMD160 081129737d01e3b770f502faf5a58f6f7d038b00 SHA1 e4ac0899c6bb566adc9a390be56f81113a13b4db SHA256 ab32034694a6ec3b41bbae6c71eef42c6f64fafd79e79e2542843c5e9d3b8f03
+EBUILD gretl-1.9.6-r1.ebuild 2966 RMD160 eac2f461957b958831f63a70903022caacdf717e SHA1 c84ec662db67f6ee0b5fdfa4c55bf5bc811c529d SHA256 68c482e37ba1bc0b34c2fdc592b7be9dc91ba141946fb476b44ced3cf915abec
+MISC ChangeLog 6200 RMD160 bbd5841683956b2b643b4fd70f76cd19fc0f446d SHA1 7a48ab415b41058b0b9424b0e9dd19314a254d17 SHA256 282ee0d7a4b86618b6e5a75e729dcaf5913efa9d79d0588abea0adf5127260ad
+MISC metadata.xml 1083 RMD160 639362ab2ac0c7ce47d64463ee99e00214252008 SHA1 e687bee4c752e9d507ae5ef0d84852dcce3834d2 SHA256 b3c287f4d11616deac347457c019d926a7345d10f8043467d2bb3847e5770edd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7P238ACgkQ1ycZbhPLE2A8twCgly+hS2AtHEPlIjDX3eHKTPA7
-uuEAn0RSV4jw8qzZSmj6a9kRtAdpKPjl
-=fidC
+iEYEARECAAYFAk7sNdoACgkQ1ycZbhPLE2DTKwCdHA+st/8ZCahFzHSRMIBye4B7
+3gAAnirCWKtGKlW5jHCdLGDG58NlxLZt
+=X1e3
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/gretl/gretl-1.9.6.ebuild b/sci-mathematics/gretl/gretl-1.9.6-r1.ebuild
index 2ae219460080..401834486572 100644
--- a/sci-mathematics/gretl/gretl-1.9.6.ebuild
+++ b/sci-mathematics/gretl/gretl-1.9.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.9.6.ebuild,v 1.1 2011/11/25 18:15:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.9.6-r1.ebuild,v 1.1 2011/12/17 06:25:22 bicatali Exp $
 
 USE_EINSTALL=true
 EAPI=4
@@ -14,10 +14,9 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="accessibility emacs gnome gtk nls odbc openmp readline R sourceview static-libs"
+IUSE="accessibility emacs gnome gtk gtk3 nls odbc openmp readline sse2 R static-libs"
 
-RDEPEND="
-	dev-libs/libxml2:2
+RDEPEND="dev-libs/libxml2:2
 	dev-libs/glib:2
 	>=sci-visualization/gnuplot-4.2
 	virtual/lapack
@@ -29,13 +28,17 @@ RDEPEND="
 	accessibility? ( app-accessibility/flite )
 	gtk?  ( sci-visualization/gnuplot[gd]
 			media-libs/gd[png]
-			x11-libs/gtk+:2 )
+			x11-libs/gtk+:2
+			x11-libs/gtksourceview:2.0 )
+	gtk3? ( sci-visualization/gnuplot[gd]
+			media-libs/gd[png]
+			x11-libs/gtk+:3
+			x11-libs/gtksourceview:3.0 )
 	gnome? ( sci-visualization/gnuplot[gd]
 			 media-libs/gd[png]
 			 gnome-base/libgnomeui
 			 gnome-base/gconf:2 )
 	R? ( dev-lang/R )
-	sourceview? ( x11-libs/gtksourceview:2.0 )
 	odbc? ( dev-db/unixODBC )
 	emacs? ( virtual/emacs )"
 
@@ -56,25 +59,20 @@ pkg_setup() {
 }
 
 src_configure() {
-	local myconf
-	if use gtk; then
-		myconf="--enable-gui"
-		myconf="${myconf} $(use_with sourceview gtksourceview)"
-		myconf="${myconf} $(use_with gnome)"
-	else
-		myconf="--disable-gui --without-gnome --without-gtksourceview"
-	fi
-
 	econf \
 		--disable-rpath \
 		--enable-shared \
 		--with-mpfr \
+		$(use_enable gtk gui) \
+		$(use_enable gtk3) \
 		$(use_enable nls) \
 		$(use_enable openmp) \
+		$(use_enable sse2) \
 		$(use_enable static-libs static) \
-		$(use_with readline) \
-		$(use_with odbc) \
 		$(use_with accessibility audio) \
+		$(use_with gnome) \
+		$(use_with odbc) \
+		$(use_with readline) \
 		$(use_with R libR) \
 		${myconf} \
 		LAPACK_LIBS="$(pkg-config --libs lapack)"
@@ -93,7 +91,7 @@ src_install() {
 	else
 		einstall svprefix="${ED}usr"
 	fi
-	if use gtk && ! use gnome; then
+	if use gtk || use gtk3 && ! use gnome; then
 		doicon gnome/gretl.png
 		make_desktop_entry gretl_x11 gretl
 	fi
diff --git a/sci-mathematics/gretl/metadata.xml b/sci-mathematics/gretl/metadata.xml
index 3fbb332b2d8a..13fd2421e47d 100644
--- a/sci-mathematics/gretl/metadata.xml
+++ b/sci-mathematics/gretl/metadata.xml
@@ -17,6 +17,7 @@
 <use>
   <flag name='sourceview'>Enable support for <pkg>x11-libs/gtksourceview</pkg>
     </flag>
+  <flag name='gtk3'>Use GTK+3 frontend instead of GTK+2 </flag>
   <flag name='R'>Enable support for <pkg>dev-lang/R</pkg></flag>
 </use>
 </pkgmetadata>