added a patch that puts the config files for gtk in an arch specific directory on amd64 so that the 32bit and 64bit versions dont clash

6 files changed, 53 insertions, 28 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index ca159a7a80f9..f71ed3f46307 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.113 2004/08/19 13:13:48 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.114 2004/08/22 22:01:47 lv Exp $
+
+  22 Aug 2004; Travis Tilley <lv@gentoo.org> gtk+-2.4.4.ebuild,
+  gtk+-2.4.7.ebuild:
+  added a patch that puts the config files for gtk in an arch specific directory
+  on amd64 so that the 32bit and 64bit versions dont clash
 
 *gtk+-2.4.7 (19 Aug 2004)
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 31426e2c3943..7e20399b24ec 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,31 +1,31 @@
-MD5 b4551ad02bee9300d365a171cdfe3637 ChangeLog 17452
-MD5 745da6d8feb5c80670d33a3c43400bf5 gtk+-1.2.10-r10.ebuild 1719
+MD5 f52ef83c2b1442cfe93978cf73048912 gtk+-1.2.10-r11.ebuild 1814
 MD5 c11d7af6bd3c90b412c77d1868d07750 gtk+-2.2.4-r1.ebuild 2414
+MD5 1a48085b2566ea7c9dabefdad114d75c gtk+-2.4.7.ebuild 2663
+MD5 745da6d8feb5c80670d33a3c43400bf5 gtk+-1.2.10-r10.ebuild 1719
+MD5 89f67b6c9399ecc057a44451c50e7bb0 gtk+-2.4.4.ebuild 2616
 MD5 7572f07f74e9cf6573ce75cd9fbfaef0 gtk+-2.4.0-r1.ebuild 2400
 MD5 6880289256085cb8cb69a597d8098333 gtk+-2.4.1.ebuild 2238
+MD5 b4551ad02bee9300d365a171cdfe3637 ChangeLog 17452
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 fe3cd76194831c7f63d03688eb872550 gtk+-2.4.3-r1.ebuild 2358
 MD5 408bfe64dce99ca0abfdcb6da7596116 gtk+-2.4.3.ebuild 2257
-MD5 fd92e2c9e45454e1ba7273d8a902a05e gtk+-2.4.4.ebuild 2220
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 38b530c2c771c15a8598dd088660d791 gtk+-2.4.7.ebuild 2267
-MD5 264f07045948900c7457af906640d922 gtk+-1.2.10-r11.ebuild 1792
+MD5 18620b7ba0f3cf18b663d7e314669aa7 files/digest-gtk+-2.4.1 64
+MD5 9b79edfc3c0ad59155dc0dff5fd6d4a5 files/digest-gtk+-2.4.3 64
+MD5 1010233f6bd82db56f1e6efa4cb7327a files/digest-gtk+-2.4.4 133
+MD5 3cbd11bc85612e3d8111ed4d030f27dd files/digest-gtk+-2.4.7 133
 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 897d9bcb56e9f9303b1e35c6f521ae35 files/gtk+-2.2-notificationarea_loop.patch 440
+MD5 df6efc98861d335b1a09eab5c6011620 files/gtk+-2.4-smoothscroll.patch 29006
+MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
+MD5 c979d9262eccf5bdf8dbfa50b8d57b13 files/gtk+-2-xftprefs.patch 6711
+MD5 0ab7928b5279c384b39e7aaf56e3aa69 files/gtk+-wm.patch 11496
 MD5 a4bb1381a10a526da3a6f968a8b3a4a2 files/digest-gtk+-2.2.4-r1 64
 MD5 d53a0b86cfefe71e851e14a48b2251fd files/digest-gtk+-2.4.0-r1 64
-MD5 18620b7ba0f3cf18b663d7e314669aa7 files/digest-gtk+-2.4.1 64
-MD5 9b79edfc3c0ad59155dc0dff5fd6d4a5 files/digest-gtk+-2.4.3 64
 MD5 9b79edfc3c0ad59155dc0dff5fd6d4a5 files/digest-gtk+-2.4.3-r1 64
-MD5 8ee4e2846ed44ba2856dd8ae364d38d8 files/digest-gtk+-2.4.4 64
-MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
-MD5 c979d9262eccf5bdf8dbfa50b8d57b13 files/gtk+-2-xftprefs.patch 6711
-MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
-MD5 897d9bcb56e9f9303b1e35c6f521ae35 files/gtk+-2.2-notificationarea_loop.patch 440
-MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
 MD5 aebd5e92c0aec62bee7c49e0b24b2add files/gtk+-2.4.0-uimanager-zero-becomes-null.patch 1116
-MD5 c036eedc28ac4fb298c20ef606d53935 files/gtk+-2.4.1-define_sensible_icon_theme.patch 582
 MD5 4b1c2661ed134450ff6357781e7ab262 files/gtk+-2.4.x-filesel-navbuttons.patch.bz2 12267
-MD5 0ab7928b5279c384b39e7aaf56e3aa69 files/gtk+-wm.patch 11496
-MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
-MD5 d675fdf10da4dc4b223b36809ae0457a files/digest-gtk+-2.4.7 64
-MD5 df6efc98861d335b1a09eab5c6011620 files/gtk+-2.4-smoothscroll.patch 29006
+MD5 c036eedc28ac4fb298c20ef606d53935 files/gtk+-2.4.1-define_sensible_icon_theme.patch 582
+MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.4.4 b/x11-libs/gtk+/files/digest-gtk+-2.4.4
index 3e590b8e5e69..779c41e53ba1 100644
--- a/x11-libs/gtk+/files/digest-gtk+-2.4.4
+++ b/x11-libs/gtk+/files/digest-gtk+-2.4.4
@@ -1 +1,2 @@
 MD5 6e6ffc9003aee319ed99336b147ad19f gtk+-2.4.4.tar.bz2 9325261
+MD5 8608e20184bd9f4d3eca98d7c01c98ee gtk+-2.4.1-lib64.patch.bz2 6982
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.4.7 b/x11-libs/gtk+/files/digest-gtk+-2.4.7
index 06e36acdb8ff..935559c4974c 100644
--- a/x11-libs/gtk+/files/digest-gtk+-2.4.7
+++ b/x11-libs/gtk+/files/digest-gtk+-2.4.7
@@ -1 +1,2 @@
 MD5 2cd21398a463ef205e6e7b28e54b936d gtk+-2.4.7.tar.bz2 8920441
+MD5 8608e20184bd9f4d3eca98d7c01c98ee gtk+-2.4.1-lib64.patch.bz2 6982
diff --git a/x11-libs/gtk+/gtk+-2.4.4.ebuild b/x11-libs/gtk+/gtk+-2.4.4.ebuild
index 9ba19f7eb01a..2d2090ffecb4 100644
--- a/x11-libs/gtk+/gtk+-2.4.4.ebuild
+++ b/x11-libs/gtk+/gtk+-2.4.4.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.4.ebuild,v 1.6 2004/08/19 20:28:47 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.4.ebuild,v 1.7 2004/08/22 22:01:47 lv Exp $
 
 inherit libtool flag-o-matic eutils
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.4/${P}.tar.bz2"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.4/${P}.tar.bz2
+	amd64? ( http://dev.gentoo.org/~lv/gtk+-2.4.1-lib64.patch.bz2 )"
 
 LICENSE="LGPL-2"
 SLOT="2"
@@ -40,8 +41,12 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch
 	# define a sensible default icon theme
 	epatch ${FILESDIR}/${PN}-2.4.1-define_sensible_icon_theme.patch
+	# use an arch-specific config directory so that 32bit and 64bit versions
+	# dont clash on multilib systems
+	use amd64 && epatch ${DISTDIR}/gtk+-2.4.1-lib64.patch.bz2
 
 	autoconf || die
+	automake || die
 
 }
 
@@ -69,6 +74,7 @@ src_compile() {
 src_install() {
 
 	dodir /etc/gtk-2.0
+	use amd64 && dodir /etc/gtk-2.0/${CHOST}
 
 	make DESTDIR=${D} install || die
 
@@ -82,8 +88,11 @@ src_install() {
 
 pkg_postinst() {
 
-	gtk-query-immodules-2.0 >	/etc/gtk-2.0/gtk.immodules
-	gdk-pixbuf-query-loaders >	/etc/gtk-2.0/gdk-pixbuf.loaders
+	use amd64 && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
+
+	gtk-query-immodules-2.0 >	/${GTK2_CONFDIR}/gtk.immodules
+	gdk-pixbuf-query-loaders >	/${GTK2_CONFDIR}/gdk-pixbuf.loaders
 
 	einfo "For gtk themes to work correctly after an update, you might have to rebuild your theme engines."
 	einfo "Executing 'qpkg -f -nc /usr/lib/gtk-2.0/2.2.0/engines | xargs emerge' should do the trick if"
diff --git a/x11-libs/gtk+/gtk+-2.4.7.ebuild b/x11-libs/gtk+/gtk+-2.4.7.ebuild
index 181b5d2b837d..806003f07b7c 100644
--- a/x11-libs/gtk+/gtk+-2.4.7.ebuild
+++ b/x11-libs/gtk+/gtk+-2.4.7.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.7.ebuild,v 1.1 2004/08/19 13:13:48 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.7.ebuild,v 1.2 2004/08/22 22:01:47 lv Exp $
 
 inherit libtool flag-o-matic eutils
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.4/${P}.tar.bz2"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.4/${P}.tar.bz2
+	amd64? ( http://dev.gentoo.org/~lv/gtk+-2.4.1-lib64.patch.bz2 )"
 
 LICENSE="LGPL-2"
 SLOT="2"
@@ -40,8 +41,12 @@ src_unpack() {
 	# add smoothscroll support for usability reasons
 	# http://bugzilla.gnome.org/show_bug.cgi?id=103811
 	epatch ${FILESDIR}/${PN}-2.4-smoothscroll.patch
+	# use an arch-specific config directory so that 32bit and 64bit versions
+	# dont clash on multilib systems
+	use amd64 && epatch ${DISTDIR}/gtk+-2.4.1-lib64.patch.bz2
 
 	autoconf || die
+	automake || die
 
 }
 
@@ -69,6 +74,7 @@ src_compile() {
 src_install() {
 
 	dodir /etc/gtk-2.0
+	use amd64 && dodir /etc/gtk-2.0/${CHOST}
 
 	make DESTDIR=${D} install || die
 
@@ -82,8 +88,11 @@ src_install() {
 
 pkg_postinst() {
 
-	gtk-query-immodules-2.0 >	/etc/gtk-2.0/gtk.immodules
-	gdk-pixbuf-query-loaders >	/etc/gtk-2.0/gdk-pixbuf.loaders
+	use amd64 && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
+
+	gtk-query-immodules-2.0 >	/${GTK2_CONFDIR}/gtk.immodules
+	gdk-pixbuf-query-loaders >	/${GTK2_CONFDIR}/gdk-pixbuf.loaders
 
 	einfo "For gtk themes to work correctly after an update, you might have to rebuild your theme engines."
 	einfo "Executing 'qpkg -f -nc /usr/lib/gtk-2.0/2.2.0/engines | xargs emerge' should do the trick if"