sed expression fixups, filesdir cleanups

5 files changed, 22 insertions, 50 deletions

diff --git a/sys-apps/psmisc/ChangeLog b/sys-apps/psmisc/ChangeLog
index 6c19103146f4..33b26b6fd7ef 100644
--- a/sys-apps/psmisc/ChangeLog
+++ b/sys-apps/psmisc/ChangeLog
@@ -1,12 +1,12 @@
 # ChangeLog for sys-apps/psmisc
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/ChangeLog,v 1.8 2003/02/09 02:25:52 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/ChangeLog,v 1.9 2003/02/10 09:58:08 seemant Exp $
+
+*psmisc-21.2 (19 Nov 2002)
 
   09 Feb 2003; Guy Martin <gmsoft@gentoo.org> psmisc-21.2.ebuild :
   Added hppa to keywords.
 
-*psmisc-21.2 (19 Nov 2002)
-
   01 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
   Unmasked KEYWORDS for all arch's
 
@@ -15,6 +15,11 @@
 
 *psmisc-19-r3 (1 Feb 2002)
 
+  09 Feb 2003; Seemant Kulleen <seemant@gentoo.org> psmisc-19-r3.ebuild :
+
+  Sed delimiters are now : instead of /, closing bug #15006 by Blu3
+  <david+gentoo.org@blue-labs.org>
+
   23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
   Removed bootcd USE flag
 
diff --git a/sys-apps/psmisc/files/digest-psmisc-19-r2 b/sys-apps/psmisc/files/digest-psmisc-19-r2
deleted file mode 100644
index 9add9b67c5b5..000000000000
--- a/sys-apps/psmisc/files/digest-psmisc-19-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1d56ac6c32b657fdf8f780084b095932 psmisc-19.tar.gz 21552
diff --git a/sys-apps/psmisc/psmisc-19-r2.ebuild b/sys-apps/psmisc/psmisc-19-r2.ebuild
deleted file mode 100644
index 6cab800fc017..000000000000
--- a/sys-apps/psmisc/psmisc-19-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-19-r2.ebuild,v 1.9 2002/10/20 18:54:50 vapier Exp $
-
-S=${WORKDIR}/psmisc
-DESCRIPTION="Handy process-related utilities from Debian"
-SRC_URI="ftp://lrcftp.epfl.ch/pub/linux/local/psmisc/${P}.tar.gz"
-DEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2"
-HOMEPAGE="http://psmisc.sourceforge.net/"
-KEYWORDS="x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s/-ltermcap/-lncurses/g" -e "s/-O/${CFLAGS}/" -e "s:-Wpointer-arith::" Makefile.orig > Makefile
-}
-
-src_compile() {
-	pmake || die
-}
-
-src_install() {
-	dobin killall pstree
-	dosym killall /usr/bin/pidof
-
-	into /
-	dobin fuser
-
-	doman *.1
-
-	dodoc CHANGES COPYING README VERSION psmisc-19.lsm
-}
diff --git a/sys-apps/psmisc/psmisc-19-r3.ebuild b/sys-apps/psmisc/psmisc-19-r3.ebuild
index 25169cfe1684..94b8df561225 100644
--- a/sys-apps/psmisc/psmisc-19-r3.ebuild
+++ b/sys-apps/psmisc/psmisc-19-r3.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# 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-19-r3.ebuild,v 1.13 2002/12/15 10:44:23 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-19-r3.ebuild,v 1.14 2003/02/10 09:58:08 seemant Exp $
 
-S=${WORKDIR}/psmisc
+S=${WORKDIR}/${PN}
 DESCRIPTION="Handy process-related utilities from Debian"
 SRC_URI="ftp://lrcftp.epfl.ch/pub/linux/local/psmisc/${P}.tar.gz"
-DEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2"
 HOMEPAGE="http://psmisc.sourceforge.net/"
-KEYWORDS="x86 ppc sparc alpha"
+
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc alpha"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	cp Makefile Makefile.orig
-	sed -e "s/-ltermcap/-lncurses/g" \
-		-e "s/-O/${CFLAGS}/" \
+	sed -e "s:-ltermcap:-lncurses:g" \
+		-e "s:-O:${CFLAGS}:" \
 		-e "s:-Wpointer-arith::" \
 		Makefile.orig > Makefile
 }
diff --git a/sys-apps/psmisc/psmisc-21.2.ebuild b/sys-apps/psmisc/psmisc-21.2.ebuild
index a5c414ae6f0b..c8106acb3584 100644
--- a/sys-apps/psmisc/psmisc-21.2.ebuild
+++ b/sys-apps/psmisc/psmisc-21.2.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# 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.ebuild,v 1.5 2003/02/09 02:25:52 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.2.ebuild,v 1.6 2003/02/10 09:58:08 seemant Exp $
+
+IUSE="nls pic"
 
 DESCRIPTION="A set of tools that use the proc filesystem"
 SRC_URI="mirror://sourceforge/psmisc/${P}.tar.gz"
 HOMEPAGE="http://psmisc.sourceforge.net/"
 
-KEYWORDS="x86 ppc sparc alpha hppa"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE="nls pic"
+KEYWORDS="x86 ppc sparc alpha hppa"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2"