Updated the multilib patch for 2.8, bug 101289

Package-Manager: portage-2.0.51.22-r2

5 files changed, 209 insertions, 12 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index b060adf4d98b..059612a7d6eb 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.172 2005/08/16 01:37:05 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.173 2005/08/17 17:53:03 herbs Exp $
+
+*gtk+-2.8.0-r1 (17 Aug 2005)
+
+  17 Aug 2005; Herbie Hopkins <herbs@gentoo.org>
+  +files/gtk+-2.8.0-multilib.patch, +gtk+-2.8.0-r1.ebuild:
+  Updated the multilib patch for 2.8, bug 101289
 
 *gtk+-2.8.0 (15 Aug 2005)
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 4db287b2bfd9..ae222f42f73b 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,20 +1,33 @@
-MD5 1c9aa56acd909ab637d84408a9a1ddf9 ChangeLog 24589
-MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 88d6d5cc6a5a4f0e0426646667134046 gtk+-1.2.10-r11.ebuild 1831
-MD5 c23a87ba8c10d2a6b0733b3bcb088d73 gtk+-2.6.8.ebuild 2848
 MD5 c6c3805d8435d72c357e32e4277cb948 gtk+-2.8.0.ebuild 2935
-MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 MD5 4719d1845d3618d0e464d397289e8577 gtk+-2.6.4-r1.ebuild 2960
+MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719
+MD5 c23a87ba8c10d2a6b0733b3bcb088d73 gtk+-2.6.8.ebuild 2848
+MD5 18edfdeaf21ee671c0abb5b7aad40549 gtk+-2.8.0-r1.ebuild 2810
 MD5 4be3562f71af8184c46d141fba5e6a8b gtk+-2.6.7.ebuild 2838
-MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
-MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
+MD5 4d047fc2efdc83c714f736eb6c9f07e7 ChangeLog 24773
+MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
+MD5 9140d07ec4cf965b2041cf5b7f128743 files/digest-gtk+-2.6.7 208
 MD5 611d813de53655fa348ad470ee9c7179 files/digest-gtk+-2.6.8 208
 MD5 03586690fef8f3011aa496c446eecb92 files/digest-gtk+-2.8.0 137
-MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
-MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
-MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
+MD5 5f35263753f0ad976c13f501247b8d51 files/gtk+-2.8.0-multilib.patch 2456
+MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
+MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
 MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
+MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
+MD5 0ec83a4bf20f79d85eb2976b58c39465 files/gtk+-1.2.10-m4.patch 220
 MD5 480ef570b5082ad4677f50eb110ef1e0 files/digest-gtk+-2.6.4-r1 208
+MD5 03586690fef8f3011aa496c446eecb92 files/digest-gtk+-2.8.0-r1 137
 MD5 84c943ddbc93a756c745f969e9d542e2 files/gtk+-2.6.4-bmp_reject_corrupt.patch 1256
-MD5 9140d07ec4cf965b2041cf5b7f128743 files/digest-gtk+-2.6.7 208
-MD5 0ec83a4bf20f79d85eb2976b58c39465 files/gtk+-1.2.10-m4.patch 220
+MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
+MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDA3mv2G5bA0cA/ScRAoGSAJ4pSr75ypIzYPiYAGq+mG884PVp3QCcDa8v
+h6zbPA1Fu06kDLxjoyA3hn8=
+=/pSp
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.0-r1 b/x11-libs/gtk+/files/digest-gtk+-2.8.0-r1
new file mode 100644
index 000000000000..85772c1bb2be
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.8.0-r1
@@ -0,0 +1,2 @@
+MD5 e169d35239bf9d23bdd84c473e3c4917 gtk+-2.8.0.tar.bz2 11810118
+MD5 ad9550c814fc5e24d2f03aa2dc3d5b8f gtk+-2-smoothscroll-r6.patch 18162
diff --git a/x11-libs/gtk+/files/gtk+-2.8.0-multilib.patch b/x11-libs/gtk+/files/gtk+-2.8.0-multilib.patch
new file mode 100644
index 000000000000..4a1b73dc7e59
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.8.0-multilib.patch
@@ -0,0 +1,63 @@
+diff -urN gtk+-2.8.0.orig/gdk-pixbuf/Makefile.am gtk+-2.8.0/gdk-pixbuf/Makefile.am
+--- gtk+-2.8.0.orig/gdk-pixbuf/Makefile.am	2005-07-09 01:10:11.000000000 +0100
++++ gtk+-2.8.0/gdk-pixbuf/Makefile.am	2005-08-17 17:59:20.000000000 +0100
+@@ -271,6 +271,7 @@
+ 	-I$(top_srcdir)/gdk-pixbuf 		\
+ 	-I$(top_builddir)/gdk-pixbuf 		\
+ 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
++	-DHOST=\"$(host_triplet)\"		\
+ 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
+ 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
+ 	-DG_DISABLE_DEPRECATED			\
+diff -urN gtk+-2.8.0.orig/gdk-pixbuf/Makefile.in gtk+-2.8.0/gdk-pixbuf/Makefile.in
+--- gtk+-2.8.0.orig/gdk-pixbuf/Makefile.in	2005-08-17 17:38:06.000000000 +0100
++++ gtk+-2.8.0/gdk-pixbuf/Makefile.in	2005-08-17 17:59:35.000000000 +0100
+@@ -504,6 +504,7 @@
+ 	-I$(top_srcdir)/gdk-pixbuf 		\
+ 	-I$(top_builddir)/gdk-pixbuf 		\
+ 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
++	-DHOST=\"$(host_triplet)\"		\
+ 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
+ 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
+ 	-DG_DISABLE_DEPRECATED			\
+diff -urN gtk+-2.8.0.orig/gdk-pixbuf/gdk-pixbuf-io.c gtk+-2.8.0/gdk-pixbuf/gdk-pixbuf-io.c
+--- gtk+-2.8.0.orig/gdk-pixbuf/gdk-pixbuf-io.c	2005-07-22 16:34:32.000000000 +0100
++++ gtk+-2.8.0/gdk-pixbuf/gdk-pixbuf-io.c	2005-08-17 17:44:48.000000000 +0100
+@@ -276,8 +276,15 @@
+   gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
+ 
+   if (!result)
+-	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
+-
++  {
++	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", HOST, "gdk-pixbuf.loaders", NULL);
++	  if (!g_file_test (result, G_FILE_TEST_EXISTS))
++	  {
++		  g_free (result);
++
++		  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
++	  }
++  }
+   return result;
+ }
+ 
+diff -urN gtk+-2.8.0.orig/gtk/gtkrc.c gtk+-2.8.0/gtk/gtkrc.c
+--- gtk+-2.8.0.orig/gtk/gtkrc.c	2005-04-06 14:49:28.000000000 +0100
++++ gtk+-2.8.0/gtk/gtkrc.c	2005-08-17 17:54:36.000000000 +0100
+@@ -364,7 +364,15 @@
+       if (im_module_file)
+ 	result = g_strdup (im_module_file);
+       else
+-	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
++	{
++	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", GTK_HOST, "gtk.immodules", NULL);
++	  if (!g_file_test (result, G_FILE_TEST_EXISTS))
++	    {
++	      g_free (result);
++	      
++	      result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
++	    }
++	}
+     }
+ 
+   return result;
diff --git a/x11-libs/gtk+/gtk+-2.8.0-r1.ebuild b/x11-libs/gtk+/gtk+-2.8.0-r1.ebuild
new file mode 100644
index 000000000000..74fe87731432
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.8.0-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.0-r1.ebuild,v 1.1 2005/08/17 17:53:03 herbs 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"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc tiff jpeg static"
+
+RDEPEND="virtual/x11
+	>=dev-libs/glib-2.7.1
+	>=dev-libs/atk-1.0.1
+	>=x11-libs/pango-1.9
+	>=x11-libs/cairo-0.9.2
+	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}
+	>=dev-util/pkgconfig-0.9
+	sys-devel/autoconf
+	>=sys-devel/automake-1.7.9
+	doc? (
+		>=dev-util/gtk-doc-1.4
+		~app-text/docbook-xml-dtd-4.1.2 )"
+
+
+pkg_setup() {
+	# 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
+
+	cd ${S}
+	# use an arch-specific config directory so that 32bit and 64bit versions
+	# dont clash on multilib systems
+	has_multilib_profile && epatch ${FILESDIR}/gtk+-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.
+	use x86 && [ "$(get_libdir)" == "lib32" ] && epatch ${FILESDIR}/gtk+-2.8.0-multilib.patch
+
+	# patch for ppc64 (#64359)
+	use ppc64 && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch
+	use ppc64 && append-flags -mminimal-toc
+
+	autoconf || die
+	automake || die
+
+	epunt_cxx
+
+}
+
+src_compile() {
+
+	# bug 8762
+	replace-flags "-O3" "-O2"
+
+	econf \
+		`use_enable doc gtk-doc` \
+		`use_with jpeg libjpeg` \
+		`use_with tiff libtiff` \
+		`use_enable static` \
+		--with-libpng \
+		--with-gdktarget=x11 \
+		--with-xinput \
+		|| die
+
+	# gtk+ isn't multithread friendly due to some obscure code generation bug
+	emake -j1 || die
+
+}
+
+src_install() {
+
+	dodir ${GTK2_CONFDIR}
+
+	make DESTDIR=${D} install || die
+
+	# 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() {
+
+	gtk-query-immodules-2.0 >	/${GTK2_CONFDIR}/gtk.immodules
+	gdk-pixbuf-query-loaders >	/${GTK2_CONFDIR}/gdk-pixbuf.loaders
+
+}