1 |
commit: 3e7c36e56ea0976333f3fdfd70cd67fa14892077 |
2 |
Author: abcd <abcd <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 4 18:29:44 2011 +0000 |
4 |
Commit: Jonathan Callen <abcd <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 4 22:46:53 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3e7c36e5 |
7 |
|
8 |
Create new kde4-meta-pkg.eclass |
9 |
|
10 |
(Portage version: 2.2.0_alpha28_p8/git/Linux i686, RepoMan options: --force, signed Manifest commit with key 229E5838) |
11 |
|
12 |
--- |
13 |
eclass/kde4-base.eclass | 13 +------------ |
14 |
eclass/kde4-functions.eclass | 12 ++++++++++++ |
15 |
eclass/kde4-meta-pkg.eclass | 21 +++++++++++++++++++++ |
16 |
3 files changed, 34 insertions(+), 12 deletions(-) |
17 |
|
18 |
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass |
19 |
index 56388f1..0aa6c28 100644 |
20 |
--- a/eclass/kde4-base.eclass |
21 |
+++ b/eclass/kde4-base.eclass |
22 |
@@ -64,18 +64,7 @@ KDE_MINIMAL="${KDE_MINIMAL:-4.4}" |
23 |
# Set slot for KDEBASE known packages |
24 |
case ${KDEBASE} in |
25 |
kde-base) |
26 |
- major=$(get_major_version) |
27 |
- minor=$(get_version_component_range 2) |
28 |
- micro=$(get_version_component_range 3) |
29 |
- # Determine SLOT from PVs |
30 |
- [[ ${PV} == 9999* ]] && SLOT=live # regular live |
31 |
- [[ ${major} -eq 4 && ${micro} == 9999 ]] && SLOT=${major}.${minor} # stable live |
32 |
- if [[ ${major} -eq 4 && ${micro} != 9999 ]]; then |
33 |
- [[ ${micro} -lt 60 ]] && \ |
34 |
- SLOT=${major}.${minor} |
35 |
- [[ ${micro} -ge 60 ]] && |
36 |
- SLOT=${major}.$(($minor + 1)) |
37 |
- fi |
38 |
+ SLOT=$(_calculate_kde_slot) |
39 |
[[ -z ${SLOT} ]] && die "Unsupported ${PV}" |
40 |
KDE_MINIMAL="${SLOT}" |
41 |
;; |
42 |
|
43 |
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass |
44 |
index aaa939a..1765a2a 100644 |
45 |
--- a/eclass/kde4-functions.eclass |
46 |
+++ b/eclass/kde4-functions.eclass |
47 |
@@ -596,3 +596,15 @@ _enable_selected_linguas_dir() { |
48 |
|
49 |
popd > /dev/null |
50 |
} |
51 |
+ |
52 |
+_calculate_kde_slot() { |
53 |
+ local ver=${1:-${PV}} |
54 |
+ local major=$(get_major_version ${ver}) |
55 |
+ local minor=$(get_version_component_range 2 ${ver}) |
56 |
+ local micro=$(get_version_component_range 3 ${ver}) |
57 |
+ [[ ${ver} == 9999 ]] && echo live |
58 |
+ (( major == 4 && micro == 9999 )) && echo ${major}.${minor} |
59 |
+ if (( major == 4 && micro != 9999 )); then |
60 |
+ (( micro < 50 )) && echo ${major}.${minor} || echo ${major}.$((minor + 1)) |
61 |
+ fi |
62 |
+} |
63 |
|
64 |
diff --git a/eclass/kde4-meta-pkg.eclass b/eclass/kde4-meta-pkg.eclass |
65 |
new file mode 100644 |
66 |
index 0000000..ef88b2d |
67 |
--- /dev/null |
68 |
+++ b/eclass/kde4-meta-pkg.eclass |
69 |
@@ -0,0 +1,21 @@ |
70 |
+# Copyright 1999-2011 Gentoo Foundation |
71 |
+# Distributed under the terms of the GNU General Public License v2 |
72 |
+# $Header: $ |
73 |
+ |
74 |
+# @ECLASS: kde4-meta-pkg.eclass |
75 |
+# @MAINTAINER: |
76 |
+# kde@g.o |
77 |
+# @BLURB: This eclass contains boilerplate for kde 4.X meta packages |
78 |
+# @DESCRIPTION: |
79 |
+# This eclass should only be used for defining meta packages for KDE4. |
80 |
+ |
81 |
+inherit kde4-functions versionator |
82 |
+ |
83 |
+HOMEPAGE="http://www.kde.org/" |
84 |
+ |
85 |
+LICENSE="GPL-2" |
86 |
+IUSE="aqua kdeprefix" |
87 |
+RDEPEND="$(block_other_slots)" |
88 |
+ |
89 |
+SLOT=$(_calculate_kde_slot) |
90 |
+[[ -z ${SLOT} ]] && die "Unsupported ${PV}" |