1 |
commit: 39575d8efca13bf7139301e060b79002e6377cd8 |
2 |
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 18 10:44:23 2011 +0000 |
4 |
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 18 10:44:23 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=39575d8e |
7 |
|
8 |
[kde-base/oxygen-icons] sync with release ebuild. |
9 |
|
10 |
--- |
11 |
kde-base/oxygen-icons/oxygen-icons-4.6.9999.ebuild | 24 +++++++++++++++++-- |
12 |
kde-base/oxygen-icons/oxygen-icons-9999.ebuild | 24 +++++++++++++++++-- |
13 |
2 files changed, 42 insertions(+), 6 deletions(-) |
14 |
|
15 |
diff --git a/kde-base/oxygen-icons/oxygen-icons-4.6.9999.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.6.9999.ebuild |
16 |
index 4851d08..7d171d4 100644 |
17 |
--- a/kde-base/oxygen-icons/oxygen-icons-4.6.9999.ebuild |
18 |
+++ b/kde-base/oxygen-icons/oxygen-icons-4.6.9999.ebuild |
19 |
@@ -4,19 +4,37 @@ |
20 |
|
21 |
EAPI=4 |
22 |
|
23 |
-if [[ ${PV} = *9999 ]]; then |
24 |
+if [[ ${PV} == *9999 ]]; then |
25 |
KMNAME="kdesupport" |
26 |
+else |
27 |
+ # Upstream does not ship releases properly so we dont want all versions |
28 |
+ MY_PV="4.6.2" |
29 |
+ MY_P="${PN}-${MY_PV}" |
30 |
fi |
31 |
KDE_REQUIRED="never" |
32 |
inherit kde4-base |
33 |
|
34 |
DESCRIPTION="Oxygen SVG icon theme." |
35 |
HOMEPAGE="http://www.oxygen-icons.org/" |
36 |
-#SRC_URI="mirror://kde/unstable/${PV}/src/${P}.tar.bz2" |
37 |
+# Note that the upstream tarball is .bz2, ours is .xz -- if upstream |
38 |
+# changes its compression format to .xz, we will need to change the |
39 |
+# filename of one of the tarballs |
40 |
+[[ ${PV} == *9999 ]] || \ |
41 |
+SRC_URI=" |
42 |
+ !bindist? ( http://dev.gentoo.org/~scarabeus/${MY_P}.tar.xz ) |
43 |
+ bindist? ( ${SRC_URI//${PV}/${MY_PV}} ) |
44 |
+" |
45 |
|
46 |
LICENSE="LGPL-3" |
47 |
KEYWORDS="" |
48 |
-IUSE="aqua" |
49 |
+IUSE="aqua bindist" |
50 |
+ |
51 |
+DEPEND=" |
52 |
+ !bindist? ( app-arch/xz-utils ) |
53 |
+" |
54 |
+RDEPEND="" |
55 |
+ |
56 |
+[[ ${PV} == *9999 ]] || S=${WORKDIR}/${MY_P} |
57 |
|
58 |
# Block conflicting packages |
59 |
add_blocker kdebase-data '<4.2.67' |
60 |
|
61 |
diff --git a/kde-base/oxygen-icons/oxygen-icons-9999.ebuild b/kde-base/oxygen-icons/oxygen-icons-9999.ebuild |
62 |
index 4851d08..7d171d4 100644 |
63 |
--- a/kde-base/oxygen-icons/oxygen-icons-9999.ebuild |
64 |
+++ b/kde-base/oxygen-icons/oxygen-icons-9999.ebuild |
65 |
@@ -4,19 +4,37 @@ |
66 |
|
67 |
EAPI=4 |
68 |
|
69 |
-if [[ ${PV} = *9999 ]]; then |
70 |
+if [[ ${PV} == *9999 ]]; then |
71 |
KMNAME="kdesupport" |
72 |
+else |
73 |
+ # Upstream does not ship releases properly so we dont want all versions |
74 |
+ MY_PV="4.6.2" |
75 |
+ MY_P="${PN}-${MY_PV}" |
76 |
fi |
77 |
KDE_REQUIRED="never" |
78 |
inherit kde4-base |
79 |
|
80 |
DESCRIPTION="Oxygen SVG icon theme." |
81 |
HOMEPAGE="http://www.oxygen-icons.org/" |
82 |
-#SRC_URI="mirror://kde/unstable/${PV}/src/${P}.tar.bz2" |
83 |
+# Note that the upstream tarball is .bz2, ours is .xz -- if upstream |
84 |
+# changes its compression format to .xz, we will need to change the |
85 |
+# filename of one of the tarballs |
86 |
+[[ ${PV} == *9999 ]] || \ |
87 |
+SRC_URI=" |
88 |
+ !bindist? ( http://dev.gentoo.org/~scarabeus/${MY_P}.tar.xz ) |
89 |
+ bindist? ( ${SRC_URI//${PV}/${MY_PV}} ) |
90 |
+" |
91 |
|
92 |
LICENSE="LGPL-3" |
93 |
KEYWORDS="" |
94 |
-IUSE="aqua" |
95 |
+IUSE="aqua bindist" |
96 |
+ |
97 |
+DEPEND=" |
98 |
+ !bindist? ( app-arch/xz-utils ) |
99 |
+" |
100 |
+RDEPEND="" |
101 |
+ |
102 |
+[[ ${PV} == *9999 ]] || S=${WORKDIR}/${MY_P} |
103 |
|
104 |
# Block conflicting packages |
105 |
add_blocker kdebase-data '<4.2.67' |