LIBADD librdf.la for librdf_storage_virtuoso.so wrt #297363.

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

3 files changed, 91 insertions, 1 deletions

diff --git a/dev-libs/redland/ChangeLog b/dev-libs/redland/ChangeLog
index d3253afd8e01..cb22f776f16a 100644
--- a/dev-libs/redland/ChangeLog
+++ b/dev-libs/redland/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/redland
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/ChangeLog,v 1.59 2009/12/17 14:14:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/ChangeLog,v 1.60 2009/12/18 13:42:26 ssuominen Exp $
+
+*redland-1.0.10-r1 (18 Dec 2009)
+
+  18 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +redland-1.0.10-r1.ebuild,
+  +files/redland-1.0.10-librdf_storage_register_factory.patch:
+  LIBADD librdf.la for librdf_storage_virtuoso.so wrt #297363.
 
 *redland-1.0.10 (17 Dec 2009)
 
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
new file mode 100644
index 000000000000..6c09c51e961a
--- /dev/null
+++ b/dev-libs/redland/files/redland-1.0.10-librdf_storage_register_factory.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000000..a6bd516eda85
--- /dev/null
+++ b/dev-libs/redland/redland-1.0.10-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2009 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.1 2009/12/18 13:42:26 ssuominen 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="berkdb iodbc mysql postgres sqlite ssl threads 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 )"
+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"
+
+	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) \
+		$(use_with iodbc virtuoso) \
+		$(use_with threads) \
+		--with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_test() {
+	# Remove this hack from next release.
+	if use threads; then
+		ewarn "Test suite is known to be broken with USE threads, skipping."
+	else
+		emake check || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	dohtml {FAQS,NEWS,README,RELEASE,TODO}.html
+}