Fix problems with amd64 and eselect compiler, thanks to Kazuo Teramoto <kaz.rag@gmail.com> in bug 140564

Package-Manager: portage-2.1.1_pre5-r2

4 files changed, 36 insertions, 14 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 1922ea5afae8..124901b84e14 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.66 2006/07/19 13:59:29 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.67 2006/08/22 12:13:54 genstef Exp $
+
+  22 Aug 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/slmodem-2.9.11-modem-cc-makefile.patch,
+  slmodem-2.9.11_pre20051101.ebuild:
+  Fix problems with amd64 and eselect compiler, thanks to Kazuo Teramoto
+  <kaz.rag@gmail.com> in bug 140564
 
   27 May 2006; Stefan Schweizer <genstef@gentoo.org>
   files/slmodem-2.9.11-modem-makefile.patch:
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index 26c2219bb081..917634a070c8 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -1,3 +1,7 @@
+AUX slmodem-2.9.11-modem-cc-makefile.patch 350 RMD160 64b97f6d4f340369e499c2d26423fea9544c0bed SHA1 69ce8083aa33ba941831e55e8c5941f9d5ad61b3 SHA256 0b8d803f8bc4363be32d6fc318e1764ae8df3679d7dbf7242e980053b9ec1524
+MD5 61167b597b6d73eb3fea346ecfef4996 files/slmodem-2.9.11-modem-cc-makefile.patch 350
+RMD160 64b97f6d4f340369e499c2d26423fea9544c0bed files/slmodem-2.9.11-modem-cc-makefile.patch 350
+SHA256 0b8d803f8bc4363be32d6fc318e1764ae8df3679d7dbf7242e980053b9ec1524 files/slmodem-2.9.11-modem-cc-makefile.patch 350
 AUX slmodem-2.9.11-modem-makefile.patch 685 RMD160 dd8cd679c2afd7fd8ae7e1e1af5defe14514bfc4 SHA1 e630ad1b8d4bddbf1f42d0946e4fb2719c607183 SHA256 770f23caf7ebeebd03a0ab6a2e2e02740db9dd848ee104fb67033281690655a5
 MD5 a1cd437eecc5e84a38cc22929ea9f817 files/slmodem-2.9.11-modem-makefile.patch 685
 RMD160 dd8cd679c2afd7fd8ae7e1e1af5defe14514bfc4 files/slmodem-2.9.11-modem-makefile.patch 685
@@ -22,16 +26,16 @@ AUX slusb.hotplug 262 RMD160 6ccb14b19191da17b0352525399ec8560eb89c04 SHA1 79d92
 MD5 a5c2c40e3a6c4665033c97bb9088f03d files/slusb.hotplug 262
 RMD160 6ccb14b19191da17b0352525399ec8560eb89c04 files/slusb.hotplug 262
 SHA256 1806e732086915be8ca3c43d0abaf73bdde945eb1e11bd24a12c7309be4cdfed files/slusb.hotplug 262
-DIST slmodem-2.9.11-20051101.tar.gz 833644 RMD160 044dd97f763c68ff5c5609cb925146c5302bfb61 SHA256 d5c456b1bab05a1606f7deaf4d5f1b9151d23377e7eb421b81082f9285de5172
-DIST ungrab-winmodem.tar.gz 1872 RMD160 c7058f884ddf6345ddcd15c984364f4741464fbf SHA256 b9d966fa13b05876c2921f4bd030dfb151e6810958202010fab661d1689e4e11
-EBUILD slmodem-2.9.11_pre20051101.ebuild 4553 RMD160 bcee2a49530280dfb8a64fc8d968b6121b157ff7 SHA1 cb9bcb6c5f91fef6a67b9acffa0b0fdedf0f0dfb SHA256 3d67e49d9c726d0f43a43c4c27fa4d99b6e71425cc3ac8615ff89de90ac42df3
-MD5 906b86777d9a2c9b191327f34ca5d936 slmodem-2.9.11_pre20051101.ebuild 4553
-RMD160 bcee2a49530280dfb8a64fc8d968b6121b157ff7 slmodem-2.9.11_pre20051101.ebuild 4553
-SHA256 3d67e49d9c726d0f43a43c4c27fa4d99b6e71425cc3ac8615ff89de90ac42df3 slmodem-2.9.11_pre20051101.ebuild 4553
-MISC ChangeLog 14371 RMD160 4e786b0e92ac9fc7a25a0d9c5181d8388908b614 SHA1 168a7dd06361eba1670a20c687f38823cd35df22 SHA256 14456b21cf857aa6138b44fc1923962ab4de90aaf0589fae1e6ce46344c7c733
-MD5 8ad2260e11712c5dbe8493f74eeddb38 ChangeLog 14371
-RMD160 4e786b0e92ac9fc7a25a0d9c5181d8388908b614 ChangeLog 14371
-SHA256 14456b21cf857aa6138b44fc1923962ab4de90aaf0589fae1e6ce46344c7c733 ChangeLog 14371
+DIST slmodem-2.9.11-20051101.tar.gz 833644 RMD160 044dd97f763c68ff5c5609cb925146c5302bfb61 SHA1 bacd94800a83c86cc872c6afa75dfb3c90828815 SHA256 d5c456b1bab05a1606f7deaf4d5f1b9151d23377e7eb421b81082f9285de5172
+DIST ungrab-winmodem.tar.gz 1872 RMD160 c7058f884ddf6345ddcd15c984364f4741464fbf SHA1 d8c48969fd840b4f7b15f9d6b269470a44e4eed0 SHA256 b9d966fa13b05876c2921f4bd030dfb151e6810958202010fab661d1689e4e11
+EBUILD slmodem-2.9.11_pre20051101.ebuild 4619 RMD160 cfed55daf1c5d6fdd7607d2b5c28736fc4ceed49 SHA1 85d4c940fc793b0cbbdb25d814cdd60de7ed76e5 SHA256 71c708a1b978333292b311f357f08b44b6e4c434c755859f615757e873964813
+MD5 efea4cd18104c7257dd76d8b7830a418 slmodem-2.9.11_pre20051101.ebuild 4619
+RMD160 cfed55daf1c5d6fdd7607d2b5c28736fc4ceed49 slmodem-2.9.11_pre20051101.ebuild 4619
+SHA256 71c708a1b978333292b311f357f08b44b6e4c434c755859f615757e873964813 slmodem-2.9.11_pre20051101.ebuild 4619
+MISC ChangeLog 14620 RMD160 ded96bd05ffce87e24784ba7f79e4969b16926af SHA1 c0ee47bf55fd0eb31ffda6048a6cc6fad8f7fd5f SHA256 a86902958704dad32a0f58422a2acd5aa44944961f31c090c8ce7e45521bf4ab
+MD5 fa1ba1f1cc80362360261f5892acaa82 ChangeLog 14620
+RMD160 ded96bd05ffce87e24784ba7f79e4969b16926af ChangeLog 14620
+SHA256 a86902958704dad32a0f58422a2acd5aa44944961f31c090c8ce7e45521bf4ab ChangeLog 14620
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
diff --git a/net-dialup/slmodem/files/slmodem-2.9.11-modem-cc-makefile.patch b/net-dialup/slmodem/files/slmodem-2.9.11-modem-cc-makefile.patch
new file mode 100644
index 000000000000..cdcef462a085
--- /dev/null
+++ b/net-dialup/slmodem/files/slmodem-2.9.11-modem-cc-makefile.patch
@@ -0,0 +1,11 @@
+--- slmodem-2.9.11-20051101/modem/Makefile.orig	2006-08-22 08:45:44.000000000 -0300
++++ slmodem-2.9.11-20051101/modem/Makefile	2006-08-22 08:46:04.000000000 -0300
+@@ -13,7 +13,7 @@
+ #
+ ###########################################################################
+ 
+-CC:= gcc
++CC?= gcc
+ RM:= rm -f
+ 
+ CFLAGS+= -Wall -g -finline -I. -DCONFIG_DEBUG_MODEM
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild
index 67fe4476bc05..cbac71474945 100644
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild,v 1.7 2006/07/19 13:59:29 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild,v 1.8 2006/08/22 12:13:54 genstef Exp $
 
 inherit eutils linux-mod multilib
 
@@ -21,7 +21,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P/_pre/-}
 
 pkg_setup() {
-	has_multilib_profile && ABI=x86
+	use amd64 && multilib_toolchain_setup x86
 
 	MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem)"
 	if ! use amd64; then
@@ -44,6 +44,7 @@ src_unpack() {
 
 	cd "${S}"
 	epatch "${FILESDIR}/${P%%_*}-modem-makefile.patch"
+	epatch "${FILESDIR}/${P%%_*}-modem-cc-makefile.patch"
 	cd drivers
 	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" Makefile
 	convert_to_m Makefile
@@ -59,7 +60,7 @@ src_compile() {
 	fi
 	emake ${MAKE_PARAMS} modem || die "failed to build modem"
 
-	has_multilib_profile && ABI=${DEFAULT_ABI}
+	use amd64 && multilib_toolchain_setup amd64
 	linux-mod_src_compile
 }