* [gentoo-commits] gentoo-x86 commit in app-portage/epm/files: epm-1.33-prefix.patch
@ 2012-12-28 4:35 Christoph Junghans (ottxor)
0 siblings, 0 replies; 3+ messages in thread
From: Christoph Junghans (ottxor) @ 2012-12-28 4:35 UTC (permalink / raw
To: gentoo-commits
ottxor 12/12/28 04:35:03
Modified: epm-1.33-prefix.patch
Log:
fixed prefix patch (CVS keyword screw up)
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Revision Changes Path
1.2 app-portage/epm/files/epm-1.33-prefix.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/epm/files/epm-1.33-prefix.patch?rev=1.2&view=markup
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
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/epm/files/epm-1.33-prefix.patch?r1=1.1&r2=1.2
Index: epm-1.33-prefix.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-portage/epm/files/epm-1.33-prefix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- epm-1.33-prefix.patch 27 Dec 2012 19:22:18 -0000 1.1
+++ epm-1.33-prefix.patch 28 Dec 2012 04:35:03 -0000 1.2
@@ -1,14 +1,8 @@
---- epm
-+++ epm
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -wI.
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -wI.
- # $Id: epm-1.33-prefix.patch,v 1.1 2012/12/27 19:22:18 ottxor 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.1 $') =~ s/.*?(\d.*\d).*/EPM version $1/;
+ (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';
@@ -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 ' ',
^ permalink raw reply [flat|nested] 3+ messages in thread* [gentoo-commits] gentoo-x86 commit in app-portage/epm/files: epm-1.33-prefix.patch
@ 2014-09-26 19:59 Ian Stakenvicius (axs)
0 siblings, 0 replies; 3+ messages in thread
From: Ian Stakenvicius (axs) @ 2014-09-26 19:59 UTC (permalink / raw
To: gentoo-commits
axs 14/09/26 19:59:24
Removed: epm-1.33-prefix.patch
Log:
dropping file temporarily to adjust sticky options
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-portage/epm/files: epm-1.33-prefix.patch
@ 2012-12-27 19:22 Christoph Junghans (ottxor)
0 siblings, 0 replies; 3+ messages in thread
From: Christoph Junghans (ottxor) @ 2012-12-27 19:22 UTC (permalink / raw
To: gentoo-commits
ottxor 12/12/27 19:22:18
Added: epm-1.33-prefix.patch
Log:
added prefix support
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Revision Changes Path
1.1 app-portage/epm/files/epm-1.33-prefix.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/epm/files/epm-1.33-prefix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/epm/files/epm-1.33-prefix.patch?rev=1.1&content-type=text/plain
Index: epm-1.33-prefix.patch
===================================================================
--- epm
+++ epm
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wI.
+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -wI.
# $Id: epm-1.33-prefix.patch,v 1.1 2012/12/27 19:22:18 ottxor Exp $
use Getopt::Long;
@@ -7,13 +7,13 @@
# Global vars
(my $version = '$Revision: 1.1 $') =~ 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-26 19:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-28 4:35 [gentoo-commits] gentoo-x86 commit in app-portage/epm/files: epm-1.33-prefix.patch Christoph Junghans (ottxor)
-- strict thread matches above, loose matches on Subject: below --
2014-09-26 19:59 Ian Stakenvicius (axs)
2012-12-27 19:22 Christoph Junghans (ottxor)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox