old

(Portage version: 2.2.0_alpha67/cvs/Linux x86_64)

4 files changed, 6 insertions, 176 deletions

diff --git a/dev-libs/redland/ChangeLog b/dev-libs/redland/ChangeLog
index c2eec44ab3a2..7207c9e1f674 100644
--- a/dev-libs/redland/ChangeLog
+++ b/dev-libs/redland/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/redland
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/ChangeLog,v 1.94 2011/10/18 16:55:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/ChangeLog,v 1.95 2011/10/18 16:56:26 ssuominen Exp $
+
+  18 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -redland-1.0.10-r1.ebuild, -redland-1.0.10-r2.ebuild,
+  -files/redland-1.0.10-librdf_storage_register_factory.patch:
+  old
 
   18 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> redland-1.0.14.ebuild:
   ppc/ppc64 stable wrt #382641
diff --git a/dev-libs/redland/files/redland-1.0.10-librdf_storage_register_factory.patch b/dev-libs/redland/files/redland-1.0.10-librdf_storage_register_factory.patch
deleted file mode 100644
index 6c09c51e961a..000000000000
--- a/dev-libs/redland/files/redland-1.0.10-librdf_storage_register_factory.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur redland-1.0.10.orig/src/Makefile.am redland-1.0.10/src/Makefile.am
---- redland-1.0.10.orig/src/Makefile.am	2009-11-23 08:38:32.000000000 +0200
-+++ redland-1.0.10/src/Makefile.am	2009-12-18 15:29:10.000000000 +0200
-@@ -152,7 +152,7 @@
- plugin_LTLIBRARIES += librdf_storage_virtuoso.la 
- librdf_storage_virtuoso_la_SOURCES = rdf_storage_virtuoso.c rdf_storage_virtuoso_internal.h
- librdf_storage_virtuoso_la_CPPFLAGS = @ODBC_CFLAGS@
--librdf_storage_virtuoso_la_LIBADD = @ODBC_LIBS@
-+librdf_storage_virtuoso_la_LIBADD = @ODBC_LIBS@ librdf.la
- librdf_storage_virtuoso_la_LDFLAGS = -module -avoid-version
- endif
- 
diff --git a/dev-libs/redland/redland-1.0.10-r1.ebuild b/dev-libs/redland/redland-1.0.10-r1.ebuild
deleted file mode 100644
index dd49a634a40e..000000000000
--- a/dev-libs/redland/redland-1.0.10-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.10-r1.ebuild,v 1.15 2010/10/23 18:14:58 armin76 Exp $
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="High-level interface for the Resource Description Framework"
-HOMEPAGE="http://librdf.org/"
-SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~x86-fbsd"
-IUSE="berkdb iodbc mysql odbc postgres sqlite ssl xml"
-
-RDEPEND="mysql? ( virtual/mysql )
-	sqlite? ( =dev-db/sqlite-3* )
-	berkdb? ( sys-libs/db )
-	xml? ( dev-libs/libxml2 )
-	!xml? ( dev-libs/expat )
-	ssl? ( dev-libs/openssl )
-	>=media-libs/raptor-1.4.17
-	<media-libs/raptor-1.9.0
-	>=dev-libs/rasqal-0.9.16
-	postgres? ( dev-db/postgresql-base )
-	iodbc? ( dev-db/libiodbc )
-	odbc? ( dev-db/unixODBC )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2
-	dev-util/gtk-doc-am
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-librdf_storage_register_factory.patch
-
-	sed -i \
-		-e '/SHAVE/d' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local parser="expat"
-
-	use xml && parser="libxml"
-
-	local myconf="--without-virtuoso"
-
-	if use iodbc; then
-		myconf="--with-virtuoso --with-iodbc --without-unixodbc"
-	elif use odbc; then
-		myconf="--with-virtuoso --with-unixodbc --without-iodbc"
-	fi
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_with berkdb bdb) \
-		--with-xml-parser=${parser} \
-		$(use_with ssl openssl-digests) \
-		$(use_with mysql) \
-		$(use_with sqlite) \
-		$(use_with postgres postgresql) \
-		--without-threads \
-		--with-html-dir=/usr/share/doc/${PF}/html \
-		${myconf}
-}
-
-src_test() {
-	if ! use berkdb; then
-		export REDLAND_TEST_CLONING_STORAGE_TYPE=hashes
-		export REDLAND_TEST_CLONING_STORAGE_NAME=test
-		export REDLAND_TEST_CLONING_STORAGE_OPTIONS="hash-type='memory',dir='.',write='yes',new='yes',contexts='yes'"
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	dohtml {FAQS,NEWS,README,RELEASE,TODO}.html
-}
diff --git a/dev-libs/redland/redland-1.0.10-r2.ebuild b/dev-libs/redland/redland-1.0.10-r2.ebuild
deleted file mode 100644
index 8f56ef1c6fdb..000000000000
--- a/dev-libs/redland/redland-1.0.10-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.10-r2.ebuild,v 1.11 2011/08/13 17:26:14 maekke Exp $
-
-EAPI=3
-inherit autotools eutils
-
-DESCRIPTION="High-level interface for the Resource Description Framework"
-HOMEPAGE="http://librdf.org/"
-SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
-IUSE="berkdb iodbc mysql odbc postgres sqlite ssl static-libs xml"
-
-RDEPEND="mysql? ( virtual/mysql )
-	sqlite? ( =dev-db/sqlite-3* )
-	berkdb? ( sys-libs/db )
-	xml? ( dev-libs/libxml2 )
-	!xml? ( dev-libs/expat )
-	ssl? ( dev-libs/openssl )
-	>=media-libs/raptor-1.4.17
-	<media-libs/raptor-1.9.0
-	>=dev-libs/rasqal-0.9.16
-	postgres? ( dev-db/postgresql-base )
-	iodbc? ( dev-db/libiodbc )
-	odbc? ( dev-db/unixODBC )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2
-	dev-util/gtk-doc-am
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-librdf_storage_register_factory.patch
-
-	sed -i \
-		-e '/SHAVE/d' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local parser="expat"
-
-	use xml && parser="libxml"
-
-	local myconf="--without-virtuoso"
-
-	if use iodbc; then
-		myconf="--with-virtuoso --with-iodbc --without-unixodbc"
-	elif use odbc; then
-		myconf="--with-virtuoso --with-unixodbc --without-iodbc"
-	fi
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_with berkdb bdb) \
-		--with-xml-parser=${parser} \
-		$(use_with ssl openssl-digests) \
-		$(use_with mysql) \
-		$(use_with sqlite) \
-		$(use_with postgres postgresql) \
-		--without-threads \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		${myconf}
-}
-
-src_test() {
-	if ! use berkdb; then
-		export REDLAND_TEST_CLONING_STORAGE_TYPE=hashes
-		export REDLAND_TEST_CLONING_STORAGE_NAME=test
-		export REDLAND_TEST_CLONING_STORAGE_OPTIONS="hash-type='memory',dir='.',write='yes',new='yes',contexts='yes'"
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO || die
-	dohtml {FAQS,NEWS,README,RELEASE,TODO}.html || die
-}