fixed multilib handling

Package-Manager: portage-2.1.2.2

4 files changed, 35 insertions, 17 deletions

diff --git a/media-libs/vigra/ChangeLog b/media-libs/vigra/ChangeLog
index 2bd59e07821a..e4ee14981be9 100644
--- a/media-libs/vigra/ChangeLog
+++ b/media-libs/vigra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/vigra
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.10 2007/04/06 22:05:56 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.11 2007/04/18 06:30:43 opfer Exp $
+
+  18 Apr 2007; Christian Faulhammer <opfer@gentoo.org> vigra-1.3.2.ebuild,
+  vigra-1.5.0-r1.ebuild:
+  fixed multilib handling
 
   06 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org> vigra-1.3.2.ebuild:
   ppc stable, bug #173182
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 0db13fb1e002..6917ac61e8a3 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,17 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST vigra1.3.2.tar.gz 3150473 RMD160 d270dd2467bf056aee056557a652318c26487fc9 SHA1 716b962d6ceae19a4e456df0a1ebc12803081232 SHA256 308d5b9531ae132812978f1fdf4ad0cf88f675b5c10aa1b5b94ba6ca70db325f
 DIST vigra1.5.0.tar.gz 12854465 RMD160 8d8cadc7f20586ec3336d0f6581ddfafc93fff73 SHA1 26fca97f1b3b97d9f4d3b4e775c841894e492143 SHA256 2ac6416bc1da1be8e6c308985566be93d3e210582c2a83a8e2e55077c457d6b6
-EBUILD vigra-1.3.2.ebuild 789 RMD160 7c6c7065b334c883ea3252dfa352b2b841c8a10e SHA1 1c6e549f2f40204589ceab1175a91c46d705fe1c SHA256 20d4b7b916148f2f6e9a3c94f788f744f41fe0c1ad11672e281bca7f36f22db4
-MD5 03b5065eff7570b7ab5cba07f6981899 vigra-1.3.2.ebuild 789
-RMD160 7c6c7065b334c883ea3252dfa352b2b841c8a10e vigra-1.3.2.ebuild 789
-SHA256 20d4b7b916148f2f6e9a3c94f788f744f41fe0c1ad11672e281bca7f36f22db4 vigra-1.3.2.ebuild 789
-EBUILD vigra-1.5.0-r1.ebuild 1163 RMD160 79d87233328ae5ce691c2c529b30bdf0b9faff73 SHA1 9963267a9051eb4ee07ba66e591d2d43f1584c22 SHA256 7d1371249f0726a0bb243068caa08c849b2090657adc5ebc868f032344405675
-MD5 fb85ed8b8a9f93bf02db44c95e94b079 vigra-1.5.0-r1.ebuild 1163
-RMD160 79d87233328ae5ce691c2c529b30bdf0b9faff73 vigra-1.5.0-r1.ebuild 1163
-SHA256 7d1371249f0726a0bb243068caa08c849b2090657adc5ebc868f032344405675 vigra-1.5.0-r1.ebuild 1163
-MISC ChangeLog 1315 RMD160 74b952efc48c159810310d546226a534a459c7f4 SHA1 fb7777ea9a83ae41f5f7ef7616b644bc9cfb32e7 SHA256 0960e3c88fbcc755be61a96fca55c695767e890f97cdb3a3e0af8616c00448f8
-MD5 6cd2fbc398d3ad57cc5a0bbc214e7fca ChangeLog 1315
-RMD160 74b952efc48c159810310d546226a534a459c7f4 ChangeLog 1315
-SHA256 0960e3c88fbcc755be61a96fca55c695767e890f97cdb3a3e0af8616c00448f8 ChangeLog 1315
+EBUILD vigra-1.3.2.ebuild 835 RMD160 1fac5786370c0ed30b473939cde453cfc4705d46 SHA1 05f093bf03f87ac34400514c7617a9347c73bfe0 SHA256 da00fdf6f58997fd38277daeb1eaebb4ed1cd6c191c4754ff0af4f34079de710
+MD5 c19dd6d74c538bf0d91ac0c9b9fbccf9 vigra-1.3.2.ebuild 835
+RMD160 1fac5786370c0ed30b473939cde453cfc4705d46 vigra-1.3.2.ebuild 835
+SHA256 da00fdf6f58997fd38277daeb1eaebb4ed1cd6c191c4754ff0af4f34079de710 vigra-1.3.2.ebuild 835
+EBUILD vigra-1.5.0-r1.ebuild 1213 RMD160 aee9399a7f188d011f98fce9c7b32c2cec74e336 SHA1 77f7cb145756531cb377e7ae5657b69c648e6811 SHA256 ddad825df330df2ff13b428a9ccf7cbafb7461bf5ce3ff805969cb4cf8087e2d
+MD5 d0f7d949ee1d4ea9cab04eafb5a4ef7d vigra-1.5.0-r1.ebuild 1213
+RMD160 aee9399a7f188d011f98fce9c7b32c2cec74e336 vigra-1.5.0-r1.ebuild 1213
+SHA256 ddad825df330df2ff13b428a9ccf7cbafb7461bf5ce3ff805969cb4cf8087e2d vigra-1.5.0-r1.ebuild 1213
+MISC ChangeLog 1437 RMD160 ee9698a73727eb0f748ec65f066bbe85d6909ff0 SHA1 ba9e8b393a76a48b3d45b4444bffe9432fc9a628 SHA256 cf22406d979c1d0439ed19da971a5ace899ec2f3361b594bb267b89b447c9dd0
+MD5 564fb8348d98bba7b419ea5194b45f31 ChangeLog 1437
+RMD160 ee9698a73727eb0f748ec65f066bbe85d6909ff0 ChangeLog 1437
+SHA256 cf22406d979c1d0439ed19da971a5ace899ec2f3361b594bb267b89b447c9dd0 ChangeLog 1437
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
@@ -22,3 +25,10 @@ SHA256 c0d8087d752c2d4424ced8d3d42678efdf58316589e4bca18aaa784a232937e2 files/di
 MD5 ccd731c2e47c0fff10b668c6c1719e79 files/digest-vigra-1.5.0-r1 238
 RMD160 48064b8e128ea9e37678b0942553a4d2e4919eb7 files/digest-vigra-1.5.0-r1 238
 SHA256 db7d4c744252706aed4a6070dba9fa5dfa1cd2a51d55784fe971f76d84bd612e files/digest-vigra-1.5.0-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFGJbsuNQqtfCuFneMRAjMhAKCBXf5mAEDIsxaM5tiLtONCnsTImgCdFCg9
+IOiM2GaJJWm38QY0tIZMB0U=
+=y6yT
+-----END PGP SIGNATURE-----
diff --git a/media-libs/vigra/vigra-1.3.2.ebuild b/media-libs/vigra/vigra-1.3.2.ebuild
index d18472334748..8de802b5f8b7 100644
--- a/media-libs/vigra/vigra-1.3.2.ebuild
+++ b/media-libs/vigra/vigra-1.3.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.3.2.ebuild,v 1.3 2007/04/06 22:05:56 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.3.2.ebuild,v 1.4 2007/04/18 06:30:43 opfer Exp $
+
+inherit multilib
 
 DESCRIPTION="Vision with Generic Algorithms"
 HOMEPAGE="http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra"
@@ -28,6 +30,6 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} prefix=${D}/usr install || die
+	make DESTDIR=${D} libdir="${D}/usr/$(get_libdir) " prefix=${D}/usr install || die
 }
 
diff --git a/media-libs/vigra/vigra-1.5.0-r1.ebuild b/media-libs/vigra/vigra-1.5.0-r1.ebuild
index 484e41ec9e1b..1b9ff49bfef5 100644
--- a/media-libs/vigra/vigra-1.5.0-r1.ebuild
+++ b/media-libs/vigra/vigra-1.5.0-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.5.0-r1.ebuild,v 1.1 2007/03/05 10:48:41 anant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.5.0-r1.ebuild,v 1.2 2007/04/18 06:30:43 opfer Exp $
+
+inherit multilib
 
 DESCRIPTION="C++ computer vision library with emphasize on customizable algorithms and data structures"
 HOMEPAGE="http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/"
@@ -36,7 +38,7 @@ src_compile() {
 }
 
 src_install() {
-	emake prefix="${D}/usr" install || die "emake install failed"
+	emake libdir="${D}/usr/$(get_libdir)" prefix="${D}/usr" install || die "emake install failed"
 	use doc || rm -Rf "${D}/${MY_DOCDIR}"
 	dodoc README.txt
 }