Bump to EAPI=3, add prefix keywords, update patch

Package-Manager: portage--svn/cvs/Linux i686

4 files changed, 41 insertions, 20 deletions

diff --git a/app-admin/passook/ChangeLog b/app-admin/passook/ChangeLog
index 64f2a2d86061..6caabc0301e3 100644
--- a/app-admin/passook/ChangeLog
+++ b/app-admin/passook/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/passook
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/passook/ChangeLog,v 1.14 2008/01/26 10:03:28 grobian Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/passook/ChangeLog,v 1.15 2010/04/06 05:54:22 abcd Exp $
+
+  06 Apr 2010; Jonathan Callen <abcd@gentoo.org> passook-1.0.0.ebuild,
+  -files/passook.diff, +files/passook.patch:
+  Bump to EAPI=3, add prefix keywords, update patch
 
   26 Jan 2008; Fabian Groffen <grobian@gentoo.org> passook-1.0.0.ebuild:
   Dropped ppc-macos keyword, see you in prefix
diff --git a/app-admin/passook/Manifest b/app-admin/passook/Manifest
index e8b5178d2275..84207d3bf483 100644
--- a/app-admin/passook/Manifest
+++ b/app-admin/passook/Manifest
@@ -1,5 +1,15 @@
-AUX passook.diff 663 RMD160 2d73751d9ec0c3ec735c5dfc39373c7177a26878 SHA1 4a05b4b58dfab4b695c285aa73116702db30fc0f SHA256 da9436a8fa0e2d66666805addb77fcf180824d1053ba73ba80eaae59b26ba921
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX passook.patch 778 RMD160 8a4d941bf4dc5dc6615669b1a1b59f345cd60e50 SHA1 8a5e35db57c48adbb4bcf56acd75e091f3768f7a SHA256 3bce594e0621e1e21342e9717834cceda3093735db46983566e12361d86f89ac
 DIST passook.tar.gz 1424 RMD160 d8e32c69c775b1a477b572ab86110d3068ebb77d SHA1 9c95058af4f6b296c5ea362e715b89fb8f007bf5 SHA256 748db7a08bce46a380b3104d772f2a9c97fe07c3a6e94e479c790f9271ce9172
-EBUILD passook-1.0.0.ebuild 724 RMD160 2bc4c2ac7e3728e7dd28eb276a1ccdd9a00c0dee SHA1 9d8f0730d485bdd62136034009789ce966b2b5d6 SHA256 7ebf83db3b42855e226f4aa26591d0a4a2341355e0f8ebce86b542bc61425e36
-MISC ChangeLog 1286 RMD160 8e9cd8359a416574d899e910214e984ab7fd5965 SHA1 186e82657d443478d8768023463e0fa9cae3f01f SHA256 533fbb0d7618f5525bbadb4e966c6121db9877aead2f4d57fc65c73cb4726bcc
+EBUILD passook-1.0.0.ebuild 806 RMD160 0c0bfdb85fb62332446ceb2eaf694706c5d55f9b SHA1 9104d6e5782d15ca372856779d43a15f94678c98 SHA256 3a9cab7f83a719ad89fac660a05307b0c12d13f95074c3ef775f01c0b703e3a8
+MISC ChangeLog 1452 RMD160 a80378798c37ba5275034428fe3a35eb11f4499c SHA1 47dc5ca1c7fbf0c391774bf5834199d5e319c53b SHA256 026c3ef402530763924a9f6e61d69c316892a0f768b240030db1bf1b3dbf16c4
 MISC metadata.xml 378 RMD160 a64219512d0d2d71e62ea3510765308e8f4b71e2 SHA1 572bdd1c40f451b939a4d084e1de9852a982af5f SHA256 75d875037635e1abb4b6583f6a2cc085ed2ddfcdeffe0720f3f63c7e08dec653
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAku6zJMACgkQOypDUo0oQOo4rQCgm4UeVBjrBJX1pWh78VvJlDbo
+i5oAoJzOMiVGP9CDullmMxs/9eX993/X
+=dA4g
+-----END PGP SIGNATURE-----
diff --git a/app-admin/passook/files/passook.diff b/app-admin/passook/files/passook.patch
index 13639ff90329..db14e6ec817c 100644
--- a/app-admin/passook/files/passook.diff
+++ b/app-admin/passook/files/passook.patch
@@ -1,11 +1,17 @@
---- passook.orig	Fri Jan 26 15:02:26 2001
-+++ passook	Fri Apr 26 02:03:22 2002
+--- passook.orig
++++ passook
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl
+ 
+ srand;
+ $p = 3; #default pronouce level
 @@ -38,7 +38,7 @@
  }
  
  sub fourletterword {
 -	my $grepstring = 'egrep "^....$" /usr/dict/words';
-+	my $grepstring = 'egrep "^....$" /usr/share/dict/words';
++	my $grepstring = 'egrep "^....$" @GENTOO_PORTAGE_EPREFIX@/usr/share/dict/words';
  	my @fourletters = split(/\n/,`$grepstring`); 
  	my $word = $fourletters[rand(@fourletters)];
          $word = &tangle($word) if ($p<5);
@@ -14,7 +20,7 @@
  
  sub threeletterword {
 -	my $grepstring = 'egrep "^...$" /usr/dict/words';
-+	my $grepstring = 'egrep "^...$" /usr/share/dict/words';
++	my $grepstring = 'egrep "^...$" @GENTOO_PORTAGE_EPREFIX@/usr/share/dict/words';
  	my @threeletters = split(/\n/,`$grepstring`);
  	my $word = $threeletters[rand(@threeletters)];
  	$word = &tangle($word) if ($p<5);
diff --git a/app-admin/passook/passook-1.0.0.ebuild b/app-admin/passook/passook-1.0.0.ebuild
index 75588b1ddd08..c5b4db18ceb4 100644
--- a/app-admin/passook/passook-1.0.0.ebuild
+++ b/app-admin/passook/passook-1.0.0.ebuild
@@ -1,30 +1,31 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/passook/passook-1.0.0.ebuild,v 1.22 2008/01/26 10:03:28 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/passook/passook-1.0.0.ebuild,v 1.23 2010/04/06 05:54:22 abcd Exp $
 
-inherit eutils
+EAPI="3"
+
+inherit eutils prefix
 
 S=${WORKDIR}
 DESCRIPTION="Password generator capable of generating pronounceable and/or secure passwords."
 SRC_URI="http://mackers.com/projects/passook/${PN}.tar.gz"
 HOMEPAGE="http://mackers.com/misc/scripts/passook/"
-IUSE=""
 
-SLOT="0"
 LICENSE="as-is"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
 
 DEPEND="dev-lang/perl
 	sys-apps/grep
 	sys-apps/miscfiles"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/passook.diff
+src_prepare() {
+	epatch "${FILESDIR}"/passook.patch
+	eprefixify passook
 }
 
 src_install() {
-	dobin passook
+	dobin passook || die "dobin failed"
 	dodoc README passook.cgi
 }