Bump to 2.8.20 and fix bug #140222

Package-Manager: portage-2.1.1_pre2-r8

4 files changed, 192 insertions, 5 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 8717b73c23f2..d5243b8ff072 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.247 2006/07/16 09:30:06 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.248 2006/07/17 14:25:25 dang Exp $
+
+*gtk+-2.8.20 (17 Jul 2006)
+
+  17 Jul 2006; Daniel Gryniewicz <dang@gentoo.org> +gtk+-2.8.20.ebuild:
+  Bump to 2.8.20 and fix bug #140222
 
   16 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org> gtk+-2.8.19.ebuild:
   hppa stable, bug #139612
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 8605fe229618..dec23f3f2f5c 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a files/gtk+-1.2-locale_fix.patch 419
@@ -45,6 +48,7 @@ DIST gtk+-2.8.12.tar.bz2 12004253 RMD160 e64d984029cc488f65465ecebc501d4a0696899
 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.19.tar.bz2 12303676 RMD160 9d74e7a19f2da0361dd731757310abe1f4c08555 SHA1 5108749bdd2f3ab0b500cec879a0f421a548ca35 SHA256 ccdf52c74ed9902dda6e18923d1fd6fc9c9d48821bf79c4e354d181ff074fdf8
+DIST gtk+-2.8.20.tar.bz2 12247295 RMD160 d20254de9e5b37b19f432758fbd78fff4c6baf1e SHA1 8ea2449ff139b8bc457f8b5bcdcad93b02cfba9e SHA256 69a9b6c1e78da7e71416f20fab0c4972503139406e89ce7fbdbac0e213b16b79
 DIST gtk+-2.8.8.tar.bz2 11902480 RMD160 7775dfe502f6b478b5e5764917cfc7668d574065 SHA1 69160c9b844abe4c92847effdde69510fbca5dca SHA256 d1bf51735fa7535c72ba034d99880016c8349f2e8026d72c40a7eb57a3ce2bb8
 EBUILD gtk+-1.2.10-r10.ebuild 1821 RMD160 ad3c002279536e8c98b498e4162c631332546af6 SHA1 8daaf981d13680b20ce44b457285a65422e53f74 SHA256 33d21b3f23e0ea30f8c68e21cf0ea7f863df4e947cc7bbf5406115c2312d01d4
 MD5 e1786e8eefd917c4dc90ecbe3091aa08 gtk+-1.2.10-r10.ebuild 1821
@@ -78,14 +82,18 @@ EBUILD gtk+-2.8.19.ebuild 4081 RMD160 2e8447c6bd9739fd47e2167ec1995c97dd68e16e S
 MD5 5462ea07b20dffeaf2ea002e7a035962 gtk+-2.8.19.ebuild 4081
 RMD160 2e8447c6bd9739fd47e2167ec1995c97dd68e16e gtk+-2.8.19.ebuild 4081
 SHA256 3a42bea8462a9165c3d426fc6cc112271b6f64c6e5b04c17211da30e0e543c46 gtk+-2.8.19.ebuild 4081
+EBUILD gtk+-2.8.20.ebuild 4093 RMD160 1f0c2fefe58bd850a3ebeffb7701987b9f217855 SHA1 edf6f0c7226da60b4ba9c7233d6f33490c490a6f SHA256 4a41ab4a6e268f647b2d33630fcfcba9da1123244f4b46567b01c974dfcf5c40
+MD5 ecf986f4a1c10ddd9650897755a8b5d8 gtk+-2.8.20.ebuild 4093
+RMD160 1f0c2fefe58bd850a3ebeffb7701987b9f217855 gtk+-2.8.20.ebuild 4093
+SHA256 4a41ab4a6e268f647b2d33630fcfcba9da1123244f4b46567b01c974dfcf5c40 gtk+-2.8.20.ebuild 4093
 EBUILD gtk+-2.8.8.ebuild 4113 RMD160 2a0a497cc25fecdec658b444eacb1374e7491a36 SHA1 4dfe4e9df2432fef20d9de3b73879da2a3ecc261 SHA256 11c0c44d19b8efe7994af62a4bed7aec110cb69e2f3b8d0bdd72bbe7cfdfe121
 MD5 eae2dcc7f50ccdc71d375984f2104005 gtk+-2.8.8.ebuild 4113
 RMD160 2a0a497cc25fecdec658b444eacb1374e7491a36 gtk+-2.8.8.ebuild 4113
 SHA256 11c0c44d19b8efe7994af62a4bed7aec110cb69e2f3b8d0bdd72bbe7cfdfe121 gtk+-2.8.8.ebuild 4113
-MISC ChangeLog 35256 RMD160 d2e7058ce7ced7bdb69874872b6028d45e6e4b74 SHA1 913c609303c331ba2f7f7d6244374e0573ce9acb SHA256 1ca729d0b15c8f0e6367a0d4bde80e91ae01c2b25ba890f53fe404f5766107c9
-MD5 1d30fce5a7f2670e7a99a5c2ab14cdff ChangeLog 35256
-RMD160 d2e7058ce7ced7bdb69874872b6028d45e6e4b74 ChangeLog 35256
-SHA256 1ca729d0b15c8f0e6367a0d4bde80e91ae01c2b25ba890f53fe404f5766107c9 ChangeLog 35256
+MISC ChangeLog 35388 RMD160 4a5a0b858a1e910b97109026654f857edb83650a SHA1 bba5e4656e69923e3616ddebe9776d1e370c76ab SHA256 7c139b4f59633ef55ade1d753fff7b08f7a406786e36a3eeba2a63072868efd5
+MD5 2f1897763bf79e18e162c94109e30e6b ChangeLog 35388
+RMD160 4a5a0b858a1e910b97109026654f857edb83650a ChangeLog 35388
+SHA256 7c139b4f59633ef55ade1d753fff7b08f7a406786e36a3eeba2a63072868efd5 ChangeLog 35388
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 metadata.xml 424
@@ -114,6 +122,16 @@ SHA256 cf80659190cc030b5606ac8eb7d7b717fbbe8f25ce18f506168f91b71e65b87f files/di
 MD5 980589f9b9d65ae297e3161771506a39 files/digest-gtk+-2.8.19 244
 RMD160 0b62e1a84ab652bb3426f2ff4d89d7889eb7532c files/digest-gtk+-2.8.19 244
 SHA256 0be521aa113e9334cffe0bb4078bd8a363029c2a8ddae0b8005bbf2e3eb69f09 files/digest-gtk+-2.8.19 244
+MD5 5987bda64cc0a2c5d968d200029e4f26 files/digest-gtk+-2.8.20 244
+RMD160 ef26312aa81fad817ff4350262c7675927298af6 files/digest-gtk+-2.8.20 244
+SHA256 87a06d8202ce31cb65090a54522b8c4cd3021dd5d5d42ff53ff22f754f9b2b97 files/digest-gtk+-2.8.20 244
 MD5 98f0c0090a29b1fd7fb4843cfff7c326 files/digest-gtk+-2.8.8 512
 RMD160 53f899df61e1d373f54eabae144c940850d31164 files/digest-gtk+-2.8.8 512
 SHA256 e263619d35ad46ec239b36623c4b6768ff50ae9e2cf4ad01d716e17f0608cd74 files/digest-gtk+-2.8.8 512
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFEu53QomPajV0RnrERAl8GAJ4uc0+zaah2h78YYHFmTcEDoA/CYQCfS3rI
+H5OWW/6ieXSZyPb+2LXvGCU=
+=+9MK
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.20 b/x11-libs/gtk+/files/digest-gtk+-2.8.20
new file mode 100644
index 000000000000..18c0a050ea7b
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.8.20
@@ -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.ebuild b/x11-libs/gtk+/gtk+-2.8.20.ebuild
new file mode 100644
index 000000000000..2b2d8f0fb333
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.8.20.ebuild
@@ -0,0 +1,161 @@
+# 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.ebuild,v 1.1 2006/07/17 14:25:25 dang 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}"
+
+	# 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}
+
+	# 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."
+
+}