Version bump.

Package-Manager: portage-2.0.51.19

5 files changed, 85 insertions, 16 deletions

diff --git a/sys-process/psmisc/ChangeLog b/sys-process/psmisc/ChangeLog
index 902e3d1058e1..7a6dbd41fbde 100644
--- a/sys-process/psmisc/ChangeLog
+++ b/sys-process/psmisc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/psmisc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.2 2005/03/03 19:48:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.3 2005/03/14 05:44:38 vapier Exp $
+
+*psmisc-21.6 (14 Mar 2005)
+
+  14 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/psmisc-21.6-nonls.patch, +psmisc-21.6.ebuild:
+  Version bump.
 
 *psmisc-21.5 (03 Mar 2005)
 
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 285a029a11bc..b97bcce0fbfb 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3ce4475763b559f555aa6f0b1692ca74 psmisc-21.5.ebuild 1189
-MD5 5285fc6f76e03845c4676376e8a69f84 ChangeLog 6497
-MD5 5fc18674b29d14855af3388a6b1e708a psmisc-21.4.ebuild 1365
+MD5 cdc3f30394f7651936d13850c0db0788 ChangeLog 6645
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 277920d9195611033bc0e32e98474466 files/psmisc-21.5-selinux.diff.bz2 7783
-MD5 429eeb81b4aaa5515cfa08f533e5123d files/psmisc-21.4-no-nls.patch 1360
+MD5 5fc18674b29d14855af3388a6b1e708a psmisc-21.4.ebuild 1365
+MD5 5fe4a20eac235d7d262581b0cf3b165d psmisc-21.6.ebuild 1240
+MD5 3ce4475763b559f555aa6f0b1692ca74 psmisc-21.5.ebuild 1189
 MD5 b27975d795b1253e70ef1133dde797d0 files/digest-psmisc-21.4 63
 MD5 b94603b23b078474476ccd9da16cb675 files/digest-psmisc-21.5 63
+MD5 429eeb81b4aaa5515cfa08f533e5123d files/psmisc-21.4-no-nls.patch 1360
 MD5 f8a6de9ef42d405c6ac24373df5c5f74 files/psmisc-21.4-selinux.diff.bz2 7720
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCJ2oCI1lqEGTUzyQRAqwiAJ0a7PvU6ayDfL8gCIUYhjZnyRZfygCgkvuM
-zJiPhc1/M44dyRxuVHQIqlk=
-=Yuf+
------END PGP SIGNATURE-----
+MD5 277920d9195611033bc0e32e98474466 files/psmisc-21.5-selinux.diff.bz2 7783
+MD5 6f859fa9957d5cbc362d55aa098dfd0b files/digest-psmisc-21.6 63
+MD5 d57c7610d25b7e2cf2a3b99cbf27b43b files/psmisc-21.6-nonls.patch 385
diff --git a/sys-process/psmisc/files/digest-psmisc-21.6 b/sys-process/psmisc/files/digest-psmisc-21.6
new file mode 100644
index 000000000000..903beece2258
--- /dev/null
+++ b/sys-process/psmisc/files/digest-psmisc-21.6
@@ -0,0 +1 @@
+MD5 6994f227b38b09cb3f3bdd3bc5fc65fe psmisc-21.6.tar.gz 222454
diff --git a/sys-process/psmisc/files/psmisc-21.6-nonls.patch b/sys-process/psmisc/files/psmisc-21.6-nonls.patch
new file mode 100644
index 000000000000..4d282e3423a6
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-21.6-nonls.patch
@@ -0,0 +1,14 @@
+--- psmisc-21.6/src/i18n.h	2004-11-09 06:25:15.000000000 -0500
++++ psmisc-21.6.nonls/src/i18n.h	2005-03-14 00:21:53.000000000 -0500
+@@ -13,6 +13,11 @@
+ #define _(String) gettext (String)
+ #else
+ #define _(String) (String)
++#define rpmatch(x) \
++	( (line == NULL) ? -1 : \
++	  (*line == 'y' || *line == 'Y') ? 1 : \
++	  (*line == 'n' || *line == 'N') ? 0 : \
++	  -1 )
+ #endif
+ 
+ #endif
diff --git a/sys-process/psmisc/psmisc-21.6.ebuild b/sys-process/psmisc/psmisc-21.6.ebuild
new file mode 100644
index 000000000000..8943e44f824e
--- /dev/null
+++ b/sys-process/psmisc/psmisc-21.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-21.6.ebuild,v 1.1 2005/03/14 05:44:38 vapier Exp $
+
+inherit eutils
+
+SELINUX_PATCH="${P}-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls selinux"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r2
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	if use selinux ; then
+		epatch "${FILESDIR}"/${SELINUX_PATCH}
+		libtoolize --copy --force
+	fi
+	epatch "${FILESDIR}"/${P}-nonls.patch
+	epunt_cxx #73632
+}
+
+src_compile() {
+	econf \
+		--bindir=/bin \
+		$(use_enable selinux) \
+		$(use_enable nls) \
+		|| die
+	emake || die
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+
+	# Some packages expect these to use /usr, others to use /
+	dodir /usr/bin
+	cd "${D}"/bin
+	for f in * ; do
+		dosym /bin/${f} /usr/bin/${f}
+	done
+
+	dodoc AUTHORS ChangeLog NEWS README
+}