diff options
| author | Andreas K. Huettel (dilfridge) <mail@akhuettel.de> | 2013-02-02 00:22:47 +0100 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <mail@akhuettel.de> | 2013-02-02 00:22:47 +0100 |
| commit | 24db6d852350f272a583a81bc3010c36c2f1aa33 (patch) | |
| tree | 8f9221424230e8821aaecb34d2fc42da76c9f197 /eclass | |
| parent | 59c274219d09cded68b416ac7e88fdd9b3e4c806 (diff) | |
| download | kde-24db6d852350f272a583a81bc3010c36c2f1aa33.tar.gz kde-24db6d852350f272a583a81bc3010c36c2f1aa33.tar.bz2 kde-24db6d852350f272a583a81bc3010c36c2f1aa33.zip | |
[eclass] Remove remaining references to IUSE=kdeprefix
If we dont do this we need to add special logic since (as string) 4.10 < 4.6 ...
and this would get far too complicated.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 20 | ||||
| -rw-r--r-- | eclass/kde4-meta-pkg.eclass | 6 |
2 files changed, 0 insertions, 26 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 5abe955a831..0b16ad47e97 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -172,12 +172,6 @@ case ${KDEBASE} in RESTRICT+=" test" fi - # Only add the kdeprefix USE flag for older versions, to help - # non-portage package managers handle the upgrade - if [[ ${PV} < 4.6.4 && ( ( ${KMNAME} != kdepim && ${PN} != kdepim-runtime ) || ${PV} < 4.6 ) ]]; 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). @@ -598,20 +592,6 @@ kde4-base_pkg_setup() { eqawarn "Please do not just set IUSE=handbook, as this leads to dependency errors." fi - if use_if_iuse kdeprefix; then - eerror "Sorry, kdeprefix support has been removed." - eerror "Please remove kdeprefix from your USE variable." - die "kdeprefix support has been removed" - fi - - if [[ ${CATEGORY}/${PN} != kde-base/kdelibs && ${CATEGORY}/${PN} != kde-base/kde-env ]] && \ - { [[ ${KDE_REQUIRED} == always ]] || { [[ ${KDE_REQUIRED} == optional ]] && use kde; }; } && \ - has_version kde-base/kdelibs[kdeprefix]; then - eerror "Sorry, kdeprefix support has been removed." - eerror "Please rebuild kdelibs without kdeprefix support." - die "kdeprefix support has been removed" - fi - # Don't set KDEHOME during compilation, it will cause access violations unset KDEHOME diff --git a/eclass/kde4-meta-pkg.eclass b/eclass/kde4-meta-pkg.eclass index 24416eeec38..9a0cc0c4e16 100644 --- a/eclass/kde4-meta-pkg.eclass +++ b/eclass/kde4-meta-pkg.eclass @@ -16,10 +16,4 @@ HOMEPAGE="http://www.kde.org/" LICENSE="metapackage" IUSE="aqua" -# Only add the kdeprefix USE flag for older versions, to help -# non-portage package managers handle the upgrade -if [[ ${PV} < 4.6.4 && ( ${PN} != kdepim-meta || ${PV} < 4.6 ) ]]; then - IUSE+=" kdeprefix" -fi - SLOT=4 |