new version. this includes the patch to fix the slow repainting with ATI cards. remove smoothscroll patch, use eautoreconf.

(Portage version: 2.1_pre4-r1)

4 files changed, 167 insertions, 4 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index c81beec0b9f3..157f8b0cacab 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.217 2006/02/12 19:15:47 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.218 2006/02/12 19:19:56 allanonjl Exp $
+
+*gtk+-2.8.12 (12 Feb 2006)
+
+  12 Feb 2006; John N. Laliberte <allanonjl@gentoo.org> +gtk+-2.8.12.ebuild:
+  new version. this includes the patch to fix the slow repainting with ATI
+  cards. remove smoothscroll patch, use eautoreconf.
 
   12 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
   gtk+-1.2.10-r10.ebuild, gtk+-1.2.10-r11.ebuild, gtk+-2.6.10-r1.ebuild:
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 3a97ed025b07..3c1ad2c4a26d 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,6 +1,6 @@
-MD5 5bbb232b0b664016a5cf6b74fbfe9853 ChangeLog 31172
-RMD160 f353cb2ccf5f8b84bbcb84d61aa212fb0acfccfa ChangeLog 31172
-SHA256 8b372f8391482a8a5a6be7e268c79aac01669739812fa563adb8aeed1f5aa8c7 ChangeLog 31172
+MD5 e421f738cc5ac67c0c007c3da28819c1 ChangeLog 31406
+RMD160 a6e720eed8973a2663e2df98791a33dfd8f1c6ba ChangeLog 31406
+SHA256 7f4e978585396b018430c6d4089661c517a9ab669de597c94e156f753f32155d ChangeLog 31406
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
 RMD160 089774caae5ebadfe26a94913e690a0e2b1edd39 files/digest-gtk+-1.2.10-r10 138
 SHA256 f1c6441519ca2edf919e1163744c97ef7b7ff05bf456efed405eef49e2684048 files/digest-gtk+-1.2.10-r10 138
@@ -13,6 +13,9 @@ SHA256 5ac30a979bdf26948a53b8e96c74733e8d3c68bdddf44bace638b9afba3cf3da files/di
 MD5 3d136a29a973e16c88bb0ead86243644 files/digest-gtk+-2.8.11 141
 RMD160 db069c6adfcc2dc1b4be4f22d666c83e18f7bc38 files/digest-gtk+-2.8.11 141
 SHA256 66729e26d2a376aadb69ad3daf8a5da4f5c3da0a5ad3f76912fab5ca685d04ec files/digest-gtk+-2.8.11 141
+MD5 be842969da937e925b030650993d5c31 files/digest-gtk+-2.8.12 244
+RMD160 3888ef99bedbae32756eb61af0b27cde0a94bc0e files/digest-gtk+-2.8.12 244
+SHA256 a1440ed953deaeb9229d10d53aaf9fc7d4b36375696ab4581deba5912a22a624 files/digest-gtk+-2.8.12 244
 MD5 c2395b72772f29144c0b34c311e68b26 files/digest-gtk+-2.8.8 140
 RMD160 f6477660581c85e3ea93da9b51ee00e3a823e9d9 files/digest-gtk+-2.8.8 140
 SHA256 71839aa71eb0523b5315576e62cb32060bf9743c491f8b186dd131846631757e files/digest-gtk+-2.8.8 140
@@ -55,6 +58,9 @@ SHA256 d58bd7ffe27a02b4c4cf71dd16dcc6c7116723b36df0d15519846b19549ade2e gtk+-2.6
 MD5 98c3798b9681eb69ff09d1147d16e602 gtk+-2.8.11.ebuild 4192
 RMD160 6e692a0ae91d437641f042279e9c70502c8d7d63 gtk+-2.8.11.ebuild 4192
 SHA256 4ab0c704bb526c5a5e77aeff321d68f5542ca8aa86acd4fd0d80f9a163847eb0 gtk+-2.8.11.ebuild 4192
+MD5 270afa5b12cac304f94fe956cf488661 gtk+-2.8.12.ebuild 4094
+RMD160 0146aca710cb81c2e0b0d2d6ab210babb042016e gtk+-2.8.12.ebuild 4094
+SHA256 7cc1be64a017094899ae2ebdffd5a77472284d99b8bd4db459eca0f5abe4087b gtk+-2.8.12.ebuild 4094
 MD5 eae2dcc7f50ccdc71d375984f2104005 gtk+-2.8.8.ebuild 4113
 RMD160 2a0a497cc25fecdec658b444eacb1374e7491a36 gtk+-2.8.8.ebuild 4113
 SHA256 11c0c44d19b8efe7994af62a4bed7aec110cb69e2f3b8d0bdd72bbe7cfdfe121 gtk+-2.8.8.ebuild 4113
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.12 b/x11-libs/gtk+/files/digest-gtk+-2.8.12
new file mode 100644
index 000000000000..9eae445eb1d4
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.8.12
@@ -0,0 +1,3 @@
+MD5 bdd3b950e4a3c65d61bceed9149888a9 gtk+-2.8.12.tar.bz2 12004253
+RMD160 e64d984029cc488f65465ecebc501d4a06968995 gtk+-2.8.12.tar.bz2 12004253
+SHA256 5a0cb101fe9a8751e07bf11a1ddc99cae76fa652f9d7370ab6d8a8b62852479c gtk+-2.8.12.tar.bz2 12004253
diff --git a/x11-libs/gtk+/gtk+-2.8.12.ebuild b/x11-libs/gtk+/gtk+-2.8.12.ebuild
new file mode 100644
index 000000000000..83ea362791aa
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.8.12.ebuild
@@ -0,0 +1,148 @@
+# 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.12.ebuild,v 1.1 2006/02/12 19:19:56 allanonjl Exp $
+
+inherit gnome.org flag-o-matic eutils debug autotools
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug doc jpeg tiff xinerama"
+
+RDEPEND="|| ( (
+			x11-libs/libXrender
+			x11-libs/libX11
+			x11-libs/libXi
+			x11-libs/libXt
+			x11-libs/libXext
+			xinerama? ( x11-libs/libXinerama )
+			x11-libs/libXcursor
+			x11-libs/libXrandr
+			x11-libs/libXfixes )
+		virtual/x11 )
+
+	>=dev-libs/glib-2.8.5
+	>=x11-libs/pango-1.9
+	>=dev-libs/atk-1.10.1
+	>=x11-libs/cairo-0.9.2
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.2.1
+	media-libs/fontconfig
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	tiff? ( >=media-libs/tiff-3.5.7 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	sys-devel/autoconf
+	>=sys-devel/automake-1.7.9
+
+	|| ( (
+			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 )"
+
+
+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}"
+
+	# beautifying patch for disabled icons
+	epatch "${FILESDIR}"/${PN}-2.2.1-disable_icons_smooth_alpha.patch
+
+	# Make xinerama support optional
+	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
+	eautoreconf
+	#autoconf || die "autoconf failed"
+	#automake || die "automake failed"
+
+	epunt_cxx
+}
+
+src_compile() {
+	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_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."
+}