1 |
commit: 32ec4afd9a64345f2ef4050f25e46ba1edf1c45b |
2 |
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 2 09:45:18 2015 +0000 |
4 |
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 2 09:45:18 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=32ec4afd |
7 |
|
8 |
gnome-base/gnome-desktop: Bump version to 3.18.0 |
9 |
|
10 |
Package-Manager: portage-2.2.22 |
11 |
Manifest-Sign-Key: 7E8B4D42 |
12 |
|
13 |
...top-9999.ebuild => gnome-desktop-3.18.0.ebuild} | 55 ++-------------------- |
14 |
gnome-base/gnome-desktop/gnome-desktop-9999.ebuild | 2 +- |
15 |
2 files changed, 5 insertions(+), 52 deletions(-) |
16 |
|
17 |
diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.18.0.ebuild |
18 |
similarity index 56% |
19 |
copy from gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |
20 |
copy to gnome-base/gnome-desktop/gnome-desktop-3.18.0.ebuild |
21 |
index d7d9f33..ab955a7 100644 |
22 |
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |
23 |
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.18.0.ebuild |
24 |
@@ -6,27 +6,19 @@ EAPI="5" |
25 |
GCONF_DEBUG="yes" |
26 |
|
27 |
inherit gnome2 virtualx |
28 |
-if [[ ${PV} = 9999 ]]; then |
29 |
- inherit git-2 gnome2-live |
30 |
-fi |
31 |
|
32 |
DESCRIPTION="Libraries for the gnome desktop that are not part of the UI" |
33 |
HOMEPAGE="https://git.gnome.org/browse/gnome-desktop" |
34 |
|
35 |
LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" |
36 |
-SLOT="3/10" # subslot = libgnome-desktop-3 soname version |
37 |
+SLOT="3/12" # subslot = libgnome-desktop-3 soname version |
38 |
IUSE="+introspection" |
39 |
-if [[ ${PV} = 9999 ]]; then |
40 |
- IUSE="${IUSE} doc" |
41 |
- KEYWORDS="" |
42 |
-else |
43 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris" |
44 |
-fi |
45 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris" |
46 |
|
47 |
# cairo[X] needed for gnome-bg |
48 |
COMMON_DEPEND=" |
49 |
app-text/iso-codes |
50 |
- >=dev-libs/glib-2.38:2 |
51 |
+ >=dev-libs/glib-2.44:2 |
52 |
>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] |
53 |
>=x11-libs/gtk+-3.3.6:3[introspection?] |
54 |
>=x11-libs/libXext-1.1 |
55 |
@@ -51,47 +43,11 @@ DEPEND="${COMMON_DEPEND} |
56 |
virtual/pkgconfig |
57 |
" |
58 |
|
59 |
-if [[ ${PV} = 9999 ]]; then |
60 |
- DEPEND="${DEPEND} |
61 |
- doc? ( >=dev-util/gtk-doc-1.4 ) |
62 |
- app-text/yelp-tools" |
63 |
-fi |
64 |
- |
65 |
# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto |
66 |
# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and |
67 |
# eventually libXrandr shouldn't RDEPEND on randrproto) |
68 |
|
69 |
-src_unpack() { |
70 |
- gnome2_src_unpack |
71 |
- |
72 |
- if [[ ${PV} = 9999 ]]; then |
73 |
- # pnp.ids are only provided with the gnome-desktop tarball; |
74 |
- # for the live version, we have to get them from hwdata git |
75 |
- unset gnome_desktop_LIVE_BRANCH |
76 |
- unset gnome_destkop_LIVE_COMMIT |
77 |
- unset gnome_desktop_LIVE_REPO |
78 |
- unset EGIT_BRANCH |
79 |
- unset EGIT_COMMIT |
80 |
- unset EGIT_DIR |
81 |
- unset EGIT_MASTER |
82 |
- EGIT_PROJECT="gnome-desktop_hwdata" |
83 |
- EGIT_REPO_URI="git://git.fedorahosted.org/hwdata.git" |
84 |
- EGIT_SOURCEDIR="${WORKDIR}/hwdata" |
85 |
- git-2_src_unpack |
86 |
- ln -sf "${WORKDIR}/hwdata/pnp.ids" "${S}/libgnome-desktop/" || |
87 |
- die "ln -sf failed" |
88 |
- fi |
89 |
-} |
90 |
- |
91 |
src_configure() { |
92 |
- local myconf="" |
93 |
- |
94 |
- if [[ ${PV} = 9999 ]]; then |
95 |
- myconf="${myconf} $(use_enable doc gtk-doc)" |
96 |
- else |
97 |
- myconf="${myconf} ITSTOOL=$(type -P true)" |
98 |
- fi |
99 |
- |
100 |
DOCS="AUTHORS ChangeLog HACKING NEWS README" |
101 |
# Note: do *not* use "--with-pnp-ids-path" argument. Otherwise, the pnp.ids |
102 |
# file (needed by other packages such as >=gnome-settings-daemon-3.1.2) |
103 |
@@ -101,12 +57,9 @@ src_configure() { |
104 |
--with-gnome-distributor=Gentoo \ |
105 |
--enable-desktop-docs \ |
106 |
$(use_enable introspection) \ |
107 |
- ${myconf} |
108 |
+ ITSTOOL=$(type -P true) |
109 |
} |
110 |
|
111 |
src_test() { |
112 |
- # Makes unittest fail without this locale installed |
113 |
- rm "${S}"/tests/he_IL* || die |
114 |
- |
115 |
Xemake check |
116 |
} |
117 |
|
118 |
diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |
119 |
index d7d9f33..cd36410 100644 |
120 |
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |
121 |
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |
122 |
@@ -14,7 +14,7 @@ DESCRIPTION="Libraries for the gnome desktop that are not part of the UI" |
123 |
HOMEPAGE="https://git.gnome.org/browse/gnome-desktop" |
124 |
|
125 |
LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" |
126 |
-SLOT="3/10" # subslot = libgnome-desktop-3 soname version |
127 |
+SLOT="3/12" # subslot = libgnome-desktop-3 soname version |
128 |
IUSE="+introspection" |
129 |
if [[ ${PV} = 9999 ]]; then |
130 |
IUSE="${IUSE} doc" |