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

(Portage version: 2.2_rc86/cvs/Linux x86_64)

10 files changed, 50 insertions, 210 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/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"
-}