we don't need the use x86 && [[ LIBDIR == lib32 ]] hack anymore

(Portage version: 2.1.2-r9)

3 files changed, 7 insertions, 17 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index f8e31a6a3066..409f2954bed9 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.298 2007/01/25 17:44:43 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.299 2007/02/21 12:54:25 blubb Exp $
+
+  21 Feb 2007; Simon Stelling <blubb@gentoo.org> gtk+-2.10.6.ebuild,
+  gtk+-2.10.9.ebuild:
+  we don't need the use x86 && [[ LIBDIR == lib32 ]] hack anymore
 
 *gtk+-2.10.9 (25 Jan 2007)
 
diff --git a/x11-libs/gtk+/gtk+-2.10.6.ebuild b/x11-libs/gtk+/gtk+-2.10.6.ebuild
index ffe4ecfad22b..ef12f770cb55 100644
--- a/x11-libs/gtk+/gtk+-2.10.6.ebuild
+++ b/x11-libs/gtk+/gtk+-2.10.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.6.ebuild,v 1.13 2007/01/05 04:07:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.6.ebuild,v 1.14 2007/02/21 12:54:25 blubb Exp $
 
 inherit gnome.org flag-o-matic eutils autotools virtualx
 
@@ -56,7 +56,6 @@ pkg_setup() {
 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}
 }
 
@@ -71,12 +70,6 @@ src_unpack() {
 	# 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
-
 	# -O3 and company cause random crashes in applications. Bug #133469
 	replace-flags -O3 -O2
 	strip-flags
diff --git a/x11-libs/gtk+/gtk+-2.10.9.ebuild b/x11-libs/gtk+/gtk+-2.10.9.ebuild
index b81a00727f63..2bf934ba4c60 100644
--- a/x11-libs/gtk+/gtk+-2.10.9.ebuild
+++ b/x11-libs/gtk+/gtk+-2.10.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.9.ebuild,v 1.1 2007/01/25 17:44:43 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.9.ebuild,v 1.2 2007/02/21 12:54:25 blubb Exp $
 
 inherit gnome.org flag-o-matic eutils autotools virtualx
 
@@ -56,7 +56,6 @@ pkg_setup() {
 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}
 }
 
@@ -71,12 +70,6 @@ src_unpack() {
 	# 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
-
 	# Revert DND change that makes mozilla products DND broken
 	EPATCH_OPTS="-R" epatch "${FILESDIR}/${PN}-2.10.7-mozilla-dnd-fix.patch"