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

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

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"