diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2014-09-26 19:59:40 +0000 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2014-09-26 19:59:40 +0000 |
| commit | 6bc9d80db08418b5ec8be509ef00bacf34060d96 (patch) | |
| tree | 0c9bdff53d9caed38f67b2d20435ee995cce7746 /app-portage | |
| parent | dropping file temporarily to adjust sticky options (diff) | |
| download | gentoo-2-6bc9d80db08418b5ec8be509ef00bacf34060d96.tar.gz gentoo-2-6bc9d80db08418b5ec8be509ef00bacf34060d96.tar.bz2 gentoo-2-6bc9d80db08418b5ec8be509ef00bacf34060d96.zip | |
fixed cvs sticky options on file(s) that should not have cvs keyword expansion
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Diffstat (limited to 'app-portage')
| -rw-r--r-- | app-portage/epm/ChangeLog | 8 | ||||
| -rw-r--r-- | app-portage/epm/files/epm-1.33-prefix.patch | 32 | ||||
| -rw-r--r-- | app-portage/epm/files/epm-1.40-prefix.patch | 32 |
3 files changed, 70 insertions, 2 deletions
diff --git a/app-portage/epm/ChangeLog b/app-portage/epm/ChangeLog index 96e385b01804..aea5fbcb9b62 100644 --- a/app-portage/epm/ChangeLog +++ b/app-portage/epm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-portage/epm -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/epm/ChangeLog,v 1.35 2013/03/17 16:03:35 hwoarang Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/epm/ChangeLog,v 1.36 2014/09/26 19:59:40 axs Exp $ + + 26 Sep 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> + +files/epm-1.33-prefix.patch, +files/epm-1.40-prefix.patch: + fixed cvs sticky options on file(s) that should not have cvs keyword expansion 17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml: Add proxy-maintainers to metadata.xml 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..0dfe13c0e854 --- /dev/null +++ b/app-portage/epm/files/epm-1.33-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.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, +@@ -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/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 |