From: Patrick McLean Date: Mon, 5 Jun 2006 15:16:03 +0000 (+0000) Subject: Fixup libdirs for multilib. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8105e576c4ee6307f042a670b8494668eda24b89;p=gentoo.git Fixup libdirs for multilib. Package-Manager: portage-2.1_rc4-r2 --- diff --git a/sys-fs/cryptsetup-luks/ChangeLog b/sys-fs/cryptsetup-luks/ChangeLog index 0c550def36b9..a5feaae40496 100644 --- a/sys-fs/cryptsetup-luks/ChangeLog +++ b/sys-fs/cryptsetup-luks/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/cryptsetup-luks # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/ChangeLog,v 1.30 2006/06/01 23:35:00 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/ChangeLog,v 1.31 2006/06/05 15:16:03 chutzpah Exp $ + + 05 Jun 2006; Patrick McLean + cryptsetup-luks-1.0.3-r2.ebuild: + Fixup libdirs for multilib. 01 Jun 2006; Diego Pettenò cryptsetup-luks-1.0.3-r2.ebuild: diff --git a/sys-fs/cryptsetup-luks/Manifest b/sys-fs/cryptsetup-luks/Manifest index 6f7200911947..a99e2d381863 100644 --- a/sys-fs/cryptsetup-luks/Manifest +++ b/sys-fs/cryptsetup-luks/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX cryptfs.confd 1548 RMD160 a009482d77e0c467fc9b26bbf7cd0a46ed5eb26e SHA1 a51fd66f741436626706f6221be4709f5b6870ad SHA256 7e6d165edb4e3971d949847629e56849c0839c73f43de07822b4c942171dc16a MD5 6d86b15e07cd0cdf96d8a363b1d778cd files/cryptfs.confd 1548 RMD160 a009482d77e0c467fc9b26bbf7cd0a46ed5eb26e files/cryptfs.confd 1548 @@ -25,7 +22,7 @@ AUX dm-crypt-stop.sh 1297 RMD160 aae23fdb24788b31992f61afd750d0be270a586b SHA1 1 MD5 a3bb6598f67c8922ccb6576ff256ced0 files/dm-crypt-stop.sh 1297 RMD160 aae23fdb24788b31992f61afd750d0be270a586b files/dm-crypt-stop.sh 1297 SHA256 c160c65b947af563e5e5ee0b090f3d2a4f4097361b1088be05cba3f3461907b7 files/dm-crypt-stop.sh 1297 -DIST cryptsetup-luks-1.0.1.tar.bz2 286161 RMD160 18dd277463607b3b9cc348e0af27af41c5ebcfe1 SHA256 f93f062785f4619735eed4855d3e8b062428a161e498d8b77eca446db940a2a5 +DIST cryptsetup-luks-1.0.1.tar.bz2 286161 RMD160 18dd277463607b3b9cc348e0af27af41c5ebcfe1 SHA1 77805684ab670699827c0a22f7c188b865145b9a SHA256 f93f062785f4619735eed4855d3e8b062428a161e498d8b77eca446db940a2a5 DIST cryptsetup-luks-1.0.3.tar.bz2 304836 RMD160 302304c28bbda40cbb19dd4fd31f3684ef2e6ba1 SHA1 b4e5658891dcad943dd45bc5d4a7f31396e9b83f SHA256 f8b7e9b410a581decd948cd0b4efcd3eea3bfeb729e01ad11eb24ddec54ac45b EBUILD cryptsetup-luks-1.0.1-r1.ebuild 2043 RMD160 f874c0e679bc70b69476504342a60dc5d5b4838d SHA1 7f9f5e335ea9e444075df6b7454c9d62680f421e SHA256 93be14fa4eaafaf0d8f427e195de320d438113392a963c3db7547008df5c407b MD5 e9db29331962729c373695ee3d7e8fed cryptsetup-luks-1.0.1-r1.ebuild 2043 @@ -35,14 +32,14 @@ EBUILD cryptsetup-luks-1.0.1-r2.ebuild 2113 RMD160 9e2a4262487ac28c5187608d7f556 MD5 06345bb64c18f0ab5857556a8bd52de0 cryptsetup-luks-1.0.1-r2.ebuild 2113 RMD160 9e2a4262487ac28c5187608d7f55611a3427b438 cryptsetup-luks-1.0.1-r2.ebuild 2113 SHA256 b694e6dd1aee7872022e048ab9db572fdaf2ffeda36603dc2dbd268cb639f495 cryptsetup-luks-1.0.1-r2.ebuild 2113 -EBUILD cryptsetup-luks-1.0.3-r2.ebuild 2284 RMD160 3f2c42877d51e5ca4532c05ff658c65819f73011 SHA1 066e445996c815fcb6270b81e8f5a60ab80f3c3b SHA256 0246331a8542ed2d46301115eb3dbd118b6a21eda725651cb9b136f3c2c9ab11 -MD5 bc65dcacffc403dc31c2b358fdcfb6b6 cryptsetup-luks-1.0.3-r2.ebuild 2284 -RMD160 3f2c42877d51e5ca4532c05ff658c65819f73011 cryptsetup-luks-1.0.3-r2.ebuild 2284 -SHA256 0246331a8542ed2d46301115eb3dbd118b6a21eda725651cb9b136f3c2c9ab11 cryptsetup-luks-1.0.3-r2.ebuild 2284 -MISC ChangeLog 4251 RMD160 fbc643b2ff8c0ceb61fbef1093607367b7eaeca5 SHA1 5db82d324b9364681c0fabb75ce8804387b0b6c5 SHA256 c11a0df5928b3915319c9f3a9856b5c2710670d4ca7e8f81bcd4c88e34a2d150 -MD5 144d2896e8d38b9b90ec51c4a83a0990 ChangeLog 4251 -RMD160 fbc643b2ff8c0ceb61fbef1093607367b7eaeca5 ChangeLog 4251 -SHA256 c11a0df5928b3915319c9f3a9856b5c2710670d4ca7e8f81bcd4c88e34a2d150 ChangeLog 4251 +EBUILD cryptsetup-luks-1.0.3-r2.ebuild 2358 RMD160 ba73d81b0647560e4106bf6c5c27923888084b6a SHA1 5e3c55b4868a1a1030af0ef95861f25aceade503 SHA256 58d1faf6f34c4f90db66727f25cf3b7a4f0a5142e1319b48ca28f519b74c5239 +MD5 102f0aa009a423960a3c7a11ea924569 cryptsetup-luks-1.0.3-r2.ebuild 2358 +RMD160 ba73d81b0647560e4106bf6c5c27923888084b6a cryptsetup-luks-1.0.3-r2.ebuild 2358 +SHA256 58d1faf6f34c4f90db66727f25cf3b7a4f0a5142e1319b48ca28f519b74c5239 cryptsetup-luks-1.0.3-r2.ebuild 2358 +MISC ChangeLog 4368 RMD160 b301445193d3e9442a2c5f1669a0c50e8232ad84 SHA1 8e26f000503281ce5c94600cc269127c31f4f183 SHA256 781d4815e5dca70d3bee22742936037b84db3db6f5ecb1289b999b4088eadd56 +MD5 35340726265beccf889dec473ea903a9 ChangeLog 4368 +RMD160 b301445193d3e9442a2c5f1669a0c50e8232ad84 ChangeLog 4368 +SHA256 781d4815e5dca70d3bee22742936037b84db3db6f5ecb1289b999b4088eadd56 ChangeLog 4368 MISC metadata.xml 228 RMD160 4ecb17bc29c5805c7d009098d379f85807f0ff9a SHA1 0f7be0d47f13ff42c97b3787385fe6e1cd9cbfc0 SHA256 157fd3642e30749762584d579cbeb8095379a572897d3f60dc30414cfd0f5c34 MD5 6c788beeca78bd11e5cd6e759e52fadc metadata.xml 228 RMD160 4ecb17bc29c5805c7d009098d379f85807f0ff9a metadata.xml 228 @@ -56,10 +53,3 @@ SHA256 44f9a55c285900d0fbbdc7268257cde094c0968a33f99e993510147af84a5471 files/di MD5 27723e8b4ff24b9ba390777aaa73fbf0 files/digest-cryptsetup-luks-1.0.3-r2 268 RMD160 e8a465408fe58d69af0ca1cc38c5743e621e3d0b files/digest-cryptsetup-luks-1.0.3-r2 268 SHA256 b3e05fc5b08998b29b5c80fdab6eb5f3b9c7558ddd447c785cb4baf998bde190 files/digest-cryptsetup-luks-1.0.3-r2 268 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.3 (GNU/Linux) - -iD8DBQFEf3mtAiZjviIA2XgRAiypAJ95jAU9Co5A1UZOitUuIn7mxnBeJACgrmqY -hhx2+RUc4r36b0ubtcCa6Ho= -=Cmb6 ------END PGP SIGNATURE----- diff --git a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.ebuild b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.ebuild index 34362fd9ab6b..6ff5d3aba167 100644 --- a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.ebuild +++ b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.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-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.ebuild,v 1.2 2006/06/01 23:35:00 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.ebuild,v 1.3 2006/06/05 15:16:03 chutzpah Exp $ -inherit autotools linux-info eutils flag-o-matic +inherit autotools linux-info eutils flag-o-matic multilib DESCRIPTION="Tool to setup encrypted devices with dm-crypt" HOMEPAGE="http://luks.endorphin.org/" @@ -63,12 +63,12 @@ src_compile() { ewarn "If you need cryptsetup for an initrd or initramfs then you" ewarn "should NOT use the dynamic USE flag" epause 5 - econf --sbindir=/bin --disable-static "${PIC_FLAG}" \ + econf --sbindir=/bin --disable-static --libdir=/usr/$(get_libdir) "${PIC_FLAG}" \ $(use_enable nls) \ $(use_enable selinux) \ || die else - econf --sbindir=/bin --enable-static "${PIC_FLAG}" \ + econf --sbindir=/bin --enable-static --libdir=/usr/$(get_libdir) "${PIC_FLAG}" \ $(use_enable nls) \ $(use_enable selinux) \ || die @@ -79,7 +79,7 @@ src_compile() { src_install() { make DESTDIR="${D}" install || die "install failed" - rmdir "${D}/usr/lib/cryptsetup" + rmdir "${D}/usr/$(get_libdir)/cryptsetup" insinto /lib/rcscripts/addons newconfd ${FILESDIR}/cryptfs.confd cryptfs doins "${FILESDIR}"/dm-crypt-{start,stop}.sh