old

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

5 files changed, 6 insertions, 158 deletions

diff --git a/sys-process/psmisc/ChangeLog b/sys-process/psmisc/ChangeLog
index 7a1e723db86b..926fd4da470c 100644
--- a/sys-process/psmisc/ChangeLog
+++ b/sys-process/psmisc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-process/psmisc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.119 2012/01/26 13:29:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.120 2012/01/26 13:30:44 ssuominen Exp $
+
+  26 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -files/psmisc-22.5-no-nls.patch, -psmisc-22.12.ebuild,
+  -files/psmisc-22.12-peekfd.patch, -psmisc-22.13.ebuild:
+  old
 
   26 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> psmisc-22.14.ebuild:
   ppc64 stable wrt #392641
diff --git a/sys-process/psmisc/files/psmisc-22.12-peekfd.patch b/sys-process/psmisc/files/psmisc-22.12-peekfd.patch
deleted file mode 100644
index bb0686152321..000000000000
--- a/sys-process/psmisc/files/psmisc-22.12-peekfd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix building of peekfd for x86_64 (from upstream).
-
---- configure.ac
-+++ configure.ac
-@@ -66,7 +66,8 @@
- 		struct user_regs_struct.rdi,
- 		struct user_regs_struct.rsi,
- 		struct user_regs_struct.rdx], [],[],
--    [#include <sys/user.h>])
-+    [#include <bits/types.h>
-+     #include <sys/user.h>])
- AC_CHECK_MEMBERS([struct pt_regs.orig_gpr3,
- 		struct pt_regs.gpr], [],[], [#include <linux/ptrace.h>])
- AC_CHECK_MEMBERS([struct pt_regs.uregs],[],[], [#include <asm/ptrace.h>])
diff --git a/sys-process/psmisc/files/psmisc-22.5-no-nls.patch b/sys-process/psmisc/files/psmisc-22.5-no-nls.patch
deleted file mode 100644
index 2681a0433f5d..000000000000
--- a/sys-process/psmisc/files/psmisc-22.5-no-nls.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-http://bugs.gentoo.org/193920
-
---- psmisc-22.5/Makefile.am
-+++ psmisc-22.5/Makefile.am
-@@ -1,5 +1,5 @@
- 
--SUBDIRS = doc src po icons 
-+SUBDIRS = doc src icons 
- 
- #EXTRA_DIST = config.rpath ABOUT-NLS mkinstalldirs
- 
---- psmisc-22.5/configure.ac
-+++ psmisc-22.5/configure.ac
-@@ -65,10 +65,6 @@
-    test $ac_cv_member_struct_user_regs_struct_ecx = yes &&
-    test $ac_cv_member_struct_user_regs_struct_edx = yes )
- 
--dnl Check for language stuff
--AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.16.1])
--
- dnl Checks for library functions.
- AC_FUNC_CLOSEDIR_VOID
- AC_FUNC_GETMNTENT
-@@ -87,6 +83,5 @@
- AC_CONFIG_FILES([Makefile
- 		 doc/Makefile
- 		 src/Makefile
--		 icons/Makefile
--		 po/Makefile.in])
-+		 icons/Makefile])
- AC_OUTPUT
diff --git a/sys-process/psmisc/psmisc-22.12.ebuild b/sys-process/psmisc/psmisc-22.12.ebuild
deleted file mode 100644
index 710f3a8d6090..000000000000
--- a/sys-process/psmisc/psmisc-22.12.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.12.ebuild,v 1.11 2010/09/20 18:17:27 armin76 Exp $
-
-EAPI=3
-inherit autotools 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="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="ipv6 nls selinux X"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-peekfd.patch
-	use nls || epatch "${FILESDIR}"/${PN}-22.5-no-nls.patch
-	eautoreconf
-}
-
-src_configure() {
-	# the nls looks weird, but it's because we actually delete the nls stuff
-	# above when USE=-nls.  this should get cleaned up so we dont have to patch
-	# it out, but until then, let's not confuse users ... #220787
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable selinux) \
-		$(use_enable ipv6) \
-		$(use nls && use_enable nls)
-}
-
-src_compile() {
-	# peekfd is a fragile crap hack #330631
-	emake -C src peekfd || touch src/peekfd{.o,}
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-	[[ -s ${D}/usr/bin/peekfd ]] || rm -f "${D}"/usr/bin/peekfd
-	use X || rm "${ED}"/usr/bin/pstree.x11
-	# fuser is needed by init.d scripts
-	dodir /bin
-	mv "${ED}"/usr/bin/fuser "${ED}"/bin/ || die
-	# easier to do this than forcing regen of autotools
-	[[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1
-}
diff --git a/sys-process/psmisc/psmisc-22.13.ebuild b/sys-process/psmisc/psmisc-22.13.ebuild
deleted file mode 100644
index 8d69040c9383..000000000000
--- a/sys-process/psmisc/psmisc-22.13.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.13.ebuild,v 1.1 2010/09/07 10:48:04 ssuominen Exp $
-
-EAPI=3
-inherit autotools 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="ipv6 nls selinux X"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	use nls || epatch "${FILESDIR}"/${PN}-22.13-no-nls.patch
-	eautoreconf
-}
-
-src_configure() {
-	# the nls looks weird, but it's because we actually delete the nls stuff
-	# above when USE=-nls.  this should get cleaned up so we dont have to patch
-	# it out, but until then, let's not confuse users ... #220787
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable selinux) \
-		$(use_enable ipv6) \
-		$(use nls && use_enable nls)
-}
-
-src_compile() {
-	# peekfd is a fragile crap hack #330631
-	emake -C src peekfd || touch src/peekfd{.o,}
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-	[[ -s ${D}/usr/bin/peekfd ]] || rm -f "${D}"/usr/bin/peekfd
-	use X || rm "${ED}"/usr/bin/pstree.x11
-	# fuser is needed by init.d scripts
-	dodir /bin
-	mv "${ED}"/usr/bin/fuser "${ED}"/bin/ || die
-	# easier to do this than forcing regen of autotools
-	[[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1
-}