diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-03-10 05:27:08 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-03-10 05:27:08 +0000 |
| commit | 59550ad658c29aa05115e38f6b8cb77d4aadffe5 (patch) | |
| tree | 3af0f58c81758dc77b62c7514e1d6f3497f8ad42 /sys-apps/acl | |
| parent | Updated wxGTK info (diff) | |
| download | historical-59550ad658c29aa05115e38f6b8cb77d4aadffe5.tar.gz historical-59550ad658c29aa05115e38f6b8cb77d4aadffe5.tar.bz2 historical-59550ad658c29aa05115e38f6b8cb77d4aadffe5.zip | |
Fix USE=-nls support #84641 by B. Bruce.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'sys-apps/acl')
| -rw-r--r-- | sys-apps/acl/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-apps/acl/Manifest | 5 | ||||
| -rw-r--r-- | sys-apps/acl/acl-2.2.27.ebuild | 10 | ||||
| -rw-r--r-- | sys-apps/acl/files/acl-2.2.27-nls.patch | 25 |
4 files changed, 40 insertions, 8 deletions
diff --git a/sys-apps/acl/ChangeLog b/sys-apps/acl/ChangeLog index afd45a7cb2d0..6eebed5d9df9 100644 --- a/sys-apps/acl/ChangeLog +++ b/sys-apps/acl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/acl -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/ChangeLog,v 1.40 2004/12/16 06:13:06 absinthe Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/ChangeLog,v 1.41 2005/03/10 05:27:08 vapier Exp $ + + 10 Mar 2005; Mike Frysinger <vapier@gentoo.org> + +files/acl-2.2.27-nls.patch, acl-2.2.27.ebuild: + Fix USE=-nls support #84641 by B. Bruce. 16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> acl-2.2.27.ebuild: Stable on amd64. Closes bug 73277. diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest index bc7e47cc4275..ba5e5325a3b0 100644 --- a/sys-apps/acl/Manifest +++ b/sys-apps/acl/Manifest @@ -1,4 +1,5 @@ -MD5 629cad2d54eca005b977f77dac4cff67 ChangeLog 5493 -MD5 b5f5d462bbddaea016a9ab73c2c45a45 acl-2.2.27.ebuild 1410 +MD5 4bcc37ccaa9058828a5d39a1b9acbd01 ChangeLog 5635 +MD5 a2e6ac9a1d667f95a94c00b801684f13 acl-2.2.27.ebuild 1465 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 +MD5 656f4bc223732028fde11b5aa671f12b files/acl-2.2.27-nls.patch 703 MD5 202ece244d099994a2eda97e02a85a15 files/digest-acl-2.2.27 66 diff --git a/sys-apps/acl/acl-2.2.27.ebuild b/sys-apps/acl/acl-2.2.27.ebuild index c8b212e52347..8aca7dc37dd5 100644 --- a/sys-apps/acl/acl-2.2.27.ebuild +++ b/sys-apps/acl/acl-2.2.27.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.2.27.ebuild,v 1.12 2004/12/30 20:38:23 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.2.27.ebuild,v 1.13 2005/03/10 05:27:08 vapier Exp $ inherit eutils @@ -21,7 +21,8 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} - cd ${S} + cd "${S}" + epatch "${FILESDIR}"/${P}-nls.patch sed -i \ -e "/^PKG_DOC_DIR/s:=.*:= /usr/share/doc/${PF}:" \ -e '/^PKG_[[:upper:]]*_DIR/s:= := $(DESTDIR):' \ @@ -54,5 +55,6 @@ src_compile() { } src_install() { - make DIST_ROOT=${D} install install-dev install-lib || die + make DIST_ROOT="${D}" install install-dev install-lib || die + dodoc README } diff --git a/sys-apps/acl/files/acl-2.2.27-nls.patch b/sys-apps/acl/files/acl-2.2.27-nls.patch new file mode 100644 index 000000000000..ed90cd2e856b --- /dev/null +++ b/sys-apps/acl/files/acl-2.2.27-nls.patch @@ -0,0 +1,25 @@ +The config.h handles the gettext logic, make sure we use it instead of +assuming gettext support is enabled. + +http://bugs.gentoo.org/show_bug.cgi?id=84641 + +--- acl-2.2.27/setfacl/do_set.c ++++ acl-2.2.27/setfacl/do_set.c +@@ -36,7 +36,7 @@ + #include "sequence.h" + #include "parse.h" + +-#include <libintl.h> ++#include "config.h" + + + extern const char *progname; +@@ -389,7 +388,7 @@ + goto fail; + if (error > 0) { + acl_text = acl_to_any_text(acl, NULL, ',', 0); +- fprintf(stderr, gettext("%s: %s: Malformed access ACL " ++ fprintf(stderr, _("%s: %s: Malformed access ACL " + "`%s': %s at entry %d\n"), progname, path_p, + acl_text, acl_error(error), which_entry+1); + acl_free(acl_text); |