diff options
Diffstat (limited to 'eclass/kde4-base.eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 86 |
1 files changed, 14 insertions, 72 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 6779d41a0c4b..d327de1f5791 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -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/eclass/kde4-base.eclass,v 1.95 2011/06/06 18:42:55 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.96 2011/06/06 21:38:18 abcd Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -175,12 +175,14 @@ case ${KDEBASE} in if [[ $BUILD_TYPE = live ]]; then # Disable tests for live ebuilds RESTRICT+=" test" - # Live ebuilds in kde-base default to kdeprefix by default - IUSE+=" +kdeprefix" - else - # All other ebuild types default to -kdeprefix as before + fi + + # Only add the kdeprefix USE flag for older versions, to help + # non-portage package managers handle the upgrade + if [[ ${PV} < 4.6.4 ]]; then IUSE+=" kdeprefix" fi + # This code is to prevent portage from searching GENTOO_MIRRORS for # packages that will never be mirrored. (As they only will ever be in # the overlay). @@ -615,7 +617,7 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}" # @FUNCTION: kde4-base_pkg_setup # @DESCRIPTION: -# Do the basic kdeprefix KDEDIR settings and determine with which kde should +# Do the basic KDEDIR settings and determine with which kde should # optional applications link kde4-base_pkg_setup() { debug-print-function ${FUNCNAME} "$@" @@ -648,40 +650,9 @@ kde4-base_pkg_setup() { ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ && die "Sorry, but gcc-4.3 and earlier wont work for KDE (see bug 354837)." - if [[ ${KDEBASE} = kde-base ]]; then - if use kdeprefix; then - KDEDIR=/usr/kde/${SLOT} - else - KDEDIR=/usr - fi - : ${PREFIX:=${KDEDIR}} - else - # Determine KDEDIR by loooking for the closest match with KDE_MINIMAL - KDEDIR= - local kde_minimal_met - for slot in ${KDE_SLOTS[@]} ${KDE_LIVE_SLOTS[@]}; do - [[ -z ${kde_minimal_met} ]] && [[ ${slot} = ${KDE_MINIMAL} ]] && kde_minimal_met=1 - if [[ -n ${kde_minimal_met} ]] && has_version "kde-base/kdelibs:${slot}"; then - if has_version "kde-base/kdelibs:${slot}[kdeprefix]"; then - KDEDIR=/usr/kde/${slot} - else - KDEDIR=/usr - fi - break; - fi - done - unset slot - - # Bail out if kdelibs required but not found - if [[ ${KDE_REQUIRED} = always ]] || { [[ ${KDE_REQUIRED} = optional ]] && use kde; }; then - [[ -z ${KDEDIR} ]] && die "Failed to determine KDEDIR!" - else - [[ -z ${KDEDIR} ]] && KDEDIR=/usr - fi - - : ${PREFIX:=/usr} - fi - EKDEDIR=${EPREFIX}${KDEDIR} + KDEDIR=/usr + : ${PREFIX:=/usr} + EKDEDIR=${EPREFIX}/usr # Point pkg-config path to KDE *.pc files export PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}" @@ -832,33 +803,13 @@ kde4-base_src_configure() { # Shadow existing /usr installations unset KDEDIRS - # Handle kdeprefix-ed KDE - if [[ ${KDEDIR} != /usr ]]; then - # Override some environment variables - only when kdeprefix is different, - # to not break ccache/distcc - PATH="${EKDEDIR}/bin:${PATH}" - - # Append library search path - append-ldflags -L"${EKDEDIR}/$(get_libdir)" - - # Append full RPATH - cmakeargs+=(-DCMAKE_SKIP_RPATH=OFF) - - # Set cmake prefixes to allow buildsystem to locate valid KDE installation - # when more are present - cmakeargs+=(-DCMAKE_SYSTEM_PREFIX_PATH="${EKDEDIR}") - fi - #qmake -query QT_INSTALL_LIBS unavailable when cross-compiling - tc-is-cross-compiler && cmakeargs+=(-DQT_LIBRARY_DIR=${ROOT}/usr/lib/qt4) + tc-is-cross-compiler && cmakeargs+=(-DQT_LIBRARY_DIR=${ROOT}/usr/$(get_libdir)/qt4) #kde-config -path data unavailable when cross-compiling tc-is-cross-compiler && cmakeargs+=(-DKDE4_DATA_DIR=${ROOT}/usr/share/apps/) - # Handle kdeprefix in application itself - if ! has kdeprefix ${IUSE//+} || ! use kdeprefix; then - # If prefix is /usr, sysconf needs to be /etc, not /usr/etc - cmakeargs+=(-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc) - fi + # sysconf needs to be /etc, not /usr/etc + cmakeargs+=(-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc) if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]]; then mycmakeargs=(${mycmakeargs}) @@ -991,15 +942,6 @@ kde4-base_pkg_postinst() { fi fi fi - if has kdeprefix ${IUSE//+} && use kdeprefix; then - # warning about kdeprefix - echo - ewarn "WARNING! You have the kdeprefix useflag enabled." - eerror "This setting will be removed on or about 2011-06-06." - ewarn "You are using this setup at your own risk and the kde team does not" - ewarn "take responsibilities for dead kittens." - echo - fi } # @FUNCTION: kde4-base_pkg_postrm |