From: "Ole Reifschneider" <tranquility@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
Date: Sun, 11 Oct 2015 20:46:58 +0000 (UTC) [thread overview]
Message-ID: <1444596372.2bace6e4ddefc13c09b967e8f197be12f76f977f.tranquility@gentoo> (raw)
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
}
next reply other threads:[~2015-10-11 20:47 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-11 20:46 Ole Reifschneider [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-01-12 14:59 [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/ Dennis Lamm
2016-04-09 9:48 Ole Reifschneider
2016-03-25 0:56 Ole Reifschneider
2015-06-09 9:16 Gilles Dartiguelongue
2015-05-25 2:23 Alexandre Rostovtsev
2015-05-14 13:39 Gilles Dartiguelongue
2015-05-12 19:31 Gilles Dartiguelongue
2015-04-25 18:52 Alexandre Rostovtsev
2014-12-14 22:46 Gilles Dartiguelongue
2014-12-14 22:46 Gilles Dartiguelongue
2014-11-23 23:51 Remi Cardona
2014-11-23 23:51 Remi Cardona
2014-11-03 23:24 Gilles Dartiguelongue
2014-10-25 21:07 Gilles Dartiguelongue
2014-10-13 21:51 Gilles Dartiguelongue
2014-04-25 23:35 Gilles Dartiguelongue
2014-04-22 21:27 Gilles Dartiguelongue
2014-04-20 18:17 Gilles Dartiguelongue
2014-02-12 23:48 Gilles Dartiguelongue
2013-12-22 20:26 Gilles Dartiguelongue
2013-12-18 19:16 Priit Laes
2013-12-12 23:20 Gilles Dartiguelongue
2013-12-02 15:30 Priit Laes
2013-12-01 14:28 Gilles Dartiguelongue
2013-03-20 5:55 Priit Laes
2013-03-08 14:39 Priit Laes
2012-10-10 7:51 Alexandre Rostovtsev
2012-09-22 15:54 Nirbheek Chauhan
2012-09-10 6:22 Nirbheek Chauhan
2012-09-05 16:43 Nirbheek Chauhan
2012-09-05 15:48 Nirbheek Chauhan
2012-07-22 4:41 Priit Laes
2012-07-13 10:21 Priit Laes
2012-05-06 18:15 Alexandre Restovtsev
2012-03-14 4:48 Alexandre Restovtsev
2012-03-08 18:19 Alexandre Restovtsev
2012-03-07 16:45 Alexandre Restovtsev
2012-03-07 0:32 Alexandre Restovtsev
2012-02-08 7:52 Priit Laes
2012-02-03 8:32 Priit Laes
2012-01-23 21:29 Priit Laes
2012-01-23 19:23 Priit Laes
2012-01-17 11:30 Priit Laes
2012-01-11 4:36 Nirbheek Chauhan
2011-12-25 0:43 Nirbheek Chauhan
2011-12-14 19:51 Alexandre Restovtsev
2011-10-21 19:25 Alexandre Restovtsev
2011-10-06 11:51 Alexandre Restovtsev
2011-04-05 0:57 Nirbheek Chauhan
2011-03-26 1:58 Nirbheek Chauhan
2011-03-23 22:24 Nirbheek Chauhan
2011-03-22 1:18 Nirbheek Chauhan
2011-03-19 23:23 Nirbheek Chauhan
2011-02-22 0:31 Nirbheek Chauhan
2011-02-12 9:30 Nirbheek Chauhan
2011-02-12 9:30 Nirbheek Chauhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444596372.2bace6e4ddefc13c09b967e8f197be12f76f977f.tranquility@gentoo \
--to=tranquility@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox