Apply sed from Ed Catmur so that apmd compiles against system headers, instead of...

Package-Manager: portage-2.1_pre7-r2

diff --git a/sys-apps/apmd/ChangeLog b/sys-apps/apmd/ChangeLog
index bc8ae9d58d23b818583c8b6555de068f27ea912d..a784dd27a9dd18eac3b6fd26f1f747217161eebe 100644 (file)
--- a/sys-apps/apmd/ChangeLog
+++ b/sys-apps/apmd/ChangeLog
@@ -1,6 +1,10 @@
 # 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.27 2006/02/12 08:50:00 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.28 2006/03/28 21:09:54 steev Exp $
+
+  28 Mar 2006; Steev Klimaszewski <steev@gentoo.org> apmd-3.2.2_p5.ebuild:
+  Apply sed from Ed Catmur to apmd-3.2.2_p5 to build against system headers,
+  rather than the kernel headers.  Closes bug #124841
 
   12 Feb 2006; Steev Klimaszewski <steev@gentoo.org>
   +files/apmd-no-on_ac_power_script.patch, apmd-3.0.2-r3.ebuild,

diff --git a/sys-apps/apmd/Manifest b/sys-apps/apmd/Manifest
index e3ec08c21343cb71e14d4a995dc11469867abcf2..91db4ef22f3e35facfebd7a9ba3b8fe4da94122d 100644 (file)
--- a/sys-apps/apmd/Manifest
+++ b/sys-apps/apmd/Manifest
@@ -1,6 +1,6 @@
-MD5 e5bf8f6a75ac0b6e4a3597aef22ac90c ChangeLog 4429
-RMD160 ca07879efd1bb594ed63de55ee683c88e5443ef1 ChangeLog 4429
-SHA256 797a174bc72416e4f7ccd00538c5a9404c52821b6ec877cb99f4161c0d5e5630 ChangeLog 4429
+MD5 89a010c81923e73d8521b46a21b94678 ChangeLog 4636
+RMD160 15057bdf456384e03bb6d4cb316b7a6554b05cdc ChangeLog 4636
+SHA256 bc19ab772463e9285174a17fe40f884764f3fefe281238498dee7a97895bfd52 ChangeLog 4636
 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
@@ -10,9 +10,9 @@ SHA256 95a47660d55aef8c77a884a8cb1d2a9e373b6115fa64fb9df23c8a3019a4ed8b apmd-3.2
 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
-MD5 b18614b9b2c3e222138c0c29bbfe971f apmd-3.2.2_p5.ebuild 2063
-RMD160 0b9e9d49074008d13bd7c5e8ac618b76cf9f6048 apmd-3.2.2_p5.ebuild 2063
-SHA256 119229436bbae6b49b628ac861966de5c7de1ca49064a0624a851820ead1a796 apmd-3.2.2_p5.ebuild 2063
+MD5 a7999aac7e33062c56c39e78e67a3591 apmd-3.2.2_p5.ebuild 2174
+RMD160 34b22ca487b77a789533391ea4a3f4cfaf26a793 apmd-3.2.2_p5.ebuild 2174
+SHA256 212cef4a9d0821293cb676f124c7b390734e0f7b36c942fcb561643a9f1cd884 apmd-3.2.2_p5.ebuild 2174
 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

diff --git a/sys-apps/apmd/apmd-3.2.2_p5.ebuild b/sys-apps/apmd/apmd-3.2.2_p5.ebuild
index 2682aab026ad1f7ab0060e7be8d89d40612b1de8..79b020bbd58823a4a02f973a7d826c37a6cfa4cc 100644 (file)
--- a/sys-apps/apmd/apmd-3.2.2_p5.ebuild
+++ b/sys-apps/apmd/apmd-3.2.2_p5.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/sys-apps/apmd/apmd-3.2.2_p5.ebuild,v 1.1 2006/02/12 08:50:00 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.2_p5.ebuild,v 1.2 2006/03/28 21:09:54 steev Exp $
 
 inherit eutils multilib
 
@@ -48,6 +48,8 @@ src_unpack() {
                        "${S}"/Makefile \
                        || die "sed failed"
        fi
+       # apmd is perfectly happy with system linux-headers
+       sed -e 's:-I/usr/src/linux/include::' -i "${S}"/Makefile
 }
 
 src_compile() {