added prefix support

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C2000586)

3 files changed, 79 insertions, 1 deletions

diff --git a/app-portage/epm/ChangeLog b/app-portage/epm/ChangeLog
index 53d33e20416e..d991d86a8133 100644
--- a/app-portage/epm/ChangeLog
+++ b/app-portage/epm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.30 2012/12/26 19:20:54 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/epm/ChangeLog,v 1.31 2012/12/27 19:22:18 ottxor Exp $
+
+*epm-1.33-r2 (27 Dec 2012)
+
+  27 Dec 2012; Christoph Junghans <ottxor@gentoo.org> +epm-1.33-r2.ebuild,
+  +files/epm-1.33-prefix.patch:
+  added prefix support
 
   26 Dec 2012; Paul Varner <fuzzyray@gentoo.org> metadata.xml:
   Move to maintainer-needed, due to not being maintained by anyone in the
diff --git a/app-portage/epm/epm-1.33-r2.ebuild b/app-portage/epm/epm-1.33-r2.ebuild
new file mode 100644
index 000000000000..2b83610ec605
--- /dev/null
+++ b/app-portage/epm/epm-1.33-r2.ebuild
@@ -0,0 +1,34 @@
+# 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-r2.ebuild,v 1.1 2012/12/27 19:22:18 ottxor Exp $
+
+EAPI="4"
+
+inherit eutils prefix
+
+DESCRIPTION="rpm workalike for Gentoo Linux"
+HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
+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}/${PV}-epm-310475.patch"
+	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.33-prefix.patch b/app-portage/epm/files/epm-1.33-prefix.patch
new file mode 100644
index 000000000000..dbf04016c2b5
--- /dev/null
+++ b/app-portage/epm/files/epm-1.33-prefix.patch
@@ -0,0 +1,38 @@
+--- epm
++++ epm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -wI.
++#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -wI.
+ # $Id: epm,v 1.33 2006/09/13 15:09:19 agriffis Exp $
+ 
+ use Getopt::Long;
+@@ -7,13 +7,13 @@
+ # Global vars
+ (my $version = '$Revision: 1.33 $') =~ 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,
+@@ -266,11 +266,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