version bump for bug fixes

Package-Manager: portage-2.1.2.5

4 files changed, 173 insertions, 15 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index d4dd20399e25..55a7f369a227 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
 # 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.306 2007/03/22 21:35:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.307 2007/05/03 20:46:44 compnerd Exp $
+
+*gtk+-2.10.12 (03 May 2007)
+
+  03 May 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  +gtk+-2.10.12.ebuild:
+  Version bump from upstream with numerous bug fixes
 
   22 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> gtk+-2.10.9.ebuild:
   Stable on alpha/ia64/ppc wrt bug #163678.
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index ae5f17e5dee9..a592059a2848 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,6 +1,3 @@
------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
@@ -48,6 +45,7 @@ SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 files/gt
 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 SHA1 7350d1ed147e52ddc870a4d4b52073f7407d9f0d SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684
 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.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
@@ -64,6 +62,10 @@ EBUILD gtk+-2.10.11.ebuild 4051 RMD160 cfd60c65db156f53afaa7d4c424c4a5a7d0fd50c
 MD5 d5f4d60ef3cb0e9d7f141a920fcf84aa gtk+-2.10.11.ebuild 4051
 RMD160 cfd60c65db156f53afaa7d4c424c4a5a7d0fd50c gtk+-2.10.11.ebuild 4051
 SHA256 8067c1b095eefdc74298b1db46bd4ac529f524984291785af4e17b1a6ef62261 gtk+-2.10.11.ebuild 4051
+EBUILD gtk+-2.10.12.ebuild 4055 RMD160 d14c6ba9ced2c4e36aba0f3b46e772583a6dbf85 SHA1 1e5a30a354733143bb0504edc9da3917cfd5b9d7 SHA256 e09309a64591d00c178565f568a31483f74ecd51068ff4fb8cc29fe6f730b51b
+MD5 1f5aafdc9f0bb8b9da208ecaa4dffb87 gtk+-2.10.12.ebuild 4055
+RMD160 d14c6ba9ced2c4e36aba0f3b46e772583a6dbf85 gtk+-2.10.12.ebuild 4055
+SHA256 e09309a64591d00c178565f568a31483f74ecd51068ff4fb8cc29fe6f730b51b gtk+-2.10.12.ebuild 4055
 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
@@ -88,10 +90,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 43237 RMD160 87c17b5d44492e3012fd1b642494978e44013cb7 SHA1 f0b41312c3db7f769f46c13b9dbac30b0c5d94b0 SHA256 a61fab9cec039dbe455ab50039c724866f5a29ccbf389136ff0eb0e3899c77d4
-MD5 a62334570ea7e5b8523514fe17a34810 ChangeLog 43237
-RMD160 87c17b5d44492e3012fd1b642494978e44013cb7 ChangeLog 43237
-SHA256 a61fab9cec039dbe455ab50039c724866f5a29ccbf389136ff0eb0e3899c77d4 ChangeLog 43237
+MISC ChangeLog 43400 RMD160 b15f82706e8787b8a0a91409ddc82d5632270f2b SHA1 b759e024e4400eae84819407892f8a71771cb7c2 SHA256 92291dac45299c3903ed0cd03227a57a6ff0000880c5a0ea3b2d48cda2d020eb
+MD5 abe78f73f827eb026e692325947f4f97 ChangeLog 43400
+RMD160 b15f82706e8787b8a0a91409ddc82d5632270f2b ChangeLog 43400
+SHA256 92291dac45299c3903ed0cd03227a57a6ff0000880c5a0ea3b2d48cda2d020eb ChangeLog 43400
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 metadata.xml 424
@@ -102,6 +104,9 @@ SHA256 4bd7f7ef31547e6dabca532b07bc6be7e37c96d234abd2818afbb85d725aed47 files/di
 MD5 243331e51ce452c0613ceee64d80f77d files/digest-gtk+-2.10.11 247
 RMD160 649617bd811670f0ce9bbffd5165a400d42e7d1d files/digest-gtk+-2.10.11 247
 SHA256 d0eb86fc1575869bcad882c9bcfcf3e5dddb0ed962e7f455582824179a24e4ec files/digest-gtk+-2.10.11 247
+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 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
@@ -120,10 +125,3 @@ 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.3 (GNU/Linux)
-
-iD8DBQFGAvahkT4lNIS36YERAkrbAJ4tmAF1WFzz6uhMk32j+LMSn3KlogCdHdiH
-e6WkWsSl892Xe+GLRPPYT9A=
-=Y73q
------END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.10.12 b/x11-libs/gtk+/files/digest-gtk+-2.10.12
new file mode 100644
index 000000000000..11337c221dbf
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.10.12
@@ -0,0 +1,3 @@
+MD5 cf969c62134c662ff07e64613ed6c11f gtk+-2.10.12.tar.bz2 15137074
+RMD160 d48eab088a2871d4866f25b7413b78925bb280d7 gtk+-2.10.12.tar.bz2 15137074
+SHA256 58599eae374d15f2474ea2ed67b5c116f9358c05a2c6b01acb3e5910a79fce4f gtk+-2.10.12.tar.bz2 15137074
diff --git a/x11-libs/gtk+/gtk+-2.10.12.ebuild b/x11-libs/gtk+/gtk+-2.10.12.ebuild
new file mode 100644
index 000000000000..dd7d82566309
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.10.12.ebuild
@@ -0,0 +1,151 @@
+# 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.12.ebuild,v 1.1 2007/05/03 20:46:44 compnerd 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"
+
+	# 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
+}