diff options
| -rw-r--r-- | kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild | 5 | ||||
| -rw-r--r-- | kde-apps/khelpcenter/Manifest (renamed from kde-base/khelpcenter/Manifest) | 0 | ||||
| -rw-r--r-- | kde-apps/khelpcenter/khelpcenter-4.14.3.ebuild (renamed from kde-base/khelpcenter/khelpcenter-4.14.3.ebuild) | 4 | ||||
| -rw-r--r-- | kde-apps/khelpcenter/metadata.xml (renamed from kde-base/khelpcenter/metadata.xml) | 8 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.14.16.ebuild | 3 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.14.18.ebuild | 3 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.14.8.ebuild | 3 | ||||
| -rw-r--r-- | profiles/updates/2Q-2016 | 1 |
8 files changed, 13 insertions, 14 deletions
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 102e7b606a22..a6ac242dc174 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,8 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 + inherit kde4-meta-pkg DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages" @@ -42,7 +43,7 @@ RDEPEND=" $(add_kdeapps_dep solid-runtime) crash-reporter? ( $(add_kdeapps_dep drkonqi ) ) handbook? ( || ( - $(add_kdebase_dep khelpcenter) + kde-apps/khelpcenter:* kde-plasma/khelpcenter:5[compat(+)] ) ) minimal? ( $(add_kdeapps_dep solid-runtime '-bluetooth') ) diff --git a/kde-base/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest index f52cca023dfa..f52cca023dfa 100644 --- a/kde-base/khelpcenter/Manifest +++ b/kde-apps/khelpcenter/Manifest diff --git a/kde-base/khelpcenter/khelpcenter-4.14.3.ebuild b/kde-apps/khelpcenter/khelpcenter-4.14.3.ebuild index f5581137e6ed..781d332d5069 100644 --- a/kde-base/khelpcenter/khelpcenter-4.14.3.ebuild +++ b/kde-apps/khelpcenter/khelpcenter-4.14.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 KDE_HANDBOOK="always" KMNAME="kde-runtime" diff --git a/kde-base/khelpcenter/metadata.xml b/kde-apps/khelpcenter/metadata.xml index 0cf59224b009..2fdbf33d963d 100644 --- a/kde-base/khelpcenter/metadata.xml +++ b/kde-apps/khelpcenter/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> -</maintainer> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> </pkgmetadata> diff --git a/kde-base/kdelibs/kdelibs-4.14.16.ebuild b/kde-base/kdelibs/kdelibs-4.14.16.ebuild index b04f30e54393..221ce7119c9d 100644 --- a/kde-base/kdelibs/kdelibs-4.14.16.ebuild +++ b/kde-base/kdelibs/kdelibs-4.14.16.ebuild @@ -116,8 +116,7 @@ PDEPEND=" ) handbook? ( || ( - $(add_kdebase_dep khelpcenter '' 4.14.3) - kde-apps/khelpcenter:5 + kde-apps/khelpcenter:* kde-plasma/khelpcenter:5[compat(+)] ) ) diff --git a/kde-base/kdelibs/kdelibs-4.14.18.ebuild b/kde-base/kdelibs/kdelibs-4.14.18.ebuild index 2c7910876c2d..b54244e77831 100644 --- a/kde-base/kdelibs/kdelibs-4.14.18.ebuild +++ b/kde-base/kdelibs/kdelibs-4.14.18.ebuild @@ -116,8 +116,7 @@ PDEPEND=" ) handbook? ( || ( - $(add_kdebase_dep khelpcenter '' 4.14.3) - kde-apps/khelpcenter:5 + kde-apps/khelpcenter:* kde-plasma/khelpcenter:5[compat(+)] ) ) diff --git a/kde-base/kdelibs/kdelibs-4.14.8.ebuild b/kde-base/kdelibs/kdelibs-4.14.8.ebuild index dc3c0d8cb203..4fa9bfd4780c 100644 --- a/kde-base/kdelibs/kdelibs-4.14.8.ebuild +++ b/kde-base/kdelibs/kdelibs-4.14.8.ebuild @@ -112,8 +112,7 @@ PDEPEND=" ) handbook? ( || ( - $(add_kdebase_dep khelpcenter '' 4.14.3) - kde-apps/khelpcenter:5 + kde-apps/khelpcenter:* kde-plasma/khelpcenter:5[compat(+)] ) ) diff --git a/profiles/updates/2Q-2016 b/profiles/updates/2Q-2016 index cb5e60419b18..e773c0276bf6 100644 --- a/profiles/updates/2Q-2016 +++ b/profiles/updates/2Q-2016 @@ -1 +1,2 @@ move dev-perl/math-pari dev-perl/Math-Pari +move kde-base/khelpcenter kde-apps/khelpcenter |