Transfer prefix and clean up

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 18 insertions, 135 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/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
 }