Version bump to fix long standing issues. Changed maintainer to Peter Weilbacher. Fixs bugs 73494, 93843, and 153921.

(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key 0x4D269A1B)

4 files changed, 83 insertions, 5 deletions

diff --git a/app-portage/epm/ChangeLog b/app-portage/epm/ChangeLog
index 23bceeb1b97d..2600fa2c6577 100644
--- a/app-portage/epm/ChangeLog
+++ b/app-portage/epm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/epm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/epm/ChangeLog,v 1.32 2012/12/28 04:35:03 ottxor Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/epm/ChangeLog,v 1.33 2013/02/01 20:53:40 fuzzyray Exp $
+
+*epm-1.40 (01 Feb 2013)
+
+  01 Feb 2013; Paul Varner <fuzzyray@gentoo.org> +epm-1.40.ebuild,
+  +files/epm-1.40-prefix.patch, metadata.xml:
+  Version bump to fix long standing issues. Changed maintainer to Peter
+  Weilbacher. Fixs bugs 73494, 93843, and 153921.
 
   28 Dec 2012; Christoph Junghans <ottxor@gentoo.org>
   files/epm-1.33-prefix.patch:
diff --git a/app-portage/epm/epm-1.40.ebuild b/app-portage/epm/epm-1.40.ebuild
new file mode 100644
index 000000000000..5628ca69a64a
--- /dev/null
+++ b/app-portage/epm/epm-1.40.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/epm/epm-1.40.ebuild,v 1.1 2013/02/01 20:53:40 fuzzyray Exp $
+
+EAPI="4"
+
+inherit eutils prefix
+
+DESCRIPTION="rpm workalike for Gentoo Linux"
+HOMEPAGE="https://github.com/fuzzyray/epm"
+SRC_URI="http://www.gentoo.org/~fuzzyray/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-prefix.patch
+	eprefixify epm
+}
+
+src_compile() {
+	pod2man epm > epm.1 || die "pod2man failed"
+}
+
+src_install() {
+	dobin epm || die
+	doman epm.1
+}
diff --git a/app-portage/epm/files/epm-1.40-prefix.patch b/app-portage/epm/files/epm-1.40-prefix.patch
new file mode 100644
index 000000000000..957a5cb43838
--- /dev/null
+++ b/app-portage/epm/files/epm-1.40-prefix.patch
@@ -0,0 +1,32 @@
+--- epm.orig	2012-12-27 21:21:51.288350173 -0700
++++ epm	2012-12-27 21:26:51.429905384 -0700
+@@ -7,13 +7,13 @@
+ # Global vars
+ (my $version = '$Revision: 1.2 $') =~ s/.*?(\d.*\d).*/EPM version $1/;
+ my $verbose = 0;
+-my $dbpath = '/var/db/pkg';
++my $dbpath = '@GENTOO_PORTAGE_EPREFIX@/var/db/pkg';
+ my $pkgregex =
+     '^.+?\/'.					# group (ignored)
+     '(.+?)'.					# name
+     '-(\d+(?:\.\d+)*\w*)'.			# version, eg 1.23.4a
+     '((?:(?:_alpha|_beta|_pre|_rc)\d*)?)'.	# special suffix
+-    '((?:-r\d+)?)$';				# revision, eg r12
++    '((?:-r\d+)?(?:\.\d+)?)$';			# revision, eg r12 or r01.1
+ my $root = '/';
+ my %opt = (
+     'dbpath' => \$dbpath,
+@@ -267,11 +267,11 @@
+     if ($opt{'c'}) {
+ 	# Read in CONFIG_PROTECT from /etc/make.{global,conf}
+ 	my (@CONFIG_PROTECT) = split ' ',
+-	    `. /etc/make.globals; . /etc/make.conf; echo \$CONFIG_PROTECT`;
++	    `. @GENTOO_PORTAGE_EPREFIX@/etc/make.globals; .  @GENTOO_PORTAGE_EPREFIX@/etc/make.conf; echo \$CONFIG_PROTECT`;
+ 	die "CONFIG_PROTECT is empty" unless @CONFIG_PROTECT;
+ 	my ($confprotre) = join '|', @CONFIG_PROTECT;
+ 	@files = grep {
+-	    (split ' ', $_, 2)[1] =~ /^($confprotre)/o } @files;
++	    (split ' ', $_, 2)[1] =~ m!^@GENTOO_PORTAGE_EPREFIX@($confprotre)!o } @files;
+     }
+ 
+     # Trim @files if doc files requested
diff --git a/app-portage/epm/metadata.xml b/app-portage/epm/metadata.xml
index bb85084cc4c0..912b894ec28a 100644
--- a/app-portage/epm/metadata.xml
+++ b/app-portage/epm/metadata.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
+	<maintainer>
+		<email>peter@weilbacher.org</email>
+		<name>Peter Weilbacher</name>
+		<description>Current maintainer, assign bugs</description>
+	</maintainer>
+	<maintainer>
+		<email>fuzzyray@gentoo.org</email>
+		<description>Proxy committer, CC bugs</description>
+	</maintainer>
 </pkgmetadata>