Unfortunate forcing of gtk for emacs use flag (bug #452112)

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

4 files changed, 15 insertions, 126 deletions

diff --git a/sci-mathematics/gretl/ChangeLog b/sci-mathematics/gretl/ChangeLog
index c0e0675ecfa6..56fa1236e16c 100644
--- a/sci-mathematics/gretl/ChangeLog
+++ b/sci-mathematics/gretl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/gretl
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.40 2012/11/30 07:33:23 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.41 2013/01/15 18:22:35 bicatali Exp $
+
+  15 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org> -gretl-1.9.9.ebuild,
+  gretl-1.9.11.ebuild:
+  Unfortunate forcing of gtk for emacs use flag (bug #452112)
 
 *gretl-1.9.11 (30 Nov 2012)
 
diff --git a/sci-mathematics/gretl/Manifest b/sci-mathematics/gretl/Manifest
index dafc169190fc..53aac9f4dd85 100644
--- a/sci-mathematics/gretl/Manifest
+++ b/sci-mathematics/gretl/Manifest
@@ -3,15 +3,13 @@ Hash: SHA256
 
 AUX 50gretl-gentoo.el 473 SHA256 7f5398d85016858044257a900e33d9441aa7a3981ac1d71feff79c26b03aa939 SHA512 dff2fd680e295ba8cd722092d5ffe8cb36cd9b79f2ed2be69c8adaa5e414a456abb40c0ec70a6fc0d6b9fb09bf936e3c6ef6804f87bde62d86d3692c34ec595e WHIRLPOOL 6ab37909501bd70482b3b0f0f7febf8930701aafbd227c1bba6c0d9f50be3c46947eb236e1e30b43d7313f739a1b49727d40fc4e055672ce6d4e812a26cfeec8
 DIST gretl-1.9.11.tar.bz2 9342322 SHA256 e997eaceff02076a2b071f2cdec764d8b88ab14fa5cc63d526547e125858f60e SHA512 88535f88a623cba0c3cc89059a675e1bc49a85627dced4ddac775827e97fd32f0630e298ee14d98d5258ac2a95b257f5e3298492a3be9173f152c25b1c9d4326 WHIRLPOOL 52f1a8e2261269de9847e79b8c0b3ecf12b21bea6f03d8437675367bf2c80d2ce79cf8e52d312911933db3fb1216b55dbe50dec60889e02b0467a4a20ff2bf8d
-DIST gretl-1.9.9.tar.bz2 9260961 SHA256 87caa9b780cab18e7795de1cc2ef95fee5cda154b72a90006abac60d959229aa
-EBUILD gretl-1.9.11.ebuild 2545 SHA256 88410135a517feaa6edade74867fa7fda0fb2273cf12f4dff4cf46a70ab9aa7a SHA512 d3c5d3e6049981ba8df496c287749231adae08a4680225e062160bc3d1d877354d2328831f3bbdc1b439a038ab02e84f14a003317dc828eb572cb80c3cd0642c WHIRLPOOL d6f90cc9fab77aeb8a535cd77e9d1079122b28f0a2720f963251888444333b2a602ca58a131d03551346901e58b493392b0e7be7f21338dd527631a38ff29d73
-EBUILD gretl-1.9.9.ebuild 2764 SHA256 a270d2c89d31ddaa8ea48685869078837939b8f0ebf7936d12ba72cac11b542d SHA512 8f9b0c6a4c572014135d9366ce957ad63c57f308ad48aa92629cca28209bb5851547795b11a39224d1856183357b73b4623be37494e90410045b8e64050132b8 WHIRLPOOL 51042d9df78069425fe298a1f2c061e054c5878951688ecea48e0799727fb7d3d9d147734eb51b447995c83ef7132e8949ae59226810ae61adc2316887e97295
-MISC ChangeLog 7182 SHA256 d787d938c27867f8ab0cde810919ecf39347dc320851f2b01af1f11d4a4facb5 SHA512 787659949c4d89a7b7c4c0ea2923ed6e8a667523cf4a0c158b7d1ba0b2fc586788e56be19c91be8725b6fee48ef6c9e676d63dc230506a746247c3ba49db8e83 WHIRLPOOL 24e8ab581c6193a8743562b38ddb4e19625bb4f624a72c3c888b3c6d24def1573b80d1d3d980b0687d4cf97e8afc5ec0d501b92b58df37e3448fac9af2151417
+EBUILD gretl-1.9.11.ebuild 2576 SHA256 30e5f1beaf137ec5de1f1963a82f774b05835f0e491695f2730c781eaef6260a SHA512 66dd24e1ce72bb1fe5892e880a1e6ad4d56daead62891a06d2f4d1e22046a5051795891be62883a3ee1cab6026b2e0b46ad183777c8e8454d8dc27474f22cc97 WHIRLPOOL 6338b56173b9e46f4c44e9a8d94ec2efa8aec414044a0aeb5de1dedcd5762cd9c3181d5e5409eacb52050123702b2e7471664dcafaac1ab09c14d5f883f490ae
+MISC ChangeLog 7344 SHA256 2c3b8b0d12ca8950cfa03845498d3757776cb9e92338baaa8c01e84d6ed81e85 SHA512 3f79767a117bc0c4b0e39d8e744fb4b351e334831bc9bb927a355a7a5842212c5e31d35f230d253ba86ffcc28b32169b4d7b66561176ec3bb847c1d9152ff893 WHIRLPOOL 8670231d07e46c4e77db8056281c4ce0a8008b2516f597080565c4a8e4ccbcf82326fa326262568911ff6c5e7ee41313ce13915c641330c46200762609290969
 MISC metadata.xml 932 SHA256 ea264b9b7bb7bfe86db7690cc156c5cdbec04f7aff116479cbba0d7aeaa33161 SHA512 b4ad3b28e9d01d77d70877af1272cc62f0d1fa7ece11abc2cb5f3566ae9cd2c2205ffe242e4569d80e8988459b6e5ac1e7636e01e71ee4f8eab64480736d2e85 WHIRLPOOL 3b14bff123a7eddcf3b5e5c5a206b4d1181c482864b4c6382eabb77998074f4e6152526d63d4b137ee9e09455abd79a45e079a875fe29ff37a42398b02659144
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC4YUkACgkQ1ycZbhPLE2A8yQCeLFVjnn4FXZr/dQLUTEGtTRCz
-OeoAn08gjNLARV8MFMbt5qacb4dF7MIO
-=U/3b
+iEYEAREIAAYFAlD1nm4ACgkQ1ycZbhPLE2BoqACgrhtGqk9S/6LB06HIkmO7u/Al
+zlsAn30GgOsWk0cePfrIMrUAF+cEbDvg
+=i+WQ
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/gretl/gretl-1.9.11.ebuild b/sci-mathematics/gretl/gretl-1.9.11.ebuild
index 6d3925baf2bf..72f443f32a7b 100644
--- a/sci-mathematics/gretl/gretl-1.9.11.ebuild
+++ b/sci-mathematics/gretl/gretl-1.9.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.9.11.ebuild,v 1.1 2012/11/30 07:33:23 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.9.11.ebuild,v 1.2 2013/01/15 18:22:35 bicatali Exp $
 
 EAPI=4
 
@@ -42,6 +42,8 @@ DEPEND="${RDEPEND}
 
 SITEFILE=50${PN}-gentoo.el
 
+REQUIRED_USE="emacs? ( gtk )"
+
 pkg_setup() {
 	if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp
 	then
diff --git a/sci-mathematics/gretl/gretl-1.9.9.ebuild b/sci-mathematics/gretl/gretl-1.9.9.ebuild
deleted file mode 100644
index 813cfbf051f4..000000000000
--- a/sci-mathematics/gretl/gretl-1.9.9.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.9.9.ebuild,v 1.1 2012/06/10 18:46:33 jlec Exp $
-
-EAPI=4
-
-USE_EINSTALL=true
-
-inherit eutils gnome2 elisp-common toolchain-funcs
-
-DESCRIPTION="Regression, econometrics and time-series library"
-HOMEPAGE="http://gretl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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
-	sci-visualization/gnuplot
-	virtual/lapack
-	virtual/latex-base
-	accessibility? ( app-accessibility/flite )
-	emacs? ( virtual/emacs )
-	gtk? (
-			media-libs/gd[png]
-			sci-visualization/gnuplot[gd]
-			x11-libs/gtk+:3
-			x11-libs/gtksourceview:3.0 )
-	gnome? (
-				media-libs/gd[png]
-				sci-visualization/gnuplot[gd]
-				gnome-base/libgnomeui
-				gnome-base/gconf:2 )
-	odbc? ( dev-db/unixODBC )
-	R? ( dev-lang/R )
-	readline? ( sys-libs/readline )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-SITEFILE=50${PN}-gentoo.el
-
-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 "
-		die "Need an OpenMP capable compiler"
-	fi
-}
-
-src_configure() {
-	econf \
-		--disable-rpath \
-		--enable-shared \
-		--with-mpfr \
-		$(use_enable gtk gui) \
-		$(use_enable gtk gtk3) \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable sse2) \
-		$(use_enable static-libs static) \
-		$(use_with accessibility audio) \
-		$(use_with gnome) \
-		$(use_with odbc) \
-		$(use_with readline) \
-		$(use_with R libR) \
-		${myconf} \
-		LAPACK_LIBS="$(pkg-config --libs lapack)"
-}
-
-src_compile() {
-	emake
-	if use emacs; then
-		elisp-compile utils/emacs/gretl.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	if use gnome; then
-		gnome2_src_install gnome_prefix="${ED}"/usr svprefix="${ED}usr"
-	else
-		einstall svprefix="${ED}usr"
-	fi
-	if use gtk && ! use gnome; then
-		doicon gnome/gretl.png
-		make_desktop_entry gretl_x11 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 README README.audio ChangeLog CompatLog
-}
-
-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
-}