old

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

6 files changed, 14 insertions, 172 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/Manifest b/sys-process/psmisc/Manifest
index 9893e18d885d..d4cfeb712ef9 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,25 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX psmisc-22.12-peekfd.patch 478 RMD160 42839c32114c79d85f9154aa9efd08f0031d0449 SHA1 ec6240134908ef6b317de422cc4c465958d8b5b4 SHA256 1775d41187d3d15842f62d9aeda87f1ae5a7eaf62b935d1262345a9a8bf7e1e6
 AUX psmisc-22.13-no-nls.patch 693 RMD160 10170e0d3a593185781c8e5c866b49fd3070beaa SHA1 48a94c3796680fd20103a3938f546ca32246d3e0 SHA256 493e2b1a1a45da3f2334340af58950320108161c6e1fd43bc086b2b85f23a5bc
-AUX psmisc-22.5-no-nls.patch 736 RMD160 ac2c51cccc6c95f0aa47efe1ecaeb0d5eaefbce9 SHA1 0227573aa987bfb78ecef891673dc2792c98aba5 SHA256 b2137d22d62276cbd4a1b154c119df025d864054063302a91b5a1610f6c7102c
-DIST psmisc-22.12.tar.gz 374354 RMD160 cd33616bb36c0c5d7b107711c76be82a250d1a54 SHA1 662e332f7140252b65aca0c44096ee8d2f80b3c2 SHA256 ba2f41a501da6137b2d94e54e855bea8246f65167c613d3990bd0ce49e996a7a
-DIST psmisc-22.13.tar.gz 382389 RMD160 46c77bfd3c36d338b5da70d24d762ead911a16b1 SHA1 5d53c8bb5a279176be3515c07d833cdf116dd516 SHA256 06d25e8ebb4722dbcede98a787c39a9ed341f8e58fde10c0b2d6b35990b35daa
 DIST psmisc-22.14.tar.gz 382024 RMD160 56a1b2ab415013ac18fa8a49b9cd67dc1f735822 SHA1 dc6fc0ec131c11796d01512bbd80089719b04a66 SHA256 22bbf4561837af475c0d8d14e3b9cab453998c787212c107fac7faf2f281e26e
-EBUILD psmisc-22.12.ebuild 1733 RMD160 c179d5a73272be234c5f0ae539009e6b3480e101 SHA1 235c90d269f149fca63fe9e7f23911e1dec828cc SHA256 fd41fbbe9c5071efafd403d1a94886cbc526f42975821df28c4e821dd234b2d6
-EBUILD psmisc-22.13.ebuild 1707 RMD160 0211be98cad84366c0001cf5446e11a75a6765e2 SHA1 f0556869c752892f5465259120d272b114d8af57 SHA256 63a74ab2b6be101fcfc020be9624f15abc929fa18cd1661d51505baf9b8cea95
 EBUILD psmisc-22.14.ebuild 1695 RMD160 53f776d73f61855e088789e0f15cc06ce436cba3 SHA1 ca356ac21b43c7b899a3d8d83c3f1eaa95fe5b23 SHA256 5bc21e953ac9f7b50239668ee09880568fce744a6b766483d4fdc3dfc7397241
-MISC ChangeLog 20118 RMD160 c523793c8079e3c7048c16bb37c032a858269187 SHA1 271554613c66afb95f1aecc6fdb3a08c11c27575 SHA256 c5962d90e9575cbbe7f3bb27393613e2297651ec66417a30f8da3a152dd40ac2
+MISC ChangeLog 20294 RMD160 fcb3da65a54c50a9e4f55012ba1031e6624bcc7e SHA1 01ec32e41a257f25a73631305e56d99bf9dbaf72 SHA256 62dae4cb9644ef45185a10ccbbb24eac8109b2ee5704a56464e82b30229a7a60
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPIVTCAAoJEEdUh39IaPFNIJ8IAJcrHeCgxKbL89jNXsG3uAnl
-knjUnnCc9MaDMjgHutgjGXOSyBZEcDmJ7lc3y1DDRxxoYIYdjmGOaEfB5fZmYTGx
-hUw1dZVBe28zlh7QQHxwq/8jeEPMhpJZxhwcCfMGr8ShRzW4vJ9U+d9QEPRJYnzW
-jSbeExm92Y1CZamJHAXlWdIivlasuEOBRDMXYKo5s3VW9mkcEXJlIFArx+e/+Jf3
-I7uoiMuFuc5bCOfZlq3NNszH2g4zHKuC7SMxOfHRrIR+nKRQrJP2nyMz4gNEQrpz
-oy2Vl0qDPbkyTyjWqIYy2cdOiOAdhdav8Yj+Otjfzvng0LD8wT8Xh9wDvZacYTs=
-=S/Mj
+iQEcBAEBAgAGBQJPIVUHAAoJEEdUh39IaPFNXc8H/1MW9j9COKupUfd25iaWSqbT
+3qbDYQAvRaEkda2R+0NXT0GZY1nIiFxVSUIIWZYf7jWPdmgB0Hz1MIoS0UQ+8+jd
+cJBkH8TyRU4ENpQcvXk9MNh/ykte2HDRpzu2e73Zq7BvVV45fv8SN5UzFbrBaxmb
+IGhtcXnbAkOkaHx0j5rR3io0eSwMkEq5S424vZb8HYcS6eQa4AobHIpjvhgXe6bA
+h50zpnfmQvtgYUmK0KY9aK+7aTTbFQBsoA/FK8zPpowb5bLFRpxGfWuYWT8autSv
+F321HuTjP2PX405xm/jS/YHQr66m150Ix3bXe61zHe3lWbL5P8nonxmKoLJrjE8=
+=imis
 -----END PGP SIGNATURE-----
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
-}