Added soprano and KDE eclass with enforced RPATH

5 files changed, 98 insertions, 5 deletions

diff --git a/dev-libs/soprano/ChangeLog b/dev-libs/soprano/ChangeLog
index b32f021e0ac..1e42221e0bc 100644
--- a/dev-libs/soprano/ChangeLog
+++ b/dev-libs/soprano/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*soprano-2.2.2-r1 (22 Apr 2009)
+
+  22 Apr 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  +soprano-2.2.2-r1.ebuild, soprano-9999.ebuild:
+  Added soprano-2.2.2 with enforced RPATH
+
   05 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
   soprano-2.2.2.ebuild, soprano-9999.ebuild:
   removed unnecessary src_prepare
diff --git a/dev-libs/soprano/Manifest b/dev-libs/soprano/Manifest
index 6a93517499e..2a8947cf95b 100644
--- a/dev-libs/soprano/Manifest
+++ b/dev-libs/soprano/Manifest
@@ -1,3 +1,5 @@
-EBUILD soprano-9999.ebuild 2608 RMD160 90f2df8f34a7b1dbed7923778452631e1250c8e7 SHA1 b8fd0b543781ee4a132d258a8faa2d83c98ae396 SHA256 ba9895a81181f8bd77e5dc8a90e8605d881e64618a1410ba779c7fdadd4793af
-MISC ChangeLog 2193 RMD160 c55bb91df07da62b250f48114ab029744811b088 SHA1 2cd561e1c70a8955b016153267ccd8c6f95cb993 SHA256 fe4a928741a14a6f370aa47f770819a9ffd0d735a74848e343080e7d659095b4
+DIST soprano-2.2.2.tar.bz2 1849380 RMD160 31d8dce6cf5972b433b1b69e4027ef7650b9aa14 SHA1 a660637d6ce05ce4a107628d4e95a37f96a53c5e SHA256 ac3f4f36a947dc38857e930c5be504a41cbeb3cd931632ffeb4b70555a4bbc72
+EBUILD soprano-2.2.2-r1.ebuild 2360 RMD160 ca79eded3ef456d0649c87452af83eae333a32e1 SHA1 c9e45f8d72432b8854c87eec4ec76e4b8d931ae7 SHA256 2c9281f66c9e718b3eba37b60429fe5bb51a5df2831e21199b6747c083c43b34
+EBUILD soprano-9999.ebuild 2633 RMD160 e7ea676b38f6b0fe236d2d5e590682ab153c2390 SHA1 e2005aaf590a20d815d85ad8d6aca8d9ec9608e9 SHA256 956d2f34199b8bea4b231a40875a07b1ee1092e880a9595948b7c8c72ff32750
+MISC ChangeLog 2382 RMD160 f27fa1dd6e1250f79a986ce49e6d683596bea2cd SHA1 253d8c69b211fe3ab1b305f7dbb671b6775f15fc SHA256 d9c0e6a7e789e9464dc3cf39fb4dfedcfa1e6224b23705b0008fa802fc361c78
 MISC metadata.xml 639 RMD160 234b659c3f69f67d78a63dc306d6b71c1a1a3b08 SHA1 4372f02abd387e168b818fde5b67ba5c90ebbd1a SHA256 d6779255efef8efa04149e0547e0cd1d4616858a69b07e43b444698ef5bd4a99
diff --git a/dev-libs/soprano/soprano-2.2.2-r1.ebuild b/dev-libs/soprano/soprano-2.2.2-r1.ebuild
new file mode 100644
index 00000000000..72ee88f5a94
--- /dev/null
+++ b/dev-libs/soprano/soprano-2.2.2-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/soprano-2.2.2.ebuild,v 1.1 2009/03/15 14:14:47 scarabeus Exp $
+
+EAPI="2"
+
+JAVA_PKG_OPT_USE="java"
+inherit base cmake-utils flag-o-matic java-pkg-opt-2
+
+DESCRIPTION="Soprano is a library which provides a nice QT interface to RDF storage solutions."
+HOMEPAGE="http://sourceforge.net/projects/soprano"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE="+clucene +dbus debug doc elibc_FreeBSD java +raptor +redland"
+
+COMMON_DEPEND="
+	x11-libs/qt-core:4
+	clucene? ( dev-cpp/clucene )
+	dbus? ( x11-libs/qt-dbus:4 )
+	raptor? ( >=media-libs/raptor-1.4.16 )
+	redland? (
+		>=dev-libs/rasqal-0.9.15
+		>=dev-libs/redland-1.0.6
+	)
+	java? ( >=virtual/jdk-1.6.0 )
+"
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	echo
+	if ! use redland && ! use java; then
+		ewarn "You explicitly disabled default soprano backend and haven't chosen other one."
+		ewarn "Applications using soprano may need at least one backend functional."
+		ewarn "If you experience any problems, enable any of those USE flags:"
+		ewarn "redland, java"
+	fi
+}
+
+src_prepare() {
+	base_src_prepare
+}
+
+src_configure() {
+	# Fix for missing pthread.h linking
+	# NOTE: temporarely fix until a better cmake files patch will be provided.
+	use elibc_FreeBSD && append-ldflags "-lpthread"
+
+	mycmakeargs="${mycmakeargs}
+		-DSOPRANO_BUILD_TESTS=OFF
+		-DCMAKE_SKIP_RPATH=OFF"
+
+	! use clucene && mycmakeargs="${mycmakeargs} -DSOPRANO_DISABLE_CLUCENE_INDEX=ON"
+	! use dbus && mycmakeargs="${mycmakeargs} -DSOPRANO_DISABLE_DBUS=ON"
+	! use raptor && mycmakeargs="${mycmakeargs} -DSOPRANO_DISABLE_RAPTOR_PARSER=ON"
+	! use redland && mycmakeargs="${mycmakeargs} -DSOPRANO_DISABLE_REDLAND_BACKEND=ON"
+	! use java && mycmakeargs="${mycmakeargs} -DSOPRANO_DISABLE_SESAME2_BACKEND=ON"
+	use doc && mycmakeargs="${mycmakeargs} -DSOPRANO_BUILD_API_DOCS=ON"
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	mycmakeargs="${mycmakeargs}
+		-DSOPRANO_BUILD_TESTS=ON"
+	cmake-utils_src_configure
+	cmake-utils_src_compile
+	ctest --extra-verbose || die "Tests failed."
+}
diff --git a/dev-libs/soprano/soprano-9999.ebuild b/dev-libs/soprano/soprano-9999.ebuild
index 2afbdbfd1f2..ba54ccdc8e0 100644
--- a/dev-libs/soprano/soprano-9999.ebuild
+++ b/dev-libs/soprano/soprano-9999.ebuild
@@ -62,7 +62,8 @@ src_configure() {
 	use elibc_FreeBSD && append-ldflags "-lpthread"
 
 	mycmakeargs="${mycmakeargs}
-		-DSOPRANO_BUILD_TESTS=OFF"
+		-DSOPRANO_BUILD_TESTS=OFF
+		-DCMAKE_SKIP_RPATH=OFF"
 
 	! use clucene && mycmakeargs="${mycmakeargs} -DSOPRANO_DISABLE_CLUCENE_INDEX=ON"
 	! use dbus && mycmakeargs="${mycmakeargs} -DSOPRANO_DISABLE_DBUS=ON"
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index a10778820fc..4371c65bfe9 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -489,11 +489,14 @@ kde4-base_src_configure() {
 	# Shadow existing /usr installations
 	unset KDEDIRS
 
-	# Override some environment variables - only when kdeprefix is different,
-	# to not break ccache/distcc
 	if [[ ${KDEDIR} != /usr ]]; then
+		# Override some environment variables - only when kdeprefix is different,
+		# to not break ccache/distcc
 		PATH="${KDEDIR}/bin:${PATH}"
 		LDPATH="${KDEDIR}/$(get_libdir):${LDPATH}"
+
+		# Append full RPATH
+		cmakeargs="${cmakeargs} -DCMAKE_SKIP_RPATH=OFF"
 	fi
 
 	if has kdeprefix ${IUSE//+} && use kdeprefix; then