diff options
| author |   Christoph Junghans <ottxor@gentoo.org> | 2012-12-28 04:35:03 +0000 |
|---|---|---|
| committer | Christoph Junghans <ottxor@gentoo.org> | 2012-12-28 04:35:03 +0000 |
| commit | ea1de88ea5c84c33a9590a11419795768dc426b9 (patch) | |
| tree | 1999520b6f1417ee637723a4141d07be2b798743 /app-portage | |
| parent | Fixed the licencing of hgtools to be correct (as BSD-2, now GPL-2) (diff) | |
| download | gentoo-2-ea1de88ea5c84c33a9590a11419795768dc426b9.tar.gz gentoo-2-ea1de88ea5c84c33a9590a11419795768dc426b9.tar.bz2 gentoo-2-ea1de88ea5c84c33a9590a11419795768dc426b9.zip | |
fixed prefix patch (CVS keyword screw up)
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Diffstat (limited to 'app-portage')
| -rw-r--r-- | app-portage/epm/ChangeLog | 6 | ||||
| -rw-r--r-- | app-portage/epm/files/epm-1.33-prefix.patch | 14 |
2 files changed, 9 insertions, 11 deletions
diff --git a/app-portage/epm/ChangeLog b/app-portage/epm/ChangeLog index d991d86a8133..23bceeb1b97d 100644 --- a/app-portage/epm/ChangeLog +++ b/app-portage/epm/ChangeLog @@ -1,6 +1,10 @@ # 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.31 2012/12/27 19:22:18 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/epm/ChangeLog,v 1.32 2012/12/28 04:35:03 ottxor Exp $ + + 28 Dec 2012; Christoph Junghans <ottxor@gentoo.org> + files/epm-1.33-prefix.patch: + fixed prefix patch (CVS keyword screw up) *epm-1.33-r2 (27 Dec 2012) diff --git a/app-portage/epm/files/epm-1.33-prefix.patch b/app-portage/epm/files/epm-1.33-prefix.patch index dbf04016c2b5..0dfe13c0e854 100644 --- a/app-portage/epm/files/epm-1.33-prefix.patch +++ b/app-portage/epm/files/epm-1.33-prefix.patch @@ -1,11 +1,5 @@ ---- 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; +--- 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.33 $') =~ s/.*?(\d.*\d).*/EPM version $1/; @@ -18,11 +12,11 @@ '-(\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 ++ '((?:-r\d+)?(?:\.\d+)?)$'; # revision, eg r12 or r01.1 my $root = '/'; my %opt = ( 'dbpath' => \$dbpath, -@@ -266,11 +266,11 @@ +@@ -267,11 +267,11 @@ if ($opt{'c'}) { # Read in CONFIG_PROTECT from /etc/make.{global,conf} my (@CONFIG_PROTECT) = split ' ', |