diff options
| author | Marcin Deranek <marcin.deranek@booking.com> | 2021-08-22 15:49:48 +0200 |
|---|---|---|
| committer | Marcin Deranek <marcin.deranek@booking.com> | 2021-08-22 15:49:48 +0200 |
| commit | a1c5090b93d9b6f5bad72a2f33105d37c4b95ec1 (patch) | |
| tree | 22befb98c8d65ad39953a08f5d74f4068e66c4cb | |
| parent | b79cca4cba3332b82b334721fb84863a7332cf54 (diff) | |
| download | portage-a1c5090b93d9b6f5bad72a2f33105d37c4b95ec1.tar.gz portage-a1c5090b93d9b6f5bad72a2f33105d37c4b95ec1.tar.bz2 portage-a1c5090b93d9b6f5bad72a2f33105d37c4b95ec1.zip | |
Merge patch
| -rw-r--r-- | app-portage/epm/Manifest | 5 | ||||
| -rw-r--r-- | app-portage/epm/epm-1.40.ebuild | 3 | ||||
| -rw-r--r-- | app-portage/epm/files/epm | 8 | ||||
| -rw-r--r-- | app-portage/epm/files/epm-1.40-prefix.patch | 32 |
4 files changed, 6 insertions, 42 deletions
diff --git a/app-portage/epm/Manifest b/app-portage/epm/Manifest index 9ace081..0eeebaa 100644 --- a/app-portage/epm/Manifest +++ b/app-portage/epm/Manifest @@ -1,4 +1,3 @@ -AUX epm 30664 BLAKE2B 72988b0b08616761367b98dc3c698e0d352e2c442d0bcc1c77b2bfcd0009cb06bd27572e93d727babeca5bc353a3e7db43a8d7997e316a9e3b41b434e1d93a11 SHA512 75ae3fb03be9508f357f020310fba1e2d89513782ea57cb39f5a524b8cf5ded95c45bc4fbe0bfd195902c25f286119cf54501de64a2f082a69ea0ca55968175a -AUX epm-1.40-prefix.patch 1293 BLAKE2B 6d835610fce455f6089867b2fd7e959b5dffff07f72a96a9a8a2be3fb4033822967098e32f859b836c25cc8d463b9ae950a7337f65c261ceb538a0dac14a842c SHA512 877204c75356b36df74ace94fe26a09f598448cbf502b7d65fec9d4b142368c4734e16807e5e4706671d8a59bc7db09811166f422d43d74a40fae5ff65e8c256 -EBUILD epm-1.40.ebuild 673 BLAKE2B f47c9aacfede1d6b7c0bb8f0f900031859fa1b386c23381d4ccbe1e69ef61d60d00418bb2a700258e35581b1a1a72c57a9ed7b8cd3f1fa60c9bfc05c4827e7ff SHA512 f992a2b682693554c09346732b69ccc914d4bf32a4df7dbd6a25f2cd8f5d2ae297c9ebbec46aa96e97160dce1e9d03eb31d3ddeef27fbc6dbf0f3a1b2881212d +AUX epm 30780 BLAKE2B df9f0871b00db98e9552906dbf110e98f1463767ffc064f0bafdc26d76e9615445df455d027c6cf41bc73c1fe71055c5cd04977801ea4056432583ebfff2307a SHA512 e7c5ad8e7bcddd879c3cb4a4e91ec2a3166edee72771062bf645119fc15085559f5b4d8ebb1be81dd66e80a516b2889f44d96543ae0bd66937a97de1ed70473b +EBUILD epm-1.40.ebuild 628 BLAKE2B caba3508575fd1a01393d30fb5b83ec03ed19f593493ce86d4d110522ceda471c80dfac6f413e48bb029cbe55cbeaeeb2d0da08229c446dec1c826dbd00a829c SHA512 08bc82fad0a1cf8ab38b67e695c9e13dbbc281908d59740b94731d00ef0796929baf65a35d042688e25cd84d6e6ee8d486a9722135f91cf778c2c7624aade740 MISC metadata.xml 255 BLAKE2B fec818e56877b2451e889c05ed95700632e02438bbe9ae515925548714246b19bdf3b141e0771f64b92483ade6734afe8828d0b177db1d76902c535871ea5551 SHA512 f5e088eef2af90b4f6129ca7ed31d833f61521a8fe6c60e5d5cb871601a85374bf330f445c298990760d51e5186ec8156a192ff30b42f8abc3cb82d329ccc803 diff --git a/app-portage/epm/epm-1.40.ebuild b/app-portage/epm/epm-1.40.ebuild index 78fe46d..0690241 100644 --- a/app-portage/epm/epm-1.40.ebuild +++ b/app-portage/epm/epm-1.40.ebuild @@ -14,9 +14,6 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="" -PATCHES=( - "${FILESDIR}/${P}-prefix.patch" -) DEPEND="dev-lang/perl" RDEPEND="${DEPEND}" diff --git a/app-portage/epm/files/epm b/app-portage/epm/files/epm index 29d3d2f..3922749 100644 --- a/app-portage/epm/files/epm +++ b/app-portage/epm/files/epm @@ -6,13 +6,13 @@ use Cwd qw(abs_path); # Global vars my $version = "EPM version 1.40"; 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 @@ sub query_list($) 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 deleted file mode 100644 index 957a5cb..0000000 --- a/app-portage/epm/files/epm-1.40-prefix.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- 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 |