From 9f43850753db10beb092cfed67fe591f21a761bc Mon Sep 17 00:00:00 2001 From: anomen Date: Thu, 4 Apr 2013 22:20:21 +0200 Subject: [PATCH] ecless/kde - move qt-meta --- eclass/kde-functions.eclass | 4 ++-- eclass/kde.eclass | 2 +- eclass/qt3.eclass | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass index 0895982..9b7e547 100644 --- a/eclass/kde-functions.eclass +++ b/eclass/kde-functions.eclass @@ -513,8 +513,8 @@ need-qt() { fi case ${QTVER} in - 3*) DEPEND="${DEPEND} =x11-libs/qt-meta-3*" - RDEPEND="${RDEPEND} =x11-libs/qt-meta-3*" + 3*) DEPEND="${DEPEND} =dev-qt/qt-meta-3*" + RDEPEND="${RDEPEND} =dev-qt/qt-meta-3*" ;; *) echo "!!! error: $FUNCNAME() called with invalid parameter: \"$QTVER\", please report bug" && exit 1;; esac diff --git a/eclass/kde.eclass b/eclass/kde.eclass index 48171c5..b85a9bb 100644 --- a/eclass/kde.eclass +++ b/eclass/kde.eclass @@ -118,7 +118,7 @@ kde_pkg_setup() { fi if [[ "${PN}" = "kdelibs" ]]; then - use doc && if ! built_with_use =x11-libs/qt-meta-3* doc ; then + use doc && if ! built_with_use =dev-qt/qt-meta-3* doc ; then eerror "Building kdelibs with the doc USE flag requires qt to be built with the doc USE flag." eerror "Please re-emerge qt-3 with this USE flag enabled." fi diff --git a/eclass/qt3.eclass b/eclass/qt3.eclass index dec23da..cd59f8e 100644 --- a/eclass/qt3.eclass +++ b/eclass/qt3.eclass @@ -12,7 +12,7 @@ inherit toolchain-funcs versionator eutils -QTPKG="x11-libs/qt-" +QTPKG="dev-qt/qt-" QT3MAJORVERSIONS="3.3 3.2 3.1 3.0" QT3VERSIONS="3.3.8b-r1 3.3.8b 3.3.8-r4 3.3.8-r3 3.3.8-r2 3.3.8-r1 3.3.8 3.3.6-r5 3.3.6-r4 3.3.6-r3 3.3.6-r2 3.3.6-r1 3.3.6 3.3.5-r1 3.3.5 3.3.4-r9 3.3.4-r8 3.3.4-r7 3.3.4-r6 3.3.4-r5 3.3.4-r4 3.3.4-r3 3.3.4-r2 3.3.4-r1 3.3.4 3.3.3-r3 3.3.3-r2 3.3.3-r1 3.3.3 3.3.2 3.3.1-r2 3.3.1-r1 3.3.1 3.3.0-r1 3.3.0 3.2.3-r1 3.2.3 3.2.2-r1 3.2.2 3.2.1-r2 3.2.1-r1 3.2.1 3.2.0 3.1.2-r4 3.1.2-r3 3.1.2-r2 3.1.2-r1 3.1.2 3.1.1-r2 3.1.1-r1 3.1.1 3.1.0-r3 3.1.0-r2 3.1.0-r1 3.1.0" -- 2.11.4.GIT