Add patch from Alexander Miller to fix epm -qi output. Bug 310475

Fix implicit RDEPEND in stable epm-1.33 ebuild.
Remove unused epm-0.9.1 ebuild.

(Portage version: 2.1.10.58/cvs/Linux x86_64)

4 files changed, 57 insertions, 7 deletions

diff --git a/app-portage/epm/ChangeLog b/app-portage/epm/ChangeLog
index d5810f0d9bd4..f06cd9b72182 100644
--- a/app-portage/epm/ChangeLog
+++ b/app-portage/epm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-portage/epm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/epm/ChangeLog,v 1.27 2010/11/03 02:50:15 jmbsvicetto Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/epm/ChangeLog,v 1.28 2012/05/11 21:33:33 fuzzyray Exp $
+
+*epm-1.33-r1 (11 May 2012)
+
+  11 May 2012; Paul Varner <fuzzyray@gentoo.org> -epm-0.9.1.ebuild,
+  epm-1.33.ebuild, +epm-1.33-r1.ebuild, +files/1.33-epm-310475.patch:
+  Add patch from Alexander Miller to fix epm -qi output. Bug 310475
+  Fix implicit RDEPEND in stable epm-1.33 ebuild.
+  Remove unused epm-0.9.1 ebuild.
 
   03 Nov 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:
diff --git a/app-portage/epm/epm-0.9.1.ebuild b/app-portage/epm/epm-1.33-r1.ebuild
index 5967e20c3baf..8792c52b0253 100644
--- a/app-portage/epm/epm-0.9.1.ebuild
+++ b/app-portage/epm/epm-1.33-r1.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/epm/epm-0.9.1.ebuild,v 1.4 2010/10/19 11:21:56 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/epm/epm-1.33-r1.ebuild,v 1.1 2012/05/11 21:33:33 fuzzyray Exp $
+
+EAPI="4"
+
+inherit eutils
 
 DESCRIPTION="rpm workalike for Gentoo Linux"
 HOMEPAGE="http://www.gentoo.org/~agriffis/epm/"
@@ -8,10 +12,15 @@ SRC_URI="http://www.gentoo.org/~agriffis/epm/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=dev-lang/perl-5"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-epm-310475.patch"
+}
 
 src_compile() {
 	pod2man epm > epm.1 || die "pod2man failed"
diff --git a/app-portage/epm/epm-1.33.ebuild b/app-portage/epm/epm-1.33.ebuild
index 32f8907a690b..780e8ae6c695 100644
--- a/app-portage/epm/epm-1.33.ebuild
+++ b/app-portage/epm/epm-1.33.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/epm/epm-1.33.ebuild,v 1.5 2010/10/19 11:21:56 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/epm/epm-1.33.ebuild,v 1.6 2012/05/11 21:33:33 fuzzyray Exp $
 
 DESCRIPTION="rpm workalike for Gentoo Linux"
 HOMEPAGE="http://www.gentoo.org/~agriffis/epm/"
@@ -12,6 +12,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-fbsd ~
 IUSE=""
 
 DEPEND=">=dev-lang/perl-5"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	pod2man epm > epm.1 || die "pod2man failed"
diff --git a/app-portage/epm/files/1.33-epm-310475.patch b/app-portage/epm/files/1.33-epm-310475.patch
new file mode 100644
index 000000000000..ac1a2f6df3e8
--- /dev/null
+++ b/app-portage/epm/files/1.33-epm-310475.patch
@@ -0,0 +1,32 @@
+Fix "Use of uninitialized value in printf" warning
+http://bugs.gentoo.org/310475
+Patch from Alexander Miller
+
+--- epm
++++ epm
+@@ -189,7 +189,7 @@
+     my ($p) = @_;
+     my ($group, $ename) = $p =~ /^(.+?)\/(.+)$/;
+     my ($key, $value);
+-    my %vals;
++    my %vals = map {$_, '(n/a)'} qw/CATEGORY HOSTNAME DESCRIPTION URL LICENSE NAME RELEASE VERSION SLOT PACKAGER/;
+     my $ldbpath = "$dbpath/$p";
+     my $fmt = <<EOT;
+ Name        : \%s
+@@ -206,7 +206,7 @@
+     open(F, "bzcat $ldbpath/environment.bz2|")
+ 	or die "epm: Can't open $ldbpath/environment.bz2: $!\n";
+     while (<F>) {
+-	next unless (/^(CATEGORY|HOSTNAME|DESCRIPTION|HOMEPAGE|LICENSE|PN|PR|PV|SLOT)=(.*)/);
++	next unless (/^(?:declare\s+(?:-[x-]\s+)*)?(CATEGORY|HOSTNAME|DESCRIPTION|HOMEPAGE|LICENSE|PN|PR|PV|SLOT)=(.*)/);
+ 	($key, $value) = ($1, $2);
+ 	if ($key eq 'PN') {
+ 	    $key = 'NAME';
+@@ -221,6 +221,7 @@
+ 	}
+ 	# Clean up the double and single quotes
+ 	$value =~ s/^'(.*)'$/$1/o;
++	$value =~ s/^"(.*)"$/$1/o;
+ 	$value =~ s/'\\''/'/go;
+ 	$value =~ s/\\"/"/go;
+