commit: 4424085a68894f149dc62eb59c06f114312d5ffc Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Aug 25 18:18:54 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Aug 25 18:30:18 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=4424085a
kde-apps/drkonqi: pkgmove to kde-plasma/drkonqi Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> eclass/kde-functions.eclass | 2 +- .../kdebase-runtime-meta-4.14.3.ebuild | 4 ++-- kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild | 7 ++++--- {kde-apps => kde-plasma}/drkonqi/ChangeLog | 0 {kde-apps => kde-plasma}/drkonqi/drkonqi-16.04.3.ebuild | 8 +++++++- {kde-apps => kde-plasma}/drkonqi/drkonqi-3.5.10.ebuild | 15 ++++++++++----- {kde-apps => kde-plasma}/drkonqi/drkonqi-4.14.3.ebuild | 8 +++++++- {kde-apps => kde-plasma}/drkonqi/metadata.xml | 0 .../kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild | 2 +- profiles/updates/3Q-2020 | 1 + 10 files changed, 33 insertions(+), 14 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/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 similarity index 100% rename from kde-apps/drkonqi/ChangeLog rename to kde-plasma/drkonqi/ChangeLog diff --git a/kde-apps/drkonqi/drkonqi-16.04.3.ebuild b/kde-plasma/drkonqi/drkonqi-16.04.3.ebuild similarity index 70% rename from kde-apps/drkonqi/drkonqi-16.04.3.ebuild rename to 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 similarity index 58% rename from kde-apps/drkonqi/drkonqi-3.5.10.ebuild rename to 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 similarity index 71% rename from kde-apps/drkonqi/drkonqi-4.14.3.ebuild rename to 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 similarity index 100% rename from kde-apps/drkonqi/metadata.xml rename to 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