diff --git a/kde-base/systemsettings/systemsettings-4.11.22-r2.ebuild b/kde-base/systemsettings/systemsettings-4.11.22-r2.ebuild index 98ef85b3fbcbe..49f5e8b80cc2b 100644 --- a/kde-base/systemsettings/systemsettings-4.11.22-r2.ebuild +++ b/kde-base/systemsettings/systemsettings-4.11.22-r2.ebuild @@ -43,7 +43,7 @@ RDEPEND="${COMMONDEPEND} sys-libs/timezone-data x11-apps/setxkbmap x11-misc/xkeyboard-config - gtk? ( kde-misc/kde-gtk-config ) + gtk? ( kde-plasma/kde-gtk-config:4 ) kscreen? ( kde-misc/kscreen:4 ) || ( $(add_kdebase_dep legacy-icons) >=kde-frameworks/oxygen-icons-5.19.0:5 ) " diff --git a/kde-misc/kde-gtk-config/Manifest b/kde-misc/kde-gtk-config/Manifest deleted file mode 100644 index 3c89ea03a8353..0000000000000 --- a/kde-misc/kde-gtk-config/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kde-gtk-config-2.2.1.tar.xz 86472 SHA256 9c890d7e39ab6ebfad13c5453051f0759cb61beac9f7fc2df7e331c9a4415c85 SHA512 24623b5f668cb7d5dd46b96bcd0ee1ba4f2c9068995716f6658c2bdf8a41a81d76848cf63c1749d3ff365ece0399d4a54e98be4d03f992d49a04616e26f1baeb WHIRLPOOL 49f0186c6a265eef8aa8972a77502b34bc130fd2df04faab4145c6b181ab80fdefc2b9ca7d2d7979c89a5b57e36b8d0787c986e584bd6f332915316d73c07802 diff --git a/kde-misc/kde-gtk-config/metadata.xml b/kde-misc/kde-gtk-config/metadata.xml deleted file mode 100644 index 0cf59224b0096..0000000000000 --- a/kde-misc/kde-gtk-config/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - kde@gentoo.org - Gentoo KDE Project - - diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest index b10c5b2f5d28c..40d19e60ce4b9 100644 --- a/kde-plasma/kde-gtk-config/Manifest +++ b/kde-plasma/kde-gtk-config/Manifest @@ -1,2 +1,3 @@ +DIST kde-gtk-config-2.2.1.tar.xz 86472 SHA256 9c890d7e39ab6ebfad13c5453051f0759cb61beac9f7fc2df7e331c9a4415c85 SHA512 24623b5f668cb7d5dd46b96bcd0ee1ba4f2c9068995716f6658c2bdf8a41a81d76848cf63c1749d3ff365ece0399d4a54e98be4d03f992d49a04616e26f1baeb WHIRLPOOL 49f0186c6a265eef8aa8972a77502b34bc130fd2df04faab4145c6b181ab80fdefc2b9ca7d2d7979c89a5b57e36b8d0787c986e584bd6f332915316d73c07802 DIST kde-gtk-config-5.7.5.tar.xz 147732 SHA256 3603055a4821a0aa4250a42261004b4384b53c337ee201d03e494bb18e9602e5 SHA512 88635c51a41a5a47351fa77483ad76c27b3881be28124e53fe0e4fc571dff1596c41e61d22a3e842a81180e9e3f955d8206dfc332965f84be20e47295142ffcb WHIRLPOOL 28231cbc4ac576b8b3d059e9b17faef099b103784386c0f54a6c86a1ccecebc500183fb200a438383c36211a49171b48096b0ce0218598746aed7662d847009c DIST kde-gtk-config-5.8.3.tar.xz 149984 SHA256 6d548f2143c0f7f2624aa857cb54c79a40cdb868942f68ab487eac86fef47d78 SHA512 247b8a07f077adc767b727b58406dff1148e9e21b695e98d63ef34c0590444933f0120a035a9e9df9e74570132f72f317396c7b7c6a68765733c5e1600286720 WHIRLPOOL 593998e11325e3cde9a9c6bfffbf11fd55ef877c6e24f27d5c6edbb7553cd844f0002d013e20598c98e832e0450327588ea59f306a17d85e1cca144c2ee6db82 diff --git a/kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch b/kde-plasma/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch similarity index 100% rename from kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch rename to kde-plasma/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch diff --git a/kde-misc/kde-gtk-config/kde-gtk-config-2.2.1.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-2.2.1.ebuild similarity index 92% rename from kde-misc/kde-gtk-config/kde-gtk-config-2.2.1.ebuild rename to kde-plasma/kde-gtk-config/kde-gtk-config-2.2.1.ebuild index 180de1b381b9d..a28e70ef1bcd5 100644 --- a/kde-misc/kde-gtk-config/kde-gtk-config-2.2.1.ebuild +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-2.2.1.ebuild @@ -8,7 +8,7 @@ KDE_LINGUAS="bs ca ca@valencia cs da de el es et eu fi fr ga gl hu id it ja kk km lt mr nb nds nl pl pt pt_BR ro ru sk sl sv uk zh_CN zh_TW" inherit kde4-base -DESCRIPTION="KDE systemsettings kcm to set GTK application look&feel" +DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel" HOMEPAGE="https://projects.kde.org/kde-gtk-config" SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.7.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.7.5.ebuild index e3a9a65cfa238..b199a37dfad1e 100644 --- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.7.5.ebuild +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.7.5.ebuild @@ -34,7 +34,7 @@ DEPEND=" RDEPEND="${DEPEND} $(add_plasma_dep kde-cli-tools) !kde-base/kde-gtk-config:4 - !kde-misc/kde-gtk-config + !kde-plasma/kde-gtk-config:4 " PATCHES=( diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.8.3.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.8.3.ebuild index 581afc8ee1e49..a460448ab0bd8 100644 --- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.8.3.ebuild +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.8.3.ebuild @@ -34,7 +34,7 @@ DEPEND=" RDEPEND="${DEPEND} $(add_plasma_dep kde-cli-tools) !kde-base/kde-gtk-config:4 - !kde-misc/kde-gtk-config + !kde-plasma/kde-gtk-config:4 " PATCHES=( "${FILESDIR}/${PN}-5.4.2-gtk3-optional.patch" ) diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016 index 24b1c34b85974..0c672e144bb6a 100644 --- a/profiles/updates/4Q-2016 +++ b/profiles/updates/4Q-2016 @@ -8,3 +8,4 @@ move app-office/akonadi-server kde-apps/akonadi move net-wireless/bluedevil kde-plasma/bluedevil move kde-base/kdeplasma-addons kde-plasma/kdeplasma-addons move kde-misc/milou kde-plasma/milou +move kde-misc/kde-gtk-config kde-plasma/kde-gtk-config