commit: 2bace6e4ddefc13c09b967e8f197be12f76f977f
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 4 10:41:44 2015 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 20:46:12 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2bace6e4
x11-libs/gtk+: Bump version to 3.18.0
Package-Manager: portage-2.2.22
Manifest-Sign-Key: 7E8B4D42
.../gtk+/{gtk+-9999.ebuild => gtk+-3.18.0.ebuild} | 55 +++++++---------------
x11-libs/gtk+/gtk+-9999.ebuild | 10 ++--
2 files changed, 22 insertions(+), 43 deletions(-)
diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-3.18.0.ebuild
similarity index 79%
copy from x11-libs/gtk+/gtk+-9999.ebuild
copy to x11-libs/gtk+/gtk+-3.18.0.ebuild
index 13bc54c..b70ecdf 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-3.18.0.ebuild
@@ -6,10 +6,7 @@ EAPI="5"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
-inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
+inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
DESCRIPTION="Gimp ToolKit +"
HOMEPAGE="http://www.gtk.org/";
@@ -22,23 +19,18 @@ REQUIRED_USE="
xinerama? ( X )
"
-if [[ ${PV} = 9999 ]]; then
- IUSE="${IUSE} doc"
- KEYWORDS=""
-else
- 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"
-fi
+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"
# FIXME: introspection data is built against system installation of gtk+:3
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
COMMON_DEPEND="
>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.43.4:2[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.45.8:2[${MULTILIB_USEDEP}]
media-libs/fontconfig[${MULTILIB_USEDEP}]
>=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}]
>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
>=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
- >=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]
x11-misc/shared-mime-info
cloudprint? (
@@ -46,7 +38,7 @@ COMMON_DEPEND="
>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.39 )
+ introspection? ( >=dev-libs/gobject-introspection-1.39:= )
wayland? (
>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
media-libs/mesa[wayland,${MULTILIB_USEDEP}]
@@ -85,18 +77,11 @@ DEPEND="${COMMON_DEPEND}
test? (
media-fonts/font-misc-misc
media-fonts/font-cursor-misc )
- examples? ( media-libs/libcanberra[gtk3] )
"
-
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- doc? ( >=dev-util/gtk-doc-1.20 )"
-fi
-
# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
# >=xorg-server-1.11.4 needed for
-# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
+# https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
RDEPEND="${COMMON_DEPEND}
>=dev-util/gtk-update-icon-cache-3
!<gnome-base/gail-1000
@@ -134,34 +119,29 @@ src_prepare() {
if ! use test ; then
# don't waste time building tests
- strip_builddir SRC_SUBDIRS testsuite Makefile.am
- [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS testsuite
Makefile.in
- strip_builddir SRC_SUBDIRS tests Makefile.am
- [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests
Makefile.in
+ strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+
+ # the tests dir needs to be build now because since commit
+ # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o
needs to be there
+ # strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
fi
if ! use examples; then
# don't waste time building demos
- strip_builddir SRC_SUBDIRS demos Makefile.am
- [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos
Makefile.in
- strip_builddir SRC_SUBDIRS examples Makefile.am
- [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS examples
Makefile.in
+ strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+ strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
fi
- # Do no build and install gtk-update-icon-cache which is done by gtk+:2
+ # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch
epatch_user
- [[ ${PV} = 9999 ]] && gnome2_src_prepare
+ eautoreconf
+ gnome2_src_prepare
}
multilib_src_configure() {
- local myconf=""
-
- [[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)"
-
- # Passing --disable-debug is not recommended for production use
# need libdir here to avoid a double slash in a path that libtool
doesn't
# grok so well during install (// between $EPREFIX and usr ...)
ECONF_SOURCE=${S} \
@@ -185,8 +165,7 @@ multilib_src_configure() {
--enable-man \
--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
- CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" \
- ${myconf}
+ CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
# work-around gtk-doc out-of-source brokedness
if multilib_is_native_abi; then
diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 13bc54c..5536c9e 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -33,12 +33,12 @@ fi
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
COMMON_DEPEND="
>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.43.4:2[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.45.8:2[${MULTILIB_USEDEP}]
media-libs/fontconfig[${MULTILIB_USEDEP}]
>=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}]
>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
>=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
- >=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]
x11-misc/shared-mime-info
cloudprint? (
@@ -46,7 +46,7 @@ COMMON_DEPEND="
>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.39 )
+ introspection? ( >=dev-libs/gobject-introspection-1.39:= )
wayland? (
>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
media-libs/mesa[wayland,${MULTILIB_USEDEP}]
@@ -85,7 +85,6 @@ DEPEND="${COMMON_DEPEND}
test? (
media-fonts/font-misc-misc
media-fonts/font-cursor-misc )
- examples? ( media-libs/libcanberra[gtk3] )
"
if [[ ${PV} = 9999 ]]; then
@@ -96,7 +95,7 @@ fi
# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
# >=xorg-server-1.11.4 needed for
-# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
+# https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
RDEPEND="${COMMON_DEPEND}
>=dev-util/gtk-update-icon-cache-3
!<gnome-base/gail-1000
@@ -153,6 +152,7 @@ src_prepare() {
epatch_user
+ eautoreconf
[[ ${PV} = 9999 ]] && gnome2_src_prepare
}
