app-admin/pwgen: Add to autotools-utils.eclass; eautoreconf for sane prefix header detection; drop old

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

7 files changed, 55 insertions, 114 deletions

diff --git a/app-admin/pwgen/ChangeLog b/app-admin/pwgen/ChangeLog
index c464c42128e4..404031040846 100644
--- a/app-admin/pwgen/ChangeLog
+++ b/app-admin/pwgen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/pwgen
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pwgen/ChangeLog,v 1.65 2012/10/14 21:52:18 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pwgen/ChangeLog,v 1.66 2013/04/04 13:46:28 jlec Exp $
+
+*pwgen-2.06-r2 (04 Apr 2013)
+
+  04 Apr 2013; Justin Lecher <jlec@gentoo.org> -pwgen-2.04.ebuild,
+  -pwgen-2.05.ebuild, -pwgen-2.06.ebuild, +pwgen-2.06-r2.ebuild, metadata.xml:
+  Add to autotools-utils.eclass; eautoreconf for sane prefix header detection;
+  drop old
 
   14 Oct 2012; Alexis Ballier <aballier@gentoo.org> pwgen-2.06-r1.ebuild:
   keyword ~amd64-fbsd
diff --git a/app-admin/pwgen/Manifest b/app-admin/pwgen/Manifest
index b93e6e925467..470ba659b18f 100644
--- a/app-admin/pwgen/Manifest
+++ b/app-admin/pwgen/Manifest
@@ -1,21 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 2.06-special-char.patch 313 SHA256 f061802b7e9cd24e9ce7f56b28db986ad041cd3b6add8d855c94fc3388a2451a SHA512 8d306b088ba020b730b32f85a8799bff72c8ada28995bcf1182dde093f67fe5836525d674c4af9516262274a04803332aacfcd4ca905d4d7ee6ebe17f8e2a331 WHIRLPOOL d86cd9acb63efec65fdd64d87188b05ca19c25e5568f176ed849afb38e8aedc411c09c6894c6064ff6e2fc968c34947e46e15ab3d1de60139835919028a7df0d
 AUX pwgen.rc 495 SHA256 156c01a9549390112f037bbbc27bebe6e0585c975d00d2ea13314e03f3d6f6b8 SHA512 47d00fe4a08d97f48390d9b9911d0815c1d48b3c603634b14e136fa8f0ae1bd735a870ea6cd0e4c7cfe7b2c3e31ac22768c6c5a8e81884aa6d9b24eb236df820 WHIRLPOOL 6181e7c3f01be4e56469714f888a027a228b237f72d4694fb5782180657966ac4febca6d358fc5d2be0521743a96395a2bf7f7177127f4ca96111b5b2388ab32
-DIST pwgen-2.04.tar.gz 47276 SHA256 f2edeff7fe4968187201e37d84254fabceb155fadc0979a06f5643dec290b715 SHA512 45991bd94195fa730b19b5786c48d02adf111882a79b68158b27098bd07f2e9cb16650d6d707fc879359ab28bfe03754f891cbf0a0e1b385a6fba7595d189266 WHIRLPOOL 6fc7d19af2cb579b81426b2fe92b9901f5fc6356ec64dac50d7eba1d05f9f49ebe7042fb3b43433b9899603d33f9bec6a2d3c92d2bf84653c4447294162665a4
-DIST pwgen-2.05.tar.gz 48892 SHA256 c87a138652e0c971afb6ecefe123cb2dd686c214272d7f813901ad44db5cdda9 SHA512 ab2bb2af5509dd379f640b39b87fb0cc23c0f61a7453097a4bb0439a78b6ea5a5f54d40bf321fd8b4a58aae5bd94169b0ce4734f67b7dde5ced5807c1a9caf51 WHIRLPOOL 19ce25a62a2b2d2d33dd5126bbec481bea813af992968166b887006bbbe7dc50a5832bf2b181cc9b9194e18b4c48363e5828d4e5f54e944508822f2a27eb1184
 DIST pwgen-2.06.tar.gz 30952 SHA256 61598c9e3a0f7eb2e7367d4ecc71522c4f16a7d41ed31db29e3afee8d9843454 SHA512 46cd35292cc0772ae5c89888c862e08ae14854b4d32bfe2c57aa5ab62dab2a3e858255b2a8f3ef94eec32739ea403ad12b872f4a8890d2b5157bc62e48488001 WHIRLPOOL a0e7ac49690ae9c9f27c3d73406eb70de90985c2e674757e78acde99e4fed8da2d412f2449da99d11bbe41fc1b18ad88102710e1359c74ef428024c88c26345b
-EBUILD pwgen-2.04.ebuild 781 SHA256 0e3a10f2e300e98f740cf330b8ebf8258f3b91ade23e7e956f2aefc746c839d5 SHA512 4ee2cef97b183bcfeb04a8ba414866ca3c9bfea90bade64948cc422670d2c1ad1611ecf7e278f003d21acb7f482dd0418f81d62b8a3df876bb628bdf3b498d3f WHIRLPOOL d73b5ddab860a824aef1ced4b424f6c96f86c8756ba360035f6f9bb8ac0be62b8f17a0d0c5d1b8f6909f39dd40c3a4433d3a4e5313bcc3b225bada6b051f7ce3
-EBUILD pwgen-2.05.ebuild 791 SHA256 5a206e7e53ec9e2a3ee650dbc8ff85e500d14bd631a42d33999315304af0c6be SHA512 ac3f3b61e05258cc4c7b4c47ee2543b6ff87b71c3c19a919e1a00d09d89566a223a7cdc731330c61607dd178f86bba2ab3fef093af46ac010d8febea1cc14369 WHIRLPOOL 10697c78f8090e6e0abffd18a52834aa3942f8ebfe272300a5494080d291a074bf32502dea25cdb7966f40b391d06045b5cc379458dbca27d1faa225f75e4054
 EBUILD pwgen-2.06-r1.ebuild 936 SHA256 e0e64b3e5b1297159a61da419a1c66d190cd03c633359a8ab2896f0daa25006c SHA512 4c2fcd74f395d0bf6cbba734ac77b02d75aaa998fee5ebee63c0d60efe9cd97fac6b8337485e80da14d3e2cca9af596b188469c01d9f934b8ee0403fcbbf8ef3 WHIRLPOOL f9b9ed1e99503d5ba2482d1d4eab61eefa3eee9f293a268935d7a383fa5745a977a49ca5a11980a139b5166768d351015092c93f1c5113b0b2ab145251fd785d
-EBUILD pwgen-2.06.ebuild 818 SHA256 3c789baeca226cd061dc17541f5f37790d0e0f8e0ccbf5f7b05623f23d112a31 SHA512 96c4ff9f9718e3bebeeba847901f8e5b4354589549047fd66ae742b448adaa31248273d5b086c64ef2e26b796b590fbd0dd8b50a4b01053a410addbe63cf9bf9 WHIRLPOOL 222f8e9c6e139437f449978994ff8e456cc36c9153d3ad856aef0ce0dd5c7a02c9a856a95eb85810abe9b87c1799474bba4717f6e07a406563cda6113c003db1
-MISC ChangeLog 7566 SHA256 338b9a794a042e33f6b115ab14a4a5217fc6c41a717b977b521ca2ba88cd68ce SHA512 99b474ef31d46e094731038e06f31fda2b954ed14404f54b1f9636a49cdea0509b85c02199522b30ec075dd6b5b97cbaa911178296f4e5a813de63f760040b64 WHIRLPOOL 819b72717dee7ffc0eb04baa2d0475205b9b54d22e58330b48ba11c75bbf52fba84d6c0e6c00c4f67e6f4737839a6bf661a05eea7d118f209e4ef413e22e81ad
-MISC metadata.xml 218 SHA256 f1eb341d350e20d164962d85b99168657fcb47622bd6b163f1fdb3a00ab68889 SHA512 b402e1256ae4b5485be59d74a981b77464601ecb023e48f71e098260d353c729ed37ade44c44ca7573df56ce18582d4654e6e7d1c5f49f54136ede2848096987 WHIRLPOOL e1f772993c175cb5c4b0ba038ea39df71b7137780e661a497e116499a8a3eef5ee9ef3705d5967ff97ad3c5c7a8abf74a2ee7fdacef28159e3ce753a17ea3113
+EBUILD pwgen-2.06-r2.ebuild 1039 SHA256 04984f5c252ff32dfb414f12c249ba15ff903785d63ca40a0e8f23a7229d09ec SHA512 887cdd0f787df7a3a24ecdf9eb82642836fd5cc6bd1f4e62a6bfa5cb3a7da7ae650a926eeab4dbeb61fecaa0c509ca611cfe0bfd188083348b4abc06fed44c5b WHIRLPOOL 064f95f9ed85e82ac653ac25f0d6b191231b32ccbb0fc8d1198f29155b5596166285c2a247d53efb4d8140d554bdea9d51abea99dc16ee842b58e97b494950c1
+MISC ChangeLog 7829 SHA256 a0d8f61d2bdc69ea633bf76f81fa3e224b268624927d3c1886f314ce08a42243 SHA512 9545a40935115e4384dbbcfa95cfab0cab048d2bc8d2cac533e5719f91e7b039e07b875e535d94c2fbfbb451662ccd5d0ead37f345db768aaf3121af7638ee32 WHIRLPOOL 7805f6213a85a102474ed669ef17a1ed3d8aa59fe2f6234a351fda220029f55b4d39956e3318cd7ecf6e7f1f0efcbfc7f553c859fd986c08e8946cb5981517fc
+MISC metadata.xml 227 SHA256 dd26fa828c98391974d6dd00aebaf07f36581eeb623aa3f858bca77ed68e75d8 SHA512 ad4338520af0d1d3537175fe341b073baaba07dc10526b21836d2b32a3462f2ae8328e816447266b28146b0ee53136d49e198c00e1b7151aaad38637633fc475 WHIRLPOOL 2014d44bcb37e16c5ce2562969ec720fe5ce489c60b5308ed416a207f80b3767da6e110ff6b9c3982d77f4bbfbbd3c841ffb9a6b9e0e9f93846c33066c706b0e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB7NBQACgkQvFcC4BYPU0py2ACgzvao+QAIUU9K0ZorE0o7Ozhh
-U9IAoMIcFGfzWqHC1QRIgoyV5gdpRxi/
-=ibnb
+iEYEAREKAAYFAlFdhDUACgkQgAnW8HDreRaw9gCginh5lbZtWFN+4AGInnT0LahV
+FY8Ani8afJr8jI3ggjLz7YNtDNRNca1N
+=ZfLS
 -----END PGP SIGNATURE-----
diff --git a/app-admin/pwgen/metadata.xml b/app-admin/pwgen/metadata.xml
index bf55b762cee1..28a4f05f1934 100644
--- a/app-admin/pwgen/metadata.xml
+++ b/app-admin/pwgen/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>livecd</herd>
-<maintainer>
-	<email>jlec@gentoo.org</email>
-</maintainer>
+  <herd>livecd</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-admin/pwgen/pwgen-2.04.ebuild b/app-admin/pwgen/pwgen-2.04.ebuild
deleted file mode 100644
index 095754ec1671..000000000000
--- a/app-admin/pwgen/pwgen-2.04.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pwgen/pwgen-2.04.ebuild,v 1.17 2011/02/06 05:19:15 leio Exp $
-
-inherit eutils
-
-DESCRIPTION="Password Generator"
-HOMEPAGE="http://sourceforge.net/projects/pwgen/"
-SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="livecd"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's:$(prefix)/man/man1:$(mandir)/man1:g' Makefile.in
-}
-
-src_compile() {
-	econf --sysconfdir=/etc/pwgen || die "econf failed"
-	make || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	use livecd && newinitd "${FILESDIR}"/pwgen.rc pwgen
-}
diff --git a/app-admin/pwgen/pwgen-2.05.ebuild b/app-admin/pwgen/pwgen-2.05.ebuild
deleted file mode 100644
index 1d58fc15ecae..000000000000
--- a/app-admin/pwgen/pwgen-2.05.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pwgen/pwgen-2.05.ebuild,v 1.3 2009/09/23 15:01:54 patrick Exp $
-
-inherit eutils
-
-DESCRIPTION="Password Generator"
-HOMEPAGE="http://sourceforge.net/projects/pwgen/"
-SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="livecd"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's:$(prefix)/man/man1:$(mandir)/man1:g' Makefile.in
-}
-
-src_compile() {
-	econf --sysconfdir=/etc/pwgen || die "econf failed"
-	make || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	use livecd && newinitd "${FILESDIR}"/pwgen.rc pwgen
-}
diff --git a/app-admin/pwgen/pwgen-2.06-r2.ebuild b/app-admin/pwgen/pwgen-2.06-r2.ebuild
new file mode 100644
index 000000000000..4ccd0478cb46
--- /dev/null
+++ b/app-admin/pwgen/pwgen-2.06-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pwgen/pwgen-2.06-r2.ebuild,v 1.1 2013/04/04 13:46:28 jlec Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils toolchain-funcs
+
+DESCRIPTION="Password Generator"
+HOMEPAGE="http://sourceforge.net/projects/pwgen/"
+SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="livecd"
+
+PATCHES=( "${FILESDIR}"/${PV}-special-char.patch )
+
+src_prepare() {
+	sed -i -e 's:$(prefix)/man/man1:$(mandir)/man1:g' Makefile.in || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=( --sysconfdir="${EPREFIX}"/etc/pwgen )
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	use livecd && newinitd "${FILESDIR}"/pwgen.rc pwgen
+}
diff --git a/app-admin/pwgen/pwgen-2.06.ebuild b/app-admin/pwgen/pwgen-2.06.ebuild
deleted file mode 100644
index a3fab4c59956..000000000000
--- a/app-admin/pwgen/pwgen-2.06.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pwgen/pwgen-2.06.ebuild,v 1.8 2009/09/23 15:01:54 patrick Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Password Generator"
-HOMEPAGE="http://sourceforge.net/projects/pwgen/"
-SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~arm"
-IUSE="livecd"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's:$(prefix)/man/man1:$(mandir)/man1:g' Makefile.in
-}
-
-src_compile() {
-	tc-export CC
-	econf --sysconfdir=/etc/pwgen || die "econf failed"
-	make || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	use livecd && newinitd "${FILESDIR}"/pwgen.rc pwgen
-}