3 files changed, 82 insertions, 5 deletions
diff --git a/dev-libs/redland/ChangeLog b/dev-libs/redland/ChangeLog
index d134d2f0158f..01e38cd9bef1 100644
--- a/dev-libs/redland/ChangeLog
+++ b/dev-libs/redland/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/redland
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/ChangeLog,v 1.64 2010/01/19 00:27:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/ChangeLog,v 1.65 2010/02/10 20:40:21 grobian Exp $
+
+*redland-1.0.10-r2 (10 Feb 2010)
+
+  10 Feb 2010; Fabian Groffen <grobian@gentoo.org> redland-1.0.10-r1.ebuild,
+  +redland-1.0.10-r2.ebuild:
+  Bump to EAPI=3 for Prefix, drop Prefix keywords and hacks from -r1,
+  keywords moved to -r2, marked ~ppc-macos
 
   19 Jan 2010; Jeroen Roovers <jer@gentoo.org> redland-1.0.10-r1.ebuild:
   Stable for HPPA (bug #301306).
diff --git a/dev-libs/redland/redland-1.0.10-r1.ebuild b/dev-libs/redland/redland-1.0.10-r1.ebuild
index 2d9ac4426673..e109ecc213ba 100644
--- a/dev-libs/redland/redland-1.0.10-r1.ebuild
+++ b/dev-libs/redland/redland-1.0.10-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2010/01/19 00:27:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.10-r1.ebuild,v 1.6 2010/02/10 20:40:21 grobian Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -11,7 +11,7 @@ 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="berkdb iodbc mysql odbc postgres sqlite ssl xml"
 
 RDEPEND="mysql? ( virtual/mysql )
@@ -39,7 +39,6 @@ src_prepare() {
 }
 
 src_configure() {
-	use prefix || EPREFIX=
 	local parser="expat"
 
 	use xml && parser="libxml"
@@ -61,7 +60,7 @@ src_configure() {
 		$(use_with sqlite) \
 		$(use_with postgres postgresql) \
 		--without-threads \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--with-html-dir=/usr/share/doc/${PF}/html \
 		${myconf}
 }
 
diff --git a/dev-libs/redland/redland-1.0.10-r2.ebuild b/dev-libs/redland/redland-1.0.10-r2.ebuild
new file mode 100644
index 000000000000..fed22669bc8e
--- /dev/null
+++ b/dev-libs/redland/redland-1.0.10-r2.ebuild
@@ -0,0 +1,71 @@
+# 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-r2.ebuild,v 1.1 2010/02/10 20:40:21 grobian 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
+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
+	>=dev-libs/rasqal-0.9.16
+	postgres? ( virtual/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="${EPREFIX}"/usr/share/doc/${PF}/html \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	dohtml {FAQS,NEWS,README,RELEASE,TODO}.html
+}