New upstream version

svn path=/trunk/overlay/; revision=26

3 files changed, 172 insertions, 0 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index e45e348..af9c098 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -42,6 +42,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.8.17.tar.bz2 12261085 RMD160 ff4d34eef948cd98c81d852a111d716b9cead94f SHA1 a6c62ec016bc076a9938ba962f0dd4bcc1e74e16 SHA256 d9dea2c9777ab22dfaefed169b2d9b8a8fd914aec8937e723ae029df1aaf19be
 DIST gtk+-2.8.18.tar.bz2 12258449 RMD160 f9b41fc90e16158ccc87872f07dc4eb269903e84 SHA1 e4f0231b943418d8bb17b3bf9d79aa902ab3eb13 SHA256 c685da334c88c0dac5a5c8d23e08fed23a74b6bc981c345e351a1574ccf52f5b
 DIST gtk+-2.8.20.tar.bz2 12247295 RMD160 d20254de9e5b37b19f432758fbd78fff4c6baf1e SHA1 8ea2449ff139b8bc457f8b5bcdcad93b02cfba9e SHA256 69a9b6c1e78da7e71416f20fab0c4972503139406e89ce7fbdbac0e213b16b79
@@ -57,6 +58,10 @@ EBUILD gtk+-2.10.7-r1.ebuild 4573 RMD160 cbfc7073b15308685753526e3529688c3bcf0f8
 MD5 1a0f7bfdbd9b1764eb4e5ea7304a3b19 gtk+-2.10.7-r1.ebuild 4573
 RMD160 cbfc7073b15308685753526e3529688c3bcf0f87 gtk+-2.10.7-r1.ebuild 4573
 SHA256 13b780898291f5fa03078c1e9fd179032975691ee5cd01c2c4e8d21c581f3a36 gtk+-2.10.7-r1.ebuild 4573
+EBUILD gtk+-2.10.9.ebuild 4465 RMD160 ca094080d083baa12901ab95eb07d9c66de9475b SHA1 42217b0863968c0e6a6c42d5dc812d3a8627a593 SHA256 c60acce7ca82fcfaafcbd4d9af88c29dbfbea8b5152436e33c61668587f279e3
+MD5 46544d312c97b9fa72a8996eede21647 gtk+-2.10.9.ebuild 4465
+RMD160 ca094080d083baa12901ab95eb07d9c66de9475b gtk+-2.10.9.ebuild 4465
+SHA256 c60acce7ca82fcfaafcbd4d9af88c29dbfbea8b5152436e33c61668587f279e3 gtk+-2.10.9.ebuild 4465
 EBUILD gtk+-2.8.17.ebuild 4116 RMD160 43d730085c1ff6a47b2141e78960bf4bd177cb7a SHA1 ef6842fba1851bab8bf9e0f9b0c2ee3944f79f97 SHA256 19406591be0907714d2cc8e584ea223b3c122a8deb348262633d69214ec217ae
 MD5 d837775fe059b430a256182912b5b365 gtk+-2.8.17.ebuild 4116
 RMD160 43d730085c1ff6a47b2141e78960bf4bd177cb7a gtk+-2.8.17.ebuild 4116
@@ -82,6 +87,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 bfa8801927a407aeb3fb14dc55888662 files/digest-gtk+-2.8.17 244
 RMD160 4136760f91ba6c09d5c35f9fecfcb5f9dc41ae55 files/digest-gtk+-2.8.17 244
 SHA256 b53b24818165462a5a77713bfcbb65e0d0da4474c15c19f346e595f1852e84b1 files/digest-gtk+-2.8.17 244
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 0000000..788de2d
--- /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 0000000..cdec180
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.10.9.ebuild
@@ -0,0 +1,161 @@
+# 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}"
+
+	# By default expand the silly file chooser.
+	epatch "${FILESDIR}"/${PN}-2.8.11-filechooser.patch
+
+	# 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
+}