Fix cross compiling thanks to Josu López Fernández <zamorate@zamorate.net> in bug...

Package-Manager: portage-2.1_rc4-r1

diff --git a/sys-apps/apmd/ChangeLog b/sys-apps/apmd/ChangeLog
index f142ca2cc09233456dd8caeeffda326637c5e740..a506f6656842d7c92b1408b38c38316a9c6b6feb 100644 (file)
--- a/sys-apps/apmd/ChangeLog
+++ b/sys-apps/apmd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/apmd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.31 2006/05/14 21:19:03 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.32 2006/06/05 09:56:08 genstef Exp $
+
+  05 Jun 2006; Stefan Schweizer <genstef@gentoo.org> apmd-3.2.1_p4.ebuild,
+  apmd-3.2.2_p5.ebuild:
+  Fix cross compiling thanks to Josu López Fernández <zamorate@zamorate.net>
+  in bug 134104
 
   14 May 2006; Mark Loeser <halcy0n@gentoo.org> apmd-3.2.2_p5.ebuild:
   Stable on x86; bug #131757

diff --git a/sys-apps/apmd/Manifest b/sys-apps/apmd/Manifest
index 4346caa75d2682c983e9aab6e3ec4de125064023..6fa57b71fb7bb8ab74f062806dadcfde3a6cefca 100644 (file)
--- a/sys-apps/apmd/Manifest
+++ b/sys-apps/apmd/Manifest
@@ -1,61 +1,61 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX apmd-3.2.0.kernel26x.patch 627 RMD160 6d3c919f9032c418b95ea4544d137c383048838d SHA1 8a309596322fb6098e94e5f0002818eda8b9f718 SHA256 5cb5c097dcf18a8e00f16c36e96bf1acb460a4aaa59e36cc14634f22ce68aebf size 627
+AUX apmd-3.2.0.kernel26x.patch 627 RMD160 6d3c919f9032c418b95ea4544d137c383048838d SHA1 8a309596322fb6098e94e5f0002818eda8b9f718 SHA256 5cb5c097dcf18a8e00f16c36e96bf1acb460a4aaa59e36cc14634f22ce68aebf
 MD5 bed1c6668552bbf528df267c302a75eb files/apmd-3.2.0.kernel26x.patch 627
 RMD160 6d3c919f9032c418b95ea4544d137c383048838d files/apmd-3.2.0.kernel26x.patch 627
 SHA256 5cb5c097dcf18a8e00f16c36e96bf1acb460a4aaa59e36cc14634f22ce68aebf files/apmd-3.2.0.kernel26x.patch 627
-AUX apmd-no-on_ac_power_script.patch 4057 RMD160 fbfafa74939d219daf11d7d964bb820f95072cce SHA1 1ff59af7fc54df593a585f091b25c794f332f175 SHA256 32d85e1328426482693a29305bc8c892e232ddb628b36b6818cfa3cb9099820c size 4057
+AUX apmd-no-on_ac_power_script.patch 4057 RMD160 fbfafa74939d219daf11d7d964bb820f95072cce SHA1 1ff59af7fc54df593a585f091b25c794f332f175 SHA256 32d85e1328426482693a29305bc8c892e232ddb628b36b6818cfa3cb9099820c
 MD5 5e54c304ecfa384d9f8295aab9fb1b7a files/apmd-no-on_ac_power_script.patch 4057
 RMD160 fbfafa74939d219daf11d7d964bb820f95072cce files/apmd-no-on_ac_power_script.patch 4057
 SHA256 32d85e1328426482693a29305bc8c892e232ddb628b36b6818cfa3cb9099820c files/apmd-no-on_ac_power_script.patch 4057
-AUX apmd.confd 161 RMD160 b9017e4fdcb4554c6c7b67d560efe2135f88f310 SHA1 4e1f966e936a0fe94ff5991b3773b60f4789b1a0 SHA256 3e984cccf976443ada013ea80a759b47a3c618cdc036b5979bc348bb26210957 size 161
+AUX apmd.confd 161 RMD160 b9017e4fdcb4554c6c7b67d560efe2135f88f310 SHA1 4e1f966e936a0fe94ff5991b3773b60f4789b1a0 SHA256 3e984cccf976443ada013ea80a759b47a3c618cdc036b5979bc348bb26210957
 MD5 5aa18e3b8ad79d8893bddb038e29ab98 files/apmd.confd 161
 RMD160 b9017e4fdcb4554c6c7b67d560efe2135f88f310 files/apmd.confd 161
 SHA256 3e984cccf976443ada013ea80a759b47a3c618cdc036b5979bc348bb26210957 files/apmd.confd 161
-AUX apmd.kernel26x.patch 644 RMD160 43dd4216fcf97ea79a4fbfa94a794f4cd2e4f70b SHA1 944649193e1c351e42476f677a90b4f308eea912 SHA256 eb1a65c3c165197200f24dfe8495182e36b88ab0c5df9912be8b74d7322b2e86 size 644
+AUX apmd.kernel26x.patch 644 RMD160 43dd4216fcf97ea79a4fbfa94a794f4cd2e4f70b SHA1 944649193e1c351e42476f677a90b4f308eea912 SHA256 eb1a65c3c165197200f24dfe8495182e36b88ab0c5df9912be8b74d7322b2e86
 MD5 02fc246d5b2fde52708927cb672239f1 files/apmd.kernel26x.patch 644
 RMD160 43dd4216fcf97ea79a4fbfa94a794f4cd2e4f70b files/apmd.kernel26x.patch 644
 SHA256 eb1a65c3c165197200f24dfe8495182e36b88ab0c5df9912be8b74d7322b2e86 files/apmd.kernel26x.patch 644
-AUX apmd.rc6 672 RMD160 86ce76611e496f65bbc174995f7575b06bde333b SHA1 5e3626bdd4aeea147cb01b7322a7b9e3fe1287d7 SHA256 121ad43e5da300f36d5536aa3ddc6f0c41c612063b22c3d033832fe9f0dde34d size 672
+AUX apmd.rc6 672 RMD160 86ce76611e496f65bbc174995f7575b06bde333b SHA1 5e3626bdd4aeea147cb01b7322a7b9e3fe1287d7 SHA256 121ad43e5da300f36d5536aa3ddc6f0c41c612063b22c3d033832fe9f0dde34d
 MD5 bdb989641f5be7797a3232a8691ebc66 files/apmd.rc6 672
 RMD160 86ce76611e496f65bbc174995f7575b06bde333b files/apmd.rc6 672
 SHA256 121ad43e5da300f36d5536aa3ddc6f0c41c612063b22c3d033832fe9f0dde34d files/apmd.rc6 672
-AUX apmsleep.c.diff 367 RMD160 f2a178039d1375e66e1eea065ea1a67a845d1ccc SHA1 059b08ade7302b2a3bddf43514ee797e4de90ed0 SHA256 d5249757b83d832e3d0042ba5dee8856c6b21f7420a2fa62fc35c63e461a9548 size 367
+AUX apmsleep.c.diff 367 RMD160 f2a178039d1375e66e1eea065ea1a67a845d1ccc SHA1 059b08ade7302b2a3bddf43514ee797e4de90ed0 SHA256 d5249757b83d832e3d0042ba5dee8856c6b21f7420a2fa62fc35c63e461a9548
 MD5 ad21c10734c08e19968e2c8c9560957c files/apmsleep.c.diff 367
 RMD160 f2a178039d1375e66e1eea065ea1a67a845d1ccc files/apmsleep.c.diff 367
 SHA256 d5249757b83d832e3d0042ba5dee8856c6b21f7420a2fa62fc35c63e461a9548 files/apmsleep.c.diff 367
-AUX apmsleep.c.diff.3.2.0 301 RMD160 2fe32822ce93d429d36dd5b7ec81bf0ae842b147 SHA1 ffc1055be9a7566119723cdd1580e9d89f399936 SHA256 d168aeddbf9926b9f104f586d2332f7770113d29bfd12399a1c03b739f39dcc1 size 301
+AUX apmsleep.c.diff.3.2.0 301 RMD160 2fe32822ce93d429d36dd5b7ec81bf0ae842b147 SHA1 ffc1055be9a7566119723cdd1580e9d89f399936 SHA256 d168aeddbf9926b9f104f586d2332f7770113d29bfd12399a1c03b739f39dcc1
 MD5 253b79375ab72606e4fdf89109ed2c03 files/apmsleep.c.diff.3.2.0 301
 RMD160 2fe32822ce93d429d36dd5b7ec81bf0ae842b147 files/apmsleep.c.diff.3.2.0 301
 SHA256 d168aeddbf9926b9f104f586d2332f7770113d29bfd12399a1c03b739f39dcc1 files/apmsleep.c.diff.3.2.0 301
-DIST apmd-3.0.2.tar.gz 80489 size 80489
-DIST apmd_3.2.0.orig.tar.gz 71686 size 71686
-DIST apmd_3.2.1-4.diff.gz 22350 RMD160 aaafdc846e7163e94d1cbef4d1795eb791898e87 SHA256 438e3e7024c37873c6ba7fdeb2581b11644e0b2604889dd5fb90aa6de482e59a size 22350
-DIST apmd_3.2.1.orig.tar.gz 72610 RMD160 3dffd794f819346be4891c64d38299835c001664 SHA256 3224da73d3f803114d5d729c1f750ccdc49bca5b197222fd2f5c43840988fc88 size 72610
-DIST apmd_3.2.2-5.diff.gz 28232 RMD160 b82ad14bdcdcab149df0ae1b08c4dba7a6631c53 SHA256 b67021ab7dfb2d3b21bd12ba42fcc5f46481680ac640dafe9fd90d076d19a73d size 28232
-DIST apmd_3.2.2.orig.tar.gz 72757 RMD160 d6433f4b8cd537e574fde2df56f45982b8da13aa SHA256 7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d size 72757
-EBUILD apmd-3.0.2-r3.ebuild 1933 RMD160 02a38c3659bf500fcebdc230b9cdf9dc015867b6 SHA1 3bbf254087ee6599daae61205965fec88753a26e SHA256 0b38e0d39325c972aa23ef767d472c130dcb120b98e6bf4b42076ab63135f165 size 1933
+DIST apmd-3.0.2.tar.gz 80489
+DIST apmd_3.2.0.orig.tar.gz 71686
+DIST apmd_3.2.1-4.diff.gz 22350 RMD160 aaafdc846e7163e94d1cbef4d1795eb791898e87 SHA256 438e3e7024c37873c6ba7fdeb2581b11644e0b2604889dd5fb90aa6de482e59a
+DIST apmd_3.2.1.orig.tar.gz 72610 RMD160 3dffd794f819346be4891c64d38299835c001664 SHA256 3224da73d3f803114d5d729c1f750ccdc49bca5b197222fd2f5c43840988fc88
+DIST apmd_3.2.2-5.diff.gz 28232 RMD160 b82ad14bdcdcab149df0ae1b08c4dba7a6631c53 SHA1 2c13a569590f3b00f8223cd796ce882aeec1a8aa SHA256 b67021ab7dfb2d3b21bd12ba42fcc5f46481680ac640dafe9fd90d076d19a73d
+DIST apmd_3.2.2.orig.tar.gz 72757 RMD160 d6433f4b8cd537e574fde2df56f45982b8da13aa SHA1 2697ba78724a22b76e871b27363b6bdefa9baa38 SHA256 7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d
+EBUILD apmd-3.0.2-r3.ebuild 1933 RMD160 02a38c3659bf500fcebdc230b9cdf9dc015867b6 SHA1 3bbf254087ee6599daae61205965fec88753a26e SHA256 0b38e0d39325c972aa23ef767d472c130dcb120b98e6bf4b42076ab63135f165
 MD5 00c81b66a272cba9b2e829c42c3da143 apmd-3.0.2-r3.ebuild 1933
 RMD160 02a38c3659bf500fcebdc230b9cdf9dc015867b6 apmd-3.0.2-r3.ebuild 1933
 SHA256 0b38e0d39325c972aa23ef767d472c130dcb120b98e6bf4b42076ab63135f165 apmd-3.0.2-r3.ebuild 1933
-EBUILD apmd-3.2.0.ebuild 2003 RMD160 f9f90a5fa7f30430cef81ed56d3b477045d73e40 SHA1 64553dbe13a267b65703d4ec549e2303a848e8fe SHA256 95a47660d55aef8c77a884a8cb1d2a9e373b6115fa64fb9df23c8a3019a4ed8b size 2003
+EBUILD apmd-3.2.0.ebuild 2003 RMD160 f9f90a5fa7f30430cef81ed56d3b477045d73e40 SHA1 64553dbe13a267b65703d4ec549e2303a848e8fe SHA256 95a47660d55aef8c77a884a8cb1d2a9e373b6115fa64fb9df23c8a3019a4ed8b
 MD5 e0f486a25ba8907f6675fd5546d1eb8f apmd-3.2.0.ebuild 2003
 RMD160 f9f90a5fa7f30430cef81ed56d3b477045d73e40 apmd-3.2.0.ebuild 2003
 SHA256 95a47660d55aef8c77a884a8cb1d2a9e373b6115fa64fb9df23c8a3019a4ed8b apmd-3.2.0.ebuild 2003
-EBUILD apmd-3.2.1_p4.ebuild 1881 RMD160 4fc2655262c62bd6daf9963be4910a613be3e8d8 SHA1 d1d7159397f467c185ef71f3b1d8dc4b1cdf78ce SHA256 122c9046affbd33f1ca547fbda1ea8cc728fda454e77d3327fefc74e0f12cd92 size 1881
-MD5 b1f0bde94ec7b38f1065226d075862df apmd-3.2.1_p4.ebuild 1881
-RMD160 4fc2655262c62bd6daf9963be4910a613be3e8d8 apmd-3.2.1_p4.ebuild 1881
-SHA256 122c9046affbd33f1ca547fbda1ea8cc728fda454e77d3327fefc74e0f12cd92 apmd-3.2.1_p4.ebuild 1881
-EBUILD apmd-3.2.2_p5.ebuild 2173 RMD160 447388ecec7f546b5baa414a3a0270336cb36b8c SHA1 51dad099c9630206ec5ab6cc7b398350e4b8c023 SHA256 9897e67df9f0669c7174c804474c0a28c35da2eb9267970fc330f5a71b5e16df size 2173
-MD5 cbae94dd76cdff8b0b70056deefdd003 apmd-3.2.2_p5.ebuild 2173
-RMD160 447388ecec7f546b5baa414a3a0270336cb36b8c apmd-3.2.2_p5.ebuild 2173
-SHA256 9897e67df9f0669c7174c804474c0a28c35da2eb9267970fc330f5a71b5e16df apmd-3.2.2_p5.ebuild 2173
-MISC ChangeLog 4936 RMD160 574ce9b0339700802e0113d6af0a3c6401a291a8 SHA1 856fc09de5e7b1cdc18409396ea0e5af8de22596 SHA256 92b546af9922da58cf4600683fbdba8016b183c139aabcad7bc198811ceb218e size 4936
-MD5 dd5e46b91589a76147b46575a07bf4f1 ChangeLog 4936
-RMD160 574ce9b0339700802e0113d6af0a3c6401a291a8 ChangeLog 4936
-SHA256 92b546af9922da58cf4600683fbdba8016b183c139aabcad7bc198811ceb218e ChangeLog 4936
-MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f size 159
+EBUILD apmd-3.2.1_p4.ebuild 1911 RMD160 98fc58176fdce977586e9e8afd1c7bdceb821581 SHA1 f2793ec9f8bd7465036b39f6d3aa94a49a21b972 SHA256 f55dca2449ad496dba2e28350d5dea578f7e779af7745e1bb008ed490e1a394c
+MD5 9b09602901e14f075c0514015317aa1d apmd-3.2.1_p4.ebuild 1911
+RMD160 98fc58176fdce977586e9e8afd1c7bdceb821581 apmd-3.2.1_p4.ebuild 1911
+SHA256 f55dca2449ad496dba2e28350d5dea578f7e779af7745e1bb008ed490e1a394c apmd-3.2.1_p4.ebuild 1911
+EBUILD apmd-3.2.2_p5.ebuild 2204 RMD160 bb82da80231c7efd6938c8cdaf319605fd28dc0b SHA1 d2cb38b0c4215a76a398518ba4c1bbcd4cb3f49f SHA256 7cc4136c810a00966c19eeea6822118f23241ad3a5aaa661459664e09afccffc
+MD5 4030ebd33f9916fa865202537a765e1d apmd-3.2.2_p5.ebuild 2204
+RMD160 bb82da80231c7efd6938c8cdaf319605fd28dc0b apmd-3.2.2_p5.ebuild 2204
+SHA256 7cc4136c810a00966c19eeea6822118f23241ad3a5aaa661459664e09afccffc apmd-3.2.2_p5.ebuild 2204
+MISC ChangeLog 5131 RMD160 ad9a7faf4a3c339868aa0afc1440adba6ff042e2 SHA1 b865ae55ee4c06d2efaaec6183aae3fd3d8f95dd SHA256 b2bbded3acd063e0db71472a0d2fe1d36f21ce73674a459bd6edc59a7bdfdd7c
+MD5 bdcbc53c0c4554f866c8bdb73781dde6 ChangeLog 5131
+RMD160 ad9a7faf4a3c339868aa0afc1440adba6ff042e2 ChangeLog 5131
+SHA256 b2bbded3acd063e0db71472a0d2fe1d36f21ce73674a459bd6edc59a7bdfdd7c ChangeLog 5131
+MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 metadata.xml 159
 SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f metadata.xml 159
@@ -74,7 +74,7 @@ SHA256 6e30474dfe576440b1609ffb171e93dc451d6dd360b6aaf96e3cb363a4ee5595 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEZ5EhCRZPokWLroQRAtO0AJ9EBR+/Dh5ECUOh6Incj+kthIEIswCg3s4P
-zycv50Kp8opi660+ms6RRsg=
-=a1kv
+iD8DBQFEg/+7NJowsmZ/PzARAnmiAJ0YlHFT3vKRB/kp4XRfhgem1cIMKwCgkiFU
+76SUFSk8n/FL9LsEYeJZrUQ=
+=vY3y
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/apmd/apmd-3.2.1_p4.ebuild b/sys-apps/apmd/apmd-3.2.1_p4.ebuild
index d56262ce1c4c814f8de551a234e1bb68ad013522..2c5e737b6d7bc241490fbe42629b7147e590153a 100644 (file)
--- a/sys-apps/apmd/apmd-3.2.1_p4.ebuild
+++ b/sys-apps/apmd/apmd-3.2.1_p4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.1_p4.ebuild,v 1.16 2005/11/09 07:19:24 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.1_p4.ebuild,v 1.17 2006/06/05 09:56:08 genstef Exp $
 
-inherit eutils multilib
+inherit eutils multilib toolchain-funcs
 
 MY_PV="${PV%_p*}"
 MY_P="${PN}_${MY_PV}"
@@ -47,7 +47,7 @@ src_unpack() {
 }
 
 src_compile() {
-       emake || die "emake failed"
+       emake CC=$(tc-getCC) || die "emake failed"
 }
 
 src_install() {

diff --git a/sys-apps/apmd/apmd-3.2.2_p5.ebuild b/sys-apps/apmd/apmd-3.2.2_p5.ebuild
index dd2725170a77ad9ed9b68ef036217f70c9c7880c..8882e804cc408006360fb4709e33e119b7a56b87 100644 (file)
--- a/sys-apps/apmd/apmd-3.2.2_p5.ebuild
+++ b/sys-apps/apmd/apmd-3.2.2_p5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.2_p5.ebuild,v 1.5 2006/05/14 21:19:03 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.2_p5.ebuild,v 1.6 2006/06/05 09:56:08 genstef Exp $
 
-inherit eutils multilib
+inherit eutils multilib toolchain-funcs
 
 MY_PV="${PV%_p*}"
 MY_P="${PN}_${MY_PV}"
@@ -53,7 +53,7 @@ src_unpack() {
 }
 
 src_compile() {
-       emake || die "emake failed"
+       emake CC=$(tc-getCC) || die "emake failed"
 }
 
 src_install() {