old

diff --git a/sys-apps/psmisc/Manifest b/sys-apps/psmisc/Manifest
index 94fb4380f13b5050f7dadb85df9f4a37fdc7b63f..5a6b5ab944a218b3a6f3105b977c9a4061f54136 100644 (file)
--- a/sys-apps/psmisc/Manifest
+++ b/sys-apps/psmisc/Manifest
@@ -3,23 +3,15 @@ Hash: SHA1
 
 MD5 18c3cc750bc8114bdfbe04b5369f2bed ChangeLog 5598
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 22b02fe46517ddaa64943da063201e9b psmisc-21.2-r3.ebuild 1158
-MD5 0a088775a9ba8a5283bd77eeb05dda71 psmisc-21.2-r4.ebuild 2002
 MD5 8602ac8d26453570399e4c3d7f379710 psmisc-21.4.ebuild 1483
-MD5 056073bdd75042db6a6484fab28f6210 files/digest-psmisc-21.2-r3 63
-MD5 056073bdd75042db6a6484fab28f6210 files/digest-psmisc-21.2-r4 63
-MD5 c3fc900b7ebf1f4231b1ea416d908ce2 files/psmisc-21.2-fix-realloc.patch 368
-MD5 b3c372e1b1ef54a8798b8526a2aa92d1 files/psmisc-21.2-gcc33.patch 547
-MD5 75e16053b4cd5c14c747413ee46dbaa1 files/psmisc-21.2-selinux.diff.bz2 10102
 MD5 b27975d795b1253e70ef1133dde797d0 files/digest-psmisc-21.4 63
 MD5 5d788fbdf401f203822bee5d8dc8c504 files/psmisc-21.4-selinux.diff.bz2 7841
-MD5 06fa2daf8fe69cf2890ccd85ed77369a files/psmisc-21.2-no-nls.patch 1268
 MD5 329287c0414da4ba155403a97d65dbff files/psmisc-21.4-no-nls.patch 1594
 MD5 78083673f5555f5363baa0cf4d907a8b files/psmisc-21.4-no-nls-selinux.patch 1580
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBtlnVroRuSHgZdywRAttEAJ46t6jlddBWmxqgyiuf3iNfg9N6JgCcCNTG
-NO0UaGmv7RkE+oDjiJbTBi0=
-=sh1c
+iD8DBQFB1w9GroRuSHgZdywRAlOkAJ4smGpbe/L85enUikhE6BWZQyshJACgiKRN
+hxkKnhwfykJNOCPRQPLDuag=
+=EwWf
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/psmisc/files/digest-psmisc-21.2-r3 b/sys-apps/psmisc/files/digest-psmisc-21.2-r3
deleted file mode 100644 (file)
index 705ea95..0000000
--- a/sys-apps/psmisc/files/digest-psmisc-21.2-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0749017f500b171f053d7c1fd72df537 psmisc-21.2.tar.gz 258561

diff --git a/sys-apps/psmisc/files/digest-psmisc-21.2-r4 b/sys-apps/psmisc/files/digest-psmisc-21.2-r4
deleted file mode 100644 (file)
index 705ea95..0000000
--- a/sys-apps/psmisc/files/digest-psmisc-21.2-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0749017f500b171f053d7c1fd72df537 psmisc-21.2.tar.gz 258561

diff --git a/sys-apps/psmisc/files/psmisc-21.2-fix-realloc.patch b/sys-apps/psmisc/files/psmisc-21.2-fix-realloc.patch
deleted file mode 100644 (file)
index 4d937bd..0000000
--- a/sys-apps/psmisc/files/psmisc-21.2-fix-realloc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- psmisc-21.2/src/killall.c.orig     2002-09-04 18:22:39.000000000 -0400
-+++ psmisc-21.2/src/killall.c  2003-09-08 23:08:01.000000000 -0400
-@@ -206,7 +206,7 @@
-               {
-                 int cur_size = cmd_size;
-                 cmd_size *= 2;
--                if (!realloc(&command_buf, cmd_size))
-+                if (!(command_buf = realloc(command_buf, cmd_size)))
-                   exit (1);
-                 p = command_buf + cur_size;
-               }

diff --git a/sys-apps/psmisc/files/psmisc-21.2-gcc33.patch b/sys-apps/psmisc/files/psmisc-21.2-gcc33.patch
deleted file mode 100644 (file)
index c0fb98e..0000000
--- a/sys-apps/psmisc/files/psmisc-21.2-gcc33.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- psmisc-21.2/src/killall.c.orig     2003-05-19 01:03:00.000000000 +0200
-+++ psmisc-21.2/src/killall.c  2003-05-19 01:03:34.000000000 +0200
-@@ -395,7 +395,7 @@
- #ifdef FLASK_LINUX
-   fprintf (stderr, "  -S,--Sid            kill only process(es) having sid\n");
-   fprintf (stderr, "  -c,--context        kill only process(es) having scontext\n");
--  fprintf(stderr, "   (-s, -c are mutually exclusive and must precede other
-+  fprintf(stderr, "   (-s, -c are mutually exclusive and must precede other\n\
- arguments)\n\n");
- #endif /*FLASK_LINUX*/
- }

diff --git a/sys-apps/psmisc/files/psmisc-21.2-no-nls.patch b/sys-apps/psmisc/files/psmisc-21.2-no-nls.patch
deleted file mode 100644 (file)
index 79292b4..0000000
--- a/sys-apps/psmisc/files/psmisc-21.2-no-nls.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- src/fuser.c.nonls~ Fri Sep 27 12:58:54 2002
-+++ src/fuser.c        Tue Jun  8 20:55:24 2004
-@@ -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 */
-@@ -981,9 +985,11 @@
-   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.nonls~       Tue Jun  8 20:52:00 2004
-+++ src/killall.c      Tue Jun  8 20:55:24 2004
-@@ -24,9 +24,13 @@
- #include <fs_secure.h>
- #include <ss.h>
- #endif /*FLASK_LINUX*/
-+#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,9 +465,11 @@
-   sig_num = SIGTERM;
- 
-   /* Setup the i18n */
-+#ifdef USE_NLS
-   setlocale(LC_ALL, "");
-   bindtextdomain(PACKAGE, LOCALEDIR);
-   textdomain(PACKAGE);
-+#endif
- 
-   opterr = 0;
-   while ( (optc = getopt_long_only(argc,argv,"egilqs:vwS:c:V",options,NULL)) != EOF) {

diff --git a/sys-apps/psmisc/files/psmisc-21.2-selinux.diff.bz2 b/sys-apps/psmisc/files/psmisc-21.2-selinux.diff.bz2
deleted file mode 100644 (file)
index 4219df8..0000000
Binary files a/sys-apps/psmisc/files/psmisc-21.2-selinux.diff.bz2 and /dev/null differ

diff --git a/sys-apps/psmisc/psmisc-21.2-r3.ebuild b/sys-apps/psmisc/psmisc-21.2-r3.ebuild
deleted file mode 100644 (file)
index a6311cd..0000000
--- a/sys-apps/psmisc/psmisc-21.2-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.2-r3.ebuild,v 1.8 2004/06/24 22:22:59 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="A set of tools that use the proc filesystem"
-HOMEPAGE="http://psmisc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/psmisc/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc alpha hppa mips"
-IUSE="nls"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2"
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-
-       # Fix gcc-3.3 compile issues.
-       # <azarah@gentoo.org> (18 May 2003)
-       epatch ${FILESDIR}/${P}-gcc33.patch
-}
-
-src_compile() {
-       local myconf="--with-gnu-ld"
-       use nls || myconf="${myconf} --disable-nls"
-
-       econf ${myconf} || die
-       emake || die
-}
-
-src_install() {
-       einstall || die
-       dosym killall /usr/bin/pidof
-
-       # Some packages expect these to use /usr, others to use /
-       dodir /bin
-       mv ${D}/usr/bin/* ${D}/bin/
-       cd ${D}/bin
-       for f in * ; do
-               dosym /bin/${f} /usr/bin/${f}
-       done
-
-       # We use pidof from baselayout.
-       rm -f ${D}/bin/pidof
-       dosym ../sbin/pidof /bin/pidof
-
-       dodoc ABOUT-NLS AUTHORS ChangeLog NEWS README
-}

diff --git a/sys-apps/psmisc/psmisc-21.2-r4.ebuild b/sys-apps/psmisc/psmisc-21.2-r4.ebuild
deleted file mode 100644 (file)
index ce24312..0000000
--- a/sys-apps/psmisc/psmisc-21.2-r4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.2-r4.ebuild,v 1.18 2004/07/15 02:27:06 agriffis Exp $
-
-inherit eutils gnuconfig
-
-SELINUX_PATCH="psmisc-21.2-selinux.diff.bz2"
-
-DESCRIPTION="A set of tools that use the proc filesystem"
-HOMEPAGE="http://psmisc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/psmisc/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc ~alpha hppa mips ia64 ppc64 s390"
-IUSE="nls selinux"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2
-       selinux? ( sys-libs/libselinux )
-       nls? ( sys-devel/gettext )"
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-
-       if use selinux; then
-               # Necessary selinux patch
-               epatch ${FILESDIR}/${SELINUX_PATCH}
-       else
-               # Fix gcc-3.3 compile issues.
-               # <azarah@gentoo.org> (18 May 2003)
-
-               # the section that this patch fixes
-               # is deleted by the above selinux patch
-               # so should only needed for ! use selinux
-               # <pebenito@gentoo.org> (09 Aug 2003)
-
-               epatch ${FILESDIR}/${P}-gcc33.patch
-       fi
-
-       # Killall segfault if an command is longer than 128 bytes, as
-       # the realloc call is not done in such an way to update the
-       # pointer that is used, thanks to bug submitted (bug #28234) by
-       # Grant McDorman <grant.mcdorman@sympatico.ca>.
-       epatch ${FILESDIR}/${P}-fix-realloc.patch
-       use nls || epatch ${FILESDIR}/${P}-no-nls.patch
-}
-
-src_compile() {
-
-       # Detect mips systems properly
-       gnuconfig_update
-
-       local myconf="--with-gnu-ld"
-       use nls || myconf="${myconf} --disable-nls"
-       use selinux && myconf="${myconf} --enable-flask"
-
-       econf ${myconf} || die
-       emake || die
-}
-
-src_install() {
-       einstall || die
-       dosym killall /usr/bin/pidof
-
-       # Some packages expect these to use /usr, others to use /
-       dodir /bin
-       mv ${D}/usr/bin/* ${D}/bin/
-       cd ${D}/bin
-       for f in * ; do
-               dosym /bin/${f} /usr/bin/${f}
-       done
-
-       # We use pidof from baselayout.
-       rm -f ${D}/bin/pidof
-       dosym ../sbin/pidof /bin/pidof
-
-       dodoc ABOUT-NLS AUTHORS ChangeLog NEWS README
-}