Multilib fixes and use proper toolchain compiler.

(Portage version: 2.0.51.19)

3 files changed, 35 insertions, 29 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 9be0248c68cf..e9f20b6ed399 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.70 2005/03/03 21:35:03 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.71 2005/03/26 22:54:49 eradicator Exp $
+
+  26 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  wxGTK-2.4.2-r3.ebuild, wxGTK-2.5.3.ebuild:
+  Multilib fixes and use proper toolchain compiler.
 
   03 Mar 2005; Rob Cakebread <pythonhead@gentoo.org> wxGTK-2.4.2-r2.ebuild:
   Added menu.cpp patch
diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild
index 30d12488dd7e..318849317452 100644
--- a/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild,v 1.5 2005/01/16 10:56:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild,v 1.6 2005/03/26 22:54:49 eradicator Exp $
 
-inherit flag-o-matic eutils gnuconfig
+inherit flag-o-matic eutils gnuconfig multilib toolchain-funcs
 
 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
 HOMEPAGE="http://www.wxwidgets.org/"
@@ -68,6 +68,7 @@ src_compile() {
 	myconf="${myconf} `use_with opengl`"
 	myconf="${myconf} --with-gtk"
 	myconf="${myconf} `use_enable debug`"
+	myconf="${myconf} --libdir=/usr/$(get_libdir)"
 
 	if ! use no_wxgtk1 ; then
 		mkdir build_gtk
@@ -78,9 +79,9 @@ src_compile() {
 			--prefix=/usr \
 			--infodir=/usr/share/info \
 			--mandir=/usr/share/man || die "./configure failed"
-		emake || die "make gtk failed"
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk failed"
 		cd contrib/src
-		emake || die "make gtk contrib failed"
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk contrib failed"
 	fi
 	cd ${S}
 
@@ -94,9 +95,9 @@ src_compile() {
 			--prefix=/usr \
 			--infodir=/usr/share/info \
 			--mandir=/usr/share/man || die "./configure failed"
-		emake || die "make gtk2 failed"
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 failed"
 		cd contrib/src
-		emake || die "make gtk2 contrib failed"
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 contrib failed"
 
 		cd ${S}
 
@@ -111,10 +112,10 @@ src_compile() {
 				--infodir=/usr/share/info \
 				--mandir=/usr/share/man || die "./configure failed"
 
-			emake || die "make unicode failed"
+			emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode failed"
 
 			cd contrib/src
-			emake || die "make unicode contrib failed"
+			emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode contrib failed"
 		fi
 	fi
 }
@@ -122,23 +123,23 @@ src_compile() {
 src_install() {
 	if [ -e ${S}/build_gtk ] ; then
 		cd ${S}/build_gtk
-		einstall || die "install gtk failed"
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk failed"
 		cd contrib/src
-		einstall || die "install gtk contrib failed"
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk contrib failed"
 	fi
 
 	if [ -e ${S}/build_gtk2 ] ; then
 		cd ${S}/build_gtk2
-		einstall || die "install gtk2 failed"
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 failed"
 		cd contrib/src
-		einstall || die "install gtk2 contrib failed"
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 contrib failed"
 	fi
 
 	if [ -e ${S}/build_unicode ] ; then
 		cd ${S}/build_unicode
-		einstall || die "install unicode failed"
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode failed"
 		cd contrib/src
-		einstall || die "install unicode contrib failed"
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode contrib failed"
 	fi
 
 	# twp 20040830 wxGTK-2.4.2 forgets to install htmlproc.h; copy it manually
diff --git a/x11-libs/wxGTK/wxGTK-2.5.3.ebuild b/x11-libs/wxGTK/wxGTK-2.5.3.ebuild
index 4d37c4735079..b7201406d466 100644
--- a/x11-libs/wxGTK/wxGTK-2.5.3.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.5.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.5.3.ebuild,v 1.4 2005/01/16 10:56:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.5.3.ebuild,v 1.5 2005/03/26 22:54:49 eradicator Exp $
 
-inherit eutils gnuconfig
+inherit eutils gnuconfig multilib toolchain-funcs
 
 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
 HOMEPAGE="http://www.wxwidgets.org/"
@@ -60,6 +60,7 @@ src_compile() {
 	myconf="${myconf} `use_with opengl`"
 	myconf="${myconf} --with-gtk"
 	myconf="${myconf} `use_enable debug`"
+	myconf="${myconf} --libdir=/usr/$(get_libdir)"
 
 	if ! use no_wxgtk1 ; then
 		mkdir build_gtk
@@ -70,9 +71,9 @@ src_compile() {
 			--prefix=/usr \
 			--infodir=/usr/share/info \
 			--mandir=/usr/share/man || die "./configure failed"
-		emake || die "make gtk failed"
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk failed"
 		cd contrib/src
-		emake || die "make gtk contrib failed"
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk contrib failed"
 	fi
 	cd ${S}
 
@@ -86,9 +87,9 @@ src_compile() {
 			--prefix=/usr \
 			--infodir=/usr/share/info \
 			--mandir=/usr/share/man || die "./configure failed"
-		emake || die "make gtk2 failed"
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 failed"
 		cd contrib/src
-		emake || die "make gtk2 contrib failed"
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 contrib failed"
 
 		cd ${S}
 
@@ -103,10 +104,10 @@ src_compile() {
 				--infodir=/usr/share/info \
 				--mandir=/usr/share/man || die "./configure failed"
 
-			emake || die "make unicode failed"
+			emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode failed"
 
 			cd contrib/src
-			emake || die "make unicode contrib failed"
+			emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode contrib failed"
 		fi
 	fi
 }
@@ -114,23 +115,23 @@ src_compile() {
 src_install() {
 	if [ -e ${S}/build_gtk ] ; then
 		cd ${S}/build_gtk
-		einstall || die "install gtk failed"
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk failed"
 		cd contrib/src
-		einstall || die "install gtk contrib failed"
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk contrib failed"
 	fi
 
 	if [ -e ${S}/build_unicode ] ; then
 		cd ${S}/build_unicode
-		einstall || die "install unicode failed"
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode failed"
 		cd contrib/src
-		einstall || die "install unicode contrib failed"
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode contrib failed"
 	fi
 
 	if [ -e ${S}/build_gtk2 ] ; then
 		cd ${S}/build_gtk2
-		einstall || die "install gtk2 failed"
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 failed"
 		cd contrib/src
-		einstall || die "install gtk2 contrib failed"
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 contrib failed"
 	fi
 
 	# /usr/bin/wx-config is a symlink to the real wx-config. 2.4 and 2.5