1 |
ottxor 12/12/28 04:35:03 |
2 |
|
3 |
Modified: epm-1.33-prefix.patch |
4 |
Log: |
5 |
fixed prefix patch (CVS keyword screw up) |
6 |
|
7 |
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C2000586) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 app-portage/epm/files/epm-1.33-prefix.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/epm/files/epm-1.33-prefix.patch?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/epm/files/epm-1.33-prefix.patch?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/epm/files/epm-1.33-prefix.patch?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: epm-1.33-prefix.patch |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-portage/epm/files/epm-1.33-prefix.patch,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- epm-1.33-prefix.patch 27 Dec 2012 19:22:18 -0000 1.1 |
23 |
+++ epm-1.33-prefix.patch 28 Dec 2012 04:35:03 -0000 1.2 |
24 |
@@ -1,14 +1,8 @@ |
25 |
---- epm |
26 |
-+++ epm |
27 |
-@@ -1,4 +1,4 @@ |
28 |
--#!/usr/bin/perl -wI. |
29 |
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -wI. |
30 |
- # $Id: epm-1.33-prefix.patch,v 1.1 2012/12/27 19:22:18 ottxor Exp $ |
31 |
- |
32 |
- use Getopt::Long; |
33 |
+--- epm.orig 2012-12-27 21:21:51.288350173 -0700 |
34 |
++++ epm 2012-12-27 21:26:51.429905384 -0700 |
35 |
@@ -7,13 +7,13 @@ |
36 |
# Global vars |
37 |
- (my $version = '$Revision: 1.1 $') =~ s/.*?(\d.*\d).*/EPM version $1/; |
38 |
+ (my $version = '$Revision: 1.2 $') =~ s/.*?(\d.*\d).*/EPM version $1/; |
39 |
my $verbose = 0; |
40 |
-my $dbpath = '/var/db/pkg'; |
41 |
+my $dbpath = '@GENTOO_PORTAGE_EPREFIX@/var/db/pkg'; |
42 |
@@ -18,11 +12,11 @@ |
43 |
'-(\d+(?:\.\d+)*\w*)'. # version, eg 1.23.4a |
44 |
'((?:(?:_alpha|_beta|_pre|_rc)\d*)?)'. # special suffix |
45 |
- '((?:-r\d+)?)$'; # revision, eg r12 |
46 |
-+ '((?:-r\d+)?(?:\.\d+)?)$'; # revision, eg r12 or r01.1 |
47 |
++ '((?:-r\d+)?(?:\.\d+)?)$'; # revision, eg r12 or r01.1 |
48 |
my $root = '/'; |
49 |
my %opt = ( |
50 |
'dbpath' => \$dbpath, |
51 |
-@@ -266,11 +266,11 @@ |
52 |
+@@ -267,11 +267,11 @@ |
53 |
if ($opt{'c'}) { |
54 |
# Read in CONFIG_PROTECT from /etc/make.{global,conf} |
55 |
my (@CONFIG_PROTECT) = split ' ', |