Attempt at fixing dependencies. Fix vala to slot 0, bug #338067. Clean up old revisions.

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

11 files changed, 63 insertions, 225 deletions

diff --git a/dev-util/radare/ChangeLog b/dev-util/radare/ChangeLog
index a6bf3388a9bd..e47e27a0abf4 100644
--- a/dev-util/radare/ChangeLog
+++ b/dev-util/radare/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/radare
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/ChangeLog,v 1.14 2010/08/08 15:00:23 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/ChangeLog,v 1.15 2010/09/25 15:18:56 eva Exp $
+
+  25 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org> -radare-0.9.9.ebuild,
+  -radare-1.2.1.ebuild, -radare-1.2.1-r1.ebuild, -radare-1.2.2.ebuild,
+  -radare-1.4.ebuild, -radare-1.4.1.ebuild, radare-1.4.2.ebuild,
+  -radare-1.5.ebuild, radare-1.5-r1.ebuild:
+  Attempt at fixing dependencies. Fix vala to slot 0, bug #338067. Clean up
+  old revisions.
 
   08 Aug 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:
diff --git a/dev-util/radare/Manifest b/dev-util/radare/Manifest
index a9c714fd85fe..f458d24fed4c 100644
--- a/dev-util/radare/Manifest
+++ b/dev-util/radare/Manifest
@@ -1,20 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX radare-1.2.1-as-needed.patch 12748 RMD160 c4fcc56db1586b308213dd3732dd89627abcac86 SHA1 0ac02f07f5439b3e37e01b5e909b15f3748fcd80 SHA256 6b72a2fb75109d6d1ba14cba9ec15c97dec504b3984f98e82ecd465860e85729
 AUX radare-1.5-ldflags.patch 3182 RMD160 bf315743ea4e268a21992f48bd216baee6979419 SHA1 8e86fc685349eb96cbbb340d47f7ff32ffaccf94 SHA256 dbea1b9c24dbd05a7ffb0c7b074dc4f11f2adb9f90ec978a835150d85d6c6833
-DIST radare-0.9.9.tar.gz 1111964 RMD160 024c5905e9a856f126e88b0be501fb8ba0febf36 SHA1 c05e106f6188a385c4bdd813af66154970759846 SHA256 a8856c6622a888beb96cb3f3c758c827a175af2b272e00454d281e64f035cff5
-DIST radare-1.2.1.tar.gz 1595561 RMD160 fbc2d2c130ab5402df9d88f8dcac179b23cb34a2 SHA1 8a685b8e219181aaccc2e0de88eea6de632ec6a5 SHA256 d89c2a7254d8a05341e1b2c4c9a5c5a07e3d150d664833dbcf6cc2b559d82def
-DIST radare-1.2.2.tar.gz 1595419 RMD160 3f3da03aa2aeb39d6fb7008174f3d03d4ec939b2 SHA1 9b806c2536b7b712aa9cff71c75e2675710e0178 SHA256 c43a286023a5d024f0328a721c7f469a5673ee18cb84bc640467057d128b4418
-DIST radare-1.4.1.tar.gz 1726020 RMD160 65184d7e70387aaab14214031f622885d0a34a62 SHA1 b9405e9157facb44e1570b138615a698ef7c0ed9 SHA256 b0d79991989d59b782c07ef134deb64094b798e967be8164f6ce9ebba154b0e0
 DIST radare-1.4.2.tar.gz 1732826 RMD160 5162e4dd35bfabd47448e1fe16a92fcbad8fdbfe SHA1 7cd6df9be1fa7eecc19cb561276e99694531edac SHA256 4d83810562edf16bbce7e5c25c63bfce84256511043527ffc17f8e4ee688ea26
-DIST radare-1.4.tar.gz 1719924 RMD160 e4c27fa2c824dea897cee5d3b12ef3e5c5c999ae SHA1 4eff668c0dac713b05f82a8b21a5b384443be4dd SHA256 6bb05ac27db7fc787e67dfedd46853188648a51a35ce99065e6bededd9eea9c3
 DIST radare-1.5.tar.gz 1798606 RMD160 871b6941f8be497257848536ce6ed1087062c240 SHA1 1045c8085eb15bd2fd2887741b0b2280172b3dcb SHA256 30d068207e702fd87821134c5ba5dc0579b1d71597c58f549d91a67f184b0ce4
-EBUILD radare-0.9.9.ebuild 594 RMD160 5e4d99c1e3aacaf5ad5625ce2e7ccef66ec24d5f SHA1 4dd0a043ffb6cfa9ab2825d40af2ec2f248e9785 SHA256 9e136b11c9a4df6363c5946f3268a5586b45ebb2d1b2338d3e3a1052e75bda18
-EBUILD radare-1.2.1-r1.ebuild 794 RMD160 a5cd9bcbaab58aa5e5064bc9caa73690abb5c772 SHA1 e442729544d037e47f481b2fdd252cfe9a2a9856 SHA256 6f52fdd1500ef849b1dcfb580dd0a8019c70376917505f1837f8a38f92401abe
-EBUILD radare-1.2.1.ebuild 688 RMD160 61ffcd7f97cd194ca20583584d45d2e48d4adc6e SHA1 4bb10a20224f5638d3db168d21af1e24843ffc73 SHA256 8bc3640ce91338b3a3882bd6062da7cb0d5589cb010ce0d8226f70a42b110072
-EBUILD radare-1.2.2.ebuild 690 RMD160 07fde3b4e828870ea46985e12f0aa69d288032e7 SHA1 6ece628d15ef712e603e20a766210d824b059599 SHA256 35f19e4b8e668de12a683c6d30ed37e57d52dcd79de936dd67ddda1714251661
-EBUILD radare-1.4.1.ebuild 745 RMD160 d9f745e5ca39ac7b2cc09044784c41b2db29dea8 SHA1 c5bd05b8189cb0456376f0cd608ea894b4deb89f SHA256 e8615944889f85da119211b630babf4869e780488265dc9a286fff58cf8255e7
-EBUILD radare-1.4.2.ebuild 749 RMD160 2248c7b4d95fe6f241593d57af1bb1a065efec7b SHA1 234f484ea04f1a94f599fe850c10272e6524319f SHA256 2d8ac92da36c20add2053804fc52a02d7ddb8f02c34161118feb8dda924d4d6f
-EBUILD radare-1.4.ebuild 684 RMD160 145b98dce2b3e5661ab39cf9cfd88deeaec3f0b3 SHA1 c85f669c27362baa6d1bb7b26fb3d62f1ab751cc SHA256 e22caffb0ea01d018be448f741c69da9c1fd300b31e1d380955297437b906bcf
-EBUILD radare-1.5-r1.ebuild 981 RMD160 815a4500f7bd3a9deb597237918d94da90238d20 SHA1 82ac118a230db679e3e0ead7f4cb0aa1883fa3a3 SHA256 66a38103f9b9774f140e63bba3814b361ad302deb8be5662eb517eb79725239d
-EBUILD radare-1.5.ebuild 739 RMD160 02c9476a2c726b79ee5deeb704dbe3d14771d9a7 SHA1 20208a011e16213cdae694e0626312ff14a150e1 SHA256 533871eda4e32c231bd1e0292ec0c2f0357bbec675bf3cd6d1b8a6826562295e
-MISC ChangeLog 2339 RMD160 2e9073206f826cd5f412567e70cecaca077bea7c SHA1 47dd4b6037ee423c4e0f0f65fbecfbdfa5b7c97a SHA256 bc809b2dc090e9ab871bd134b3a3055b30f2cb271be1e0db46a2311d9e452131
+EBUILD radare-1.4.2.ebuild 763 RMD160 a0dc6dcf9c8f9a68e5baec24979d1e9b6325a741 SHA1 edc0447d720062dbc6ecbfe829e6542a9df9b70e SHA256 7b397773282694b64a991b3443e5174536dc75fc260e5782b2583882e834b27b
+EBUILD radare-1.5-r1.ebuild 1140 RMD160 bd9d7c35a087624803575579fe56f21c0d21a6db SHA1 58a5d806efd5fc78c1109aa14a5f90492158a074 SHA256 62fecaf143bceaf6fa91f34b2faf17768f042f91e370f270400bc3ed7a21e098
+MISC ChangeLog 2681 RMD160 8b8285a266323eba95214892ce606cbef69892b5 SHA1 7f22ecef5ca70ea843122d767eebf499f44407d6 SHA256 4418c77deb12749aaba52e383d0797ac42821565ca63eb61ab34932039f48a39
 MISC metadata.xml 423 RMD160 7621588950ca5cc67ce667381cae00b5f5a27aa7 SHA1 0fbb831428876d7ebd4a987d8dd2e845cfdb7187 SHA256 6f5bfb822e7e23613afecf3d038d79d5b6ab9f444ded1689c38eaf4cd9557d0d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyeEuYACgkQ1fmVwcYIWAbXRQCePQloemtYqDxUSYq+sgelayPH
+UAoAniwM8DWpKGqPyLY2fks9oTdS0Ga2
+=NdbX
+-----END PGP SIGNATURE-----
diff --git a/dev-util/radare/radare-0.9.9.ebuild b/dev-util/radare/radare-0.9.9.ebuild
deleted file mode 100644
index d94759a343a2..000000000000
--- a/dev-util/radare/radare-0.9.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-0.9.9.ebuild,v 1.2 2008/08/01 04:19:56 mr_bones_ Exp $
-
-DESCRIPTION="Advanced command line hexadecimail editor and more"
-HOMEPAGE="http://radare.nopcode.org"
-SRC_URI="http://radare.nopcode.org/get/radare-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="sys-libs/readline
-		dev-lang/python
-		"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake ROOT="${D}" DESTDIR="${D}" install || die "install failed"
-}
diff --git a/dev-util/radare/radare-1.2.1-r1.ebuild b/dev-util/radare/radare-1.2.1-r1.ebuild
deleted file mode 100644
index bc99688f8c9f..000000000000
--- a/dev-util/radare/radare-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.2.1-r1.ebuild,v 1.2 2009/02/16 21:56:04 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="Advanced command line hexadecimail editor and more"
-HOMEPAGE="http://radare.nopcode.org"
-SRC_URI="http://radare.nopcode.org/get/radare-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="gui"
-
-DEPEND="sys-libs/readline
-		dev-lang/python
-		"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-}
-
-src_compile() {
-	econf $(use_with gui) || die "configure failed"
-	emake -j1 || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}
diff --git a/dev-util/radare/radare-1.2.1.ebuild b/dev-util/radare/radare-1.2.1.ebuild
deleted file mode 100644
index 271e324ad2f5..000000000000
--- a/dev-util/radare/radare-1.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.2.1.ebuild,v 1.2 2009/02/12 17:25:17 mr_bones_ Exp $
-
-DESCRIPTION="Advanced command line hexadecimail editor and more"
-HOMEPAGE="http://radare.nopcode.org"
-SRC_URI="http://radare.nopcode.org/get/radare-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="gui"
-
-DEPEND="sys-libs/readline
-		dev-lang/python
-		"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf $(use_with gui) || die "configure failed"
-	emake -j1 || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}
diff --git a/dev-util/radare/radare-1.2.2.ebuild b/dev-util/radare/radare-1.2.2.ebuild
deleted file mode 100644
index 02a975aee348..000000000000
--- a/dev-util/radare/radare-1.2.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.2.2.ebuild,v 1.1 2009/03/20 16:28:46 deathwing00 Exp $
-
-DESCRIPTION="Advanced command line hexadecimail editor and more"
-HOMEPAGE="http://radare.nopcode.org"
-SRC_URI="http://radare.nopcode.org/get/radare-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="gui"
-
-DEPEND="sys-libs/readline
-		dev-lang/python
-		"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf $(use_with gui) || die "configure failed"
-	emake -j1 || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}
diff --git a/dev-util/radare/radare-1.4.1.ebuild b/dev-util/radare/radare-1.4.1.ebuild
deleted file mode 100644
index f63bfe89d3f2..000000000000
--- a/dev-util/radare/radare-1.4.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.4.1.ebuild,v 1.1 2009/06/28 20:55:15 patrick Exp $
-
-DESCRIPTION="Advanced command line hexadecimail editor and more"
-HOMEPAGE="http://radare.nopcode.org"
-SRC_URI="http://radare.nopcode.org/get/radare-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="gui lua vala"
-
-DEPEND="sys-libs/readline
-		dev-lang/python
-		lua? ( dev-lang/lua )
-		vala? ( dev-lang/vala )
-		"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf $(use_with gui) || die "configure failed"
-	emake -j1 || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}
diff --git a/dev-util/radare/radare-1.4.2.ebuild b/dev-util/radare/radare-1.4.2.ebuild
index 210bf8202156..e78695950c90 100644
--- a/dev-util/radare/radare-1.4.2.ebuild
+++ b/dev-util/radare/radare-1.4.2.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.4.2.ebuild,v 1.1 2009/07/25 10:58:13 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.4.2.ebuild,v 1.2 2010/09/25 15:18:56 eva Exp $
+
+EAPI="3"
+
+inherit base
 
 DESCRIPTION="Advanced command line hexadecimail editor and more"
 HOMEPAGE="http://radare.nopcode.org"
@@ -14,15 +18,18 @@ IUSE="gui lua vala"
 DEPEND="sys-libs/readline
 		dev-lang/python
 		lua? ( dev-lang/lua )
-		vala? ( dev-lang/vala )
+		vala? ( dev-lang/vala:0 )
 		"
 RDEPEND="${DEPEND}"
 
+src_configure() {
+	econf $(use_with gui)
+}
+
 src_compile() {
-	econf $(use_with gui) || die "configure failed"
 	emake -j1 || die "compile failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${ED}" install || die "install failed"
 }
diff --git a/dev-util/radare/radare-1.4.ebuild b/dev-util/radare/radare-1.4.ebuild
deleted file mode 100644
index 31a3b0318f2f..000000000000
--- a/dev-util/radare/radare-1.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.4.ebuild,v 1.1 2009/06/28 10:16:37 patrick Exp $
-
-DESCRIPTION="Advanced command line hexadecimail editor and more"
-HOMEPAGE="http://radare.nopcode.org"
-SRC_URI="http://radare.nopcode.org/get/radare-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="gui"
-
-DEPEND="sys-libs/readline
-		dev-lang/python
-		"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf $(use_with gui) || die "configure failed"
-	emake -j1 || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}
diff --git a/dev-util/radare/radare-1.5-r1.ebuild b/dev-util/radare/radare-1.5-r1.ebuild
index 5e2ebc38c91a..3b9b7b9d8131 100644
--- a/dev-util/radare/radare-1.5-r1.ebuild
+++ b/dev-util/radare/radare-1.5-r1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.5-r1.ebuild,v 1.1 2010/06/24 12:39:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.5-r1.ebuild,v 1.2 2010/09/25 15:18:56 eva Exp $
 
-inherit eutils
+EAPI="3"
+
+inherit base eutils
 
 DESCRIPTION="Advanced command line hexadecimail editor and more"
 HOMEPAGE="http://www.radare.org"
@@ -11,29 +13,41 @@ SRC_URI="http://www.radare.org/get/radare-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="gui lua vala"
-
-DEPEND="sys-libs/readline
-		dev-lang/python
-		lua? ( dev-lang/lua )
-		vala? ( dev-lang/vala )
-		"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+IUSE="gui lua readline vala"
+
+RDEPEND="
+	dev-lang/python
+	dev-lang/perl
+	gui? (
+		x11-libs/gtk+:2
+		x11-libs/vte )
+	lua? ( dev-lang/lua )
+	readline? ( sys-libs/readline )
+"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	vala? ( >=dev-lang/vala-0.5:0 )
+"
+
+src_prepare() {
+	base_src_prepare
 	epatch "${FILESDIR}"/${P}-ldflags.patch
 	# fix documentation installation
 	sed -i "s:doc/${PN}:doc/${PF}:g" \
 		Makefile.acr global.h.acr src/Makefile.acr wscript dist/maemo/Makefile
 }
 
+src_configure() {
+	econf \
+		$(use_with readline) \
+		$(use_with vala) \
+		$(use_with gui)
+}
+
 src_compile() {
-	econf $(use_with gui) || die "configure failed"
 	emake -j1 || die "compile failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${ED}" install || die "install failed"
 }
diff --git a/dev-util/radare/radare-1.5.ebuild b/dev-util/radare/radare-1.5.ebuild
deleted file mode 100644
index 2b5f8bec0981..000000000000
--- a/dev-util/radare/radare-1.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.5.ebuild,v 1.1 2009/12/14 21:33:39 deathwing00 Exp $
-
-DESCRIPTION="Advanced command line hexadecimail editor and more"
-HOMEPAGE="http://www.radare.org"
-SRC_URI="http://www.radare.org/get/radare-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="gui lua vala"
-
-DEPEND="sys-libs/readline
-		dev-lang/python
-		lua? ( dev-lang/lua )
-		vala? ( dev-lang/vala )
-		"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf $(use_with gui) || die "configure failed"
-	emake -j1 || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}