diff options
17 files changed, 14 insertions, 13 deletions
diff --git a/kde-apps/kajongg/kajongg-16.08.3.ebuild b/kde-apps/kajongg/kajongg-16.08.3.ebuild index 8e2dce130d40..c756aa0c3f92 100644 --- a/kde-apps/kajongg/kajongg-16.08.3.ebuild +++ b/kde-apps/kajongg/kajongg-16.08.3.ebuild @@ -17,7 +17,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="${PYTHON_DEPS} $(add_kdeapps_dep libkdegames) - $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}") + $(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}") dev-db/sqlite:3 " RDEPEND="${DEPEND} diff --git a/kde-apps/kajongg/kajongg-16.12.0.ebuild b/kde-apps/kajongg/kajongg-16.12.0.ebuild index 0d77cad41f0e..11472fb6a0e8 100644 --- a/kde-apps/kajongg/kajongg-16.12.0.ebuild +++ b/kde-apps/kajongg/kajongg-16.12.0.ebuild @@ -17,7 +17,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="${PYTHON_DEPS} $(add_kdeapps_dep libkdegames) - $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}") + $(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}") dev-db/sqlite:3 " RDEPEND="${DEPEND} diff --git a/kde-apps/marble/marble-4.14.3.ebuild b/kde-apps/marble/marble-4.14.3.ebuild index 089db03a98db..07b77da4c527 100644 --- a/kde-apps/marble/marble-4.14.3.ebuild +++ b/kde-apps/marble/marble-4.14.3.ebuild @@ -37,7 +37,7 @@ RDEPEND=" python? ( ${PYTHON_DEPS} >=dev-python/PyQt4-4.4.4-r1[${PYTHON_USEDEP}] - kde? ( $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}" ) ) + kde? ( $(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}" ) ) ) shapefile? ( sci-libs/shapelib ) zip? ( dev-libs/quazip[qt4] ) diff --git a/kde-base/pykde4/Manifest b/kde-apps/pykde4/Manifest index 95faafe1cca4..95faafe1cca4 100644 --- a/kde-base/pykde4/Manifest +++ b/kde-apps/pykde4/Manifest diff --git a/kde-base/pykde4/files/kpythonpluginfactorywrapper.c-r2 b/kde-apps/pykde4/files/kpythonpluginfactorywrapper.c-r2 index f516f1b72281..f516f1b72281 100644 --- a/kde-base/pykde4/files/kpythonpluginfactorywrapper.c-r2 +++ b/kde-apps/pykde4/files/kpythonpluginfactorywrapper.c-r2 diff --git a/kde-base/pykde4/files/pykde4-4.14.0-arm-sip.patch b/kde-apps/pykde4/files/pykde4-4.14.0-arm-sip.patch index f6391a8ec714..f6391a8ec714 100644 --- a/kde-base/pykde4/files/pykde4-4.14.0-arm-sip.patch +++ b/kde-apps/pykde4/files/pykde4-4.14.0-arm-sip.patch diff --git a/kde-base/pykde4/files/pykde4-4.14.3-gcc-5.patch b/kde-apps/pykde4/files/pykde4-4.14.3-gcc-5.patch index 9c29ffa503fa..9c29ffa503fa 100644 --- a/kde-base/pykde4/files/pykde4-4.14.3-gcc-5.patch +++ b/kde-apps/pykde4/files/pykde4-4.14.3-gcc-5.patch diff --git a/kde-base/pykde4/metadata.xml b/kde-apps/pykde4/metadata.xml index 5c0841267d7e..5c0841267d7e 100644 --- a/kde-base/pykde4/metadata.xml +++ b/kde-apps/pykde4/metadata.xml diff --git a/kde-base/pykde4/pykde4-4.14.3-r1.ebuild b/kde-apps/pykde4/pykde4-4.14.3-r1.ebuild index e8eb357d250e..ce382c6d4345 100644 --- a/kde-base/pykde4/pykde4-4.14.3-r1.ebuild +++ b/kde-apps/pykde4/pykde4-4.14.3-r1.ebuild @@ -11,7 +11,7 @@ CMAKE_MAKEFILE_GENERATOR="emake" WEBKIT_REQUIRED="always" inherit python-r1 portability kde4-base multilib eutils -DESCRIPTION="Python bindings for KDE4" +DESCRIPTION="Python bindings for KDE SC 4" KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" IUSE="akonadi debug doc examples test" HOMEPAGE="https://techbase.kde.org/Development/Languages/Python" diff --git a/kde-misc/kanyremote/kanyremote-6.3.5.ebuild b/kde-misc/kanyremote/kanyremote-6.3.5.ebuild index 251d188302c8..7d15d7eb7209 100644 --- a/kde-misc/kanyremote/kanyremote-6.3.5.ebuild +++ b/kde-misc/kanyremote/kanyremote-6.3.5.ebuild @@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} >=app-mobilephone/anyremote-6.5[bluetooth?] dev-python/PyQt4[X,${PYTHON_USEDEP}] - kde-base/pykde4:4[${PYTHON_USEDEP}] + kde-apps/pykde4:4[${PYTHON_USEDEP}] bluetooth? ( dev-python/pybluez[${PYTHON_USEDEP}] ) " DEPEND="${RDEPEND} diff --git a/kde-misc/pyrad/pyrad-0.6.2-r1.ebuild b/kde-misc/pyrad/pyrad-0.6.2-r1.ebuild index 51f24ab037ea..9a18d259c44b 100644 --- a/kde-misc/pyrad/pyrad-0.6.2-r1.ebuild +++ b/kde-misc/pyrad/pyrad-0.6.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -22,6 +22,6 @@ IUSE="" S=${WORKDIR}/${MY_P} -RDEPEND="kde-base/pykde4:4[${PYTHON_USEDEP}]" +RDEPEND="kde-apps/pykde4:4[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/kde-misc/pyrad/pyrad-0.7.1.ebuild b/kde-misc/pyrad/pyrad-0.7.1.ebuild index 92966a53a0ba..d3d51cd32d5d 100644 --- a/kde-misc/pyrad/pyrad-0.7.1.ebuild +++ b/kde-misc/pyrad/pyrad-0.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P} RDEPEND=" kde-apps/kdialog:4 - kde-base/pykde4:4[${PYTHON_USEDEP}] + kde-apps/pykde4:4[${PYTHON_USEDEP}] " DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/kde-misc/synaptiks/synaptiks-0.8.1-r4.ebuild b/kde-misc/synaptiks/synaptiks-0.8.1-r4.ebuild index fcdd937ea1ec..e23759f09c68 100644 --- a/kde-misc/synaptiks/synaptiks-0.8.1-r4.ebuild +++ b/kde-misc/synaptiks/synaptiks-0.8.1-r4.ebuild @@ -21,7 +21,7 @@ RDEPEND=" >=dev-python/PyQt4-4.7[${PYTHON_USEDEP}] >=dev-python/pyudev-0.8[pyqt4,${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] - $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}" ) + $(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}" ) >=x11-drivers/xf86-input-synaptics-1.3 >=x11-libs/libXi-1.4 x11-libs/libXtst diff --git a/kde-plasma/plasma-workspace/plasma-workspace-4.11.22.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-4.11.22.ebuild index c8e048cd340a..3f18976d6896 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-4.11.22.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-4.11.22.ebuild @@ -42,7 +42,7 @@ COMMONDEPEND=" python? ( ${PYTHON_DEPS} >=dev-python/PyQt4-4.4.0[X,${PYTHON_USEDEP}] - $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}") + $(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}") ) qalculate? ( sci-libs/libqalculate ) " diff --git a/profiles/targets/desktop/kde/package.use b/profiles/targets/desktop/kde/package.use index 9dda4a56b89b..7391cc327ce4 100644 --- a/profiles/targets/desktop/kde/package.use +++ b/profiles/targets/desktop/kde/package.use @@ -30,7 +30,7 @@ dev-qt/qtcore icu # Required by kde-apps/kate[addons] dev-libs/libgit2 threads -# Required by kde-base/pykde4 +# Required by kde-apps/pykde4 dev-python/PyQt4 script sql webkit # Required by kde-apps/akonadi diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use index db173703143c..04a5612ed3bf 100644 --- a/profiles/targets/desktop/plasma/package.use +++ b/profiles/targets/desktop/plasma/package.use @@ -32,7 +32,7 @@ media-gfx/exiv2 xmp # Required by kde-apps/okteta dev-qt/qtscript scripttools -# Required by kde-base/pykde4 +# Required by kde-apps/pykde4 dev-python/PyQt4 script sql webkit # Required by kde-frameworks/kactivities diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016 index 29d5f40d18a1..77df786e3031 100644 --- a/profiles/updates/4Q-2016 +++ b/profiles/updates/4Q-2016 @@ -55,3 +55,4 @@ move dev-perl/extutils-pkgconfig dev-perl/ExtUtils-PkgConfig move kde-base/kdebase-startkde kde-plasma/kdebase-startkde move kde-base/krosspython kde-apps/kross-interpreters move kde-base/katepart kde-apps/katepart +move kde-base/pykde4 kde-apps/pykde4 |