2.12.0 release

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

5 files changed, 226 insertions, 0 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index c6b6ef5..927db65 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -22,6 +22,14 @@ AUX gtk+-2.10.7-textview-fix.patch 937 RMD160 32e9a321151742e29dc15f891c91218bfd
 MD5 4af2fc5215284f8bf11c5fe9f71c3c9c files/gtk+-2.10.7-textview-fix.patch 937
 RMD160 32e9a321151742e29dc15f891c91218bfd94fe49 files/gtk+-2.10.7-textview-fix.patch 937
 SHA256 9f251fe7d50a7e9280d331bece4956ceb12044ac64a01cc6effcb28ec672baae files/gtk+-2.10.7-textview-fix.patch 937
+AUX gtk+-2.12.0-icon-cache-speedup.patch 969 RMD160 822ebb9e3b59eab5cda16ca3ff9cfffa04df3671 SHA1 2b199886215bb4bb0372e11665dab72d494e3077 SHA256 cb117bf1bbfc1e9509c614ba3c2d4a193f7b486fad9d7922208134749793e5ec
+MD5 1edb4111800bb328c4b04a98d20a2adc files/gtk+-2.12.0-icon-cache-speedup.patch 969
+RMD160 822ebb9e3b59eab5cda16ca3ff9cfffa04df3671 files/gtk+-2.12.0-icon-cache-speedup.patch 969
+SHA256 cb117bf1bbfc1e9509c614ba3c2d4a193f7b486fad9d7922208134749793e5ec files/gtk+-2.12.0-icon-cache-speedup.patch 969
+AUX gtk+-2.12.0-libtracker_so.patch 585 RMD160 c8d857b5bb7398f34f9f84fd59ed3b1247964375 SHA1 a1da145b30e2346fa3536a16c132be53450c8699 SHA256 5c922a06bbacc20df5e8ea9c22656236a0d780e55cb955a261fb604628b4b56f
+MD5 e61c470b1296b6f7e3deb79673d0ab2f files/gtk+-2.12.0-libtracker_so.patch 585
+RMD160 c8d857b5bb7398f34f9f84fd59ed3b1247964375 files/gtk+-2.12.0-libtracker_so.patch 585
+SHA256 5c922a06bbacc20df5e8ea9c22656236a0d780e55cb955a261fb604628b4b56f files/gtk+-2.12.0-libtracker_so.patch 585
 AUX gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383 RMD160 f2557ee984df766bce0b5e5ea8c41962a2ccff13 SHA1 5be2ba7cdac1bf48fdca5dc49d2adf96480452f0 SHA256 f4b916c7d26ba60b5d5af63ff694a5203f0dcd31b7310fb375c324fc1df72e05
 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
 RMD160 f2557ee984df766bce0b5e5ea8c41962a2ccff13 files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
@@ -51,6 +59,7 @@ DIST gtk+-2.10.14.tar.bz2 15172170 RMD160 234d7240732b28a31a260aa9e04c34fc502acb
 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.12.0.tar.bz2 15732170 RMD160 226c8f38eb7895d63f81feb60152db1ca3599628 SHA1 f5ecbf73a789a8880a6b2e15279267bb113980e2 SHA256 faa1dc73f8077f72849ade14963202d8af22b51469c1e8e88e20c69d330fd2fd
 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
@@ -86,6 +95,10 @@ EBUILD gtk+-2.10.9.ebuild 4465 RMD160 ca094080d083baa12901ab95eb07d9c66de9475b S
 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.12.0.ebuild 4318 RMD160 588e665cbe20b4894dce301ef5addce5ce0a4547 SHA1 bf96b4c8b55cf37b0966277dc9ce64b7eff48956 SHA256 a88c6e3983d589d429f283da8a6802845e9133e3021246552dde8c6f1075065b
+MD5 761e581e26ca0cf169689d11d4ecd063 gtk+-2.12.0.ebuild 4318
+RMD160 588e665cbe20b4894dce301ef5addce5ce0a4547 gtk+-2.12.0.ebuild 4318
+SHA256 a88c6e3983d589d429f283da8a6802845e9133e3021246552dde8c6f1075065b gtk+-2.12.0.ebuild 4318
 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
@@ -126,6 +139,9 @@ SHA256 9e73127b8282101f4e1005e145b8eaaddcd52924f7148e3eb47ffeb894fcfc7d files/di
 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 0e2763959f967fce165ece267e5489b0 files/digest-gtk+-2.12.0 244
+RMD160 c26bd49dc4cb613ebe788023c40485b625b891fb files/digest-gtk+-2.12.0 244
+SHA256 06f40719ec74a015134e6e3269a1a8b5b10966ba8d72b961f8d4425d8beff06b files/digest-gtk+-2.12.0 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.12.0 b/x11-libs/gtk+/files/digest-gtk+-2.12.0
new file mode 100644
index 0000000..f17cb4d
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.12.0
@@ -0,0 +1,3 @@
+MD5 e9c280afec29b11772af5a7c807abf41 gtk+-2.12.0.tar.bz2 15732170
+RMD160 226c8f38eb7895d63f81feb60152db1ca3599628 gtk+-2.12.0.tar.bz2 15732170
+SHA256 faa1dc73f8077f72849ade14963202d8af22b51469c1e8e88e20c69d330fd2fd gtk+-2.12.0.tar.bz2 15732170
diff --git a/x11-libs/gtk+/files/gtk+-2.12.0-icon-cache-speedup.patch b/x11-libs/gtk+/files/gtk+-2.12.0-icon-cache-speedup.patch
new file mode 100644
index 0000000..99311df
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.12.0-icon-cache-speedup.patch
@@ -0,0 +1,28 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtk+-2.12.0.orig/gtk/gtkiconcache.c gtk+-2.12.0/gtk/gtkiconcache.c
+--- gtk+-2.12.0.orig/gtk/gtkiconcache.c	2007-09-13 16:35:41.000000000 -0400
++++ gtk+-2.12.0/gtk/gtkiconcache.c	2007-09-14 15:33:01.000000000 -0400
+@@ -127,14 +127,19 @@ _gtk_icon_cache_new_for_path (const gcha
+   info.n_directories = 0;
+   info.flags = CHECK_OFFSETS|CHECK_STRINGS;
+ 
+-  if (!_gtk_icon_cache_validate (&info))
++#ifdef G_ENABLE_DEBUG
++  if (gtk_debug_flags & GTK_DEBUG_ICONTHEME)
+     {
+-      g_mapped_file_free (map);
+-      g_warning ("Icon cache '%s' is invalid\n", cache_filename);
++      if (!_gtk_icon_cache_validate (&info))
++        {
++          g_mapped_file_free (map);
++          g_warning ("Icon cache '%s' is invalid\n", cache_filename);
+ 
+-      goto done;
++          goto done;
++        }
+     }
+-  
++#endif 
++
+   GTK_NOTE (ICONTHEME, g_print ("found cache for %s\n", path));
+ 
+   cache = g_new0 (GtkIconCache, 1);
diff --git a/x11-libs/gtk+/files/gtk+-2.12.0-libtracker_so.patch b/x11-libs/gtk+/files/gtk+-2.12.0-libtracker_so.patch
new file mode 100644
index 0000000..d5f3fdd
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.12.0-libtracker_so.patch
@@ -0,0 +1,21 @@
+--- gtk/gtksearchenginetracker.c	2007/06/22 14:32:22	18219
++++ gtk/gtksearchenginetracker.c	2007/09/18 21:48:01	18846
+@@ -71,10 +71,16 @@
+     {
+       int i;
+       GModule *tracker;
++      GModuleFlags flags;
+       
+       done = TRUE;
+- 
+-      tracker = g_module_open ("libtracker.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
++      flags = G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL;
++
++      tracker = g_module_open ("libtrackerclient.so.0", flags);
++
++      if (!tracker)
++        tracker = g_module_open ("libtracker.so.0", flags);
++
+       if (!tracker)
+ 	return;
+       
diff --git a/x11-libs/gtk+/gtk+-2.12.0.ebuild b/x11-libs/gtk+/gtk+-2.12.0.ebuild
new file mode 100644
index 0000000..e41d54f
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.12.0.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.12.0.ebuild,v 1.3 2007/09/22 23:51:35 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="cups debug doc jpeg tiff xinerama"
+
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	xinerama? ( x11-libs/libXinerama )
+	>=dev-libs/glib-2.13.5
+	>=x11-libs/pango-1.17.3
+	>=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
+	cups? ( net-print/cups )
+	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
+	x11-proto/damageproto
+	xinerama? ( x11-proto/xineramaproto )
+	doc? (
+			>=dev-util/gtk-doc-1.6
+			~app-text/docbook-xml-dtd-4.1.2
+		 )"
+
+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
+
+	# 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"
+
+	# http://bugzilla.gnome.org/show_bug.cgi?id=476342
+	epatch "${FILESDIR}"/${P}-icon-cache-speedup.patch
+
+	# http://bugzilla.gnome.org/show_bug.cgi?id=478173
+	epatch "${FILESDIR}/${PN}-2.12.0-libtracker_so.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() {
+	einstall || 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*
+
+	# This has to be removed, because it's multilib specific; generated in
+	# postinst
+	rm ${D}/etc/gtk-2.0/gtk.immodules
+}
+
+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
+}