Fix building with newer gettext #142362.

Package-Manager: portage-2.1.1_pre4

diff --git a/sys-fs/cryptsetup-luks/ChangeLog b/sys-fs/cryptsetup-luks/ChangeLog
index 8442486f43cd408dd5984b5032187eab915e9154..2c53a75b3861eb6fbe55eb8321839d69c8874388 100644 (file)
--- 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.35 2006/07/10 18:03:57 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/ChangeLog,v 1.36 2006/08/05 21:27:55 vapier Exp $
+
+  05 Aug 2006; Mike Frysinger <vapier@gentoo.org>
+  cryptsetup-luks-1.0.3-r2.ebuild:
+  Fix building with newer gettext #142362.
 
   10 Jul 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   cryptsetup-luks-1.0.3-r2.ebuild:

diff --git a/sys-fs/cryptsetup-luks/Manifest b/sys-fs/cryptsetup-luks/Manifest
index 5c9abda6e18c0ef80a4eb918368502104ceddcdb..ac314d6237a9161896fe2995f5fe5be1756d4ac5 100644 (file)
--- a/sys-fs/cryptsetup-luks/Manifest
+++ b/sys-fs/cryptsetup-luks/Manifest
@@ -25,7 +25,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 +35,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 2356 RMD160 f5603771a1d7bd85fe8fe2680577d4fa5e0f1b4c SHA1 1996a96377563e1df132a32b7ef00a324445e175 SHA256 36b37dbafe0446185670f16f781824b4bc3d88e44ed57921741e18378ba22813
-MD5 7aa8210b49d2450e5e7cb614afe4dc91 cryptsetup-luks-1.0.3-r2.ebuild 2356
-RMD160 f5603771a1d7bd85fe8fe2680577d4fa5e0f1b4c cryptsetup-luks-1.0.3-r2.ebuild 2356
-SHA256 36b37dbafe0446185670f16f781824b4bc3d88e44ed57921741e18378ba22813 cryptsetup-luks-1.0.3-r2.ebuild 2356
-MISC ChangeLog 4816 RMD160 e276af458a0a650e57e07256e06050fa288cc378 SHA1 f5ad736f6edcfadaf875c9e84a283571d12500ca SHA256 5fbcd4a327db9231a0637b2eae18c273302b5c0b7a1ab79e789e91ca7e3ab51e
-MD5 af35f5367c1396bdc7ed9fa6246ca696 ChangeLog 4816
-RMD160 e276af458a0a650e57e07256e06050fa288cc378 ChangeLog 4816
-SHA256 5fbcd4a327db9231a0637b2eae18c273302b5c0b7a1ab79e789e91ca7e3ab51e ChangeLog 4816
+EBUILD cryptsetup-luks-1.0.3-r2.ebuild 2418 RMD160 dd340fad3aa2d97669020003d361cf4f89c1afcd SHA1 c756e476b0a21ab9b333d088d5ee361bd3c4ddc8 SHA256 661643cf0df6ec2f6987bd2c1d54bcfdc60c300bc50842af26d1d3438ca4b75a
+MD5 d7f6733a4dd0d3d0bf7ff71c1793510a cryptsetup-luks-1.0.3-r2.ebuild 2418
+RMD160 dd340fad3aa2d97669020003d361cf4f89c1afcd cryptsetup-luks-1.0.3-r2.ebuild 2418
+SHA256 661643cf0df6ec2f6987bd2c1d54bcfdc60c300bc50842af26d1d3438ca4b75a cryptsetup-luks-1.0.3-r2.ebuild 2418
+MISC ChangeLog 4943 RMD160 a247bb9d576678c828b01f909f4e10c7ff43d80b SHA1 eac17bd81772ecfba26fe8c1f489cf38e7ba8e8b SHA256 0c0ccab5f48eb448f5a69dbe3e7447273023e08be184b6566fba706f09f3ace8
+MD5 cdeb04e02812087529574cb9655fe35e ChangeLog 4943
+RMD160 a247bb9d576678c828b01f909f4e10c7ff43d80b ChangeLog 4943
+SHA256 0c0ccab5f48eb448f5a69dbe3e7447273023e08be184b6566fba706f09f3ace8 ChangeLog 4943
 MISC metadata.xml 228 RMD160 4ecb17bc29c5805c7d009098d379f85807f0ff9a SHA1 0f7be0d47f13ff42c97b3787385fe6e1cd9cbfc0 SHA256 157fd3642e30749762584d579cbeb8095379a572897d3f60dc30414cfd0f5c34
 MD5 6c788beeca78bd11e5cd6e759e52fadc metadata.xml 228
 RMD160 4ecb17bc29c5805c7d009098d379f85807f0ff9a metadata.xml 228
@@ -57,9 +57,9 @@ 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.4-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEspaYKRy60XGEcJIRAooJAJ0Q8tG3GAbvj0dwNYSufCeYFGX/egCdH/tc
-VlgLrfwATXfn7L/gjHHVCqQ=
-=M3ii
+iD8DBQFE1Q1tamhnQswr0vIRAmaoAKCEVIyxXX6qsX/6SQfHCF7W8h7RMQCfX1b0
+WDY6lZsv16hD1uC4dv/YuCE=
+=FhMJ
 -----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 f2440e90de00b7bbb82d3844bd5b9f67054973f6..6f3392b77882bb4565375c9d0833d58eeda3feb3 100644 (file)
--- 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,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-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.ebuild,v 1.8 2006/07/10 18:03:57 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.ebuild,v 1.9 2006/08/05 21:27:55 vapier Exp $
 
 inherit autotools linux-info eutils flag-o-matic multilib
 
@@ -49,8 +49,10 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
        cd "${S}"
-       epatch "${FILESDIR}"/"${PN}-${PV}-selinux.patch"
-       eautoreconf
+       epatch "${FILESDIR}"/${P}-selinux.patch
+       rm -f po/Makefile.in.in #142362
+       autopoint -f || die
+       AT_M4DIR="${S}/m4" eautoreconf
 }
 
 src_compile() {