New gtk versions

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

5 files changed, 337 insertions, 0 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 4df247c..dc7b7fa 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -41,6 +41,8 @@ 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.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
@@ -55,6 +57,14 @@ EBUILD gtk+-2.10.11.ebuild 4465 RMD160 ca094080d083baa12901ab95eb07d9c66de9475b
 MD5 46544d312c97b9fa72a8996eede21647 gtk+-2.10.11.ebuild 4465
 RMD160 ca094080d083baa12901ab95eb07d9c66de9475b gtk+-2.10.11.ebuild 4465
 SHA256 c60acce7ca82fcfaafcbd4d9af88c29dbfbea8b5152436e33c61668587f279e3 gtk+-2.10.11.ebuild 4465
+EBUILD gtk+-2.10.12.ebuild 4154 RMD160 c6c82bb03c56ba3130d4027a9e335a32ba9ed55c SHA1 3977b6df7963dec57b14ac9c008a4ba0b1206f1f SHA256 822a3f5dc58f20037b5ecad5f8fc5e039e306e4004a29739e1172a1810fa556d
+MD5 a1d0bdb01cb423ad11816d4e27571876 gtk+-2.10.12.ebuild 4154
+RMD160 c6c82bb03c56ba3130d4027a9e335a32ba9ed55c gtk+-2.10.12.ebuild 4154
+SHA256 822a3f5dc58f20037b5ecad5f8fc5e039e306e4004a29739e1172a1810fa556d gtk+-2.10.12.ebuild 4154
+EBUILD gtk+-2.10.13.ebuild 4278 RMD160 61030d48c630c3ee90108980a3ea47f80ff34c93 SHA1 dfc6f5c014fc40f68daee2b25414621f9b5ba26e SHA256 daccfe095933093da37bba37c54348a117708844497dd5894fc78b3a45625ad7
+MD5 a715b6839b727fd8b948f5f4de381ddf gtk+-2.10.13.ebuild 4278
+RMD160 61030d48c630c3ee90108980a3ea47f80ff34c93 gtk+-2.10.13.ebuild 4278
+SHA256 daccfe095933093da37bba37c54348a117708844497dd5894fc78b3a45625ad7 gtk+-2.10.13.ebuild 4278
 EBUILD gtk+-2.10.6.ebuild 4312 RMD160 bff1e56662419171795cab9a1d1e180806b74802 SHA1 53609f463ede97722955b3cd0c2f70e2cae1cb61 SHA256 ea96ea8aa8cf0c4571f9cb615536638c85a9c84fdce393fa20358b85e2b4b4fe
 MD5 82eb5870ab6220537029a90840f79476 gtk+-2.10.6.ebuild 4312
 RMD160 bff1e56662419171795cab9a1d1e180806b74802 gtk+-2.10.6.ebuild 4312
@@ -83,12 +93,22 @@ MISC NOTES 82 RMD160 58293858cde627b688c697e076d2d45f005007b2 SHA1 2f0647b873ce5
 MD5 61f1935636c8a7927b7a2deecd6ed127 NOTES 82
 RMD160 58293858cde627b688c697e076d2d45f005007b2 NOTES 82
 SHA256 6878454f7bf28d1c462b4e213724c88d89eac6694d3323e0f372d227cdbb5f34 NOTES 82
+MISC gtk+-2.10.13.ebuild.orig 4154 RMD160 c6c82bb03c56ba3130d4027a9e335a32ba9ed55c SHA1 3977b6df7963dec57b14ac9c008a4ba0b1206f1f SHA256 822a3f5dc58f20037b5ecad5f8fc5e039e306e4004a29739e1172a1810fa556d
+MD5 a1d0bdb01cb423ad11816d4e27571876 gtk+-2.10.13.ebuild.orig 4154
+RMD160 c6c82bb03c56ba3130d4027a9e335a32ba9ed55c gtk+-2.10.13.ebuild.orig 4154
+SHA256 822a3f5dc58f20037b5ecad5f8fc5e039e306e4004a29739e1172a1810fa556d gtk+-2.10.13.ebuild.orig 4154
 MD5 9a443de5999df036ffd6e66f5b0f83ce files/digest-gtk+-1.2.10-r11 506
 RMD160 45ddc3e7c5ca97084139787b6be318498a9965db files/digest-gtk+-1.2.10-r11 506
 SHA256 4bd7f7ef31547e6dabca532b07bc6be7e37c96d234abd2818afbb85d725aed47 files/digest-gtk+-1.2.10-r11 506
 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 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
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 0000000..11337c2
--- /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+/files/digest-gtk+-2.10.13 b/x11-libs/gtk+/files/digest-gtk+-2.10.13
new file mode 100644
index 0000000..96dba50
--- /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.12.ebuild b/x11-libs/gtk+/gtk+-2.10.12.ebuild
new file mode 100644
index 0000000..ab641b0
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.10.12.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.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}"
+
+	# 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"
+
+	# 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
+}
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 0000000..c69c52e
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.10.13.ebuild
@@ -0,0 +1,157 @@
+# 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}"
+
+	# 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"
+
+	# 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
+}