Version bump for bug fixes. Should also fix our bug #180669

Package-Manager: portage-2.1.2.9

4 files changed, 185 insertions, 5 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index cd67b69b308c..d87eca5dc374 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.317 2007/06/02 02:39:38 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.318 2007/06/14 02:42:37 leio Exp $
+
+*gtk+-2.10.13 (14 Jun 2007)
+
+  14 Jun 2007; Mart Raudsepp <leio@gentoo.org> +gtk+-2.10.13.ebuild:
+  Version bump for bug fixes. Should also fix our bug #180669
 
   02 Jun 2007; Brent Baude <ranger@gentoo.org> gtk+-2.10.11.ebuild:
   Marking gtk+-2.10.11 ppc stable for bug #171107
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 0e02e1c365b7..af6df848d5fa 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a files/gtk+-1.2-locale_fix.patch 419
@@ -50,6 +53,7 @@ DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 RMD160 fa41bb12e41f0c60c605dbeac03a1aa
 DIST gtk+-1.2.10.tar.gz 2868322 RMD160 9b38310d2768e947c4f6173db009243dd11db288 SHA1 a5adcb909257da01ae4d4761e1d41081d06e4d7c SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34
 DIST gtk+-2.10.11.tar.bz2 15031543 RMD160 2c1297ace8c6893fdf6e682e7f7faabdb1866b3a SHA1 3c68f3fa13ab72f6b190cbe958813d29955042e2 SHA256 9b1d724e39e1650ffc0719596bf1aaf140e27b924e96380020050c0cd7ae25f1
 DIST gtk+-2.10.12.tar.bz2 15137074 RMD160 d48eab088a2871d4866f25b7413b78925bb280d7 SHA1 2912aeac11628c60b653e6a4bc5919106c02e045 SHA256 58599eae374d15f2474ea2ed67b5c116f9358c05a2c6b01acb3e5910a79fce4f
+DIST gtk+-2.10.13.tar.bz2 15163566 RMD160 bd812db8b11fbca5283e04958660fd3beec23caa SHA1 8d00b928a8788ff86d97197c20c18d41f9a1b1cd SHA256 6443ecc087a7cf771406264044e3f942ca49cc5fcb84f66d700fd291d55d0b4e
 DIST gtk+-2.10.6.tar.bz2 14561124 RMD160 929386610a634e82b7ddb10f43930b27194fa67b SHA1 aad6e1ef964d8acb8a04942b8dd2e00a9db56450 SHA256 ca98edcea2034ab36c1024121a44d047de192d282127c8f8b77d14afba0ca468
 DIST gtk+-2.10.7.tar.bz2 14955229 RMD160 130af39787b146166846f44b104ea0c3683d0578 SHA1 784a7ecc75767306efe1f200a1251968f944143e SHA256 3daead5f578ec2a3752997e6048eb3ecdce208cee560f7289dd9d069ca623276
 DIST gtk+-2.10.9.tar.bz2 14933330 RMD160 f415eb350edbf53965a1ec32f99c386cfd3d7df5 SHA1 aa3260d9093398445cfbecf355f4728db3e827bf SHA256 3aab107fb97a280b77fa30d07540e325d1511907bbce1e7efa5b4db2dffa28a3
@@ -70,6 +74,10 @@ EBUILD gtk+-2.10.12.ebuild 4179 RMD160 7c93005fbfc75abbbd44a156bb4f557df5a54c52
 MD5 e6bcd4391ede842bdb2a05164c041cad gtk+-2.10.12.ebuild 4179
 RMD160 7c93005fbfc75abbbd44a156bb4f557df5a54c52 gtk+-2.10.12.ebuild 4179
 SHA256 6fe568c9e72028ea3ef49501e6ded77669b2199dbf837164bf558a8e878e9009 gtk+-2.10.12.ebuild 4179
+EBUILD gtk+-2.10.13.ebuild 4179 RMD160 05e4d347af93b9c8efba8c8e302fc00e6a873982 SHA1 f8f6447393d4549bd8e476cc89a054ac6980a7e3 SHA256 9447bf6aab5f7ea3a584c40cb623dc9c1c556781507286acd08e3b2e52c10ec0
+MD5 8adbf6a06cc641b60df5274ec5ae301c gtk+-2.10.13.ebuild 4179
+RMD160 05e4d347af93b9c8efba8c8e302fc00e6a873982 gtk+-2.10.13.ebuild 4179
+SHA256 9447bf6aab5f7ea3a584c40cb623dc9c1c556781507286acd08e3b2e52c10ec0 gtk+-2.10.13.ebuild 4179
 EBUILD gtk+-2.10.6.ebuild 3893 RMD160 354ee4716b84f28df1320538e8c94a8c6dd3c7d7 SHA1 098f51da4dbea131ca8ea881f2636476f9f64971 SHA256 e4ca6e74b371da926c6588fef80cb7490f0e624016f07c80c4819078cea51b29
 MD5 290fbdb32a07b1b65df99e5bb523e1c8 gtk+-2.10.6.ebuild 3893
 RMD160 354ee4716b84f28df1320538e8c94a8c6dd3c7d7 gtk+-2.10.6.ebuild 3893
@@ -94,10 +102,10 @@ EBUILD gtk+-2.8.20-r1.ebuild 4092 RMD160 63a741c0bbf75fe549277f5cad36d2b21d7afe7
 MD5 cd6eb30366994c8450fa9359d2d4fcd5 gtk+-2.8.20-r1.ebuild 4092
 RMD160 63a741c0bbf75fe549277f5cad36d2b21d7afe71 gtk+-2.8.20-r1.ebuild 4092
 SHA256 10933d9f04fc0124a446e88fd29892fdb9c2c737b0604d74eae3df8bc4d8b4e1 gtk+-2.8.20-r1.ebuild 4092
-MISC ChangeLog 44575 RMD160 70d8589677240620eafb52bafbe4962919811461 SHA1 0158d644edb184597d821672dbaf972e228d2f31 SHA256 37dc7a51ea148ff315519902d66eb18e37a22c765cc2ba3eee697b084f928e52
-MD5 50ae76aa43a00ee47bac565f212417f6 ChangeLog 44575
-RMD160 70d8589677240620eafb52bafbe4962919811461 ChangeLog 44575
-SHA256 37dc7a51ea148ff315519902d66eb18e37a22c765cc2ba3eee697b084f928e52 ChangeLog 44575
+MISC ChangeLog 44734 RMD160 b3319d7156c6bc7b920da6ac58771ec42dc6a141 SHA1 c5342b0d5bf57c4e3eee570c0cf59dae6b2dc200 SHA256 ee0a8e7eb67cabd3d46a10598b74042fa700ff996fb1385737dc3b2bacca5e3e
+MD5 2f9f2df4819425be082500626456445f ChangeLog 44734
+RMD160 b3319d7156c6bc7b920da6ac58771ec42dc6a141 ChangeLog 44734
+SHA256 ee0a8e7eb67cabd3d46a10598b74042fa700ff996fb1385737dc3b2bacca5e3e ChangeLog 44734
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 metadata.xml 424
@@ -111,6 +119,9 @@ SHA256 d0eb86fc1575869bcad882c9bcfcf3e5dddb0ed962e7f455582824179a24e4ec files/di
 MD5 8cf987179b8e73e7e6e530c763d331bf files/digest-gtk+-2.10.12 247
 RMD160 ffa16a158229064a6a516741c879f263ecce2aa0 files/digest-gtk+-2.10.12 247
 SHA256 5b49ec7b0c3a64f7b7dfd594ab9c92fdcb0d7d50e495c07f6fe9670ae3842a47 files/digest-gtk+-2.10.12 247
+MD5 8ece972bd8f3c887e435824b69db36ab files/digest-gtk+-2.10.13 247
+RMD160 3fc8f24201e41870ae42b490fad96a20cb72cd97 files/digest-gtk+-2.10.13 247
+SHA256 9f0cafcfeb47855f4c2ee132d581b32e1246607906f82840a89dceb1f766becc files/digest-gtk+-2.10.13 247
 MD5 c8326ddbc6cc256207f438f1907fc185 files/digest-gtk+-2.10.6 244
 RMD160 52d7da5456f30a8fef7f96c0eca54f3c6c63a260 files/digest-gtk+-2.10.6 244
 SHA256 55bbe220e1f771910fc8c1bbaae3a8a5d984af059306f8904ed77a0e76e1947b files/digest-gtk+-2.10.6 244
@@ -129,3 +140,10 @@ SHA256 0be521aa113e9334cffe0bb4078bd8a363029c2a8ddae0b8005bbf2e3eb69f09 files/di
 MD5 5987bda64cc0a2c5d968d200029e4f26 files/digest-gtk+-2.8.20-r1 244
 RMD160 ef26312aa81fad817ff4350262c7675927298af6 files/digest-gtk+-2.8.20-r1 244
 SHA256 87a06d8202ce31cb65090a54522b8c4cd3021dd5d5d42ff53ff22f754f9b2b97 files/digest-gtk+-2.8.20-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGcKsdkeYb6olFHJcRAqxhAKCyCMmIAIdaKor+DegwrNRkPkX3swCg96EO
+g7uzeU++aMDAytO4FPDhqvI=
+=Bw+O
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.10.13 b/x11-libs/gtk+/files/digest-gtk+-2.10.13
new file mode 100644
index 000000000000..96dba50326a8
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.10.13
@@ -0,0 +1,3 @@
+MD5 d0af87715f3b0f05bf38a3312a528012 gtk+-2.10.13.tar.bz2 15163566
+RMD160 bd812db8b11fbca5283e04958660fd3beec23caa gtk+-2.10.13.tar.bz2 15163566
+SHA256 6443ecc087a7cf771406264044e3f942ca49cc5fcb84f66d700fd291d55d0b4e gtk+-2.10.13.tar.bz2 15163566
diff --git a/x11-libs/gtk+/gtk+-2.10.13.ebuild b/x11-libs/gtk+/gtk+-2.10.13.ebuild
new file mode 100644
index 000000000000..a65e053995bf
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.10.13.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.13.ebuild,v 1.1 2007/06/14 02:42:37 leio Exp $
+
+inherit gnome.org flag-o-matic eutils autotools 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="debug doc jpeg tiff xinerama"
+
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXfixes
+	xinerama? ( x11-libs/libXinerama )
+	>=dev-libs/glib-2.12.1
+	>=x11-libs/pango-1.12.0
+	>=dev-libs/atk-1.10.1
+	>=x11-libs/cairo-1.2.0
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.2.1
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	tiff? ( >=media-libs/tiff-3.5.7 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	>=dev-util/pkgconfig-0.9
+	=sys-devel/automake-1.7*
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/inputproto
+	xinerama? ( x11-proto/xineramaproto )
+	doc? (
+			>=dev-util/gtk-doc-1.4
+			~app-text/docbook-xml-dtd-4.1.2
+		 )"
+
+RESTRICT="confcache"
+
+pkg_setup() {
+	if ! built_with_use x11-libs/cairo X; then
+		einfo "Please re-emerge x11-libs/cairo with the X USE flag set"
+		die "cairo needs the X flag set"
+	fi
+}
+
+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_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Optionalize xinerama support
+	epatch "${FILESDIR}/${PN}-2.8.10-xinerama.patch"
+
+	# Make gtk-update-icon-cache check subdirs in it's update check
+	epatch "${FILESDIR}"/${PN}-2.10.11-update-icon-subdirs.patch
+
+	# 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"
+
+	# Revert DND change that makes mozilla products DND broken
+	EPATCH_OPTS="-R" epatch "${FILESDIR}/${PN}-2.10.7-mozilla-dnd-fix.patch"
+
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	use ppc64 && append-flags -mminimal-toc
+
+	# remember, eautoreconf applies elibtoolize.
+	# if you remove this, you should manually run elibtoolize
+	export WANT_AUTOMAKE=1.7
+	cp aclocal.m4 old_macros.m4
+	AT_M4DIR="."
+	eautoreconf
+
+	epunt_cxx
+}
+
+src_compile() {
+	# png always on to display icons (foser)
+	local myconf="$(use_enable doc gtk-doc) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		$(use_enable xinerama) \
+		--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} || die "configure failed"
+
+	emake || die "compile failed"
+}
+
+src_test() {
+	Xmake check || die
+}
+
+src_install() {
+	make 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*
+}
+
+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
+}