Clean up the patches #76230 by Milus János.

6 files changed, 39 insertions, 138 deletions

diff --git a/sys-apps/psmisc/ChangeLog b/sys-apps/psmisc/ChangeLog
index f9580e6861a6..b9df4c910348 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.43 2004/12/08 01:33:00 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/ChangeLog,v 1.44 2005/01/01 21:16:48 vapier Exp $
+
+  01 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  -files/psmisc-21.4-no-nls-selinux.patch, files/psmisc-21.4-no-nls.patch,
+  files/psmisc-21.4-selinux.diff.bz2, psmisc-21.4.ebuild:
+  Clean up the patches #76230 by Milus János.
 
   07 Dec 2004; Mike Frysinger <vapier@gentoo.org> psmisc-21.4.ebuild:
   Remove C++ requirement #73632.
diff --git a/sys-apps/psmisc/Manifest b/sys-apps/psmisc/Manifest
index 5a6b5ab944a2..7be80f4e3e12 100644
--- a/sys-apps/psmisc/Manifest
+++ b/sys-apps/psmisc/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 18c3cc750bc8114bdfbe04b5369f2bed ChangeLog 5598
+MD5 cea85e921fc6586f5e3eeb611590ad6e ChangeLog 5828
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 8602ac8d26453570399e4c3d7f379710 psmisc-21.4.ebuild 1483
+MD5 8cae3b05d354320805b8b9d112402fe1 psmisc-21.4.ebuild 1332
+MD5 f8a6de9ef42d405c6ac24373df5c5f74 files/psmisc-21.4-selinux.diff.bz2 7720
 MD5 b27975d795b1253e70ef1133dde797d0 files/digest-psmisc-21.4 63
-MD5 5d788fbdf401f203822bee5d8dc8c504 files/psmisc-21.4-selinux.diff.bz2 7841
-MD5 329287c0414da4ba155403a97d65dbff files/psmisc-21.4-no-nls.patch 1594
-MD5 78083673f5555f5363baa0cf4d907a8b files/psmisc-21.4-no-nls-selinux.patch 1580
+MD5 429eeb81b4aaa5515cfa08f533e5123d files/psmisc-21.4-no-nls.patch 1360
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFB1w9GroRuSHgZdywRAlOkAJ4smGpbe/L85enUikhE6BWZQyshJACgiKRN
-hxkKnhwfykJNOCPRQPLDuag=
-=EwWf
+iD8DBQFB1xNMroRuSHgZdywRAtpTAJ0W7ZeYzCA3qgLtH9u4OEKFXm6h/QCfQqPW
+/eJwVxYHd4XIQmaaz5kazvs=
+=wzSR
 -----END PGP SIGNATURE-----
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
deleted file mode 100644
index 8485845f1d8e..000000000000
--- a/sys-apps/psmisc/files/psmisc-21.4-no-nls-selinux.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- 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/files/psmisc-21.4-no-nls.patch b/sys-apps/psmisc/files/psmisc-21.4-no-nls.patch
index 89546b3a072d..4832e73aae18 100644
--- a/sys-apps/psmisc/files/psmisc-21.4-no-nls.patch
+++ b/sys-apps/psmisc/files/psmisc-21.4-no-nls.patch
@@ -1,9 +1,7 @@
---- 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
+diff -ur psmisc-21.4.orig/src/fuser.c psmisc-21.4/src/fuser.c
+--- psmisc-21.4.orig/src/fuser.c	2005-01-01 16:10:44.601397328 -0500
++++ psmisc-21.4/src/fuser.c	2005-01-01 16:11:22.884577400 -0500
+@@ -31,3 +31,7 @@
 +#ifdef USE_NLS
  #include <libintl.h>
  #include <locale.h>
@@ -11,27 +9,17 @@
 +#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 */
+@@ -1006,4 +1010,6 @@
 +#ifdef USE_NLS
+   /* Setup the i18n */
    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
-@@ -25,9 +25,13 @@
- #include <selinux/fs_secure.h>
- #include <selinux/ss.h>
- #endif /*FLASK_LINUX*/
+diff -ur psmisc-21.4.orig/src/killall.c psmisc-21.4/src/killall.c
+--- psmisc-21.4.orig/src/killall.c	2005-01-01 16:10:44.602397176 -0500
++++ psmisc-21.4/src/killall.c	2005-01-01 16:11:54.860716288 -0500
+@@ -25,3 +25,7 @@
 +#ifdef USE_NLS
  #include <libintl.h>
  #include <locale.h>
@@ -39,33 +27,20 @@
 +#else
 +#define _(String) (String)
 +#endif
- 
- #include "comm.h"
- #include "signals.h"
-@@ -467,9 +471,11 @@ main (int argc, char **argv)
-   sig_num = SIGTERM;
- 
-   /* Setup the i18n */
+@@ -466,4 +470,6 @@
 +#ifdef USE_NLS
+   /* Setup the i18n */
    setlocale(LC_ALL, "");
    bindtextdomain(PACKAGE, LOCALEDIR);
    textdomain(PACKAGE);
 +#endif
- 
-   opterr = 0;
- #ifdef FLASK_LINUX
---- 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>
+diff -ur psmisc-21.4.orig/src/pstree.c psmisc-21.4/src/pstree.c
+--- psmisc-21.4.orig/src/pstree.c	2005-01-01 16:10:44.602397176 -0500
++++ psmisc-21.4/src/pstree.c	2005-01-01 16:12:14.659706384 -0500
+@@ -22,2 +22,6 @@
 +#ifdef USE_NLS
  #include <libintl.h>
  #define _(String) gettext (String)
 +#else
 +#define _(String) (String)
 +#endif
- 
- #include "comm.h"
- 
diff --git a/sys-apps/psmisc/files/psmisc-21.4-selinux.diff.bz2 b/sys-apps/psmisc/files/psmisc-21.4-selinux.diff.bz2
index 689b09f5420d..78b287f55d2d 100644
--- a/sys-apps/psmisc/files/psmisc-21.4-selinux.diff.bz2
+++ b/sys-apps/psmisc/files/psmisc-21.4-selinux.diff.bz2
diff --git a/sys-apps/psmisc/psmisc-21.4.ebuild b/sys-apps/psmisc/psmisc-21.4.ebuild
index 6e531139bcf0..72e38cb557c2 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
+# Copyright 1999-2005 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.18 2004/12/08 01:33:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.4.ebuild,v 1.19 2005/01/01 21:16:48 vapier Exp $
 
 inherit eutils gnuconfig
 
@@ -25,28 +25,22 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	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 selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
+	use nls || epatch ${FILESDIR}/${P}-no-nls.patch
 
 	epunt_cxx #73632
 }
 
 src_compile() {
-	local myconf=""
-	use nls || myconf="${myconf} --disable-nls"
-	use selinux && myconf="${myconf} --enable-flask"
-
-	econf ${myconf} || die
+	econf \
+		$(use_enable nls) \
+		$(use_enable selinux flask) \
+		|| die
 	emake || die
 }
 
 src_install() {
-	einstall || die
+	make install DESTDIR="${D}" || die
 	dosym killall /usr/bin/pidof
 
 	# Some packages expect these to use /usr, others to use /