From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdebase-runtime-meta/, profiles/updates/, kde-apps/khelpcenter/, ...
Date: Fri, 15 Apr 2016 19:11:58 +0000 (UTC) [thread overview]
Message-ID: <1460747506.0d01065cdeed0873ff326c3d5567c8b2f3b2b3f6.johu@gentoo> (raw)
commit: 0d01065cdeed0873ff326c3d5567c8b2f3b2b3f6
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Apr 15 15:22:11 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 19:11:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d01065c
kde-base/khelpcenter -> kde-apps/khelpcenter
Package-Manager: portage-2.2.27
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild | 5 +++--
{kde-base => kde-apps}/khelpcenter/Manifest | 0
{kde-base => kde-apps}/khelpcenter/khelpcenter-4.14.3.ebuild | 4 ++--
{kde-base => kde-apps}/khelpcenter/metadata.xml | 8 ++++----
kde-base/kdelibs/kdelibs-4.14.16.ebuild | 3 +--
kde-base/kdelibs/kdelibs-4.14.18.ebuild | 3 +--
kde-base/kdelibs/kdelibs-4.14.8.ebuild | 3 +--
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 102e7b6..a6ac242 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
similarity index 100%
rename from kde-base/khelpcenter/Manifest
rename to kde-apps/khelpcenter/Manifest
diff --git a/kde-base/khelpcenter/khelpcenter-4.14.3.ebuild b/kde-apps/khelpcenter/khelpcenter-4.14.3.ebuild
similarity index 90%
rename from kde-base/khelpcenter/khelpcenter-4.14.3.ebuild
rename to kde-apps/khelpcenter/khelpcenter-4.14.3.ebuild
index f558113..781d332 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
similarity index 55%
rename from kde-base/khelpcenter/metadata.xml
rename to kde-apps/khelpcenter/metadata.xml
index 0cf5922..2fdbf33 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 b04f30e..221ce71 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 2c79108..b54244e 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 dc3c0d8..4fa9bfd 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 cb5e604..e773c02 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
reply other threads:[~2016-04-15 19:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1460747506.0d01065cdeed0873ff326c3d5567c8b2f3b2b3f6.johu@gentoo \
--to=johu@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox