QA: Move latest to eapi4 to avoid ugly pkg_setup hack. Remove eapi0 version so virtualx eclass can require eapi2 unconditionally.

(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)

3 files changed, 15 insertions, 62 deletions

diff --git a/x11-libs/guile-gtk/ChangeLog b/x11-libs/guile-gtk/ChangeLog
index a64177539d03..42777c289289 100644
--- a/x11-libs/guile-gtk/ChangeLog
+++ b/x11-libs/guile-gtk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/guile-gtk
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/guile-gtk/ChangeLog,v 1.38 2010/09/24 13:30:28 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/guile-gtk/ChangeLog,v 1.39 2011/02/18 12:19:44 scarabeus Exp $
+
+  18 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> -guile-gtk-2.0.ebuild,
+  guile-gtk-2.1-r1.ebuild:
+  QA: Move latest to eapi4 to avoid ugly pkg_setup hack. Remove eapi0 version
+  so virtualx eclass can require eapi2 unconditionally.
 
 *guile-gtk-2.1-r1 (24 Sep 2010)
 
diff --git a/x11-libs/guile-gtk/guile-gtk-2.0.ebuild b/x11-libs/guile-gtk/guile-gtk-2.0.ebuild
deleted file mode 100644
index b9f5698f76a3..000000000000
--- a/x11-libs/guile-gtk/guile-gtk-2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/guile-gtk/guile-gtk-2.0.ebuild,v 1.8 2009/12/05 13:13:50 ulm Exp $
-
-inherit virtualx eutils
-
-DESCRIPTION="GTK+ bindings for guile"
-HOMEPAGE="http://www.gnu.org/software/guile-gtk/"
-SRC_URI="ftp://ftp.gnu.org/gnu/guile-gtk/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="dev-scheme/guile
-	=x11-libs/gtk+-2*
-	=gnome-base/libglade-2*
-	>=x11-libs/gtkglarea-1.90"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if has_version =dev-scheme/guile-1.8*; then
-		local flags="deprecated"
-		built_with_use dev-scheme/guile ${flags} \
-			|| die "guile must be built with \"${flags}\" use flag"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-g-object-ref.diff"
-}
-
-src_test() {
-	Xemake check || die "tests failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README AUTHORS ChangeLog NEWS TODO
-	insinto /usr/share/doc/${PF}/examples
-	doins -r examples/
-}
diff --git a/x11-libs/guile-gtk/guile-gtk-2.1-r1.ebuild b/x11-libs/guile-gtk/guile-gtk-2.1-r1.ebuild
index 25ca08637a11..74e0de4a1b0f 100644
--- a/x11-libs/guile-gtk/guile-gtk-2.1-r1.ebuild
+++ b/x11-libs/guile-gtk/guile-gtk-2.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/guile-gtk/guile-gtk-2.1-r1.ebuild,v 1.1 2010/09/24 13:30:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/guile-gtk/guile-gtk-2.1-r1.ebuild,v 1.2 2011/02/18 12:19:44 scarabeus Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit autotools eutils virtualx
 
@@ -16,20 +16,12 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
-	dev-scheme/guile
+	dev-scheme/guile[deprecated(+)]
 	=x11-libs/gtk+-2*
 	=gnome-base/libglade-2*
 	>=x11-libs/gtkglarea-1.90"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	if has_version =dev-scheme/guile-1.8*; then
-		local flags="deprecated"
-		built_with_use dev-scheme/guile ${flags} \
-			|| die "guile must be built with \"${flags}\" use flag"
-	fi
-}
-
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.0-g-object-ref.diff"
 	epatch "${FILESDIR}"/${PV}-prll-install.patch
@@ -38,13 +30,13 @@ src_prepare() {
 }
 
 src_test() {
-	Xemake check || die "tests failed"
+	Xemake check
 }
 
 src_install() {
 	# bug #298803
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README AUTHORS ChangeLog NEWS TODO || die
+	emake DESTDIR="${D}" install
+	dodoc README AUTHORS ChangeLog NEWS TODO
 	insinto /usr/share/doc/${PF}/
-	doins -r examples || die
+	doins -r examples
 }