[gentoo-commits] proj/kde:apps-scratch commit in: eclass/
commit: de74b85925b4ee0060e6e97da8cd88238399fc5b
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Nov 23 17:26:53 2014 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Nov 23 17:26:53 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=de74b859
[eclass] Blacklist packages with no kde-apps release.
---
eclass/kde4-functions.eclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 760e6bd..69660ea 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -300,7 +300,8 @@ add_kdebase_dep() {
local ver category=kde-base
- if [[ ${CATEGORY} == kde-apps && ${1} != kdelibs ]] ; then
+ if [[ ${CATEGORY} == kde-apps && ${1} != kdelibs && ${1} != kdepimlibs
&& ${1} != baloo-widgets &&
+ ${1} != kactivities && ${1} != baloo && ${1} != kfilemetadata
]] ; then
category=kde-apps
fi
[gentoo-commits] proj/kde:apps-scratch commit in: eclass/
commit: baa030e48a9ef50957b18916676fb510f70e9254
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Nov 23 17:00:34 2014 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Nov 23 17:00:34 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=baa030e4
[eclass] Support oxygen-icons from kde-apps.
---
eclass/kde4-base.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index a23ffb9..edfffb3 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -335,7 +335,7 @@ fi
# all packages needs oxygen icons for basic iconset
if [[ ${PN} != oxygen-icons ]]; then
- kderdepend+=" $(add_kdebase_dep oxygen-icons)"
+ kderdepend+=" || ( kde-apps/oxygen-icons $(add_kdebase_dep
oxygen-icons) )"
fi
# add a dependency over kde-l10n
[gentoo-commits] proj/kde:apps-scratch commit in: eclass/
commit: ddc14806ff384188f9a1da73c7033570db4e1f93
Author: Michael Palimaka gentoo org>
AuthorDate: Tue Nov 18 08:40:14 2014 +
Commit: Michael Palimaka gentoo org>
CommitDate: Tue Nov 18 08:40:14 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ddc14806
[eclass] Add KDE Applications support to KDE 4 eclasses.
Handle SRC_URI appropriately, and automatically block the kde-base package with
the same name.
Adjust add_kdebase_dep to transparently handle the new situation - use the new
kde-apps category for all packages except kdelibs (which has no further 4.x
releases).
Todo, handle Plasma 5 and any other packages not part of KDE Applications.
---
eclass/kde4-base.eclass | 14 +-
eclass/kde4-functions.eclass | 16
2 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index a75f995..a23ffb9 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -186,7 +186,7 @@ case ${KDEBASE} in
# packages that will never be mirrored. (As they only will ever
be in
# the overlay).
case ${PV} in
- ** | 4.?.[6-9]? | 4.??.[6-9]?)
+ ** | 4.?.[6-9]? | 4.??.[6-9]? | 14.?.[6-9]? |
14.??.[6-9]?)
RESTRICT+=" mirror"
;;
esac
@@ -329,6 +329,10 @@ kdedepend="
kderdepend=""
+if [[ ${CATEGORY} == kde-apps ]]; then
+ kderdepend+=" !kde-base/${PN}"
+fi
+
# all packages needs oxygen icons for basic iconset
if [[ ${PN} != oxygen-icons ]]; then
kderdepend+=" $(add_kdebase_dep oxygen-icons)"
@@ -454,7 +458,15 @@ _calculate_src_uri() {
4.11.14)
# Part of 4.14 actually, sigh. Not
stable for next release!
SRC_URI="mirror://kde/stable/4.14.3/src/${_kmname_pv}.tar.xz" ;;
+ 14.?.[6-9]? | 14.??.[4-9]?)
+ # Unstable KDE Applications releases
+
SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz"
;;
*)
+ if [[ ${CATEGORY} == kde-apps ]]; then
+ # Stable KDE Applications
releases
+
SRC_URI="mirror://kde/stable/applications/${PV}/src/${_kmname}-${PV}.tar.xz"
+ fi
+
# Stable KDE SC releases
SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;
esac
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index a5af8bd..760e6bd 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -36,7 +36,7 @@ esac
# @DESCRIPTION:
# This gets set to a non-zero value when a package is considered a kde or
# kdevelop ebuild.
-if [[ ${CATEGORY} = kde-base ]]; then
+if [[ ${CATEGORY} = kde-base || ${CATEGORY} = kde-apps ]]; then
debug-print "${ECLASS}: KDEBASE ebuild recognized"
KDEBASE=kde-base
elif [[ ${KMNAME-${PN}} = kdevelop ]]; then
@@ -298,7 +298,11 @@ load_library_dependencies() {
add_kdebase_dep() {
debug-print-function ${FUNCNAME} "$@"
- local ver
+ local ver category=kde-base
+
+ if [[ ${CATEGORY} == kde-apps && ${1} != kdelibs ]] ; then
+ category=kde-apps
+ fi
if [[ -n ${3} ]]; then
ver=${3}
@@ -311,12 +315,16 @@ add_kdebase_dep() {
elif [[ ${PV} == *. ]]; then
ver=$(get_kde_version)
else
- ver=${PV}
+ if [[ ${CATEGORY} == kde-apps && ${category} == kde-base ]];
then
+ ver=4.14.3
+ else
+ ver=${PV}
+ fi
fi
[[ -z ${1} ]] && die "Missing parameter"
- echo " >=kde-base/${1}-${ver}:4[aqua=${2:+,${2}}]"
+ echo " >=${category}/${1}-${ver}:4[aqua=${2:+,${2}}]"
}
# local function to enable specified translations for specified directory
[gentoo-commits] proj/kde:apps-scratch commit in: eclass/
commit: 2781dad2e0f8b2bd9e2f21aa5473e4a326d7991a
Author: Michael Palimaka gentoo org>
AuthorDate: Mon Nov 17 09:44:25 2014 +
Commit: Michael Palimaka gentoo org>
CommitDate: Mon Nov 17 09:44:25 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2781dad2
[eclass] Add add_kdeapps_dep function.
---
eclass/kde5-functions.eclass | 24
1 file changed, 24 insertions(+)
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 4466276..830cacc 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -131,6 +131,30 @@ add_frameworks_dep() {
_add_kdecategory_dep kde-frameworks "${1}" "${2}" "${version}"
}
+# @FUNCTION: add_kdeapps_dep
+# @USAGE: [USE flags] [minimum version]
+# @DESCRIPTION:
+# Create proper dependency for kde-apps/ dependencies.
+# This takes 1 to 3 arguments. The first being the package name, the optional
+# second is additional USE flags to append, and the optional third is the
+# version to use instead of the automatic version (use sparingly).
+# The output of this should be added directly to DEPEND/RDEPEND, and may be
+# wrapped in a USE conditional (but not an || conditional without an extra set
+# of parentheses).
+add_kdeapps_dep() {
+ debug-print-function ${FUNCNAME} "$@"
+
+ local version
+
+ if [[ -n ${3} ]]; then
+ version=${3}
+ elif [[ ${CATEGORY} = kde-apps ]]; then
+ version=${PV}
+ fi
+
+ _add_kdecategory_dep kde-apps "${1}" "${2}" "${version}"
+}
+
# @FUNCTION: add_kdebase_dep
# @USAGE: [USE flags] [minimum version]
# @DESCRIPTION:
