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

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

[David Seifert]

commit:     f8d53442d2b950a27ab42e66d9ff2d1834c0ddd4
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Feb  5 12:20:44 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 16:35:53 2017 +0000
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..00000000
--- 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 <dolsen@gentoo.org>
-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 <module>
-    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 <djc> 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 +0000"	# 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
-

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

[Zac Medico]

commit:     881cad9b9f38bd7de82b570e1ff20746e5b16cba
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  6 00:28:34 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Aug  6 00:31:38 2017 +0000
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..00000000000
--- 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 <floppym@gentoo.org>
-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 @@
--<xsl:stylesheet xmlns:xsl="https://www.w3.org/1999/XSL/Transform" version="1.0">
-+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:param name="toc.section.depth" select="20"/>
- <xsl:param name="chunk.section.depth" select="2"/>
- <xsl:param name="generate.section.toc.level" select="2"/>
-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 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
--	"https://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-+	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
- 
- 	<!ENTITY date SYSTEM "fragment/date">
- 	<!ENTITY version SYSTEM "fragment/version">
--- 
-2.10.0
-

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

[Zac Medico]

commit:     2a0943eb825dc8a66810f5ce08fcc823d64b6b39
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  5 22:57:58 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Aug  5 22:59:36 2018 +0000
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/

[Conrad Kostecki]

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

sys-apps/portage: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28918
Signed-off-by: Conrad Kostecki <conikost <AT> 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..000000000000
--- 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 <sam@gentoo.org>
-Date: Wed, 30 Nov 2022 01:09:12 +0000
-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 <kfm@plushkava.net>
-Signed-off-by: Sam James <sam@gentoo.org>
---- 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..000000000000
--- 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 <sam@gentoo.org>
-Date: Sun, 20 Nov 2022 23:32:08 +0000
-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 <sam@gentoo.org>
---- 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/

[Sam James]

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

sys-apps/portage: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29938
Signed-off-by: Sam James <sam <AT> 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..000000000000
--- 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 <sam@gentoo.org>
-Date: Tue, 28 Feb 2023 03:10:26 +0000
-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 <sam@gentoo.org>
---- 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
-