[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/files/, sys-apps/portage/

[Sam James]

commit: ebcda0fcb565efda696a77e3bc6c2ab28fc53158
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  4 11:35:20 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  4 11:35:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebcda0fc

sys-apps/portage: drop versions

Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/Manifest  |   5 -
 ...epgraph.py-fix-no-ebuilds-binpkgs-message.patch |  43 ---
 ...age-3.0.49-prefixify-init-script-shebangs.patch |  29 --
 sys-apps/portage/portage-3.0.49-r2.ebuild  | 303 -
 sys-apps/portage/portage-3.0.57-r1.ebuild  | 244 -
 sys-apps/portage/portage-3.0.60-r1.ebuild  | 246 -
 sys-apps/portage/portage-3.0.61-r1.ebuild  | 246 -
 sys-apps/portage/portage-3.0.62.ebuild | 246 -
 8 files changed, 1362 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a04609873fed..be6694390c5a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,7 +1,2 @@
-DIST portage-3.0.49.tar.bz2 1152449 BLAKE2B 
a47f951a35828ba9c8fc88c2eab5222c98ed20240c736c366d8f2e4f4aef773a140bf0e150448cc3796a7adb7471ce006aae4de1816bbbaae6dd83dcf28f52b0
 SHA512 
f07950d10c01bda0915aa30c5c0b6ce2864754fe7dea38b5341336cd7665dcabfdc219969f1a3d2803db59bc23fc4284bc96b4087a596cb27a5d9eb075735469
-DIST portage-3.0.57.tar.bz2 1173286 BLAKE2B 
793a150c94c939672783d7556e5fce80f7ff8895a616726d7adf92d6f8da99768c55db8a685f2dd548ab0bb09c29fd7548ee6fc1dfc51b55c530119690b92265
 SHA512 
4c5348e0dfc966db5ca1c08cc3fafc72dd2b3b402972b99b411f61f7a288190ecd9e5ac597dc62ee96eacc378818a4cac65b0fd040c9ff557e7cbe057a934829
 DIST portage-3.0.59.tar.bz2 1175098 BLAKE2B 
dbb8a22fd9417a74e60aa24ff064e9da5b4c54bd4936a0a1a4fdb0cd30d8568ca2424ef2a484883b538685a291a85009d942defdbb5cfa4e0072e9d977f238cd
 SHA512 
8c86e0663327125e7cb36150d4aca1d7fcd2bf7ae25634ed916c2ee444809404aafb094adacacc0408509600f447d62d9c53e7bc25dd8c71c61e8758ac674638
-DIST portage-3.0.60.tar.bz2 1177524 BLAKE2B 
1928e448e8f319e4f000e795587fa043155cf54871a14631f06cf96d0ff2372049d54da2196c878bd9c09b7db0578eaba72b15d85edc9c7b1514cc58f6ab24c3
 SHA512 
20b6af1778aff8ab7db64861393290ce57ef5ee4c9c1659d31ecd45374f10e230e6e9029d883c0647ab8f9e0d9b9fb0a22ddf70cb2281e4bcac949b7e4751428
-DIST portage-3.0.61.tar.bz2 1178151 BLAKE2B 
bad3140735b12a18a3108e91cc88146fc5c64ad3e3e056707eec7629927f718483a3e1ccf09f74de510ee7733b4d856c3c53692a6cc0f5fc1a7babf88fd7f06b
 SHA512 
1401392a7bd2bf18e698e82af25a39db2aa9d8d9e8d9c07dea11ba5d5c866d2d3f8a3eccc8568b081aeaf6f668466921c61f58adbdd9dd5ffd9cf632bff2bdbd
-DIST portage-3.0.62.tar.bz2 1186084 BLAKE2B 
954cb29a06a4aede6a1b7460d16aa9d65b11b39e7c3a60d23f8eb8220381214add0243c8297f13fbec9fe8391af7abf608ab1e6f25756acf8a4104d895288343
 SHA512 
3d415e419c8827e290f7e0dcf9b582670ce5f0224fa74b39acaa093a4dc9a1a96abf597c94c2858aba52a6ea153f2823f2b8f92413dfee9b93806582202b4fe6
 DIST portage-3.0.63.tar.bz2 1187961 BLAKE2B 
10523150b0eabac97309004c57356c40fa94ebd59f8f76701ae63d13f9424b523ccee2a367174af3a52078d5d9e4338b94e144247f6709c2f7df4418c040b06f
 SHA512 
323adc17254f92e58f22028dad12ebcaaafa25c82567c5d31cc9575c30e0d78224c8f9efe0fcbeee549b08b0797edffb4bbe9c6fbbd8943e3f9dcda25eedd699

diff --git 
a/sys-apps/portage/files/depgraph.py-fix-no-ebuilds-binpkgs-message.patch 
b/sys-apps/portage/files/depgraph.py-fix-no-ebuilds-binpkgs-message.patch
deleted file mode 100644
index 97cff72cd85c..
--- a/sys-apps/portage/files/depgraph.py-fix-no-ebuilds-binpkgs-message.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b199d0307b47f9fb06dbe533d7e24926a561c238 Mon Sep 17 00:00:00 2001
-From: Oskari Pirhonen 
-Date: Sun, 9 Jul 2023 00:08:27 -0500
-Subject: [PATCH] depgraph.py: fix "no ebuilds/binpkgs" message
-
-The "there are no binary packages to satisfy" was being unconditionally
-output for packages that could not be found. Fix the logic for choosing
-between the "binary packages" and "ebuilds" form of the message.
-
-This is a temporary stopgap as alluded to by me in the bug, but the
-tl;dr is that some entries in the `myopts` dict have "y"/"n" values
-whereas some are True/unset, and this discrepancy should be sorted out.
-
-[sam: Add NEWS and Fixes, although the change in that commit _shouldn't_
-have been wrong, it is because of a quirk for now...]
-
-[oskari: remove NEWS for backport]
-
-Bug: https://bugs.gentoo.org/909853
-Signed-off-by: Oskari Pirhonen 
-Closes: https://github.com/gentoo/portage/pull/1065
-Fixes: 0b21a5a392bd84c07b94373991f59108fbe98516
-Signed-off-by: Sam James 

- lib/_emerge/depgraph.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
-index a36ab6351..1aeae6257 100644
 a/lib/_emerge/depgraph.py
-+++ b/lib/_emerge/depgraph.py
-@@ -6456,7 +6456,7 @@ class depgraph:
- cp_exists = True
-   

[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/files/

[Sam James]

commit: f52d2611a9b2dc690a0765055efddb0f1d33349e
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Mar  5 15:41:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar  7 07:57:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f52d2611

sys-apps/portage: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29938
Signed-off-by: Sam James  gentoo.org>

 ...ge-3.0.45.1-qa-notice-configure-func-decl.patch | 29 --
 1 file changed, 29 deletions(-)

diff --git 
a/sys-apps/portage/files/portage-3.0.45.1-qa-notice-configure-func-decl.patch 
b/sys-apps/portage/files/portage-3.0.45.1-qa-notice-configure-func-decl.patch
deleted file mode 100644
index a621ab65d719..
--- 
a/sys-apps/portage/files/portage-3.0.45.1-qa-notice-configure-func-decl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From eca90b6049a9ce42ec6868f64abcab403c9f4190 Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Tue, 28 Feb 2023 03:10:26 +
-Subject: [PATCH] install-qa-check.d/90config-impl-decl: prefix warning with
- 'QA Notice'
-
-... so tinderboxes can pick it up more easily.
-
-Signed-off-by: Sam James 
 a/bin/install-qa-check.d/90config-impl-decl
-+++ b/bin/install-qa-check.d/90config-impl-decl
-@@ -92,12 +92,13 @@ config_impl_decl_check() {
-   # Drop out early if no impl decls found (all the arrays are the same 
size)
-   [[ ${#files[@]} -eq 0 ]] && return
- 
--  eqawarn 'Found the following implicit function declarations in 
configure logs:'
-+  eqawarn 'QA Notice: Found the following implicit function declarations 
in configure logs:'
-   for l in "${!files[@]}"; do
-   eqawarn "  ${files[l]}:${lines[l]} - ${funcs[l]}"
-   eqatag 'config.log-impl-decl' "line=${lines[l]}" 
"func=${funcs[l]}" "${files[l]}"
-   done
-   eqawarn 'Check that no features were accidentally disabled.'
-+  eqawarn 'See https://wiki.gentoo.org/wiki/Modern_C_porting.'
- }
- 
- config_impl_decl_check
--- 
-2.39.2
-

[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/files/

[Conrad Kostecki]

commit: b7d61574506baf1f3a9b016d627f994cded1c9a9
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Jan  1 13:42:19 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Jan  1 18:16:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7d61574

sys-apps/portage: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28918
Signed-off-by: Conrad Kostecki  gentoo.org>

 ...ortage-3.0.39-bash-5.2-patsub_replacement.patch | 49 --
 ...rtage-3.0.39-implicit-func-decls-no-fatal.patch | 34 ---
 2 files changed, 83 deletions(-)

diff --git 
a/sys-apps/portage/files/portage-3.0.39-bash-5.2-patsub_replacement.patch 
b/sys-apps/portage/files/portage-3.0.39-bash-5.2-patsub_replacement.patch
deleted file mode 100644
index 90c678998a05..
--- a/sys-apps/portage/files/portage-3.0.39-bash-5.2-patsub_replacement.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://github.com/gentoo/portage/commit/69cac73ba0a7bcf2e2cff88c60d389895a550623
-
-From 69cac73ba0a7bcf2e2cff88c60d389895a550623 Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Wed, 30 Nov 2022 01:09:12 +
-Subject: [PATCH] ebuild.sh: disable patsub_replacement in Bash 5.2
-
-patsub_replacement is a new option in bash-5.2 that is also default-on
-in that release. The default value is not gated by BASH_COMPAT (see bug 
#881383),
-hence we need to disable it for older Bashes to avoid behaviour changes in 
ebuilds
-and eclasses.
-
-Thanks to Kerin for both raising this & being persistent with trying
-to get Bash 5.2 to be suitable for use in Gentoo.
-
-Bug: https://bugs.gentoo.org/881383
-Thanks-to: Kerin Millar 
-Signed-off-by: Sam James 
 a/bin/ebuild.sh
-+++ b/bin/ebuild.sh
-@@ -18,6 +18,7 @@ source "${PORTAGE_BIN_PATH}/isolated-functions.sh" || exit 1
- # used instead.
- __check_bash_version() {
-   # Figure out which min version of bash we require.
-+  # Adjust patsub_replacement logic below on new EAPI!
-   local maj min
-   if ___eapi_bash_3_2 ; then
-   maj=3 min=2
-@@ -50,6 +51,19 @@ __check_bash_version() {
-   if ___eapi_bash_3_2 && [[ ${BASH_VERSINFO[0]} -gt 3 ]] ; then
-   shopt -s compat32
-   fi
-+
-+  # patsub_replacement is a new option in bash-5.2 that is also default-on
-+  # in that release. The default value is not gated by BASH_COMPAT (see 
bug #881383),
-+  # hence we need to disable it for older Bashes to avoid behaviour 
changes in ebuilds
-+  # and eclasses.
-+  #
-+  # New EAPI note: a newer EAPI (after 8) may well adopt Bash 5.2 as its 
minimum version.
-+  # If it does, this logic will need to be adjusted to only disable 
patsub_replacement
-+  # for < ${new_api}!
-+  if (( BASH_VERSINFO[0] >= 6 || ( BASH_VERSINFO[0] == 5 && 
BASH_VERSINFO[1] >= 2 ) )) ; then
-+  shopt -u patsub_replacement
-+  fi
-+
- }
- __check_bash_version
- 
-

diff --git 
a/sys-apps/portage/files/portage-3.0.39-implicit-func-decls-no-fatal.patch 
b/sys-apps/portage/files/portage-3.0.39-implicit-func-decls-no-fatal.patch
deleted file mode 100644
index 4a4e68f2690a..
--- a/sys-apps/portage/files/portage-3.0.39-implicit-func-decls-no-fatal.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://github.com/gentoo/portage/commit/0fdbbbdb5a80e331adf701f2b2c1f096695447c4
-
-From 0fdbbbdb5a80e331adf701f2b2c1f096695447c4 Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Sun, 20 Nov 2022 23:32:08 +
-Subject: [PATCH] install-qa-check.d/90gcc-warnings: don't make implicit func
- decls fatal for now
-
-We need to do this at some point (as Clang 16 and GCC 14 are doing it, and
-they indicate runtime problems anyway), but there's too much breakage for now.
-
-We did find some extra bugs though. The main issue is too much high-profile
-stuff breaks rather than the total number of bugs, wrt Portage behaviour
-changing being suitable or not.
-
-Bug: https://bugs.gentoo.org/870412
-Signed-off-by: Sam James 
 a/bin/install-qa-check.d/90gcc-warnings
-+++ b/bin/install-qa-check.d/90gcc-warnings
-@@ -153,9 +153,10 @@ gcc_warn_check() {
-   #   always_overflow=yes
-   #fi
- 
--  if [[ ${f} == *'[-Wimplicit-function-declaration]'* ]] 
; then
--  implicit_func_decl=yes
--  fi
-+  # Disabled for now because too many failures. bug 
#870412.
-+  #if [[ ${f} == *'[-Wimplicit-function-declaration]'* ]] 
; then
-+  #   implicit_func_decl=yes
-+  #fi
- 
-   if [[ ${always_overflow} = yes || ${implicit_func_decl} 
= yes ]] ; then
-   eerror
-

[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/files/, sys-apps/portage/

[Mike Gilbert]

commit: d9eeba71d686e10711cba09e547ed5e20d8c6bfb
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Oct 20 15:45:51 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Oct 21 14:32:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9eeba71

sys-apps/portage: install tmpfiles.d to create /var/tmp/portage

This ensures the directory is created at boot, and prevents other users
from creating it before emerge is run.

Bug: https://bugs.gentoo.org/853283
Closes: https://github.com/gentoo/gentoo/pull/27871
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/portage/files/portage-tmpdir.conf  | 1 +
 .../portage/{portage-3.0.38.1.ebuild => portage-3.0.38.1-r1.ebuild} | 2 +-
 sys-apps/portage/portage-.ebuild| 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/files/portage-tmpdir.conf 
b/sys-apps/portage/files/portage-tmpdir.conf
new file mode 100644
index ..63a9bcf07097
--- /dev/null
+++ b/sys-apps/portage/files/portage-tmpdir.conf
@@ -0,0 +1 @@
+d /var/tmp/portage 0775 portage portage

diff --git a/sys-apps/portage/portage-3.0.38.1.ebuild 
b/sys-apps/portage/portage-3.0.38.1-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-3.0.38.1.ebuild
rename to sys-apps/portage/portage-3.0.38.1-r1.ebuild
index 63140095cfca..f7e3c208d20d 100644
--- a/sys-apps/portage/portage-3.0.38.1.ebuild
+++ b/sys-apps/portage/portage-3.0.38.1-r1.ebuild
@@ -217,7 +217,7 @@ python_install_all() {
esetup.py "${targets[@]}"
fi
 
-   dotmpfiles "${FILESDIR}"/portage-ccache.conf
+   dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
 
# Due to distutils/python-exec limitations
# these must be installed to /usr/bin.

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index f134a27fd88e..cd92c9d2da5d 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -212,7 +212,7 @@ python_install_all() {
esetup.py "${targets[@]}"
fi
 
-   dotmpfiles "${FILESDIR}"/portage-ccache.conf
+   dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
 
# Due to distutils/python-exec limitations
# these must be installed to /usr/bin.

[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/files/, sys-apps/portage/

[Mike Gilbert]

commit: a92e6d74d7a7af59dd351f815e87e09a719ea742
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Dec 20 16:23:53 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Dec 20 16:24:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a92e6d74

sys-apps/portage: revert --ignore-soname-deps change

Bug: https://bugs.gentoo.org/687956
Bug: https://bugs.gentoo.org/829623
Signed-off-by: Mike Gilbert  gentoo.org>

 ...revert-default-enable-soname-dependencies.patch | 52 ++
 ...tage-3.0.30.ebuild => portage-3.0.30-r1.ebuild} |  1 +
 2 files changed, 53 insertions(+)

diff --git 
a/sys-apps/portage/files/3.0.30-revert-default-enable-soname-dependencies.patch 
b/sys-apps/portage/files/3.0.30-revert-default-enable-soname-dependencies.patch
new file mode 100644
index ..bcb2e427db9e
--- /dev/null
+++ 
b/sys-apps/portage/files/3.0.30-revert-default-enable-soname-dependencies.patch
@@ -0,0 +1,52 @@
+From 2c025e87bb6253f869f9e84e6eb0d98eecfd49c4 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Mon, 20 Dec 2021 11:16:30 -0500
+Subject: [PATCH] Revert "emerge: Default enable soname dependencies (bug
+ 687956)"
+To: gentoo-portage-...@lists.gentoo.org
+
+This change seems to cause problems with emerge --depclean.
+
+Reverts: 6091fcd861034b9b20677098827eff7b7a148853
+Bug: https://bugs.gentoo.org/687956
+Bug: https://bugs.gentoo.org/829623
+Signed-off-by: Mike Gilbert 
+---
+ lib/_emerge/create_depgraph_params.py | 2 +-
+ man/emerge.1  | 7 +++
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/lib/_emerge/create_depgraph_params.py 
b/lib/_emerge/create_depgraph_params.py
+index 95c4c2035..11c3e3736 100644
+--- a/lib/_emerge/create_depgraph_params.py
 b/lib/_emerge/create_depgraph_params.py
+@@ -104,7 +104,7 @@ def create_depgraph_params(myopts, myaction):
+ if ignore_built_slot_operator_deps is not None:
+ myparams["ignore_built_slot_operator_deps"] = 
ignore_built_slot_operator_deps
+ 
+-myparams["ignore_soname_deps"] = myopts.get("--ignore-soname-deps", "n")
++myparams["ignore_soname_deps"] = myopts.get("--ignore-soname-deps", "y")
+ 
+ dynamic_deps = myopts.get("--dynamic-deps", "y") != "n" and "--nodeps" 
not in myopts
+ if dynamic_deps:
+diff --git a/man/emerge.1 b/man/emerge.1
+index ff565b46f..8f6d12925 100644
+--- a/man/emerge.1
 b/man/emerge.1
+@@ -639,10 +639,9 @@ supported beginning with \fBEAPI 5\fR.
+ .TP
+ .BR "\-\-ignore\-soname\-deps < y | n >"
+ Ignore the soname dependencies of binary and installed packages. This
+-option may be useful when working with binary or installed packages
+-that lack appropriate soname dependency metadata because they were built
+-with a package manager that does not support soname dependencies (perhaps
+-an older version of portage). Soname
++option is enabled by default, since soname dependencies are relatively
++new, and the required metadata is not guaranteed to exist for binary and
++installed packages built with older versions of portage. Also, soname
+ dependencies will be automatically ignored for dependency calculations
+ that can pull unbuilt ebuilds into the dependency graph, since unbuilt
+ ebuilds do not have any soname dependency metadata, making it impossible
+-- 
+2.34.1
+

diff --git a/sys-apps/portage/portage-3.0.30.ebuild 
b/sys-apps/portage/portage-3.0.30-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-3.0.30.ebuild
rename to sys-apps/portage/portage-3.0.30-r1.ebuild
index f2a08d991631..0db4771550b8 100644
--- a/sys-apps/portage/portage-3.0.30.ebuild
+++ b/sys-apps/portage/portage-3.0.30-r1.ebuild
@@ -81,6 +81,7 @@ pkg_pretend() {
 
 python_prepare_all() {
local PATCHES=(
+   
"${FILESDIR}/3.0.30-revert-default-enable-soname-dependencies.patch"
)
 
distutils-r1_python_prepare_all

[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/files/

[Zac Medico]

commit: 2a0943eb825dc8a66810f5ce08fcc823d64b6b39
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Aug  5 22:57:58 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Aug  5 22:59:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a0943eb

sys-apps/portage: update README.RESCUE URL

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 sys-apps/portage/files/README.RESCUE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/files/README.RESCUE 
b/sys-apps/portage/files/README.RESCUE
index 70c494ebb81..e8f3932ac21 100644
--- a/sys-apps/portage/files/README.RESCUE
+++ b/sys-apps/portage/files/README.RESCUE
@@ -1,2 +1,2 @@
-Please see 
http://www.gentoo.org/proj/en/portage/doc/manually-fixing-portage.xml
+Please see https://wiki.gentoo.org/wiki/Project:Portage/Fixing_broken_portage
 for a recovery guide for a broken portage installation.

[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/files/

[Zac Medico]

commit: 881cad9b9f38bd7de82b570e1ff20746e5b16cba
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Aug  6 00:28:34 2017 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Aug  6 00:31:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=881cad9b

sys-apps/portage: remove unused patch for 2.3.1

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 ...ert-URI-changes-related-to-docbook-schema.patch | 39 --
 1 file changed, 39 deletions(-)

diff --git 
a/sys-apps/portage/files/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch
 
b/sys-apps/portage/files/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch
deleted file mode 100644
index ee191fffa73..000
--- 
a/sys-apps/portage/files/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 35863a80b915939aac3ce6bf017d942cac879df8 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert 
-Date: Wed, 20 Jul 2016 12:30:05 -0400
-Subject: [PATCH] doc: Revert URI changes related to docbook schema
-
-This partially reverts b5365341dad167e314023df95d2c5e0f955962f0.
-
-X-Gentoo-Bug: 589210
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/589210

- doc/custom.xsl  | 2 +-
- doc/portage.docbook | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/custom.xsl b/doc/custom.xsl
-index 11a2b9e..a7763ec 100644
 a/doc/custom.xsl
-+++ b/doc/custom.xsl
-@@ -1,4 +1,4 @@
--https://www.w3.org/1999/XSL/Transform; 
version="1.0">
-+http://www.w3.org/1999/XSL/Transform; 
version="1.0">
- 
- 
- 
-diff --git a/doc/portage.docbook b/doc/portage.docbook
-index f7d539a..811544f 100644
 a/doc/portage.docbook
-+++ b/doc/portage.docbook
-@@ -1,6 +1,6 @@
- 
- https://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd; [
-+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd; [
- 
-   
-   
--- 
-2.10.0
-

[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/files/

[David Seifert]

commit: f8d53442d2b950a27ab42e66d9ff2d1834c0ddd4
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Sun Feb  5 12:20:44 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Feb  5 16:35:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8d53442

sys-apps/portage: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/3823

 sys-apps/portage/files/portage-2.3.0_rc1.patch | 52 --
 1 file changed, 52 deletions(-)

diff --git a/sys-apps/portage/files/portage-2.3.0_rc1.patch 
b/sys-apps/portage/files/portage-2.3.0_rc1.patch
deleted file mode 100644
index 8464462..
--- a/sys-apps/portage/files/portage-2.3.0_rc1.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 9ba1bea5e24fe839ef5bd833c3974a55d5333bf1 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec 
-Date: Mon, 16 May 2016 02:45:45 -0700
-Subject: [PATCH] portage.const.py: Remove repoman from PORTAGE_PYM_PACKAGES
-
-Decca (in IRC) got a traceback due to the missing repoman install
-
-sysresccd / # emerge -e @system
-Calculating dependencies... done!
-Traceback (most recent call last):
-  File "/usr/lib/python-exec/python3.5/emerge", line 50, in 
-retval = emerge_main()
-  File "/usr/lib64/python3.5/site-packages/_emerge/main.py", line 1185, in 
emerge_main
-return run_action(emerge_config)
-  File "/usr/lib64/python3.5/site-packages/_emerge/actions.py", line 3236, in 
run_action
-emerge_config.args, spinner)
-  File "/usr/lib64/python3.5/site-packages/_emerge/actions.py", line 505, in 
action_build
-retval = mergetask.merge()
-  File "/usr/lib64/python3.5/site-packages/_emerge/Scheduler.py", line 958, in 
merge
-rval = self._handle_self_update()
-  File "/usr/lib64/python3.5/site-packages/_emerge/Scheduler.py", line 323, in 
_handle_self_update
-_prepare_self_update(self.settings)
-  File 
"/usr/lib64/python3.5/site-packages/portage/package/ebuild/doebuild.py", line 
2489, in _prepare_self_update
-symlinks=True)
-  File "/usr/lib64/python3.5/site-packages/portage/__init__.py", line 259, in 
__call__
-rval = self._func(*wrapped_args, **wrapped_kwargs)
-  File "/usr/lib64/python3.5/shutil.py", line 303, in copytree
-names = os.listdir(src)
-FileNotFoundError: [Errno 2] No such file or directory: 
b'/usr/lib64/python3.5/site-packages/repoman'
-
-Dirkjan  found  repoman was still included in the PORTAGE_PYM_PACKAGES 
which
-caused the traceback.

- pym/portage/const.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pym/portage/const.py b/pym/portage/const.py
-index 814d7f4..179efce 100644
 a/pym/portage/const.py
-+++ b/pym/portage/const.py
-@@ -278,7 +278,7 @@ SUPPORTED_XPAK_EXTENSIONS = (".tbz2", ".xpak")
- TIMESTAMP_FORMAT = "%a, %d %b %Y %H:%M:%S +"  # to be used with 
time.gmtime()
- 
- # Top-level names of Python packages installed by Portage.
--PORTAGE_PYM_PACKAGES = ("_emerge", "portage", "repoman")
-+PORTAGE_PYM_PACKAGES = ("_emerge", "portage")
- 
- RETURNCODE_POSTINST_FAILURE = 5
- 
--- 
-2.8.2
-