From 5fbb5fe7a9f80a67ec2b6c028306c4dd3de9a17b Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 5 Feb 2018 23:50:11 +0100 Subject: [PATCH] dev-libs/purpose: pkgmove to kde-frameworks/purpose --- dev-util/kdevelop/kdevelop-5.2.1.ebuild | 2 +- kde-apps/okular/okular-17.12.1.ebuild | 2 +- kde-apps/spectacle/spectacle-17.08.3.ebuild | 2 +- kde-apps/spectacle/spectacle-17.12.1.ebuild | 2 +- {dev-libs => kde-frameworks}/purpose/Manifest | 0 .../purpose/metadata.xml | 0 .../purpose/purpose-1.2.1.ebuild | 21 +++++++++++++------ .../kdeplasma-addons-5.11.5.ebuild | 2 +- media-video/kamoso/kamoso-3.2.4.ebuild | 2 +- profiles/updates/1Q-2018 | 1 + 10 files changed, 22 insertions(+), 12 deletions(-) rename {dev-libs => kde-frameworks}/purpose/Manifest (100%) rename {dev-libs => kde-frameworks}/purpose/metadata.xml (100%) rename {dev-libs => kde-frameworks}/purpose/purpose-1.2.1.ebuild (65%) diff --git a/dev-util/kdevelop/kdevelop-5.2.1.ebuild b/dev-util/kdevelop/kdevelop-5.2.1.ebuild index a453ea55d407c..d0dab918f8754 100644 --- a/dev-util/kdevelop/kdevelop-5.2.1.ebuild +++ b/dev-util/kdevelop/kdevelop-5.2.1.ebuild @@ -66,7 +66,7 @@ COMMON_DEPEND=" $(add_frameworks_dep plasma) ) qmake? ( dev-util/kdevelop-pg-qt:5 ) - reviewboard? ( dev-libs/purpose ) + reviewboard? ( kde-frameworks/purpose ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 diff --git a/kde-apps/okular/okular-17.12.1.ebuild b/kde-apps/okular/okular-17.12.1.ebuild index e4166ea80ff95..20ecfc164b149 100644 --- a/kde-apps/okular/okular-17.12.1.ebuild +++ b/kde-apps/okular/okular-17.12.1.ebuild @@ -51,7 +51,7 @@ DEPEND=" pdf? ( app-text/poppler[qt5,-exceptions(-)] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) - share? ( dev-libs/purpose:5 ) + share? ( kde-frameworks/purpose:5 ) speech? ( $(add_qt_dep qtspeech) ) tiff? ( media-libs/tiff:0 ) " diff --git a/kde-apps/spectacle/spectacle-17.08.3.ebuild b/kde-apps/spectacle/spectacle-17.08.3.ebuild index 0f060a3d67136..5e724edf70f7e 100644 --- a/kde-apps/spectacle/spectacle-17.08.3.ebuild +++ b/kde-apps/spectacle/spectacle-17.08.3.ebuild @@ -36,7 +36,7 @@ DEPEND=" x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') ) - share? ( dev-libs/purpose:5 ) + share? ( kde-frameworks/purpose:5 ) " RDEPEND="${DEPEND} kipi? ( media-plugins/kipi-plugins:5 ) diff --git a/kde-apps/spectacle/spectacle-17.12.1.ebuild b/kde-apps/spectacle/spectacle-17.12.1.ebuild index 169a0c094823d..10e7f8bc10744 100644 --- a/kde-apps/spectacle/spectacle-17.12.1.ebuild +++ b/kde-apps/spectacle/spectacle-17.12.1.ebuild @@ -36,7 +36,7 @@ DEPEND=" x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') ) - share? ( dev-libs/purpose:5 ) + share? ( kde-frameworks/purpose:5 ) " RDEPEND="${DEPEND} kipi? ( media-plugins/kipi-plugins:5 ) diff --git a/dev-libs/purpose/Manifest b/kde-frameworks/purpose/Manifest similarity index 100% rename from dev-libs/purpose/Manifest rename to kde-frameworks/purpose/Manifest diff --git a/dev-libs/purpose/metadata.xml b/kde-frameworks/purpose/metadata.xml similarity index 100% rename from dev-libs/purpose/metadata.xml rename to kde-frameworks/purpose/metadata.xml diff --git a/dev-libs/purpose/purpose-1.2.1.ebuild b/kde-frameworks/purpose/purpose-1.2.1.ebuild similarity index 65% rename from dev-libs/purpose/purpose-1.2.1.ebuild rename to kde-frameworks/purpose/purpose-1.2.1.ebuild index 78b845bdcdfae..06e55ebd995ae 100644 --- a/dev-libs/purpose/purpose-1.2.1.ebuild +++ b/kde-frameworks/purpose/purpose-1.2.1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 +KDE_AUTODEPS="false" +KDE_QTHELP="false" KDE_TEST="forceoptional" inherit kde5 @@ -13,10 +15,11 @@ LICENSE="LGPL-2.1+" KEYWORDS="amd64 ~arm x86" IUSE="+kaccounts" -DEPEND=" - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) +COMMON_DEPEND=" + $(add_frameworks_dep kcoreaddons '' 5.40.0) + $(add_frameworks_dep ki18n '' 5.40.0) + $(add_frameworks_dep kio '' 5.40.0) + $(add_qt_dep qtcore) $(add_qt_dep qtdeclarative) $(add_qt_dep qtgui) $(add_qt_dep qtnetwork) @@ -26,7 +29,13 @@ DEPEND=" net-libs/accounts-qt ) " -RDEPEND="${DEPEND}" +DEPEND="${COMMON_DEPEND} + $(add_frameworks_dep extra-cmake-modules '' 5.40.0) +" +RDEPEND="${COMMON_DEPEND} + >=kde-frameworks/kf-env-4 + || ( $(add_frameworks_dep breeze-icons '' 5.40.0) kde-frameworks/oxygen-icons:* ) +" # requires running environment RESTRICT+=" test" diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.5.ebuild index 9dd8884adffe7..1263c95fea218 100644 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.5.ebuild +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.5.ebuild @@ -40,7 +40,7 @@ DEPEND=" $(add_qt_dep qtgui) $(add_qt_dep qtwidgets) $(add_qt_dep qtx11extras) - share? ( dev-libs/purpose:5 ) + share? ( kde-frameworks/purpose:5 ) " RDEPEND="${DEPEND} $(add_plasma_dep plasma-workspace) diff --git a/media-video/kamoso/kamoso-3.2.4.ebuild b/media-video/kamoso/kamoso-3.2.4.ebuild index a6e202fdda524..061fb9aa08c7a 100644 --- a/media-video/kamoso/kamoso-3.2.4.ebuild +++ b/media-video/kamoso/kamoso-3.2.4.ebuild @@ -23,7 +23,7 @@ DEPEND=" $(add_qt_dep qtdeclarative) $(add_qt_dep qtgui) $(add_qt_dep qtwidgets) - dev-libs/purpose:5 + kde-frameworks/purpose:5 media-libs/qt-gstreamer[qt5(+)] virtual/libudev:= " diff --git a/profiles/updates/1Q-2018 b/profiles/updates/1Q-2018 index 9e33dc9c0c931..17164482073ab 100644 --- a/profiles/updates/1Q-2018 +++ b/profiles/updates/1Q-2018 @@ -3,3 +3,4 @@ slotmove app-portage/kuroo 4 0 move dev-cpp/gsl dev-cpp/ms-gsl slotmove =dev-util/cucumber-3.1.0 3.0 3.1 move app-admin/restart_services app-admin/restart-services +move dev-libs/purpose kde-frameworks/purpose