Oops, missed a hard dep on 2.8.8. Thanks, mr-bones

(Portage version: 2.1.1)

4 files changed, 169 insertions, 1 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 2d707bdc5c51..18cf6e3dc7b7 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,10 @@
 # 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.262 2006/09/13 15:11:05 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.263 2006/09/14 14:20:08 dang Exp $
+
+  14 Sep 2006; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gtk+-gdk-pixbuf-testfix.patch, +gtk+-2.8.8.ebuild:
+  Oops, missed a hard dep on 2.8.8.  Thanks, mr-bones
 
   13 Sep 2006; Daniel Gryniewicz <dang@gentoo.org> gtk+-2.8.19.ebuild,
   gtk+-2.8.20-r1.ebuild, gtk+-2.10.2.ebuild, gtk+-2.10.3.ebuild:
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.8 b/x11-libs/gtk+/files/digest-gtk+-2.8.8
new file mode 100644
index 000000000000..92f7049a84a0
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.8.8
@@ -0,0 +1,6 @@
+MD5 0c7c66269cbac694971341dd2b2adf3d gtk+-2-smoothscroll-r6.patch.bz2 3718
+RMD160 0acbd1a78a1abf6147af0dfe91b96becd1f0f107 gtk+-2-smoothscroll-r6.patch.bz2 3718
+SHA256 43d20bd59448bf5d8daa90cc384830fe1f046889b83552fc417669c2fdff168e gtk+-2-smoothscroll-r6.patch.bz2 3718
+MD5 a048757bbe37f74d0de065aa0ac29c52 gtk+-2.8.8.tar.bz2 11902480
+RMD160 7775dfe502f6b478b5e5764917cfc7668d574065 gtk+-2.8.8.tar.bz2 11902480
+SHA256 d1bf51735fa7535c72ba034d99880016c8349f2e8026d72c40a7eb57a3ce2bb8 gtk+-2.8.8.tar.bz2 11902480
diff --git a/x11-libs/gtk+/files/gtk+-gdk-pixbuf-testfix.patch b/x11-libs/gtk+/files/gtk+-gdk-pixbuf-testfix.patch
new file mode 100644
index 000000000000..f4371243e000
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-gdk-pixbuf-testfix.patch
@@ -0,0 +1,9 @@
+--- gtk+-2.8.10/gdk-pixbuf/abicheck.sh	2005-08-07 09:47:25.000000000 -0400
++++ gtk+-2.8.10.new/gdk-pixbuf/abicheck.sh	2006-01-12 18:56:04.000000000 -0500
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+ 
+ cpp -DINCLUDE_VARIABLES -P -DALL_FILES ${srcdir:-.}/gdk-pixbuf.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
+-nm -D .libs/libgdk_pixbuf-2.0.so | grep " [BDTR] " | cut -d ' ' -f 3 | sort > actual-abi
++nm -D .libs/libgdk_pixbuf-2.0.so | grep " [GBDTR] " | cut -d ' ' -f 3 | sort > actual-abi
+ diff -u expected-abi actual-abi && rm expected-abi actual-abi
diff --git a/x11-libs/gtk+/gtk+-2.8.8.ebuild b/x11-libs/gtk+/gtk+-2.8.8.ebuild
new file mode 100644
index 000000000000..439996813b6c
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.8.8.ebuild
@@ -0,0 +1,149 @@
+# 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.8.ebuild,v 1.14 2006/09/14 14:20:08 dang Exp $
+
+inherit gnome.org flag-o-matic eutils debug
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gtk+-2-smoothscroll-r6.patch.bz2"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="debug doc jpeg tiff"
+
+RDEPEND="|| ( (
+			x11-libs/libXrender
+			x11-libs/libX11
+			x11-libs/libXi
+			x11-libs/libXt
+			x11-libs/libXext
+			x11-libs/libXinerama
+			x11-libs/libXcursor
+			x11-libs/libXrandr
+			x11-libs/libXfixes )
+		virtual/x11 )
+
+	>=dev-libs/glib-2.7.1
+	>=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
+			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
+	# add smoothscroll support for usability reasons
+	# http://bugzilla.gnome.org/show_bug.cgi?id=103811
+	epatch "${DISTDIR}"/${PN}-2-smoothscroll-r6.patch.bz2
+
+	# fix tests, see #118722
+	epatch "${FILESDIR}"/${PN}-gdk-pixbuf-testfix.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
+
+	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) \
+		--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."
+}