diff options
| -rw-r--r-- | dev-libs/soprano/Manifest | 8 | ||||
| -rw-r--r-- | dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake | 6 | ||||
| -rw-r--r-- | dev-libs/soprano/metadata.xml | 1 | ||||
| -rw-r--r-- | dev-libs/soprano/soprano-2.5.63_pre20101127.ebuild | 38 | ||||
| -rw-r--r-- | dev-libs/soprano/soprano-9999.ebuild | 34 |
5 files changed, 29 insertions, 58 deletions
diff --git a/dev-libs/soprano/Manifest b/dev-libs/soprano/Manifest index 34dbe48932b..45145b26b65 100644 --- a/dev-libs/soprano/Manifest +++ b/dev-libs/soprano/Manifest @@ -1,5 +1,5 @@ -AUX soprano-2.4.4-make-broken-redland-fatal.cmake 664 RMD160 cc2ad8117dd3202f38c7c3273506671a31c7a55b SHA1 64550959420cb2ec429c77a7f7ba6a1813343c6d SHA256 cabff4156ec94222573bdd7be5c387298ab89838b682cfb7ce0a59f4949a31ae +AUX soprano-2.4.4-make-broken-redland-fatal.cmake 626 RMD160 1e66eee8b51c408d2fdb1ee34d9b4b9aeea42379 SHA1 5bd1adc38db7547631d6ebd55a41b5fbdfe40335 SHA256 654292d68cbc6d511d7b0db0387e3f1f426484934b6a5e9355c63e7606ead051 DIST soprano-2.5.63_pre20101127.tar.bz2 1939526 RMD160 b22cf30c2e993b065cbc1398b8f5903ea62ff4b6 SHA1 88e55a4f5ac895d3c11a9fc7786c0aa506179e30 SHA256 b0b8e76e4f025e1ebef8a2bd24b7e7bbb0ec5fa0af9724bdaf9e036b9cce3572 -EBUILD soprano-2.5.63_pre20101127.ebuild 2774 RMD160 397ebaf71f9e4230a6443868f3e6d3d43032606a SHA1 dc5d5dfaa134111dab8b052a4a87de2453cc5678 SHA256 14d43e7e7ad18f263c9b8f9fc503f568d6182c87118ec2586dc8e2c9a2bc34d8 -EBUILD soprano-9999.ebuild 2757 RMD160 b6de33d8a54ff5eaee82fa83b045263308f0ee94 SHA1 8ff3b3d9d607ee74c891a2e0b9528793f939e08c SHA256 e9c243a0c3ef55abd2136aff9d86a7201133bf2da69f7fb302c10c99ce0faef5 -MISC metadata.xml 661 RMD160 4cc052a1f0507d9ea45b3dc36c0d1319cd5d6801 SHA1 ccb365c5b898290244b5ea3c66fa938fb327cce6 SHA256 e06e233e003c202ac8257cdc080eb6380dc6b78166554c54fe72cee5ba39619b +EBUILD soprano-2.5.63_pre20101127.ebuild 2307 RMD160 365a4883002326c555c393f8fe841081ba277816 SHA1 69e86e4df711f2eb045e4b906f589658c125e8b3 SHA256 ee5f127986159bdedaca3dc8924ecf977be3ce1a3b2a6438f210a1143b67b0b7 +EBUILD soprano-9999.ebuild 2332 RMD160 a23a7e55b3d17b132915465f0a43bc7f070707ea SHA1 ce8408b7767109bdd7c8b08d8105100ef8a3033c SHA256 c5f465fd60fe6faef4c2868295492d3bf1c489c3f0d3d6fde5e8f31903edb00a +MISC metadata.xml 559 RMD160 b045ab65b4cbffa13c91653aec94ae9991cc9245 SHA1 bcb25e059bba95e91facdcf2386626cf9d39a1bf SHA256 9a0ba3898e768e65e1e9ea29c799b92ac27adc25bf7b1b0c77830799e8fa1061 diff --git a/dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake b/dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake index 84e7e0689da..e63c5a487f1 100644 --- a/dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake +++ b/dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake @@ -1,6 +1,6 @@ -diff -ru ../soprano-2.4.4/cmake/modules/FindRedland.cmake ./cmake/modules/FindRedland.cmake ---- ../soprano-2.4.4/cmake/modules/FindRedland.cmake 2009-12-18 15:33:44.000000000 +0100 -+++ ./cmake/modules/FindRedland.cmake 2010-07-06 03:25:55.421484970 +0200 +diff -ru cmake/modules/FindRedland.cmake cmake/modules/FindRedland.cmake +--- cmake/modules/FindRedland.cmake 2009-12-18 15:33:44.000000000 +0100 ++++ cmake/modules/FindRedland.cmake 2010-07-06 03:25:55.421484970 +0200 @@ -108,7 +108,7 @@ if(NOT "${_TEST_EXITCODE}" EQUAL 0) set(_REDLAND_VERSION_OK) diff --git a/dev-libs/soprano/metadata.xml b/dev-libs/soprano/metadata.xml index fff5862b4ed..b992f4ad362 100644 --- a/dev-libs/soprano/metadata.xml +++ b/dev-libs/soprano/metadata.xml @@ -4,7 +4,6 @@ <herd>kde</herd> <use> <flag name="clucene">Enable <pkg>dev-cpp/clucene</pkg> backend support.</flag> - <flag name="java">Enables support for <pkg>virtual/jre-1.6.0</pkg> (sesame2) storage backend.</flag> <flag name="raptor">Enables support for <pkg>media-libs/raptor</pkg> RDF parser/serializer.</flag> <flag name="redland">Enables support for the <pkg>dev-libs/redland</pkg> storage backend (really slow one).</flag> <flag name="virtuoso">Enables support for <pkg>dev-db/virtuoso</pkg> storage backend.</flag> diff --git a/dev-libs/soprano/soprano-2.5.63_pre20101127.ebuild b/dev-libs/soprano/soprano-2.5.63_pre20101127.ebuild index 9b229d88592..2d768f5d846 100644 --- a/dev-libs/soprano/soprano-2.5.63_pre20101127.ebuild +++ b/dev-libs/soprano/soprano-2.5.63_pre20101127.ebuild @@ -2,10 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="2" +EAPI="3" -JAVA_PKG_OPT_USE="java" -inherit base java-pkg-opt-2 cmake-utils flag-o-matic +inherit cmake-utils flag-o-matic DESCRIPTION="Library that provides a nice Qt interface to RDF storage solutions" HOMEPAGE="http://sourceforge.net/projects/soprano" @@ -14,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="LGPL-2" KEYWORDS="~amd64 ~x86" SLOT="0" -IUSE="clucene +dbus debug doc elibc_FreeBSD java +raptor +redland test +virtuoso" +IUSE="clucene +dbus debug doc elibc_FreeBSD +raptor +redland test +virtuoso" RESTRICT="test" @@ -27,7 +26,6 @@ COMMON_DEPEND=" >=dev-libs/rasqal-0.9.15 >=dev-libs/redland-1.0.10 ) - java? ( >=virtual/jdk-1.6.0 ) virtuoso? ( dev-db/libiodbc:0 ) " DEPEND="${COMMON_DEPEND} @@ -45,8 +43,6 @@ PATCHES=( ) pkg_setup() { - java-pkg-opt-2_pkg_setup - if [[ ${PV} = *9999* && -z $I_KNOW_WHAT_I_AM_DOING ]]; then echo ewarn "WARNING! This is an experimental ebuild of ${PN} SVN tree. Use at your own risk." @@ -54,28 +50,16 @@ pkg_setup() { echo fi - if ! use java && ! use virtuoso; then - if ! use redland; then - echo - ewarn "You have explicitly disabled the default soprano backend and haven't chosen" - ewarn "a different one. Applications using soprano may need at least one backend" - ewarn "to be functional. If you experience any problems, enable any of those USE" - ewarn "flags:" - ewarn "java (deprecated), redland, virtuoso (recommended)" - echo - else - echo - ewarn "You selected redland as the only backend for soprano." - ewarn "Be advised that it's known to be broken (bug #275326)." - echo - fi + if ! use virtuoso; then + echo + ewarn "You have explicitly disabled the default soprano backend" + ewarn "Applications using soprano may need at least one backend" + ewarn "to be functional. If you experience any problems, enable" + ewarn "the virtuoso USE flag:" + echo fi } -src_prepare() { - base_src_prepare -} - src_configure() { # Fix for missing pthread.h linking # NOTE: temporarily fix until a better cmake files patch will be provided. @@ -84,12 +68,12 @@ src_configure() { mycmakeargs=( -DSOPRANO_BUILD_TESTS=OFF -DCMAKE_SKIP_RPATH=OFF + -DSOPRANO_DISABLE_SESAME2_BACKEND=ON $(cmake-utils_use !clucene SOPRANO_DISABLE_CLUCENE_INDEX) $(cmake-utils_use !dbus SOPRANO_DISABLE_DBUS) $(cmake-utils_use !raptor SOPRANO_DISABLE_RAPTOR_PARSER) $(cmake-utils_use !redland SOPRANO_DISABLE_RAPTOR_SERIALIZER) $(cmake-utils_use !redland SOPRANO_DISABLE_REDLAND_BACKEND) - $(cmake-utils_use !java SOPRANO_DISABLE_SESAME2_BACKEND) $(cmake-utils_use !virtuoso SOPRANO_DISABLE_VIRTUOSO_BACKEND) $(cmake-utils_use doc SOPRANO_BUILD_API_DOCS) $(cmake-utils_use test SOPRANO_BUILD_TESTS) diff --git a/dev-libs/soprano/soprano-9999.ebuild b/dev-libs/soprano/soprano-9999.ebuild index 125ad892bf2..e0c91105dd2 100644 --- a/dev-libs/soprano/soprano-9999.ebuild +++ b/dev-libs/soprano/soprano-9999.ebuild @@ -2,10 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="2" +EAPI="3" -JAVA_PKG_OPT_USE="java" -inherit base java-pkg-opt-2 cmake-utils flag-o-matic git +inherit base cmake-utils flag-o-matic git DESCRIPTION="Library that provides a nice Qt interface to RDF storage solutions" HOMEPAGE="http://sourceforge.net/projects/soprano" @@ -14,7 +13,7 @@ EGIT_REPO_URI="git://anongit.kde.org/soprano" LICENSE="LGPL-2" KEYWORDS="" SLOT="0" -IUSE="clucene +dbus debug doc elibc_FreeBSD java +raptor +redland test +virtuoso" +IUSE="clucene +dbus debug doc elibc_FreeBSD +raptor +redland test +virtuoso" COMMON_DEPEND=" >=x11-libs/qt-core-4.5.0:4 @@ -25,7 +24,6 @@ COMMON_DEPEND=" >=dev-libs/rasqal-0.9.15 >=dev-libs/redland-1.0.10 ) - java? ( >=virtual/jdk-1.6.0 ) virtuoso? ( dev-db/libiodbc:0 ) " DEPEND="${COMMON_DEPEND} @@ -43,8 +41,6 @@ PATCHES=( ) pkg_setup() { - java-pkg-opt-2_pkg_setup - if [[ ${PV} = *9999* && -z $I_KNOW_WHAT_I_AM_DOING ]]; then echo ewarn "WARNING! This is an experimental ebuild of ${PN} SVN tree. Use at your own risk." @@ -52,21 +48,13 @@ pkg_setup() { echo fi - if ! use java && ! use virtuoso; then - if ! use redland; then - echo - ewarn "You have explicitly disabled the default soprano backend and haven't chosen" - ewarn "a different one. Applications using soprano may need at least one backend" - ewarn "to be functional. If you experience any problems, enable any of those USE" - ewarn "flags:" - ewarn "java (deprecated), redland, virtuoso (recommended)" - echo - else - echo - ewarn "You selected redland as the only backend for soprano." - ewarn "Be advised that it's known to be broken (bug #275326)." - echo - fi + if ! use virtuoso; then + echo + ewarn "You have explicitly disabled the default soprano backend" + ewarn "Applications using soprano may need at least one backend" + ewarn "to be functional. If you experience any problems, enable" + ewarn "the virtuoso USE flag:" + echo fi } @@ -82,12 +70,12 @@ src_configure() { mycmakeargs=( -DSOPRANO_BUILD_TESTS=OFF -DCMAKE_SKIP_RPATH=OFF + -DSOPRANO_DISABLE_SESAME2_BACKEND=ON $(cmake-utils_use !clucene SOPRANO_DISABLE_CLUCENE_INDEX) $(cmake-utils_use !dbus SOPRANO_DISABLE_DBUS) $(cmake-utils_use !raptor SOPRANO_DISABLE_RAPTOR_PARSER) $(cmake-utils_use !redland SOPRANO_DISABLE_RAPTOR_SERIALIZER) $(cmake-utils_use !redland SOPRANO_DISABLE_REDLAND_BACKEND) - $(cmake-utils_use !java SOPRANO_DISABLE_SESAME2_BACKEND) $(cmake-utils_use !virtuoso SOPRANO_DISABLE_VIRTUOSO_BACKEND) $(cmake-utils_use doc SOPRANO_BUILD_API_DOCS) $(cmake-utils_use test SOPRANO_BUILD_TESTS) |