diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-01-03 06:52:16 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-01-03 06:52:16 +0000 |
| commit | d59aab0b2a0f0214db3004dde4b483447be7f5f2 (patch) | |
| tree | 6898cfccf13dc4f6d814f9b05fdd120fdea4211d /sys-fs/cryptsetup-luks | |
| parent | tell users to run revdep-rebuild --library instead of revdep-rebuild --soname (diff) | |
| download | gentoo-2-d59aab0b2a0f0214db3004dde4b483447be7f5f2.tar.gz gentoo-2-d59aab0b2a0f0214db3004dde4b483447be7f5f2.tar.bz2 gentoo-2-d59aab0b2a0f0214db3004dde4b483447be7f5f2.zip | |
Fix building with USE=-nls and add some sh love.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'sys-fs/cryptsetup-luks')
| -rw-r--r-- | sys-fs/cryptsetup-luks/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r1.ebuild | 23 | ||||
| -rw-r--r-- | sys-fs/cryptsetup-luks/files/cryptsetup-luks-1.0.1-no-nls.patch | 16 |
3 files changed, 36 insertions, 12 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/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" |