Fix up building with NLS disabled #191111 by Jason S. and fix locale dir setting #190895 by Benno Schulenberg.

Package-Manager: portage-2.1.3.7

5 files changed, 227 insertions, 15 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index e6e43cad0cfa..bd66ee5bb9fc 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.199 2007/08/28 00:23:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.200 2007/09/03 15:20:25 vapier Exp $
+
+*util-linux-2.13-r1 (03 Sep 2007)
+
+  03 Sep 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/util-linux-2.13-locale.patch, +util-linux-2.13-r1.ebuild:
+  Fix up building with NLS disabled #191111 by Jason S. and fix locale dir
+  setting #190895 by Benno Schulenberg.
 
 *util-linux-2.13 (28 Aug 2007)
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 16d8b695c521..b2d77bd93b5c 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -145,6 +145,10 @@ AUX util-linux-2.12r-umount-nosysfs.patch 432 RMD160 cfb2ac318ac2d821d30b1c4d065
 MD5 2ac8d002e13e5fa925551bb42798c363 files/util-linux-2.12r-umount-nosysfs.patch 432
 RMD160 cfb2ac318ac2d821d30b1c4d065d1d361845034a files/util-linux-2.12r-umount-nosysfs.patch 432
 SHA256 d7b3c5f7268e6ecb086bfb188f01f544099079ed9b4ca0f8d87e97269cb91976 files/util-linux-2.12r-umount-nosysfs.patch 432
+AUX util-linux-2.13-locale.patch 3028 RMD160 243732d4e353932908837a3b354e4b7486ed052f SHA1 0f1aec83d55d48112d4a9e954a3c64632e0cd9f3 SHA256 0de4bf7f4d9ae84f42ca656ccaadf814ff5f72325bcc3e687e7dbc7a5034a06f
+MD5 2bc51f870c2b167290521010a077b797 files/util-linux-2.13-locale.patch 3028
+RMD160 243732d4e353932908837a3b354e4b7486ed052f files/util-linux-2.13-locale.patch 3028
+SHA256 0de4bf7f4d9ae84f42ca656ccaadf814ff5f72325bcc3e687e7dbc7a5034a06f files/util-linux-2.13-locale.patch 3028
 AUX util-linux-no-kill.patch 642 RMD160 cb9bef851804fbcd9a0910cb39123f65f72bbdc5 SHA1 7152a9596d9f81fcb6b2ac867d5ce1ad679ebee7 SHA256 c72803b0918589dbd409e22368853330bc84d875c91936fc5e899686c1642aaf
 MD5 65f42fbf981464410f7d5d84a429e920 files/util-linux-no-kill.patch 642
 RMD160 cb9bef851804fbcd9a0910cb39123f65f72bbdc5 files/util-linux-no-kill.patch 642
@@ -158,18 +162,18 @@ EBUILD util-linux-2.12r-r7.ebuild 6687 RMD160 2439048c174299ea7c33a87cb584357df2
 MD5 80a48f84a9364d4661fd96afc56906da util-linux-2.12r-r7.ebuild 6687
 RMD160 2439048c174299ea7c33a87cb584357df216d9f1 util-linux-2.12r-r7.ebuild 6687
 SHA256 64053b1f9b75e9900209925e877c940dc694aad0237ea3f86b8cd934908e7f97 util-linux-2.12r-r7.ebuild 6687
-EBUILD util-linux-2.13.ebuild 1771 RMD160 88eba22ac204f9bfb4821bcdf1a146e452813940 SHA1 06b2dd71f88fa1be8b771298a0c05bff45b4299d SHA256 9f26ba569b398c65f260154d272db1e08783320db310d7801be617d74c534a45
-MD5 7f7f7f554f181400f5bbe2b3337b0746 util-linux-2.13.ebuild 1771
-RMD160 88eba22ac204f9bfb4821bcdf1a146e452813940 util-linux-2.13.ebuild 1771
-SHA256 9f26ba569b398c65f260154d272db1e08783320db310d7801be617d74c534a45 util-linux-2.13.ebuild 1771
+EBUILD util-linux-2.13-r1.ebuild 1881 RMD160 85b7431069b1d60a2a8734f2e11e421b8092e421 SHA1 68a4a424161a63bb7082dffd6cf5aff26c94630b SHA256 56bfc0cde7dad198416faa6e7fcf345bc9e4ce97a1a8d430e0edb1e6b42b6a36
+MD5 b5134ce219e8c5cf291aa1e474ff664f util-linux-2.13-r1.ebuild 1881
+RMD160 85b7431069b1d60a2a8734f2e11e421b8092e421 util-linux-2.13-r1.ebuild 1881
+SHA256 56bfc0cde7dad198416faa6e7fcf345bc9e4ce97a1a8d430e0edb1e6b42b6a36 util-linux-2.13-r1.ebuild 1881
 EBUILD util-linux-9999.ebuild 1695 RMD160 c61be7a1041d86884c3d5a22a922061617b911f2 SHA1 e51e149f937d0bc3d2b7cc4897ae454f0767d217 SHA256 fc4a8751c5d55865d6555a6b8c639426c4ee8700b8928d7dee205fb6d7688df3
 MD5 3358b9404df679e4004ddfc1f0706fbc util-linux-9999.ebuild 1695
 RMD160 c61be7a1041d86884c3d5a22a922061617b911f2 util-linux-9999.ebuild 1695
 SHA256 fc4a8751c5d55865d6555a6b8c639426c4ee8700b8928d7dee205fb6d7688df3 util-linux-9999.ebuild 1695
-MISC ChangeLog 30866 RMD160 fb289632a99998490446a6cbcbfb56de20d24536 SHA1 60f17179d0234a4bb0e793da3476b116c0e7248b SHA256 8adb78b99b25f108451153ff92db318369299e3529fcc4e2cfa1fa65b218c69e
-MD5 9ba516cd4cc4d71a5b528fa5b9424553 ChangeLog 30866
-RMD160 fb289632a99998490446a6cbcbfb56de20d24536 ChangeLog 30866
-SHA256 8adb78b99b25f108451153ff92db318369299e3529fcc4e2cfa1fa65b218c69e ChangeLog 30866
+MISC ChangeLog 31134 RMD160 3d23ae5bdb74b7af8b3da69b88cf4c52c14ee8ef SHA1 7bc2aaedfd9b3051a356bd0ec10a759f178b4a18 SHA256 8af5bae02dc273274b74cc897acb0fff8532baca8f9e38031c220a9299b8dd9e
+MD5 55e71dbfc5afc746d211443ccad6cb06 ChangeLog 31134
+RMD160 3d23ae5bdb74b7af8b3da69b88cf4c52c14ee8ef ChangeLog 31134
+SHA256 8af5bae02dc273274b74cc897acb0fff8532baca8f9e38031c220a9299b8dd9e ChangeLog 31134
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -177,16 +181,16 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 MD5 6f4a7e9af9c890fde37c16cd670219e2 files/digest-util-linux-2.12r-r7 1063
 RMD160 9d0bdb33b8b41435aaaa241e7077f1170db24d16 files/digest-util-linux-2.12r-r7 1063
 SHA256 28d8b5a13df815eb0448175cabb264a92602133401563b47a0a71b6956e2d0fd files/digest-util-linux-2.12r-r7 1063
-MD5 e1ab7f2986fe508f9e8caa0b7b49d123 files/digest-util-linux-2.13 262
-RMD160 97f7a95ec952f82d50569034938cb4043611e1ef files/digest-util-linux-2.13 262
-SHA256 5ef76e2b126dec2a44a83b45afecd748869c337733d1d0167cb418a69c7f6853 files/digest-util-linux-2.13 262
+MD5 e1ab7f2986fe508f9e8caa0b7b49d123 files/digest-util-linux-2.13-r1 262
+RMD160 97f7a95ec952f82d50569034938cb4043611e1ef files/digest-util-linux-2.13-r1 262
+SHA256 5ef76e2b126dec2a44a83b45afecd748869c337733d1d0167cb418a69c7f6853 files/digest-util-linux-2.13-r1 262
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-util-linux-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-util-linux-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-util-linux-9999 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG1CuOp/wUKkr7RBoRArO0AJ97Gx4Y0VRoe21U1zQjydBDXSaXUwCg1VOr
-TW4IZc0wD8IIMZTMp/Noz/g=
-=U7p6
+iD8DBQFG3CZnp/wUKkr7RBoRAtDdAKCmAjhCXeRNoxkgTMekKNti6x8D4wCdH3tH
+2wspwHMZmlJ7TlniJP8Z/Zo=
+=V38u
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.13-r1 b/sys-apps/util-linux/files/digest-util-linux-2.13-r1
new file mode 100644
index 000000000000..a2e47b157d36
--- /dev/null
+++ b/sys-apps/util-linux/files/digest-util-linux-2.13-r1
@@ -0,0 +1,3 @@
+MD5 2175a6e64ba0cf8ff05402eaee33e4b0 util-linux-ng-2.13.tar.bz2 2702618
+RMD160 499b1c5c2060b23d8bf504122a22122af99eb7fa util-linux-ng-2.13.tar.bz2 2702618
+SHA256 002412e93d8e85b1796fdbe65bbb0a4d193d0317a7155fda4270667e08bdfbfc util-linux-ng-2.13.tar.bz2 2702618
diff --git a/sys-apps/util-linux/files/util-linux-2.13-locale.patch b/sys-apps/util-linux/files/util-linux-2.13-locale.patch
new file mode 100644
index 000000000000..feb46f98af3a
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.13-locale.patch
@@ -0,0 +1,121 @@
+http://bugs.gentoo.org/191111
+http://thread.gmane.org/gmane.linux.utilities.util-linux-ng/614
+
+Move all locale/nls related includes to nls.h and make sure they are only
+pulled in when ENABLE_NLS.  When !ENABLE_NLS, don't include any locale/nls
+related headers and stub out setlocale() as well.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ include/nls.h      |    5 ++++-
+ misc-utils/cal.c   |    1 -
+ misc-utils/look.c  |    1 -
+ misc-utils/write.c |    1 -
+ text-utils/colrm.c |    2 +-
+ text-utils/more.c  |    1 -
+ text-utils/pg.c    |    2 --
+ 7 files changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/include/nls.h b/include/nls.h
+index f571ca5..e9f7927 100644
+--- a/include/nls.h
++++ b/include/nls.h
+@@ -9,6 +9,8 @@ int main(int argc, char *argv[]);
+ 
+ #ifdef ENABLE_NLS
+ # include <libintl.h>
++# include <locale.h>
++# include <nl_types.h>
+ # define _(Text) gettext (Text)
+ # ifdef gettext_noop
+ #  define N_(String) gettext_noop (String)
+@@ -16,9 +18,10 @@ int main(int argc, char *argv[]);
+ #  define N_(String) (String)
+ # endif
+ #else
+-# include <locale.h>
+ # undef bindtextdomain
+ # define bindtextdomain(Domain, Directory) /* empty */
++# undef setlocale
++# define setlocale(Category, Locale) /* empty */
+ # undef textdomain
+ # define textdomain(Domain) /* empty */
+ # define _(Text) (Text)
+diff --git a/misc-utils/cal.c b/misc-utils/cal.c
+index f5ede93..77333d8 100644
+--- a/misc-utils/cal.c
++++ b/misc-utils/cal.c
+@@ -63,7 +63,6 @@
+ #include <string.h>
+ #include <time.h>
+ #include <unistd.h>
+-#include <locale.h>
+ #include "errs.h"
+ #include "nls.h"
+ 
+diff --git a/misc-utils/look.c b/misc-utils/look.c
+index 5c7e30c..9e25596 100644
+--- a/misc-utils/look.c
++++ b/misc-utils/look.c
+@@ -59,7 +59,6 @@
+ #include <strings.h>
+ #include <ctype.h>
+ #include <getopt.h>
+-#include <locale.h>
+ #include "pathnames.h"
+ #include "nls.h"
+ 
+diff --git a/misc-utils/write.c b/misc-utils/write.c
+index b3c96d1..46b8f0a 100644
+--- a/misc-utils/write.c
++++ b/misc-utils/write.c
+@@ -54,7 +54,6 @@
+ #include <pwd.h>
+ #include <string.h>
+ #include <stdlib.h>
+-#include <locale.h>
+ #include <signal.h>
+ #include <sys/param.h>
+ #include <sys/signal.h>
+diff --git a/text-utils/colrm.c b/text-utils/colrm.c
+index 5e18a6f..e8b1ea4 100644
+--- a/text-utils/colrm.c
++++ b/text-utils/colrm.c
+@@ -40,8 +40,8 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <locale.h>
+ 
++#include "nls.h"
+ #include "widechar.h"
+ 
+ /*
+diff --git a/text-utils/more.c b/text-utils/more.c
+index 19c4417..5dcae7b 100644
+--- a/text-utils/more.c
++++ b/text-utils/more.c
+@@ -55,7 +55,6 @@
+ #include <sys/file.h>
+ #include <sys/wait.h>
+ #include <a.out.h>
+-#include <locale.h>
+ #include "xstrncpy.h"
+ #include "nls.h"
+ #include "widechar.h"
+diff --git a/text-utils/pg.c b/text-utils/pg.c
+index 10bdd15..3e1b25e 100644
+--- a/text-utils/pg.c
++++ b/text-utils/pg.c
+@@ -49,8 +49,6 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <setjmp.h>
+-#include <locale.h>
+-#include <nl_types.h>
+ #include <libgen.h>
+ 
+ #ifdef HAVE_NCURSES_H
+-- 
+1.5.3.rc7
+
diff --git a/sys-apps/util-linux/util-linux-2.13-r1.ebuild b/sys-apps/util-linux/util-linux-2.13-r1.ebuild
new file mode 100644
index 000000000000..d92ba29868df
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.13-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.13-r1.ebuild,v 1.1 2007/09/03 15:20:25 vapier Exp $
+
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
+inherit eutils
+[[ ${PV} == "9999" ]] && inherit git
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-ng-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux-ng/"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+else
+	SRC_URI="http://www.kernel.org/pub/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls old-linux selinux"
+
+RDEPEND="!sys-process/schedutils
+	!sys-apps/setarch
+	>=sys-libs/ncurses-5.2-r2
+	>=sys-fs/e2fsprogs-1.34
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/os-headers"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+		cd "${S}"
+		./autogen.sh || die
+	else
+		unpack ${A}
+		cd "${S}"
+		epatch "${FILESDIR}"/${P}-locale.patch #191111
+	fi
+}
+
+src_compile() {
+	export localedir="/usr/share/locale" #190895
+	econf \
+		--with-fsprobe=blkid \
+		$(use_enable nls) \
+		--enable-agetty \
+		--enable-cramfs \
+		$(use_enable old-linux elvtune) \
+		--disable-init \
+		--disable-kill \
+		--disable-last \
+		--disable-mesg \
+		--enable-partx \
+		--enable-raw \
+		--enable-rdev \
+		--enable-rename \
+		--disable-reset \
+		--disable-login-utils \
+		--enable-schedutils \
+		--disable-wall \
+		--enable-write \
+		--without-pam \
+		$(use_with selinux) \
+		|| die "configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "install failed"
+	dodoc AUTHORS NEWS README* TODO docs/*
+}