New patched gtk+ version

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

3 files changed, 177 insertions, 0 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 8b8a441..30c18e9 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -16,6 +16,7 @@ RMD160 2825a07857ed487a5855ea0e9f2a01db254d2f56 files/gtk+-2.8.11-filechooser.pa
 SHA256 b0df921477ee89a807f35012e81774287092d929f3b5382690cb9c57ff48aae5 files/gtk+-2.8.11-filechooser.patch 594
 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
 EBUILD gtk+-2.8.17.ebuild 4122 RMD160 e072dde3401a99cb28e8c16f0b22f968acb5630b SHA1 7588cdce614b0e1eba06a18069c54c5d2640b3dc SHA256 4c313b5e5402f3e523c5a0b48a331199a231e8f4c345738298c71bdc6d0ea33a
 MD5 73f968e97597246ed8707df58b2af092 gtk+-2.8.17.ebuild 4122
 RMD160 e072dde3401a99cb28e8c16f0b22f968acb5630b gtk+-2.8.17.ebuild 4122
@@ -24,6 +25,10 @@ EBUILD gtk+-2.8.18.ebuild 4122 RMD160 e072dde3401a99cb28e8c16f0b22f968acb5630b S
 MD5 73f968e97597246ed8707df58b2af092 gtk+-2.8.18.ebuild 4122
 RMD160 e072dde3401a99cb28e8c16f0b22f968acb5630b gtk+-2.8.18.ebuild 4122
 SHA256 4c313b5e5402f3e523c5a0b48a331199a231e8f4c345738298c71bdc6d0ea33a gtk+-2.8.18.ebuild 4122
+EBUILD gtk+-2.8.20-r1.ebuild 4292 RMD160 2dfb697ec9ec6b19775f5052bbcd5a51a663abd9 SHA1 92c1a4c71f54f63f1e71fb8f4672ba2c79a86723 SHA256 5a71ff2e7ea32748fd6733c8e81ea66df136d19fc051da71368ee4790ebc8631
+MD5 2d894f385c204c3e83e077af079d1056 gtk+-2.8.20-r1.ebuild 4292
+RMD160 2dfb697ec9ec6b19775f5052bbcd5a51a663abd9 gtk+-2.8.20-r1.ebuild 4292
+SHA256 5a71ff2e7ea32748fd6733c8e81ea66df136d19fc051da71368ee4790ebc8631 gtk+-2.8.20-r1.ebuild 4292
 MISC NOTES 82 RMD160 58293858cde627b688c697e076d2d45f005007b2 SHA1 2f0647b873ce5d273d6492ce390a9c882db26046 SHA256 6878454f7bf28d1c462b4e213724c88d89eac6694d3323e0f372d227cdbb5f34
 MD5 61f1935636c8a7927b7a2deecd6ed127 NOTES 82
 RMD160 58293858cde627b688c697e076d2d45f005007b2 NOTES 82
@@ -34,3 +39,6 @@ SHA256 b53b24818165462a5a77713bfcbb65e0d0da4474c15c19f346e595f1852e84b1 files/di
 MD5 947f2b8fcdf106adff2488518fd43b26 files/digest-gtk+-2.8.18 244
 RMD160 c5e50985cc890a51ab99e261389afa399ba9d05c files/digest-gtk+-2.8.18 244
 SHA256 cf80659190cc030b5606ac8eb7d7b717fbbe8f25ce18f506168f91b71e65b87f files/digest-gtk+-2.8.18 244
+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
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.20-r1 b/x11-libs/gtk+/files/digest-gtk+-2.8.20-r1
new file mode 100644
index 0000000..18c0a05
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.8.20-r1
@@ -0,0 +1,3 @@
+MD5 74e7ca98194f1fadfe906e66d763d05d gtk+-2.8.20.tar.bz2 12247295
+RMD160 d20254de9e5b37b19f432758fbd78fff4c6baf1e gtk+-2.8.20.tar.bz2 12247295
+SHA256 69a9b6c1e78da7e71416f20fab0c4972503139406e89ce7fbdbac0e213b16b79 gtk+-2.8.20.tar.bz2 12247295
diff --git a/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild b/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild
new file mode 100644
index 0000000..4f1f936
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild,v 1.1 2006/07/18 19:13:57 allanonjl Exp $
+
+inherit gnome.org flag-o-matic eutils debug 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 ) )
+		virtual/x11 )
+	>=dev-libs/glib-2.10.1
+	>=x11-libs/pango-1.9
+	>=dev-libs/atk-1.10.1
+	>=x11-libs/cairo-0.9.2
+	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 ) )
+		virtual/x11 )
+	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
+
+	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 to run"
+
+	emake || die "gtk+ failed to compile"
+}
+
+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
+
+	einfo "If you experience text corruption issues, turn off RenderAccel"
+	einfo "in your xorg.conf.  NVIDIA is working on this issue. "
+	einfo "See http://bugs.gentoo.org/113123 for more information."
+
+}