Version bump. Lots of bug fixes, disable tests broken in gentoo env.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 167 insertions, 6 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 03a763608a8d..1226653d9e08 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.421 2009/05/04 22:28:22 eva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.422 2009/07/19 23:25:17 eva Exp $
+
+*gtk+-2.16.5 (19 Jul 2009)
+
+  19 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org> +gtk+-2.16.5.ebuild:
+  Version bump. Lots of bug fixes, disable tests broken in gentoo env.
 
 *gtk+-2.16.1 (04 May 2009)
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index ca4e12c95b76..d469f7d6b92b 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -27,17 +27,19 @@ DIST gtk+-2.12.11.tar.bz2 16232428 RMD160 189baa48d16736ab60fd2ed2b124cd4fa2448d
 DIST gtk+-2.12.12.tar.bz2 16222631 RMD160 2aeeeb6557530d6062e799e11138186a57ddaed2 SHA1 e3c247783da930ff3bdce7f4cdc738d74ee1a03f SHA256 eeacb49b99312e89c611d9ee72b4351b36a136c1344064af2c831d452dd92116
 DIST gtk+-2.14.7.tar.bz2 17475873 RMD160 2ed6451d3de050e9b2423f6509d15e39ba69a6ab SHA1 f4b9c65dbdc78cad6fc9b601640cbad1d3abb57f SHA256 e82f4728e52dbafc35713b755eb863a47dc155334912dda0240dc3de9cb07e14
 DIST gtk+-2.16.1.tar.bz2 18297352 RMD160 41bdf85d93a38236eea12f4882289efb671e16af SHA1 01cba21f12e6fa3762fe47437eb4dc335a2fb841 SHA256 2f1f3fbdb2f5f907913838d6efbb595419e370c950838bb7fad51eb0ed776d50
+DIST gtk+-2.16.5.tar.bz2 18527338 RMD160 2e938a81a95b99275fd7738b1fc99f8f224d1e02 SHA1 4482e698730c8ea88239512a49306dc27a661145 SHA256 bd6d227cca010ecc5ad722f476cf9485194946ccc9250c6a1349182e68ad8500
 EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9bd5 SHA1 93a6ec39cde941b4939c04da955475d017a6ff6f SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3a79658dcec6d5374c5910aa78b
 EBUILD gtk+-2.12.11.ebuild 4958 RMD160 940e8c7b465316386f7878590a274ce3b74b4593 SHA1 db01e240a5e17bc78c616c47f27b2bab8bbb0f23 SHA256 ac75435bc30144c72351b7075140719deeb9ba78bb1ae575d453ed337706e9d7
 EBUILD gtk+-2.12.12.ebuild 4964 RMD160 96178ab4ded53396ba6c17fa8ed6d8d858046e61 SHA1 c8a3e1340574f3603f1a4ff335be2bbac802c20b SHA256 712d43258904b8254aab79598c1d9d25a92f5b8e671fdc3ce39063b60a352ca9
 EBUILD gtk+-2.14.7-r2.ebuild 4837 RMD160 d4756b6e99afefee642f0939e645c9382983e1db SHA1 d32b99bbcf345438c3f812f755eca0a0e92f46ba SHA256 8dc785991f9cd614edf3b6f0e3c4adfcd2691dcc4ef963727ffaefb4eafaf0aa
 EBUILD gtk+-2.16.1.ebuild 4368 RMD160 98221ddcd50c082c807419e8f07aff7b06cb89ff SHA1 aa2f07d4cc6240290e72bdca2730d9d496e09449 SHA256 7377271b9d7801c3af3bf2f45b747f3fc2818045cf706369d481c7eccd3dcb60
-MISC ChangeLog 61897 RMD160 8189428fc51d341791cc80d98665f9d54db42ec4 SHA1 0f60117fd20f65acb2465b94c9e352ddeb62d9bd SHA256 2d6c4f6b01cde662ff8ee59fbd1a4bf771ee2454b833de3a46ac26a5d63b13ac
+EBUILD gtk+-2.16.5.ebuild 4580 RMD160 486a2df455d912bc93a51d8de3bf386d991c65c6 SHA1 f0653777934d221bcd14e19112cc9cdfc44dd040 SHA256 edf0c9d38fe8b2ea0382473e0b4c07cb95620b50467c9cb6ba7ae229479a4d6b
+MISC ChangeLog 62072 RMD160 147aba6e73b55710578fb37ba5138810627a1dcc SHA1 0078a8c1ec999b4b2a3722d986aefd4d6e544efd SHA256 e127dd7545be5de528ab3de1225cdd80687bca85e9df25d58bc0ae1be3828ad2
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkn/bA0ACgkQ1fmVwcYIWAaSPgCePDU06OuFR2QY4pA69pc1PA2O
-IzwAnRFJQW5oHQhlf3N0pW+KGQi0qyIc
-=cY6w
+iEYEARECAAYFAkpjq2QACgkQ1fmVwcYIWAYztQCfQWazKNIFyK13mS3wACq4bZvf
+o/sAoIxGbPORtYESli3y8EeixcUuXnIF
+=nSCe
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-2.16.5.ebuild b/x11-libs/gtk+/gtk+-2.16.5.ebuild
new file mode 100644
index 000000000000..775e7e0dd49b
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.16.5.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.16.5.ebuild,v 1.1 2009/07/19 23:25:17 eva Exp $
+
+EAPI="2"
+
+inherit gnome.org flag-o-matic eutils libtool 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"
+IUSE="cups debug doc jpeg jpeg2k tiff test vim-syntax xinerama"
+
+# FIXME: configure says >=xrandr-1.2.99 but remi tells me it's broken
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXt
+	x11-libs/libXext
+	>=x11-libs/libXrandr-1.2
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	xinerama? ( x11-libs/libXinerama )
+	>=dev-libs/glib-2.19.7
+	>=x11-libs/pango-1.20
+	>=dev-libs/atk-1.13
+	>=x11-libs/cairo-1.6[X]
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.2.1
+	cups? ( net-print/cups )
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	jpeg2k? ( media-libs/jasper )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	!<gnome-base/gail-1000"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	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 )"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+set_gtk2_confdir() {
+	# An arch specific config directory is used on multilib systems
+	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
+}
+
+src_prepare() {
+	# use an arch-specific config directory so that 32bit and 64bit versions
+	# dont clash on multilib systems
+	has_multilib_profile && epatch "${FILESDIR}/${PN}-2.8.0-multilib.patch"
+
+	# Don't break inclusion of gtkclist.h, upstream bug 536767
+	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
+
+	# -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"
+	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
+		-i gtk/tests/recentmanager.c || die "sed 2 failed"
+	elibtoolize
+}
+
+src_configure() {
+	# png always on to display icons (foser)
+	local myconf="$(use_enable doc gtk-doc) \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with tiff libtiff) \
+		$(use_enable xinerama) \
+		$(use_enable cups cups auto) \
+		--disable-papi \
+		--with-libpng \
+		--with-gdktarget=x11 \
+		--with-xinput"
+
+	# 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
+	Xemake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation failed"
+
+	set_gtk2_confdir
+	dodir ${GTK2_CONFDIR}
+	keepdir ${GTK2_CONFDIR}
+
+	# see bug #133241
+	echo 'gtk-fallback-icon-theme = "gnome"' > "${D}/${GTK2_CONFDIR}/gtkrc"
+
+	# Enable xft in environment as suggested by <utx@gentoo.org>
+	dodir /etc/env.d
+	echo "GDK_USE_XFT=1" > "${D}/etc/env.d/50gtk2"
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
+
+	# This has to be removed, because it's multilib specific; generated in
+	# postinst
+	rm "${D}/etc/gtk-2.0/gtk.immodules"
+}
+
+pkg_postinst() {
+	set_gtk2_confdir
+
+	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
+		gtk-query-immodules-2.0  > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
+		gdk-pixbuf-query-loaders > "${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
+	else
+		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
+		ewarn "to complete the installation of GTK+, please create the"
+		ewarn "directory and then manually run:"
+		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
+		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
+		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
+	fi
+
+	if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then
+		elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]*
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)"
+	fi
+
+	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."
+}