make package multilib-strict aware

Package-Manager: portage-2.0.51.22-r2

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index e77dd85a832c224e811cbf92bac6c96b9524c77b..2f9bd918a49a640806b7c8347b509b3a251f1e84 100644 (file)
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for gnome-base/control-center
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.133 2005/09/17 16:42:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.134 2005/09/24 11:47:02 blubb Exp $
 
   17 Sep 2005; Aron Griffis <agriffis@gentoo.org>
   control-center-2.10.2.ebuild, control-center-2.12.0.ebuild:
   Mark 2.12.0 2.10.2 ~alpha
 
+  24 Sep 2005; Simon Stelling <blubb@gentoo.org>
+  control-center-1.4.0.5-r1.ebuild:
+  make package multilib-strict aware
+
 *control-center-2.12.0 (07 Sep 2005)
 
   07 Sep 2005; Leonardo Boshell <leonardop@gentoo.org>

diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index ede8e1d28f5b6ee9a54ab22206392512b6984c8a..e739197123d7e50a0d5c48d805f61cbfc2ba9356 100644 (file)
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,29 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 171442d9d892b442c48aca1b60a0a065 control-center-2.12.0.ebuild 2468
-MD5 6b6006defc45689433348e51f7ea5296 ChangeLog 17223
-MD5 aa3234dd1a36f666ba5ace0047cdd8b9 control-center-1.4.0.5-r1.ebuild 1258
-MD5 5af1d1aad2b9b7fef198abb27b604c35 control-center-2.10.1-r1.ebuild 2036
+MD5 e99d6ed15caae5629f299a3ebb117039 ChangeLog 17343
+MD5 d4f0febb27460c43fb258412acde17b8 control-center-1.4.0.5-r1.ebuild 1333
 MD5 63d40166766fb5bc828bb2bad93e6422 control-center-2.10.0.ebuild 1905
 MD5 057a9b63a1fffc8535af779891248213 control-center-2.10.2.ebuild 1987
-MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
-MD5 f14d2fe3d15320580a2ab5715e6e2d94 files/control-center-2.10.1-pathfix.patch 6670
+MD5 171442d9d892b442c48aca1b60a0a065 control-center-2.12.0.ebuild 2468
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 5af1d1aad2b9b7fef198abb27b604c35 control-center-2.10.1-r1.ebuild 2036
+MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
 MD5 cd6f25b991e95ef9f518b4c499f2e2f7 files/digest-control-center-2.10.2 75
+MD5 6d346011e61ca1c016c3c391881f9a4a files/control-center-2.11-gentoo_xcursor.patch 527
 MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
-MD5 2f0867c07305e05e49c57051e20dc068 files/digest-control-center-2.10.1-r1 75
-MD5 975ffa9d50cadbd034c4dd6c3ffe0cac files/control-center-2.11-xcursor_fix.patch 646
-MD5 d49937874828450c09be566a6a624ead files/digest-control-center-2.12.0 75
 MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210
+MD5 d49937874828450c09be566a6a624ead files/digest-control-center-2.12.0 75
 MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083
-MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
-MD5 6d346011e61ca1c016c3c391881f9a4a files/control-center-2.11-gentoo_xcursor.patch 527
+MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
 MD5 86ede4717972671750335483cefdf77b files/digest-control-center-2.10.0 75
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDLEeGJrHF4yAQTrARAjUnAJ0R6oPdtHZKmzbOW5PQxw97bX5JhQCgr2XH
-77tKkiw0gjgG7R43r/ooAzU=
-=iYab
------END PGP SIGNATURE-----
+MD5 975ffa9d50cadbd034c4dd6c3ffe0cac files/control-center-2.11-xcursor_fix.patch 646
+MD5 f14d2fe3d15320580a2ab5715e6e2d94 files/control-center-2.10.1-pathfix.patch 6670
+MD5 2f0867c07305e05e49c57051e20dc068 files/digest-control-center-2.10.1-r1 75

diff --git a/gnome-base/control-center/control-center-1.4.0.5-r1.ebuild b/gnome-base/control-center/control-center-1.4.0.5-r1.ebuild
index 8d5e8bb815717fb0047565303fc92841de05a92c..71fb04e29d1dddca42674c4893226e6d27367832 100644 (file)
--- a/gnome-base/control-center/control-center-1.4.0.5-r1.ebuild
+++ b/gnome-base/control-center/control-center-1.4.0.5-r1.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/gnome-base/control-center/control-center-1.4.0.5-r1.ebuild,v 1.27 2005/01/08 23:25:15 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-1.4.0.5-r1.ebuild,v 1.28 2005/09/24 11:47:02 blubb Exp $
 
-inherit gnome.org eutils
+inherit gnome.org eutils multilib
 
 DESCRIPTION="The GNOME control-center"
 HOMEPAGE="http://www.gnome.org/"
@@ -41,6 +41,7 @@ src_compile() {
                    --mandir=/usr/share/man \
                    --sysconfdir=/etc \
                    --localstatedir=/var/lib \
+                       --libdir=/usr/$(get_libdir) \
                    ${myconf} || die
 
        emake || die
@@ -51,6 +52,7 @@ src_install() {
                mandir=${D}/usr/share/man \
                sysconfdir=${D}/etc \
                localstatedir=${D}/var/lib      \
+               libdir=${D}/usr/$(get_libdir) \
                install || die
        dodoc AUTHORS ChangeLog README NEWS
 }