version bump

Package-Manager: portage-2.1.1_pre3-r3

4 files changed, 190 insertions, 15 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 67fd7dba4695..9b26716fad4e 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.251 2006/07/19 05:21:01 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.252 2006/07/24 21:10:28 genstef Exp $
+
+*gtk+-2.10.1 (24 Jul 2006)
+
+  24 Jul 2006; Stefan Schweizer <genstef@gentoo.org> +gtk+-2.10.1.ebuild:
+  version bump
 
   19 Jul 2006; Olivier Crête <tester@gentoo.org> files/digest-gtk+-2.8.19:
   Fix digest
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 5a44868af42e..795059682f45 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,6 +1,3 @@
------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
@@ -41,6 +38,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.0.tar.bz2 14152208 RMD160 295aff724cf255f30321ea62c8cea6c1a815ea73 SHA1 9395758be636323bc2392be78426bb131c4c3b36 SHA256 9de9f4892a0b1022dc9b928e908e8638bc2b717d2c49a0baf530eaed71376bee
+DIST gtk+-2.10.1.tar.bz2 14052462 RMD160 9c27934ad23f7d0669e51dd66ece8883dbfa6e2d SHA1 1a6326a08cc80afb64c1b72ed4af0739cd35415b SHA256 db7ff62bb39cff4a80f7dd940c8da28cf6e8842b716517f995af19bdc5118320
 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
@@ -62,6 +60,10 @@ EBUILD gtk+-2.10.0.ebuild 4448 RMD160 044862f3bb11ba83bd0fe4f7c4578c2d12637c97 S
 MD5 0f63b8097b9f55220456b7448ff7a64e gtk+-2.10.0.ebuild 4448
 RMD160 044862f3bb11ba83bd0fe4f7c4578c2d12637c97 gtk+-2.10.0.ebuild 4448
 SHA256 4a40e3631c6ffec69452d9a7213f1b3ee6617c340e29b779aa0046cf53671b33 gtk+-2.10.0.ebuild 4448
+EBUILD gtk+-2.10.1.ebuild 4446 RMD160 b18494b113a299bb7a1492fe366542274c15942d SHA1 980eff0d8d885da41b1273aec278a763d7c4c74e SHA256 1f2f636f2050bba0432c1d93a0195a3a89512938e289737481a9a44d79778489
+MD5 accdcca861bbdff5d599d45101546d8d gtk+-2.10.1.ebuild 4446
+RMD160 b18494b113a299bb7a1492fe366542274c15942d gtk+-2.10.1.ebuild 4446
+SHA256 1f2f636f2050bba0432c1d93a0195a3a89512938e289737481a9a44d79778489 gtk+-2.10.1.ebuild 4446
 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
@@ -94,10 +96,10 @@ EBUILD gtk+-2.8.8.ebuild 4113 RMD160 2a0a497cc25fecdec658b444eacb1374e7491a36 SH
 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 35809 RMD160 789010541a6301207201b82323e2d336f11cdc82 SHA1 6d90fd5110f687274ebf3d2141c071804167287d SHA256 dfc5eb55cc78aa2abd559812999e59430b429f48de982a3c03663fb1958698fe
-MD5 5903ee93ebf8e00e26fc8c8e320162c9 ChangeLog 35809
-RMD160 789010541a6301207201b82323e2d336f11cdc82 ChangeLog 35809
-SHA256 dfc5eb55cc78aa2abd559812999e59430b429f48de982a3c03663fb1958698fe ChangeLog 35809
+MISC ChangeLog 35928 RMD160 875c3a1aa8a378f4b17e3c1f95ff344a4f70e096 SHA1 56072792bf88d3477c7c12865803121d18cafa24 SHA256 d04aec0352942f4720accbeea42c2ad2f42ba35482a423e431df2c6e4d428d45
+MD5 da44748dfde66da74b7f7ca7fc04a6a6 ChangeLog 35928
+RMD160 875c3a1aa8a378f4b17e3c1f95ff344a4f70e096 ChangeLog 35928
+SHA256 d04aec0352942f4720accbeea42c2ad2f42ba35482a423e431df2c6e4d428d45 ChangeLog 35928
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 metadata.xml 424
@@ -111,6 +113,9 @@ SHA256 4bd7f7ef31547e6dabca532b07bc6be7e37c96d234abd2818afbb85d725aed47 files/di
 MD5 0c0f1d0b8b3f5e7cc1004516a5abeff7 files/digest-gtk+-2.10.0 244
 RMD160 792d893b66a7ced6101878f1b64e507ef8221a27 files/digest-gtk+-2.10.0 244
 SHA256 d2bbb32837054bb5422686c763c0b1763ac2da98c672a97c607d9c4708792340 files/digest-gtk+-2.10.0 244
+MD5 3734377ef4828e8121235a814594186c files/digest-gtk+-2.10.1 244
+RMD160 7bfd4d5716231a695bf5df41602cefbce3463294 files/digest-gtk+-2.10.1 244
+SHA256 3ce2d68d583bb89fc9a00cbb4b6bb3aaadc3ee216613cde1072fcef313ab5220 files/digest-gtk+-2.10.1 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
@@ -135,10 +140,3 @@ SHA256 87a06d8202ce31cb65090a54522b8c4cd3021dd5d5d42ff53ff22f754f9b2b97 files/di
 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 (GNU/Linux)
-
-iD8DBQFEvjYpoGcCqvCmTSIRAvozAKCQVENLQJOX5YvMfaYZnVS280GlEgCg0OKL
-uE4Rzcv7X/U1xwk8v6aaIrA=
-=oTB4
------END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.10.1 b/x11-libs/gtk+/files/digest-gtk+-2.10.1
new file mode 100644
index 000000000000..501f157d47bd
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.10.1
@@ -0,0 +1,3 @@
+MD5 7f1d39031d50de8228211aa3230d4acd gtk+-2.10.1.tar.bz2 14052462
+RMD160 9c27934ad23f7d0669e51dd66ece8883dbfa6e2d gtk+-2.10.1.tar.bz2 14052462
+SHA256 db7ff62bb39cff4a80f7dd940c8da28cf6e8842b716517f995af19bdc5118320 gtk+-2.10.1.tar.bz2 14052462
diff --git a/x11-libs/gtk+/gtk+-2.10.1.ebuild b/x11-libs/gtk+/gtk+-2.10.1.ebuild
new file mode 100644
index 000000000000..6664b4855bb8
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.10.1.ebuild
@@ -0,0 +1,169 @@
+# 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.1.ebuild,v 1.1 2006/07/24 21:10:28 genstef 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.12.1
+	>=x11-libs/pango-1.13.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 )
+		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 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
+
+	# 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."
+
+	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
+}