no-nls patch was failing with USE='selinux -nls', added offset patch from bug #55115

4 files changed, 84 insertions, 4 deletions

diff --git a/sys-apps/psmisc/ChangeLog b/sys-apps/psmisc/ChangeLog
index 34c9a50b51f4..261d13a69406 100644
--- a/sys-apps/psmisc/ChangeLog
+++ b/sys-apps/psmisc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/psmisc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/ChangeLog,v 1.37 2004/06/24 22:22:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/ChangeLog,v 1.38 2004/06/25 13:00:20 solar Exp $
+
+  25 Jun 2004; <solar@gentoo.org> psmisc-21.4.ebuild,
+  files/psmisc-21.4-no-nls-selinux.patch:
+  no-nls patch was failing with USE='selinux -nls', added offset patch from bug
+  #55115
 
   15 Jun 2004; <solar@gentoo.org> psmisc-21.2-r4.ebuild, psmisc-21.4.ebuild,
   files/psmisc-21.2-no-nls.patch, files/psmisc-21.4-no-nls.patch:
diff --git a/sys-apps/psmisc/Manifest b/sys-apps/psmisc/Manifest
index eb4e0cda91b2..274c5ec3dde8 100644
--- a/sys-apps/psmisc/Manifest
+++ b/sys-apps/psmisc/Manifest
@@ -1,13 +1,14 @@
 MD5 22b02fe46517ddaa64943da063201e9b psmisc-21.2-r3.ebuild 1158
 MD5 924d10a569bedb4ee22f568e5759c2a5 psmisc-21.2-r4.ebuild 2014
 MD5 80c52cf075bca5b489c9d05b20fcdb87 ChangeLog 4907
-MD5 ba0370e7500a56404e78cb74e4b23d65 psmisc-21.4.ebuild 1427
+MD5 20ae8558566bad04e79b956414003c26 psmisc-21.4.ebuild 1492
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 329287c0414da4ba155403a97d65dbff files/psmisc-21.4-no-nls.patch 1594
 MD5 c3fc900b7ebf1f4231b1ea416d908ce2 files/psmisc-21.2-fix-realloc.patch 368
 MD5 b27975d795b1253e70ef1133dde797d0 files/digest-psmisc-21.4 63
 MD5 056073bdd75042db6a6484fab28f6210 files/digest-psmisc-21.2-r3 63
 MD5 056073bdd75042db6a6484fab28f6210 files/digest-psmisc-21.2-r4 63
+MD5 78083673f5555f5363baa0cf4d907a8b files/psmisc-21.4-no-nls-selinux.patch 1580
 MD5 06fa2daf8fe69cf2890ccd85ed77369a files/psmisc-21.2-no-nls.patch 1268
 MD5 5d788fbdf401f203822bee5d8dc8c504 files/psmisc-21.4-selinux.diff.bz2 7841
 MD5 75e16053b4cd5c14c747413ee46dbaa1 files/psmisc-21.2-selinux.diff.bz2 10102
diff --git a/sys-apps/psmisc/files/psmisc-21.4-no-nls-selinux.patch b/sys-apps/psmisc/files/psmisc-21.4-no-nls-selinux.patch
new file mode 100644
index 000000000000..8485845f1d8e
--- /dev/null
+++ b/sys-apps/psmisc/files/psmisc-21.4-no-nls-selinux.patch
@@ -0,0 +1,72 @@
+--- src/fuser.c.mps	2004-06-08 18:21:33 +0200
++++ src/fuser.c	2004-06-08 18:27:13 +0200
+@@ -31,9 +31,13 @@
+ #include <linux/kdev_t.h>	/* for MKDEV */
+ #include <linux/major.h>	/* for LOOP_MAJOR */
+ #endif
++#ifdef USE_NLS
+ #include <libintl.h>
+ #include <locale.h>
+ #define _(String) gettext (String)
++#else
++#define _(String) (String)
++#endif
+ 
+ #include "comm.h"
+ #include "loop.h"         /* for loop_info */
+@@ -1007,9 +1011,11 @@ main (int argc, char **argv)
+   no_files = 1;
+ 
+   /* Setup the i18n */
++#ifdef USE_NLS
+   setlocale(LC_ALL, "");
+   bindtextdomain(PACKAGE, LOCALEDIR);
+   textdomain(PACKAGE);
++#endif
+ 
+   if (argc < 2)
+     usage ();
+--- src/killall.c.mps	2004-06-08 18:21:38 +0200
++++ src/killall.c	2004-06-08 18:26:51 +0200
+@@ -26,9 +26,13 @@
+ #include <selinux/selinux.h>
+ #endif /*WITH_SELINUX*/
+ 
++#ifdef USE_NLS
+ #include <libintl.h>
+ #include <locale.h>
+ #define _(String) gettext (String)
++#else
++#define _(String) (String)
++#endif
+ 
+ #include "comm.h"
+ #include "signals.h"
+@@ -461,10 +465,12 @@
+   pidof = strcmp (name, "killall");
+   sig_num = SIGTERM;
+ 
++#ifdef USE_NLS
+   /* Setup the i18n */
+   setlocale(LC_ALL, "");
+   bindtextdomain(PACKAGE, LOCALEDIR);
+   textdomain(PACKAGE);
++#endif
+ 
+   opterr = 0;
+ #ifdef WITH_SELINUX
+--- src/pstree.c.mps	2004-06-08 18:27:39 +0200
++++ src/pstree.c	2004-06-08 18:28:03 +0200
+@@ -22,8 +22,12 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
++#ifdef USE_NLS
+ #include <libintl.h>
+ #define _(String) gettext (String)
++#else
++#define _(String) (String)
++#endif
+ 
+ #include "comm.h"
+ 
diff --git a/sys-apps/psmisc/psmisc-21.4.ebuild b/sys-apps/psmisc/psmisc-21.4.ebuild
index f96eead6a1d2..277087e4d64f 100644
--- a/sys-apps/psmisc/psmisc-21.4.ebuild
+++ b/sys-apps/psmisc/psmisc-21.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.4.ebuild,v 1.9 2004/06/24 22:22:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.4.ebuild,v 1.10 2004/06/25 13:00:20 solar Exp $
 
 inherit eutils gnuconfig
 
@@ -26,8 +26,10 @@ src_unpack() {
 	if use selinux; then
 		# Necessary selinux patch
 		epatch ${FILESDIR}/${SELINUX_PATCH}
+		use nls || epatch ${FILESDIR}/${P}-no-nls-selinux.patch
+	else
+		use nls || epatch ${FILESDIR}/${P}-no-nls.patch
 	fi
-	use nls || epatch ${FILESDIR}/${P}-no-nls.patch
 }
 
 src_compile() {