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

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

6 files changed, 48 insertions, 103 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/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
-}