Transfer prefix and clean up

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 21 insertions, 141 deletions

diff --git a/sys-process/psmisc/ChangeLog b/sys-process/psmisc/ChangeLog
index 1f584c3c21e1..d471b24e780e 100644
--- a/sys-process/psmisc/ChangeLog
+++ b/sys-process/psmisc/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for sys-process/psmisc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.103 2010/07/31 00:27:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.104 2010/08/05 17:54:39 ssuominen Exp $
+
+  05 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> psmisc-22.12.ebuild:
+  Convert to EAPI="3" and keyword ~amd64-linux ~ia64-linux ~x86-linux wrt
+  #331321 by Jeremy Olexa.
 
   31 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> psmisc-22.12.ebuild,
-  +files/psmisc-22.12-no-nls.patch, +files/psmisc-22.12-peekfd.patch:
-  Fix building of "peekfd" for X86_64.
+  +files/psmisc-22.12-peekfd.patch:
+  Fix missing bits/types.h include in configure.ac check for peekfd and x86_64.
 
 *psmisc-22.12 (30 Jul 2010)
 
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 83844719af5e..3aceb6c1c14c 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,11 +1,8 @@
-AUX psmisc-22.12-no-nls.patch 693 RMD160 10170e0d3a593185781c8e5c866b49fd3070beaa SHA1 48a94c3796680fd20103a3938f546ca32246d3e0 SHA256 493e2b1a1a45da3f2334340af58950320108161c6e1fd43bc086b2b85f23a5bc
-AUX psmisc-22.12-peekfd.patch 1697 RMD160 e27402b6490d3790babee84698f34f1a0c60da5e SHA1 74506d6dd651a108ed67ea5f5f83a1387920349b SHA256 ef68917b98b96689f4faf6fa6132625028a8f3fe86f06361c9682bc53b2f157e
+AUX psmisc-22.12-peekfd.patch 478 RMD160 42839c32114c79d85f9154aa9efd08f0031d0449 SHA1 ec6240134908ef6b317de422cc4c465958d8b5b4 SHA256 1775d41187d3d15842f62d9aeda87f1ae5a7eaf62b935d1262345a9a8bf7e1e6
 AUX psmisc-22.5-no-nls.patch 736 RMD160 ac2c51cccc6c95f0aa47efe1ecaeb0d5eaefbce9 SHA1 0227573aa987bfb78ecef891673dc2792c98aba5 SHA256 b2137d22d62276cbd4a1b154c119df025d864054063302a91b5a1610f6c7102c
 DIST psmisc-22.10.tar.gz 314712 RMD160 cf0fa6985db0ac4c6b31b0a1af7cf47da2e5b6ba SHA1 20bfa81ec36603c6a141bd7e6137cf9d3b52c3d9 SHA256 e8c2a520549ec86deeccd55fd30cbb46fca20e57d7dfde240ee49df1c6dca053
-DIST psmisc-22.11.tar.gz 375038 RMD160 a525b0d39bdfc5af0f5981c191e46953bce90d94 SHA1 5d3b9f15ffba3f98147223abbcf803405fd7b7ae SHA256 8fff37557f5150d89ef9afc03133731da3eaa2bad1a94f64355218a68b884536
 DIST psmisc-22.12.tar.gz 374354 RMD160 cd33616bb36c0c5d7b107711c76be82a250d1a54 SHA1 662e332f7140252b65aca0c44096ee8d2f80b3c2 SHA256 ba2f41a501da6137b2d94e54e855bea8246f65167c613d3990bd0ce49e996a7a
 EBUILD psmisc-22.10.ebuild 1507 RMD160 86b6dfb8eb8a0086deb86ec1c6ce006ae4c5ef04 SHA1 caf5f8affc22a5f63360419b85e2997f709f0b4c SHA256 863af68179ab351ebe1941cd388d45f85aabd4fca5f1a091c4d061ff4a29ab2a
-EBUILD psmisc-22.11.ebuild 1573 RMD160 341d65cef2de4cb190f86c1ee1eb2b5471035895 SHA1 d3167fe89f45235c67c8f0d1eaff4f99a41dbdff SHA256 f62b3c940144b2aa6b2f1e1a2d0ce5336fbc400352ad4d809e3e244a98487a41
-EBUILD psmisc-22.12.ebuild 1562 RMD160 45f575af3c32fb34b7914e66ef11d3a60b130041 SHA1 fa2dab0e84a974136073e4725363805e4c4543e0 SHA256 57e81f7325184bf60a77f440c50c40c204f465ffbe4178da14351fb2ce878cdf
-MISC ChangeLog 18175 RMD160 8e0dae4c83828f45f938f3a962907f22d0bc9613 SHA1 12a811eee8f7fe3c3c4e59169f3cf306b8faf702 SHA256 33033e9a803f7bf90257ed866b09ee38e1fdd81008d6e6dbf015d5698d62d244
+EBUILD psmisc-22.12.ebuild 1565 RMD160 be4add63f8a7e124b09c51014ac11a15a3a30f88 SHA1 407decab75895efcef137e6d6bfccac54e519479 SHA256 6c27286c4d3e3b0bf584e35ef65062c9792401991808070db0bb023f89f297c3
+MISC ChangeLog 18359 RMD160 fcf6a858d49e6cf02809502eda20d1ba5d50c3a2 SHA1 cde36a2f3a46beb04581a265a32481fb8d1978aa SHA256 24722a7bbc4755c7b7fec8fa16467094c99c0d956815f293de7e23fa8e0ae35a
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-process/psmisc/files/psmisc-22.12-no-nls.patch b/sys-process/psmisc/files/psmisc-22.12-no-nls.patch
deleted file mode 100644
index d18b36af3f6c..000000000000
--- a/sys-process/psmisc/files/psmisc-22.12-no-nls.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-http://bugs.gentoo.org/193920
-
---- configure.ac
-+++ configure.ac
-@@ -57,10 +57,6 @@
- AC_CHECK_MEMBERS([struct stat.st_rdev])
- AC_TYPE_UID_T
- 
--dnl Check for language stuff
--AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.16.1])
--
- dnl Must be after the gettext stuff as it sets build_cpu
- AC_CHECK_MEMBERS([struct user_regs_struct.orig_eax,
- 		struct user_regs_struct.eax,
-@@ -120,6 +116,5 @@
- AC_CONFIG_FILES([Makefile
- 		 doc/Makefile
- 		 src/Makefile
--		 icons/Makefile
--		 po/Makefile.in])
-+		 icons/Makefile])
- AC_OUTPUT
---- Makefile.am
-+++ Makefile.am
-@@ -1,5 +1,5 @@
- 
--SUBDIRS = doc src po icons 
-+SUBDIRS = doc src icons 
- 
- #EXTRA_DIST = config.rpath ABOUT-NLS mkinstalldirs
- 
diff --git a/sys-process/psmisc/files/psmisc-22.12-peekfd.patch b/sys-process/psmisc/files/psmisc-22.12-peekfd.patch
index 81b508b27298..bb0686152321 100644
--- a/sys-process/psmisc/files/psmisc-22.12-peekfd.patch
+++ b/sys-process/psmisc/files/psmisc-22.12-peekfd.patch
@@ -1,21 +1,8 @@
-Fix building of peekfd for X86_64
+Fix building of peekfd for x86_64 (from upstream).
 
 --- configure.ac
 +++ configure.ac
-@@ -56,6 +56,12 @@ AC_TYPE_PID_T
- AC_TYPE_SIZE_T
- AC_CHECK_MEMBERS([struct stat.st_rdev])
- AC_TYPE_UID_T
-+
-+dnl Check for language stuff
-+AM_GNU_GETTEXT([external])
-+AM_GNU_GETTEXT_VERSION([0.16.1])
-+
-+dnl Must be after the gettext stuff as it sets build_cpu
- AC_CHECK_MEMBERS([struct user_regs_struct.orig_eax,
- 		struct user_regs_struct.eax,
- 		struct user_regs_struct.ebx,
-@@ -66,11 +72,13 @@ AC_CHECK_MEMBERS([struct user_regs_struct.orig_eax,
+@@ -66,7 +66,8 @@
  		struct user_regs_struct.rdi,
  		struct user_regs_struct.rsi,
  		struct user_regs_struct.rdx], [],[],
@@ -25,24 +12,3 @@ Fix building of peekfd for X86_64
  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>])
--AC_CHECK_MEMBERS([struct pt_regs.regs],[],[], [#include <asm/ptrace.h>])
-+AC_CHECK_MEMBERS([struct pt_regs.regs,
-+                  struct pt_regs.cp0_status],[],[], [#include <asm/ptrace.h>])
- 
- AM_CONDITIONAL(WANT_PEEKFD_I386,
-  test $ac_cv_member_struct_user_regs_struct_orig_eax = yes &&
-@@ -90,11 +98,9 @@ AM_CONDITIONAL(WANT_PEEKFD_PPC,
- AM_CONDITIONAL(WANT_PEEKFD_ARM,
-    test $ac_cv_member_struct_pt_regs_uregs = yes)
- AM_CONDITIONAL(WANT_PEEKFD_MIPS,
--   test $ac_cv_member_struct_pt_regs_regs = yes)
--
--dnl Check for language stuff
--AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.16.1])
-+   test $build_cpu = mipsel &&
-+   test $ac_cv_member_struct_pt_regs_regs = yes &&
-+   test $ac_cv_member_struct_pt_regs_cp0_status = yes)
- 
- dnl Checks for library functions.
- AC_FUNC_CLOSEDIR_VOID
diff --git a/sys-process/psmisc/psmisc-22.11.ebuild b/sys-process/psmisc/psmisc-22.11.ebuild
deleted file mode 100644
index f283383a95e2..000000000000
--- a/sys-process/psmisc/psmisc-22.11.ebuild
+++ /dev/null
@@ -1,52 +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.11.ebuild,v 1.1 2010/05/01 21:03:19 ssuominen Exp $
-
-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"
-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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use nls || epatch "${FILESDIR}"/${PN}-22.5-no-nls.patch #193920
-	sed -i -e '/^ACLOCAL_AMFLAGS/d' Makefile.am || die
-	eautoreconf
-}
-
-src_compile() {
-	# 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)
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-	use X || rm "${D}"/usr/bin/pstree.x11
-	# fuser is needed by init.d scripts
-	dodir /bin
-	mv "${D}"/usr/bin/fuser "${D}"/bin/ || die
-	# easier to do this than forcing regen of autotools
-	[[ -e ${D}/usr/bin/peekfd ]] || rm -f "${D}"/usr/share/man/man1/peekfd.1
-}
diff --git a/sys-process/psmisc/psmisc-22.12.ebuild b/sys-process/psmisc/psmisc-22.12.ebuild
index 1cfd59085228..1c601a3d9f8c 100644
--- a/sys-process/psmisc/psmisc-22.12.ebuild
+++ b/sys-process/psmisc/psmisc-22.12.ebuild
@@ -1,7 +1,8 @@
 # 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.2 2010/07/31 00:27:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.12.ebuild,v 1.3 2010/08/05 17:54:39 ssuominen Exp $
 
+EAPI=3
 inherit autotools eutils
 
 DESCRIPTION="A set of tools that use the proc filesystem"
@@ -10,7 +11,7 @@ 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"
+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
@@ -19,15 +20,13 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 	nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-peekfd.patch
-	use nls || epatch "${FILESDIR}"/${PN}-22.12-no-nls.patch #193920
+	use nls || epatch "${FILESDIR}"/${PN}-22.5-no-nls.patch
 	eautoreconf
 }
 
-src_compile() {
+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
@@ -36,17 +35,15 @@ src_compile() {
 		$(use_enable selinux) \
 		$(use_enable ipv6) \
 		$(use nls && use_enable nls)
-
-	emake || die
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README
-	use X || rm "${D}"/usr/bin/pstree.x11
+	use X || rm "${ED}"/usr/bin/pstree.x11
 	# fuser is needed by init.d scripts
 	dodir /bin
-	mv "${D}"/usr/bin/fuser "${D}"/bin/ || die
+	mv "${ED}"/usr/bin/fuser "${ED}"/bin/ || die
 	# easier to do this than forcing regen of autotools
-	[[ -e ${D}/usr/bin/peekfd ]] || rm -f "${D}"/usr/share/man/man1/peekfd.1
+	[[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1
 }