1 |
commit: 2bace6e4ddefc13c09b967e8f197be12f76f977f |
2 |
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 4 10:41:44 2015 +0000 |
4 |
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 11 20:46:12 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2bace6e4 |
7 |
|
8 |
x11-libs/gtk+: Bump version to 3.18.0 |
9 |
|
10 |
Package-Manager: portage-2.2.22 |
11 |
Manifest-Sign-Key: 7E8B4D42 |
12 |
|
13 |
.../gtk+/{gtk+-9999.ebuild => gtk+-3.18.0.ebuild} | 55 +++++++--------------- |
14 |
x11-libs/gtk+/gtk+-9999.ebuild | 10 ++-- |
15 |
2 files changed, 22 insertions(+), 43 deletions(-) |
16 |
|
17 |
diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-3.18.0.ebuild |
18 |
similarity index 79% |
19 |
copy from x11-libs/gtk+/gtk+-9999.ebuild |
20 |
copy to x11-libs/gtk+/gtk+-3.18.0.ebuild |
21 |
index 13bc54c..b70ecdf 100644 |
22 |
--- a/x11-libs/gtk+/gtk+-9999.ebuild |
23 |
+++ b/x11-libs/gtk+/gtk+-3.18.0.ebuild |
24 |
@@ -6,10 +6,7 @@ EAPI="5" |
25 |
GCONF_DEBUG="yes" |
26 |
GNOME2_LA_PUNT="yes" |
27 |
|
28 |
-inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal |
29 |
-if [[ ${PV} = 9999 ]]; then |
30 |
- inherit gnome2-live |
31 |
-fi |
32 |
+inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal |
33 |
|
34 |
DESCRIPTION="Gimp ToolKit +" |
35 |
HOMEPAGE="http://www.gtk.org/" |
36 |
@@ -22,23 +19,18 @@ REQUIRED_USE=" |
37 |
xinerama? ( X ) |
38 |
" |
39 |
|
40 |
-if [[ ${PV} = 9999 ]]; then |
41 |
- IUSE="${IUSE} doc" |
42 |
- KEYWORDS="" |
43 |
-else |
44 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
45 |
-fi |
46 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
47 |
|
48 |
# FIXME: introspection data is built against system installation of gtk+:3 |
49 |
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) |
50 |
COMMON_DEPEND=" |
51 |
>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] |
52 |
- >=dev-libs/glib-2.43.4:2[${MULTILIB_USEDEP}] |
53 |
+ >=dev-libs/glib-2.45.8:2[${MULTILIB_USEDEP}] |
54 |
media-libs/fontconfig[${MULTILIB_USEDEP}] |
55 |
>=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}] |
56 |
>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] |
57 |
>=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}] |
58 |
- >=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}] |
59 |
+ >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}] |
60 |
x11-misc/shared-mime-info |
61 |
|
62 |
cloudprint? ( |
63 |
@@ -46,7 +38,7 @@ COMMON_DEPEND=" |
64 |
>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) |
65 |
colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) |
66 |
cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) |
67 |
- introspection? ( >=dev-libs/gobject-introspection-1.39 ) |
68 |
+ introspection? ( >=dev-libs/gobject-introspection-1.39:= ) |
69 |
wayland? ( |
70 |
>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}] |
71 |
media-libs/mesa[wayland,${MULTILIB_USEDEP}] |
72 |
@@ -85,18 +77,11 @@ DEPEND="${COMMON_DEPEND} |
73 |
test? ( |
74 |
media-fonts/font-misc-misc |
75 |
media-fonts/font-cursor-misc ) |
76 |
- examples? ( media-libs/libcanberra[gtk3] ) |
77 |
" |
78 |
- |
79 |
-if [[ ${PV} = 9999 ]]; then |
80 |
- DEPEND="${DEPEND} |
81 |
- doc? ( >=dev-util/gtk-doc-1.20 )" |
82 |
-fi |
83 |
- |
84 |
# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 |
85 |
# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 |
86 |
# >=xorg-server-1.11.4 needed for |
87 |
-# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html |
88 |
+# https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html |
89 |
RDEPEND="${COMMON_DEPEND} |
90 |
>=dev-util/gtk-update-icon-cache-3 |
91 |
!<gnome-base/gail-1000 |
92 |
@@ -134,34 +119,29 @@ src_prepare() { |
93 |
|
94 |
if ! use test ; then |
95 |
# don't waste time building tests |
96 |
- strip_builddir SRC_SUBDIRS testsuite Makefile.am |
97 |
- [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS testsuite Makefile.in |
98 |
- strip_builddir SRC_SUBDIRS tests Makefile.am |
99 |
- [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in |
100 |
+ strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} |
101 |
+ |
102 |
+ # the tests dir needs to be build now because since commit |
103 |
+ # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there |
104 |
+ # strip_builddir SRC_SUBDIRS tests Makefile.{am,in} |
105 |
fi |
106 |
|
107 |
if ! use examples; then |
108 |
# don't waste time building demos |
109 |
- strip_builddir SRC_SUBDIRS demos Makefile.am |
110 |
- [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in |
111 |
- strip_builddir SRC_SUBDIRS examples Makefile.am |
112 |
- [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS examples Makefile.in |
113 |
+ strip_builddir SRC_SUBDIRS demos Makefile.{am,in} |
114 |
+ strip_builddir SRC_SUBDIRS examples Makefile.{am,in} |
115 |
fi |
116 |
|
117 |
- # Do no build and install gtk-update-icon-cache which is done by gtk+:2 |
118 |
+ # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache |
119 |
epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch |
120 |
|
121 |
epatch_user |
122 |
|
123 |
- [[ ${PV} = 9999 ]] && gnome2_src_prepare |
124 |
+ eautoreconf |
125 |
+ gnome2_src_prepare |
126 |
} |
127 |
|
128 |
multilib_src_configure() { |
129 |
- local myconf="" |
130 |
- |
131 |
- [[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)" |
132 |
- |
133 |
- # Passing --disable-debug is not recommended for production use |
134 |
# need libdir here to avoid a double slash in a path that libtool doesn't |
135 |
# grok so well during install (// between $EPREFIX and usr ...) |
136 |
ECONF_SOURCE=${S} \ |
137 |
@@ -185,8 +165,7 @@ multilib_src_configure() { |
138 |
--enable-man \ |
139 |
--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ |
140 |
--libdir="${EPREFIX}"/usr/$(get_libdir) \ |
141 |
- CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" \ |
142 |
- ${myconf} |
143 |
+ CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" |
144 |
|
145 |
# work-around gtk-doc out-of-source brokedness |
146 |
if multilib_is_native_abi; then |
147 |
|
148 |
diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild |
149 |
index 13bc54c..5536c9e 100644 |
150 |
--- a/x11-libs/gtk+/gtk+-9999.ebuild |
151 |
+++ b/x11-libs/gtk+/gtk+-9999.ebuild |
152 |
@@ -33,12 +33,12 @@ fi |
153 |
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) |
154 |
COMMON_DEPEND=" |
155 |
>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] |
156 |
- >=dev-libs/glib-2.43.4:2[${MULTILIB_USEDEP}] |
157 |
+ >=dev-libs/glib-2.45.8:2[${MULTILIB_USEDEP}] |
158 |
media-libs/fontconfig[${MULTILIB_USEDEP}] |
159 |
>=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}] |
160 |
>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] |
161 |
>=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}] |
162 |
- >=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}] |
163 |
+ >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}] |
164 |
x11-misc/shared-mime-info |
165 |
|
166 |
cloudprint? ( |
167 |
@@ -46,7 +46,7 @@ COMMON_DEPEND=" |
168 |
>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) |
169 |
colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) |
170 |
cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) |
171 |
- introspection? ( >=dev-libs/gobject-introspection-1.39 ) |
172 |
+ introspection? ( >=dev-libs/gobject-introspection-1.39:= ) |
173 |
wayland? ( |
174 |
>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}] |
175 |
media-libs/mesa[wayland,${MULTILIB_USEDEP}] |
176 |
@@ -85,7 +85,6 @@ DEPEND="${COMMON_DEPEND} |
177 |
test? ( |
178 |
media-fonts/font-misc-misc |
179 |
media-fonts/font-cursor-misc ) |
180 |
- examples? ( media-libs/libcanberra[gtk3] ) |
181 |
" |
182 |
|
183 |
if [[ ${PV} = 9999 ]]; then |
184 |
@@ -96,7 +95,7 @@ fi |
185 |
# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 |
186 |
# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 |
187 |
# >=xorg-server-1.11.4 needed for |
188 |
-# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html |
189 |
+# https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html |
190 |
RDEPEND="${COMMON_DEPEND} |
191 |
>=dev-util/gtk-update-icon-cache-3 |
192 |
!<gnome-base/gail-1000 |
193 |
@@ -153,6 +152,7 @@ src_prepare() { |
194 |
|
195 |
epatch_user |
196 |
|
197 |
+ eautoreconf |
198 |
[[ ${PV} = 9999 ]] && gnome2_src_prepare |
199 |
} |