Revert last commit by Caleb, and move swig to DEPEND.

(Portage version: 2.1.5_rc10)

5 files changed, 13 insertions, 170 deletions

diff --git a/dev-libs/redland-bindings/ChangeLog b/dev-libs/redland-bindings/ChangeLog
index badea2463357..22c2a092bbb7 100644
--- a/dev-libs/redland-bindings/ChangeLog
+++ b/dev-libs/redland-bindings/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/redland-bindings
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland-bindings/ChangeLog,v 1.13 2008/05/14 12:08:44 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland-bindings/ChangeLog,v 1.14 2008/05/14 17:46:03 drac Exp $
+
+  14 May 2008; Samuli Suominen <drac@gentoo.org>
+  -redland-bindings-1.0.4.1.ebuild, -redland-bindings-1.0.5.1.ebuild,
+  -redland-bindings-1.0.6.1.ebuild, redland-bindings-1.0.7.1.ebuild:
+  Revert last commit by Caleb, and move swig to DEPEND.
 
 *redland-bindings-1.0.7.1 (14 May 2008)
 
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.4.1.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.4.1.ebuild
deleted file mode 100644
index 78f313326196..000000000000
--- a/dev-libs/redland-bindings/redland-bindings-1.0.4.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland-bindings/redland-bindings-1.0.4.1.ebuild,v 1.5 2007/06/14 07:56:17 phreak Exp $
-
-inherit eutils mono
-
-DESCRIPTION="Language bindings for Redland"
-HOMEPAGE="http://librdf.org/"
-SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="perl python java tcl php ruby mono"
-
-DEPEND=">=dev-libs/redland-1.0.4
-	>=dev-lang/swig-1.3.25
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	java? ( virtual/jdk )
-	tcl? ( dev-lang/tcl )
-	php? ( virtual/php )
-	ruby? ( dev-lang/ruby dev-ruby/log4r )
-	mono? ( dev-lang/mono )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i 's:$(INSTALL_PROGRAM) $(TCL_PACKAGE):$(INSTALL_PROGRAM) -D $(TCL_PACKAGE):' tcl/Makefile.in
-	epatch "${FILESDIR}"/${PN}-1.0.0.2-configure.patch
-	epatch "${FILESDIR}"/${PN}-1.0.0.2-DESTDIR.patch
-}
-
-src_compile() {
-	econf \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with java) \
-		$(use_with java jdk ${JAVA_HOME}) \
-		$(use_with tcl tcl) \
-		$(use_with php) \
-		$(use_with ruby) \
-		$(use_with mono ecma-cli mono) \
-		--with-redland=system \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog* INSTALL NEWS README TODO
-	dohtml *.html
-}
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.5.1.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.5.1.ebuild
deleted file mode 100644
index 6736d980987a..000000000000
--- a/dev-libs/redland-bindings/redland-bindings-1.0.5.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland-bindings/redland-bindings-1.0.5.1.ebuild,v 1.4 2007/06/14 07:56:17 phreak Exp $
-
-inherit eutils mono
-
-DESCRIPTION="Language bindings for Redland"
-HOMEPAGE="http://librdf.org/"
-SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="perl python java tcl php ruby mono"
-
-DEPEND=">=dev-libs/redland-1.0.5
-	>=dev-lang/swig-1.3.25
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	java? ( virtual/jdk )
-	tcl? ( dev-lang/tcl )
-	php? ( virtual/php )
-	ruby? ( dev-lang/ruby dev-ruby/log4r )
-	mono? ( dev-lang/mono )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.0.0.2-configure.patch
-}
-
-src_compile() {
-	econf \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with java) \
-		$(use_with java jdk ${JAVA_HOME}) \
-		$(use_with tcl tcl) \
-		$(use_with php) \
-		$(use_with ruby) \
-		$(use_with mono ecma-cli mono) \
-		--with-redland=system \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog* INSTALL NEWS README TODO
-	dohtml *.html
-}
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.6.1.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.6.1.ebuild
deleted file mode 100644
index 876905f4d99d..000000000000
--- a/dev-libs/redland-bindings/redland-bindings-1.0.6.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland-bindings/redland-bindings-1.0.6.1.ebuild,v 1.2 2007/06/14 07:56:17 phreak Exp $
-
-inherit eutils mono
-
-DESCRIPTION="Language bindings for Redland"
-HOMEPAGE="http://librdf.org/"
-SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="perl python java tcl php ruby mono"
-
-DEPEND=">=dev-libs/redland-1.0.5
-	>=dev-lang/swig-1.3.25
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	java? ( virtual/jdk )
-	tcl? ( dev-lang/tcl )
-	php? ( virtual/php )
-	ruby? ( dev-lang/ruby dev-ruby/log4r )
-	mono? ( dev-lang/mono )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.0.0.2-configure.patch
-}
-
-src_compile() {
-	econf \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with java) \
-		$(use_with java jdk ${JAVA_HOME}) \
-		$(use_with tcl tcl) \
-		$(use_with php) \
-		$(use_with ruby) \
-		$(use_with mono ecma-cli mono) \
-		--with-redland=system \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog* INSTALL NEWS README TODO
-	dohtml *.html
-}
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.7.1.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.7.1.ebuild
index b1b52f9da24d..c406b5460b10 100644
--- a/dev-libs/redland-bindings/redland-bindings-1.0.7.1.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland-bindings/redland-bindings-1.0.7.1.ebuild,v 1.1 2008/05/14 12:08:44 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland-bindings/redland-bindings-1.0.7.1.ebuild,v 1.2 2008/05/14 17:46:03 drac Exp $
 
 inherit eutils mono
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="perl python java tcl php ruby mono"
 
-DEPEND=">=dev-libs/redland-1.0.7
+RDEPEND=">=dev-libs/redland-1.0.7
 	perl? ( dev-lang/perl )
 	python? ( dev-lang/python )
 	java? ( virtual/jdk )
@@ -21,16 +21,9 @@ DEPEND=">=dev-libs/redland-1.0.7
 	php? ( virtual/php )
 	ruby? ( dev-lang/ruby dev-ruby/log4r )
 	mono? ( dev-lang/mono )"
-
-RDEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	>=dev-lang/swig-1.3.25"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# epatch "${FILESDIR}"/${PN}-1.0.0.2-configure.patch
-}
-
 src_compile() {
 	econf \
 		$(use_with perl) \
@@ -42,12 +35,12 @@ src_compile() {
 		$(use_with ruby) \
 		$(use_with mono ecma-cli mono) \
 		--with-redland=system \
-		|| die
-	emake || die
+		|| die "econf failed."
+	emake || die "emake failed."
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog* INSTALL NEWS README TODO
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog* NEWS README TODO
 	dohtml *.html
 }