diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-01-01 20:59:37 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-01-01 20:59:37 +0000 |
commit | eb2ba6ba3ecb93f8efc576f9055447bce358963d (patch) | |
tree | 889b7bc68bf585caf560058c7ae4896fb5087179 /sys-apps | |
parent | fix USE=static usage and lib install (Manifest recommit) (diff) | |
download | gentoo-2-eb2ba6ba3ecb93f8efc576f9055447bce358963d.tar.gz gentoo-2-eb2ba6ba3ecb93f8efc576f9055447bce358963d.tar.bz2 gentoo-2-eb2ba6ba3ecb93f8efc576f9055447bce358963d.zip |
old
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/psmisc/files/digest-psmisc-21.2-r3 | 1 | ||||
-rw-r--r-- | sys-apps/psmisc/files/digest-psmisc-21.2-r4 | 1 | ||||
-rw-r--r-- | sys-apps/psmisc/files/psmisc-21.2-fix-realloc.patch | 11 | ||||
-rw-r--r-- | sys-apps/psmisc/files/psmisc-21.2-gcc33.patch | 11 | ||||
-rw-r--r-- | sys-apps/psmisc/files/psmisc-21.2-no-nls.patch | 56 | ||||
-rw-r--r-- | sys-apps/psmisc/files/psmisc-21.2-selinux.diff.bz2 | bin | 10102 -> 0 bytes | |||
-rw-r--r-- | sys-apps/psmisc/psmisc-21.2-r3.ebuild | 52 | ||||
-rw-r--r-- | sys-apps/psmisc/psmisc-21.2-r4.ebuild | 79 |
8 files changed, 0 insertions, 211 deletions
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 index 705ea95e0332..000000000000 --- 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 index 705ea95e0332..000000000000 --- 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 index 4d937bd2ca88..000000000000 --- 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 index c0fb98e6a1e2..000000000000 --- 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 index 79292b40a5c6..000000000000 --- 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 Binary files differdeleted file mode 100644 index 4219df816cda..000000000000 --- a/sys-apps/psmisc/files/psmisc-21.2-selinux.diff.bz2 +++ /dev/null diff --git a/sys-apps/psmisc/psmisc-21.2-r3.ebuild b/sys-apps/psmisc/psmisc-21.2-r3.ebuild deleted file mode 100644 index a6311cd1feee..000000000000 --- 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 index ce24312c6972..000000000000 --- 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 -} |