fix gcc-3.3 issues, bug #21212

5 files changed, 74 insertions, 3 deletions

diff --git a/sys-apps/psmisc/ChangeLog b/sys-apps/psmisc/ChangeLog
index cb647aa575ee..6e62447a62bc 100644
--- a/sys-apps/psmisc/ChangeLog
+++ b/sys-apps/psmisc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/psmisc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/ChangeLog,v 1.14 2003/03/25 17:16:33 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/ChangeLog,v 1.15 2003/05/18 23:36:07 azarah Exp $
+
+*psmisc-21.2-r2 (19 May 2003)
+
+  19 May 2003; Martin Schlemmer <azarah@gentoo.org> psmisc-21.2-r2.ebuild,
+  files/psmisc-21.2-gcc33.patch:
+  Fix gcc-3.3 compile issues, bug #21212.
 
 *psmisc-21.2-r1 (20 Mar 2003)
 
diff --git a/sys-apps/psmisc/Manifest b/sys-apps/psmisc/Manifest
index 0c8a617125c6..6005379a7674 100644
--- a/sys-apps/psmisc/Manifest
+++ b/sys-apps/psmisc/Manifest
@@ -1,6 +1,6 @@
-MD5 7a26388163f17220ed6901115bd8d68c ChangeLog 2070
+MD5 c76449129295d1578703914898b1af8a ChangeLog 2252
 MD5 2a2934392ebc3c5d5e0d6267ccd9425e psmisc-21.2-r1.ebuild 1216
-MD5 0fe5c046878365b08fa9cab1b156fe6f psmisc-21.2-r2.ebuild 1330
+MD5 41bb787c79994377eb70ba25b615c79c psmisc-21.2-r2.ebuild 1330
 MD5 6103f4929ab117827385124493e78c77 files/digest-psmisc-21.2-r1 136
 MD5 b3c372e1b1ef54a8798b8526a2aa92d1 files/psmisc-21.2-gcc33.patch 547
 MD5 6103f4929ab117827385124493e78c77 files/digest-psmisc-21.2-r2 136
diff --git a/sys-apps/psmisc/files/digest-psmisc-21.2-r2 b/sys-apps/psmisc/files/digest-psmisc-21.2-r2
new file mode 100644
index 000000000000..cbf11a229904
--- /dev/null
+++ b/sys-apps/psmisc/files/digest-psmisc-21.2-r2
@@ -0,0 +1,2 @@
+MD5 0749017f500b171f053d7c1fd72df537 psmisc-21.2.tar.gz 258561
+MD5 68f826245b24b3cbb5bf9ac193d00f10 psmisc-21.2-selinux.patch.bz2 84457
diff --git a/sys-apps/psmisc/files/psmisc-21.2-gcc33.patch b/sys-apps/psmisc/files/psmisc-21.2-gcc33.patch
new file mode 100644
index 000000000000..c0fb98e6a1e2
--- /dev/null
+++ b/sys-apps/psmisc/files/psmisc-21.2-gcc33.patch
@@ -0,0 +1,11 @@
+--- 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/psmisc-21.2-r2.ebuild b/sys-apps/psmisc/psmisc-21.2-r2.ebuild
new file mode 100644
index 000000000000..99fa36c952ae
--- /dev/null
+++ b/sys-apps/psmisc/psmisc-21.2-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.2-r2.ebuild,v 1.1 2003/05/18 23:36:07 azarah Exp $
+
+IUSE="nls selinux"
+
+DESCRIPTION="A set of tools that use the proc filesystem"
+HOMEPAGE="http://psmisc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/psmisc/${P}.tar.gz
+    selinux? mirror://gentoo/${P}-selinux.patch.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2
+    selinux? ( >=sys-apps/selinux-small-2003011510-r2 )"
+
+src_unpack() {
+    unpack ${A}
+    cd ${S}
+
+    # Necessary selinux patch 
+    use selinux && epatch ${DISTDIR}/${P}-selinux.patch.bz2
+
+	# 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"
+	use selinux && myconf="${myconf} --enable-flask"
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+	dosym killall /usr/bin/pidof
+	dodoc ABOUT-NLS AUTHORS ChangeLog NEWS README
+
+	# 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
+}