Version bump

Package-Manager: portage-2.1.2-r4

4 files changed, 182 insertions, 8 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index c211e5895f13..f8e31a6a3066 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.297 2007/01/16 20:51:15 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.298 2007/01/25 17:44:43 leio Exp $
+
+*gtk+-2.10.9 (25 Jan 2007)
+
+  25 Jan 2007; Mart Raudsepp <leio@gentoo.org> +gtk+-2.10.9.ebuild:
+  Version bump
 
 *gtk+-2.10.7-r1 (16 Jan 2007)
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 628b6dd6dfcf..22a3ee32dbd1 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -49,6 +49,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.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
 DIST gtk+-2.6-smoothscroll-r5.patch.bz2 3758 RMD160 b1db44f5055cef48239f69620e0bc13b1dccc139 SHA1 4ee4af7ebb1e013b14afeac94e8bd14b12badd58 SHA256 1322ed086c0b7353c5a28f23fe422ab23fd553ca8f3047b47fe5ae9a69c6c5eb
 DIST gtk+-2.6.1-lib64.patch.bz2 6047 RMD160 0ce3bf05fe59910ea019b4157dd1066367df2af6 SHA1 4a83215ef6a420db5f8080288567437941f72daf SHA256 fe171fc78e10f49ff69c2db424b816a331e21f362aef55b8624031c53ebcfc72
 DIST gtk+-2.6.10.tar.bz2 11521380 RMD160 5bb2e4de406e0e6ccf5c66ec48f6ba3e5b0911ff SHA1 9ba627683e0dc4bceb5fb900c1ee687638d95fcd SHA256 d408b606c8dd414dfbf220ccc168a0bc85a419945439796792a5357a96ff02af
@@ -66,6 +67,10 @@ EBUILD gtk+-2.10.7-r1.ebuild 4474 RMD160 17660ab3339b9ec888bd723fb619e270fc02e9f
 MD5 79d0efb82e95365d2b1e966df6049bc7 gtk+-2.10.7-r1.ebuild 4474
 RMD160 17660ab3339b9ec888bd723fb619e270fc02e9f5 gtk+-2.10.7-r1.ebuild 4474
 SHA256 abb4e8250d8e9ea8159296f19a79f5519498d50a707cef7c2da99ac0a0578aa6 gtk+-2.10.7-r1.ebuild 4474
+EBUILD gtk+-2.10.9.ebuild 4366 RMD160 fdf5d2fb3cae5670f6d979f96585b77a36f1fbd9 SHA1 348412c7c32b69773646bfbbf97efecc92321d76 SHA256 441a0a75ef15c43ac626f5d47c4919cd0de8000e89026428c4e5d333c048602d
+MD5 b2aace4da99e92c2f9aa8c64264f5864 gtk+-2.10.9.ebuild 4366
+RMD160 fdf5d2fb3cae5670f6d979f96585b77a36f1fbd9 gtk+-2.10.9.ebuild 4366
+SHA256 441a0a75ef15c43ac626f5d47c4919cd0de8000e89026428c4e5d333c048602d gtk+-2.10.9.ebuild 4366
 EBUILD gtk+-2.6.10-r1.ebuild 3455 RMD160 63997fee767bbb4ddc7d978374c7d9fbe73bf6ba SHA1 4c472888cd0f1dc1b43c3e4c3167e2941ae1c39e SHA256 d58bd7ffe27a02b4c4cf71dd16dcc6c7116723b36df0d15519846b19549ade2e
 MD5 16ca62398139ea671319657720b6fc8b gtk+-2.6.10-r1.ebuild 3455
 RMD160 63997fee767bbb4ddc7d978374c7d9fbe73bf6ba gtk+-2.6.10-r1.ebuild 3455
@@ -78,10 +83,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 42180 RMD160 e65d60d0760b169ced700c231ed80bf032c92272 SHA1 a7acf930e479633cf7c793b3f0f5ee259b8ffe04 SHA256 18d25bf0869137aa29117de5907d8b4bacb44b099c743063b2f0f441a5ef2105
-MD5 207e47ff566702a322e2900bea4ee88e ChangeLog 42180
-RMD160 e65d60d0760b169ced700c231ed80bf032c92272 ChangeLog 42180
-SHA256 18d25bf0869137aa29117de5907d8b4bacb44b099c743063b2f0f441a5ef2105 ChangeLog 42180
+MISC ChangeLog 42292 RMD160 cf41eade8550f320ec044c0367c3c3d41b868782 SHA1 8873292ad5564d36144537be8ccf08661be0af5f SHA256 4e1f4e71616e65f094613dfc970b2115748405e03063b8d1390a503b6cb04ed5
+MD5 6a0850000a641876a02c1398462c9fac ChangeLog 42292
+RMD160 cf41eade8550f320ec044c0367c3c3d41b868782 ChangeLog 42292
+SHA256 4e1f4e71616e65f094613dfc970b2115748405e03063b8d1390a503b6cb04ed5 ChangeLog 42292
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 metadata.xml 424
@@ -95,6 +100,9 @@ SHA256 55bbe220e1f771910fc8c1bbaae3a8a5d984af059306f8904ed77a0e76e1947b files/di
 MD5 b481b67d1bae232fb2772db23a21395a files/digest-gtk+-2.10.7-r1 244
 RMD160 2d68d26bab77ff8d03c6764c0108315db2f0b8b1 files/digest-gtk+-2.10.7-r1 244
 SHA256 9e73127b8282101f4e1005e145b8eaaddcd52924f7148e3eb47ffeb894fcfc7d files/digest-gtk+-2.10.7-r1 244
+MD5 b4aa079fb9ea08921c5600a375e87078 files/digest-gtk+-2.10.9 244
+RMD160 eea9d0cbd967fd7699893edd6a362e680a8f1e66 files/digest-gtk+-2.10.9 244
+SHA256 3ff146f542f92059fbaf23e9ebb270e83ceb0327499f40350c7210238beb95da files/digest-gtk+-2.10.9 244
 MD5 4db8c558f465f191df15e6d4b6198e6b files/digest-gtk+-2.6.10-r1 774
 RMD160 b07163c72c7096fb0f6fae53857bfce45994af49 files/digest-gtk+-2.6.10-r1 774
 SHA256 219aadd2affc04b82e80378f93bc4acbb03123573cc4e16c2f3366c20e4854cf files/digest-gtk+-2.6.10-r1 774
@@ -107,7 +115,7 @@ SHA256 87a06d8202ce31cb65090a54522b8c4cd3021dd5d5d42ff53ff22f754f9b2b97 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFrTrNkeYb6olFHJcRAilWAKDn5RO/Nt90h+GT8ajOEhaqSfKQ7wCgkrv4
-gmo6/I9wu9TR4PDwdaQ8L9E=
-=ogUZ
+iD8DBQFFuOyVkeYb6olFHJcRAqN6AKCT4O/15c/oAyhwswShYu7XsVpR4gCeP15R
+UFu53wJXtDh3I0OsiW4oQTs=
+=xNPL
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.10.9 b/x11-libs/gtk+/files/digest-gtk+-2.10.9
new file mode 100644
index 000000000000..788de2dc004b
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.10.9
@@ -0,0 +1,3 @@
+MD5 20d763198efb38263b22dee347f69da6 gtk+-2.10.9.tar.bz2 14933330
+RMD160 f415eb350edbf53965a1ec32f99c386cfd3d7df5 gtk+-2.10.9.tar.bz2 14933330
+SHA256 3aab107fb97a280b77fa30d07540e325d1511907bbce1e7efa5b4db2dffa28a3 gtk+-2.10.9.tar.bz2 14933330
diff --git a/x11-libs/gtk+/gtk+-2.10.9.ebuild b/x11-libs/gtk+/gtk+-2.10.9.ebuild
new file mode 100644
index 000000000000..b81a00727f63
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.10.9.ebuild
@@ -0,0 +1,158 @@
+# 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.9.ebuild,v 1.1 2007/01/25 17:44:43 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}"
+	use x86 && [ "$(get_libdir)" == "lib32" ] && 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
+
+	# and this line is just here to make building emul-linux-x86-gtklibs a bit
+	# easier, so even this should be amd64 specific.
+	if use x86 && [ "$(get_libdir)" == "lib32" ]; then
+		epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
+	fi
+
+	# 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
+}