diff options
| -rw-r--r-- | dev-libs/soprano/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/soprano/soprano-2.2.2.ebuild | 2 | ||||
| -rw-r--r-- | dev-libs/soprano/soprano-9999.ebuild | 4 | ||||
| -rw-r--r-- | eclass/cmake-utils.eclass | 27 | ||||
| -rw-r--r-- | eclass/kde4-base.eclass | 2 |
5 files changed, 18 insertions, 21 deletions
diff --git a/dev-libs/soprano/Manifest b/dev-libs/soprano/Manifest index 66dc2b0f2d4..f8004715100 100644 --- a/dev-libs/soprano/Manifest +++ b/dev-libs/soprano/Manifest @@ -1,5 +1,5 @@ DIST soprano-2.2.2.tar.bz2 1849380 RMD160 31d8dce6cf5972b433b1b69e4027ef7650b9aa14 SHA1 a660637d6ce05ce4a107628d4e95a37f96a53c5e SHA256 ac3f4f36a947dc38857e930c5be504a41cbeb3cd931632ffeb4b70555a4bbc72 -EBUILD soprano-2.2.2.ebuild 2196 RMD160 be36ee7925fc6a6f18eba35f90b3c8b6e3916d5f SHA1 9eb1d171f246a192c2cbe3ab6dc2f77537c5551e SHA256 c5aa3a2a5da40b27486ea157f2b297cbb01ac7e2f2e04a703c5ec58a429435d1 -EBUILD soprano-9999.ebuild 2592 RMD160 1d0c963520360ccdfb5cc0b32a4f967519e4a7b4 SHA1 8f53e5c5e66b5b134ef0afdcbcd6c7eeaf3ebafe SHA256 f82e0cbd6a989a91ee4d04d533ca9ad2bbc4956b0c9e5f9db8dc0f4fffa55d60 +EBUILD soprano-2.2.2.ebuild 2189 RMD160 386c14858e77f5c6c42e8f8940e64d5ae9181858 SHA1 96532185b88ce26c5b740c131172aef15a2d765d SHA256 cf97988f198974417ffb4b87245c1b54758b909cbdcb2c5805aa08b9b91ced30 +EBUILD soprano-9999.ebuild 2582 RMD160 f425205b91d0693d05f276edfd97b86001799241 SHA1 e4de3ec7e16c0844425a8023bfce9e6228697a43 SHA256 7daf8ed4494f3e572343d49797a77057fe63629fc76412d64355a6e7e185024c MISC ChangeLog 2193 RMD160 c55bb91df07da62b250f48114ab029744811b088 SHA1 2cd561e1c70a8955b016153267ccd8c6f95cb993 SHA256 fe4a928741a14a6f370aa47f770819a9ffd0d735a74848e343080e7d659095b4 MISC metadata.xml 639 RMD160 234b659c3f69f67d78a63dc306d6b71c1a1a3b08 SHA1 4372f02abd387e168b818fde5b67ba5c90ebbd1a SHA256 d6779255efef8efa04149e0547e0cd1d4616858a69b07e43b444698ef5bd4a99 diff --git a/dev-libs/soprano/soprano-2.2.2.ebuild b/dev-libs/soprano/soprano-2.2.2.ebuild index 5150c7cae98..5f827779445 100644 --- a/dev-libs/soprano/soprano-2.2.2.ebuild +++ b/dev-libs/soprano/soprano-2.2.2.ebuild @@ -45,7 +45,7 @@ pkg_setup() { } src_prepare() { - cmake-utils_src_prepare + base_src_prepare } src_configure() { diff --git a/dev-libs/soprano/soprano-9999.ebuild b/dev-libs/soprano/soprano-9999.ebuild index 71aa5696c10..fdcd906d349 100644 --- a/dev-libs/soprano/soprano-9999.ebuild +++ b/dev-libs/soprano/soprano-9999.ebuild @@ -43,7 +43,7 @@ pkg_setup() { ewarn "WARNING! This is an experimental ebuild of ${PN} SVN tree. Use at your own risk." ewarn "Do _NOT_ file bugs at bugs.gentoo.org because of this ebuild!" echo - if ! use redland && ! use sesame2 && ! use virtuoso ; then + if ! use redland && ! use java && ! use virtuoso ; 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:" @@ -52,7 +52,7 @@ pkg_setup() { } src_prepare() { - cmake-utils_src_prepare + base_src_prepare } src_configure() { diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 3b4af6fbf95..c137b0754c1 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -45,29 +45,29 @@ _use_me_now_inverted() { echo "-D$1_${3:-$2}=$(use $2 && echo OFF || echo ON)" } -# @VARIABLE: DOCS +# @ECLASS-VARIABLE: DOCS # @DESCRIPTION: # Documents to pass to dodoc. -# @VARIABLE: PREFIX +# @ECLASS-VARIABLE: PREFIX # @DESCRIPTION # Eclass respects PREFIX variable, though it's not recommended way to set # install/lib/bin prefixes. # Use -DCMAKE_INSTALL_PREFIX=... CMake variable instead. -# @VARIABLE: CMAKE_IN_SOURCE_BUILD +# @ECLASS-VARIABLE: CMAKE_IN_SOURCE_BUILD # @DESCRIPTION: # Set to enable in-source build. -# @VARIABLE: CMAKE_NO_COLOR +# @ECLASS-VARIABLE: CMAKE_NO_COLOR # @DESCRIPTION: # Set to disable cmake output coloring. -# @VARIABLE: CMAKE_VERBOSE +# @ECLASS-VARIABLE: CMAKE_VERBOSE # @DESCRIPTION: # Set to enable verbose messages during compilation. -# @VARIABLE: CMAKE_BUILD_TYPE +# @ECLASS-VARIABLE: CMAKE_BUILD_TYPE # @DESCRIPTION: # Set to override default CMAKE_BUILD_TYPE. Only useful for packages # known to make use of "if (CMAKE_BUILD_TYPE MATCHES xxx)". @@ -150,17 +150,11 @@ cmake-utils_use_build() { _use_me_now BUILD "$@" ; } # and -DHAVE_FOO=OFF if it is disabled. cmake-utils_has() { _use_me_now HAVE "$@" ; } -# @FUNCTION: cmake-utils_src_prepare -# @DESCRIPTION: -# General function for src_prepare with cmake. Main purpose is to strip hardcoded -# build type definitions and override cmake default build type specific flags. -# Autopatcher is available. -cmake-utils_src_prepare() { +# internal function for modifying hardcoded definitions. +# remove dangerous defintionts that override gentoo settings. +_modify-cmakelists() { debug-print-function ${FUNCNAME} "$@" - # Invoke autopatcher - base_src_prepare - # Comment out all set (<some_should_be_user_defined_variable> value) # TODO add QA checker - inform when something from avobe is set in CMakeLists.txt find "${S}" -name CMakeLists.txt \ @@ -182,6 +176,9 @@ Install path: ${CMAKE_INSTALL_PREFIX}\n")' >> CMakeLists.txt cmake-utils_src_configure() { debug-print-function ${FUNCNAME} "$@" + # remove dangerous things. + _modify-cmakelists + # @SEE CMAKE_BUILD_TYPE if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then # Handle release builds diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index fc26ef73cc1..55142776020 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -534,7 +534,7 @@ kde4-base_src_prepare() { enable_selected_linguas fi - cmake-utils_src_prepare + base_src_prepare # Save library dependencies if [[ -n ${KMSAVELIBS} ]] ; then |