[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2011-02-12  9:30 Nirbheek Chauhan
  0 siblings, 0 replies; 57+ messages in thread
From: Nirbheek Chauhan @ 2011-02-12  9:30 UTC (permalink / raw
  To: gentoo-commits

commit:     f21f43b2975194ea5f15d73e6213e0819d50baa9
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 20:19:05 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 21:14:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f21f43b2

x11-libs/gtk+: 2.99.3 -> 3.0.0, 2.24 moved to tree

* WARNING: soname changed, everything breaks

---
 x11-libs/gtk+/gtk+-2.24.0.ebuild                   |  212 --------------------
 .../gtk+/{gtk+-2.99.3.ebuild => gtk+-3.0.0.ebuild} |   16 +-
 x11-libs/gtk+/gtk+-9999.ebuild                     |   16 +-
 3 files changed, 10 insertions(+), 234 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-2.24.0.ebuild b/x11-libs/gtk+/gtk+-2.24.0.ebuild
deleted file mode 100644
index 99f5c58..0000000
--- a/x11-libs/gtk+/gtk+-2.24.0.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.22.1.ebuild,v 1.3 2010/12/17 07:59:35 grobian Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.4"
-
-inherit eutils flag-o-matic gnome.org libtool python virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="aqua cups debug doc examples +introspection jpeg jpeg2k tiff test vim-syntax xinerama"
-
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-RDEPEND="!aqua? (
-		x11-libs/libXrender
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXt
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.3
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		>=x11-libs/cairo-1.6[X,svg]
-		x11-libs/gdk-pixbuf:2[X,introspection?,jpeg?,jpeg2k?,tiff?]
-	)
-	aqua? (
-		>=x11-libs/cairo-1.6[aqua,svg]
-		x11-libs/gdk-pixbuf:2[introspection?,jpeg?,jpeg2k?,tiff?]
-	)
-	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.27.3
-	>=x11-libs/pango-1.20[introspection?]
-	>=dev-libs/atk-1.29.2[introspection?]
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	cups? ( net-print/cups )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	!<gnome-base/gail-1000"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	!aqua? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/damageproto
-	)
-	x86-interix? (
-		sys-libs/itx-bind
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	>=dev-util/gtk-doc-am-1.11
-	doc? (
-		>=dev-util/gtk-doc-1.11
-		~app-text/docbook-xml-dtd-4.1.2 )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-}
-
-src_prepare() {
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	epatch "${FILESDIR}/${PN}-2.21.3-multilib.patch"
-
-	# Don't break inclusion of gtkclist.h, upstream bug 536767
-	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
-
-	# Stop trying to build unmaintained docs, bug #349754
-	strip_builddir SUBDIRS tutorial docs/Makefile.am docs/Makefile.in
-	strip_builddir SUBDIRS faq docs/Makefile.am docs/Makefile.in
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	use ppc64 && append-flags -mminimal-toc
-
-	# Non-working test in gentoo's env
-	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-		-i gtk/tests/testing.c || die "sed 1 failed"
-
-	if use x86-interix; then
-		# activate the itx-bind package...
-		append-flags "-I${EPREFIX}/usr/include/bind"
-		append-ldflags "-L${EPREFIX}/usr/lib/bind"
-	fi
-
-	if ! use test; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS tests Makefile.am Makefile.in
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
-	fi
-
-	elibtoolize
-}
-
-src_configure() {
-	local myconf="$(use_enable doc gtk-doc)
-		$(use_enable xinerama)
-		$(use_enable cups cups auto)
-		$(use_enable introspection)
-		--disable-papi"
-	if use aqua; then
-		myconf="${myconf} --with-gdktarget=quartz"
-	else
-		myconf="${myconf} --with-gdktarget=x11 --with-xinput"
-	fi
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	econf ${myconf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	# Exporting HOME fixes tests using XDG directories spec since all defaults
-	# are based on $HOME. It is also backward compatible with functions not
-	# yet ported to this spec.
-	XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR} || die "dodir failed"
-	keepdir ${GTK2_CONFDIR}
-
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
-	insinto /etc/gtk-2.0
-	doins "${T}"/gtkrc || die "doins gtkrc failed"
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	echo "GDK_USE_XFT=1" > "${T}"/50gtk2
-	doenvd "${T}"/50gtk2 || die "doenvd failed"
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
-
-	# add -framework Carbon to the .pc files
-	use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
-		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed"
-	done
-
-	python_convert_shebangs 2 "${ED}"usr/bin/gtk-builder-convert
-}
-
-pkg_postinst() {
-	set_gtk2_confdir
-
-	# gtk.immodules should be in their CHOST directories respectively.
-	gtk-query-immodules-2.0  > "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" \
-		|| ewarn "Failed to run gtk-query-immodules-2.0"
-
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
-		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
-		elog "aware location. Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
-	fi
-
-	# pixbufs are now handled by x11-libs/gdk-pixbuf
-	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
-	fi
-
-	# two checks needed since we dropped multilib conditional
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
-	fi
-
-	if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
-	fi
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your gtkrc."
-	fi
-}

diff --git a/x11-libs/gtk+/gtk+-2.99.3.ebuild b/x11-libs/gtk+/gtk+-3.0.0.ebuild
similarity index 91%
rename from x11-libs/gtk+/gtk+-2.99.3.ebuild
rename to x11-libs/gtk+/gtk+-3.0.0.ebuild
index bfdfdc5..62ef50a 100644
--- a/x11-libs/gtk+/gtk+-2.99.3.ebuild
+++ b/x11-libs/gtk+/gtk+-3.0.0.ebuild
@@ -39,16 +39,16 @@ RDEPEND="!aqua? (
 		x11-libs/libXcomposite
 		x11-libs/libXdamage
 		>=x11-libs/cairo-1.10.0[X,svg]
-		>=x11-libs/gdk-pixbuf-2.21:2[X,introspection?,jpeg?,jpeg2k?,tiff?]
+		>=x11-libs/gdk-pixbuf-2.22.0:2[X,introspection?,jpeg?,jpeg2k?,tiff?]
 	)
 	aqua? (
 		>=x11-libs/cairo-1.10.0[aqua,svg]
-		>=x11-libs/gdk-pixbuf-2.21:2[introspection?,jpeg?,jpeg2k?,tiff?]
+		>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?,jpeg?,jpeg2k?,tiff?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.27.5
+	>=dev-libs/glib-2.28.0
 	>=x11-libs/pango-1.20[introspection?]
-	>=dev-libs/atk-1.29.2[introspection?]
+	>=dev-libs/atk-1.30[introspection?]
 	media-libs/fontconfig
 	x11-libs/gtk+:2
 	x11-misc/shared-mime-info
@@ -126,9 +126,7 @@ src_configure() {
 		$(use_enable introspection)
 		--disable-packagekit
 		--disable-papi
-		--disable-gtk2-dependency"
-	# ARGH. --enable-gtk2-dependency doesn't actually work.
-	# We remove the utilities manually below.
+		--enable-gtk2-dependency"
 
 	# XXX: Maybe with multi-backend we should enable x11 all the time?
 	if use aqua; then
@@ -172,10 +170,6 @@ src_install() {
 	# Remove unneeded *.la files
 	find "${ED}" -name "*.la" -delete
 
-	# gtk-update-icon-cache and gtk-builder-convert are provided by gtk+:2 now
-	# Remove this once --enable-gtk2-dependency works
-	rm -v "${ED}"/usr/bin/gtk-update-icon-cache || die
-
 	# add -framework Carbon to the .pc files
 	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
 		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index bfdfdc5..62ef50a 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -39,16 +39,16 @@ RDEPEND="!aqua? (
 		x11-libs/libXcomposite
 		x11-libs/libXdamage
 		>=x11-libs/cairo-1.10.0[X,svg]
-		>=x11-libs/gdk-pixbuf-2.21:2[X,introspection?,jpeg?,jpeg2k?,tiff?]
+		>=x11-libs/gdk-pixbuf-2.22.0:2[X,introspection?,jpeg?,jpeg2k?,tiff?]
 	)
 	aqua? (
 		>=x11-libs/cairo-1.10.0[aqua,svg]
-		>=x11-libs/gdk-pixbuf-2.21:2[introspection?,jpeg?,jpeg2k?,tiff?]
+		>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?,jpeg?,jpeg2k?,tiff?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.27.5
+	>=dev-libs/glib-2.28.0
 	>=x11-libs/pango-1.20[introspection?]
-	>=dev-libs/atk-1.29.2[introspection?]
+	>=dev-libs/atk-1.30[introspection?]
 	media-libs/fontconfig
 	x11-libs/gtk+:2
 	x11-misc/shared-mime-info
@@ -126,9 +126,7 @@ src_configure() {
 		$(use_enable introspection)
 		--disable-packagekit
 		--disable-papi
-		--disable-gtk2-dependency"
-	# ARGH. --enable-gtk2-dependency doesn't actually work.
-	# We remove the utilities manually below.
+		--enable-gtk2-dependency"
 
 	# XXX: Maybe with multi-backend we should enable x11 all the time?
 	if use aqua; then
@@ -172,10 +170,6 @@ src_install() {
 	# Remove unneeded *.la files
 	find "${ED}" -name "*.la" -delete
 
-	# gtk-update-icon-cache and gtk-builder-convert are provided by gtk+:2 now
-	# Remove this once --enable-gtk2-dependency works
-	rm -v "${ED}"/usr/bin/gtk-update-icon-cache || die
-
 	# add -framework Carbon to the .pc files
 	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
 		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2011-02-12  9:30 Nirbheek Chauhan
  0 siblings, 0 replies; 57+ messages in thread
From: Nirbheek Chauhan @ 2011-02-12  9:30 UTC (permalink / raw
  To: gentoo-commits

commit:     4f70325dfef2f38280e1a92b6cd4f0691872d0be
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 21:42:43 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 08:41:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4f70325d

x11-libs/gtk+: add FIXME about introspection problems

---
 x11-libs/gtk+/gtk+-3.0.0.ebuild |    1 +
 x11-libs/gtk+/gtk+-9999.ebuild  |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.0.0.ebuild b/x11-libs/gtk+/gtk+-3.0.0.ebuild
index 62ef50a..55473c2 100644
--- a/x11-libs/gtk+/gtk+-3.0.0.ebuild
+++ b/x11-libs/gtk+/gtk+-3.0.0.ebuild
@@ -25,6 +25,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
+# 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)
 # Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert
 RDEPEND="!aqua? (

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 62ef50a..55473c2 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -25,6 +25,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
+# 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)
 # Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert
 RDEPEND="!aqua? (



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2011-02-22  0:31 Nirbheek Chauhan
  0 siblings, 0 replies; 57+ messages in thread
From: Nirbheek Chauhan @ 2011-02-22  0:31 UTC (permalink / raw
  To: gentoo-commits

commit:     14dfed8bd00ddb63707800b57fc4b1ec68dc1939
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 00:19:23 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 00:19:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=14dfed8b

x11-libs/gtk+: 3.0.0 -> 3.0.1

---
 .../gtk+/{gtk+-3.0.0.ebuild => gtk+-3.0.1.ebuild}  |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.0.0.ebuild b/x11-libs/gtk+/gtk+-3.0.1.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.0.0.ebuild
rename to x11-libs/gtk+/gtk+-3.0.1.ebuild



^ permalink raw reply	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2011-03-19 23:23 Nirbheek Chauhan
  0 siblings, 0 replies; 57+ messages in thread
From: Nirbheek Chauhan @ 2011-03-19 23:23 UTC (permalink / raw
  To: gentoo-commits

commit:     1cf22a19f91e02e29c982cc91d578864d014073b
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 23:14:44 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 23:15:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1cf22a19

x11-libs/gtk+: depend on gtk+-2.24 for gtk-builder-convert, bug 359555

---
 x11-libs/gtk+/gtk+-3.0.3.ebuild |    3 ++-
 x11-libs/gtk+/gtk+-9999.ebuild  |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.0.3.ebuild b/x11-libs/gtk+/gtk+-3.0.3.ebuild
index 7090c8e..b7dfba8 100644
--- a/x11-libs/gtk+/gtk+-3.0.3.ebuild
+++ b/x11-libs/gtk+/gtk+-3.0.3.ebuild
@@ -28,6 +28,7 @@ fi
 # 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)
 # Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert
+# >=x11-libs/gtk+-2.24:2 is needed for bug 359555
 RDEPEND="!aqua? (
 		x11-libs/libXrender
 		x11-libs/libX11
@@ -50,8 +51,8 @@ RDEPEND="!aqua? (
 	>=dev-libs/glib-2.28.0
 	>=x11-libs/pango-1.24.0[introspection?]
 	>=dev-libs/atk-1.30[introspection?]
+	>=x11-libs/gtk+-2.24:2
 	media-libs/fontconfig
-	x11-libs/gtk+:2
 	x11-misc/shared-mime-info
 	cups? ( net-print/cups )
 	introspection? ( >=dev-libs/gobject-introspection-0.10.1 )

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 7090c8e..b7dfba8 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -28,6 +28,7 @@ fi
 # 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)
 # Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert
+# >=x11-libs/gtk+-2.24:2 is needed for bug 359555
 RDEPEND="!aqua? (
 		x11-libs/libXrender
 		x11-libs/libX11
@@ -50,8 +51,8 @@ RDEPEND="!aqua? (
 	>=dev-libs/glib-2.28.0
 	>=x11-libs/pango-1.24.0[introspection?]
 	>=dev-libs/atk-1.30[introspection?]
+	>=x11-libs/gtk+-2.24:2
 	media-libs/fontconfig
-	x11-libs/gtk+:2
 	x11-misc/shared-mime-info
 	cups? ( net-print/cups )
 	introspection? ( >=dev-libs/gobject-introspection-0.10.1 )



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2011-03-22  1:18 Nirbheek Chauhan
  0 siblings, 0 replies; 57+ messages in thread
From: Nirbheek Chauhan @ 2011-03-22  1:18 UTC (permalink / raw
  To: gentoo-commits

commit:     fb53dbf51e8d22228a5aaee24c671f095cf1a8ca
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 00:53:23 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 00:53:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fb53dbf5

x11-libs/gtk+: 3.0.3 → 3.0.4

---
 .../gtk+/{gtk+-3.0.3.ebuild => gtk+-3.0.4.ebuild}  |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.0.3.ebuild b/x11-libs/gtk+/gtk+-3.0.4.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.0.3.ebuild
rename to x11-libs/gtk+/gtk+-3.0.4.ebuild



^ permalink raw reply	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2011-03-23 22:24 Nirbheek Chauhan
  0 siblings, 0 replies; 57+ messages in thread
From: Nirbheek Chauhan @ 2011-03-23 22:24 UTC (permalink / raw
  To: gentoo-commits

commit:     8547596a612f4a76d9fd38e76b3a7504e130f235
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 22:13:26 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 22:13:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8547596a

x11-libs/gtk+: 3.0.4 → 3.0.5

---
 .../gtk+/{gtk+-3.0.4.ebuild => gtk+-3.0.5.ebuild}  |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.0.4.ebuild b/x11-libs/gtk+/gtk+-3.0.5.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.0.4.ebuild
rename to x11-libs/gtk+/gtk+-3.0.5.ebuild



^ permalink raw reply	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2011-03-26  1:58 Nirbheek Chauhan
  0 siblings, 0 replies; 57+ messages in thread
From: Nirbheek Chauhan @ 2011-03-26  1:58 UTC (permalink / raw
  To: gentoo-commits

commit:     c5026c882c9cfb0362a8bf655ca89c1ba7ece890
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 01:18:36 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 01:18:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c5026c88

x11-libs/gtk+: 3.0.5 → 3.0.6

* Bugfixes, translation updates

---
 .../gtk+/{gtk+-3.0.5.ebuild => gtk+-3.0.6.ebuild}  |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.0.5.ebuild b/x11-libs/gtk+/gtk+-3.0.6.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.0.5.ebuild
rename to x11-libs/gtk+/gtk+-3.0.6.ebuild



^ permalink raw reply	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2011-04-05  0:57 Nirbheek Chauhan
  0 siblings, 0 replies; 57+ messages in thread
From: Nirbheek Chauhan @ 2011-04-05  0:57 UTC (permalink / raw
  To: gentoo-commits

commit:     de3d9c3f89ae90847fc73c972df5495a93d8a225
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 13:33:07 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 13:33:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=de3d9c3f

x11-libs/gtk+: sync live ebuild with portage

---
 x11-libs/gtk+/gtk+-9999.ebuild |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 18ef65d..521a6cf 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -3,7 +3,6 @@
 # $Header: $
 
 EAPI="3"
-PYTHON_DEPEND="2:2.4"
 
 inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx
 
@@ -17,7 +16,7 @@ SLOT="3"
 #  * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
 #  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
 # NOTE: Lots of aqua stuff in this ebuild is probably very broken
-IUSE="aqua cups debug doc examples +introspection jpeg jpeg2k tiff test vim-syntax xinerama"
+IUSE="aqua cups debug doc examples +introspection test vim-syntax xinerama"
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 	KEYWORDS=""
@@ -41,11 +40,11 @@ COMMON_DEPEND="!aqua? (
 		x11-libs/libXcomposite
 		x11-libs/libXdamage
 		>=x11-libs/cairo-1.10.0[X,svg]
-		>=x11-libs/gdk-pixbuf-2.22.0:2[X,introspection?,jpeg?,jpeg2k?,tiff?]
+		>=x11-libs/gdk-pixbuf-2.22.0:2[X,introspection?]
 	)
 	aqua? (
 		>=x11-libs/cairo-1.10.0[aqua,svg]
-		>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?,jpeg?,jpeg2k?,tiff?]
+		>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
 	>=dev-libs/glib-2.28.0



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2011-10-06 11:51 Alexandre Restovtsev
  0 siblings, 0 replies; 57+ messages in thread
From: Alexandre Restovtsev @ 2011-10-06 11:51 UTC (permalink / raw
  To: gentoo-commits

commit:     a9b5562d008d0dfd52d9614adc75e1f09c1bc157
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Thu Oct  6 11:44:33 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Oct  6 11:50:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a9b5562d

x11-libs/gtk+: add missing cairo[glib] dep (#365159)

This was fixed in gx86, but not in the overlay. Thanks to geki_ and
Dave King (amigadave) on IRC for noticing.

---
 x11-libs/gtk+/gtk+-3.2.0.ebuild |    4 ++--
 x11-libs/gtk+/gtk+-9999.ebuild  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.2.0.ebuild b/x11-libs/gtk+/gtk+-3.2.0.ebuild
index ec98b3a..0cfe730 100644
--- a/x11-libs/gtk+/gtk+-3.2.0.ebuild
+++ b/x11-libs/gtk+/gtk+-3.2.0.ebuild
@@ -41,11 +41,11 @@ COMMON_DEPEND="!aqua? (
 		x11-libs/libXfixes
 		x11-libs/libXcomposite
 		x11-libs/libXdamage
-		>=x11-libs/cairo-1.10.0[X,svg]
+		>=x11-libs/cairo-1.10.0[X,glib,svg]
 		>=x11-libs/gdk-pixbuf-2.23.5:2[X,introspection?]
 	)
 	aqua? (
-		>=x11-libs/cairo-1.10.0[aqua,svg]
+		>=x11-libs/cairo-1.10.0[aqua,glib,svg]
 		>=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index ec98b3a..0cfe730 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -41,11 +41,11 @@ COMMON_DEPEND="!aqua? (
 		x11-libs/libXfixes
 		x11-libs/libXcomposite
 		x11-libs/libXdamage
-		>=x11-libs/cairo-1.10.0[X,svg]
+		>=x11-libs/cairo-1.10.0[X,glib,svg]
 		>=x11-libs/gdk-pixbuf-2.23.5:2[X,introspection?]
 	)
 	aqua? (
-		>=x11-libs/cairo-1.10.0[aqua,svg]
+		>=x11-libs/cairo-1.10.0[aqua,glib,svg]
 		>=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2011-10-21 19:25 Alexandre Restovtsev
  0 siblings, 0 replies; 57+ messages in thread
From: Alexandre Restovtsev @ 2011-10-21 19:25 UTC (permalink / raw
  To: gentoo-commits

commit:     de550777f87f375e0c619d21167271bc0dfedcb1
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 21 19:23:22 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Oct 21 19:23:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=de550777

x11-libs/gtk+: do not call gnome2_src_prepare for non-live versions

Non-live versions do not use gnome2.eclass. Thanks to ssuominen for
noticing.

---
 x11-libs/gtk+/gtk+-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index d2495e8..7077f90 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -127,7 +127,7 @@ src_prepare() {
 		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
 	fi
 
-	gnome2_src_prepare
+	[[ ${PV} == 9999 ]] && gnome2_src_prepare
 }
 
 src_configure() {



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2011-12-14 19:51 Alexandre Restovtsev
  0 siblings, 0 replies; 57+ messages in thread
From: Alexandre Restovtsev @ 2011-12-14 19:51 UTC (permalink / raw
  To: gentoo-commits

commit:     05b03fb455e2b700e0e0fcfc6dbca402cf03594a
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 19:50:54 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Dec 14 19:50:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=05b03fb4

x11-libs/gtk+: do not use gnome2_schemas_update --uninstall (#394501)

---
 x11-libs/gtk+/gtk+-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 7077f90..b55d38a 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -200,5 +200,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_schemas_update --uninstall
+	gnome2_schemas_update
 }



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2011-12-25  0:43 Nirbheek Chauhan
  0 siblings, 0 replies; 57+ messages in thread
From: Nirbheek Chauhan @ 2011-12-25  0:43 UTC (permalink / raw
  To: gentoo-commits

commit:     3d600af7fa94baf6989dd946a5c3b41cce7f3bf5
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 19:06:48 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 19:10:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3d600af7

x11-libs/gtk+: bump to 3.3.6

---
 .../gtk+/{gtk+-9999.ebuild => gtk+-3.3.6.ebuild}   |   26 +++++++-------------
 x11-libs/gtk+/gtk+-9999.ebuild                     |   13 ++++-----
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-3.3.6.ebuild
similarity index 89%
copy from x11-libs/gtk+/gtk+-9999.ebuild
copy to x11-libs/gtk+/gtk+-3.3.6.ebuild
index b55d38a..b9d5b14 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-3.3.6.ebuild
@@ -1,13 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.2-r2.ebuild,v 1.1 2011/12/15 23:46:04 tetromino Exp $
 
 EAPI="4"
 
 inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
@@ -20,11 +17,7 @@ SLOT="3"
 # I tried this and got it all compiling, but the end result is unusable as it
 # horribly mixes up the backends -- grobian
 IUSE="aqua colord cups debug doc examples +introspection packagekit test vim-syntax xinerama"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-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 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-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)
@@ -49,7 +42,7 @@ COMMON_DEPEND="!aqua? (
 		>=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.29.14
+	>=dev-libs/glib-2.31.6
 	>=x11-libs/pango-1.29.0[introspection?]
 	>=dev-libs/atk-2.1.5[introspection?]
 	>=x11-libs/gtk+-2.24:2
@@ -74,8 +67,10 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		media-fonts/font-misc-misc
 		media-fonts/font-cursor-misc )"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.30.1-r1:2.90
 	packagekit? ( app-admin/packagekit-base )"
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
 
@@ -109,7 +104,7 @@ src_prepare() {
 		-i tests/Makefile.* || die "sed 3 failed"
 
 	# Test results depend on the list of mounted filesystems!
-	rm tests/a11y/pickers.{ui,txt} || die "rm failed"
+	rm -v tests/a11y/pickers.{ui,txt} || die "rm failed"
 
 	# Failing treeview scrolling tests; bug #384855,
 	# https://bugzilla.gnome.org/show_bug.cgi?id=660931
@@ -118,20 +113,17 @@ src_prepare() {
 	if ! use test; then
 		# don't waste time building tests
 		strip_builddir SRC_SUBDIRS tests Makefile.am
-		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in
+		strip_builddir SRC_SUBDIRS tests Makefile.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 demos Makefile.in
 	fi
-
-	[[ ${PV} == 9999 ]] && gnome2_src_prepare
 }
 
 src_configure() {
-	# png always on to display icons (foser)
 	local myconf="$(use_enable doc gtk-doc)
 		$(use_enable xinerama)
 		$(use_enable packagekit)
@@ -173,7 +165,7 @@ src_install() {
 	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
 
 	# Remove unneeded *.la files
-	find "${ED}" -name "*.la" -delete
+	find "${D}" -name '*.la' -exec rm -f {} +
 
 	# add -framework Carbon to the .pc files
 	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index b55d38a..c2e17d0 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.2-r2.ebuild,v 1.1 2011/12/15 23:46:04 tetromino Exp $
 
 EAPI="4"
 
@@ -49,7 +49,7 @@ COMMON_DEPEND="!aqua? (
 		>=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.29.14
+	>=dev-libs/glib-2.31.6
 	>=x11-libs/pango-1.29.0[introspection?]
 	>=dev-libs/atk-2.1.5[introspection?]
 	>=x11-libs/gtk+-2.24:2
@@ -74,8 +74,10 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		media-fonts/font-misc-misc
 		media-fonts/font-cursor-misc )"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.30.1-r1:2.90
 	packagekit? ( app-admin/packagekit-base )"
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
 
@@ -109,7 +111,7 @@ src_prepare() {
 		-i tests/Makefile.* || die "sed 3 failed"
 
 	# Test results depend on the list of mounted filesystems!
-	rm tests/a11y/pickers.{ui,txt} || die "rm failed"
+	rm -v tests/a11y/pickers.{ui,txt} || die "rm failed"
 
 	# Failing treeview scrolling tests; bug #384855,
 	# https://bugzilla.gnome.org/show_bug.cgi?id=660931
@@ -126,12 +128,9 @@ src_prepare() {
 		strip_builddir SRC_SUBDIRS demos Makefile.am
 		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
 	fi
-
-	[[ ${PV} == 9999 ]] && gnome2_src_prepare
 }
 
 src_configure() {
-	# png always on to display icons (foser)
 	local myconf="$(use_enable doc gtk-doc)
 		$(use_enable xinerama)
 		$(use_enable packagekit)
@@ -173,7 +172,7 @@ src_install() {
 	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
 
 	# Remove unneeded *.la files
-	find "${ED}" -name "*.la" -delete
+	find "${D}" -name '*.la' -exec rm -f {} +
 
 	# add -framework Carbon to the .pc files
 	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2012-01-11  4:36 Nirbheek Chauhan
  0 siblings, 0 replies; 57+ messages in thread
From: Nirbheek Chauhan @ 2012-01-11  4:36 UTC (permalink / raw
  To: gentoo-commits

commit:     dec0b8b77932f31e945bece98f48726bbb9c8bf1
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 04:36:43 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 04:36:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=dec0b8b7

x11-libs/gtk+: fix 9999 ebuild

---
 x11-libs/gtk+/gtk+-3.3.6.ebuild |    4 ----
 x11-libs/gtk+/gtk+-9999.ebuild  |    6 ++----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.3.6.ebuild b/x11-libs/gtk+/gtk+-3.3.6.ebuild
index b9d5b14..5185182 100644
--- a/x11-libs/gtk+/gtk+-3.3.6.ebuild
+++ b/x11-libs/gtk+/gtk+-3.3.6.ebuild
@@ -94,10 +94,6 @@ src_prepare() {
 	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
 		-i gtk/tests/recentmanager.c || die "sed 2 failed"
 
-	# Missing file, required for tests; https://bugzilla.gnome.org/show_bug.cgi?id=662024
-	cp "${FILESDIR}/${PN}-3.2.1-selector.errors" \
-		tests/css/parser/selector.errors || die "cp failed"
-
 	# FIXME: multiple reftests fail when run from portage (but succeed when
 	# run from a manual compile in a temp directory)
 	sed -e 's:\(SUBDIRS.*\)reftests:\1:' \

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index c2e17d0..72d6e70 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -101,10 +101,6 @@ src_prepare() {
 	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
 		-i gtk/tests/recentmanager.c || die "sed 2 failed"
 
-	# Missing file, required for tests; https://bugzilla.gnome.org/show_bug.cgi?id=662024
-	cp "${FILESDIR}/${PN}-3.2.1-selector.errors" \
-		tests/css/parser/selector.errors || die "cp failed"
-
 	# FIXME: multiple reftests fail when run from portage (but succeed when
 	# run from a manual compile in a temp directory)
 	sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
@@ -128,6 +124,8 @@ src_prepare() {
 		strip_builddir SRC_SUBDIRS demos Makefile.am
 		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
 	fi
+
+	gnome2_src_prepare
 }
 
 src_configure() {



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2012-01-17 11:30 Priit Laes
  0 siblings, 0 replies; 57+ messages in thread
From: Priit Laes @ 2012-01-17 11:30 UTC (permalink / raw
  To: gentoo-commits

commit:     46bbe9e9298ee83392748a9c16bc59a20ec154e0
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Jan 17 11:27:08 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Jan 17 11:27:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=46bbe9e9

x11-libs/gtk+: 3.3.6 -> 3.3.8

---
 .../gtk+/{gtk+-3.3.6.ebuild => gtk+-3.3.8.ebuild}  |    2 +-
 x11-libs/gtk+/gtk+-9999.ebuild                     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.3.6.ebuild b/x11-libs/gtk+/gtk+-3.3.8.ebuild
similarity index 99%
rename from x11-libs/gtk+/gtk+-3.3.6.ebuild
rename to x11-libs/gtk+/gtk+-3.3.8.ebuild
index 5185182..31423aa 100644
--- a/x11-libs/gtk+/gtk+-3.3.6.ebuild
+++ b/x11-libs/gtk+/gtk+-3.3.8.ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="!aqua? (
 		>=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.31.6
+	>=dev-libs/glib-2.31.10
 	>=x11-libs/pango-1.29.0[introspection?]
 	>=dev-libs/atk-2.1.5[introspection?]
 	>=x11-libs/gtk+-2.24:2

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 72d6e70..5e7c7bc 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -49,7 +49,7 @@ COMMON_DEPEND="!aqua? (
 		>=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.31.6
+	>=dev-libs/glib-2.31.10
 	>=x11-libs/pango-1.29.0[introspection?]
 	>=dev-libs/atk-2.1.5[introspection?]
 	>=x11-libs/gtk+-2.24:2



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2012-01-23 19:23 Priit Laes
  0 siblings, 0 replies; 57+ messages in thread
From: Priit Laes @ 2012-01-23 19:23 UTC (permalink / raw
  To: gentoo-commits

commit:     4cab925d5b90de356fd5d0a0ffdad80395899e08
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Mon Jan 23 19:19:42 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Mon Jan 23 19:19:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4cab925d

x11-libs/gtk+: 3.3.8 → 3.3.10

---
 .../gtk+/{gtk+-3.3.8.ebuild => gtk+-3.3.10.ebuild} |   17 +++++++++++++----
 x11-libs/gtk+/gtk+-9999.ebuild                     |    2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.3.8.ebuild b/x11-libs/gtk+/gtk+-3.3.10.ebuild
similarity index 91%
rename from x11-libs/gtk+/gtk+-3.3.8.ebuild
rename to x11-libs/gtk+/gtk+-3.3.10.ebuild
index 31423aa..00240b1 100644
--- a/x11-libs/gtk+/gtk+-3.3.8.ebuild
+++ b/x11-libs/gtk+/gtk+-3.3.10.ebuild
@@ -5,6 +5,9 @@
 EAPI="4"
 
 inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
@@ -17,7 +20,11 @@ SLOT="3"
 # I tried this and got it all compiling, but the end result is unusable as it
 # horribly mixes up the backends -- grobian
 IUSE="aqua colord cups debug doc examples +introspection packagekit test vim-syntax xinerama"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
 
 # 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)
@@ -42,7 +49,7 @@ COMMON_DEPEND="!aqua? (
 		>=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.31.10
+	>=dev-libs/glib-2.31.11
 	>=x11-libs/pango-1.29.0[introspection?]
 	>=dev-libs/atk-2.1.5[introspection?]
 	>=x11-libs/gtk+-2.24:2
@@ -109,14 +116,16 @@ src_prepare() {
 	if ! use test; then
 		# don't waste time building tests
 		strip_builddir SRC_SUBDIRS tests Makefile.am
-		strip_builddir SRC_SUBDIRS tests Makefile.in
+		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in
 	fi
 
 	if ! use examples; then
 		# don't waste time building demos
 		strip_builddir SRC_SUBDIRS demos Makefile.am
-		strip_builddir SRC_SUBDIRS demos Makefile.in
+		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
 	fi
+
+	gnome2_src_prepare
 }
 
 src_configure() {

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 5e7c7bc..00240b1 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -49,7 +49,7 @@ COMMON_DEPEND="!aqua? (
 		>=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.31.10
+	>=dev-libs/glib-2.31.11
 	>=x11-libs/pango-1.29.0[introspection?]
 	>=dev-libs/atk-2.1.5[introspection?]
 	>=x11-libs/gtk+-2.24:2



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2012-01-23 21:29 Priit Laes
  0 siblings, 0 replies; 57+ messages in thread
From: Priit Laes @ 2012-01-23 21:29 UTC (permalink / raw
  To: gentoo-commits

commit:     fd1a35df1189ab790ce769d8534f03230b568c3b
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Mon Jan 23 21:18:55 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Mon Jan 23 21:18:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fd1a35df

x11-libs/gtk+: Fix eclass usage

---
 x11-libs/gtk+/gtk+-3.3.10.ebuild |    2 +-
 x11-libs/gtk+/gtk+-9999.ebuild   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.3.10.ebuild b/x11-libs/gtk+/gtk+-3.3.10.ebuild
index 00240b1..1a0185d 100644
--- a/x11-libs/gtk+/gtk+-3.3.10.ebuild
+++ b/x11-libs/gtk+/gtk+-3.3.10.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx
+inherit eutils flag-o-matic gnome.org gnome2 libtool virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 00240b1..1a0185d 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx
+inherit eutils flag-o-matic gnome.org gnome2 libtool virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2012-02-03  8:32 Priit Laes
  0 siblings, 0 replies; 57+ messages in thread
From: Priit Laes @ 2012-02-03  8:32 UTC (permalink / raw
  To: gentoo-commits

commit:     d4c5207cd3c42d4b2f54157c3aa24254a7882170
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Feb  3 08:28:44 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Feb  3 08:28:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d4c5207c

x11-libs/gtk+: 3.3.10 → 3.3.12

---
 .../{gtk+-3.3.10.ebuild => gtk+-3.3.12.ebuild}     |    2 +-
 x11-libs/gtk+/gtk+-9999.ebuild                     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.3.10.ebuild b/x11-libs/gtk+/gtk+-3.3.12.ebuild
similarity index 99%
rename from x11-libs/gtk+/gtk+-3.3.10.ebuild
rename to x11-libs/gtk+/gtk+-3.3.12.ebuild
index 1a0185d..bb451a3 100644
--- a/x11-libs/gtk+/gtk+-3.3.10.ebuild
+++ b/x11-libs/gtk+/gtk+-3.3.12.ebuild
@@ -49,7 +49,7 @@ COMMON_DEPEND="!aqua? (
 		>=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.31.11
+	>=dev-libs/glib-2.31.13
 	>=x11-libs/pango-1.29.0[introspection?]
 	>=dev-libs/atk-2.1.5[introspection?]
 	>=x11-libs/gtk+-2.24:2

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 1a0185d..bb451a3 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -49,7 +49,7 @@ COMMON_DEPEND="!aqua? (
 		>=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.31.11
+	>=dev-libs/glib-2.31.13
 	>=x11-libs/pango-1.29.0[introspection?]
 	>=dev-libs/atk-2.1.5[introspection?]
 	>=x11-libs/gtk+-2.24:2



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2012-02-08  7:52 Priit Laes
  0 siblings, 0 replies; 57+ messages in thread
From: Priit Laes @ 2012-02-08  7:52 UTC (permalink / raw
  To: gentoo-commits

commit:     4415778bf2cbcb09a0dc8ac4e04ad2c56eb6eace
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Feb  7 11:46:37 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Feb  7 11:47:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4415778b

x11-libs/gtk+: 3.3.12 → 3.3.14

---
 .../{gtk+-3.3.12.ebuild => gtk+-3.3.14.ebuild}     |   10 +++++++---
 x11-libs/gtk+/gtk+-9999.ebuild                     |    6 +++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.3.12.ebuild b/x11-libs/gtk+/gtk+-3.3.14.ebuild
similarity index 96%
rename from x11-libs/gtk+/gtk+-3.3.12.ebuild
rename to x11-libs/gtk+/gtk+-3.3.14.ebuild
index bb451a3..b2bdac9 100644
--- a/x11-libs/gtk+/gtk+-3.3.12.ebuild
+++ b/x11-libs/gtk+/gtk+-3.3.14.ebuild
@@ -26,6 +26,10 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
+# Testing is broken badly:
+# https://bugzilla.gnome.org/show_bug.cgi?id=669562
+RESTRICT="test"
+
 # 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)
 # Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert
@@ -42,14 +46,14 @@ COMMON_DEPEND="!aqua? (
 		x11-libs/libXcomposite
 		x11-libs/libXdamage
 		>=x11-libs/cairo-1.10.0[X,glib,svg]
-		>=x11-libs/gdk-pixbuf-2.23.5:2[X,introspection?]
+		>=x11-libs/gdk-pixbuf-2.25.2:2[X,introspection?]
 	)
 	aqua? (
 		>=x11-libs/cairo-1.10.0[aqua,glib,svg]
-		>=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
+		>=x11-libs/gdk-pixbuf-2.25.2:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.31.13
+	>=dev-libs/glib-2.31.14
 	>=x11-libs/pango-1.29.0[introspection?]
 	>=dev-libs/atk-2.1.5[introspection?]
 	>=x11-libs/gtk+-2.24:2

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index bb451a3..d73c294 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -42,14 +42,14 @@ COMMON_DEPEND="!aqua? (
 		x11-libs/libXcomposite
 		x11-libs/libXdamage
 		>=x11-libs/cairo-1.10.0[X,glib,svg]
-		>=x11-libs/gdk-pixbuf-2.23.5:2[X,introspection?]
+		>=x11-libs/gdk-pixbuf-2.25.2:2[X,introspection?]
 	)
 	aqua? (
 		>=x11-libs/cairo-1.10.0[aqua,glib,svg]
-		>=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
+		>=x11-libs/gdk-pixbuf-2.25.2:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.31.13
+	>=dev-libs/glib-2.31.14
 	>=x11-libs/pango-1.29.0[introspection?]
 	>=dev-libs/atk-2.1.5[introspection?]
 	>=x11-libs/gtk+-2.24:2



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2012-03-07  0:32 Alexandre Restovtsev
  0 siblings, 0 replies; 57+ messages in thread
From: Alexandre Restovtsev @ 2012-03-07  0:32 UTC (permalink / raw
  To: gentoo-commits

commit:     ce57a84690c31c024c193ca866f7783d3b91c8e5
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  7 00:25:55 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Mar  7 00:25:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ce57a846

x11-libs/gtk+: 3.3.16 → 3.3.18

Instead of restricting tests, we should simply skip them if a new enough
version of gnome-themes-standard is not installed.

---
 .../{gtk+-3.3.16.ebuild => gtk+-3.3.18.ebuild}     |   15 ++++++++++-----
 x11-libs/gtk+/gtk+-9999.ebuild                     |   15 ++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.3.16.ebuild b/x11-libs/gtk+/gtk+-3.3.18.ebuild
similarity index 92%
rename from x11-libs/gtk+/gtk+-3.3.16.ebuild
rename to x11-libs/gtk+/gtk+-3.3.18.ebuild
index 10fe626..d82c7c6 100644
--- a/x11-libs/gtk+/gtk+-3.3.16.ebuild
+++ b/x11-libs/gtk+/gtk+-3.3.18.ebuild
@@ -26,10 +26,6 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
-# Testing is broken badly:
-# https://bugzilla.gnome.org/show_bug.cgi?id=669562
-RESTRICT="test"
-
 # 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)
 # Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert
@@ -53,7 +49,7 @@ COMMON_DEPEND="!aqua? (
 		>=x11-libs/gdk-pixbuf-2.25.2:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.31.18
+	>=dev-libs/glib-2.31.20
 	>=x11-libs/pango-1.29.0[introspection?]
 	>=dev-libs/atk-2.1.5[introspection?]
 	>=x11-libs/gtk+-2.24:2
@@ -154,6 +150,15 @@ src_configure() {
 }
 
 src_test() {
+	# Tests require a new gnome-themes-standard, but adding it to DEPEND
+	# would result in circular dependencies.
+	# https://bugzilla.gnome.org/show_bug.cgi?id=669562
+	if ! has_version '>=x11-themes/gnome-themes-standard-3.3.91'; then
+		ewarn "Tests will be skipped beecause >=gnome-themes-standard-3.3.90"
+		ewarn "is not installed. Please re-run tests after installing the"
+		ewarn "required version of gnome-themes-standard."
+		return 0
+	fi
 	unset DBUS_SESSION_BUS_ADDRESS
 	# Exporting HOME fixes tests using XDG directories spec since all defaults
 	# are based on $HOME. It is also backward compatible with functions not

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 10fe626..d82c7c6 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -26,10 +26,6 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
-# Testing is broken badly:
-# https://bugzilla.gnome.org/show_bug.cgi?id=669562
-RESTRICT="test"
-
 # 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)
 # Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert
@@ -53,7 +49,7 @@ COMMON_DEPEND="!aqua? (
 		>=x11-libs/gdk-pixbuf-2.25.2:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.31.18
+	>=dev-libs/glib-2.31.20
 	>=x11-libs/pango-1.29.0[introspection?]
 	>=dev-libs/atk-2.1.5[introspection?]
 	>=x11-libs/gtk+-2.24:2
@@ -154,6 +150,15 @@ src_configure() {
 }
 
 src_test() {
+	# Tests require a new gnome-themes-standard, but adding it to DEPEND
+	# would result in circular dependencies.
+	# https://bugzilla.gnome.org/show_bug.cgi?id=669562
+	if ! has_version '>=x11-themes/gnome-themes-standard-3.3.91'; then
+		ewarn "Tests will be skipped beecause >=gnome-themes-standard-3.3.90"
+		ewarn "is not installed. Please re-run tests after installing the"
+		ewarn "required version of gnome-themes-standard."
+		return 0
+	fi
 	unset DBUS_SESSION_BUS_ADDRESS
 	# Exporting HOME fixes tests using XDG directories spec since all defaults
 	# are based on $HOME. It is also backward compatible with functions not



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2012-03-07 16:45 Alexandre Restovtsev
  0 siblings, 0 replies; 57+ messages in thread
From: Alexandre Restovtsev @ 2012-03-07 16:45 UTC (permalink / raw
  To: gentoo-commits

commit:     e30f77c5a546119d616f01a0b367dadabc2e3131
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  7 07:26:04 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Mar  7 07:26:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e30f77c5

x11-libs/gtk+: temporarily restore 3.3.16

gtk+-3.3.18 has highly annoying scrolling bugs, e.g. see
https://bugzilla.gnome.org/show_bug.cgi?id=671523

---
 x11-libs/gtk+/gtk+-3.3.16.ebuild |  206 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 206 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.3.16.ebuild b/x11-libs/gtk+/gtk+-3.3.16.ebuild
new file mode 100644
index 0000000..3409613
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.3.16.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.2-r2.ebuild,v 1.1 2011/12/15 23:46:04 tetromino Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="3"
+# NOTE: This gtk+ has multi-gdk-backend support, see:
+#  * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
+#  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
+# I tried this and got it all compiling, but the end result is unusable as it
+# horribly mixes up the backends -- grobian
+IUSE="aqua colord cups debug doc examples +introspection packagekit test vim-syntax xinerama"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+# 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)
+# Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert
+# >=x11-libs/gtk+-2.24:2 is needed for bug 359555
+COMMON_DEPEND="!aqua? (
+		x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXt
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.3
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		>=x11-libs/cairo-1.10.0[X,glib,svg]
+		>=x11-libs/gdk-pixbuf-2.25.2:2[X,introspection?]
+	)
+	aqua? (
+		>=x11-libs/cairo-1.10.0[aqua,glib,svg]
+		>=x11-libs/gdk-pixbuf-2.25.2:2[introspection?]
+	)
+	xinerama? ( x11-libs/libXinerama )
+	>=dev-libs/glib-2.31.18
+	>=x11-libs/pango-1.29.0[introspection?]
+	>=dev-libs/atk-2.1.5[introspection?]
+	>=x11-libs/gtk+-2.24:2
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	colord? ( >=x11-misc/colord-0.1.9 )
+	cups? ( net-print/cups )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.1 )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/pkgconfig-0.9
+	!aqua? (
+		x11-proto/xextproto
+		x11-proto/xproto
+		x11-proto/inputproto
+		x11-proto/damageproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	>=dev-util/gtk-doc-am-1.11
+	doc? (
+		>=dev-util/gtk-doc-1.11
+		~app-text/docbook-xml-dtd-4.1.2 )
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.30.1-r1:2.90
+	packagekit? ( app-admin/packagekit-base )"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	# Non-working test in gentoo's env
+	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
+		-i gtk/tests/testing.c || die "sed 1 failed"
+	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
+		-i gtk/tests/recentmanager.c || die "sed 2 failed"
+
+	# FIXME: multiple reftests fail when run from portage (but succeed when
+	# run from a manual compile in a temp directory)
+	sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
+		-i tests/Makefile.* || die "sed 3 failed"
+
+	# Test results depend on the list of mounted filesystems!
+	rm -v tests/a11y/pickers.{ui,txt} || die "rm failed"
+
+	if ! use test; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS tests Makefile.am
+		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.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
+	fi
+
+	[[ ${PV} = 9999 ]] && gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf="$(use_enable doc gtk-doc)
+		$(use_enable xinerama)
+		$(use_enable packagekit)
+		$(use_enable cups cups auto)
+		$(use_enable colord)
+		$(use_enable introspection)
+		--disable-papi
+		--enable-gtk2-dependency"
+
+	# XXX: Maybe with multi-backend we should enable x11 all the time?
+	if use aqua; then
+		myconf="${myconf} --enable-quartz-backend --disable-xinput"
+	else
+		myconf="${myconf} --enable-x11-backend --enable-xinput"
+	fi
+
+	# Passing --disable-debug is not recommended for production use
+	use debug && myconf="${myconf} --enable-debug=yes"
+
+	# 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 --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
+}
+
+src_test() {
+	# Tests require a new gnome-themes-standard, but adding it to DEPEND
+	# would result in circular dependencies.
+	# https://bugzilla.gnome.org/show_bug.cgi?id=669562
+	if ! has_version '>=x11-themes/gnome-themes-standard-3.3.91'; then
+		ewarn "Tests will be skipped beecause >=gnome-themes-standard-3.3.90"
+		ewarn "is not installed. Please re-run tests after installing the"
+		ewarn "required version of gnome-themes-standard."
+		return 0
+	fi
+	unset DBUS_SESSION_BUS_ADDRESS
+	# Exporting HOME fixes tests using XDG directories spec since all defaults
+	# are based on $HOME. It is also backward compatible with functions not
+	# yet ported to this spec.
+	XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+	# Remove unneeded *.la files
+	find "${D}" -name '*.la' -exec rm -f {} +
+
+	# add -framework Carbon to the .pc files
+	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+	done
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+
+	local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0"
+	gtk-query-immodules-3.0  > "${GTK3_MODDIR}/immodules.cache" \
+		|| ewarn "Failed to run gtk-query-immodules-3.0"
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2012-03-08 18:19 Alexandre Restovtsev
  0 siblings, 0 replies; 57+ messages in thread
From: Alexandre Restovtsev @ 2012-03-08 18:19 UTC (permalink / raw
  To: gentoo-commits

commit:     c46e909e4e30272778a272a51f00cd4a2064b2c4
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  8 18:18:09 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Mar  8 18:18:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c46e909e

x11-libs/gtk+: --enable-xinput configure option is now gone

---
 x11-libs/gtk+/gtk+-3.3.18.ebuild |    4 ++--
 x11-libs/gtk+/gtk+-9999.ebuild   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.3.18.ebuild b/x11-libs/gtk+/gtk+-3.3.18.ebuild
index d82c7c6..b2bac32 100644
--- a/x11-libs/gtk+/gtk+-3.3.18.ebuild
+++ b/x11-libs/gtk+/gtk+-3.3.18.ebuild
@@ -136,9 +136,9 @@ src_configure() {
 
 	# XXX: Maybe with multi-backend we should enable x11 all the time?
 	if use aqua; then
-		myconf="${myconf} --enable-quartz-backend --disable-xinput"
+		myconf="${myconf} --enable-quartz-backend"
 	else
-		myconf="${myconf} --enable-x11-backend --enable-xinput"
+		myconf="${myconf} --enable-x11-backend"
 	fi
 
 	# Passing --disable-debug is not recommended for production use

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index d82c7c6..b2bac32 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -136,9 +136,9 @@ src_configure() {
 
 	# XXX: Maybe with multi-backend we should enable x11 all the time?
 	if use aqua; then
-		myconf="${myconf} --enable-quartz-backend --disable-xinput"
+		myconf="${myconf} --enable-quartz-backend"
 	else
-		myconf="${myconf} --enable-x11-backend --enable-xinput"
+		myconf="${myconf} --enable-x11-backend"
 	fi
 
 	# Passing --disable-debug is not recommended for production use



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2012-03-14  4:48 Alexandre Restovtsev
  0 siblings, 0 replies; 57+ messages in thread
From: Alexandre Restovtsev @ 2012-03-14  4:48 UTC (permalink / raw
  To: gentoo-commits

commit:     c1b9ac1fbc56700f9f2f8bd4fdaa0e5dd17a0146
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 14 04:47:15 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Mar 14 04:47:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c1b9ac1f

x11-libs/gtk+: block vte versions with broken scrolling

---
 x11-libs/gtk+/gtk+-3.3.18.ebuild |    3 ++-
 x11-libs/gtk+/gtk+-9999.ebuild   |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.3.18.ebuild b/x11-libs/gtk+/gtk+-3.3.18.ebuild
index b2bac32..4d353a9 100644
--- a/x11-libs/gtk+/gtk+-3.3.18.ebuild
+++ b/x11-libs/gtk+/gtk+-3.3.18.ebuild
@@ -75,9 +75,10 @@ DEPEND="${COMMON_DEPEND}
 		media-fonts/font-misc-misc
 		media-fonts/font-cursor-misc )"
 # 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
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.30.1-r1:2.90
+	!<x11-libs/vte-0.31.0:2.90
 	packagekit? ( app-admin/packagekit-base )"
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
 

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index b2bac32..4d353a9 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -75,9 +75,10 @@ DEPEND="${COMMON_DEPEND}
 		media-fonts/font-misc-misc
 		media-fonts/font-cursor-misc )"
 # 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
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.30.1-r1:2.90
+	!<x11-libs/vte-0.31.0:2.90
 	packagekit? ( app-admin/packagekit-base )"
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
 



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2012-05-06 18:15 Alexandre Restovtsev
  0 siblings, 0 replies; 57+ messages in thread
From: Alexandre Restovtsev @ 2012-05-06 18:15 UTC (permalink / raw
  To: gentoo-commits

commit:     35c8fa6ad887bac61ab40ced6ab2f552a61b76f0
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun May  6 18:14:50 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun May  6 18:14:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=35c8fa6a

x11-libs/gtk+: sync with gx86

---
 x11-libs/gtk+/gtk+-9999.ebuild |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index c5863bd..2379dd3 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -52,17 +52,17 @@ COMMON_DEPEND="X? (
 		x11-libs/cairo[opengl]
 		x11-libs/libxkbcommon
 	)
-	>=dev-libs/glib-2.31.20
-	>=x11-libs/pango-1.29.0[introspection?]
-	>=dev-libs/atk-2.1.5[introspection?]
+	>=dev-libs/glib-2.32
+	>=x11-libs/pango-1.30[introspection?]
+	>=dev-libs/atk-2.2[introspection?]
 	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.25.2:2[introspection?,X?]
+	>=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?]
 	>=x11-libs/gtk+-2.24:2
 	media-libs/fontconfig
 	x11-misc/shared-mime-info
 	colord? ( >=x11-misc/colord-0.1.9 )
 	cups? ( >=net-print/cups-1.2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.1 )"
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	X? (
@@ -110,6 +110,11 @@ src_prepare() {
 	# Apparently needed for new libxkbcommon headers; bug #408131
 	epatch "${FILESDIR}/${PN}-3.3.20-wayland-xkbcommon-headers.patch"
 
+	# Work around https://bugzilla.gnome.org/show_bug.cgi?id=663991
+	if [[ ${CHOST} == *-solaris* ]]; then
+		sed -i -e '/_XOPEN_SOURCE/s/500/600/' gtk/gtksearchenginesimple.c || die
+	fi
+
 	# Non-working test in gentoo's env
 	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
 		-i gtk/tests/testing.c || die "sed 1 failed"



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2012-07-13 10:21 Priit Laes
  0 siblings, 0 replies; 57+ messages in thread
From: Priit Laes @ 2012-07-13 10:21 UTC (permalink / raw
  To: gentoo-commits

commit:     a66c05411148af9bf3e51dd67abd78f4d7f807bc
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Jul 13 10:20:56 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Jul 13 10:20:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a66c0541

x11-libs/gtk+: Add gtk+-3.5.6 to overlay

---
 .../gtk+/{gtk+-9999.ebuild => gtk+-3.5.6.ebuild}   |    7 +++++--
 x11-libs/gtk+/gtk+-9999.ebuild                     |    7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-3.5.6.ebuild
similarity index 96%
copy from x11-libs/gtk+/gtk+-9999.ebuild
copy to x11-libs/gtk+/gtk+-3.5.6.ebuild
index 2379dd3..8483377 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-3.5.6.ebuild
@@ -19,7 +19,7 @@ SLOT="3"
 #  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
 # I tried this and got it all compiling, but the end result is unusable as it
 # horribly mixes up the backends -- grobian
-IUSE="aqua colord cups debug doc examples +introspection packagekit test vim-syntax wayland X xinerama"
+IUSE="accessibility aqua colord cups debug doc examples +introspection packagekit test vim-syntax wayland X xinerama"
 REQUIRED_USE="
 	|| ( aqua wayland X )
 	xinerama? ( X )"
@@ -46,13 +46,14 @@ COMMON_DEPEND="X? (
 		x11-libs/libXdamage
 		xinerama? ( x11-libs/libXinerama )
 	)
+	accessibility? ( app-accessibility/at-spi2-atk )
 	wayland? (
 		dev-libs/wayland
 		media-libs/mesa[egl,wayland]
 		x11-libs/cairo[opengl]
 		x11-libs/libxkbcommon
 	)
-	>=dev-libs/glib-2.32
+	>=dev-libs/glib-2.33.1
 	>=x11-libs/pango-1.30[introspection?]
 	>=dev-libs/atk-2.2[introspection?]
 	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
@@ -145,6 +146,7 @@ src_prepare() {
 }
 
 src_configure() {
+	# TODO: --enable-wayland-cairo-gl
 	local myconf="$(use_enable aqua quartz-backend)
 		$(use_enable colord)
 		$(use_enable cups cups auto)
@@ -159,6 +161,7 @@ src_configure() {
 		$(use_enable X xkb)
 		$(use_enable X xrandr)
 		$(use_enable xinerama)
+		$(use_with accessibility atk-bridge)
 		--disable-papi
 		--enable-gtk2-dependency"
 

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 2379dd3..8483377 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -19,7 +19,7 @@ SLOT="3"
 #  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
 # I tried this and got it all compiling, but the end result is unusable as it
 # horribly mixes up the backends -- grobian
-IUSE="aqua colord cups debug doc examples +introspection packagekit test vim-syntax wayland X xinerama"
+IUSE="accessibility aqua colord cups debug doc examples +introspection packagekit test vim-syntax wayland X xinerama"
 REQUIRED_USE="
 	|| ( aqua wayland X )
 	xinerama? ( X )"
@@ -46,13 +46,14 @@ COMMON_DEPEND="X? (
 		x11-libs/libXdamage
 		xinerama? ( x11-libs/libXinerama )
 	)
+	accessibility? ( app-accessibility/at-spi2-atk )
 	wayland? (
 		dev-libs/wayland
 		media-libs/mesa[egl,wayland]
 		x11-libs/cairo[opengl]
 		x11-libs/libxkbcommon
 	)
-	>=dev-libs/glib-2.32
+	>=dev-libs/glib-2.33.1
 	>=x11-libs/pango-1.30[introspection?]
 	>=dev-libs/atk-2.2[introspection?]
 	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
@@ -145,6 +146,7 @@ src_prepare() {
 }
 
 src_configure() {
+	# TODO: --enable-wayland-cairo-gl
 	local myconf="$(use_enable aqua quartz-backend)
 		$(use_enable colord)
 		$(use_enable cups cups auto)
@@ -159,6 +161,7 @@ src_configure() {
 		$(use_enable X xkb)
 		$(use_enable X xrandr)
 		$(use_enable xinerama)
+		$(use_with accessibility atk-bridge)
 		--disable-papi
 		--enable-gtk2-dependency"
 



^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2012-07-22  4:41 Priit Laes
  0 siblings, 0 replies; 57+ messages in thread
From: Priit Laes @ 2012-07-22  4:41 UTC (permalink / raw
  To: gentoo-commits

commit:     d3081ccbbb6879cdc0cd88139180fe2ede2d4c65
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sun Jul 22 04:39:02 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sun Jul 22 04:40:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d3081ccb

x11-libs/gtk+: Bump at-spi2-atk requirement

---
 x11-libs/gtk+/gtk+-3.5.6.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.5.6.ebuild b/x11-libs/gtk+/gtk+-3.5.6.ebuild
index 8483377..8cb50ea 100644
--- a/x11-libs/gtk+/gtk+-3.5.6.ebuild
+++ b/x11-libs/gtk+/gtk+-3.5.6.ebuild
@@ -46,7 +46,7 @@ COMMON_DEPEND="X? (
 		x11-libs/libXdamage
 		xinerama? ( x11-libs/libXinerama )
 	)
-	accessibility? ( app-accessibility/at-spi2-atk )
+	accessibility? ( >=app-accessibility/at-spi2-atk-2.5.3 )
 	wayland? (
 		dev-libs/wayland
 		media-libs/mesa[egl,wayland]


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2012-09-05 15:48 Nirbheek Chauhan
  0 siblings, 0 replies; 57+ messages in thread
From: Nirbheek Chauhan @ 2012-09-05 15:48 UTC (permalink / raw
  To: gentoo-commits

commit:     9ffc0759e739623e4831e8ae36fb770b5d733d57
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  4 02:30:21 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Sep  5 15:48:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9ffc0759

x11-libs/gtk+: 3.5.10 → 3.5.12

---
 .../{gtk+-3.5.10.ebuild => gtk+-3.5.12.ebuild}     |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.5.10.ebuild b/x11-libs/gtk+/gtk+-3.5.12.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.5.10.ebuild
rename to x11-libs/gtk+/gtk+-3.5.12.ebuild


^ permalink raw reply	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2012-09-05 16:43 Nirbheek Chauhan
  0 siblings, 0 replies; 57+ messages in thread
From: Nirbheek Chauhan @ 2012-09-05 16:43 UTC (permalink / raw
  To: gentoo-commits

commit:     e3532c24ed8cb131f4825f63a4cc91665136db85
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  5 16:25:42 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Sep  5 16:25:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e3532c24

x11-libs/gtk+: 3.5.12 → 3.5.14

---
 .../{gtk+-3.5.12.ebuild => gtk+-3.5.14.ebuild}     |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.5.12.ebuild b/x11-libs/gtk+/gtk+-3.5.14.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.5.12.ebuild
rename to x11-libs/gtk+/gtk+-3.5.14.ebuild


^ permalink raw reply	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2012-09-10  6:22 Nirbheek Chauhan
  0 siblings, 0 replies; 57+ messages in thread
From: Nirbheek Chauhan @ 2012-09-10  6:22 UTC (permalink / raw
  To: gentoo-commits

commit:     e54862d7db55c962d6351c91503533b6d231bef0
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 10 05:43:16 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Sep 10 05:43:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e54862d7

x11-libs/gtk+: 3.5.14 → 3.5.16

---
 .../{gtk+-3.5.14.ebuild => gtk+-3.5.16.ebuild}     |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.5.14.ebuild b/x11-libs/gtk+/gtk+-3.5.16.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.5.14.ebuild
rename to x11-libs/gtk+/gtk+-3.5.16.ebuild


^ permalink raw reply	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2012-09-22 15:54 Nirbheek Chauhan
  0 siblings, 0 replies; 57+ messages in thread
From: Nirbheek Chauhan @ 2012-09-22 15:54 UTC (permalink / raw
  To: gentoo-commits

commit:     675b1502ec2a4016a57b968fe6ab2cb5287b6d3a
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 21 05:16:31 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 15:53:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=675b1502

x11-libs/gtk+: 3.5.16 → 3.5.18

---
 .../{gtk+-3.5.16.ebuild => gtk+-3.5.18.ebuild}     |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.5.16.ebuild b/x11-libs/gtk+/gtk+-3.5.18.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.5.16.ebuild
rename to x11-libs/gtk+/gtk+-3.5.18.ebuild


^ permalink raw reply	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2012-10-10  7:51 Alexandre Rostovtsev
  0 siblings, 0 replies; 57+ messages in thread
From: Alexandre Rostovtsev @ 2012-10-10  7:51 UTC (permalink / raw
  To: gentoo-commits

commit:     917d07ab157efde1a0aaee6f752480435c09beb0
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 10 07:51:00 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Wed Oct 10 07:51:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=917d07ab

x11-libs/gtk+: sync with gx86

Kill USE=doc for non-live ebuilds.

---
 x11-libs/gtk+/gtk+-9999.ebuild |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 5e41dc2..7aae8da 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -19,12 +19,13 @@ SLOT="3"
 #  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
 # I tried this and got it all compiling, but the end result is unusable as it
 # horribly mixes up the backends -- grobian
-IUSE="aqua colord cups debug doc egl examples +introspection packagekit test vim-syntax wayland X xinerama"
+IUSE="aqua colord cups debug egl examples +introspection packagekit test vim-syntax wayland X xinerama"
 REQUIRED_USE="
 	|| ( aqua wayland X )
 	xinerama? ( X )"
 
 if [[ ${PV} = 9999 ]]; then
+	IUSE="${IUSE} doc"
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -77,10 +78,11 @@ DEPEND="${COMMON_DEPEND}
 		xinerama? ( x11-proto/xineramaproto )
 	)
 	>=dev-util/gtk-doc-am-1.11
-	doc? ( >=dev-util/gtk-doc-1.11 )
 	test? (
 		media-fonts/font-misc-misc
 		media-fonts/font-cursor-misc )"
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+	doc? ( >=dev-util/gtk-doc-1.11 )"
 # 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
@@ -142,7 +144,6 @@ src_configure() {
 	local myconf="$(use_enable aqua quartz-backend)
 		$(use_enable colord)
 		$(use_enable cups cups auto)
-		$(use_enable doc gtk-doc)
 		$(use_enable introspection)
 		$(use_enable packagekit)
 		$(use_enable wayland wayland-backend)
@@ -157,6 +158,8 @@ src_configure() {
 		--enable-man
 		--enable-gtk2-dependency"
 
+	[[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)"
+
 	use wayland && myconf="${myconf} $(use_enable egl wayland-cairo-gl)"
 
 	# Passing --disable-debug is not recommended for production use


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2013-03-08 14:39 Priit Laes
  0 siblings, 0 replies; 57+ messages in thread
From: Priit Laes @ 2013-03-08 14:39 UTC (permalink / raw
  To: gentoo-commits

commit:     8e17626cab72f2dad44d0ccbe58ea0edc675d6fc
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Mar  8 14:35:09 2013 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Mar  8 14:35:09 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8e17626c

x11-libs/gtk+: Add 3.7.12 to overlay

---
 .../gtk+/{gtk+-9999.ebuild => gtk+-3.7.12.ebuild}  |   30 +++++++++----------
 x11-libs/gtk+/gtk+-9999.ebuild                     |   30 +++++++++----------
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-3.7.12.ebuild
similarity index 91%
copy from x11-libs/gtk+/gtk+-9999.ebuild
copy to x11-libs/gtk+/gtk+-3.7.12.ebuild
index 7aae8da..ca52583 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-3.7.12.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils flag-o-matic gnome.org gnome2-utils multilib virtualx
 if [[ ${PV} = 9999 ]]; then
@@ -19,7 +19,8 @@ SLOT="3"
 #  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
 # I tried this and got it all compiling, but the end result is unusable as it
 # horribly mixes up the backends -- grobian
-IUSE="aqua colord cups debug egl examples +introspection packagekit test vim-syntax wayland X xinerama"
+# TODO: avahi-browsing for >=cups-1.6
+IUSE="aqua colord cups debug examples +introspection packagekit test vim-syntax wayland X xinerama"
 REQUIRED_USE="
 	|| ( aqua wayland X )
 	xinerama? ( X )"
@@ -49,16 +50,15 @@ COMMON_DEPEND="X? (
 		xinerama? ( x11-libs/libXinerama )
 	)
 	wayland? (
-		>=dev-libs/wayland-0.95
-		media-libs/mesa[egl?,wayland]
-		x11-libs/libxkbcommon
-		egl? ( x11-libs/cairo[opengl] )
+		>=dev-libs/wayland-1.0.0
+		media-libs/mesa[wayland]
+		>=x11-libs/libxkbcommon-0.2.0
 	)
-	>=dev-libs/glib-2.33.1
-	>=x11-libs/pango-1.30[introspection?]
-	>=dev-libs/atk-2.5.3[introspection?]
+	>=dev-libs/glib-2.35.3
+	>=x11-libs/pango-1.32.4[introspection?]
+	>=dev-libs/atk-2.7.5[introspection?]
 	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?]
+	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
 	>=x11-libs/gtk+-2.24:2
 	media-libs/fontconfig
 	x11-misc/shared-mime-info
@@ -108,8 +108,8 @@ src_prepare() {
 	replace-flags -O3 -O2
 	strip-flags
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=654108
-	epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
+	# FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=654108
+	# epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
 
 	# Non-working test in gentoo's env
 	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
@@ -160,8 +160,6 @@ src_configure() {
 
 	[[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)"
 
-	use wayland && myconf="${myconf} $(use_enable egl wayland-cairo-gl)"
-
 	# Passing --disable-debug is not recommended for production use
 	use debug && myconf="${myconf} --enable-debug=yes"
 
@@ -174,8 +172,8 @@ src_test() {
 	# Tests require a new gnome-themes-standard, but adding it to DEPEND
 	# would result in circular dependencies.
 	# https://bugzilla.gnome.org/show_bug.cgi?id=669562
-	if ! has_version '>=x11-themes/gnome-themes-standard-3.6[gtk3]'; then
-		ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk3]"
+	if ! has_version '>=x11-themes/gnome-themes-standard-3.6[gtk]'; then
+		ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]"
 		ewarn "is not installed. Please re-run tests after installing the"
 		ewarn "required version of gnome-themes-standard."
 		return 0

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 7aae8da..ca52583 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils flag-o-matic gnome.org gnome2-utils multilib virtualx
 if [[ ${PV} = 9999 ]]; then
@@ -19,7 +19,8 @@ SLOT="3"
 #  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
 # I tried this and got it all compiling, but the end result is unusable as it
 # horribly mixes up the backends -- grobian
-IUSE="aqua colord cups debug egl examples +introspection packagekit test vim-syntax wayland X xinerama"
+# TODO: avahi-browsing for >=cups-1.6
+IUSE="aqua colord cups debug examples +introspection packagekit test vim-syntax wayland X xinerama"
 REQUIRED_USE="
 	|| ( aqua wayland X )
 	xinerama? ( X )"
@@ -49,16 +50,15 @@ COMMON_DEPEND="X? (
 		xinerama? ( x11-libs/libXinerama )
 	)
 	wayland? (
-		>=dev-libs/wayland-0.95
-		media-libs/mesa[egl?,wayland]
-		x11-libs/libxkbcommon
-		egl? ( x11-libs/cairo[opengl] )
+		>=dev-libs/wayland-1.0.0
+		media-libs/mesa[wayland]
+		>=x11-libs/libxkbcommon-0.2.0
 	)
-	>=dev-libs/glib-2.33.1
-	>=x11-libs/pango-1.30[introspection?]
-	>=dev-libs/atk-2.5.3[introspection?]
+	>=dev-libs/glib-2.35.3
+	>=x11-libs/pango-1.32.4[introspection?]
+	>=dev-libs/atk-2.7.5[introspection?]
 	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?]
+	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
 	>=x11-libs/gtk+-2.24:2
 	media-libs/fontconfig
 	x11-misc/shared-mime-info
@@ -108,8 +108,8 @@ src_prepare() {
 	replace-flags -O3 -O2
 	strip-flags
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=654108
-	epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
+	# FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=654108
+	# epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
 
 	# Non-working test in gentoo's env
 	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
@@ -160,8 +160,6 @@ src_configure() {
 
 	[[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)"
 
-	use wayland && myconf="${myconf} $(use_enable egl wayland-cairo-gl)"
-
 	# Passing --disable-debug is not recommended for production use
 	use debug && myconf="${myconf} --enable-debug=yes"
 
@@ -174,8 +172,8 @@ src_test() {
 	# Tests require a new gnome-themes-standard, but adding it to DEPEND
 	# would result in circular dependencies.
 	# https://bugzilla.gnome.org/show_bug.cgi?id=669562
-	if ! has_version '>=x11-themes/gnome-themes-standard-3.6[gtk3]'; then
-		ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk3]"
+	if ! has_version '>=x11-themes/gnome-themes-standard-3.6[gtk]'; then
+		ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]"
 		ewarn "is not installed. Please re-run tests after installing the"
 		ewarn "required version of gnome-themes-standard."
 		return 0


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2013-03-20  5:55 Priit Laes
  0 siblings, 0 replies; 57+ messages in thread
From: Priit Laes @ 2013-03-20  5:55 UTC (permalink / raw
  To: gentoo-commits

commit:     118aa226882dee269591d88fb27cf33e68b6832d
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Wed Mar 20 05:54:30 2013 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Wed Mar 20 05:54:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=118aa226

x11-libs/gtk+: 3.7.12  → 3.7.14

---
 .../{gtk+-3.7.12.ebuild => gtk+-3.7.14.ebuild}     |    1 -
 x11-libs/gtk+/gtk+-9999.ebuild                     |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.7.12.ebuild b/x11-libs/gtk+/gtk+-3.7.14.ebuild
similarity index 99%
rename from x11-libs/gtk+/gtk+-3.7.12.ebuild
rename to x11-libs/gtk+/gtk+-3.7.14.ebuild
index ca52583..0ca6cb2 100644
--- a/x11-libs/gtk+/gtk+-3.7.12.ebuild
+++ b/x11-libs/gtk+/gtk+-3.7.14.ebuild
@@ -19,7 +19,6 @@ SLOT="3"
 #  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
 # I tried this and got it all compiling, but the end result is unusable as it
 # horribly mixes up the backends -- grobian
-# TODO: avahi-browsing for >=cups-1.6
 IUSE="aqua colord cups debug examples +introspection packagekit test vim-syntax wayland X xinerama"
 REQUIRED_USE="
 	|| ( aqua wayland X )

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index ca52583..0ca6cb2 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -19,7 +19,6 @@ SLOT="3"
 #  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
 # I tried this and got it all compiling, but the end result is unusable as it
 # horribly mixes up the backends -- grobian
-# TODO: avahi-browsing for >=cups-1.6
 IUSE="aqua colord cups debug examples +introspection packagekit test vim-syntax wayland X xinerama"
 REQUIRED_USE="
 	|| ( aqua wayland X )


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2013-12-01 14:28 Gilles Dartiguelongue
  0 siblings, 0 replies; 57+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-01 14:28 UTC (permalink / raw
  To: gentoo-commits

commit:     217feb95f8e3cfae4ff1677f5239b2ed6926492b
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  1 14:07:27 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec  1 14:21:49 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=217feb95

x11-libs/gtk+: 3.8.7 → 3.10.5

* Clean up unittests modifications, everything appears to run fine now.
* Use local gsettings files, otherwise gtkfilechooser tests fails.
* Sort dependency like in other ebuilds.
* Make sure immodules cache is owned by ebuild and use eclass function
  to update it.

---
 .../{gtk+-3.7.14.ebuild => gtk+-3.10.5.ebuild}     | 170 ++++++++++-----------
 x11-libs/gtk+/gtk+-9999.ebuild                     | 161 ++++++++++---------
 x11-libs/gtk+/metadata.xml                         |  20 +++
 3 files changed, 186 insertions(+), 165 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.7.14.ebuild b/x11-libs/gtk+/gtk+-3.10.5.ebuild
similarity index 57%
rename from x11-libs/gtk+/gtk+-3.7.14.ebuild
rename to x11-libs/gtk+/gtk+-3.10.5.ebuild
index 0ca6cb2..03a21ed 100644
--- a/x11-libs/gtk+/gtk+-3.7.14.ebuild
+++ b/x11-libs/gtk+/gtk+-3.10.5.ebuild
@@ -1,13 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 
 inherit eutils flag-o-matic gnome.org gnome2-utils multilib virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
@@ -24,22 +21,34 @@ REQUIRED_USE="
 	|| ( aqua wayland X )
 	xinerama? ( X )"
 
-if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-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 ~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)
 # Use gtk+:2 for gtk-update-icon-cache
-COMMON_DEPEND="X? (
+COMMON_DEPEND="
+	>=dev-libs/atk-2.7.5[introspection?]
+	>=dev-libs/glib-2.37.5:2
+	media-libs/fontconfig
+	>=x11-libs/cairo-1.12[aqua?,glib,svg,X?]
+	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
+	>=x11-libs/gtk+-2.24:2
+	>=x11-libs/pango-1.32.4[introspection?]
+	x11-misc/shared-mime-info
+
+	colord? ( >=x11-misc/colord-0.1.9 )
+	cups? ( >=net-print/cups-1.2 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )
+	wayland? (
+		>=dev-libs/wayland-1.2
+		media-libs/mesa[wayland]
+		>=x11-libs/libxkbcommon-0.2
+	)
+	X? (
 		>=app-accessibility/at-spi2-atk-2.5.3
 		x11-libs/libXrender
 		x11-libs/libX11
 		>=x11-libs/libXi-1.3
-		x11-libs/libXt
 		x11-libs/libXext
 		>=x11-libs/libXrandr-1.3
 		x11-libs/libXcursor
@@ -48,26 +57,13 @@ COMMON_DEPEND="X? (
 		x11-libs/libXdamage
 		xinerama? ( x11-libs/libXinerama )
 	)
-	wayland? (
-		>=dev-libs/wayland-1.0.0
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2.0
-	)
-	>=dev-libs/glib-2.35.3
-	>=x11-libs/pango-1.32.4[introspection?]
-	>=dev-libs/atk-2.7.5[introspection?]
-	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
-	>=x11-libs/gtk+-2.24:2
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	colord? ( >=x11-misc/colord-0.1.9 )
-	cups? ( >=net-print/cups-1.2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32 )"
+"
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xsl-stylesheets
 	app-text/docbook-xml-dtd:4.1.2
 	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.11
 	virtual/pkgconfig
 	X? (
 		x11-proto/xextproto
@@ -76,12 +72,10 @@ DEPEND="${COMMON_DEPEND}
 		x11-proto/damageproto
 		xinerama? ( x11-proto/xineramaproto )
 	)
-	>=dev-util/gtk-doc-am-1.11
 	test? (
 		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	doc? ( >=dev-util/gtk-doc-1.11 )"
+		media-fonts/font-cursor-misc )
+"
 # 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
@@ -90,7 +84,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gail-1000
 	!<x11-libs/vte-0.31.0:2.90
 	packagekit? ( app-admin/packagekit-base )
-	X? ( !<x11-base/xorg-server-1.11.4 )"
+	X? ( !<x11-base/xorg-server-1.11.4 )
+"
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
 
 strip_builddir() {
@@ -103,68 +98,50 @@ strip_builddir() {
 }
 
 src_prepare() {
+	gnome2_environment_reset
+
 	# -O3 and company cause random crashes in applications. Bug #133469
 	replace-flags -O3 -O2
 	strip-flags
 
-	# FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=654108
-	# epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
-
-	# Non-working test in gentoo's env
-	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-		-i gtk/tests/testing.c || die "sed 1 failed"
-	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
-		-i gtk/tests/recentmanager.c || die "sed 2 failed"
-
-	# FIXME: multiple reftests fail when run from portage (but succeed when
-	# run from a manual compile in a temp directory)
-	sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
-		-i tests/Makefile.* || die "sed 3 failed"
-
-	# Test results depend on the list of mounted filesystems!
-	rm -v tests/a11y/pickers.{ui,txt} || die "rm failed"
-
-	if ! use test; then
+	if ! use test ; then
 		# don't waste time building tests
 		strip_builddir SRC_SUBDIRS tests Makefile.am
-		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in
+		strip_builddir SRC_SUBDIRS tests Makefile.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 demos Makefile.in
 	fi
-
-	[[ ${PV} = 9999 ]] && gnome2_src_prepare
 }
 
 src_configure() {
-	local myconf="$(use_enable aqua quartz-backend)
-		$(use_enable colord)
-		$(use_enable cups cups auto)
-		$(use_enable introspection)
-		$(use_enable packagekit)
-		$(use_enable wayland wayland-backend)
-		$(use_enable X x11-backend)
-		$(use_enable X xcomposite)
-		$(use_enable X xdamage)
-		$(use_enable X xfixes)
-		$(use_enable X xkb)
-		$(use_enable X xrandr)
-		$(use_enable xinerama)
-		--disable-papi
-		--enable-man
-		--enable-gtk2-dependency"
-
-	[[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)"
-
 	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
 	# 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 --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
+	econf \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(usex debug --enable-debug=yes "") \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend) \
+		$(use_enable X xcomposite) \
+		$(use_enable X xdamage) \
+		$(use_enable X xfixes) \
+		$(use_enable X xkb) \
+		$(use_enable X xrandr) \
+		$(use_enable xinerama) \
+		--disable-gtk-doc \
+		--disable-papi \
+		--enable-man \
+		--enable-gtk2-dependency \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
 }
 
 src_test() {
@@ -177,11 +154,12 @@ src_test() {
 		ewarn "required version of gnome-themes-standard."
 		return 0
 	fi
+
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
 	unset DBUS_SESSION_BUS_ADDRESS
-	# Exporting HOME fixes tests using XDG directories spec since all defaults
-	# are based on $HOME. It is also backward compatible with functions not
-	# yet ported to this spec.
-	XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
 }
 
 src_install() {
@@ -192,25 +170,33 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
 
-	# Remove unneeded *.la files
-	prune_libtool_files --all
+	prune_libtool_files --modules
 
 	# add -framework Carbon to the .pc files
-	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-	done
+	if use aqua ; then
+		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
+				-i "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+		done
+	fi
 }
 
 pkg_preinst() {
 	gnome2_schemas_savelist
+
+	# Make sure loaders.cache belongs to gdk-pixbuf alone
+	local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"/${cache} || die
+	fi
 }
 
 pkg_postinst() {
 	gnome2_schemas_update
-
-	local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0"
-	gtk-query-immodules-3.0  > "${GTK3_MODDIR}/immodules.cache" \
-		|| ewarn "Failed to run gtk-query-immodules-3.0"
+	gnome2_query_immodules_gtk3
 
 	if ! has_version "app-text/evince"; then
 		elog "Please install app-text/evince for print preview functionality."
@@ -221,4 +207,8 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_schemas_update
+
+	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+		rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+	fi
 }

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 0ca6cb2..3797f40 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -28,18 +28,35 @@ if [[ ${PV} = 9999 ]]; then
 	IUSE="${IUSE} doc"
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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
 
 # 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)
 # Use gtk+:2 for gtk-update-icon-cache
-COMMON_DEPEND="X? (
+COMMON_DEPEND="
+	>=dev-libs/atk-2.7.5[introspection?]
+	>=dev-libs/glib-2.37.5:2
+	media-libs/fontconfig
+	>=x11-libs/cairo-1.12[aqua?,glib,svg,X?]
+	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
+	>=x11-libs/gtk+-2.24:2
+	>=x11-libs/pango-1.32.4[introspection?]
+	x11-misc/shared-mime-info
+
+	colord? ( >=x11-misc/colord-0.1.9 )
+	cups? ( >=net-print/cups-1.2 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )
+	wayland? (
+		>=dev-libs/wayland-1.2
+		media-libs/mesa[wayland]
+		>=x11-libs/libxkbcommon-0.2
+	)
+	X? (
 		>=app-accessibility/at-spi2-atk-2.5.3
 		x11-libs/libXrender
 		x11-libs/libX11
 		>=x11-libs/libXi-1.3
-		x11-libs/libXt
 		x11-libs/libXext
 		>=x11-libs/libXrandr-1.3
 		x11-libs/libXcursor
@@ -48,26 +65,13 @@ COMMON_DEPEND="X? (
 		x11-libs/libXdamage
 		xinerama? ( x11-libs/libXinerama )
 	)
-	wayland? (
-		>=dev-libs/wayland-1.0.0
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2.0
-	)
-	>=dev-libs/glib-2.35.3
-	>=x11-libs/pango-1.32.4[introspection?]
-	>=dev-libs/atk-2.7.5[introspection?]
-	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
-	>=x11-libs/gtk+-2.24:2
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	colord? ( >=x11-misc/colord-0.1.9 )
-	cups? ( >=net-print/cups-1.2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32 )"
+"
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xsl-stylesheets
 	app-text/docbook-xml-dtd:4.1.2
 	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.11
 	virtual/pkgconfig
 	X? (
 		x11-proto/xextproto
@@ -76,12 +80,16 @@ DEPEND="${COMMON_DEPEND}
 		x11-proto/damageproto
 		xinerama? ( x11-proto/xineramaproto )
 	)
-	>=dev-util/gtk-doc-am-1.11
 	test? (
 		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	doc? ( >=dev-util/gtk-doc-1.11 )"
+		media-fonts/font-cursor-misc )
+"
+
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		doc? ( >=dev-util/gtk-doc-1.11 )"
+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
@@ -90,7 +98,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gail-1000
 	!<x11-libs/vte-0.31.0:2.90
 	packagekit? ( app-admin/packagekit-base )
-	X? ( !<x11-base/xorg-server-1.11.4 )"
+	X? ( !<x11-base/xorg-server-1.11.4 )
+"
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
 
 strip_builddir() {
@@ -103,28 +112,13 @@ strip_builddir() {
 }
 
 src_prepare() {
+	gnome2_environment_reset
+
 	# -O3 and company cause random crashes in applications. Bug #133469
 	replace-flags -O3 -O2
 	strip-flags
 
-	# FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=654108
-	# epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
-
-	# Non-working test in gentoo's env
-	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-		-i gtk/tests/testing.c || die "sed 1 failed"
-	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
-		-i gtk/tests/recentmanager.c || die "sed 2 failed"
-
-	# FIXME: multiple reftests fail when run from portage (but succeed when
-	# run from a manual compile in a temp directory)
-	sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
-		-i tests/Makefile.* || die "sed 3 failed"
-
-	# Test results depend on the list of mounted filesystems!
-	rm -v tests/a11y/pickers.{ui,txt} || die "rm failed"
-
-	if ! use test; then
+	if ! use test ; then
 		# don't waste time building tests
 		strip_builddir SRC_SUBDIRS tests Makefile.am
 		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in
@@ -140,31 +134,35 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="$(use_enable aqua quartz-backend)
-		$(use_enable colord)
-		$(use_enable cups cups auto)
-		$(use_enable introspection)
-		$(use_enable packagekit)
-		$(use_enable wayland wayland-backend)
-		$(use_enable X x11-backend)
-		$(use_enable X xcomposite)
-		$(use_enable X xdamage)
-		$(use_enable X xfixes)
-		$(use_enable X xkb)
-		$(use_enable X xrandr)
-		$(use_enable xinerama)
-		--disable-papi
-		--enable-man
-		--enable-gtk2-dependency"
+	local myconf=""
 
 	[[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)"
 
 	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
 	# 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 --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
+	econf \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(usex debug --enable-debug=yes "") \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend) \
+		$(use_enable X xcomposite) \
+		$(use_enable X xdamage) \
+		$(use_enable X xfixes) \
+		$(use_enable X xkb) \
+		$(use_enable X xrandr) \
+		$(use_enable xinerama) \
+		--disable-gtk-doc \
+		--disable-papi \
+		--enable-man \
+		--enable-gtk2-dependency \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		${myconf}
 }
 
 src_test() {
@@ -177,11 +175,12 @@ src_test() {
 		ewarn "required version of gnome-themes-standard."
 		return 0
 	fi
+
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
 	unset DBUS_SESSION_BUS_ADDRESS
-	# Exporting HOME fixes tests using XDG directories spec since all defaults
-	# are based on $HOME. It is also backward compatible with functions not
-	# yet ported to this spec.
-	XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
 }
 
 src_install() {
@@ -192,25 +191,33 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
 
-	# Remove unneeded *.la files
-	prune_libtool_files --all
+	prune_libtool_files --modules
 
 	# add -framework Carbon to the .pc files
-	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-	done
+	if use aqua ; then
+		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
+				-i "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+		done
+	fi
 }
 
 pkg_preinst() {
 	gnome2_schemas_savelist
+
+	# Make sure loaders.cache belongs to gdk-pixbuf alone
+	local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"/${cache} || die
+	fi
 }
 
 pkg_postinst() {
 	gnome2_schemas_update
-
-	local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0"
-	gtk-query-immodules-3.0  > "${GTK3_MODDIR}/immodules.cache" \
-		|| ewarn "Failed to run gtk-query-immodules-3.0"
+	gnome2_query_immodules_gtk3
 
 	if ! has_version "app-text/evince"; then
 		elog "Please install app-text/evince for print preview functionality."
@@ -221,4 +228,8 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_schemas_update
+
+	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+		rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+	fi
 }

diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
new file mode 100644
index 0000000..dde3aef
--- /dev/null
+++ b/x11-libs/gtk+/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <longdescription>
+    GTK+ is a multi-platform toolkit for creating graphical user
+    interfaces. Offering a complete set of widgets, GTK+ is suitable
+    for projects ranging from small one-off projects to complete
+    application suites.
+  </longdescription>
+  <use>
+    <flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management
+	  in printing</flag>
+    <flag name="packagekit">Enable support for the distro-neutral package
+	  manager GUI <pkg>app-admin/packagekit</pkg> in application chooser</flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:gtk:gtk%2B</remote-id>
+  </upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2013-12-02 15:30 Priit Laes
  0 siblings, 0 replies; 57+ messages in thread
From: Priit Laes @ 2013-12-02 15:30 UTC (permalink / raw
  To: gentoo-commits

commit:     d0cacec38283d5fb549b49ce7bc6f00f9e0e39a8
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Mon Dec  2 15:33:00 2013 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Mon Dec  2 15:33:00 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d0cacec3

x11-libs/gtk+: Fix build with USE="-test"

---
 x11-libs/gtk+/gtk+-3.10.5.ebuild | 2 ++
 x11-libs/gtk+/gtk+-9999.ebuild   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/x11-libs/gtk+/gtk+-3.10.5.ebuild b/x11-libs/gtk+/gtk+-3.10.5.ebuild
index 03a21ed..af29e93 100644
--- a/x11-libs/gtk+/gtk+-3.10.5.ebuild
+++ b/x11-libs/gtk+/gtk+-3.10.5.ebuild
@@ -106,6 +106,8 @@ src_prepare() {
 
 	if ! use test ; then
 		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS testsuite Makefile.am
+		strip_builddir SRC_SUBDIRS testsuite Makefile.in
 		strip_builddir SRC_SUBDIRS tests Makefile.am
 		strip_builddir SRC_SUBDIRS tests Makefile.in
 	fi

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 3797f40..3a9d8de 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -121,6 +121,7 @@ src_prepare() {
 	if ! use test ; then
 		# don't waste time building tests
 		strip_builddir SRC_SUBDIRS tests Makefile.am
+		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS testsuite Makefile.in
 		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in
 	fi
 


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2013-12-12 23:20 Gilles Dartiguelongue
  0 siblings, 0 replies; 57+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-12 23:20 UTC (permalink / raw
  To: gentoo-commits

commit:     c56a1848690d32588733c69c16a693a0770bd51d
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 22:55:49 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 23:20:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c56a1848

x11-libs/gtk+: 3.10.5 → 3.10.6

---
 x11-libs/gtk+/{gtk+-3.10.5.ebuild => gtk+-3.10.6.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.10.5.ebuild b/x11-libs/gtk+/gtk+-3.10.6.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.10.5.ebuild
rename to x11-libs/gtk+/gtk+-3.10.6.ebuild


^ permalink raw reply	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2013-12-18 19:16 Priit Laes
  0 siblings, 0 replies; 57+ messages in thread
From: Priit Laes @ 2013-12-18 19:16 UTC (permalink / raw
  To: gentoo-commits

commit:     bea4d1d41ae2791e27d44e2f021f0e660c664916
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Wed Dec 18 19:16:17 2013 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Wed Dec 18 19:16:17 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bea4d1d4

x11-libs/gtk+: Fix build with USE="wayland"

---
 x11-libs/gtk+/gtk+-3.10.6.ebuild | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/x11-libs/gtk+/gtk+-3.10.6.ebuild b/x11-libs/gtk+/gtk+-3.10.6.ebuild
index af29e93..05a7b7d 100644
--- a/x11-libs/gtk+/gtk+-3.10.6.ebuild
+++ b/x11-libs/gtk+/gtk+-3.10.6.ebuild
@@ -100,6 +100,11 @@ strip_builddir() {
 src_prepare() {
 	gnome2_environment_reset
 
+	# Build fails with USE="wayland introspection"
+	# Fixed upstream with commit 8dd899dae (and will be in 3.10.7 tarball)
+	rm ${S}/gdk/wayland/gtk-shell-client-protocol.h || die
+	rm ${S}/gdk/wayland/gtk-shell-protocol.c || die
+
 	# -O3 and company cause random crashes in applications. Bug #133469
 	replace-flags -O3 -O2
 	strip-flags


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2013-12-22 20:26 Gilles Dartiguelongue
  0 siblings, 0 replies; 57+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-22 20:26 UTC (permalink / raw
  To: gentoo-commits

commit:     cd39fc7d4d9be57d074993c7e7dc48a9a8865772
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 22 20:13:17 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 22 20:26:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cd39fc7d

x11-libs/gtk+: add missing quotes per repoman

---
 x11-libs/gtk+/gtk+-3.10.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.10.6.ebuild b/x11-libs/gtk+/gtk+-3.10.6.ebuild
index 05a7b7d..fe48b76 100644
--- a/x11-libs/gtk+/gtk+-3.10.6.ebuild
+++ b/x11-libs/gtk+/gtk+-3.10.6.ebuild
@@ -102,8 +102,8 @@ src_prepare() {
 
 	# Build fails with USE="wayland introspection"
 	# Fixed upstream with commit 8dd899dae (and will be in 3.10.7 tarball)
-	rm ${S}/gdk/wayland/gtk-shell-client-protocol.h || die
-	rm ${S}/gdk/wayland/gtk-shell-protocol.c || die
+	rm "${S}"/gdk/wayland/gtk-shell-client-protocol.h || die
+	rm "${S}"/gdk/wayland/gtk-shell-protocol.c || die
 
 	# -O3 and company cause random crashes in applications. Bug #133469
 	replace-flags -O3 -O2


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2014-02-12 23:48 Gilles Dartiguelongue
  0 siblings, 0 replies; 57+ messages in thread
From: Gilles Dartiguelongue @ 2014-02-12 23:48 UTC (permalink / raw
  To: gentoo-commits

commit:     31877704f1419e12ca0bf264227d1501fe906aa3
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 23:35:05 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 23:35:05 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=31877704

x11-libs/gtk+: moved to gentoo-x86 + sync live ebuild

---
 x11-libs/gtk+/gtk+-3.10.6.ebuild | 221 ---------------------------------------
 x11-libs/gtk+/gtk+-9999.ebuild   |   7 +-
 2 files changed, 5 insertions(+), 223 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.10.6.ebuild b/x11-libs/gtk+/gtk+-3.10.6.ebuild
deleted file mode 100644
index fe48b76..0000000
--- a/x11-libs/gtk+/gtk+-3.10.6.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit eutils flag-o-matic gnome.org gnome2-utils multilib virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-# NOTE: This gtk+ has multi-gdk-backend support, see:
-#  * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
-#  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
-# I tried this and got it all compiling, but the end result is unusable as it
-# horribly mixes up the backends -- grobian
-IUSE="aqua colord cups debug examples +introspection packagekit test vim-syntax wayland X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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)
-# Use gtk+:2 for gtk-update-icon-cache
-COMMON_DEPEND="
-	>=dev-libs/atk-2.7.5[introspection?]
-	>=dev-libs/glib-2.37.5:2
-	media-libs/fontconfig
-	>=x11-libs/cairo-1.12[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
-	>=x11-libs/gtk+-2.24:2
-	>=x11-libs/pango-1.32.4[introspection?]
-	x11-misc/shared-mime-info
-
-	colord? ( >=x11-misc/colord-0.1.9 )
-	cups? ( >=net-print/cups-1.2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32 )
-	wayland? (
-		>=dev-libs/wayland-1.2
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3
-		x11-libs/libXrender
-		x11-libs/libX11
-		>=x11-libs/libXi-1.3
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.3
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		xinerama? ( x11-libs/libXinerama )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/damageproto
-		xinerama? ( x11-proto/xineramaproto )
-	)
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-# 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
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-	packagekit? ( app-admin/packagekit-base )
-	X? ( !<x11-base/xorg-server-1.11.4 )
-"
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	gnome2_environment_reset
-
-	# Build fails with USE="wayland introspection"
-	# Fixed upstream with commit 8dd899dae (and will be in 3.10.7 tarball)
-	rm "${S}"/gdk/wayland/gtk-shell-client-protocol.h || die
-	rm "${S}"/gdk/wayland/gtk-shell-protocol.c || die
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.am
-		strip_builddir SRC_SUBDIRS testsuite Makefile.in
-		strip_builddir SRC_SUBDIRS tests Makefile.am
-		strip_builddir SRC_SUBDIRS tests Makefile.in
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.am
-		strip_builddir SRC_SUBDIRS demos Makefile.in
-	fi
-}
-
-src_configure() {
-	# 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 \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable colord) \
-		$(use_enable cups cups auto) \
-		$(usex debug --enable-debug=yes "") \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend) \
-		$(use_enable X xcomposite) \
-		$(use_enable X xdamage) \
-		$(use_enable X xfixes) \
-		$(use_enable X xkb) \
-		$(use_enable X xrandr) \
-		$(use_enable xinerama) \
-		--disable-gtk-doc \
-		--disable-papi \
-		--enable-man \
-		--enable-gtk2-dependency \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_test() {
-	# Tests require a new gnome-themes-standard, but adding it to DEPEND
-	# would result in circular dependencies.
-	# https://bugzilla.gnome.org/show_bug.cgi?id=669562
-	if ! has_version '>=x11-themes/gnome-themes-standard-3.6[gtk]'; then
-		ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]"
-		ewarn "is not installed. Please re-run tests after installing the"
-		ewarn "required version of gnome-themes-standard."
-		return 0
-	fi
-
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
-	prune_libtool_files --modules
-
-	# add -framework Carbon to the .pc files
-	if use aqua ; then
-		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
-				-i "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-		done
-	fi
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-
-	# Make sure loaders.cache belongs to gdk-pixbuf alone
-	local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"/${cache} || die
-	fi
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	gnome2_query_immodules_gtk3
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-
-	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
-		rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-	fi
-}

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 3a9d8de..f755462 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -120,8 +120,9 @@ 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 testsuite Makefile.in
 		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in
 	fi
 
@@ -129,6 +130,8 @@ src_prepare() {
 		# 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
 	fi
 
 	[[ ${PV} = 9999 ]] && gnome2_src_prepare


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2014-04-20 18:17 Gilles Dartiguelongue
  0 siblings, 0 replies; 57+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-20 18:17 UTC (permalink / raw
  To: gentoo-commits

commit:     fadc3af0d5ebff6de560e48f3dec6c6cca4a6a80
Author:     Mike Auty <ikelos <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 17 00:36:43 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 15:48:29 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fadc3af0

x11-libs/gtk+: 3.10.8 → 3.12.0

Bump gtk+ with wayland, gtk-doc and glib dep bumps.
Also added in cloudprint optional component with dependencies.

---
 x11-libs/gtk+/gtk+-3.12.0.ebuild | 220 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 220 insertions(+)

diff --git a/x11-libs/gtk+/gtk+-3.12.0.ebuild b/x11-libs/gtk+/gtk+-3.12.0.ebuild
new file mode 100644
index 0000000..d891bcc
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.12.0.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.10.8.ebuild,v 1.4 2014/04/16 07:49:22 ago Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2 multilib virtualx
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+# NOTE: This gtk+ has multi-gdk-backend support, see:
+#  * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
+#  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
+# I tried this and got it all compiling, but the end result is unusable as it
+# horribly mixes up the backends -- grobian
+IUSE="aqua cloudprint colord cups debug examples +introspection packagekit test vim-syntax wayland X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	xinerama? ( X )"
+
+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)
+# Use gtk+:2 for gtk-update-icon-cache
+COMMON_DEPEND="
+	>=dev-libs/atk-2.7.5[introspection?]
+	>=dev-libs/glib-2.39.5:2
+	media-libs/fontconfig
+	>=x11-libs/cairo-1.12[aqua?,glib,svg,X?]
+	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
+	>=x11-libs/gtk+-2.24:2
+	>=x11-libs/pango-1.32.4[introspection?]
+	x11-misc/shared-mime-info
+
+	colord? ( >=x11-misc/colord-0.1.9 )
+	cups? ( >=net-print/cups-1.2 )
+	cloudprint? ( >=net-libs/rest-0.7 
+				  >=dev-libs/json-glib-1.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.39 )
+	wayland? (
+		>=dev-libs/wayland-1.3.90
+		media-libs/mesa[wayland]
+		>=x11-libs/libxkbcommon-0.2
+	)
+	X? (
+		>=app-accessibility/at-spi2-atk-2.5.3
+		x11-libs/libXrender
+		x11-libs/libX11
+		>=x11-libs/libXi-1.3
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.3
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		xinerama? ( x11-libs/libXinerama )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.20
+	virtual/pkgconfig
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto
+		x11-proto/inputproto
+		x11-proto/damageproto
+		xinerama? ( x11-proto/xineramaproto )
+	)
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )
+"
+# 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
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.31.0:2.90
+	packagekit? ( app-admin/packagekit-base )
+	X? ( !<x11-base/xorg-server-1.11.4 )
+"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS testsuite Makefile.am
+		strip_builddir SRC_SUBDIRS testsuite Makefile.in
+		strip_builddir SRC_SUBDIRS tests Makefile.am
+		strip_builddir SRC_SUBDIRS tests Makefile.in
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.am
+		strip_builddir SRC_SUBDIRS demos Makefile.in
+		strip_builddir SRC_SUBDIRS examples Makefile.am
+		strip_builddir SRC_SUBDIRS examples Makefile.in
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# 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 ...)
+	gnome2_src_configure \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(usex debug --enable-debug=yes "") \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend) \
+		$(use_enable X xcomposite) \
+		$(use_enable X xdamage) \
+		$(use_enable X xfixes) \
+		$(use_enable X xkb) \
+		$(use_enable X xrandr) \
+		$(use_enable xinerama) \
+		$(use_enable cloudprint) \
+		--disable-papi \
+		--enable-man \
+		--enable-gtk2-dependency \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_test() {
+	# Tests require a new gnome-themes-standard, but adding it to DEPEND
+	# would result in circular dependencies.
+	# https://bugzilla.gnome.org/show_bug.cgi?id=669562
+	if ! has_version '>=x11-themes/gnome-themes-standard-3.6[gtk]'; then
+		ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]"
+		ewarn "is not installed. Please re-run tests after installing the"
+		ewarn "required version of gnome-themes-standard."
+		return 0
+	fi
+
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+	unset DBUS_SESSION_BUS_ADDRESS
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+	# add -framework Carbon to the .pc files
+	if use aqua ; then
+		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
+				-i "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+		done
+	fi
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	# Make sure loaders.cache belongs to gdk-pixbuf alone
+	local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"/${cache} || die
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	gnome2_query_immodules_gtk3
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+		rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+	fi
+}


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2014-04-22 21:27 Gilles Dartiguelongue
  0 siblings, 0 replies; 57+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-22 21:27 UTC (permalink / raw
  To: gentoo-commits

commit:     32dd5cd7b1949e3c1422c5dbd95a6b250add5c9b
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 22 21:16:11 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Apr 22 21:16:11 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=32dd5cd7

x11-libs/gtk+: 3.12.0 → 3.12.1

---
 x11-libs/gtk+/{gtk+-3.12.0.ebuild => gtk+-3.12.1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.12.0.ebuild b/x11-libs/gtk+/gtk+-3.12.1.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.12.0.ebuild
rename to x11-libs/gtk+/gtk+-3.12.1.ebuild


^ permalink raw reply	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2014-04-25 23:35 Gilles Dartiguelongue
  0 siblings, 0 replies; 57+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-25 23:35 UTC (permalink / raw
  To: gentoo-commits

commit:     840bf487a082b36dee3d48e845167779046449a8
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 25 23:35:08 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Apr 25 23:35:08 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=840bf487

x11-libs/gtk+: needs rebuild with colord changes subslot

---
 x11-libs/gtk+/gtk+-3.12.1.ebuild | 2 +-
 x11-libs/gtk+/gtk+-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.12.1.ebuild b/x11-libs/gtk+/gtk+-3.12.1.ebuild
index ee97028..1fc1a1b 100644
--- a/x11-libs/gtk+/gtk+-3.12.1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.12.1.ebuild
@@ -41,7 +41,7 @@ COMMON_DEPEND="
 	cloudprint? (
 		>=net-libs/rest-0.7
 		>=dev-libs/json-glib-1.0 )
-	colord? ( >=x11-misc/colord-0.1.9 )
+	colord? ( >=x11-misc/colord-0.1.9:0= )
 	cups? ( >=net-print/cups-1.2 )
 	introspection? ( >=dev-libs/gobject-introspection-1.39 )
 	wayland? (

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 9c81c07..8313158 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -49,7 +49,7 @@ COMMON_DEPEND="
 	cloudprint? (
 		>=net-libs/rest-0.7
 		>=dev-libs/json-glib-1.0 )
-	colord? ( >=x11-misc/colord-0.1.9 )
+	colord? ( >=x11-misc/colord-0.1.9:0= )
 	cups? ( >=net-print/cups-1.2 )
 	introspection? ( >=dev-libs/gobject-introspection-1.39 )
 	wayland? (


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2014-10-13 21:51 Gilles Dartiguelongue
  0 siblings, 0 replies; 57+ messages in thread
From: Gilles Dartiguelongue @ 2014-10-13 21:51 UTC (permalink / raw
  To: gentoo-commits

commit:     3d0b30d016f6ca5285d22585ce765b8da328c66d
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 13 21:31:09 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Oct 13 21:31:09 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3d0b30d0

x11-libs/gtk+: 3.14.2 → 3.14.3

---
 x11-libs/gtk+/{gtk+-3.14.2.ebuild => gtk+-3.14.3.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.14.2.ebuild b/x11-libs/gtk+/gtk+-3.14.3.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.14.2.ebuild
rename to x11-libs/gtk+/gtk+-3.14.3.ebuild


^ permalink raw reply	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2014-10-25 21:07 Gilles Dartiguelongue
  0 siblings, 0 replies; 57+ messages in thread
From: Gilles Dartiguelongue @ 2014-10-25 21:07 UTC (permalink / raw
  To: gentoo-commits

commit:     d6983e920906050b3105fd9c9449b632453d908a
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 25 20:11:57 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 25 20:12:12 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d6983e92

x11-libs/gtk+: clean up metadata.xml

---
 x11-libs/gtk+/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
index dde3aef..c619de0 100644
--- a/x11-libs/gtk+/metadata.xml
+++ b/x11-libs/gtk+/metadata.xml
@@ -11,8 +11,6 @@
   <use>
     <flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management
 	  in printing</flag>
-    <flag name="packagekit">Enable support for the distro-neutral package
-	  manager GUI <pkg>app-admin/packagekit</pkg> in application chooser</flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:gtk:gtk%2B</remote-id>


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2014-11-03 23:24 Gilles Dartiguelongue
  0 siblings, 0 replies; 57+ messages in thread
From: Gilles Dartiguelongue @ 2014-11-03 23:24 UTC (permalink / raw
  To: gentoo-commits

commit:     1d42ec882b9576cebcf60aed006379fc1a3b3f9b
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  2 16:29:52 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov  2 16:29:52 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1d42ec88

x11-libs/gtk+: 3.14.3 → 3.14.4

---
 x11-libs/gtk+/{gtk+-3.14.3.ebuild => gtk+-3.14.4.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.14.3.ebuild b/x11-libs/gtk+/gtk+-3.14.4.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.14.3.ebuild
rename to x11-libs/gtk+/gtk+-3.14.4.ebuild


^ permalink raw reply	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2014-11-23 23:51 Remi Cardona
  0 siblings, 0 replies; 57+ messages in thread
From: Remi Cardona @ 2014-11-23 23:51 UTC (permalink / raw
  To: gentoo-commits

commit:     d08a0ec8e065f8af516977ad0fb1779c346e4e5c
Author:     Rémi Cardona <remi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 23 23:38:57 2014 +0000
Commit:     Remi Cardona <remi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 23 23:49:42 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d08a0ec8

x11-libs/gtk+: 3.14.4 → 3.14.5

---
 x11-libs/gtk+/{gtk+-3.14.4.ebuild => gtk+-3.14.5.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.14.4.ebuild b/x11-libs/gtk+/gtk+-3.14.5.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.14.4.ebuild
rename to x11-libs/gtk+/gtk+-3.14.5.ebuild


^ permalink raw reply	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2014-11-23 23:51 Remi Cardona
  0 siblings, 0 replies; 57+ messages in thread
From: Remi Cardona @ 2014-11-23 23:51 UTC (permalink / raw
  To: gentoo-commits

commit:     f3cdc71f834a3723ae85a4f80acde76cdb42e721
Author:     Rémi Cardona <remi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 23 23:23:37 2014 +0000
Commit:     Remi Cardona <remi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 23 23:48:55 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f3cdc71f

x11-libs/gtk+: sync with portage (mostly multilib)

---
 x11-libs/gtk+/gtk+-3.14.4.ebuild | 121 +++++++++++++++++++++++----------------
 x11-libs/gtk+/gtk+-9999.ebuild   | 119 ++++++++++++++++++++++----------------
 2 files changed, 141 insertions(+), 99 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.14.4.ebuild b/x11-libs/gtk+/gtk+-3.14.4.ebuild
index f6d9192..122f8e6 100644
--- a/x11-libs/gtk+/gtk+-3.14.4.ebuild
+++ b/x11-libs/gtk+/gtk+-3.14.4.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils flag-o-matic gnome2 multilib virtualx
+inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
@@ -30,38 +30,38 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
 # Use gtk+:2 for gtk-update-icon-cache
 COMMON_DEPEND="
-	>=dev-libs/atk-2.12[introspection?]
-	>=dev-libs/glib-2.41.2:2
-	media-libs/fontconfig
-	>=x11-libs/cairo-1.12[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?]
-	>=x11-libs/gtk+-2.24:2
-	>=x11-libs/pango-1.36.7[introspection?]
+	>=dev-libs/atk-2.12[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.41.2:2[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-2.24:2[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]
 	x11-misc/shared-mime-info
 
 	cloudprint? (
-		>=net-libs/rest-0.7
-		>=dev-libs/json-glib-1.0 )
-	colord? ( >=x11-misc/colord-0.1.9:0= )
-	cups? ( >=net-print/cups-1.2 )
+		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+		>=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 )
 	wayland? (
-		>=dev-libs/wayland-1.5.91
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2
+		>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
 	)
 	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3
-		x11-libs/libXrender
-		x11-libs/libX11
-		>=x11-libs/libXi-1.3
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.3
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		xinerama? ( x11-libs/libXinerama )
+		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 	)
 "
 DEPEND="${COMMON_DEPEND}
@@ -71,13 +71,13 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gdbus-codegen
 	>=dev-util/gtk-doc-am-1.20
 	sys-devel/gettext
-	virtual/pkgconfig
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/damageproto
-		xinerama? ( x11-proto/xineramaproto )
+		x11-proto/xextproto[${MULTILIB_USEDEP}]
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-proto/inputproto[${MULTILIB_USEDEP}]
+		x11-proto/damageproto[${MULTILIB_USEDEP}]
+		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
 	)
 	test? (
 		media-fonts/font-misc-misc
@@ -94,6 +94,10 @@ RDEPEND="${COMMON_DEPEND}
 "
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
 
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-3.0
+)
+
 strip_builddir() {
 	local rule=$1
 	shift
@@ -127,17 +131,18 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
-src_configure() {
+multilib_src_configure() {
 	# 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} \
 	gnome2_src_configure \
 		$(use_enable aqua quartz-backend) \
 		$(use_enable cloudprint) \
 		$(use_enable colord) \
 		$(use_enable cups cups auto) \
 		$(usex debug --enable-debug=yes "") \
-		$(use_enable introspection) \
+		$(multilib_native_use_enable introspection) \
 		$(use_enable wayland wayland-backend) \
 		$(use_enable X x11-backend) \
 		$(use_enable X xcomposite) \
@@ -151,9 +156,17 @@ src_configure() {
 		--enable-gtk2-dependency \
 		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
 		--libdir="${EPREFIX}"/usr/$(get_libdir)
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
 }
 
-src_test() {
+multilib_src_test() {
 	# Tests require a new gnome-themes-standard, but adding it to DEPEND
 	# would result in circular dependencies.
 	# https://bugzilla.gnome.org/show_bug.cgi?id=669562
@@ -171,14 +184,9 @@ src_test() {
 	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
 }
 
-src_install() {
+multilib_src_install() {
 	gnome2_src_install
 
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
 	# add -framework Carbon to the .pc files
 	if use aqua ; then
 		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
@@ -188,17 +196,27 @@ src_install() {
 	fi
 }
 
+multilib_src_install_all() {
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+}
+
 pkg_preinst() {
 	gnome2_pkg_preinst
 
-	# Make sure loaders.cache belongs to gdk-pixbuf alone
-	local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"/${cache} || die
-	fi
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
 }
 
 pkg_postinst() {
@@ -216,6 +234,9 @@ pkg_postrm() {
 	gnome2_pkg_postrm
 
 	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
-		rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
 	fi
 }

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index c704c0c..f2ec93c 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils flag-o-matic gnome2 multilib virtualx
+inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -38,38 +38,38 @@ fi
 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
 # Use gtk+:2 for gtk-update-icon-cache
 COMMON_DEPEND="
-	>=dev-libs/atk-2.12[introspection?]
-	>=dev-libs/glib-2.41.2:2
-	media-libs/fontconfig
-	>=x11-libs/cairo-1.12[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?]
-	>=x11-libs/gtk+-2.24:2
-	>=x11-libs/pango-1.36.7[introspection?]
+	>=dev-libs/atk-2.12[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.41.2:2[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-2.24:2[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]
 	x11-misc/shared-mime-info
 
 	cloudprint? (
-		>=net-libs/rest-0.7
-		>=dev-libs/json-glib-1.0 )
-	colord? ( >=x11-misc/colord-0.1.9:0= )
-	cups? ( >=net-print/cups-1.2 )
+		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+		>=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 )
 	wayland? (
-		>=dev-libs/wayland-1.5.91
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2
+		>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
 	)
 	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3
-		x11-libs/libXrender
-		x11-libs/libX11
-		>=x11-libs/libXi-1.3
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.3
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		xinerama? ( x11-libs/libXinerama )
+		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 	)
 "
 DEPEND="${COMMON_DEPEND}
@@ -79,13 +79,13 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gdbus-codegen
 	>=dev-util/gtk-doc-am-1.20
 	sys-devel/gettext
-	virtual/pkgconfig
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/damageproto
-		xinerama? ( x11-proto/xineramaproto )
+		x11-proto/xextproto[${MULTILIB_USEDEP}]
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-proto/inputproto[${MULTILIB_USEDEP}]
+		x11-proto/damageproto[${MULTILIB_USEDEP}]
+		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
 	)
 	test? (
 		media-fonts/font-misc-misc
@@ -108,6 +108,10 @@ RDEPEND="${COMMON_DEPEND}
 "
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
 
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-3.0
+)
+
 strip_builddir() {
 	local rule=$1
 	shift
@@ -141,7 +145,7 @@ src_prepare() {
 	[[ ${PV} = 9999 ]] && gnome2_src_prepare
 }
 
-src_configure() {
+multilib_src_configure() {
 	local myconf=""
 
 	[[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)"
@@ -149,13 +153,14 @@ src_configure() {
 	# 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} \
 	gnome2_src_configure \
 		$(use_enable aqua quartz-backend) \
 		$(use_enable cloudprint) \
 		$(use_enable colord) \
 		$(use_enable cups cups auto) \
 		$(usex debug --enable-debug=yes "") \
-		$(use_enable introspection) \
+		$(multilib_native_use_enable introspection) \
 		$(use_enable wayland wayland-backend) \
 		$(use_enable X x11-backend) \
 		$(use_enable X xcomposite) \
@@ -170,9 +175,17 @@ src_configure() {
 		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		${myconf}
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
 }
 
-src_test() {
+multilib_src_test() {
 	# Tests require a new gnome-themes-standard, but adding it to DEPEND
 	# would result in circular dependencies.
 	# https://bugzilla.gnome.org/show_bug.cgi?id=669562
@@ -190,14 +203,9 @@ src_test() {
 	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
 }
 
-src_install() {
+multilib_src_install() {
 	gnome2_src_install
 
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
 	# add -framework Carbon to the .pc files
 	if use aqua ; then
 		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
@@ -207,17 +215,27 @@ src_install() {
 	fi
 }
 
+multilib_src_install_all() {
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+}
+
 pkg_preinst() {
 	gnome2_pkg_preinst
 
-	# Make sure loaders.cache belongs to gdk-pixbuf alone
-	local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
 
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"/${cache} || die
-	fi
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
 }
 
 pkg_postinst() {
@@ -235,6 +253,9 @@ pkg_postrm() {
 	gnome2_pkg_postrm
 
 	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
-		rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
 	fi
 }


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2014-12-14 22:46 Gilles Dartiguelongue
  0 siblings, 0 replies; 57+ messages in thread
From: Gilles Dartiguelongue @ 2014-12-14 22:46 UTC (permalink / raw
  To: gentoo-commits

commit:     4ded56b4dd158ee154e929f4f5d77a1117e2bf0d
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 14 22:43:06 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 14 22:45:42 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4ded56b4

x11-libs/gtk+: moved to gentoo-x86, sync live ebuild

---
 x11-libs/gtk+/gtk+-3.14.6.ebuild | 246 ---------------------------------------
 x11-libs/gtk+/gtk+-9999.ebuild   |   8 ++
 2 files changed, 8 insertions(+), 246 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.14.6.ebuild b/x11-libs/gtk+/gtk+-3.14.6.ebuild
deleted file mode 100644
index 98e6e47..0000000
--- a/x11-libs/gtk+/gtk+-3.14.6.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic autotools gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-# NOTE: This gtk+ has multi-gdk-backend support, see:
-#  * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
-#  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
-# I tried this and got it all compiling, but the end result is unusable as it
-# horribly mixes up the backends -- grobian
-IUSE="aqua cloudprint colord cups debug examples +introspection test vim-syntax wayland X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-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)
-# Use gtk+:2 for gtk-update-icon-cache
-COMMON_DEPEND="
-	>=dev-libs/atk-2.12[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.41.2:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-2.24:2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
-		>=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 )
-	wayland? (
-		>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.20
-	sys-devel/gettext
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? (
-		x11-proto/xextproto[${MULTILIB_USEDEP}]
-		x11-proto/xproto[${MULTILIB_USEDEP}]
-		x11-proto/inputproto[${MULTILIB_USEDEP}]
-		x11-proto/damageproto[${MULTILIB_USEDEP}]
-		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
-	)
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-# 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
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-	X? ( !<x11-base/xorg-server-1.11.4 )
-"
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	# see bug #525928
-	epatch "${FILESDIR}/${PN}-non-bash-support.patch"
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.am
-		strip_builddir SRC_SUBDIRS testsuite Makefile.in
-		strip_builddir SRC_SUBDIRS tests Makefile.am
-		strip_builddir SRC_SUBDIRS tests Makefile.in
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.am
-		strip_builddir SRC_SUBDIRS demos Makefile.in
-		strip_builddir SRC_SUBDIRS examples Makefile.am
-		strip_builddir SRC_SUBDIRS examples Makefile.in
-	fi
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# 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} \
-	gnome2_src_configure \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable cloudprint) \
-		$(use_enable colord) \
-		$(use_enable cups cups auto) \
-		$(usex debug --enable-debug=yes "") \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend) \
-		$(use_enable X xcomposite) \
-		$(use_enable X xdamage) \
-		$(use_enable X xfixes) \
-		$(use_enable X xkb) \
-		$(use_enable X xrandr) \
-		$(use_enable xinerama) \
-		--disable-papi \
-		--enable-man \
-		--enable-gtk2-dependency \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	# Tests require a new gnome-themes-standard, but adding it to DEPEND
-	# would result in circular dependencies.
-	# https://bugzilla.gnome.org/show_bug.cgi?id=669562
-	if ! has_version '>=x11-themes/gnome-themes-standard-3.6[gtk]'; then
-		ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]"
-		ewarn "is not installed. Please re-run tests after installing the"
-		ewarn "required version of gnome-themes-standard."
-		return 0
-	fi
-
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-
-	# add -framework Carbon to the .pc files
-	if use aqua ; then
-		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
-				-i "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make sure loaders.cache belongs to gdk-pixbuf alone
-		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	gnome2_query_immodules_gtk3
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index f2ec93c..c7e2c21 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -105,6 +105,10 @@ RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gail-1000
 	!<x11-libs/vte-0.31.0:2.90
 	X? ( !<x11-base/xorg-server-1.11.4 )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)
 "
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
 
@@ -122,6 +126,9 @@ strip_builddir() {
 }
 
 src_prepare() {
+	# see bug #525928
+	epatch "${FILESDIR}/${PN}-non-bash-support.patch"
+
 	# -O3 and company cause random crashes in applications. Bug #133469
 	replace-flags -O3 -O2
 	strip-flags
@@ -174,6 +181,7 @@ multilib_src_configure() {
 		--enable-gtk2-dependency \
 		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" \
 		${myconf}
 
 	# work-around gtk-doc out-of-source brokedness


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2014-12-14 22:46 Gilles Dartiguelongue
  0 siblings, 0 replies; 57+ messages in thread
From: Gilles Dartiguelongue @ 2014-12-14 22:46 UTC (permalink / raw
  To: gentoo-commits

commit:     629e8bf04a43fc64ebcce23e1556b392e567c94c
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 14 21:42:00 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 14 22:45:36 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=629e8bf0

x11-libs/gtk+: 3.14.5 → 3.14.6

---
 x11-libs/gtk+/{gtk+-3.14.5.ebuild => gtk+-3.14.6.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.14.5.ebuild b/x11-libs/gtk+/gtk+-3.14.6.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.14.5.ebuild
rename to x11-libs/gtk+/gtk+-3.14.6.ebuild


^ permalink raw reply	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2015-04-25 18:52 Alexandre Rostovtsev
  0 siblings, 0 replies; 57+ messages in thread
From: Alexandre Rostovtsev @ 2015-04-25 18:52 UTC (permalink / raw
  To: gentoo-commits

commit:     e7758a4ed2669d32965e342422ca2b7f09723d25
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 25 18:48:11 2015 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 18:48:11 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=e7758a4e

x11-libs/gtk+: sync deps with gx86 (bug #547710)

Package-Manager: portage-2.2.18
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

 x11-libs/gtk+/gtk+-3.16.2.ebuild | 5 ++++-
 x11-libs/gtk+/gtk+-9999.ebuild   | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.16.2.ebuild b/x11-libs/gtk+/gtk+-3.16.2.ebuild
index 893508c..5e2890a 100644
--- a/x11-libs/gtk+/gtk+-3.16.2.ebuild
+++ b/x11-libs/gtk+/gtk+-3.16.2.ebuild
@@ -95,7 +95,10 @@ RDEPEND="${COMMON_DEPEND}
 		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 	)
 "
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="gnome-base/librsvg[${MULTILIB_USEDEP}]
+	vim-syntax? ( app-vim/gtk-syntax )
+"
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/gtk-query-immodules-3.0

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 723f8ae..e610614 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -110,7 +110,10 @@ RDEPEND="${COMMON_DEPEND}
 		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 	)
 "
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="gnome-base/librsvg[${MULTILIB_USEDEP}]
+	vim-syntax? ( app-vim/gtk-syntax )
+"
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/gtk-query-immodules-3.0


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2015-05-12 19:31 Gilles Dartiguelongue
  0 siblings, 0 replies; 57+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-12 19:31 UTC (permalink / raw
  To: gentoo-commits

commit:     7458b115ef7a1e92e658378a3fb1194d00696116
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 19:03:46 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue May 12 19:05:30 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=7458b115

x11-libs/gtk+: 3.16.2 → 3.16.3

 x11-libs/gtk+/{gtk+-3.16.2.ebuild => gtk+-3.16.3.ebuild} | 2 +-
 x11-libs/gtk+/gtk+-9999.ebuild                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.16.2.ebuild b/x11-libs/gtk+/gtk+-3.16.3.ebuild
similarity index 99%
rename from x11-libs/gtk+/gtk+-3.16.2.ebuild
rename to x11-libs/gtk+/gtk+-3.16.3.ebuild
index 80e3822..55b2a89 100644
--- a/x11-libs/gtk+/gtk+-3.16.2.ebuild
+++ b/x11-libs/gtk+/gtk+-3.16.3.ebuild
@@ -134,7 +134,7 @@ src_prepare() {
 	fi
 
 	# Do no build and install gtk-update-icon-cache which is done by gtk+:2
-	epatch "${FILESDIR}"/${P}-remove_update-icon-cache.patch
+	epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch
 
 	epatch_user
 

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index c2c45c3..284cd91 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -149,7 +149,7 @@ src_prepare() {
 	fi
 
 	# Do no build and install gtk-update-icon-cache which is done by gtk+:2
-	epatch "${FILESDIR}"/${P}-remove_update-icon-cache.patch
+	epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch
 
 	epatch_user
 


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2015-05-14 13:39 Gilles Dartiguelongue
  0 siblings, 0 replies; 57+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-14 13:39 UTC (permalink / raw
  To: gentoo-commits

commit:     4df73d48979c25415fd4dc446b41c14994ec20eb
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 10:58:38 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu May 14 10:58:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4df73d48

x11-libs/gtk+: 2.24.27-r2 → 2.24.28

 x11-libs/gtk+/{gtk+-2.24.27-r2.ebuild => gtk+-2.24.28.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-2.24.27-r2.ebuild b/x11-libs/gtk+/gtk+-2.24.28.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-2.24.27-r2.ebuild
rename to x11-libs/gtk+/gtk+-2.24.28.ebuild


^ permalink raw reply	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2015-05-25  2:23 Alexandre Rostovtsev
  0 siblings, 0 replies; 57+ messages in thread
From: Alexandre Rostovtsev @ 2015-05-25  2:23 UTC (permalink / raw
  To: gentoo-commits

commit:     993dfd9fdafc02b4b8f17a25d62acf44bc5e8548
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 02:03:05 2015 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Mon May 25 02:03:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=993dfd9f

x11-libs/gtk+: revbump to not collide with gx86

Package-Manager: portage-2.2.20
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

 x11-libs/gtk+/{gtk+-2.24.28.ebuild => gtk+-2.24.28-r1.ebuild} | 0
 x11-libs/gtk+/{gtk+-3.14.13.ebuild => gtk+-3.14.13-r1.ebuild} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-2.24.28.ebuild b/x11-libs/gtk+/gtk+-2.24.28-r1.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-2.24.28.ebuild
rename to x11-libs/gtk+/gtk+-2.24.28-r1.ebuild

diff --git a/x11-libs/gtk+/gtk+-3.14.13.ebuild b/x11-libs/gtk+/gtk+-3.14.13-r1.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.14.13.ebuild
rename to x11-libs/gtk+/gtk+-3.14.13-r1.ebuild


^ permalink raw reply	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2015-06-09  9:16 Gilles Dartiguelongue
  0 siblings, 0 replies; 57+ messages in thread
From: Gilles Dartiguelongue @ 2015-06-09  9:16 UTC (permalink / raw
  To: gentoo-commits

commit:     ac3d1a959a5c56709d5d9977805af40c2dddd307
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  8 22:16:58 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Jun  8 22:16:58 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ac3d1a95

x11-libs/gtk+: moved to gentoo-x86

 x11-libs/gtk+/gtk+-3.16.3.ebuild | 249 ---------------------------------------
 1 file changed, 249 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.16.3.ebuild b/x11-libs/gtk+/gtk+-3.16.3.ebuild
deleted file mode 100644
index 55b2a89..0000000
--- a/x11-libs/gtk+/gtk+-3.16.3.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-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}]
-	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-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
-		>=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 )
-	wayland? (
-		>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	>=dev-util/gdbus-codegen-2.38.2
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? (
-		x11-proto/xextproto[${MULTILIB_USEDEP}]
-		x11-proto/xproto[${MULTILIB_USEDEP}]
-		x11-proto/inputproto[${MULTILIB_USEDEP}]
-		x11-proto/damageproto[${MULTILIB_USEDEP}]
-		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
-	)
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-	examples? ( media-libs/libcanberra[gtk3] )
-"
-# 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
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-	>=x11-themes/adwaita-icon-theme-3.14
-	X? ( !<x11-base/xorg-server-1.11.4 )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	if ! use test ; then
-		# don't waste time building tests
-		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,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
-	epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# 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} \
-	gnome2_src_configure \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable broadway broadway-backend) \
-		$(use_enable cloudprint) \
-		$(use_enable colord) \
-		$(use_enable cups cups auto) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend) \
-		$(use_enable X xcomposite) \
-		$(use_enable X xdamage) \
-		$(use_enable X xfixes) \
-		$(use_enable X xkb) \
-		$(use_enable X xrandr) \
-		$(use_enable xinerama) \
-		--disable-papi \
-		--disable-mir-backend \
-		--enable-man \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset DISPLAY #527682
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-
-	# add -framework Carbon to the .pc files, bug #???
-	if use aqua ; then
-		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
-				-i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2015-10-11 20:46 Ole Reifschneider
  0 siblings, 0 replies; 57+ messages in thread
From: Ole Reifschneider @ 2015-10-11 20:46 UTC (permalink / raw
  To: gentoo-commits

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
 }
 


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2016-03-25  0:56 Ole Reifschneider
  0 siblings, 0 replies; 57+ messages in thread
From: Ole Reifschneider @ 2016-03-25  0:56 UTC (permalink / raw
  To: gentoo-commits

commit:     7d64fc2c829f9bc2aabbe26af6fd5af16f36be91
Author:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 16:34:53 2016 +0000
Commit:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 00:52:42 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=7d64fc2c

x11-libs/gtk+: Bump version to 3.20.0

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42

 .../{gtk+-3.18.0.ebuild => gtk+-3.20.0.ebuild}     | 25 ++++++----------------
 x11-libs/gtk+/gtk+-9999.ebuild                     |  7 +++---
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.18.0.ebuild b/x11-libs/gtk+/gtk+-3.20.0.ebuild
similarity index 87%
rename from x11-libs/gtk+/gtk+-3.18.0.ebuild
rename to x11-libs/gtk+/gtk+-3.20.0.ebuild
index b70ecdf..27481f2 100644
--- a/x11-libs/gtk+/gtk+-3.18.0.ebuild
+++ b/x11-libs/gtk+/gtk+-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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)
@@ -40,7 +40,8 @@ COMMON_DEPEND="
 	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
 	wayland? (
-		>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.0.0[${MULTILIB_USEDEP}]
 		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
 		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
 	)
@@ -50,7 +51,7 @@ COMMON_DEPEND="
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
 		x11-libs/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
@@ -88,10 +89,6 @@ RDEPEND="${COMMON_DEPEND}
 	!<x11-libs/vte-0.31.0:2.90
 	>=x11-themes/adwaita-icon-theme-3.14
 	X? ( !<x11-base/xorg-server-1.11.4 )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
 "
 # librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
 PDEPEND="
@@ -177,24 +174,14 @@ multilib_src_configure() {
 }
 
 multilib_src_test() {
-	# FIXME: this should be handled at eclass level
 	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
 
-	unset DBUS_SESSION_BUS_ADDRESS
 	unset DISPLAY #527682
 	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
 }
 
 multilib_src_install() {
 	gnome2_src_install
-
-	# add -framework Carbon to the .pc files, bug #???
-	if use aqua ; then
-		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
-				-i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-		done
-	fi
 }
 
 multilib_src_install_all() {
@@ -239,7 +226,7 @@ pkg_postinst() {
 pkg_postrm() {
 	gnome2_pkg_postrm
 
-	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
 		multilib_pkg_postrm() {
 			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
 		}

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 5536c9e..7c73fa4 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -48,7 +48,8 @@ COMMON_DEPEND="
 	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
 	wayland? (
-		>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.0.0[${MULTILIB_USEDEP}]
 		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
 		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
 	)
@@ -58,7 +59,7 @@ COMMON_DEPEND="
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
 		x11-libs/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/libXcomposite[${MULTILIB_USEDEP}]


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2016-04-09  9:48 Ole Reifschneider
  0 siblings, 0 replies; 57+ messages in thread
From: Ole Reifschneider @ 2016-04-09  9:48 UTC (permalink / raw
  To: gentoo-commits

commit:     47c01b37d19b2184024e9b38e24fe2d3a2b0dce3
Author:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 09:46:11 2016 +0000
Commit:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sat Apr  9 09:46:11 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=47c01b37

x11-libs/gtk+: Bump version to 3.20.2

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42

 x11-libs/gtk+/{gtk+-3.20.0.ebuild => gtk+-3.20.2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.20.0.ebuild b/x11-libs/gtk+/gtk+-3.20.2.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.20.0.ebuild
rename to x11-libs/gtk+/gtk+-3.20.2.ebuild


^ permalink raw reply	[flat|nested] 57+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
@ 2018-01-12 14:59 Dennis Lamm
  0 siblings, 0 replies; 57+ messages in thread
From: Dennis Lamm @ 2018-01-12 14:59 UTC (permalink / raw
  To: gentoo-commits

commit:     3f7d84e6127ec62b49c9225b341338d2078d3ccd
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 14:59:19 2018 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 14:59:19 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=3f7d84e6

x11-libs/gtk+: drop old

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 x11-libs/gtk+/gtk+-3.20.2.ebuild | 235 ---------------------------------------
 1 file changed, 235 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.20.2.ebuild b/x11-libs/gtk+/gtk+-3.20.2.ebuild
deleted file mode 100644
index 27481f26..00000000
--- a/x11-libs/gtk+/gtk+-3.20.2.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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.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.37.3[introspection?,${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
-		>=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:= )
-	wayland? (
-		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.0.0[${MULTILIB_USEDEP}]
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	>=dev-util/gdbus-codegen-2.38.2
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? (
-		x11-proto/xextproto[${MULTILIB_USEDEP}]
-		x11-proto/xproto[${MULTILIB_USEDEP}]
-		x11-proto/inputproto[${MULTILIB_USEDEP}]
-		x11-proto/damageproto[${MULTILIB_USEDEP}]
-		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
-	)
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-# 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
-#  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
-	!<x11-libs/vte-0.31.0:2.90
-	>=x11-themes/adwaita-icon-theme-3.14
-	X? ( !<x11-base/xorg-server-1.11.4 )
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	if ! use test ; then
-		# don't waste time building tests
-		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,in}
-		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
-	fi
-
-	# 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
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# 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} \
-	gnome2_src_configure \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable broadway broadway-backend) \
-		$(use_enable cloudprint) \
-		$(use_enable colord) \
-		$(use_enable cups cups auto) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend) \
-		$(use_enable X xcomposite) \
-		$(use_enable X xdamage) \
-		$(use_enable X xfixes) \
-		$(use_enable X xkb) \
-		$(use_enable X xrandr) \
-		$(use_enable xinerama) \
-		--disable-papi \
-		--disable-mir-backend \
-		--enable-man \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-	unset DISPLAY #527682
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}


^ permalink raw reply related	[flat|nested] 57+ messages in thread

end of thread, other threads:[~2018-01-12 14:59 UTC | newest]

Thread overview: 57+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-23 22:24 [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/ Nirbheek Chauhan
  -- strict thread matches above, loose matches on Subject: below --
2018-01-12 14:59 Dennis Lamm
2016-04-09  9:48 Ole Reifschneider
2016-03-25  0:56 Ole Reifschneider
2015-10-11 20:46 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-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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox