kde-apps/drkonqi: pkgmove to kde-plasma/drkonqi

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

12 files changed, 37 insertions, 18 deletions

diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index 58c8cff8..f5b9ae4a 100644
--- a/eclass/kde-functions.eclass
+++ b/eclass/kde-functions.eclass
@@ -56,7 +56,7 @@ kde-base/kdeartwork kde-base/kdeartwork-kworldwatch
 kde-base/kdeartwork kde-base/kdeartwork-sounds
 kde-base/kdeartwork kde-apps/kdeartwork-styles
 kde-base/kdeartwork kde-apps/kdeartwork-wallpapers
-kde-base/kdebase kde-apps/drkonqi
+kde-base/kdebase kde-plasma/drkonqi
 kde-base/kdebase kde-base/kappfinder
 kde-base/kdebase kde-apps/kate
 kde-base/kdebase kde-base/kcheckpass
diff --git a/kde-apps/drkonqi/Manifest b/kde-apps/drkonqi/Manifest
deleted file mode 100644
index c7abc5c6..00000000
--- a/kde-apps/drkonqi/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST kde-runtime-16.04.3.tar.xz 7903920 SHA256 690e0f848b305b8a2491dbcd01b6e511d64c98d991226cd8a1dc35f23372505d SHA512 df52cd4c423030d3457bb907eb0bef0cdd3c8bce283d9f181b7ae6b7b4ce9c59a34f874f9ac6d2bd59597647a3c6315d772b2551c739423378186d4debbb53ae WHIRLPOOL e4a4a6c3ab315517f757dce952db14e154d4674cf555e1315f018f10cc2a443deede74cf3d370f0c92ab839b35bce8bd360a958cd7edf1ae56720c5ec7d029b5
-DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
-DIST kdebase-3.5-patchset-13.tar.bz2 26504 SHA256 78dc069a6d007d1dbf97147c368e7a4fda0dee5d41b15c471fde0589f0c377e0 SHA512 256eec673813e8492487683aeb8ebf79217fd2d8fee883abca33e69cfacd8787c795fd49fd7a18caac0e12b76ed9201abe0efde994610f022455d1e21120c72a WHIRLPOOL 6cecd33709a66c6fa6eb0acee480413d85ffbfe8561c5f2cef106002e597987385106568bac5f65b939e197725c6632e355ac1cefa0c7645ec9bedf452df6fbb
-DIST kdebase-3.5.10.tar.bz2 24339704 SHA256 77aa9d8f28c532f2e7a5157a7f4ba8df1001f00fa1cb72cb70b388b3d0e16b61 SHA512 f83ea197cedfce3b2be3038c25a88131f210183a8330d8bfb503e84ea8df2dd019b2f245de1ed75d8102f95f69fbde3d26c29e2ae228cbbd270ad2aadacb8db6 WHIRLPOOL a69067e038a0c1d4d1efb6c41ba749e32bb354ccbd433ea406b6209f7e8c65f9aa1ec638ae9072b065a4a61a1faac8d32d273303e140b907c15f0cc6845f4e7c
diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild
index afdf8f85..613ea5c8 100644
--- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild
+++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -40,7 +40,7 @@ RDEPEND="
 	$(add_kdeapps_dep plasma-runtime)
 	$(add_kdeapps_dep renamedlg-plugins)
 	$(add_kdeapps_dep solid-runtime)
-	crash-reporter? ( $(add_kdeapps_dep drkonqi ) )
+	crash-reporter? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
 	handbook? ( kde-apps/khelpcenter:* )
 	minimal? ( $(add_kdeapps_dep solid-runtime '-bluetooth') )
 	!minimal? (
diff --git a/kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild b/kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild
index 8a945d34..92cf33f5 100644
--- a/kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild,v 1.8 2009/08/09 21:03:44 zmedico Exp $
 
 EAPI="1"
+
 inherit kde-functions
+
 DESCRIPTION="kdebase - merge this to pull in all kdebase-derived packages"
 HOMEPAGE="http://www.kde.org/"
 
@@ -13,7 +14,7 @@ KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=kde-base/kdebase-startkde-${PV}:${SLOT}
->=kde-apps/drkonqi-${PV}:${SLOT}
+>=kde-plasma/drkonqi-${PV}:${SLOT}
 >=kde-base/kappfinder-${PV}:${SLOT}
 >=kde-apps/kate-${PV}:${SLOT}
 >=kde-base/kcheckpass-${PV}:${SLOT}
diff --git a/kde-apps/drkonqi/ChangeLog b/kde-plasma/drkonqi/ChangeLog
index f1faf258..f1faf258 100644
--- a/kde-apps/drkonqi/ChangeLog
+++ b/kde-plasma/drkonqi/ChangeLog
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
new file mode 100644
index 00000000..ace5464d
--- /dev/null
+++ b/kde-plasma/drkonqi/Manifest
@@ -0,0 +1,4 @@
+DIST kde-runtime-16.04.3.tar.xz 7903920 BLAKE2B d09512c73dcd830c54678d4c41b6711c72b920af6bb7308e547b2b02fead679ba640372be590821edfad0b632e1e10166bbb041d7de063e4d33f65240d618ea3 SHA512 df52cd4c423030d3457bb907eb0bef0cdd3c8bce283d9f181b7ae6b7b4ce9c59a34f874f9ac6d2bd59597647a3c6315d772b2551c739423378186d4debbb53ae
+DIST kde-runtime-4.14.3.tar.xz 7867308 BLAKE2B 8c91c390dfd2af49e1f5ed54010471a43e965e0531da19ea6d9df4e480344c41b3e1cee88489d65cf6acf96448c228d39494fd728760ecf9ea2f1cdd51ec1928 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244
+DIST kdebase-3.5-patchset-13.tar.bz2 26504 BLAKE2B 812befffef02c764f9e1bd8eb06e04db2c14988590b1abd21715b8dd8f19b421626f374549062bf4f5111db112a24453684158e7724ddf3c322baa53e0ff6393 SHA512 256eec673813e8492487683aeb8ebf79217fd2d8fee883abca33e69cfacd8787c795fd49fd7a18caac0e12b76ed9201abe0efde994610f022455d1e21120c72a
+DIST kdebase-3.5.10.tar.bz2 24339704 BLAKE2B 5eb00fe6d1f2a83252bad6619df91091c455e319e81ce6f9f2ca04994ffd5cc1cc3c678ece7db76ff3538579c2a38eb0eb2aa2b7707a40e9c962da21565b4def SHA512 f83ea197cedfce3b2be3038c25a88131f210183a8330d8bfb503e84ea8df2dd019b2f245de1ed75d8102f95f69fbde3d26c29e2ae228cbbd270ad2aadacb8db6
diff --git a/kde-apps/drkonqi/drkonqi-16.04.3.ebuild b/kde-plasma/drkonqi/drkonqi-16.04.3.ebuild
index 02bba45d..d7be0193 100644
--- a/kde-apps/drkonqi/drkonqi-16.04.3.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-16.04.3.ebuild
@@ -1,13 +1,19 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+KDE_MINIMAL="${PV}"
 KMNAME="kde-runtime"
 WEBKIT_REQUIRED="always"
 inherit kde4-meta
 
 DESCRIPTION="KDE crash handler, gives the user feedback if a program crashed"
+HOMEPAGE="https://kde.org/"
+SRC_URI="mirror://kde/Attic/applications/${PV}/src/${KMNAME}-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT=4/$(get_version_component_range 1-2)
 KEYWORDS="amd64 x86"
 IUSE="debug"
 
diff --git a/kde-apps/drkonqi/drkonqi-3.5.10.ebuild b/kde-plasma/drkonqi/drkonqi-3.5.10.ebuild
index a6d8b7d1..9a7a526b 100644
--- a/kde-apps/drkonqi/drkonqi-3.5.10.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-3.5.10.ebuild
@@ -1,16 +1,21 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/drkonqi-3.5.10.ebuild,v 1.7 2009/07/12 09:52:59 armin76 Exp $
 
 EAPI="1"
+
+KDE_MINIMAL="${PV}"
+KDEBASE=true
 KMNAME=kdebase
 inherit kde-meta eutils
 
-SRC_URI="${SRC_URI}
+DESCRIPTION="KDE crash handler gives the user feedback if a program crashed"
+HOMEPAGE="https://kde.org/"
+SRC_URI="mirror://kde/Attic/stable/${PV}/src/${KMNAME}-${PV}.tar.bz2
 	mirror://gentoo/kdebase-3.5-patchset-13.tar.bz2"
 
-DESCRIPTION="KDE crash handler gives the user feedback if a program crashed"
+LICENSE="GPL-2"
+SLOT="3.5"
 KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
-IUSE="kdehiddenvisibility"
+IUSE="debug kdehiddenvisibility"
 
 RDEPEND="sys-devel/gdb"
diff --git a/kde-apps/drkonqi/drkonqi-4.14.3.ebuild b/kde-plasma/drkonqi/drkonqi-4.14.3.ebuild
index 3eaafd5e..0231d834 100644
--- a/kde-apps/drkonqi/drkonqi-4.14.3.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-4.14.3.ebuild
@@ -1,12 +1,18 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
+KDE_MINIMAL="${PV}"
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE crash handler, gives the user feedback if a program crashed"
+HOMEPAGE="https://kde.org/"
+SRC_URI="mirror://kde/Attic/${PV}/src/${KMNAME}-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT=4/$(get_version_component_range 1-2)
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
diff --git a/kde-apps/drkonqi/metadata.xml b/kde-plasma/drkonqi/metadata.xml
index 6f49eba8..6f49eba8 100644
--- a/kde-apps/drkonqi/metadata.xml
+++ b/kde-plasma/drkonqi/metadata.xml
diff --git a/kde-plasma/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild b/kde-plasma/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
index e9a032d1..605fee8a 100644
--- a/kde-plasma/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
+++ b/kde-plasma/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
@@ -66,7 +66,7 @@ RDEPEND="
 	x11-apps/xrdb
 	x11-apps/xsetroot
 	x11-apps/xset
-	crash-reporter? ( $(add_kdeapps_dep drkonqi ) )
+	crash-reporter? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
 	handbook? ( kde-apps/khelpcenter:* )
 	!minimal? (
 		$(add_kdeapps_dep kdepasswd)
diff --git a/profiles/updates/3Q-2020 b/profiles/updates/3Q-2020
index 6d557bf8..e0b30332 100644
--- a/profiles/updates/3Q-2020
+++ b/profiles/updates/3Q-2020
@@ -10,3 +10,4 @@ move kde-misc/kbiff mail-client/kbiff
 move kde-misc/kdocker x11-misc/kdocker
 move kde-apps/okteta app-editors/okteta
 move kde-apps/kstars sci-astronomy/kstars
+move kde-apps/drkonqi kde-plasma/drkonqi