Add 2.10.5. Mostly fixes a bug in 2.10.4 that had 80+ duplicates on the upstream bug report. If this commit message has something doubled then blame repoman for screwing up with left arrow in the message entry.

Package-Manager: portage-2.1.2_pre2-r1

5 files changed, 206 insertions, 8 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index cae1aeae61f0..389fa9c2d9d6 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
 # 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.267 2006/09/28 16:28:24 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.268 2006/10/02 16:54:26 leio Exp $
+
+*gtk+-2.10.5 (02 Oct 2006)
+
+  02 Oct 2006; Mart Raudsepp <leio@gentoo.org>
+  +files/gtk+-2.10.5-buildfile_typo.patch, +gtk+-2.10.5.ebuild:
+  Version bump for 2.10 series.
 
 *gtk+-2.10.4 (28 Sep 2006)
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 885f022850ee..90b344a623d0 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -13,6 +13,10 @@ AUX gtk+-2-xpm_loader.patch 920 RMD160 08e77b9df95557e874a193dd45aad84835a2c281
 MD5 cd1c96c0a81026a3af29449389e455d5 files/gtk+-2-xpm_loader.patch 920
 RMD160 08e77b9df95557e874a193dd45aad84835a2c281 files/gtk+-2-xpm_loader.patch 920
 SHA256 ee01227c6dae5041040aac8d43c16b689cca197ea1fca62401e5011623ee832c files/gtk+-2-xpm_loader.patch 920
+AUX gtk+-2.10.5-buildfile_typo.patch 737 RMD160 bcdfaa61cd69d4fe17d9d59ab7c78576d7978992 SHA1 ba0adb2157633451aef757d91acb316a05b89e51 SHA256 e83c2b03599550327e8032fa85a29aa6b3b45b9316cb713f3f8049aa4e013101
+MD5 6d15fe5a9124eedcbbbee109bf7e8839 files/gtk+-2.10.5-buildfile_typo.patch 737
+RMD160 bcdfaa61cd69d4fe17d9d59ab7c78576d7978992 files/gtk+-2.10.5-buildfile_typo.patch 737
+SHA256 e83c2b03599550327e8032fa85a29aa6b3b45b9316cb713f3f8049aa4e013101 files/gtk+-2.10.5-buildfile_typo.patch 737
 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
@@ -41,6 +45,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-smoothscroll-r6.patch.bz2 3718 RMD160 0acbd1a78a1abf6147af0dfe91b96becd1f0f107 SHA1 7735c1d49e87a2bfce9537224c4c3da5c40647aa SHA256 43d20bd59448bf5d8daa90cc384830fe1f046889b83552fc417669c2fdff168e
 DIST gtk+-2.10.4.tar.bz2 14611916 RMD160 dcaf1d4b1439f47d7b5de9c71150cf71e5ac25c0 SHA1 80dc1cfa86c3db8bfc9d60d64f4868091f6140bb SHA256 39b0dd1a9a326447d708837d88ea50ca2f9914bacb6b434ba8b6713e229f7553
+DIST gtk+-2.10.5.tar.bz2 14558020 RMD160 8ac88a11664badc045477638e09fde1c005e764e SHA1 ba31cb4f7f40490858658f23dce948e3d9a9bbae SHA256 37cfbb70e3af5db122b893f43a5ba0c4debfc1772906441d72fc7df1a25a2ec2
 DIST gtk+-2.6-smoothscroll-r5.patch.bz2 3758 RMD160 b1db44f5055cef48239f69620e0bc13b1dccc139 SHA1 4ee4af7ebb1e013b14afeac94e8bd14b12badd58 SHA256 1322ed086c0b7353c5a28f23fe422ab23fd553ca8f3047b47fe5ae9a69c6c5eb
 DIST gtk+-2.6.1-lib64.patch.bz2 6047 RMD160 0ce3bf05fe59910ea019b4157dd1066367df2af6 SHA1 4a83215ef6a420db5f8080288567437941f72daf SHA256 fe171fc78e10f49ff69c2db424b816a331e21f362aef55b8624031c53ebcfc72
 DIST gtk+-2.6.10.tar.bz2 11521380 RMD160 5bb2e4de406e0e6ccf5c66ec48f6ba3e5b0911ff SHA1 9ba627683e0dc4bceb5fb900c1ee687638d95fcd SHA256 d408b606c8dd414dfbf220ccc168a0bc85a419945439796792a5357a96ff02af
@@ -56,6 +61,10 @@ EBUILD gtk+-2.10.4.ebuild 4449 RMD160 ba41a7fc753ae392d467ced484d6fbee92ad65c3 S
 MD5 805d428538cda4ba9d517211656610d9 gtk+-2.10.4.ebuild 4449
 RMD160 ba41a7fc753ae392d467ced484d6fbee92ad65c3 gtk+-2.10.4.ebuild 4449
 SHA256 334416afadbccf2d13054d20c36c486d7ef9c42ae9e8a7e681e65ca103b582e1 gtk+-2.10.4.ebuild 4449
+EBUILD gtk+-2.10.5.ebuild 4548 RMD160 a609b32ac2beb8ce3e62b1bca64756a347e208ad SHA1 a1b83c3ba290b8b6bd73f373500c89dc874b6af4 SHA256 ab42bfb25bb07cf084c08623ed622835b4ddb50a6fbd6fca4d64efe93bfceda2
+MD5 cbaa24cb2c1b03567517b5e4328e3a12 gtk+-2.10.5.ebuild 4548
+RMD160 a609b32ac2beb8ce3e62b1bca64756a347e208ad gtk+-2.10.5.ebuild 4548
+SHA256 ab42bfb25bb07cf084c08623ed622835b4ddb50a6fbd6fca4d64efe93bfceda2 gtk+-2.10.5.ebuild 4548
 EBUILD gtk+-2.6.10-r1.ebuild 3455 RMD160 63997fee767bbb4ddc7d978374c7d9fbe73bf6ba SHA1 4c472888cd0f1dc1b43c3e4c3167e2941ae1c39e SHA256 d58bd7ffe27a02b4c4cf71dd16dcc6c7116723b36df0d15519846b19549ade2e
 MD5 16ca62398139ea671319657720b6fc8b gtk+-2.6.10-r1.ebuild 3455
 RMD160 63997fee767bbb4ddc7d978374c7d9fbe73bf6ba gtk+-2.6.10-r1.ebuild 3455
@@ -76,10 +85,10 @@ EBUILD gtk+-2.8.8.ebuild 4109 RMD160 396d41d934218c3b9bda5179aba2e9fd428a91c5 SH
 MD5 289a17f5d4f54f223c4f338adaeb8e31 gtk+-2.8.8.ebuild 4109
 RMD160 396d41d934218c3b9bda5179aba2e9fd428a91c5 gtk+-2.8.8.ebuild 4109
 SHA256 902cf9ca730823912e322e8ddd8357f2f5609ad14f118cf7c24e5bde966dd3bc gtk+-2.8.8.ebuild 4109
-MISC ChangeLog 38075 RMD160 ed364e837082c9e8f50cbbe4cf94e39a97a26982 SHA1 c25eb226e7a906ee2d902e186a0be618b6adf7b5 SHA256 ad0780c592a897155a859d437cdd94ba0b05170031e53c98a53004201165ae3c
-MD5 c6c039583c380f814bceb477d67180df ChangeLog 38075
-RMD160 ed364e837082c9e8f50cbbe4cf94e39a97a26982 ChangeLog 38075
-SHA256 ad0780c592a897155a859d437cdd94ba0b05170031e53c98a53004201165ae3c ChangeLog 38075
+MISC ChangeLog 38247 RMD160 c707a62ab0d8b3e2586902a1b1c3932d090d2bd4 SHA1 d93e4c971886c25e0430b91c4a135991ed8817f8 SHA256 4e396d5fcf7e680e70c97b935cbda78c5dbff0e1433d708b04b62d9994aa28e2
+MD5 a8e40f0a1acf4ba071aec3af81609ce3 ChangeLog 38247
+RMD160 c707a62ab0d8b3e2586902a1b1c3932d090d2bd4 ChangeLog 38247
+SHA256 4e396d5fcf7e680e70c97b935cbda78c5dbff0e1433d708b04b62d9994aa28e2 ChangeLog 38247
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 metadata.xml 424
@@ -90,6 +99,9 @@ SHA256 4bd7f7ef31547e6dabca532b07bc6be7e37c96d234abd2818afbb85d725aed47 files/di
 MD5 97cfb3d43bffa617ed419fffd04bfdab files/digest-gtk+-2.10.4 244
 RMD160 1f04beedf01286895eb442c55be6f00937281eb9 files/digest-gtk+-2.10.4 244
 SHA256 19b134b66c7db04d4c689b2fcf169eca3a3a14dad39d785d9d1749dcc952f3df files/digest-gtk+-2.10.4 244
+MD5 be482dc6e69de448be28840c87844d80 files/digest-gtk+-2.10.5 244
+RMD160 ca771ce7b83d5c948c9fe947d80701d07e0517b0 files/digest-gtk+-2.10.5 244
+SHA256 7cbf87712a3f4b9e0226db4928e4fd0b3dd3c2ef3f8d50356b32663b691334f2 files/digest-gtk+-2.10.5 244
 MD5 4db8c558f465f191df15e6d4b6198e6b files/digest-gtk+-2.6.10-r1 774
 RMD160 b07163c72c7096fb0f6fae53857bfce45994af49 files/digest-gtk+-2.6.10-r1 774
 SHA256 219aadd2affc04b82e80378f93bc4acbb03123573cc4e16c2f3366c20e4854cf files/digest-gtk+-2.6.10-r1 774
@@ -108,7 +120,7 @@ SHA256 e263619d35ad46ec239b36623c4b6768ff50ae9e2cf4ad01d716e17f0608cd74 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFG/g3keYb6olFHJcRApSNAKC+AlvsWG7oMqdrsSNVO6bQHrjdsACghFZc
-BN/4ZKnr8Soe6+GBCYTzTzE=
-=s2Nl
+iD8DBQFFIURRkeYb6olFHJcRApUYAKCsO2JeApfncKRge4L9GqwJI7oIiACg/SaF
+NsK1tpTqgWicG5lRiZfwdSU=
+=7QIJ
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.10.5 b/x11-libs/gtk+/files/digest-gtk+-2.10.5
new file mode 100644
index 000000000000..1e67d05b7f54
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.10.5
@@ -0,0 +1,3 @@
+MD5 af15a744c3e90d41021a5d3c9f364ba2 gtk+-2.10.5.tar.bz2 14558020
+RMD160 8ac88a11664badc045477638e09fde1c005e764e gtk+-2.10.5.tar.bz2 14558020
+SHA256 37cfbb70e3af5db122b893f43a5ba0c4debfc1772906441d72fc7df1a25a2ec2 gtk+-2.10.5.tar.bz2 14558020
diff --git a/x11-libs/gtk+/files/gtk+-2.10.5-buildfile_typo.patch b/x11-libs/gtk+/files/gtk+-2.10.5-buildfile_typo.patch
new file mode 100644
index 000000000000..74eb8dcefb8c
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.10.5-buildfile_typo.patch
@@ -0,0 +1,14 @@
+http://bugzilla.gnome.org/show_bug.cgi?id=358931
+
+diff -Nru gtk+-2.10.5.orig/gtk/Makefile.am gtk+-2.10.5/gtk/Makefile.am
+--- gtk+-2.10.5.orig/gtk/Makefile.am	2006-10-02 06:06:53.000000000 +0200
++++ gtk+-2.10.5/gtk/Makefile.am	2006-10-02 09:54:53.000000000 +0200
+@@ -1104,7 +1104,7 @@
+ 	   && $(LN_S) gtk-goto-first-ltr.png gtk-goto-last-rtl.png		\
+ 	   && $(RM) gtk-media-forward-rtl.png 					\
+ 	   && $(LN_S) gtk-media-rewind-ltr.png gtk-media-forward-rtl.png	\
+-	   && $(RM) gtk-mdedia-next-rtl.png					\
++	   && $(RM) gtk-media-next-rtl.png					\
+ 	   && $(LN_S) gtk-media-previous-ltr.png gtk-media-next-rtl.png		\
+ 	   && $(RM) gtk-media-previous-rtl.png 					\
+ 	   && $(LN_S) gtk-media-next-ltr.png gtk-media-previous-rtl.png		\
diff --git a/x11-libs/gtk+/gtk+-2.10.5.ebuild b/x11-libs/gtk+/gtk+-2.10.5.ebuild
new file mode 100644
index 000000000000..5a62bf7ea101
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.10.5.ebuild
@@ -0,0 +1,163 @@
+# 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.10.5.ebuild,v 1.1 2006/10/02 16:54:26 leio 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 )
+	>=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
+	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 pdf ; then
+		einfo "Please re-emerge x11-libs/cairo with the X and pdf USE flag set"
+		die "cairo needs the X and pdf 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
+
+	# Fix typo in 2.10.5 that leads to build failure
+	epatch "${FILESDIR}"/${P}-buildfile_typo.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
+
+	# -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
+
+	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."
+
+	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
+}