diff options
| -rw-r--r-- | eclass/kde4-base.eclass | 29 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 28 |
2 files changed, 17 insertions, 40 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 1d3b627520df..d11a2b046d54 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.90 2011/04/22 18:48:03 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.91 2011/05/01 13:52:09 scarabeus Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -20,12 +20,12 @@ # for tests you should proceed with setting VIRTUALX_REQUIRED=test. : ${VIRTUALX_REQUIRED:=manual} -inherit kde4-functions fdo-mime gnome2-utils base virtualx versionator eutils +inherit kde4-functions toolchain-funcs fdo-mime gnome2-utils base virtualx versionator eutils if [[ ${BUILD_TYPE} = live ]]; then case ${KDE_SCM} in svn) inherit subversion ;; - git) inherit git ;; + git) inherit git-2 ;; esac fi @@ -385,7 +385,7 @@ if [[ ${KDEBASE} != "kde-base" && -n ${KDE_LINGUAS} && ${EAPI:-0} != 3 ]]; then # this can't be done on one line because if user doesn't use any localisation # then he is probably not interested in kde-l10n at all. kderdepend+=" - linguas_${_lingua}? ( $(add_kdebase_dep kde-l10n "linguas_${_lingua}(+)?") ) + linguas_${_lingua}? ( $(add_kdebase_dep kde-l10n "linguas_${_lingua}(+)") ) " done unset _lingua @@ -608,18 +608,7 @@ _calculate_live_repo() { ;; esac - case $_kmname in - kdepim|kdepim-runtime) - case ${PV} in - # kdepim still did not branch - 4.6.9999) - EGIT_BRANCH="master" - ;; - esac - ;; - esac EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}" - EGIT_PROJECT="${_kmname}" debug-print "${FUNCNAME}: Repository: ${EGIT_REPO_URI}" debug-print "${FUNCNAME}: Branch: ${EGIT_BRANCH}" @@ -653,6 +642,14 @@ kde4-base_pkg_setup() { # Don't set KDEHOME during compilation, it will cause access violations unset KDEHOME + # Check if gcc compiler is fresh enough. + # In theory should be in pkg_pretend but we check it only for kdelibs there + # and for others we do just quick scan in pkg_setup because pkg_pretend + # executions consume quite some time. + [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(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} @@ -710,7 +707,7 @@ kde4-base_src_unpack() { subversion_src_unpack ;; git) - git_src_unpack + git-2_src_unpack ;; esac else diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 76b6bbe94e02..c8990f6091d0 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.51 2011/04/06 14:22:14 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.52 2011/05/01 13:52:09 scarabeus Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: @@ -14,16 +14,9 @@ [[ -z ${KMNAME} ]] && die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild" -inherit kde4-base toolchain-funcs versionator +inherit kde4-base versionator -case ${EAPI:-0} in - 3) - KDEMETA_EXPF="pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm" - ;; - *) - KDEMETA_EXPF="pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm" - ;; -esac +KDEMETA_EXPF="pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm" EXPORT_FUNCTIONS ${KDEMETA_EXPF} # Add dependencies that all packages in a certain module share. @@ -137,17 +130,6 @@ fi # Specify extra parameters to pass to tar, in kde4-meta_src_extract. # '-xpf -j' are passed to tar by default. -# @FUNCTION: kde4-meta_pkg_pretend -# @DESCRIPTION: -# Currently only checks the gcc version. -kde4-meta_pkg_pretend() { - debug-print-function ${FUNCNAME} "$@" - - slot_is_at_least 4.6 ${SLOT} && ( [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) ) \ - && die "Sorry, but gcc-4.3 and earlier wont work for KDE SC 4.6 (see bug 354837)." -} - # @FUNCTION: kde4-meta_pkg_setup # @DESCRIPTION: # Currently calls its equivalent in kde4-base.eclass(5) and checks the gcc version. @@ -155,8 +137,6 @@ kde4-meta_pkg_pretend() { kde4-meta_pkg_setup() { debug-print-function ${FUNCNAME} "$@" - has pkg_pretend ${KDEMETA_EXPF} || kde4-meta_pkg_pretend - kde4-base_pkg_setup } @@ -178,7 +158,7 @@ kde4-meta_src_unpack() { subversion_bootstrap ;; git) - git_src_unpack + git-2_src_unpack ;; esac fi |