Fix multilib-strict failure. Bug #105846

Package-Manager: portage-2.0.52-r1

diff --git a/sys-apps/apmd/ChangeLog b/sys-apps/apmd/ChangeLog
index 3181d024a17484271d6455065e1149bcfe8d8a2c..1af6e5112be91b0067e52398a7ad6b4e6d40f3ad 100644 (file)
--- a/sys-apps/apmd/ChangeLog
+++ b/sys-apps/apmd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/apmd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.23 2005/02/06 00:41:22 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.24 2005/09/13 21:05:13 dang Exp $
+
+  13 Sep 2005; <dang@gentoo.org> apmd-3.2.1_p4.ebuild:
+  Fix multilib-strict failure.  Bug #105846
 
   05 Feb 2005; <solar@gentoo.org> apmd-3.2.1_p4.ebuild:
   - q/a virtual/os-headers should not be set in an ebuilds RDEPEND

diff --git a/sys-apps/apmd/Manifest b/sys-apps/apmd/Manifest
index adca8aa0c8ad5019723226c177ae23214bf8a2f4..5afeebc376fb733c6cb325c29026c51cd6edd3d9 100644 (file)
--- a/sys-apps/apmd/Manifest
+++ b/sys-apps/apmd/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d329d5bd46285d76bb023cfbd1b315c5 ChangeLog 3630
+MD5 372292f0cfff361d5c0a5cbd58e4ad48 apmd-3.2.1_p4.ebuild 1619
 MD5 88e3463d354ae8c261776456764ad06e apmd-3.0.2-r3.ebuild 1781
 MD5 27e5317f463949dfc99f018f5fcc2527 apmd-3.2.0.ebuild 1856
-MD5 023f16ef80ba48a196ca62e299c4c6fe apmd-3.2.1_p4.ebuild 1585
-MD5 bed1c6668552bbf528df267c302a75eb files/apmd-3.2.0.kernel26x.patch 627
-MD5 5aa18e3b8ad79d8893bddb038e29ab98 files/apmd.confd 161
-MD5 02fc246d5b2fde52708927cb672239f1 files/apmd.kernel26x.patch 644
-MD5 bdb989641f5be7797a3232a8691ebc66 files/apmd.rc6 672
+MD5 77c24f11fc8f56930e31cffbed609825 ChangeLog 3729
+MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
+MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r3 61
+MD5 648c4b025de00c2bf42aafaebed2f4ef files/digest-apmd-3.2.1_p4 130
 MD5 ad21c10734c08e19968e2c8c9560957c files/apmsleep.c.diff 367
+MD5 bdb989641f5be7797a3232a8691ebc66 files/apmd.rc6 672
+MD5 02fc246d5b2fde52708927cb672239f1 files/apmd.kernel26x.patch 644
 MD5 253b79375ab72606e4fdf89109ed2c03 files/apmsleep.c.diff.3.2.0 301
-MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r3 61
+MD5 bed1c6668552bbf528df267c302a75eb files/apmd-3.2.0.kernel26x.patch 627
 MD5 a2b499e3ffda161e88b518f5b830a434 files/digest-apmd-3.2.0 66
-MD5 648c4b025de00c2bf42aafaebed2f4ef files/digest-apmd-3.2.1_p4 130
-MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
+MD5 5aa18e3b8ad79d8893bddb038e29ab98 files/apmd.confd 161
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFCz/SmI1lqEGTUzyQRAqSaAKCUey80TY0bkAUJaN3lGdvqWGyfawCdFOrr
-q+hiEGsfa8FaLbB2fIkCdSo=
-=A84Z
+iD8DBQFDJz8momPajV0RnrERAlO2AJ9Z+5tBgcsNYZ82RhdLqd8WQNROXACeL4fH
+9QPRpNutxIzxAhjF/sEaAVQ=
+=m3KA
 -----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 c05ac063d102262b815c03845324385d5eae375e..582d81b485aa2c4ca48b324e3e9c5bb78e3206e0 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
 # 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.13 2005/02/06 00:41:22 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.1_p4.ebuild,v 1.14 2005/09/13 21:05:13 dang Exp $
 
-inherit eutils
+inherit eutils multilib
 
 MY_PV="${PV%_p*}"
 MY_P="${PN}_${MY_PV}"
@@ -44,7 +44,7 @@ src_compile() {
 src_install() {
        dodir /usr/sbin
 
-       make DESTDIR=${D} PREFIX=/usr install || die "install failed"
+       make DESTDIR=${D} PREFIX=/usr LIBDIR=/usr/$(get_libdir) install || die "install failed"
 
        dodir /etc/apm/{event.d,suspend.d,resume.d,other.d,scripts.d}
        exeinto /etc/apm ; doexe debian/apmd_proxy