Drop autotool usage since we no longer patch autotool files.

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

3 files changed, 24 insertions, 27 deletions

diff --git a/sys-process/psmisc/ChangeLog b/sys-process/psmisc/ChangeLog
index 6c31c4bd3276..eea1d8863041 100644
--- a/sys-process/psmisc/ChangeLog
+++ b/sys-process/psmisc/ChangeLog
@@ -1,6 +1,9 @@
 # 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.121 2012/01/28 06:09:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.122 2012/01/31 16:28:49 vapier Exp $
+
+  31 Jan 2012; Mike Frysinger <vapier@gentoo.org> psmisc-22.15.ebuild:
+  Drop autotool usage since we no longer patch autotool files.
 
 *psmisc-22.15 (28 Jan 2012)
 
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 9189e25901e9..c4cbb8155cc9 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -6,17 +6,23 @@ AUX psmisc-22.15-COMM_LEN-to-18.patch 2819 RMD160 9b20be171434bf0091f67284b747dd
 DIST psmisc-22.14.tar.gz 382024 RMD160 56a1b2ab415013ac18fa8a49b9cd67dc1f735822 SHA1 dc6fc0ec131c11796d01512bbd80089719b04a66 SHA256 22bbf4561837af475c0d8d14e3b9cab453998c787212c107fac7faf2f281e26e
 DIST psmisc-22.15.tar.gz 390766 RMD160 572c738202061f60ab965ba8f7e0b024d385d647 SHA1 06f507d889afab70ac7ff20fbd419ca2ffcf90c0 SHA256 5fbe908618d7ccf08164a733a361ce9823355fd0da754e53982d842158973754
 EBUILD psmisc-22.14.ebuild 1695 RMD160 53f776d73f61855e088789e0f15cc06ce436cba3 SHA1 ca356ac21b43c7b899a3d8d83c3f1eaa95fe5b23 SHA256 5bc21e953ac9f7b50239668ee09880568fce744a6b766483d4fdc3dfc7397241
-EBUILD psmisc-22.15.ebuild 1843 RMD160 8a310ada1bcd708f3cf118bd9de5c43e98766809 SHA1 0982609da9b513a23c0cbb4963994261735979d2 SHA256 f4b3eee9d95599478273d18a64f194bad967562b8f40071a0c0c2c8488ad7586
-MISC ChangeLog 20530 RMD160 5dd7fc526b352d142788e9bdae8cdcc186c89b4b SHA1 025c2717785c3fef1e7844719f40aa897c562af3 SHA256 9ac243d12d7d07325c41c067be6d45a5721af2849e210e3d1b7b158d0b422598
+EBUILD psmisc-22.15.ebuild 1384 RMD160 5e486fdb80df6fa78d0e01616b00091ea6d9d97c SHA1 e71fec6a2b4ac128874cc3b750375c646af49592 SHA256 044411a7682dfe0ac748d233aea2948413d371aaead81bfe59652fd00d936bac
+MISC ChangeLog 20662 RMD160 89e8dd36444c3710115a360a0c0e5da583eac282 SHA1 854035601cff27276e2bb075c076fb6900c71eaf SHA256 3b74b01878f0381059a28c2482417e040bf361b8fc77b9c27e1bbfd2b86456a0
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPI5GpAAoJEEdUh39IaPFN+tgH/AqsKv9jhhhXlyfLPtur3Wqc
-Zyn5+MnIbYjAMFLvp2FcwKHtHlYprjr8rsJylbcWmtUtvx1ZIn+tv/jfYHSq/lEi
-HyKZ4mjX0MfGn4vlqoU/YfLQwbW5Mv3cGAWeVfIU64p2zDUTOPdStEm/hP1i9qkZ
-oUUiGI8SUhu3IHAxNz7YnbDvPfvAWZvZmUpX4OzMZZDWHKrL49yCXsldxHPDiyfq
-WSgQZT8NWbXBQ9AUVJKbKkaaVFv74ndC3mAjqJZmbgoJy/7fXvQMtYdQumB30Zvf
-MWoVu5x97gW5vR2SLtrecOMhlvnVdpSdRmAO343L3aP60VYEEguytRAgFrzturo=
-=L9ql
+iQIcBAEBAgAGBQJPKBbOAAoJELEHsLL7fEFWbXQP/j5XOvrAoqm28m+zEQXuyJC7
+ML5Hggq8WVn/png4polzNruvfCU7Eb45i3iFuNStRGiN82evRTQbexHCE25i4J9D
+8U2W6rRpePkSb+7vm/hTp7AjbDkqpKXzfd2M1IOBGYw9WTuL9yg+XvGuRYjpHdR/
+wRK3jbcULyQFZ7okVoYMttRQmacX59+GNGJGTXMOZI5T00aw8mcsZEXQrYNg35Ux
+WU5XGcj0LULEvPBPOpHoFFl3scK8wi1a74lR4MPMvLzGDQ/H3aodgNcOLPmaLjJq
+Cf4eLyUQ/hTz5hkQTyVihGphqdx+iUuJnS4gLtnYlaBSBvG0icwOjN5dvtmZEPUO
+y8UQagI42MBMy+jdNS1QfaiGcy9MvuYTtusKMCEKskKll/E639Dndou39XtYlVaf
+USPUU9T2zLyYkDTYWPApN4NE4dulQaP/KxGUzb2q8gagpUOaz6Akg0VV1ruBT4mV
+BOtHvH5yqDUyEUcgC9VGrHKg8cMr7k9488sxDAZiZ4ODy60SN1NPtdTVwRYmk8N7
+bNRst/vSAxnQLiTsFjCEFtjcREwvYJFJesOU7ovDB0E/vcQMdT+wzqnbzg95jvqw
+rx0gHexCXwevv/OxVmAyeDHHQHymS1iUBCWeQqLUzCan0XuhzsSgy4+WjqAhma6O
+vCOCtq7aLN8uMVH13Iob
+=xs/k
 -----END PGP SIGNATURE-----
diff --git a/sys-process/psmisc/psmisc-22.15.ebuild b/sys-process/psmisc/psmisc-22.15.ebuild
index 4aaacb945ae6..9d18fc9df953 100644
--- a/sys-process/psmisc/psmisc-22.15.ebuild
+++ b/sys-process/psmisc/psmisc-22.15.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.15.ebuild,v 1.2 2012/01/28 06:14:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.15.ebuild,v 1.3 2012/01/31 16:28:49 vapier Exp $
 
-EAPI=4
-inherit autotools eutils
+EAPI="4"
+
+inherit eutils
 
 DESCRIPTION="A set of tools that use the proc filesystem"
 HOMEPAGE="http://psmisc.sourceforge.net/"
@@ -25,26 +26,13 @@ DOCS="AUTHORS ChangeLog NEWS README"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-COMM_LEN-to-18.patch
-
-	if ! use nls; then
-		# http://bugs.gentoo.org/193920
-		sed -i \
-			-e '/AM_GNU_GETTEXT/d' -e 's:po/Makefile.in::' \
-			-e '/SUBDIRS/s:po::' -e 's:@LIBINTL@::' \
-			configure.ac {.,src}/Makefile.am || die
-	fi
-
-	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 \
 		$(use_enable selinux) \
 		$(use_enable ipv6) \
-		$(use nls && use_enable nls)
+		$(use_enable nls)
 }
 
 src_compile() {