diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2016-12-25 00:40:55 +0100 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2016-12-25 00:40:55 +0100 |
commit | e7f25f0c7eb3f509ac44f6978f70007b34f8b49a (patch) | |
tree | c09cba98ca51cdb2fb632ca0ab60b80838ce36b8 /eclass | |
parent | dev-util/kdevelop-python: Import latest (diff) | |
download | kde-sunset-e7f25f0c7eb3f509ac44f6978f70007b34f8b49a.tar.gz kde-sunset-e7f25f0c7eb3f509ac44f6978f70007b34f8b49a.tar.bz2 kde-sunset-e7f25f0c7eb3f509ac44f6978f70007b34f8b49a.zip |
Move kdelibs from kde-base to kde-framworks
So the friggin' stupid cat move Gentoo kde maintainers did won't break
old kdelibs anymore.
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/kde-functions.eclass | 10 | ||||
-rw-r--r-- | eclass/kde.eclass | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass index 39e00581..4cf57312 100644 --- a/eclass/kde-functions.eclass +++ b/eclass/kde-functions.eclass @@ -391,14 +391,14 @@ need-kde() { # If we're a kde-base package, we need at least our own version of kdelibs. # Note: we only set RDEPEND if it is already set, otherwise # we break packages relying on portage copying RDEPEND from DEPEND. - DEPEND="${DEPEND} ~kde-base/kdelibs-$PV" - RDEPEND="${x_DEPEND} ~kde-base/kdelibs-${PV}" + DEPEND="${DEPEND} ~kde-frameworks/kdelibs-$PV" + RDEPEND="${x_DEPEND} ~kde-frameworks/kdelibs-${PV}" else # Things outside kde-base need a minimum version, - # but kde-base/kdelibs:kde-4 mustn't satisfy it. + # but kde-frameworks/kdelibs:kde-4 mustn't satisfy it. min-kde-ver ${KDEVER} - DEPEND="${DEPEND} =kde-base/kdelibs-3.5*" - RDEPEND="${x_DEPEND} =kde-base/kdelibs-3.5*" + DEPEND="${DEPEND} =kde-frameworks/kdelibs-3.5*" + RDEPEND="${x_DEPEND} =kde-frameworks/kdelibs-3.5*" fi qtver-from-kdever ${KDEVER} diff --git a/eclass/kde.eclass b/eclass/kde.eclass index d57d047a..2019a28e 100644 --- a/eclass/kde.eclass +++ b/eclass/kde.eclass @@ -98,20 +98,20 @@ kde_pkg_setup() { if [[ ${PN} != "arts" ]] && [[ ${PN} != "kdelibs" ]] ; then if [[ ${ARTS_REQUIRED} == 'yes' ]] || \ ( [[ ${ARTS_REQUIRED} != "never" ]] && use arts ) ; then - if ! built_with_use =kde-base/kdelibs-3.5* arts ; then + if ! built_with_use =kde-frameworks/kdelibs-3.5* arts ; then if has arts ${IUSE} && use arts; then eerror "You are trying to compile ${CATEGORY}/${PF} with the \"arts\" USE flag enabled." else eerror "The package ${CATEGORY}/${PF} you're trying to merge requires aRTs." fi - eerror "However, $(best_version =kde-base/kdelibs-3.5*) was compiled with the arts USE flag disabled." + eerror "However, $(best_version =kde-frameworks/kdelibs-3.5*) was compiled with the arts USE flag disabled." eerror if has arts ${IUSE} && use arts; then eerror "You must either disable this USE flag, or recompile" else eerror "To build this package you have to recompile" fi - eerror "$(best_version =kde-base/kdelibs-3.5*) with the arts USE flag enabled." + eerror "$(best_version =kde-frameworks/kdelibs-3.5*) with the arts USE flag enabled." die "kdelibs missing arts" fi fi |