Fix building with USE=-nls and add some sh love.

Package-Manager: portage-2.1_pre3-r1

4 files changed, 49 insertions, 14 deletions

diff --git a/sys-fs/cryptsetup-luks/ChangeLog b/sys-fs/cryptsetup-luks/ChangeLog
index 26842d5e300f..647d8290d664 100644
--- a/sys-fs/cryptsetup-luks/ChangeLog
+++ b/sys-fs/cryptsetup-luks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/cryptsetup-luks
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/ChangeLog,v 1.17 2005/12/31 15:24:56 corsair Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/ChangeLog,v 1.18 2006/01/03 06:52:15 vapier Exp $
+
+  03 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/cryptsetup-luks-1.0.1-no-nls.patch,
+  cryptsetup-luks-1.0.1-r1.ebuild:
+  Fix building with USE=-nls and add some sh love.
 
   31 Dec 2005; Markus Rothe <corsair@gentoo.org>
   cryptsetup-luks-1.0.1-r1.ebuild:
diff --git a/sys-fs/cryptsetup-luks/Manifest b/sys-fs/cryptsetup-luks/Manifest
index 389215930788..7369da1bce96 100644
--- a/sys-fs/cryptsetup-luks/Manifest
+++ b/sys-fs/cryptsetup-luks/Manifest
@@ -1,11 +1,22 @@
-MD5 3ff603636635e7cca2255fbab4cd2095 ChangeLog 2521
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 05b588d85d48aa094d9e1b636486ce3e ChangeLog 2702
 MD5 66c1f7dfa9c09e11c9e248dd7ec07a5e cryptsetup-luks-1.0-r1.ebuild 2126
-MD5 39f4fb671435d87d833b45e59e0a7fba cryptsetup-luks-1.0.1-r1.ebuild 1955
+MD5 d96a6400c3a93bd08cf9b62802e71aca cryptsetup-luks-1.0.1-r1.ebuild 2025
 MD5 99b3cfb6a9eb43a772d29da0f88f849d cryptsetup-luks-1.0.1.ebuild 2148
 MD5 6d86b15e07cd0cdf96d8a363b1d778cd files/cryptfs.confd 1548
+MD5 c66058fc1ba9f980485e2b9e3b66df52 files/cryptsetup-luks-1.0.1-no-nls.patch 597
 MD5 f254479b9a12868d43ab10e4658fab51 files/digest-cryptsetup-luks-1.0-r1 72
 MD5 6d83c52472ad8d3b12ec5dbc4e056ed7 files/digest-cryptsetup-luks-1.0.1 74
 MD5 6d83c52472ad8d3b12ec5dbc4e056ed7 files/digest-cryptsetup-luks-1.0.1-r1 74
 MD5 c653a0b4ace27569ccc659b7cb43b4a9 files/dm-crypt-start.sh 4306
 MD5 a3bb6598f67c8922ccb6576ff256ced0 files/dm-crypt-stop.sh 1297
 MD5 6c788beeca78bd11e5cd6e759e52fadc metadata.xml 228
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDuh9W2+ySkm8kpY0RAge+AJ9FEhcq3gVBASctnmZBBBaGr6pAlQCgmPED
+OnJvzR2vcLL9+WcaB/ZdN70=
+=uPfr
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r1.ebuild b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r1.ebuild
index 4dd24d54f4b1..e8c22c5f44b3 100644
--- a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r1.ebuild
+++ b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.1-r1.ebuild,v 1.5 2005/12/31 15:24:56 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r1.ebuild,v 1.6 2006/01/03 06:52:15 vapier Exp $
 
 inherit linux-info eutils flag-o-matic
 
@@ -10,14 +10,13 @@ SRC_URI="http://luks.endorphin.org/source/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~ia64 ~mips ppc ppc64 sh sparc x86"
+IUSE="dynamic nls"
 
 DEPEND=">=sys-fs/device-mapper-1.00.07-r1
-		>=dev-libs/libgcrypt-1.1.42
-		>=dev-libs/libgpg-error-1.0-r1
-		!sys-fs/cryptsetup"
-
-IUSE="dynamic nls"
+	>=dev-libs/libgcrypt-1.1.42
+	>=dev-libs/libgpg-error-1.0-r1
+	!sys-fs/cryptsetup"
 
 dm-crypt_check() {
 	ebegin "Checking for dm-crypt support"
@@ -44,9 +43,13 @@ pkg_setup() {
 	dm-crypt_check;
 }
 
-src_compile() {
-	cd ${S}
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-no-nls.patch
+}
 
+src_compile() {
 	if use dynamic ; then
 		ewarn "If you need cryptsetup for an initrd or initramfs then you"
 		ewarn "should NOT use this USE flag"
diff --git a/sys-fs/cryptsetup-luks/files/cryptsetup-luks-1.0.1-no-nls.patch b/sys-fs/cryptsetup-luks/files/cryptsetup-luks-1.0.1-no-nls.patch
new file mode 100644
index 000000000000..b340adc6c78f
--- /dev/null
+++ b/sys-fs/cryptsetup-luks/files/cryptsetup-luks-1.0.1-no-nls.patch
@@ -0,0 +1,16 @@
+Make sure we use _() instead of gettext() so that the header
+file will define it away properly when USE=-nls.
+
+--- src/cryptsetup.c
++++ src/cryptsetup.c
+@@ -331,8 +331,8 @@ static void help(poptContext popt_contex
+ 			"<action> is one of:\n"));
+ 
+ 		for(action = action_types; action->type; action++)
+-			fprintf(stdout, "\t%s %s - %s\n", action->type, gettext(action->arg_desc),
+-			        gettext(action->desc));
++			fprintf(stdout, "\t%s %s - %s\n", action->type, _(action->arg_desc),
++			        _(action->desc));
+ 		
+ 		fprintf(stdout, _("\n"
+ 			"<name> is the device to create under %s\n"