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

Package-Manager: portage-2.1.5_rc10

6 files changed, 15 insertions, 178 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/Manifest b/dev-libs/redland-bindings/Manifest
index 89a01dfa374d..b58b245574f5 100644
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@@ -1,13 +1,7 @@
 AUX redland-bindings-1.0.0.2-DESTDIR.patch 421 RMD160 d131fcf9f5689a8622fa13596205318da16b227a SHA1 e063bf52bb3523f4cf1630fd8366687caa0384db SHA256 970346f0da066da80eb5e9e4ed260edae56f03078c941a405493dec9af8ca7f7
 AUX redland-bindings-1.0.0.2-configure.patch 287 RMD160 287ffb8bf03a74df3183fc0ff2bcfa9c14d93a54 SHA1 2e3060598b252c2df806b89362d45382ce86a71e SHA256 ed46830923adf8afd88ed4b3d479bd055a6497434647086e5b35ad886db15b41
 AUX redland-bindings-1.0.0.2-swig-update.patch 308 RMD160 ab83c39f6338f837245187f087fe73cb2ecab795 SHA1 4939f17c45ed415738d0a6303ab910416a48fca6 SHA256 4dea3bb134e5570a898bc3019b4f8127cbdcce73ea440af3e50044f490107c8a
-DIST redland-bindings-1.0.4.1.tar.gz 868763 RMD160 878c9efbcb3de0c6673decc2ffe71756aac235bf SHA1 c2f958613eab9f2a35ae5a688fd4b1288d8f681a SHA256 780ffc5b594d343dc0b9386f51fc6dabf9a87a60bcebbc645a35f7073d3c8940
-DIST redland-bindings-1.0.5.1.tar.gz 877314 RMD160 ff4bff8b77d57119fbce37577a60f7a249064d3d SHA1 4fb753a46c58c6c9e6e42a262876edb1af7f0cc5 SHA256 f2683abb6679c01b7b7af33ecff45b8ab8b187addad019ed59572b26ed7400b8
-DIST redland-bindings-1.0.6.1.tar.gz 882885 RMD160 1ec3d19630f8d1bfa365fbc289035df94600d914 SHA1 70df1706a8c96ee79103bdd0425acdd3b45d3e1d SHA256 59b0494dec097079bf6ccceb03960ae79b30bd70b8a87d1d85f1e2018cc53662
 DIST redland-bindings-1.0.7.1.tar.gz 744527 RMD160 130a0262bece540fce61bd50566ee87bc2cd805d SHA1 82462035595afe0ef622cf8c1a1a32c2f2b38e97 SHA256 82749b6e45399487aec8e368d0d1dea700222b4863ce3c12787f668469740134
-EBUILD redland-bindings-1.0.4.1.ebuild 1390 RMD160 64bed4d7e392dfb8c34209340b98f15e4b55b54a SHA1 4a279b6baa8a81a075600ba4dd45dd03bcb4a927 SHA256 856dbf58d5c8ed770a77a22644a036dca61261ba8e177de197f8053315337c32
-EBUILD redland-bindings-1.0.5.1.ebuild 1240 RMD160 14a97912a9a259b4af815bb64357658bbea39eb3 SHA1 0cfab85a03c7393d0d9f2216acde981f1b503809 SHA256 089d5ac6d1f97b799edaba0a0b57a5bf189609ae4bca470bcef0bcf495d2d456
-EBUILD redland-bindings-1.0.6.1.ebuild 1240 RMD160 8914efcf4aabfe17c611882a31f844766038b6ba SHA1 26ab931142eda5c5e70248820824e4d37484954a SHA256 ac46bf3ff1949a81942ef76bf7edab9b645b5fc9ad718fbc471abfb9b2a10422
-EBUILD redland-bindings-1.0.7.1.ebuild 1262 RMD160 64d06a9ce85f5c716646e97b46b1910be87dd9a1 SHA1 77e5a6e3ab6d9eb478d9c4306b378bada2a1b072 SHA256 38c375bb97c8d1056db40a501b84bc1189783dae2dd6744e5c53c24807360965
-MISC ChangeLog 2316 RMD160 545c167c403057b254983158ce498825fc38b956 SHA1 c83619fb8de3d375148ba25be9df26e65ff08a74 SHA256 c71867201c9a798dd6c5c01641f6784382b9b65dbcd72ed8744b63f1dacdbdb9
+EBUILD redland-bindings-1.0.7.1.ebuild 1213 RMD160 bd3ebc24d5c69f5fd848696d0392eabc95ccf9e4 SHA1 36ed5ece65393559f40b3b43632db289184e288a SHA256 3c578bd2233dcab23695adcfd724f44b7c84ab71a8339e15a026384fd710fce8
+MISC ChangeLog 2560 RMD160 8dfab985ba138fb8c11194286b8533cfd722cd77 SHA1 42a2a30681f0026e956b520499d57f931fc8a005 SHA256 db1c5b445e7083be6a779cdffcb0cc32e614909cce78c110a3a655ec07432df2
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
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
 }