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

Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64

4 files changed, 17 insertions, 76 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/Manifest b/x11-libs/guile-gtk/Manifest
index f2e1e8f227fc..71dd63e29ab4 100644
--- a/x11-libs/guile-gtk/Manifest
+++ b/x11-libs/guile-gtk/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.1-brokentest.patch 1029 RMD160 221bf0f170a56b28edb2ab8527b20b008c904cdb SHA1 0764c905a540725c9f689b8b6d1ec50e4abb467c SHA256 6aa51463c7f0f966c8a7668877fc1199b6ed85187be21811ca3c84ca42c029c1
 AUX 2.1-prll-install.patch 421 RMD160 c0736b01e21b53622df840b95e9f63b3a417b37f SHA1 efd73f287772db2695f6fba4ed2530ed9f8f73b9 SHA256 9f2aa837ee4cae17e703e4367179e64e69c0759f601ad3acd74431222e420b0d
 AUX guile-gtk-0.19-Makefile.in.patch 556 RMD160 72b626b414a22de64987a442d73309b3b8fa30ff SHA1 55f6745826baaea37560fbb8659ced162a601372 SHA256 edfa2c0a22e339d19428499e03b05817a7cb13bfe1c1a5bbaab9843729d48cd7
@@ -8,20 +5,11 @@ AUX guile-gtk-2.0-g-object-ref.diff 1239 RMD160 5f7f7b567bf26ed1ca247bb031067e9d
 DIST guile-gtk-0.41.tar.gz 697414 RMD160 6dc9f8e942c64ff8d10af561f1d7b6a577588b0b SHA1 850767d4239811a2ed83e8dee8d72246a0aed44b SHA256 1193faf62d176470d9eea846c590da019d2b980c8472960fdd8f2c55d502193d
 DIST guile-gtk-0.60.tar.gz 752981 RMD160 0e620e18745fcd936ee1b8ec61d9881506f7294d SHA1 dd25377098d61fc1030a769caa5e5777a4abd9e8 SHA256 d1abec5b47220acbfb85a59885167799ea3e6151b6f3706964659f48f21258be
 DIST guile-gtk-1.2-0.31.tar.gz 375504 RMD160 505041a1722e7a382be373609830a9ab6e94a4d6 SHA1 c745891e6f38b0e3f723db1d9b478da451d797c8 SHA256 560ab6245dcbccbb5585e9c4ad3a85ef78607a747ed0adcd7a1e5d61736a2ab5
-DIST guile-gtk-2.0.tar.gz 771154 RMD160 6491960b187e0ac7d75394a4981411d26c21310d SHA1 a0625b735cc1f36917f431952d04cdf047496740 SHA256 8c95e5a3e92ac76927d14879d5e27897481d8aa0b087504bc20c8307ce8b269c
 DIST guile-gtk-2.1.tar.gz 781985 RMD160 2a59cba70d5b9c014eb23c72e38e4c518b1bfa9e SHA1 e587bf31c08deac34bf58c8e0f9bac8c239529fb SHA256 9ad30cdfcae688837785774b2149f0ec82f464412017aeeb045b4336ef2416cc
 EBUILD guile-gtk-1.2.0.31.ebuild 805 RMD160 caa60d73352b9dc409826f6059660caddcf75211 SHA1 8aced768b5eced808ae771636ef08319d045d7a9 SHA256 6aba0c31b92db38acdef931335ffeb843b0428919622ca652091ac507b544769
 EBUILD guile-gtk-1.2.0.41.ebuild 796 RMD160 e87298f93d46146e7da32d16bb9194fcb4217ad4 SHA1 389bb28e15f7176d002efc1efb460a72c0bfdc1e SHA256 cab996b11517033bd1c86d77dcca3ef66e18c0dd5e568279fa7cfe29faf2e1e0
 EBUILD guile-gtk-1.2.0.60.ebuild 776 RMD160 4d97b12f93a114e92f0edba93166002afc4b0e62 SHA1 69e08f490ebf6ff177faaac46c6fb8c8687e3462 SHA256 9f824a51a044c4bed34293662b88ea69d21e7f3dbabe0ec55f8c571ac8b19be5
-EBUILD guile-gtk-2.0.ebuild 1080 RMD160 84fc8d60671c7a9a2fe5d51cbcb9f7c83228effb SHA1 902f4e69061b7c3075449828e1288772fe786dc8 SHA256 a9de52a986a831f8b7cddb7764fe42b4e8bdd33c08748fcc2e5de5c03f4dd169
-EBUILD guile-gtk-2.1-r1.ebuild 1239 RMD160 420a8429be0f6f508971d7e9104c7e21cd5a563c SHA1 a4c5ac9dde403b8d59ea1789aa30789c98284fe7 SHA256 2723191612dd60776e4e18f5c57b69f3d0f3cc60ce1978ee6b326f0cf7762bba
+EBUILD guile-gtk-2.1-r1.ebuild 995 RMD160 c9b5f11172d7ab2f414e480639ac5f6c9785d4a4 SHA1 0a1be12f65a0e6d097baff04bfbd808dfc525ddd SHA256 1273f24871fc6d07ca3672e7112c0b05c471c461958e560574077bb8dd0d3596
 EBUILD guile-gtk-2.1.ebuild 1203 RMD160 30988bf31aa3cf2235272ca278f468be757739ed SHA1 fbb765d440098847409fe3d470a72896d40c9059 SHA256 cff6b9e8c249ecf2b30758dabec5872c9f98881a5853ac39a4b5584e23c8022a
-MISC ChangeLog 4887 RMD160 095c6701e981b7e66d1d607ea9a264a4d1aaf29e SHA1 66c00abaa64435c934896e2ba9e968cd4ff248d8 SHA256 d0f472705cd270f5e8ee90c393cb80d44819c4d8a406b4f2d63ab8e5d9a75ec9
+MISC ChangeLog 5132 RMD160 62b305020abb8898405dc9f1a3b4b78557d60598 SHA1 8fec83d19c6d32b5d941012c12ab832dafd7c608 SHA256 080ce1eeea815482249ff223756c5891ef496ece05722698187165f21c7b5406
 MISC metadata.xml 383 RMD160 594d1ff2899049ee525b97cfa541c7aeb3cc6d2d SHA1 75b1a5d6f5fdd1a328498f7e82c54ab62f6163c0 SHA256 703a18a1572fa929ca3f575b294703022e2f771d3fff0b22e895cd452076feaa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkycp/kACgkQgAnW8HDreRbAQgCgoMqR4yf+RUzTxGRDBRsFMslB
-gVsAnRFgRKL+UpC8fUxG43TaYrhx09N1
-=+Ms3
------END PGP SIGNATURE-----
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
 }