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

2024-05-17 Thread Sam James
commit: 13a21099403d3ae59b67f68b35fa2842130e7028
Author: Sam James  gentoo  org>
AuthorDate: Fri May 17 13:00:03 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 17 13:04:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13a21099

sys-apps/portage: drop 3.0.59-r1

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

 sys-apps/portage/Manifest |   1 -
 sys-apps/portage/portage-3.0.59-r1.ebuild | 246 --
 2 files changed, 247 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 1b950c0cced9..2847a10dedb1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,3 @@
-DIST portage-3.0.59.tar.bz2 1175098 BLAKE2B 
dbb8a22fd9417a74e60aa24ff064e9da5b4c54bd4936a0a1a4fdb0cd30d8568ca2424ef2a484883b538685a291a85009d942defdbb5cfa4e0072e9d977f238cd
 SHA512 
8c86e0663327125e7cb36150d4aca1d7fcd2bf7ae25634ed916c2ee444809404aafb094adacacc0408509600f447d62d9c53e7bc25dd8c71c61e8758ac674638
 DIST portage-3.0.61.tar.bz2 1178151 BLAKE2B 
bad3140735b12a18a3108e91cc88146fc5c64ad3e3e056707eec7629927f718483a3e1ccf09f74de510ee7733b4d856c3c53692a6cc0f5fc1a7babf88fd7f06b
 SHA512 
1401392a7bd2bf18e698e82af25a39db2aa9d8d9e8d9c07dea11ba5d5c866d2d3f8a3eccc8568b081aeaf6f668466921c61f58adbdd9dd5ffd9cf632bff2bdbd
 DIST portage-3.0.63.tar.bz2 1187961 BLAKE2B 
10523150b0eabac97309004c57356c40fa94ebd59f8f76701ae63d13f9424b523ccee2a367174af3a52078d5d9e4338b94e144247f6709c2f7df4418c040b06f
 SHA512 
323adc17254f92e58f22028dad12ebcaaafa25c82567c5d31cc9575c30e0d78224c8f9efe0fcbeee549b08b0797edffb4bbe9c6fbbd8943e3f9dcda25eedd699
 DIST portage-3.0.64.tar.bz2 1187654 BLAKE2B 
622cdda85315ab60ca3b1ae7cf1cb1fe479b69c945dafe14655030387d857ae89c0d8326b85fb3d3754ea95ecf2792ae60ba36f1ad9b18d1ac693fdabf9b235e
 SHA512 
26a9fc9532aebd5965c6d62d78914d827ac48df100b5fc518934857881ca19b927e05b2cd9a2bb674b0e1bd5feff2058a083de9c8fb86af16efe8752325c7722

diff --git a/sys-apps/portage/portage-3.0.59-r1.ebuild 
b/sys-apps/portage/portage-3.0.59-r1.ebuild
deleted file mode 100644
index 6eb73a76c985..
--- a/sys-apps/portage/portage-3.0.59-r1.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit meson linux-info multiprocessing python-r1 tmpfiles
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
-
-if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="
-   https://anongit.gentoo.org/git/proj/portage.git
-   https://github.com/gentoo/portage.git
-   "
-   inherit git-r3
-else
-   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# setuptools is still needed as a workaround for Python 3.12+ for now.
-# https://github.com/mesonbuild/meson/issues/7702
-#
-# >=meson-1.2.1-r1 for bug #912051
-BDEPEND="
-   ${PYTHON_DEPS}
-   >=dev-build/meson-1.2.1-r1
-   || (
-   >=dev-build/meson-1.3.0-r1
-   /dev/null ; 
then
-   chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
-   fi
-
-   if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-   elog "The emerge --autounmask option is now disabled by 
default, except for"
-   elog "portions of behavior which are controlled by the 
--autounmask-use and"
-   elog "--autounmask-license options. For backward compatibility, 
previous"
-   elog "behavior of --autounmask=y and --autounmask=n is entirely 
preserved."
-   elog "Users can get the old behavior simply by adding 
--autounmask to the"
-   elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale 
for this"
-   elog "change, see https://bugs.gentoo.org/658648.;
-   fi
-}
-
-pkg_postinst() {
-   # Warn about obsolete "enotice" script, bug #867010
-   local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
-   if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
-   eerror "Obsolete 'enotice' script detected!"
-   eerror "Please remove this from ${bashrc} to avoid problems."
-   eerror "See bug 867010 for more details."
-   fi
-}



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

2024-05-17 Thread Sam James
commit: 5e118443b723b961a35609cd3490684f42fe7962
Author: Sam James  gentoo  org>
AuthorDate: Fri May 17 12:59:38 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 17 13:04:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e118443

sys-apps/portage: drop 3.0.64

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

 sys-apps/portage/portage-3.0.64.ebuild | 242 -
 1 file changed, 242 deletions(-)

diff --git a/sys-apps/portage/portage-3.0.64.ebuild 
b/sys-apps/portage/portage-3.0.64.ebuild
deleted file mode 100644
index ea323e5a917c..
--- a/sys-apps/portage/portage-3.0.64.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit meson linux-info python-r1 tmpfiles
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
-
-if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="
-   https://anongit.gentoo.org/git/proj/portage.git
-   https://github.com/gentoo/portage.git
-   "
-   inherit git-r3
-else
-   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# setuptools is still needed as a workaround for Python 3.12+ for now.
-# https://github.com/mesonbuild/meson/issues/7702
-#
-# >=meson-1.2.1-r1 for bug #912051
-BDEPEND="
-   ${PYTHON_DEPS}
-   >=app-arch/tar-1.27
-   >=dev-build/meson-1.2.1-r1
-   || (
-   >=dev-build/meson-1.3.0-r1
-   =sys-apps/sed-4.0.5
-   sys-devel/patch
-   !build? ( $(python_gen_impl_dep 'ssl(+)') )
-   apidoc? (
-   dev-python/sphinx[${PYTHON_USEDEP}]
-   dev-python/sphinx-epytext[${PYTHON_USEDEP}]
-   )
-   doc? (
-   ~app-text/docbook-xml-dtd-4.4
-   app-text/xmlto
-   )
-   test? (
-   dev-python/pytest-xdist[${PYTHON_USEDEP}]
-   dev-vcs/git
-   )
-"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-RDEPEND="
-   ${PYTHON_DEPS}
-   acct-user/portage
-   >=app-arch/tar-1.27
-   app-arch/zstd
-   >=app-misc/pax-utils-0.1.17
-   dev-lang/python-exec:2
-   >=sys-apps/baselayout-2.9
-   >=sys-apps/findutils-4.9
-   !build? (
-   >=app-admin/eselect-1.2
-   app-portage/getuto
-   >=app-shells/bash-5.0:0
-   >=sec-keys/openpgp-keys-gentoo-release-20230329
-   >=sys-apps/sed-4.0.5
-   rsync-verify? (
-   >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-   >=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-   )
-   )
-   elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-   elibc_musl? ( >=sys-apps/sandbox-2.2 )
-   kernel_linux? ( sys-apps/util-linux )
-   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-   xattr? ( kernel_linux? (
-   >=sys-apps/install-xattr-0.3
-   ) )
-   !/dev/null ; 
then
-   chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
-   fi
-
-   if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-   elog "The emerge --autounmask option is now disabled by 
default, except for"
-   elog "portions of behavior which are controlled by the 
--autounmask-use and"
-   elog "--autounmask-license options. For backward compatibility, 
previous"
-   elog "behavior of --autounmask=y and --autounmask=n is entirely 
preserved."
-   elog "Users can get the old behavior simply by adding 
--autounmask to the"
-   elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale 
for this"
-   elog "change, see https://bugs.gentoo.org/658648.;
-   fi
-}
-
-pkg_postinst() {
-   # Warn about obsolete "enotice" script, bug #867010
-   local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
-   if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
-   eerror "Obsolete 'enotice' script detected!"
-   eerror "Please remove this from ${bashrc} to avoid problems."
-   eerror "See bug 867010 for more details."
-   fi
-}



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

2024-05-17 Thread Sam James
commit: 2cdb1b2ae41b13dc7f25b6d64c0b6ab19e4272dd
Author: Sam James  gentoo  org>
AuthorDate: Fri May 17 13:03:41 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 17 13:04:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cdb1b2a

sys-apps/portage: backport tweak to implicit func. decl QA check

We're going to try kw GCC 14 soon so we want to reduce FPs to see what
remains to be done.

Bug: https://bugs.gentoo.org/906027
Signed-off-by: Sam James  gentoo.org>

 ...checks.d-suppress-some-gnulib-implicit-co.patch | 42 ++
 ...tage-3.0.63.ebuild => portage-3.0.63-r1.ebuild} |  4 +++
 ...e-3.0.64-r1.ebuild => portage-3.0.64-r2.ebuild} |  1 +
 3 files changed, 47 insertions(+)

diff --git 
a/sys-apps/portage/files/0001-install-qa-checks.d-suppress-some-gnulib-implicit-co.patch
 
b/sys-apps/portage/files/0001-install-qa-checks.d-suppress-some-gnulib-implicit-co.patch
new file mode 100644
index ..8844e5029f07
--- /dev/null
+++ 
b/sys-apps/portage/files/0001-install-qa-checks.d-suppress-some-gnulib-implicit-co.patch
@@ -0,0 +1,42 @@
+From 8256473c6a9fa93e7cf81c46fa920cd522507c21 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz 
+Date: Fri, 17 May 2024 01:52:53 -0400
+Subject: [PATCH] install-qa-checks.d: suppress some gnulib implicit configure
+ declarations
+
+These happen in tons of GNU packages because of using gnulib, which
+pulls in macros that check for some functionality and spit out an
+implicit function declaration error if they aren't supported, which is
+*expected*.
+
+Bug: https://bugs.gentoo.org/906027
+Signed-off-by: Eli Schwartz 
+Closes: https://github.com/gentoo/portage/pull/1323
+Signed-off-by: Sam James 
+---
+ bin/install-qa-check.d/90config-impl-decl | 9 +
+ 1 file changed, 9 insertions(+)
+
+diff --git a/bin/install-qa-check.d/90config-impl-decl 
b/bin/install-qa-check.d/90config-impl-decl
+index 7969dff17..adea7d405 100644
+--- a/bin/install-qa-check.d/90config-impl-decl
 b/bin/install-qa-check.d/90config-impl-decl
+@@ -49,6 +49,15 @@ add_default_skips() {
+   res_ndestroy
+   statacl
+   )
++
++  QA_CONFIG_IMPL_DECL_SKIP+=(
++  # Available in c23, these gnulib checks are expected to fail
++  alignof
++  static_assert
++  unreachable
++  # also gnulib, but checks both linux/non-linux headers
++  MIN
++  )
+ }
+ 
+ find_log_targets() {
+-- 
+2.45.1
+

diff --git a/sys-apps/portage/portage-3.0.63.ebuild 
b/sys-apps/portage/portage-3.0.63-r1.ebuild
similarity index 98%
rename from sys-apps/portage/portage-3.0.63.ebuild
rename to sys-apps/portage/portage-3.0.63-r1.ebuild
index 4cf41d63b8e0..b58137ac2902 100644
--- a/sys-apps/portage/portage-3.0.63.ebuild
+++ b/sys-apps/portage/portage-3.0.63-r1.ebuild
@@ -108,6 +108,10 @@ PDEPEND="
)
 "
 
+PATCHES=(
+   
"${FILESDIR}"/0001-install-qa-checks.d-suppress-some-gnulib-implicit-co.patch
+)
+
 pkg_pretend() {
local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
 

diff --git a/sys-apps/portage/portage-3.0.64-r1.ebuild 
b/sys-apps/portage/portage-3.0.64-r2.ebuild
similarity index 98%
rename from sys-apps/portage/portage-3.0.64-r1.ebuild
rename to sys-apps/portage/portage-3.0.64-r2.ebuild
index 80f59b5d3560..edec27b9f08b 100644
--- a/sys-apps/portage/portage-3.0.64-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.64-r2.ebuild
@@ -106,6 +106,7 @@ PDEPEND="
 
 PATCHES=(
"${FILESDIR}"/${P}-clang-splitdebug.patch
+   
"${FILESDIR}"/0001-install-qa-checks.d-suppress-some-gnulib-implicit-co.patch
 )
 
 pkg_pretend() {



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

2024-05-10 Thread Sam James
commit: 9a9d8628ddadbbbeb595c8f0007c9e5ba89c8a71
Author: Sam James  gentoo  org>
AuthorDate: Fri May 10 18:25:01 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 10 18:25:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a9d8628

sys-apps/portage: backport fix for splitdebug splitting

Affects Clang in particular.

Bug: https://bugs.gentoo.org/787623
Signed-off-by: Sam James  gentoo.org>

 .../files/portage-3.0.64-clang-splitdebug.patch|  76 +++
 sys-apps/portage/portage-3.0.64-r1.ebuild  | 246 +
 2 files changed, 322 insertions(+)

diff --git a/sys-apps/portage/files/portage-3.0.64-clang-splitdebug.patch 
b/sys-apps/portage/files/portage-3.0.64-clang-splitdebug.patch
new file mode 100644
index ..04193241debd
--- /dev/null
+++ b/sys-apps/portage/files/portage-3.0.64-clang-splitdebug.patch
@@ -0,0 +1,76 @@
+https://github.com/gentoo/portage/commit/51f6ad158fc3de14df3f87d1242ff950b2189f05
+
+From 51f6ad158fc3de14df3f87d1242ff950b2189f05 Mon Sep 17 00:00:00 2001
+From: "Alex Xu (Hello71)" 
+Date: Sat, 11 Mar 2023 12:27:23 -0500
+Subject: [PATCH] estrip: Don't use splitdebug for .o files
+
+As the process_ar comment explained, object files cannot be splitdebug.
+
+Bug: https://bugs.gentoo.org/787623 ("www-client/firefox[clang]: 
.gnu_debuglink is busted when using LLD")
+Fixes: 51579fb34c19 ("prepstrip: add support for elfutils strip")
+Signed-off-by: Alex Xu (Hello71) 
+Signed-off-by: Sam James 
+--- a/bin/estrip
 b/bin/estrip
+@@ -280,9 +280,6 @@ dedup_elf_debug() {
+ 
+ # Usage: save_elf_debug   [splitdebug]
+ save_elf_debug() {
+-  ${FEATURES_splitdebug} || return 0
+-  ${PORTAGE_RESTRICT_splitdebug} && return 0
+-
+   debug-print-function "${FUNCNAME}" "$@"
+ 
+   # NOTE: Debug files must be installed in
+@@ -390,7 +387,7 @@ process_elf() {
+ 
+   if ${strip_this} ; then
+   # See if we can split & strip at the same time
+-  if [[ -n ${SPLIT_STRIP_FLAGS} ]] ; then
++  if ${splitdebug} && [[ -n ${SPLIT_STRIP_FLAGS} ]] ; then
+   local shortname="${x##*/}.debug"
+   local 
splitdebug="${tmpdir}/splitdebug/${shortname}.${BASHPID:-$(__bashpid)}"
+ 
+@@ -401,7 +398,9 @@ process_elf() {
+   "${x}"
+   save_elf_debug "${x}" "${inode_link}_debug" 
"${splitdebug}"
+   else
+-  save_elf_debug "${x}" "${inode_link}_debug"
++  if ${splitdebug} ; then
++  save_elf_debug "${x}" "${inode_link}_debug"
++  fi
+   ${already_stripped} || ${STRIP} ${strip_flags} "${x}"
+   fi
+   fi
+@@ -431,7 +430,7 @@ process_ar() {
+   # There is no concept of splitdebug for objects not yet
+   # linked in (only for finally linked ELFs), so we have to
+   # retain the debug info in the archive itself.
+-  if ! ${FEATURES_splitdebug} || ${PORTAGE_RESTRICT_splitdebug} ; 
then
++  if ! ${splitdebug} ; then
+   ${STRIP} -g "${x}" && ${RANLIB} "${x}"
+   fi
+   fi
+@@ -542,6 +541,12 @@ do
+   set +o noglob
+   fi
+ 
++  if ${FEATURES_splitdebug} && ! ${PORTAGE_RESTRICT_splitdebug} ; then
++  splitdebug=true
++  else
++  splitdebug=false
++  fi
++
+   # In Prefix we are usually an unprivileged user, so we can't strip
+   # unwritable objects.  Make them temporarily writable for the
+   # stripping.
+@@ -564,6 +569,7 @@ do
+   ${f} == *"SB shared object"* ]] ; then
+   process_elf "${x}" "${inode_link}" ${PORTAGE_STRIP_FLAGS}
+   elif [[ ${f} == *"SB relocatable"* ]] ; then
++  [[ ${x} == *.ko ]] || splitdebug=false
+   process_elf "${x}" "${inode_link}" ${SAFE_STRIP_FLAGS}
+   fi
+ 
+

diff --git a/sys-apps/portage/portage-3.0.64-r1.ebuild 
b/sys-apps/portage/portage-3.0.64-r1.ebuild
new file mode 100644
index ..80f59b5d3560
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.64-r1.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="
+   https://anongit.gentoo.org/git/proj/portage.git
+   https://github.com/gentoo/portage.git
+   "
+   inherit git-r3
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa 

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

2024-05-02 Thread Arthur Zamarin
commit: 2bc6a6b27fc861167976cf0fa7733d8d3124b9b2
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu May  2 19:03:15 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu May  2 19:03:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bc6a6b2

sys-apps/portage: Stabilize 3.0.63 arm64, #931095

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.63.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.63.ebuild 
b/sys-apps/portage/portage-3.0.63.ebuild
index 68d985f4f9a9..4cf41d63b8e0 100644
--- a/sys-apps/portage/portage-3.0.63.ebuild
+++ b/sys-apps/portage/portage-3.0.63.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-05-02 Thread Sam James
commit: 194627da0306199b9eadfa2d94d692ecb4d21103
Author: Sam James  gentoo  org>
AuthorDate: Thu May  2 12:02:34 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  2 12:02:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=194627da

sys-apps/portage: Stabilize 3.0.63 amd64, #931095

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

 sys-apps/portage/portage-3.0.63.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.63.ebuild 
b/sys-apps/portage/portage-3.0.63.ebuild
index 93de37fcc094..68d985f4f9a9 100644
--- a/sys-apps/portage/portage-3.0.63.ebuild
+++ b/sys-apps/portage/portage-3.0.63.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-05-02 Thread Sam James
commit: 591ea70fd2bc0148ead226167b0792277cc5b892
Author: Sam James  gentoo  org>
AuthorDate: Thu May  2 12:02:31 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  2 12:02:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=591ea70f

sys-apps/portage: Stabilize 3.0.63 ppc64, #931095

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

 sys-apps/portage/portage-3.0.63.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.63.ebuild 
b/sys-apps/portage/portage-3.0.63.ebuild
index ced0324ffd6f..5c3bf2a3f585 100644
--- a/sys-apps/portage/portage-3.0.63.ebuild
+++ b/sys-apps/portage/portage-3.0.63.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-05-02 Thread Sam James
commit: 56cfd4b23e4e9f7c82331a70cbb263aff8715980
Author: Sam James  gentoo  org>
AuthorDate: Thu May  2 12:02:33 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  2 12:02:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56cfd4b2

sys-apps/portage: Stabilize 3.0.63 arm, #931095

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

 sys-apps/portage/portage-3.0.63.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.63.ebuild 
b/sys-apps/portage/portage-3.0.63.ebuild
index a6300e4c542d..93de37fcc094 100644
--- a/sys-apps/portage/portage-3.0.63.ebuild
+++ b/sys-apps/portage/portage-3.0.63.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-05-02 Thread Sam James
commit: b15ec6726742f18505268ba660461afc34b23649
Author: Sam James  gentoo  org>
AuthorDate: Thu May  2 12:02:32 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  2 12:02:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b15ec672

sys-apps/portage: Stabilize 3.0.63 sparc, #931095

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

 sys-apps/portage/portage-3.0.63.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.63.ebuild 
b/sys-apps/portage/portage-3.0.63.ebuild
index 5c3bf2a3f585..a6300e4c542d 100644
--- a/sys-apps/portage/portage-3.0.63.ebuild
+++ b/sys-apps/portage/portage-3.0.63.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-05-02 Thread Sam James
commit: 0ea1166bdab1d5e54d7c76009a1e8719579eb2b7
Author: Sam James  gentoo  org>
AuthorDate: Thu May  2 12:02:29 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  2 12:02:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ea1166b

sys-apps/portage: Stabilize 3.0.63 x86, #931095

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

 sys-apps/portage/portage-3.0.63.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.63.ebuild 
b/sys-apps/portage/portage-3.0.63.ebuild
index c317c4372e9c..ced0324ffd6f 100644
--- a/sys-apps/portage/portage-3.0.63.ebuild
+++ b/sys-apps/portage/portage-3.0.63.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-05-02 Thread Sam James
commit: 5f1fd57af4e7d12936e557262efa25457f2f05a9
Author: Sam James  gentoo  org>
AuthorDate: Thu May  2 12:02:28 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  2 12:02:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f1fd57a

sys-apps/portage: Stabilize 3.0.63 ppc, #931095

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

 sys-apps/portage/portage-3.0.63.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.63.ebuild 
b/sys-apps/portage/portage-3.0.63.ebuild
index 834b9af7a549..c317c4372e9c 100644
--- a/sys-apps/portage/portage-3.0.63.ebuild
+++ b/sys-apps/portage/portage-3.0.63.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2024-04-27 Thread Sam James
commit: f1e53b9368c215451e3af78b557d8b86a2db9677
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 28 00:31:29 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 28 00:31:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1e53b93

sys-apps/portage: add 3.0.64

Closes: https://bugs.gentoo.org/925481
Closes: https://bugs.gentoo.org/675748
Closes: https://bugs.gentoo.org/71
Closes: https://bugs.gentoo.org/920330
Closes: https://bugs.gentoo.org/925213
Closes: https://bugs.gentoo.org/925863
Closes: https://bugs.gentoo.org/925888
Closes: https://bugs.gentoo.org/925907
Closes: https://bugs.gentoo.org/926048
Closes: https://bugs.gentoo.org/926221
Closes: https://bugs.gentoo.org/927059
Closes: https://bugs.gentoo.org/927632
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-3.0.64.ebuild | 242 +
 2 files changed, 243 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 5320b6512abd..1b950c0cced9 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,4 @@
 DIST portage-3.0.59.tar.bz2 1175098 BLAKE2B 
dbb8a22fd9417a74e60aa24ff064e9da5b4c54bd4936a0a1a4fdb0cd30d8568ca2424ef2a484883b538685a291a85009d942defdbb5cfa4e0072e9d977f238cd
 SHA512 
8c86e0663327125e7cb36150d4aca1d7fcd2bf7ae25634ed916c2ee444809404aafb094adacacc0408509600f447d62d9c53e7bc25dd8c71c61e8758ac674638
 DIST portage-3.0.61.tar.bz2 1178151 BLAKE2B 
bad3140735b12a18a3108e91cc88146fc5c64ad3e3e056707eec7629927f718483a3e1ccf09f74de510ee7733b4d856c3c53692a6cc0f5fc1a7babf88fd7f06b
 SHA512 
1401392a7bd2bf18e698e82af25a39db2aa9d8d9e8d9c07dea11ba5d5c866d2d3f8a3eccc8568b081aeaf6f668466921c61f58adbdd9dd5ffd9cf632bff2bdbd
 DIST portage-3.0.63.tar.bz2 1187961 BLAKE2B 
10523150b0eabac97309004c57356c40fa94ebd59f8f76701ae63d13f9424b523ccee2a367174af3a52078d5d9e4338b94e144247f6709c2f7df4418c040b06f
 SHA512 
323adc17254f92e58f22028dad12ebcaaafa25c82567c5d31cc9575c30e0d78224c8f9efe0fcbeee549b08b0797edffb4bbe9c6fbbd8943e3f9dcda25eedd699
+DIST portage-3.0.64.tar.bz2 1187654 BLAKE2B 
622cdda85315ab60ca3b1ae7cf1cb1fe479b69c945dafe14655030387d857ae89c0d8326b85fb3d3754ea95ecf2792ae60ba36f1ad9b18d1ac693fdabf9b235e
 SHA512 
26a9fc9532aebd5965c6d62d78914d827ac48df100b5fc518934857881ca19b927e05b2cd9a2bb674b0e1bd5feff2058a083de9c8fb86af16efe8752325c7722

diff --git a/sys-apps/portage/portage-3.0.64.ebuild 
b/sys-apps/portage/portage-3.0.64.ebuild
new file mode 100644
index ..ea323e5a917c
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.64.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="
+   https://anongit.gentoo.org/git/proj/portage.git
+   https://github.com/gentoo/portage.git
+   "
+   inherit git-r3
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=app-arch/tar-1.27
+   >=dev-build/meson-1.2.1-r1
+   || (
+   >=dev-build/meson-1.3.0-r1
+   =sys-apps/sed-4.0.5
+   sys-devel/patch
+   !build? ( $(python_gen_impl_dep 'ssl(+)') )
+   apidoc? (
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+   )
+   doc? (
+   ~app-text/docbook-xml-dtd-4.4
+   app-text/xmlto
+   )
+   test? (
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   dev-vcs/git
+   )
+"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+RDEPEND="
+   ${PYTHON_DEPS}
+   acct-user/portage
+   >=app-arch/tar-1.27
+   app-arch/zstd
+   >=app-misc/pax-utils-0.1.17
+   dev-lang/python-exec:2
+   >=sys-apps/baselayout-2.9
+   >=sys-apps/findutils-4.9
+   !build? (
+   >=app-admin/eselect-1.2
+   app-portage/getuto
+   >=app-shells/bash-5.0:0
+   >=sec-keys/openpgp-keys-gentoo-release-20230329
+   

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

2024-03-09 Thread Michał Górny
commit: 1ffa7031cf575146c9e33ec7702d2b86e49800ee
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Mar  8 16:32:47 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Mar  9 09:57:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ffa7031

sys-apps/portage: Use epytest to run tests

Use `epytest` to run tests rather than running it with some wheel
reinvention via meson.  This ensures that the common argument list
is used rather than inlined into the ebuild.

While at it, disable plugin autoloading for good measure.

Signed-off-by: Michał Górny  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/35672
Signed-off-by: Michał Górny  gentoo.org>

 sys-apps/portage/portage-.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index f0cf8ed988bb..ea323e5a917c 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( pypy3 python3_{10..12} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 TMPFILES_OPTIONAL=1
 
-inherit meson linux-info multiprocessing python-r1 tmpfiles
+inherit meson linux-info python-r1 tmpfiles
 
 DESCRIPTION="The package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
@@ -160,9 +160,9 @@ src_compile() {
 }
 
 src_test() {
-   local -x PYTEST_ADDOPTS="-vv -ra -l -o console_output_style=count -n 
$(makeopts_jobs) --dist=worksteal"
-
-   python_foreach_impl meson_src_test --no-rebuild --verbose
+   local EPYTEST_XDIST=1
+   local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+   python_foreach_impl epytest
 }
 
 src_install() {



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

2024-03-09 Thread Michał Górny
commit: a28435607e2fc12d05ff25b8b2c34ff51195da46
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Mar  8 16:25:24 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Mar  9 09:57:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2843560

sys-apps/portage: Fix BDEPEND/DEPEND split

Correct the split of build-time dependencies between `BDEPEND`
and `DEPEND`.  None of the listed dependencies seem to be specific
to C extension builds, and they all seem to belong to `BDEPEND`.

Signed-off-by: Michał Górny  gentoo.org>

 sys-apps/portage/portage-.ebuild | 14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index 834b9af7a549..f0cf8ed988bb 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -35,6 +35,7 @@ RESTRICT="!test? ( test )"
 # >=meson-1.2.1-r1 for bug #912051
 BDEPEND="
${PYTHON_DEPS}
+   >=app-arch/tar-1.27
>=dev-build/meson-1.2.1-r1
|| (
>=dev-build/meson-1.3.0-r1
@@ -43,15 +44,6 @@ BDEPEND="
$(python_gen_cond_dep '
dev-python/setuptools[${PYTHON_USEDEP}]
' python3_12)
-   test? (
-   dev-python/pytest-xdist[${PYTHON_USEDEP}]
-   dev-vcs/git
-   )
-"
-DEPEND="
-   ${PYTHON_DEPS}
-   >=app-arch/tar-1.27
-   dev-lang/python-exec:2
>=sys-apps/sed-4.0.5
sys-devel/patch
!build? ( $(python_gen_impl_dep 'ssl(+)') )
@@ -63,6 +55,10 @@ DEPEND="
~app-text/docbook-xml-dtd-4.4
app-text/xmlto
)
+   test? (
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   dev-vcs/git
+   )
 "
 # Require sandbox-2.2 for bug #288863.
 # For whirlpool hash, require python[ssl] (bug #425046).



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

2024-03-04 Thread Zac Medico
commit: 15353f6a0fc9579d651e92a5d138b4fe3d99
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Mar  4 20:11:07 2024 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Mar  4 20:15:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15353f6a

sys-apps/portage: restore 3.0.61-r1

Fixes: ebcda0fcb565 ("sys-apps/portage: drop versions")
Bug: https://bugs.gentoo.org/921933#c11
Signed-off-by: Zac Medico  gentoo.org>

 sys-apps/portage/Manifest |   1 +
 sys-apps/portage/portage-3.0.61-r1.ebuild | 246 ++
 2 files changed, 247 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index be6694390c5a..5320b6512abd 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,3 @@
 DIST portage-3.0.59.tar.bz2 1175098 BLAKE2B 
dbb8a22fd9417a74e60aa24ff064e9da5b4c54bd4936a0a1a4fdb0cd30d8568ca2424ef2a484883b538685a291a85009d942defdbb5cfa4e0072e9d977f238cd
 SHA512 
8c86e0663327125e7cb36150d4aca1d7fcd2bf7ae25634ed916c2ee444809404aafb094adacacc0408509600f447d62d9c53e7bc25dd8c71c61e8758ac674638
+DIST portage-3.0.61.tar.bz2 1178151 BLAKE2B 
bad3140735b12a18a3108e91cc88146fc5c64ad3e3e056707eec7629927f718483a3e1ccf09f74de510ee7733b4d856c3c53692a6cc0f5fc1a7babf88fd7f06b
 SHA512 
1401392a7bd2bf18e698e82af25a39db2aa9d8d9e8d9c07dea11ba5d5c866d2d3f8a3eccc8568b081aeaf6f668466921c61f58adbdd9dd5ffd9cf632bff2bdbd
 DIST portage-3.0.63.tar.bz2 1187961 BLAKE2B 
10523150b0eabac97309004c57356c40fa94ebd59f8f76701ae63d13f9424b523ccee2a367174af3a52078d5d9e4338b94e144247f6709c2f7df4418c040b06f
 SHA512 
323adc17254f92e58f22028dad12ebcaaafa25c82567c5d31cc9575c30e0d78224c8f9efe0fcbeee549b08b0797edffb4bbe9c6fbbd8943e3f9dcda25eedd699

diff --git a/sys-apps/portage/portage-3.0.61-r1.ebuild 
b/sys-apps/portage/portage-3.0.61-r1.ebuild
new file mode 100644
index ..6eb73a76c985
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.61-r1.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info multiprocessing python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="
+   https://anongit.gentoo.org/git/proj/portage.git
+   https://github.com/gentoo/portage.git
+   "
+   inherit git-r3
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-build/meson-1.2.1-r1
+   || (
+   >=dev-build/meson-1.3.0-r1
+   /dev/null ; 
then
+   chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+   fi
+
+   if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+   elog "The emerge --autounmask option is now disabled by 
default, except for"
+   elog "portions of behavior which are controlled by the 
--autounmask-use and"
+   elog "--autounmask-license options. For backward compatibility, 
previous"
+   elog "behavior of --autounmask=y and --autounmask=n is entirely 
preserved."
+   elog "Users can get the old behavior simply by adding 
--autounmask to the"
+   elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale 
for this"
+   elog "change, see https://bugs.gentoo.org/658648.;
+   fi
+}
+
+pkg_postinst() {
+   # Warn about obsolete "enotice" script, bug #867010
+   local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
+   if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
+   eerror "Obsolete 'enotice' script detected!"
+   eerror "Please remove this from ${bashrc} to avoid problems."
+   eerror "See bug 867010 for more details."
+   fi
+}



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

2024-03-04 Thread 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/

2024-02-25 Thread Sam James
commit: 2f7307ca3409281a895c9b34b522e7180b347414
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 25 08:45:39 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 25 08:45:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f7307ca

sys-apps/portage: Stabilize 3.0.61-r1 ppc, #921933

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

 sys-apps/portage/portage-3.0.61-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.61-r1.ebuild 
b/sys-apps/portage/portage-3.0.61-r1.ebuild
index 1d35f36c8fd4..6eb73a76c985 100644
--- a/sys-apps/portage/portage-3.0.61-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.61-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-02-25 Thread Sam James
commit: 6ad9d3103abc02f60d9e123ae21fa4a2e69b7e38
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 25 08:32:40 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 25 08:32:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ad9d310

sys-apps/portage: add 3.0.63

Closes: https://bugs.gentoo.org/925214
Closes: https://bugs.gentoo.org/651018
Closes: https://bugs.gentoo.org/922935
Closes: https://bugs.gentoo.org/925240
Closes: https://bugs.gentoo.org/925311
Closes: https://bugs.gentoo.org/925333
Closes: https://bugs.gentoo.org/925350
Closes: https://bugs.gentoo.org/925456
Closes: https://bugs.gentoo.org/925460
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-3.0.63.ebuild | 246 +
 2 files changed, 247 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 9b226ebfe752..a04609873fed 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -4,3 +4,4 @@ DIST portage-3.0.59.tar.bz2 1175098 BLAKE2B 
dbb8a22fd9417a74e60aa24ff064e9da5b4c
 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/portage-3.0.63.ebuild 
b/sys-apps/portage/portage-3.0.63.ebuild
new file mode 100644
index ..834b9af7a549
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.63.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info multiprocessing python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="
+   https://anongit.gentoo.org/git/proj/portage.git
+   https://github.com/gentoo/portage.git
+   "
+   inherit git-r3
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-build/meson-1.2.1-r1
+   || (
+   >=dev-build/meson-1.3.0-r1
+   /dev/null ; 
then
+   chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+   fi
+
+   if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+   elog "The emerge --autounmask option is now disabled by 
default, except for"
+   elog "portions of behavior which are controlled by the 
--autounmask-use and"
+   elog "--autounmask-license options. For backward compatibility, 
previous"
+   elog "behavior of --autounmask=y and --autounmask=n is entirely 
preserved."
+   elog "Users can get the old behavior simply by adding 
--autounmask to the"
+   elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale 
for this"
+   elog "change, see https://bugs.gentoo.org/658648.;
+   fi
+}
+
+pkg_postinst() {
+   # Warn about obsolete "enotice" script, bug #867010
+   local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
+   if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
+   eerror "Obsolete 'enotice' script 

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

2024-02-21 Thread Sam James
commit: 77c44c46194922509bc4f2b5cfc099412a560a69
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 22 07:23:40 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 22 07:23:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77c44c46

sys-apps/portage: add 3.0.62

Closes: https://bugs.gentoo.org/663324
Closes: https://bugs.gentoo.org/728046
Closes: https://bugs.gentoo.org/891137
Closes: https://bugs.gentoo.org/906368
Closes: https://bugs.gentoo.org/916566
Closes: https://bugs.gentoo.org/921170
Closes: https://bugs.gentoo.org/921208
Closes: https://bugs.gentoo.org/921400
Closes: https://bugs.gentoo.org/922038
Closes: https://bugs.gentoo.org/922142
Closes: https://bugs.gentoo.org/923368
Closes: https://bugs.gentoo.org/923750
Closes: https://bugs.gentoo.org/923841
Closes: https://bugs.gentoo.org/923852
Closes: https://bugs.gentoo.org/923854
Closes: https://bugs.gentoo.org/924192
Closes: https://bugs.gentoo.org/924273
Closes: https://bugs.gentoo.org/924585
Closes: https://bugs.gentoo.org/921380
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-3.0.62.ebuild | 246 +
 2 files changed, 247 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 368258c4f91f..9b226ebfe752 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,3 +3,4 @@ DIST portage-3.0.57.tar.bz2 1173286 BLAKE2B 
793a150c94c939672783d7556e5fce80f7ff
 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

diff --git a/sys-apps/portage/portage-3.0.62.ebuild 
b/sys-apps/portage/portage-3.0.62.ebuild
new file mode 100644
index ..834b9af7a549
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.62.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info multiprocessing python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="
+   https://anongit.gentoo.org/git/proj/portage.git
+   https://github.com/gentoo/portage.git
+   "
+   inherit git-r3
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-build/meson-1.2.1-r1
+   || (
+   >=dev-build/meson-1.3.0-r1
+   /dev/null ; 
then
+   chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+   fi
+
+   if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+   elog "The emerge --autounmask option is now disabled by 
default, except for"
+   elog "portions of behavior which are controlled by the 
--autounmask-use and"
+   elog "--autounmask-license options. For backward compatibility, 
previous"
+   elog "behavior of --autounmask=y and --autounmask=n is entirely 
preserved."
+   elog "Users can get the old behavior simply by adding 
--autounmask to the"
+   elog "make.conf 

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

2024-01-23 Thread Arthur Zamarin
commit: 06dbeed05ca3119600022e72b208ccc994c2c7f8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Jan 23 20:16:06 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Jan 23 20:16:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06dbeed0

sys-apps/portage: Stabilize 3.0.61-r1 hppa, #921933

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.61-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.61-r1.ebuild 
b/sys-apps/portage/portage-3.0.61-r1.ebuild
index 5007fdd1dd17..1d35f36c8fd4 100644
--- a/sys-apps/portage/portage-3.0.61-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.61-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-01-12 Thread Arthur Zamarin
commit: d4c02db70a5edba10f83f3ea12f9c7cf5b022460
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan 12 18:06:24 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan 12 18:06:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4c02db7

sys-apps/portage: Stabilize 3.0.61-r1 x86, #921933

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.61-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.61-r1.ebuild 
b/sys-apps/portage/portage-3.0.61-r1.ebuild
index 416d24e84fad..0c038c06e9d7 100644
--- a/sys-apps/portage/portage-3.0.61-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.61-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-01-12 Thread Arthur Zamarin
commit: 6cc96c541bdfeba28ee6ce4b340f9817ce47d7e3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan 12 18:06:23 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan 12 18:06:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cc96c54

sys-apps/portage: Stabilize 3.0.61-r1 amd64, #921933

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.61-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.61-r1.ebuild 
b/sys-apps/portage/portage-3.0.61-r1.ebuild
index a291d6985092..416d24e84fad 100644
--- a/sys-apps/portage/portage-3.0.61-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.61-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2024-01-12 Thread Sam James
commit: cb175047dabd9c902fd1fb1a5d98e724f050344d
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 12 14:20:46 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 12 14:20:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb175047

sys-apps/portage: Stabilize 3.0.61-r1 arm, #921933

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

 sys-apps/portage/portage-3.0.61-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.61-r1.ebuild 
b/sys-apps/portage/portage-3.0.61-r1.ebuild
index 606f430f4c00..a291d6985092 100644
--- a/sys-apps/portage/portage-3.0.61-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.61-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2024-01-12 Thread Sam James
commit: 41db3a2580985cee94dd37c30828691238e66376
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 12 14:20:45 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 12 14:20:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41db3a25

sys-apps/portage: Stabilize 3.0.61-r1 arm64, #921933

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

 sys-apps/portage/portage-3.0.61-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.61-r1.ebuild 
b/sys-apps/portage/portage-3.0.61-r1.ebuild
index ca357bd6bb95..606f430f4c00 100644
--- a/sys-apps/portage/portage-3.0.61-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.61-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2024-01-12 Thread Sam James
commit: b6f7352c2db661e81d0cd83ef3e585d6d4168b34
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 12 14:20:43 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 12 14:20:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6f7352c

sys-apps/portage: Stabilize 3.0.61-r1 sparc, #921933

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

 sys-apps/portage/portage-3.0.61-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.61-r1.ebuild 
b/sys-apps/portage/portage-3.0.61-r1.ebuild
index 5b395c27b844..ca357bd6bb95 100644
--- a/sys-apps/portage/portage-3.0.61-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.61-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2024-01-12 Thread Sam James
commit: e80a8970af219e292c22ca43cafead4a9ac390d1
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 12 14:04:11 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 12 14:04:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e80a8970

sys-apps/portage: Stabilize 3.0.61-r1 ppc64, #921933

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

 sys-apps/portage/portage-3.0.61-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.61-r1.ebuild 
b/sys-apps/portage/portage-3.0.61-r1.ebuild
index 36c0d5fdf384..5b395c27b844 100644
--- a/sys-apps/portage/portage-3.0.61-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.61-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2024-01-10 Thread Sam James
commit: 3855fa374d6205c0d771a607abb6db0571c33170
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 10 12:05:22 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 10 12:05:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3855fa37

sys-apps/portage: fix python_optimimze (again) for 3.0.61

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

 sys-apps/portage/{portage-3.0.61.ebuild => portage-3.0.61-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.61.ebuild 
b/sys-apps/portage/portage-3.0.61-r1.ebuild
similarity index 100%
rename from sys-apps/portage/portage-3.0.61.ebuild
rename to sys-apps/portage/portage-3.0.61-r1.ebuild
index 7d462427195c..36c0d5fdf384 100644
--- a/sys-apps/portage/portage-3.0.61.ebuild
+++ b/sys-apps/portage/portage-3.0.61-r1.ebuild
@@ -185,8 +185,8 @@ my_src_install() {
)
 
meson_src_install
-   python_optimize "${pydirs[@]}"
python_fix_shebang "${pydirs[@]}"
+   python_optimize "${pydirs[@]}"
 }
 
 pkg_preinst() {



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

2024-01-08 Thread Sam James
commit: e48cfb03c694ce1dac06d7711dac4e9e4e321f12
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon Jan  8 21:37:32 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan  9 00:06:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e48cfb03

sys-apps/portage: fix invalid python bytecompile stage

python software needs to have two postprocessing passes run:
- fix up shebangs of bin scripts
- optimize importable libraries in sitedir

For some reason, both directories get both passes applied, which doesn't
actually do anything useful. Worse, the shebang fixing happens *after*
the optimizing, which means that if any shebang fixing occurs in the
sitedir, it invalidates the bytecode.

Fixes: be37f979f5f838c8a4039aaba379a3e373af0b6f
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/{portage-3.0.57.ebuild => portage-3.0.57-r1.ebuild} | 4 ++--
 sys-apps/portage/{portage-3.0.59.ebuild => portage-3.0.59-r1.ebuild} | 4 ++--
 sys-apps/portage/{portage-3.0.60.ebuild => portage-3.0.60-r1.ebuild} | 2 +-
 sys-apps/portage/portage-.ebuild | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys-apps/portage/portage-3.0.57.ebuild 
b/sys-apps/portage/portage-3.0.57-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-3.0.57.ebuild
rename to sys-apps/portage/portage-3.0.57-r1.ebuild
index f52331d84170..57f781d85350 100644
--- a/sys-apps/portage/portage-3.0.57.ebuild
+++ b/sys-apps/portage/portage-3.0.57-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -187,8 +187,8 @@ my_src_install() {
)
 
meson_src_install
-   python_optimize "${pydirs[@]}"
python_fix_shebang "${pydirs[@]}"
+   python_optimize "${pydirs[@]}"
 }
 
 pkg_preinst() {

diff --git a/sys-apps/portage/portage-3.0.59.ebuild 
b/sys-apps/portage/portage-3.0.59-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-3.0.59.ebuild
rename to sys-apps/portage/portage-3.0.59-r1.ebuild
index 1ff0ccb90547..2dd0b1031597 100644
--- a/sys-apps/portage/portage-3.0.59.ebuild
+++ b/sys-apps/portage/portage-3.0.59-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -185,8 +185,8 @@ my_src_install() {
)
 
meson_src_install
-   python_optimize "${pydirs[@]}"
python_fix_shebang "${pydirs[@]}"
+   python_optimize "${pydirs[@]}"
 }
 
 pkg_preinst() {

diff --git a/sys-apps/portage/portage-3.0.60.ebuild 
b/sys-apps/portage/portage-3.0.60-r1.ebuild
similarity index 100%
rename from sys-apps/portage/portage-3.0.60.ebuild
rename to sys-apps/portage/portage-3.0.60-r1.ebuild
index 7d462427195c..36c0d5fdf384 100644
--- a/sys-apps/portage/portage-3.0.60.ebuild
+++ b/sys-apps/portage/portage-3.0.60-r1.ebuild
@@ -185,8 +185,8 @@ my_src_install() {
)
 
meson_src_install
-   python_optimize "${pydirs[@]}"
python_fix_shebang "${pydirs[@]}"
+   python_optimize "${pydirs[@]}"
 }
 
 pkg_preinst() {

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index 0fa6790375b9..36c0d5fdf384 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -185,8 +185,8 @@ my_src_install() {
)
 
meson_src_install
-   python_optimize "${pydirs[@]}"
python_fix_shebang "${pydirs[@]}"
+   python_optimize "${pydirs[@]}"
 }
 
 pkg_preinst() {



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

2024-01-05 Thread Sam James
commit: b37b3b5340a35656651134154b193dbda7cf13c6
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 08:23:30 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 08:23:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b37b3b53

sys-apps/portage: add 3.0.61

Note that bug #921208 is only partly fixed but I wanted to get these fixes out,
in part because we've got more people trying binpkgs right now with the binhost
announcement.

Bug: https://bugs.gentoo.org/921208
Closes: https://bugs.gentoo.org/921177
Closes: https://bugs.gentoo.org/920180
Closes: https://bugs.gentoo.org/921181
Closes: https://bugs.gentoo.org/921327
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-3.0.61.ebuild | 246 +
 2 files changed, 247 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 967c602c4675..368258c4f91f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,3 +2,4 @@ DIST portage-3.0.49.tar.bz2 1152449 BLAKE2B 
a47f951a35828ba9c8fc88c2eab5222c98ed
 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

diff --git a/sys-apps/portage/portage-3.0.61.ebuild 
b/sys-apps/portage/portage-3.0.61.ebuild
new file mode 100644
index ..7d462427195c
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.61.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info multiprocessing python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="
+   https://anongit.gentoo.org/git/proj/portage.git
+   https://github.com/gentoo/portage.git
+   "
+   inherit git-r3
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-util/meson-1.2.1-r1
+   || (
+   >=dev-util/meson-1.3.0-r1
+   /dev/null ; 
then
+   chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+   fi
+
+   if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+   elog "The emerge --autounmask option is now disabled by 
default, except for"
+   elog "portions of behavior which are controlled by the 
--autounmask-use and"
+   elog "--autounmask-license options. For backward compatibility, 
previous"
+   elog "behavior of --autounmask=y and --autounmask=n is entirely 
preserved."
+   elog "Users can get the old behavior simply by adding 
--autounmask to the"
+   elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale 
for this"
+   elog "change, see https://bugs.gentoo.org/658648.;
+   fi
+}
+
+pkg_postinst() {
+   # Warn about obsolete "enotice" script, bug #867010
+   local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
+   if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
+   eerror "Obsolete 

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

2024-01-01 Thread Sam James
commit: 73c980cc99406a9257659adbe10af348897d7a98
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan  2 03:38:51 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan  2 03:38:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c980cc

sys-apps/portage: add 3.0.60

Closes: https://bugs.gentoo.org/920827
Closes: https://bugs.gentoo.org/920828
Closes: https://bugs.gentoo.org/921089
Closes: https://bugs.gentoo.org/921107
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-3.0.60.ebuild | 246 +
 2 files changed, 247 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 040bae125488..967c602c4675 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/sys-apps/portage/portage-3.0.60.ebuild 
b/sys-apps/portage/portage-3.0.60.ebuild
new file mode 100644
index ..7d462427195c
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.60.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info multiprocessing python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="
+   https://anongit.gentoo.org/git/proj/portage.git
+   https://github.com/gentoo/portage.git
+   "
+   inherit git-r3
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-util/meson-1.2.1-r1
+   || (
+   >=dev-util/meson-1.3.0-r1
+   /dev/null ; 
then
+   chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+   fi
+
+   if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+   elog "The emerge --autounmask option is now disabled by 
default, except for"
+   elog "portions of behavior which are controlled by the 
--autounmask-use and"
+   elog "--autounmask-license options. For backward compatibility, 
previous"
+   elog "behavior of --autounmask=y and --autounmask=n is entirely 
preserved."
+   elog "Users can get the old behavior simply by adding 
--autounmask to the"
+   elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale 
for this"
+   elog "change, see https://bugs.gentoo.org/658648.;
+   fi
+}
+
+pkg_postinst() {
+   # Warn about obsolete "enotice" script, bug #867010
+   local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
+   if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
+   eerror "Obsolete 'enotice' script detected!"
+   eerror "Please remove this from ${bashrc} to avoid problems."
+   eerror "See bug 867010 for more details."
+   fi
+}



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

2023-12-30 Thread Sam James
commit: fb8e832cab08c6c6f0fc3d78e03a98e9319a7808
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 30 22:22:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 30 22:22:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb8e832c

sys-apps/portage: Stabilize 3.0.59 x86, #920938

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

 sys-apps/portage/portage-3.0.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.59.ebuild 
b/sys-apps/portage/portage-3.0.59.ebuild
index d7fcd14be2c0..1ff0ccb90547 100644
--- a/sys-apps/portage/portage-3.0.59.ebuild
+++ b/sys-apps/portage/portage-3.0.59.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-29 Thread Arthur Zamarin
commit: 488b5d19708a6923ab6fc81226180a09c302a2e4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec 30 06:37:42 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec 30 06:37:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=488b5d19

sys-apps/portage: Stabilize 3.0.59 ppc, #920938

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.59.ebuild 
b/sys-apps/portage/portage-3.0.59.ebuild
index 4e5ba99c1abd..d7fcd14be2c0 100644
--- a/sys-apps/portage/portage-3.0.59.ebuild
+++ b/sys-apps/portage/portage-3.0.59.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-29 Thread Arthur Zamarin
commit: a646c82a48c50c833cfe8fd7b1bf16a4060346cc
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 29 15:19:28 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 29 15:19:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a646c82a

sys-apps/portage: Stabilize 3.0.59 ppc64, #920938

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.59.ebuild 
b/sys-apps/portage/portage-3.0.59.ebuild
index 274cb9862048..4e5ba99c1abd 100644
--- a/sys-apps/portage/portage-3.0.59.ebuild
+++ b/sys-apps/portage/portage-3.0.59.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-29 Thread Sam James
commit: c2d77614800c62c32f895e56c914fe62b5c386fe
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 29 15:17:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 29 15:17:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2d77614

sys-apps/portage: Stabilize 3.0.59 amd64, #920938

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

 sys-apps/portage/portage-3.0.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.59.ebuild 
b/sys-apps/portage/portage-3.0.59.ebuild
index 33dafe8bcf86..274cb9862048 100644
--- a/sys-apps/portage/portage-3.0.59.ebuild
+++ b/sys-apps/portage/portage-3.0.59.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-29 Thread Arthur Zamarin
commit: 9f07508d024e882370b072d34093174e2898c62f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 29 15:17:15 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 29 15:17:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f07508d

sys-apps/portage: Stabilize 3.0.59 sparc, #920938

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.59.ebuild 
b/sys-apps/portage/portage-3.0.59.ebuild
index b0316713ebc6..33dafe8bcf86 100644
--- a/sys-apps/portage/portage-3.0.59.ebuild
+++ b/sys-apps/portage/portage-3.0.59.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-29 Thread Arthur Zamarin
commit: 721dbbf419584bbf395db5ce2ceb01bd2dd22d44
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 29 15:13:14 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 29 15:13:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=721dbbf4

sys-apps/portage: Stabilize 3.0.59 arm, #920938

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.59.ebuild 
b/sys-apps/portage/portage-3.0.59.ebuild
index 7444380b81f6..b0316713ebc6 100644
--- a/sys-apps/portage/portage-3.0.59.ebuild
+++ b/sys-apps/portage/portage-3.0.59.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-29 Thread Arthur Zamarin
commit: 449406ad3465ab0dc3c963c505f3cf226fa84007
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 29 15:12:40 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 29 15:12:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=449406ad

sys-apps/portage: Stabilize 3.0.59 arm64, #920938

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.59.ebuild 
b/sys-apps/portage/portage-3.0.59.ebuild
index 0fa6790375b9..7444380b81f6 100644
--- a/sys-apps/portage/portage-3.0.59.ebuild
+++ b/sys-apps/portage/portage-3.0.59.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-27 Thread Sam James
commit: fafbf32ad4ee80b525f8da2f9e2a1dbaa5592d2a
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 03:49:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 03:49:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fafbf32a

sys-apps/portage: drop 3.0.51, 3.0.56-r1, 3.0.58

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

 sys-apps/portage/Manifest |   3 -
 sys-apps/portage/portage-3.0.51.ebuild| 237 
 sys-apps/portage/portage-3.0.56-r1.ebuild | 242 -
 sys-apps/portage/portage-3.0.58.ebuild| 246 --
 4 files changed, 728 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 30379a9892a8..040bae125488 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,3 @@
 DIST portage-3.0.49.tar.bz2 1152449 BLAKE2B 
a47f951a35828ba9c8fc88c2eab5222c98ed20240c736c366d8f2e4f4aef773a140bf0e150448cc3796a7adb7471ce006aae4de1816bbbaae6dd83dcf28f52b0
 SHA512 
f07950d10c01bda0915aa30c5c0b6ce2864754fe7dea38b5341336cd7665dcabfdc219969f1a3d2803db59bc23fc4284bc96b4087a596cb27a5d9eb075735469
-DIST portage-3.0.51.tar.bz2 1155503 BLAKE2B 
1095ab616993951da8f4d43cef4cf815672c67cb48ea2fe5aeb6b7c629058bfab1557d2b9508f2e3e9f38676733b5d60ec6a3686bc57840065c428508769cb1c
 SHA512 
bf237819173bed9df3b63ada067a2a99700618d88fd4b528146c56bdd592f2452003db6cc6da4a445b647eb4d8bb591260ea0d2a5627ad540526a2e802025836
-DIST portage-3.0.56.tar.bz2 1166588 BLAKE2B 
f6e8d8dbfb3b157f1e5577419ef78c8e63b6f754ffa94da22e6466f11b77738e11fc9ad4803341b6640a6c7f48bd73bb02a12643b8176d60147e88aa1fb48314
 SHA512 
6eac4edb286f3ef0074cbaaf3b216c8dd40fe474e1a9bd6f86d7185cceabe19edb76b324af76d9fa1005ba8809d624354c21ab84284aba0d92e467612bd9fe47
 DIST portage-3.0.57.tar.bz2 1173286 BLAKE2B 
793a150c94c939672783d7556e5fce80f7ff8895a616726d7adf92d6f8da99768c55db8a685f2dd548ab0bb09c29fd7548ee6fc1dfc51b55c530119690b92265
 SHA512 
4c5348e0dfc966db5ca1c08cc3fafc72dd2b3b402972b99b411f61f7a288190ecd9e5ac597dc62ee96eacc378818a4cac65b0fd040c9ff557e7cbe057a934829
-DIST portage-3.0.58.tar.bz2 1174162 BLAKE2B 
7e8edbdc20410116280d7d20bd7a97760970d34add34be84b66e7af5ea6e8f28d0123fdf6c43acc761a7d0ae75ac0badca96436b0d0272e4cfab36dfc67792e9
 SHA512 
58e9d93f1e8802202f7abe5b8085297c2e45fd160d0f6de0d10480defcb626fa4d55d273a950f796ed8a479dda9eedaa1175a8710f67880efb73c41687bd
 DIST portage-3.0.59.tar.bz2 1175098 BLAKE2B 
dbb8a22fd9417a74e60aa24ff064e9da5b4c54bd4936a0a1a4fdb0cd30d8568ca2424ef2a484883b538685a291a85009d942defdbb5cfa4e0072e9d977f238cd
 SHA512 
8c86e0663327125e7cb36150d4aca1d7fcd2bf7ae25634ed916c2ee444809404aafb094adacacc0408509600f447d62d9c53e7bc25dd8c71c61e8758ac674638

diff --git a/sys-apps/portage/portage-3.0.51.ebuild 
b/sys-apps/portage/portage-3.0.51.ebuild
deleted file mode 100644
index be41e637ba09..
--- a/sys-apps/portage/portage-3.0.51.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit meson linux-info multiprocessing python-r1 tmpfiles
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
-
-if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="
-   https://anongit.gentoo.org/git/proj/portage.git
-   https://github.com/gentoo/portage.git
-   "
-   inherit git-r3
-else
-   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# setuptools is still needed as a workaround for Python 3.12+ for now.
-# https://github.com/mesonbuild/meson/issues/7702
-#
-# >=meson-1.2.1-r1 for bug #912051
-BDEPEND="
-   ${PYTHON_DEPS}
-   >=dev-util/meson-1.2.1-r1
-   $(python_gen_cond_dep '
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   ' python3_12)
-   test? (
-   dev-python/pytest-xdist[${PYTHON_USEDEP}]
-   dev-vcs/git
-   )
-"
-DEPEND="
-   ${PYTHON_DEPS}
-   >=app-arch/tar-1.27
-   dev-lang/python-exec:2
-   >=sys-apps/sed-4.0.5
-   sys-devel/patch
-   !build? ( $(python_gen_impl_dep 'ssl(+)') )
-   apidoc? (
-   dev-python/sphinx[${PYTHON_USEDEP}]
-   dev-python/sphinx-epytext[${PYTHON_USEDEP}]
-   )
-   doc? (
-   ~app-text/docbook-xml-dtd-4.4
-   app-text/xmlto
-   )
-"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug 

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

2023-12-27 Thread Sam James
commit: 0a1f19cdd7a598070b7eb08b3954e677aa4868ad
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 27 21:27:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 27 21:28:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a1f19cd

sys-apps/portage: add 3.0.59

Closes: https://bugs.gentoo.org/587088
Closes: https://bugs.gentoo.org/822033
Closes: https://bugs.gentoo.org/915494
Closes: https://bugs.gentoo.org/916135
Closes: https://bugs.gentoo.org/917120
Closes: https://bugs.gentoo.org/919862
Closes: https://bugs.gentoo.org/920095
Closes: https://bugs.gentoo.org/920258
Closes: https://bugs.gentoo.org/920537
Closes: https://bugs.gentoo.org/920654
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-3.0.59.ebuild | 246 +
 2 files changed, 247 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 039f44b4c71a..30379a9892a8 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,3 +3,4 @@ DIST portage-3.0.51.tar.bz2 1155503 BLAKE2B 
1095ab616993951da8f4d43cef4cf815672c
 DIST portage-3.0.56.tar.bz2 1166588 BLAKE2B 
f6e8d8dbfb3b157f1e5577419ef78c8e63b6f754ffa94da22e6466f11b77738e11fc9ad4803341b6640a6c7f48bd73bb02a12643b8176d60147e88aa1fb48314
 SHA512 
6eac4edb286f3ef0074cbaaf3b216c8dd40fe474e1a9bd6f86d7185cceabe19edb76b324af76d9fa1005ba8809d624354c21ab84284aba0d92e467612bd9fe47
 DIST portage-3.0.57.tar.bz2 1173286 BLAKE2B 
793a150c94c939672783d7556e5fce80f7ff8895a616726d7adf92d6f8da99768c55db8a685f2dd548ab0bb09c29fd7548ee6fc1dfc51b55c530119690b92265
 SHA512 
4c5348e0dfc966db5ca1c08cc3fafc72dd2b3b402972b99b411f61f7a288190ecd9e5ac597dc62ee96eacc378818a4cac65b0fd040c9ff557e7cbe057a934829
 DIST portage-3.0.58.tar.bz2 1174162 BLAKE2B 
7e8edbdc20410116280d7d20bd7a97760970d34add34be84b66e7af5ea6e8f28d0123fdf6c43acc761a7d0ae75ac0badca96436b0d0272e4cfab36dfc67792e9
 SHA512 
58e9d93f1e8802202f7abe5b8085297c2e45fd160d0f6de0d10480defcb626fa4d55d273a950f796ed8a479dda9eedaa1175a8710f67880efb73c41687bd
+DIST portage-3.0.59.tar.bz2 1175098 BLAKE2B 
dbb8a22fd9417a74e60aa24ff064e9da5b4c54bd4936a0a1a4fdb0cd30d8568ca2424ef2a484883b538685a291a85009d942defdbb5cfa4e0072e9d977f238cd
 SHA512 
8c86e0663327125e7cb36150d4aca1d7fcd2bf7ae25634ed916c2ee444809404aafb094adacacc0408509600f447d62d9c53e7bc25dd8c71c61e8758ac674638

diff --git a/sys-apps/portage/portage-3.0.59.ebuild 
b/sys-apps/portage/portage-3.0.59.ebuild
new file mode 100644
index ..0fa6790375b9
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.59.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info multiprocessing python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="
+   https://anongit.gentoo.org/git/proj/portage.git
+   https://github.com/gentoo/portage.git
+   "
+   inherit git-r3
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-util/meson-1.2.1-r1
+   || (
+   >=dev-util/meson-1.3.0-r1
+   /dev/null ; 
then
+   chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+   fi
+
+   if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+   elog "The emerge --autounmask option is now disabled by 
default, except for"
+   elog "portions of behavior which are controlled by the 
--autounmask-use and"
+   elog "--autounmask-license options. For backward compatibility, 
previous"
+   elog "behavior of --autounmask=y and --autounmask=n is entirely 
preserved."
+   elog "Users can get the old behavior simply by adding 
--autounmask to the"
+   elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale 
for this"
+   elog "change, see https://bugs.gentoo.org/658648.;
+   fi
+}
+
+pkg_postinst() {
+   # Warn about obsolete "enotice" script, bug #867010
+   local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
+   if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
+   

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

2023-12-16 Thread Arthur Zamarin
commit: 718661ba3bf7a17433e59c72d126a9917f317c83
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 05:28:59 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 05:28:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=718661ba

sys-apps/portage: Stabilize 3.0.57 arm64, #919976

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.57.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.57.ebuild 
b/sys-apps/portage/portage-3.0.57.ebuild
index 91e0c2b6396e..f52331d84170 100644
--- a/sys-apps/portage/portage-3.0.57.ebuild
+++ b/sys-apps/portage/portage-3.0.57.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"
@@ -165,6 +165,8 @@ src_compile() {
 
 src_test() {
local -x PYTEST_ADDOPTS="-vv -ra -l -o console_output_style=count -n 
$(makeopts_jobs) --dist=worksteal"
+   local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+   local -x PYTEST_PLUGINS=xdist.plugin
 
python_foreach_impl meson_src_test --no-rebuild --verbose
 }



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

2023-12-15 Thread Sam James
commit: e647fb111eee20897dc5db14946e01bf0e8d6df1
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 16 04:44:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 16 04:45:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e647fb11

sys-apps/portage: Stabilize 3.0.57 ppc64, #919976

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

 sys-apps/portage/portage-3.0.57.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.57.ebuild 
b/sys-apps/portage/portage-3.0.57.ebuild
index 291fa53845e4..91e0c2b6396e 100644
--- a/sys-apps/portage/portage-3.0.57.ebuild
+++ b/sys-apps/portage/portage-3.0.57.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-15 Thread Arthur Zamarin
commit: ceb1f0dbb372af85084a12939469220c46ebe611
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 15 13:07:46 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 15 13:07:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceb1f0db

sys-apps/portage: Stabilize 3.0.57 sparc, #919976

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.57.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.57.ebuild 
b/sys-apps/portage/portage-3.0.57.ebuild
index b00248ef6754..291fa53845e4 100644
--- a/sys-apps/portage/portage-3.0.57.ebuild
+++ b/sys-apps/portage/portage-3.0.57.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-15 Thread Arthur Zamarin
commit: a1375a90ff263a24457317760c210a3d100ea4af
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 15 13:06:54 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 15 13:06:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1375a90

sys-apps/portage: Stabilize 3.0.57 x86, #919976

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.57.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.57.ebuild 
b/sys-apps/portage/portage-3.0.57.ebuild
index 85f186ae9a08..4f5b2ea88871 100644
--- a/sys-apps/portage/portage-3.0.57.ebuild
+++ b/sys-apps/portage/portage-3.0.57.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-15 Thread Arthur Zamarin
commit: e80118744ebc10b0a943e39fb37cd23d3172ca16
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 15 13:06:57 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 15 13:06:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8011874

sys-apps/portage: Stabilize 3.0.57 ppc, #919976

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.57.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.57.ebuild 
b/sys-apps/portage/portage-3.0.57.ebuild
index 4f5b2ea88871..b00248ef6754 100644
--- a/sys-apps/portage/portage-3.0.57.ebuild
+++ b/sys-apps/portage/portage-3.0.57.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-15 Thread Arthur Zamarin
commit: 0369da61b2cdfa7bfccc65234daa67aff4bddd71
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 15 13:06:51 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 15 13:06:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0369da61

sys-apps/portage: Stabilize 3.0.57 hppa, #919976

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.57.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.57.ebuild 
b/sys-apps/portage/portage-3.0.57.ebuild
index c9eed97406e0..85f186ae9a08 100644
--- a/sys-apps/portage/portage-3.0.57.ebuild
+++ b/sys-apps/portage/portage-3.0.57.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-15 Thread Arthur Zamarin
commit: 42b714b922c1edd1566d31c6dcf951ac2cce7b61
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 15 12:59:25 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 15 12:59:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42b714b9

sys-apps/portage: Stabilize 3.0.57 amd64, #919976

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.57.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.57.ebuild 
b/sys-apps/portage/portage-3.0.57.ebuild
index dafc3d985c50..96e8d3f95467 100644
--- a/sys-apps/portage/portage-3.0.57.ebuild
+++ b/sys-apps/portage/portage-3.0.57.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-15 Thread Arthur Zamarin
commit: 875dc78d490ae12e238791c94ae0e3f6f9c5071a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 15 12:59:26 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 15 12:59:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=875dc78d

sys-apps/portage: Stabilize 3.0.57 arm, #919976

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.57.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.57.ebuild 
b/sys-apps/portage/portage-3.0.57.ebuild
index 96e8d3f95467..c9eed97406e0 100644
--- a/sys-apps/portage/portage-3.0.57.ebuild
+++ b/sys-apps/portage/portage-3.0.57.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-13 Thread Sam James
commit: e1932a816fa1d407f1ad504f8d05cefb0e5294d7
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 14 04:09:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 14 04:09:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1932a81

sys-apps/portage: add 3.0.58

Closes: https://bugs.gentoo.org/919695
Closes: https://bugs.gentoo.org/912672
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-3.0.58.ebuild | 246 +
 2 files changed, 247 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 844bbda6cb3f..039f44b4c71a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,3 +2,4 @@ DIST portage-3.0.49.tar.bz2 1152449 BLAKE2B 
a47f951a35828ba9c8fc88c2eab5222c98ed
 DIST portage-3.0.51.tar.bz2 1155503 BLAKE2B 
1095ab616993951da8f4d43cef4cf815672c67cb48ea2fe5aeb6b7c629058bfab1557d2b9508f2e3e9f38676733b5d60ec6a3686bc57840065c428508769cb1c
 SHA512 
bf237819173bed9df3b63ada067a2a99700618d88fd4b528146c56bdd592f2452003db6cc6da4a445b647eb4d8bb591260ea0d2a5627ad540526a2e802025836
 DIST portage-3.0.56.tar.bz2 1166588 BLAKE2B 
f6e8d8dbfb3b157f1e5577419ef78c8e63b6f754ffa94da22e6466f11b77738e11fc9ad4803341b6640a6c7f48bd73bb02a12643b8176d60147e88aa1fb48314
 SHA512 
6eac4edb286f3ef0074cbaaf3b216c8dd40fe474e1a9bd6f86d7185cceabe19edb76b324af76d9fa1005ba8809d624354c21ab84284aba0d92e467612bd9fe47
 DIST portage-3.0.57.tar.bz2 1173286 BLAKE2B 
793a150c94c939672783d7556e5fce80f7ff8895a616726d7adf92d6f8da99768c55db8a685f2dd548ab0bb09c29fd7548ee6fc1dfc51b55c530119690b92265
 SHA512 
4c5348e0dfc966db5ca1c08cc3fafc72dd2b3b402972b99b411f61f7a288190ecd9e5ac597dc62ee96eacc378818a4cac65b0fd040c9ff557e7cbe057a934829
+DIST portage-3.0.58.tar.bz2 1174162 BLAKE2B 
7e8edbdc20410116280d7d20bd7a97760970d34add34be84b66e7af5ea6e8f28d0123fdf6c43acc761a7d0ae75ac0badca96436b0d0272e4cfab36dfc67792e9
 SHA512 
58e9d93f1e8802202f7abe5b8085297c2e45fd160d0f6de0d10480defcb626fa4d55d273a950f796ed8a479dda9eedaa1175a8710f67880efb73c41687bd

diff --git a/sys-apps/portage/portage-3.0.58.ebuild 
b/sys-apps/portage/portage-3.0.58.ebuild
new file mode 100644
index ..0fa6790375b9
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.58.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info multiprocessing python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="
+   https://anongit.gentoo.org/git/proj/portage.git
+   https://github.com/gentoo/portage.git
+   "
+   inherit git-r3
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-util/meson-1.2.1-r1
+   || (
+   >=dev-util/meson-1.3.0-r1
+   /dev/null ; 
then
+   chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+   fi
+
+   if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+   elog "The emerge --autounmask option is now disabled by 
default, except for"
+   elog "portions of behavior which are controlled by the 
--autounmask-use and"
+   elog "--autounmask-license options. For backward compatibility, 
previous"
+   elog "behavior of --autounmask=y and --autounmask=n is entirely 
preserved."
+   elog "Users can get the old behavior simply by adding 
--autounmask to the"
+   elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale 
for this"
+   elog "change, see https://bugs.gentoo.org/658648.;
+   fi
+}
+
+pkg_postinst() {
+   # Warn about obsolete "enotice" script, bug #867010
+   local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
+   if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
+   eerror "Obsolete 'enotice' script detected!"
+   eerror "Please remove this from ${bashrc} to avoid problems."
+   eerror "See bug 867010 for more details."
+   fi
+}



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

2023-12-11 Thread Michał Górny
commit: 53adaab465ca193bf42dd022694f89737f2fe65e
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Dec 12 06:32:25 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Dec 12 06:32:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53adaab4

sys-apps/portage: Stabilize 3.0.56-r1 ppc, #919102

Signed-off-by: Michał Górny  gentoo.org>

 sys-apps/portage/portage-3.0.56-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.56-r1.ebuild 
b/sys-apps/portage/portage-3.0.56-r1.ebuild
index beeaa755dfbc..1b54e1017353 100644
--- a/sys-apps/portage/portage-3.0.56-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.56-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-10 Thread Sam James
commit: bae767c21f490d9befbfc8a19872d7cdedb65bbe
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 10 23:01:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 10 23:02:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bae767c2

sys-apps/portage: switch to gpkg by default for 

Bug: https://bugs.gentoo.org/912672
Thanks-to: Andreas K. Hüttel  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/portage-.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index dafc3d985c50..0fa6790375b9 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -209,6 +209,10 @@ pkg_preinst() {
env -u FEATURES -u PORTAGE_REPOSITORIES \

PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
"${PYTHON}" -m 
portage._compat_upgrade.binpkg_multi_instance || die
+
+   env -u BINPKG_FORMAT \
+   
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+   "${PYTHON}" -m portage._compat_upgrade.binpkg_format || 
die
fi
 
# elog dir must exist to avoid logrotate error for bug #415911.



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

2023-12-10 Thread Sam James
commit: 0d365d80099d206e49b592abb30030642f8f09f9
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 10 22:34:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 10 22:34:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d365d80

sys-apps/portage: add 3.0.57

Closes: https://bugs.gentoo.org/918929
Closes: https://bugs.gentoo.org/913628
Closes: https://bugs.gentoo.org/915474
Closes: https://bugs.gentoo.org/918597
Closes: https://bugs.gentoo.org/919072
Closes: https://bugs.gentoo.org/919105
Closes: https://bugs.gentoo.org/919174
Closes: https://bugs.gentoo.org/919311
Closes: https://bugs.gentoo.org/919419
Closes: https://bugs.gentoo.org/919668
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-3.0.57.ebuild | 242 +
 2 files changed, 243 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ba9464c44403..844bbda6cb3f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,4 @@
 DIST portage-3.0.49.tar.bz2 1152449 BLAKE2B 
a47f951a35828ba9c8fc88c2eab5222c98ed20240c736c366d8f2e4f4aef773a140bf0e150448cc3796a7adb7471ce006aae4de1816bbbaae6dd83dcf28f52b0
 SHA512 
f07950d10c01bda0915aa30c5c0b6ce2864754fe7dea38b5341336cd7665dcabfdc219969f1a3d2803db59bc23fc4284bc96b4087a596cb27a5d9eb075735469
 DIST portage-3.0.51.tar.bz2 1155503 BLAKE2B 
1095ab616993951da8f4d43cef4cf815672c67cb48ea2fe5aeb6b7c629058bfab1557d2b9508f2e3e9f38676733b5d60ec6a3686bc57840065c428508769cb1c
 SHA512 
bf237819173bed9df3b63ada067a2a99700618d88fd4b528146c56bdd592f2452003db6cc6da4a445b647eb4d8bb591260ea0d2a5627ad540526a2e802025836
 DIST portage-3.0.56.tar.bz2 1166588 BLAKE2B 
f6e8d8dbfb3b157f1e5577419ef78c8e63b6f754ffa94da22e6466f11b77738e11fc9ad4803341b6640a6c7f48bd73bb02a12643b8176d60147e88aa1fb48314
 SHA512 
6eac4edb286f3ef0074cbaaf3b216c8dd40fe474e1a9bd6f86d7185cceabe19edb76b324af76d9fa1005ba8809d624354c21ab84284aba0d92e467612bd9fe47
+DIST portage-3.0.57.tar.bz2 1173286 BLAKE2B 
793a150c94c939672783d7556e5fce80f7ff8895a616726d7adf92d6f8da99768c55db8a685f2dd548ab0bb09c29fd7548ee6fc1dfc51b55c530119690b92265
 SHA512 
4c5348e0dfc966db5ca1c08cc3fafc72dd2b3b402972b99b411f61f7a288190ecd9e5ac597dc62ee96eacc378818a4cac65b0fd040c9ff557e7cbe057a934829

diff --git a/sys-apps/portage/portage-3.0.57.ebuild 
b/sys-apps/portage/portage-3.0.57.ebuild
new file mode 100644
index ..dafc3d985c50
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.57.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info multiprocessing python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="
+   https://anongit.gentoo.org/git/proj/portage.git
+   https://github.com/gentoo/portage.git
+   "
+   inherit git-r3
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-util/meson-1.2.1-r1
+   || (
+   >=dev-util/meson-1.3.0-r1
+   /dev/null ; 
then
+   chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+   fi
+
+   if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+   elog "The emerge --autounmask option is now disabled by 
default, except for"
+   elog "portions of behavior which are controlled by the 
--autounmask-use and"
+   elog "--autounmask-license options. For backward compatibility, 
previous"
+   elog "behavior of --autounmask=y and --autounmask=n is entirely 
preserved."
+   elog "Users can get the old behavior simply by adding 
--autounmask to the"
+   elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale 
for this"
+   elog "change, see https://bugs.gentoo.org/658648.;
+   fi
+}
+
+pkg_postinst() {
+   # Warn about obsolete "enotice" script, bug #867010
+   local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
+   if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
+   eerror "Obsolete 'enotice' script detected!"
+   eerror "Please remove 

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

2023-12-05 Thread Sam James
commit: 1c64c176fe49e19f9d66ec52326d16ce8f487628
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec  6 07:41:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  6 07:41:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c64c176

sys-apps/portage: Stabilize 3.0.56-r1 x86, #919102

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

 sys-apps/portage/portage-3.0.56-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.56-r1.ebuild 
b/sys-apps/portage/portage-3.0.56-r1.ebuild
index 4a8d010589f0..beeaa755dfbc 100644
--- a/sys-apps/portage/portage-3.0.56-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.56-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-05 Thread Arthur Zamarin
commit: 1b6d39f76c786e5e1eb8dace3dde0b0c865ce840
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Dec  5 19:54:46 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Dec  5 19:54:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b6d39f7

sys-apps/portage: Stabilize 3.0.51 x86, #914771

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.51.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.51.ebuild 
b/sys-apps/portage/portage-3.0.51.ebuild
index c0870d892bca..be41e637ba09 100644
--- a/sys-apps/portage/portage-3.0.51.ebuild
+++ b/sys-apps/portage/portage-3.0.51.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-05 Thread Arthur Zamarin
commit: 7b0ce884b3f6a6e57dce3101541ac50b297db25f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Dec  5 19:54:08 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Dec  5 19:54:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b0ce884

sys-apps/portage: Stabilize 3.0.51 ppc, #914771

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.51.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.51.ebuild 
b/sys-apps/portage/portage-3.0.51.ebuild
index 666b4b2c9e6f..c0870d892bca 100644
--- a/sys-apps/portage/portage-3.0.51.ebuild
+++ b/sys-apps/portage/portage-3.0.51.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-03 Thread Arthur Zamarin
commit: 92bd1d38cd5e01326e45433708647ab8c3c1e0be
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec  3 10:49:41 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec  3 10:49:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92bd1d38

sys-apps/portage: Stabilize 3.0.56-r1 hppa, #919102

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.56-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.56-r1.ebuild 
b/sys-apps/portage/portage-3.0.56-r1.ebuild
index 7c8174eb7fef..4a8d010589f0 100644
--- a/sys-apps/portage/portage-3.0.56-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.56-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-03 Thread Sam James
commit: 5b133bbb68fcb10ce43e6ab744398a6871292ba4
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  3 09:19:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  3 09:19:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b133bbb

sys-apps/portage: Stabilize 3.0.56-r1 amd64, #919102

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

 sys-apps/portage/portage-3.0.56-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.56-r1.ebuild 
b/sys-apps/portage/portage-3.0.56-r1.ebuild
index f48cd6d670cd..7c8174eb7fef 100644
--- a/sys-apps/portage/portage-3.0.56-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.56-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-03 Thread Sam James
commit: 6c251bf2a8b535677142e12e6caf38cc16771d9d
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  3 09:13:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  3 09:13:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c251bf2

sys-apps/portage: Stabilize 3.0.56-r1 arm64, #919102

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

 sys-apps/portage/portage-3.0.56-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.56-r1.ebuild 
b/sys-apps/portage/portage-3.0.56-r1.ebuild
index 046cd2788d83..21b531e6cbe6 100644
--- a/sys-apps/portage/portage-3.0.56-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.56-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-03 Thread Sam James
commit: 5221a8ff18ac9c9f21d6b11d102e4c854089d143
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  3 09:13:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  3 09:13:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5221a8ff

sys-apps/portage: Stabilize 3.0.56-r1 ppc64, #919102

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

 sys-apps/portage/portage-3.0.56-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.56-r1.ebuild 
b/sys-apps/portage/portage-3.0.56-r1.ebuild
index 21b531e6cbe6..f48cd6d670cd 100644
--- a/sys-apps/portage/portage-3.0.56-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.56-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-03 Thread Sam James
commit: f4d758c49de68e8bc77591e5a4140dff9fadbcf7
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  3 09:12:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  3 09:12:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4d758c4

sys-apps/portage: Stabilize 3.0.56-r1 sparc, #919102

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

 sys-apps/portage/portage-3.0.56-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.56-r1.ebuild 
b/sys-apps/portage/portage-3.0.56-r1.ebuild
index 5b743f545f9c..046cd2788d83 100644
--- a/sys-apps/portage/portage-3.0.56-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.56-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-03 Thread Sam James
commit: 5363c5d034e6b915bb519a12dd7acd79ef0de858
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  3 09:12:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  3 09:12:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5363c5d0

sys-apps/portage: Stabilize 3.0.56-r1 arm, #919102

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

 sys-apps/portage/portage-3.0.56-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.56-r1.ebuild 
b/sys-apps/portage/portage-3.0.56-r1.ebuild
index dafc3d985c50..5b743f545f9c 100644
--- a/sys-apps/portage/portage-3.0.56-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.56-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-12-03 Thread Sam James
commit: 83af47330fdf04004ec29a74d28be43a2b1e510e
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  3 08:03:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  3 08:03:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83af4733

sys-apps/portage: drop 3.0.45.3-r2, 3.0.46, 3.0.50

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

 sys-apps/portage/Manifest   |   3 -
 sys-apps/portage/portage-3.0.45.3-r2.ebuild | 286 
 sys-apps/portage/portage-3.0.46.ebuild  | 286 
 sys-apps/portage/portage-3.0.50.ebuild  | 237 ---
 4 files changed, 812 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 6d7f781090b1..ba9464c44403 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,3 @@
-DIST portage-3.0.45.3.tar.bz2 1146552 BLAKE2B 
0506124bf47d71df699c2ecb2846b19f68b39813409e141fe292e237093eeb4f3d6fb771f6328624e0182322f71f42e629c2c58a2c590efb8697fa61b03d73a4
 SHA512 
89757efb71127249356c7d4ea1a05de7409285abaf045b2c6b5ddd463bef997db497df6ea3a05085656eced49bee625732bfb2d0771b7592f883f8712e547415
-DIST portage-3.0.46.tar.bz2 1148375 BLAKE2B 
d97698eb3341a8d04980e021e5be8650193baf60c1ba34c11ccc79c147a256f152cb5c3a455798f38ee93164666dba31d3f510837c2924c1190f657fe1019b77
 SHA512 
0aa43d58cb23ff5931d31b2ebf724b0f9cb163d7e452c120f2917b9a1fac1cad7930c28dd40e6482a3f4e66ff05e1340e7135aa9d0eca60182c04f573c094afb
 DIST portage-3.0.49.tar.bz2 1152449 BLAKE2B 
a47f951a35828ba9c8fc88c2eab5222c98ed20240c736c366d8f2e4f4aef773a140bf0e150448cc3796a7adb7471ce006aae4de1816bbbaae6dd83dcf28f52b0
 SHA512 
f07950d10c01bda0915aa30c5c0b6ce2864754fe7dea38b5341336cd7665dcabfdc219969f1a3d2803db59bc23fc4284bc96b4087a596cb27a5d9eb075735469
-DIST portage-3.0.50.tar.bz2 1153508 BLAKE2B 
b90d93f8922acdb5486a52c1354c6c9829fac608971078a641b604b57240065eec4e82cc9cb2fb8b4ba485a7f2d52473c0a90295b29eb578638ad11cd3cf2943
 SHA512 
355841af862077f9203d6f8cbe904f4966516597444f38ef535fc06d0fe5c21d9c1da139a44407fdd69b56eb9c49c286187d856ef4e9b9bc6b21bab5b772a88f
 DIST portage-3.0.51.tar.bz2 1155503 BLAKE2B 
1095ab616993951da8f4d43cef4cf815672c67cb48ea2fe5aeb6b7c629058bfab1557d2b9508f2e3e9f38676733b5d60ec6a3686bc57840065c428508769cb1c
 SHA512 
bf237819173bed9df3b63ada067a2a99700618d88fd4b528146c56bdd592f2452003db6cc6da4a445b647eb4d8bb591260ea0d2a5627ad540526a2e802025836
 DIST portage-3.0.56.tar.bz2 1166588 BLAKE2B 
f6e8d8dbfb3b157f1e5577419ef78c8e63b6f754ffa94da22e6466f11b77738e11fc9ad4803341b6640a6c7f48bd73bb02a12643b8176d60147e88aa1fb48314
 SHA512 
6eac4edb286f3ef0074cbaaf3b216c8dd40fe474e1a9bd6f86d7185cceabe19edb76b324af76d9fa1005ba8809d624354c21ab84284aba0d92e467612bd9fe47

diff --git a/sys-apps/portage/portage-3.0.45.3-r2.ebuild 
b/sys-apps/portage/portage-3.0.45.3-r2.ebuild
deleted file mode 100644
index 3d6fdf246820..
--- a/sys-apps/portage/portage-3.0.45.3-r2.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( pypy3 python3_{10..11} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
-SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   app-arch/xz-utils
-   test? ( dev-vcs/git )
-"
-DEPEND="
-   !build? ( $(python_gen_impl_dep 'ssl(+)') )
-   >=app-arch/tar-1.27
-   dev-lang/python-exec:2
-   >=sys-apps/sed-4.0.5 sys-devel/patch
-   doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-   apidoc? (
-   dev-python/sphinx[${PYTHON_USEDEP}]
-   dev-python/sphinx-epytext[${PYTHON_USEDEP}]
-   )
-"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-   acct-user/portage
-   app-arch/zstd
-   >=app-arch/tar-1.27
-   dev-lang/python-exec:2
-   >=sys-apps/baselayout-2.9
-   >=sys-apps/findutils-4.9
-   !build? (
-   >=sys-apps/sed-4.0.5
-   >=app-shells/bash-5.0:0[readline]
-   >=app-admin/eselect-1.2
-   rsync-verify? (
-   >=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-   >=sec-keys/openpgp-keys-gentoo-release-20220101
-   

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

2023-12-03 Thread Sam James
commit: f02e131e19d855d7823d9a94e943f616d0bdc303
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  3 08:00:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  3 08:02:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f02e131e

sys-apps/portage: drop 3.0.52, 3.0.53, 3.0.54-r1, 3.0.55

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

 sys-apps/portage/Manifest  |   4 -
 54-Convert-portageq-helper-to-a-function.patch |  65 --
 sys-apps/portage/portage-3.0.52.ebuild | 238 
 sys-apps/portage/portage-3.0.53.ebuild | 238 
 sys-apps/portage/portage-3.0.54-r1.ebuild  | 241 -
 sys-apps/portage/portage-3.0.55.ebuild | 238 
 6 files changed, 1024 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 830ba607a0af..6d7f781090b1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,8 +3,4 @@ DIST portage-3.0.46.tar.bz2 1148375 BLAKE2B 
d97698eb3341a8d04980e021e5be8650193b
 DIST portage-3.0.49.tar.bz2 1152449 BLAKE2B 
a47f951a35828ba9c8fc88c2eab5222c98ed20240c736c366d8f2e4f4aef773a140bf0e150448cc3796a7adb7471ce006aae4de1816bbbaae6dd83dcf28f52b0
 SHA512 
f07950d10c01bda0915aa30c5c0b6ce2864754fe7dea38b5341336cd7665dcabfdc219969f1a3d2803db59bc23fc4284bc96b4087a596cb27a5d9eb075735469
 DIST portage-3.0.50.tar.bz2 1153508 BLAKE2B 
b90d93f8922acdb5486a52c1354c6c9829fac608971078a641b604b57240065eec4e82cc9cb2fb8b4ba485a7f2d52473c0a90295b29eb578638ad11cd3cf2943
 SHA512 
355841af862077f9203d6f8cbe904f4966516597444f38ef535fc06d0fe5c21d9c1da139a44407fdd69b56eb9c49c286187d856ef4e9b9bc6b21bab5b772a88f
 DIST portage-3.0.51.tar.bz2 1155503 BLAKE2B 
1095ab616993951da8f4d43cef4cf815672c67cb48ea2fe5aeb6b7c629058bfab1557d2b9508f2e3e9f38676733b5d60ec6a3686bc57840065c428508769cb1c
 SHA512 
bf237819173bed9df3b63ada067a2a99700618d88fd4b528146c56bdd592f2452003db6cc6da4a445b647eb4d8bb591260ea0d2a5627ad540526a2e802025836
-DIST portage-3.0.52.tar.bz2 1157447 BLAKE2B 
61e4d32f9713b9b0a2df6ca636b2d756dacdb93f862eeab8a8b46d436b9c90d3d5d04989023dc5580ce0c4a6827fa623e5b32ce3d5094ff56ccde7a53c1af81c
 SHA512 
1a249b140cc24b6d83314ad0b3f4ca73fcff3df01f1207c2fe661b16e78ab1155bb6dca4fb89100910fce13bf0fc21636232f9560360cf12f2c43b803d2a0429
-DIST portage-3.0.53.tar.bz2 1162321 BLAKE2B 
1c38bc97d9aca2ce4062ed0fc2ef9297911379a32f1ed32b4d5ced760970edbfb9579471efd69c0fc16e3227ef6444d60c2bb19be6d809eabe832250d340b4b5
 SHA512 
d747acc922da2d6f2dc10a8b5a6c7cf4b325ab903b3c5634d5aa1927bbfffa306076ad780a4634d7bcf6092b763b753b02c14f1a21197706559d370c6eee00a1
-DIST portage-3.0.54.tar.bz2 1164619 BLAKE2B 
b70ed74a557470068f873b544bc7efc497f4121b2189601c44f9ddc1571e80cdc1387148cdd705604a24a2357289385345df5d60e03e7ebff1e8797bed350fe4
 SHA512 
2e9e16dae4a30e2bfed2d5eab7eb4e4c8260cc1b5a826d247e98908fb8669e4e5176d7f59a01d4d7a302f874fe1d80c17da87bb87d31f98af7a79e1823fa4009
-DIST portage-3.0.55.tar.bz2 1167100 BLAKE2B 
8dd4ffa3f816e34a9afa5ba70d0ae252797a782cf8b3dd4df9c4fe52f1fb218d757b3679a5d43229accdbed52ae70bb6a706768839bf735b342bdfc598e252a1
 SHA512 
de891a7a91012546ded5ac6f3427324d1d959beeb7442339f350728bee3337ff49e48a113b191dc0d515f3545b8662ff26ad434bb9cbfbc23bd47938a8932fce
 DIST portage-3.0.56.tar.bz2 1166588 BLAKE2B 
f6e8d8dbfb3b157f1e5577419ef78c8e63b6f754ffa94da22e6466f11b77738e11fc9ad4803341b6640a6c7f48bd73bb02a12643b8176d60147e88aa1fb48314
 SHA512 
6eac4edb286f3ef0074cbaaf3b216c8dd40fe474e1a9bd6f86d7185cceabe19edb76b324af76d9fa1005ba8809d624354c21ab84284aba0d92e467612bd9fe47

diff --git 
a/sys-apps/portage/files/portage-3.0.54-Convert-portageq-helper-to-a-function.patch
 
b/sys-apps/portage/files/portage-3.0.54-Convert-portageq-helper-to-a-function.patch
deleted file mode 100644
index 970f49d6a001..
--- 
a/sys-apps/portage/files/portage-3.0.54-Convert-portageq-helper-to-a-function.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 27952b1d753ef4ea9bbd2307f8a9a315ad94557d Mon Sep 17 00:00:00 2001
-From: Mike Gilbert 
-Date: Thu, 26 Oct 2023 10:42:00 -0400
-Subject: [PATCH] Convert portageq helper to a function
-To: gentoo-portage-...@lists.gentoo.org
-
-This keeps it out of PATH in ebuilds to avoid breaking external
-utilities that call portageq.
-
-Bug: https://bugs.gentoo.org/906129
-Bug: https://bugs.gentoo.org/916287
-Bug: https://bugs.gentoo.org/916296
-Signed-off-by: Mike Gilbert 

- NEWS| 4 +++-
- bin/ebuild-helpers/portageq | 8 
- bin/phase-helpers.sh| 4 
- bin/portageq-wrapper| 1 -
- 4 files changed, 7 insertions(+), 10 deletions(-)
- delete mode 100755 bin/ebuild-helpers/portageq
-
-diff --git a/bin/ebuild-helpers/portageq b/bin/ebuild-helpers/portageq
-deleted file mode 100755
-index bd9d6b044..0
 a/bin/ebuild-helpers/portageq
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#!/usr/bin/env bash
--# Copyright 2009-2023 Gentoo Authors
--# 

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

2023-12-03 Thread Sam James
commit: 33701a3a34c89639c79e3d3f719358a1a01bc57d
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  3 07:59:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  3 08:02:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33701a3a

sys-apps/portage: don't allow broken meson for build

=dev-util/meson-1.3.0 could lead to a miscompiled Portage with IPC disabled.

Bug: https://bugs.gentoo.org/919072
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/{portage-3.0.56.ebuild => portage-3.0.56-r1.ebuild} | 4 
 1 file changed, 4 insertions(+)

diff --git a/sys-apps/portage/portage-3.0.56.ebuild 
b/sys-apps/portage/portage-3.0.56-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-3.0.56.ebuild
rename to sys-apps/portage/portage-3.0.56-r1.ebuild
index f261a5eae11a..dafc3d985c50 100644
--- a/sys-apps/portage/portage-3.0.56.ebuild
+++ b/sys-apps/portage/portage-3.0.56-r1.ebuild
@@ -36,6 +36,10 @@ RESTRICT="!test? ( test )"
 BDEPEND="
${PYTHON_DEPS}
>=dev-util/meson-1.2.1-r1
+   || (
+   >=dev-util/meson-1.3.0-r1
+   

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

2023-12-03 Thread Sam James
commit: 09b402074676325f9d2ef35e0a4f8e2d10438ee7
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  3 08:00:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  3 08:02:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09b40207

sys-apps/portage: sync live

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

 sys-apps/portage/portage-.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index f261a5eae11a..dafc3d985c50 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -36,6 +36,10 @@ RESTRICT="!test? ( test )"
 BDEPEND="
${PYTHON_DEPS}
>=dev-util/meson-1.2.1-r1
+   || (
+   >=dev-util/meson-1.3.0-r1
+   

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

2023-11-30 Thread Sam James
commit: baec60737ddc370dcf77ce1c797ff187357c4b14
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  1 02:54:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  1 02:54:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baec6073

sys-apps/portage: add 3.0.56

Closes: https://bugs.gentoo.org/760893
Closes: https://bugs.gentoo.org/917033
Closes: https://bugs.gentoo.org/917259
Closes: https://bugs.gentoo.org/917315
Closes: https://bugs.gentoo.org/918515
Closes: https://bugs.gentoo.org/918682
Closes: https://bugs.gentoo.org/918683
Closes: https://bugs.gentoo.org/916977
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-3.0.56.ebuild | 238 +
 2 files changed, 239 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 86155cae4c96..830ba607a0af 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,3 +7,4 @@ DIST portage-3.0.52.tar.bz2 1157447 BLAKE2B 
61e4d32f9713b9b0a2df6ca636b2d756dacd
 DIST portage-3.0.53.tar.bz2 1162321 BLAKE2B 
1c38bc97d9aca2ce4062ed0fc2ef9297911379a32f1ed32b4d5ced760970edbfb9579471efd69c0fc16e3227ef6444d60c2bb19be6d809eabe832250d340b4b5
 SHA512 
d747acc922da2d6f2dc10a8b5a6c7cf4b325ab903b3c5634d5aa1927bbfffa306076ad780a4634d7bcf6092b763b753b02c14f1a21197706559d370c6eee00a1
 DIST portage-3.0.54.tar.bz2 1164619 BLAKE2B 
b70ed74a557470068f873b544bc7efc497f4121b2189601c44f9ddc1571e80cdc1387148cdd705604a24a2357289385345df5d60e03e7ebff1e8797bed350fe4
 SHA512 
2e9e16dae4a30e2bfed2d5eab7eb4e4c8260cc1b5a826d247e98908fb8669e4e5176d7f59a01d4d7a302f874fe1d80c17da87bb87d31f98af7a79e1823fa4009
 DIST portage-3.0.55.tar.bz2 1167100 BLAKE2B 
8dd4ffa3f816e34a9afa5ba70d0ae252797a782cf8b3dd4df9c4fe52f1fb218d757b3679a5d43229accdbed52ae70bb6a706768839bf735b342bdfc598e252a1
 SHA512 
de891a7a91012546ded5ac6f3427324d1d959beeb7442339f350728bee3337ff49e48a113b191dc0d515f3545b8662ff26ad434bb9cbfbc23bd47938a8932fce
+DIST portage-3.0.56.tar.bz2 1166588 BLAKE2B 
f6e8d8dbfb3b157f1e5577419ef78c8e63b6f754ffa94da22e6466f11b77738e11fc9ad4803341b6640a6c7f48bd73bb02a12643b8176d60147e88aa1fb48314
 SHA512 
6eac4edb286f3ef0074cbaaf3b216c8dd40fe474e1a9bd6f86d7185cceabe19edb76b324af76d9fa1005ba8809d624354c21ab84284aba0d92e467612bd9fe47

diff --git a/sys-apps/portage/portage-3.0.56.ebuild 
b/sys-apps/portage/portage-3.0.56.ebuild
new file mode 100644
index ..f261a5eae11a
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.56.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info multiprocessing python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="
+   https://anongit.gentoo.org/git/proj/portage.git
+   https://github.com/gentoo/portage.git
+   "
+   inherit git-r3
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-util/meson-1.2.1-r1
+   $(python_gen_cond_dep '
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   ' python3_12)
+   test? (
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   dev-vcs/git
+   )
+"
+DEPEND="
+   ${PYTHON_DEPS}
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   >=sys-apps/sed-4.0.5
+   sys-devel/patch
+   !build? ( $(python_gen_impl_dep 'ssl(+)') )
+   apidoc? (
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+   )
+   doc? (
+   ~app-text/docbook-xml-dtd-4.4
+   app-text/xmlto
+   )
+"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+RDEPEND="
+   ${PYTHON_DEPS}
+   acct-user/portage
+   >=app-arch/tar-1.27
+   app-arch/zstd
+   >=app-misc/pax-utils-0.1.17
+   dev-lang/python-exec:2
+   >=sys-apps/baselayout-2.9
+   >=sys-apps/findutils-4.9
+   !build? (
+   >=app-admin/eselect-1.2
+   app-portage/getuto
+   >=app-shells/bash-5.0:0
+   

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

2023-11-27 Thread Sam James
commit: 9bd1c2e5b84b8126ab8dd7b5b8d3069e28841987
Author: Sam James  gentoo  org>
AuthorDate: Tue Nov 28 06:18:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov 28 06:19:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd1c2e5

sys-apps/portage: crank min. findutils version to 4.9.0

dc1e8d7b9ad8f7253fa14e068547b63b14c829b7 in Portage (first in 3.0.45) uses
find's -files0-from which was introduced in findutils-4.9.0.

Reported by awilfox.

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

 sys-apps/portage/portage-3.0.45.3-r2.ebuild | 2 +-
 sys-apps/portage/portage-3.0.46.ebuild  | 2 +-
 sys-apps/portage/portage-3.0.49-r2.ebuild   | 2 +-
 sys-apps/portage/portage-3.0.50.ebuild  | 2 +-
 sys-apps/portage/portage-3.0.51.ebuild  | 2 +-
 sys-apps/portage/portage-3.0.52.ebuild  | 2 +-
 sys-apps/portage/portage-3.0.53.ebuild  | 2 +-
 sys-apps/portage/portage-3.0.54-r1.ebuild   | 2 +-
 sys-apps/portage/portage-3.0.55.ebuild  | 2 +-
 sys-apps/portage/portage-.ebuild| 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys-apps/portage/portage-3.0.45.3-r2.ebuild 
b/sys-apps/portage/portage-3.0.45.3-r2.ebuild
index 52cbf59c45f9..3d6fdf246820 100644
--- a/sys-apps/portage/portage-3.0.45.3-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.45.3-r2.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
>=app-arch/tar-1.27
dev-lang/python-exec:2
>=sys-apps/baselayout-2.9
-   >=sys-apps/findutils-4.4
+   >=sys-apps/findutils-4.9
!build? (
>=sys-apps/sed-4.0.5
>=app-shells/bash-5.0:0[readline]

diff --git a/sys-apps/portage/portage-3.0.46.ebuild 
b/sys-apps/portage/portage-3.0.46.ebuild
index 0abed7cdcdf9..6c88d92bd623 100644
--- a/sys-apps/portage/portage-3.0.46.ebuild
+++ b/sys-apps/portage/portage-3.0.46.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
>=app-arch/tar-1.27
dev-lang/python-exec:2
>=sys-apps/baselayout-2.9
-   >=sys-apps/findutils-4.4
+   >=sys-apps/findutils-4.9
!build? (
>=sys-apps/sed-4.0.5
>=app-shells/bash-5.0:0[readline]

diff --git a/sys-apps/portage/portage-3.0.49-r2.ebuild 
b/sys-apps/portage/portage-3.0.49-r2.ebuild
index 408f1b8f0a3b..b418d471dd5f 100644
--- a/sys-apps/portage/portage-3.0.49-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.49-r2.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
>=app-arch/tar-1.27
dev-lang/python-exec:2
>=sys-apps/baselayout-2.9
-   >=sys-apps/findutils-4.4
+   >=sys-apps/findutils-4.9
!build? (
>=app-admin/eselect-1.2
>=app-shells/bash-5.0:0[readline]

diff --git a/sys-apps/portage/portage-3.0.50.ebuild 
b/sys-apps/portage/portage-3.0.50.ebuild
index d528af063975..dd57d21ea7c6 100644
--- a/sys-apps/portage/portage-3.0.50.ebuild
+++ b/sys-apps/portage/portage-3.0.50.ebuild
@@ -70,7 +70,7 @@ RDEPEND="
>=app-misc/pax-utils-0.1.17
dev-lang/python-exec:2
>=sys-apps/baselayout-2.9
-   >=sys-apps/findutils-4.4
+   >=sys-apps/findutils-4.9
!build? (
>=app-admin/eselect-1.2
>=app-shells/bash-5.0:0

diff --git a/sys-apps/portage/portage-3.0.51.ebuild 
b/sys-apps/portage/portage-3.0.51.ebuild
index 97e46e848825..666b4b2c9e6f 100644
--- a/sys-apps/portage/portage-3.0.51.ebuild
+++ b/sys-apps/portage/portage-3.0.51.ebuild
@@ -70,7 +70,7 @@ RDEPEND="
>=app-misc/pax-utils-0.1.17
dev-lang/python-exec:2
>=sys-apps/baselayout-2.9
-   >=sys-apps/findutils-4.4
+   >=sys-apps/findutils-4.9
!build? (
>=app-admin/eselect-1.2
>=app-shells/bash-5.0:0

diff --git a/sys-apps/portage/portage-3.0.52.ebuild 
b/sys-apps/portage/portage-3.0.52.ebuild
index 5bf30b190b87..f261a5eae11a 100644
--- a/sys-apps/portage/portage-3.0.52.ebuild
+++ b/sys-apps/portage/portage-3.0.52.ebuild
@@ -70,7 +70,7 @@ RDEPEND="
>=app-misc/pax-utils-0.1.17
dev-lang/python-exec:2
>=sys-apps/baselayout-2.9
-   >=sys-apps/findutils-4.4
+   >=sys-apps/findutils-4.9
!build? (
>=app-admin/eselect-1.2
app-portage/getuto

diff --git a/sys-apps/portage/portage-3.0.53.ebuild 
b/sys-apps/portage/portage-3.0.53.ebuild
index 5bf30b190b87..f261a5eae11a 100644
--- a/sys-apps/portage/portage-3.0.53.ebuild
+++ b/sys-apps/portage/portage-3.0.53.ebuild
@@ -70,7 +70,7 @@ RDEPEND="
>=app-misc/pax-utils-0.1.17
dev-lang/python-exec:2
>=sys-apps/baselayout-2.9
-   >=sys-apps/findutils-4.4
+   >=sys-apps/findutils-4.9
!build? (
>=app-admin/eselect-1.2
app-portage/getuto

diff --git a/sys-apps/portage/portage-3.0.54-r1.ebuild 
b/sys-apps/portage/portage-3.0.54-r1.ebuild
index e117706672e2..695d1d6a5bb9 100644
--- a/sys-apps/portage/portage-3.0.54-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.54-r1.ebuild

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

2023-11-06 Thread Sam James
commit: 0baf5e0bd0879f55a87111ced2140262dbec689b
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov  6 21:41:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov  6 21:41:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0baf5e0b

sys-apps/portage: add 3.0.55

Closes: https://bugs.gentoo.org/916256
Closes: https://bugs.gentoo.org/915842
Closes: https://bugs.gentoo.org/916247
Closes: https://bugs.gentoo.org/916336
Closes: https://bugs.gentoo.org/916601
Closes: https://bugs.gentoo.org/916614
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-3.0.55.ebuild | 238 +
 2 files changed, 239 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e45accaa7109..86155cae4c96 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,3 +6,4 @@ DIST portage-3.0.51.tar.bz2 1155503 BLAKE2B 
1095ab616993951da8f4d43cef4cf815672c
 DIST portage-3.0.52.tar.bz2 1157447 BLAKE2B 
61e4d32f9713b9b0a2df6ca636b2d756dacdb93f862eeab8a8b46d436b9c90d3d5d04989023dc5580ce0c4a6827fa623e5b32ce3d5094ff56ccde7a53c1af81c
 SHA512 
1a249b140cc24b6d83314ad0b3f4ca73fcff3df01f1207c2fe661b16e78ab1155bb6dca4fb89100910fce13bf0fc21636232f9560360cf12f2c43b803d2a0429
 DIST portage-3.0.53.tar.bz2 1162321 BLAKE2B 
1c38bc97d9aca2ce4062ed0fc2ef9297911379a32f1ed32b4d5ced760970edbfb9579471efd69c0fc16e3227ef6444d60c2bb19be6d809eabe832250d340b4b5
 SHA512 
d747acc922da2d6f2dc10a8b5a6c7cf4b325ab903b3c5634d5aa1927bbfffa306076ad780a4634d7bcf6092b763b753b02c14f1a21197706559d370c6eee00a1
 DIST portage-3.0.54.tar.bz2 1164619 BLAKE2B 
b70ed74a557470068f873b544bc7efc497f4121b2189601c44f9ddc1571e80cdc1387148cdd705604a24a2357289385345df5d60e03e7ebff1e8797bed350fe4
 SHA512 
2e9e16dae4a30e2bfed2d5eab7eb4e4c8260cc1b5a826d247e98908fb8669e4e5176d7f59a01d4d7a302f874fe1d80c17da87bb87d31f98af7a79e1823fa4009
+DIST portage-3.0.55.tar.bz2 1167100 BLAKE2B 
8dd4ffa3f816e34a9afa5ba70d0ae252797a782cf8b3dd4df9c4fe52f1fb218d757b3679a5d43229accdbed52ae70bb6a706768839bf735b342bdfc598e252a1
 SHA512 
de891a7a91012546ded5ac6f3427324d1d959beeb7442339f350728bee3337ff49e48a113b191dc0d515f3545b8662ff26ad434bb9cbfbc23bd47938a8932fce

diff --git a/sys-apps/portage/portage-3.0.55.ebuild 
b/sys-apps/portage/portage-3.0.55.ebuild
new file mode 100644
index ..5bf30b190b87
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.55.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info multiprocessing python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="
+   https://anongit.gentoo.org/git/proj/portage.git
+   https://github.com/gentoo/portage.git
+   "
+   inherit git-r3
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-util/meson-1.2.1-r1
+   $(python_gen_cond_dep '
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   ' python3_12)
+   test? (
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   dev-vcs/git
+   )
+"
+DEPEND="
+   ${PYTHON_DEPS}
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   >=sys-apps/sed-4.0.5
+   sys-devel/patch
+   !build? ( $(python_gen_impl_dep 'ssl(+)') )
+   apidoc? (
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+   )
+   doc? (
+   ~app-text/docbook-xml-dtd-4.4
+   app-text/xmlto
+   )
+"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+RDEPEND="
+   ${PYTHON_DEPS}
+   acct-user/portage
+   >=app-arch/tar-1.27
+   app-arch/zstd
+   >=app-misc/pax-utils-0.1.17
+   dev-lang/python-exec:2
+   >=sys-apps/baselayout-2.9
+   >=sys-apps/findutils-4.4
+   !build? (
+   >=app-admin/eselect-1.2
+   app-portage/getuto
+   >=app-shells/bash-5.0:0
+   >=sec-keys/openpgp-keys-gentoo-release-20230329
+   >=sys-apps/sed-4.0.5
+  

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

2023-10-26 Thread Mike Gilbert
commit: ef59ea9a89cfb8bcec388c7ea1a962a4ca0940b6
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Oct 26 15:50:22 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Oct 26 15:50:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef59ea9a

sys-apps/portage: backport portageq fix

Closes: https://bugs.gentoo.org/916287
Closes: https://bugs.gentoo.org/916296
Signed-off-by: Mike Gilbert  gentoo.org>

 54-Convert-portageq-helper-to-a-function.patch | 65 ++
 ...tage-3.0.54.ebuild => portage-3.0.54-r1.ebuild} |  3 +
 2 files changed, 68 insertions(+)

diff --git 
a/sys-apps/portage/files/portage-3.0.54-Convert-portageq-helper-to-a-function.patch
 
b/sys-apps/portage/files/portage-3.0.54-Convert-portageq-helper-to-a-function.patch
new file mode 100644
index ..970f49d6a001
--- /dev/null
+++ 
b/sys-apps/portage/files/portage-3.0.54-Convert-portageq-helper-to-a-function.patch
@@ -0,0 +1,65 @@
+From 27952b1d753ef4ea9bbd2307f8a9a315ad94557d Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Thu, 26 Oct 2023 10:42:00 -0400
+Subject: [PATCH] Convert portageq helper to a function
+To: gentoo-portage-...@lists.gentoo.org
+
+This keeps it out of PATH in ebuilds to avoid breaking external
+utilities that call portageq.
+
+Bug: https://bugs.gentoo.org/906129
+Bug: https://bugs.gentoo.org/916287
+Bug: https://bugs.gentoo.org/916296
+Signed-off-by: Mike Gilbert 
+---
+ NEWS| 4 +++-
+ bin/ebuild-helpers/portageq | 8 
+ bin/phase-helpers.sh| 4 
+ bin/portageq-wrapper| 1 -
+ 4 files changed, 7 insertions(+), 10 deletions(-)
+ delete mode 100755 bin/ebuild-helpers/portageq
+
+diff --git a/bin/ebuild-helpers/portageq b/bin/ebuild-helpers/portageq
+deleted file mode 100755
+index bd9d6b044..0
+--- a/bin/ebuild-helpers/portageq
 /dev/null
+@@ -1,8 +0,0 @@
+-#!/usr/bin/env bash
+-# Copyright 2009-2023 Gentoo Authors
+-# Distributed under the terms of the GNU General Public License v2
+-
+-source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
+-
+-die "'${0##*/}' is not allowed in ebuild scope"
+-exit 1
+diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
+index 3f12b3707..6c2ecf0bc 100644
+--- a/bin/phase-helpers.sh
 b/bin/phase-helpers.sh
+@@ -1006,6 +1006,10 @@ best_version() {
+   ___best_version_and_has_version_common "$@"
+ }
+ 
++portageq() {
++die "portageq is not allowed in ebuild scope"
++}
++
+ if ___eapi_has_get_libdir; then
+   get_libdir() {
+   local libdir_var="LIBDIR_${ABI}"
+diff --git a/bin/portageq-wrapper b/bin/portageq-wrapper
+index afa2defe1..047d1d826 100755
+--- a/bin/portageq-wrapper
 b/bin/portageq-wrapper
+@@ -9,7 +9,6 @@ IFS=":"
+ set -f # in case ${PATH} contains any shell glob characters
+ 
+ for path in "${PORTAGE_BIN_PATH}" ${PATH}; do
+-  [[ ${path} == */portage/*/ebuild-helpers* ]] && continue
+   [[ -x ${path}/portageq ]] || continue
+   PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \
+   exec "${PORTAGE_PYTHON:-/usr/bin/python}" "${path}/portageq" 
"$@"
+-- 
+2.42.0
+

diff --git a/sys-apps/portage/portage-3.0.54.ebuild 
b/sys-apps/portage/portage-3.0.54-r1.ebuild
similarity index 98%
rename from sys-apps/portage/portage-3.0.54.ebuild
rename to sys-apps/portage/portage-3.0.54-r1.ebuild
index 5bf30b190b87..e117706672e2 100644
--- a/sys-apps/portage/portage-3.0.54.ebuild
+++ b/sys-apps/portage/portage-3.0.54-r1.ebuild
@@ -111,6 +111,9 @@ pkg_pretend() {
 }
 
 src_prepare() {
+   local PATCHES=(
+   
"${FILESDIR}/portage-3.0.54-Convert-portageq-helper-to-a-function.patch"
+   )
default
 
if use prefix-guest; then



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

2023-10-24 Thread Sam James
commit: 2b9128b401def05cac46f9e6d66048e5a0d888b8
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 25 05:48:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 25 05:48:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b9128b4

sys-apps/portage: add 3.0.54

Closes: https://bugs.gentoo.org/905869
Closes: https://bugs.gentoo.org/915551
Closes: https://bugs.gentoo.org/915896
Closes: https://bugs.gentoo.org/916106
Closes: https://bugs.gentoo.org/916108
Closes: https://bugs.gentoo.org/916112
Closes: https://bugs.gentoo.org/916116
Closes: https://bugs.gentoo.org/916139
Closes: https://bugs.gentoo.org/916141
Closes: https://bugs.gentoo.org/916142
Closes: https://bugs.gentoo.org/916149
Closes: https://bugs.gentoo.org/916182
Closes: https://bugs.gentoo.org/916231
Closes: https://bugs.gentoo.org/916235
Closes: https://bugs.gentoo.org/916240
Closes: https://bugs.gentoo.org/916242
Closes: https://bugs.gentoo.org/916245
Closes: https://bugs.gentoo.org/916248
Closes: https://bugs.gentoo.org/899898
Closes: https://bugs.gentoo.org/906129
Closes: https://bugs.gentoo.org/906156
Closes: https://bugs.gentoo.org/916031
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-3.0.54.ebuild | 238 +
 2 files changed, 239 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a129b71c24e3..e45accaa7109 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,3 +5,4 @@ DIST portage-3.0.50.tar.bz2 1153508 BLAKE2B 
b90d93f8922acdb5486a52c1354c6c9829fa
 DIST portage-3.0.51.tar.bz2 1155503 BLAKE2B 
1095ab616993951da8f4d43cef4cf815672c67cb48ea2fe5aeb6b7c629058bfab1557d2b9508f2e3e9f38676733b5d60ec6a3686bc57840065c428508769cb1c
 SHA512 
bf237819173bed9df3b63ada067a2a99700618d88fd4b528146c56bdd592f2452003db6cc6da4a445b647eb4d8bb591260ea0d2a5627ad540526a2e802025836
 DIST portage-3.0.52.tar.bz2 1157447 BLAKE2B 
61e4d32f9713b9b0a2df6ca636b2d756dacdb93f862eeab8a8b46d436b9c90d3d5d04989023dc5580ce0c4a6827fa623e5b32ce3d5094ff56ccde7a53c1af81c
 SHA512 
1a249b140cc24b6d83314ad0b3f4ca73fcff3df01f1207c2fe661b16e78ab1155bb6dca4fb89100910fce13bf0fc21636232f9560360cf12f2c43b803d2a0429
 DIST portage-3.0.53.tar.bz2 1162321 BLAKE2B 
1c38bc97d9aca2ce4062ed0fc2ef9297911379a32f1ed32b4d5ced760970edbfb9579471efd69c0fc16e3227ef6444d60c2bb19be6d809eabe832250d340b4b5
 SHA512 
d747acc922da2d6f2dc10a8b5a6c7cf4b325ab903b3c5634d5aa1927bbfffa306076ad780a4634d7bcf6092b763b753b02c14f1a21197706559d370c6eee00a1
+DIST portage-3.0.54.tar.bz2 1164619 BLAKE2B 
b70ed74a557470068f873b544bc7efc497f4121b2189601c44f9ddc1571e80cdc1387148cdd705604a24a2357289385345df5d60e03e7ebff1e8797bed350fe4
 SHA512 
2e9e16dae4a30e2bfed2d5eab7eb4e4c8260cc1b5a826d247e98908fb8669e4e5176d7f59a01d4d7a302f874fe1d80c17da87bb87d31f98af7a79e1823fa4009

diff --git a/sys-apps/portage/portage-3.0.54.ebuild 
b/sys-apps/portage/portage-3.0.54.ebuild
new file mode 100644
index ..5bf30b190b87
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.54.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info multiprocessing python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="
+   https://anongit.gentoo.org/git/proj/portage.git
+   https://github.com/gentoo/portage.git
+   "
+   inherit git-r3
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-util/meson-1.2.1-r1
+   $(python_gen_cond_dep '
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   ' python3_12)
+   test? (
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   dev-vcs/git
+   )
+"
+DEPEND="
+   ${PYTHON_DEPS}
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   >=sys-apps/sed-4.0.5
+   sys-devel/patch
+   !build? ( $(python_gen_impl_dep 'ssl(+)') )
+   apidoc? (
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+   )
+   doc? (
+   

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

2023-10-19 Thread Sam James
commit: 3500483f75789c36e379c1b6546a09df7c11e2b1
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 20 00:49:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 20 00:51:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3500483f

sys-apps/portage: add 3.0.53

Closes: https://bugs.gentoo.org/915120
Closes: https://bugs.gentoo.org/821529
Closes: https://bugs.gentoo.org/914441
Closes: https://bugs.gentoo.org/914722
Closes: https://bugs.gentoo.org/914873
Closes: https://bugs.gentoo.org/915099
Closes: https://bugs.gentoo.org/915123
Closes: https://bugs.gentoo.org/915128
Closes: https://bugs.gentoo.org/915136
Closes: https://bugs.gentoo.org/915330
Closes: https://bugs.gentoo.org/915494
Closes: https://bugs.gentoo.org/915834
Closes: https://bugs.gentoo.org/915903
Closes: https://bugs.gentoo.org/900224
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-3.0.53.ebuild | 238 +
 2 files changed, 239 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index bea896890a8d..a129b71c24e3 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -4,3 +4,4 @@ DIST portage-3.0.49.tar.bz2 1152449 BLAKE2B 
a47f951a35828ba9c8fc88c2eab5222c98ed
 DIST portage-3.0.50.tar.bz2 1153508 BLAKE2B 
b90d93f8922acdb5486a52c1354c6c9829fac608971078a641b604b57240065eec4e82cc9cb2fb8b4ba485a7f2d52473c0a90295b29eb578638ad11cd3cf2943
 SHA512 
355841af862077f9203d6f8cbe904f4966516597444f38ef535fc06d0fe5c21d9c1da139a44407fdd69b56eb9c49c286187d856ef4e9b9bc6b21bab5b772a88f
 DIST portage-3.0.51.tar.bz2 1155503 BLAKE2B 
1095ab616993951da8f4d43cef4cf815672c67cb48ea2fe5aeb6b7c629058bfab1557d2b9508f2e3e9f38676733b5d60ec6a3686bc57840065c428508769cb1c
 SHA512 
bf237819173bed9df3b63ada067a2a99700618d88fd4b528146c56bdd592f2452003db6cc6da4a445b647eb4d8bb591260ea0d2a5627ad540526a2e802025836
 DIST portage-3.0.52.tar.bz2 1157447 BLAKE2B 
61e4d32f9713b9b0a2df6ca636b2d756dacdb93f862eeab8a8b46d436b9c90d3d5d04989023dc5580ce0c4a6827fa623e5b32ce3d5094ff56ccde7a53c1af81c
 SHA512 
1a249b140cc24b6d83314ad0b3f4ca73fcff3df01f1207c2fe661b16e78ab1155bb6dca4fb89100910fce13bf0fc21636232f9560360cf12f2c43b803d2a0429
+DIST portage-3.0.53.tar.bz2 1162321 BLAKE2B 
1c38bc97d9aca2ce4062ed0fc2ef9297911379a32f1ed32b4d5ced760970edbfb9579471efd69c0fc16e3227ef6444d60c2bb19be6d809eabe832250d340b4b5
 SHA512 
d747acc922da2d6f2dc10a8b5a6c7cf4b325ab903b3c5634d5aa1927bbfffa306076ad780a4634d7bcf6092b763b753b02c14f1a21197706559d370c6eee00a1

diff --git a/sys-apps/portage/portage-3.0.53.ebuild 
b/sys-apps/portage/portage-3.0.53.ebuild
new file mode 100644
index ..5bf30b190b87
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.53.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info multiprocessing python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="
+   https://anongit.gentoo.org/git/proj/portage.git
+   https://github.com/gentoo/portage.git
+   "
+   inherit git-r3
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-util/meson-1.2.1-r1
+   $(python_gen_cond_dep '
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   ' python3_12)
+   test? (
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   dev-vcs/git
+   )
+"
+DEPEND="
+   ${PYTHON_DEPS}
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   >=sys-apps/sed-4.0.5
+   sys-devel/patch
+   !build? ( $(python_gen_impl_dep 'ssl(+)') )
+   apidoc? (
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+   )
+   doc? (
+   ~app-text/docbook-xml-dtd-4.4
+   app-text/xmlto
+   )
+"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+RDEPEND="
+   ${PYTHON_DEPS}
+   acct-user/portage
+   >=app-arch/tar-1.27
+   app-arch/zstd
+   >=app-misc/pax-utils-0.1.17
+   

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

2023-10-06 Thread Sam James
commit: f5f361e355257f8098df5f56f7c43aed4b452831
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct  6 20:07:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  6 20:07:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5f361e3

sys-apps/portage: depend on >=meson-1.2.1-r1 for path fix

Bug: https://bugs.gentoo.org/912051
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/portage-3.0.50.ebuild | 3 +++
 sys-apps/portage/portage-3.0.51.ebuild | 3 +++
 sys-apps/portage/portage-3.0.52.ebuild | 3 +++
 sys-apps/portage/portage-.ebuild   | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/sys-apps/portage/portage-3.0.50.ebuild 
b/sys-apps/portage/portage-3.0.50.ebuild
index f57dedf5b41b..d528af063975 100644
--- a/sys-apps/portage/portage-3.0.50.ebuild
+++ b/sys-apps/portage/portage-3.0.50.ebuild
@@ -31,8 +31,11 @@ RESTRICT="!test? ( test )"
 
 # setuptools is still needed as a workaround for Python 3.12+ for now.
 # https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
 BDEPEND="
${PYTHON_DEPS}
+   >=dev-util/meson-1.2.1-r1
$(python_gen_cond_dep '
dev-python/setuptools[${PYTHON_USEDEP}]
' python3_12)

diff --git a/sys-apps/portage/portage-3.0.51.ebuild 
b/sys-apps/portage/portage-3.0.51.ebuild
index 602c1b981ea8..97e46e848825 100644
--- a/sys-apps/portage/portage-3.0.51.ebuild
+++ b/sys-apps/portage/portage-3.0.51.ebuild
@@ -31,8 +31,11 @@ RESTRICT="!test? ( test )"
 
 # setuptools is still needed as a workaround for Python 3.12+ for now.
 # https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
 BDEPEND="
${PYTHON_DEPS}
+   >=dev-util/meson-1.2.1-r1
$(python_gen_cond_dep '
dev-python/setuptools[${PYTHON_USEDEP}]
' python3_12)

diff --git a/sys-apps/portage/portage-3.0.52.ebuild 
b/sys-apps/portage/portage-3.0.52.ebuild
index e2eb0936039f..5bf30b190b87 100644
--- a/sys-apps/portage/portage-3.0.52.ebuild
+++ b/sys-apps/portage/portage-3.0.52.ebuild
@@ -31,8 +31,11 @@ RESTRICT="!test? ( test )"
 
 # setuptools is still needed as a workaround for Python 3.12+ for now.
 # https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
 BDEPEND="
${PYTHON_DEPS}
+   >=dev-util/meson-1.2.1-r1
$(python_gen_cond_dep '
dev-python/setuptools[${PYTHON_USEDEP}]
' python3_12)

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index e2eb0936039f..5bf30b190b87 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -31,8 +31,11 @@ RESTRICT="!test? ( test )"
 
 # setuptools is still needed as a workaround for Python 3.12+ for now.
 # https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
 BDEPEND="
${PYTHON_DEPS}
+   >=dev-util/meson-1.2.1-r1
$(python_gen_cond_dep '
dev-python/setuptools[${PYTHON_USEDEP}]
' python3_12)



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

2023-10-03 Thread Sam James
commit: 9f9211a35abef13079f93a96f57f3a96083c69a7
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct  3 15:38:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct  3 15:38:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f9211a3

sys-apps/portage: add 3.0.52

Closes: https://bugs.gentoo.org/704866
Closes: https://bugs.gentoo.org/877793
Closes: https://bugs.gentoo.org/889300
Closes: https://bugs.gentoo.org/900224
Closes: https://bugs.gentoo.org/912676
Closes: https://bugs.gentoo.org/912808
Closes: https://bugs.gentoo.org/913070
Closes: https://bugs.gentoo.org/913103
Closes: https://bugs.gentoo.org/914159
Closes: https://bugs.gentoo.org/915054
Closes: https://bugs.gentoo.org/915119
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-3.0.52.ebuild | 235 +
 2 files changed, 236 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d48e814e976b..bea896890a8d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,3 +3,4 @@ DIST portage-3.0.46.tar.bz2 1148375 BLAKE2B 
d97698eb3341a8d04980e021e5be8650193b
 DIST portage-3.0.49.tar.bz2 1152449 BLAKE2B 
a47f951a35828ba9c8fc88c2eab5222c98ed20240c736c366d8f2e4f4aef773a140bf0e150448cc3796a7adb7471ce006aae4de1816bbbaae6dd83dcf28f52b0
 SHA512 
f07950d10c01bda0915aa30c5c0b6ce2864754fe7dea38b5341336cd7665dcabfdc219969f1a3d2803db59bc23fc4284bc96b4087a596cb27a5d9eb075735469
 DIST portage-3.0.50.tar.bz2 1153508 BLAKE2B 
b90d93f8922acdb5486a52c1354c6c9829fac608971078a641b604b57240065eec4e82cc9cb2fb8b4ba485a7f2d52473c0a90295b29eb578638ad11cd3cf2943
 SHA512 
355841af862077f9203d6f8cbe904f4966516597444f38ef535fc06d0fe5c21d9c1da139a44407fdd69b56eb9c49c286187d856ef4e9b9bc6b21bab5b772a88f
 DIST portage-3.0.51.tar.bz2 1155503 BLAKE2B 
1095ab616993951da8f4d43cef4cf815672c67cb48ea2fe5aeb6b7c629058bfab1557d2b9508f2e3e9f38676733b5d60ec6a3686bc57840065c428508769cb1c
 SHA512 
bf237819173bed9df3b63ada067a2a99700618d88fd4b528146c56bdd592f2452003db6cc6da4a445b647eb4d8bb591260ea0d2a5627ad540526a2e802025836
+DIST portage-3.0.52.tar.bz2 1157447 BLAKE2B 
61e4d32f9713b9b0a2df6ca636b2d756dacdb93f862eeab8a8b46d436b9c90d3d5d04989023dc5580ce0c4a6827fa623e5b32ce3d5094ff56ccde7a53c1af81c
 SHA512 
1a249b140cc24b6d83314ad0b3f4ca73fcff3df01f1207c2fe661b16e78ab1155bb6dca4fb89100910fce13bf0fc21636232f9560360cf12f2c43b803d2a0429

diff --git a/sys-apps/portage/portage-3.0.52.ebuild 
b/sys-apps/portage/portage-3.0.52.ebuild
new file mode 100644
index ..e2eb0936039f
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.52.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info multiprocessing python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="
+   https://anongit.gentoo.org/git/proj/portage.git
+   https://github.com/gentoo/portage.git
+   "
+   inherit git-r3
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+BDEPEND="
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   ' python3_12)
+   test? (
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   dev-vcs/git
+   )
+"
+DEPEND="
+   ${PYTHON_DEPS}
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   >=sys-apps/sed-4.0.5
+   sys-devel/patch
+   !build? ( $(python_gen_impl_dep 'ssl(+)') )
+   apidoc? (
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+   )
+   doc? (
+   ~app-text/docbook-xml-dtd-4.4
+   app-text/xmlto
+   )
+"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+RDEPEND="
+   ${PYTHON_DEPS}
+   acct-user/portage
+   >=app-arch/tar-1.27
+   app-arch/zstd
+   >=app-misc/pax-utils-0.1.17
+   dev-lang/python-exec:2
+   >=sys-apps/baselayout-2.9
+   >=sys-apps/findutils-4.4
+   !build? (
+   >=app-admin/eselect-1.2
+   app-portage/getuto
+   

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

2023-09-27 Thread Sam James
commit: e3ae415c5f575307d73af899425f66baf6788c00
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 28 04:35:15 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 28 04:35:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3ae415c

sys-apps/portage: Stabilize 3.0.51 sparc, #914771

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

 sys-apps/portage/portage-3.0.51.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.51.ebuild 
b/sys-apps/portage/portage-3.0.51.ebuild
index cdc5a5e8be26..602c1b981ea8 100644
--- a/sys-apps/portage/portage-3.0.51.ebuild
+++ b/sys-apps/portage/portage-3.0.51.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-09-27 Thread Sam James
commit: 05cd396b487db8df6ea4e3e6bc9cbeac0840bf19
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 28 00:20:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 28 00:20:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05cd396b

sys-apps/portage: Stabilize 3.0.51 hppa, #914771

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

 sys-apps/portage/portage-3.0.51.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.51.ebuild 
b/sys-apps/portage/portage-3.0.51.ebuild
index 16959853cc02..cdc5a5e8be26 100644
--- a/sys-apps/portage/portage-3.0.51.ebuild
+++ b/sys-apps/portage/portage-3.0.51.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-09-26 Thread Sam James
commit: 31117c03d699eb2af5568fe4d6e55b58e15f283f
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 26 22:39:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 26 22:39:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31117c03

sys-apps/portage: Stabilize 3.0.51 ppc64, #914771

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

 sys-apps/portage/portage-3.0.51.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.51.ebuild 
b/sys-apps/portage/portage-3.0.51.ebuild
index b0fe0319e0d8..16959853cc02 100644
--- a/sys-apps/portage/portage-3.0.51.ebuild
+++ b/sys-apps/portage/portage-3.0.51.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-09-26 Thread Sam James
commit: 174d515ab2463dd7b3ce5b7ac5558b7f7dd0f9d7
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 26 21:58:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 26 21:58:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=174d515a

sys-apps/portage: Stabilize 3.0.51 amd64, #914771

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

 sys-apps/portage/portage-3.0.51.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.51.ebuild 
b/sys-apps/portage/portage-3.0.51.ebuild
index 745581583b59..b1c8f3a98074 100644
--- a/sys-apps/portage/portage-3.0.51.ebuild
+++ b/sys-apps/portage/portage-3.0.51.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-09-26 Thread Sam James
commit: 114c1399f8457dc77e625b7edc7ab5d577c0b15c
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 26 21:58:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 26 21:58:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=114c1399

sys-apps/portage: Stabilize 3.0.51 arm64, #914771

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

 sys-apps/portage/portage-3.0.51.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.51.ebuild 
b/sys-apps/portage/portage-3.0.51.ebuild
index f57dedf5b41b..745581583b59 100644
--- a/sys-apps/portage/portage-3.0.51.ebuild
+++ b/sys-apps/portage/portage-3.0.51.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-09-26 Thread Sam James
commit: 8095979523aadc7c8cf00c485916ce3acedaf993
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 26 21:58:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 26 21:58:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80959795

sys-apps/portage: Stabilize 3.0.51 arm, #914771

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

 sys-apps/portage/portage-3.0.51.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.51.ebuild 
b/sys-apps/portage/portage-3.0.51.ebuild
index b1c8f3a98074..b0fe0319e0d8 100644
--- a/sys-apps/portage/portage-3.0.51.ebuild
+++ b/sys-apps/portage/portage-3.0.51.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-09-08 Thread Andreas K. Hüttel
commit: 7844750a4f0076dc1db0d4409a88d09246c73703
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Fri Sep  8 19:47:12 2023 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Fri Sep  8 19:47:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7844750a

sys-apps/portage: add getuto dependency

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 sys-apps/portage/portage-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index f57dedf5b41b..e2eb0936039f 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -70,6 +70,7 @@ RDEPEND="
>=sys-apps/findutils-4.4
!build? (
>=app-admin/eselect-1.2
+   app-portage/getuto
>=app-shells/bash-5.0:0
>=sec-keys/openpgp-keys-gentoo-release-20230329
>=sys-apps/sed-4.0.5



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

2023-08-20 Thread Sam James
commit: a6a68c0255b6d3132dd555b1519a035204bffde2
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 20 07:57:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 20 07:58:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6a68c02

sys-apps/portage: add 3.0.51

Bug: https://bugs.gentoo.org/587484
Closes: https://bugs.gentoo.org/673624
Closes: https://bugs.gentoo.org/691434
Closes: https://bugs.gentoo.org/835927
Closes: https://bugs.gentoo.org/909009
Closes: https://bugs.gentoo.org/911335
Closes: https://bugs.gentoo.org/911629
Closes: https://bugs.gentoo.org/911938
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-3.0.51.ebuild | 234 +
 2 files changed, 235 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ca29b2603a38..d48e814e976b 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,3 +2,4 @@ DIST portage-3.0.45.3.tar.bz2 1146552 BLAKE2B 
0506124bf47d71df699c2ecb2846b19f68
 DIST portage-3.0.46.tar.bz2 1148375 BLAKE2B 
d97698eb3341a8d04980e021e5be8650193baf60c1ba34c11ccc79c147a256f152cb5c3a455798f38ee93164666dba31d3f510837c2924c1190f657fe1019b77
 SHA512 
0aa43d58cb23ff5931d31b2ebf724b0f9cb163d7e452c120f2917b9a1fac1cad7930c28dd40e6482a3f4e66ff05e1340e7135aa9d0eca60182c04f573c094afb
 DIST portage-3.0.49.tar.bz2 1152449 BLAKE2B 
a47f951a35828ba9c8fc88c2eab5222c98ed20240c736c366d8f2e4f4aef773a140bf0e150448cc3796a7adb7471ce006aae4de1816bbbaae6dd83dcf28f52b0
 SHA512 
f07950d10c01bda0915aa30c5c0b6ce2864754fe7dea38b5341336cd7665dcabfdc219969f1a3d2803db59bc23fc4284bc96b4087a596cb27a5d9eb075735469
 DIST portage-3.0.50.tar.bz2 1153508 BLAKE2B 
b90d93f8922acdb5486a52c1354c6c9829fac608971078a641b604b57240065eec4e82cc9cb2fb8b4ba485a7f2d52473c0a90295b29eb578638ad11cd3cf2943
 SHA512 
355841af862077f9203d6f8cbe904f4966516597444f38ef535fc06d0fe5c21d9c1da139a44407fdd69b56eb9c49c286187d856ef4e9b9bc6b21bab5b772a88f
+DIST portage-3.0.51.tar.bz2 1155503 BLAKE2B 
1095ab616993951da8f4d43cef4cf815672c67cb48ea2fe5aeb6b7c629058bfab1557d2b9508f2e3e9f38676733b5d60ec6a3686bc57840065c428508769cb1c
 SHA512 
bf237819173bed9df3b63ada067a2a99700618d88fd4b528146c56bdd592f2452003db6cc6da4a445b647eb4d8bb591260ea0d2a5627ad540526a2e802025836

diff --git a/sys-apps/portage/portage-3.0.51.ebuild 
b/sys-apps/portage/portage-3.0.51.ebuild
new file mode 100644
index ..f57dedf5b41b
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.51.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info multiprocessing python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="
+   https://anongit.gentoo.org/git/proj/portage.git
+   https://github.com/gentoo/portage.git
+   "
+   inherit git-r3
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+BDEPEND="
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   ' python3_12)
+   test? (
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   dev-vcs/git
+   )
+"
+DEPEND="
+   ${PYTHON_DEPS}
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   >=sys-apps/sed-4.0.5
+   sys-devel/patch
+   !build? ( $(python_gen_impl_dep 'ssl(+)') )
+   apidoc? (
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+   )
+   doc? (
+   ~app-text/docbook-xml-dtd-4.4
+   app-text/xmlto
+   )
+"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+RDEPEND="
+   ${PYTHON_DEPS}
+   acct-user/portage
+   >=app-arch/tar-1.27
+   app-arch/zstd
+   >=app-misc/pax-utils-0.1.17
+   dev-lang/python-exec:2
+   >=sys-apps/baselayout-2.9
+   >=sys-apps/findutils-4.4
+   !build? (
+   >=app-admin/eselect-1.2
+   >=app-shells/bash-5.0:0
+   >=sec-keys/openpgp-keys-gentoo-release-20230329
+   >=sys-apps/sed-4.0.5
+   rsync-verify? (
+   

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

2023-08-19 Thread Sam James
commit: 6fbee2ca3ca5c45ceed3aba6d396b08d111c6775
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 19 20:20:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 19 20:20:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fbee2ca

sys-apps/portage: drop 3.0.44-r1, 3.0.47-r1, 3.0.48.1-r2, 3.0.49-r1

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

 sys-apps/portage/Manifest   |   3 -
 sys-apps/portage/portage-3.0.44-r1.ebuild   | 290 ---
 sys-apps/portage/portage-3.0.47-r1.ebuild   | 296 ---
 sys-apps/portage/portage-3.0.48.1-r2.ebuild | 301 
 sys-apps/portage/portage-3.0.49-r1.ebuild   | 301 
 5 files changed, 1191 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 77e8d2fbd6a3..ca29b2603a38 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,7 +1,4 @@
-DIST portage-3.0.44.tar.bz2 1140911 BLAKE2B 
06f584e6e37bbb309b9bb0e29ba4381eadd4ae6246aeb1045e3a5c5dcb33d74f74e74aa3f2325acbf37e16a535095c433f2796ed042f73cea5e208150e210cb0
 SHA512 
d40c95f3a31c5e2ae35374243c40c8d1f6b47b7c89f6a711a12d8744cb6848a85443298c0f947475b32acf52332e7f09b1e85915149ab8363930c0404f08410e
 DIST portage-3.0.45.3.tar.bz2 1146552 BLAKE2B 
0506124bf47d71df699c2ecb2846b19f68b39813409e141fe292e237093eeb4f3d6fb771f6328624e0182322f71f42e629c2c58a2c590efb8697fa61b03d73a4
 SHA512 
89757efb71127249356c7d4ea1a05de7409285abaf045b2c6b5ddd463bef997db497df6ea3a05085656eced49bee625732bfb2d0771b7592f883f8712e547415
 DIST portage-3.0.46.tar.bz2 1148375 BLAKE2B 
d97698eb3341a8d04980e021e5be8650193baf60c1ba34c11ccc79c147a256f152cb5c3a455798f38ee93164666dba31d3f510837c2924c1190f657fe1019b77
 SHA512 
0aa43d58cb23ff5931d31b2ebf724b0f9cb163d7e452c120f2917b9a1fac1cad7930c28dd40e6482a3f4e66ff05e1340e7135aa9d0eca60182c04f573c094afb
-DIST portage-3.0.47.tar.bz2 1148789 BLAKE2B 
268589c37a6bdc36377f3e407b16bebfb9876adc1d89ee7576f3ebbee42bc0799f5a225dfd53ffedeeded91ca4403383d4811b4f104448c1b2fc6c277ca94ef1
 SHA512 
abbd2446d0da0b5d298a235c2cc7d2d4e001e9f012b6e22149fed4514b52dc938b0377b2551f45e3505b9dddeedd7170951ff967310708ec3b93610b775a7c02
-DIST portage-3.0.48.1.tar.bz2 1150967 BLAKE2B 
ed8822306ef55a776163df3464f67cfe0942a0a2aa55c324921da106019f9f8f19db772d4bee75f49ef6f9b1823b95b2239ef4fe1457fc5c22956fc83419f9c5
 SHA512 
c20cd0557d885329910fade4d5a0b701bb411f179779d96b22c5dc4e1b504d4ed3dbfbd8c28157782a297d794ce3a0021f3c6aaedc7299f3df858294c14f7945
 DIST portage-3.0.49.tar.bz2 1152449 BLAKE2B 
a47f951a35828ba9c8fc88c2eab5222c98ed20240c736c366d8f2e4f4aef773a140bf0e150448cc3796a7adb7471ce006aae4de1816bbbaae6dd83dcf28f52b0
 SHA512 
f07950d10c01bda0915aa30c5c0b6ce2864754fe7dea38b5341336cd7665dcabfdc219969f1a3d2803db59bc23fc4284bc96b4087a596cb27a5d9eb075735469
 DIST portage-3.0.50.tar.bz2 1153508 BLAKE2B 
b90d93f8922acdb5486a52c1354c6c9829fac608971078a641b604b57240065eec4e82cc9cb2fb8b4ba485a7f2d52473c0a90295b29eb578638ad11cd3cf2943
 SHA512 
355841af862077f9203d6f8cbe904f4966516597444f38ef535fc06d0fe5c21d9c1da139a44407fdd69b56eb9c49c286187d856ef4e9b9bc6b21bab5b772a88f

diff --git a/sys-apps/portage/portage-3.0.44-r1.ebuild 
b/sys-apps/portage/portage-3.0.44-r1.ebuild
deleted file mode 100644
index 103f4824d441..
--- a/sys-apps/portage/portage-3.0.44-r1.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( pypy3 python3_{10..11} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
-SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   app-arch/xz-utils
-   test? ( dev-vcs/git )
-"
-DEPEND="
-   !build? ( $(python_gen_impl_dep 'ssl(+)') )
-   >=app-arch/tar-1.27
-   dev-lang/python-exec:2
-   >=sys-apps/sed-4.0.5 sys-devel/patch
-   doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-   apidoc? (
-   dev-python/sphinx[${PYTHON_USEDEP}]
-   dev-python/sphinx-epytext[${PYTHON_USEDEP}]
-   )
-"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-   acct-user/portage
-   app-arch/zstd
-   >=app-arch/tar-1.27
-   dev-lang/python-exec:2
-   

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

2023-08-19 Thread Sam James
commit: c0c32d814d2e63d0cfb05ac7127ab7697bc5f29d
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 19 20:18:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 19 20:19:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0c32d81

sys-apps/portage: sort deps

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

 sys-apps/portage/portage-3.0.50.ebuild | 16 
 sys-apps/portage/portage-.ebuild   | 16 
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/sys-apps/portage/portage-3.0.50.ebuild 
b/sys-apps/portage/portage-3.0.50.ebuild
index 752d29f03855..f57dedf5b41b 100644
--- a/sys-apps/portage/portage-3.0.50.ebuild
+++ b/sys-apps/portage/portage-3.0.50.ebuild
@@ -31,30 +31,30 @@ RESTRICT="!test? ( test )"
 
 # setuptools is still needed as a workaround for Python 3.12+ for now.
 # https://github.com/mesonbuild/meson/issues/7702
-
 BDEPEND="
${PYTHON_DEPS}
$(python_gen_cond_dep '
dev-python/setuptools[${PYTHON_USEDEP}]
' python3_12)
test? (
-   dev-vcs/git
dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   dev-vcs/git
)
 "
 DEPEND="
${PYTHON_DEPS}
>=app-arch/tar-1.27
dev-lang/python-exec:2
-   >=sys-apps/sed-4.0.5 sys-devel/patch
+   >=sys-apps/sed-4.0.5
+   sys-devel/patch
!build? ( $(python_gen_impl_dep 'ssl(+)') )
apidoc? (
dev-python/sphinx[${PYTHON_USEDEP}]
dev-python/sphinx-epytext[${PYTHON_USEDEP}]
)
doc? (
-   app-text/xmlto
~app-text/docbook-xml-dtd-4.4
+   app-text/xmlto
)
 "
 # Require sandbox-2.2 for bug #288863.
@@ -62,25 +62,25 @@ DEPEND="
 RDEPEND="
${PYTHON_DEPS}
acct-user/portage
-   app-arch/zstd
>=app-arch/tar-1.27
+   app-arch/zstd
+   >=app-misc/pax-utils-0.1.17
dev-lang/python-exec:2
>=sys-apps/baselayout-2.9
>=sys-apps/findutils-4.4
!build? (
>=app-admin/eselect-1.2
>=app-shells/bash-5.0:0
-   >=sys-apps/sed-4.0.5
>=sec-keys/openpgp-keys-gentoo-release-20230329
+   >=sys-apps/sed-4.0.5
rsync-verify? (
-   >=app-portage/gemato-14.5[${PYTHON_USEDEP}]
>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+   >=app-portage/gemato-14.5[${PYTHON_USEDEP}]
)
)
elibc_glibc? ( >=sys-apps/sandbox-2.2 )
elibc_musl? ( >=sys-apps/sandbox-2.2 )
kernel_linux? ( sys-apps/util-linux )
-   >=app-misc/pax-utils-0.1.17
selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
xattr? ( kernel_linux? (
>=sys-apps/install-xattr-0.3

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index 752d29f03855..f57dedf5b41b 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -31,30 +31,30 @@ RESTRICT="!test? ( test )"
 
 # setuptools is still needed as a workaround for Python 3.12+ for now.
 # https://github.com/mesonbuild/meson/issues/7702
-
 BDEPEND="
${PYTHON_DEPS}
$(python_gen_cond_dep '
dev-python/setuptools[${PYTHON_USEDEP}]
' python3_12)
test? (
-   dev-vcs/git
dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   dev-vcs/git
)
 "
 DEPEND="
${PYTHON_DEPS}
>=app-arch/tar-1.27
dev-lang/python-exec:2
-   >=sys-apps/sed-4.0.5 sys-devel/patch
+   >=sys-apps/sed-4.0.5
+   sys-devel/patch
!build? ( $(python_gen_impl_dep 'ssl(+)') )
apidoc? (
dev-python/sphinx[${PYTHON_USEDEP}]
dev-python/sphinx-epytext[${PYTHON_USEDEP}]
)
doc? (
-   app-text/xmlto
~app-text/docbook-xml-dtd-4.4
+   app-text/xmlto
)
 "
 # Require sandbox-2.2 for bug #288863.
@@ -62,25 +62,25 @@ DEPEND="
 RDEPEND="
${PYTHON_DEPS}
acct-user/portage
-   app-arch/zstd
>=app-arch/tar-1.27
+   app-arch/zstd
+   >=app-misc/pax-utils-0.1.17
dev-lang/python-exec:2
>=sys-apps/baselayout-2.9
>=sys-apps/findutils-4.4
!build? (
>=app-admin/eselect-1.2
>=app-shells/bash-5.0:0
-   >=sys-apps/sed-4.0.5
>=sec-keys/openpgp-keys-gentoo-release-20230329
+   >=sys-apps/sed-4.0.5
rsync-verify? (
-   >=app-portage/gemato-14.5[${PYTHON_USEDEP}]
>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+   >=app-portage/gemato-14.5[${PYTHON_USEDEP}]
)
)
elibc_glibc? ( >=sys-apps/sandbox-2.2 )
elibc_musl? ( 

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

2023-08-19 Thread Sam James
commit: fe07031dfb04ac810a67a77a30e2452eb346cb61
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 19 16:39:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 19 16:39:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe07031d

sys-apps/portage: use xdist, epytest-style formatting

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

 sys-apps/portage/portage-3.0.50.ebuild | 9 +++--
 sys-apps/portage/portage-.ebuild   | 9 +++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/sys-apps/portage/portage-3.0.50.ebuild 
b/sys-apps/portage/portage-3.0.50.ebuild
index ec4db2e48278..752d29f03855 100644
--- a/sys-apps/portage/portage-3.0.50.ebuild
+++ b/sys-apps/portage/portage-3.0.50.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( pypy3 python3_{10..12} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 TMPFILES_OPTIONAL=1
 
-inherit meson linux-info python-r1 tmpfiles
+inherit meson linux-info multiprocessing python-r1 tmpfiles
 
 DESCRIPTION="The package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
@@ -37,7 +37,10 @@ BDEPEND="
$(python_gen_cond_dep '
dev-python/setuptools[${PYTHON_USEDEP}]
' python3_12)
-   test? ( dev-vcs/git )
+   test? (
+   dev-vcs/git
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   )
 "
 DEPEND="
${PYTHON_DEPS}
@@ -153,6 +156,8 @@ src_compile() {
 }
 
 src_test() {
+   local -x PYTEST_ADDOPTS="-vv -ra -l -o console_output_style=count -n 
$(makeopts_jobs) --dist=worksteal"
+
python_foreach_impl meson_src_test --no-rebuild --verbose
 }
 

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index ec4db2e48278..752d29f03855 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( pypy3 python3_{10..12} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 TMPFILES_OPTIONAL=1
 
-inherit meson linux-info python-r1 tmpfiles
+inherit meson linux-info multiprocessing python-r1 tmpfiles
 
 DESCRIPTION="The package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
@@ -37,7 +37,10 @@ BDEPEND="
$(python_gen_cond_dep '
dev-python/setuptools[${PYTHON_USEDEP}]
' python3_12)
-   test? ( dev-vcs/git )
+   test? (
+   dev-vcs/git
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   )
 "
 DEPEND="
${PYTHON_DEPS}
@@ -153,6 +156,8 @@ src_compile() {
 }
 
 src_test() {
+   local -x PYTEST_ADDOPTS="-vv -ra -l -o console_output_style=count -n 
$(makeopts_jobs) --dist=worksteal"
+
python_foreach_impl meson_src_test --no-rebuild --verbose
 }
 



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

2023-08-19 Thread Sam James
commit: 09baaec9f73131fa0965350e1389c779ded997a5
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 19 16:00:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 19 16:39:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09baaec9

sys-apps/portage: shift phases to match execution order

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

 sys-apps/portage/portage-3.0.50.ebuild | 8 
 sys-apps/portage/portage-.ebuild   | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys-apps/portage/portage-3.0.50.ebuild 
b/sys-apps/portage/portage-3.0.50.ebuild
index 08cbf145abb2..ec4db2e48278 100644
--- a/sys-apps/portage/portage-3.0.50.ebuild
+++ b/sys-apps/portage/portage-3.0.50.ebuild
@@ -152,6 +152,10 @@ src_compile() {
python_foreach_impl meson_src_compile
 }
 
+src_test() {
+   python_foreach_impl meson_src_test --no-rebuild --verbose
+}
+
 src_install() {
python_foreach_impl my_src_install
dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
@@ -172,10 +176,6 @@ my_src_install() {
python_fix_shebang "${pydirs[@]}"
 }
 
-src_test() {
-   python_foreach_impl meson_src_test --no-rebuild --verbose
-}
-
 pkg_preinst() {
if ! use build && [[ -z ${ROOT} ]]; then
python_setup

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index 08cbf145abb2..ec4db2e48278 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -152,6 +152,10 @@ src_compile() {
python_foreach_impl meson_src_compile
 }
 
+src_test() {
+   python_foreach_impl meson_src_test --no-rebuild --verbose
+}
+
 src_install() {
python_foreach_impl my_src_install
dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
@@ -172,10 +176,6 @@ my_src_install() {
python_fix_shebang "${pydirs[@]}"
 }
 
-src_test() {
-   python_foreach_impl meson_src_test --no-rebuild --verbose
-}
-
 pkg_preinst() {
if ! use build && [[ -z ${ROOT} ]]; then
python_setup



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

2023-08-15 Thread James Le Cuirot
commit: c726594cfd5326e6282a322098be5d3660cb9d11
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Aug 15 21:40:04 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Aug 15 21:40:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c726594c

sys-apps/portage: Don't run _compat_upgrade when ROOT!=/

Even if you point to the right config directory with PORTAGE_CONFIGROOT, these
still load the default config files from /usr/share/portage rather than
${ROOT}/usr/share/portage and therefore do the wrong thing.

portage._compat_upgrade.default_locations also cannot tell what ROOT's
directories will look like later, so we should not take action based on these.

Signed-off-by: James Le Cuirot  gentoo.org>

 sys-apps/portage/portage-3.0.50.ebuild | 2 +-
 sys-apps/portage/portage-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/portage-3.0.50.ebuild 
b/sys-apps/portage/portage-3.0.50.ebuild
index 91d945df8187..08cbf145abb2 100644
--- a/sys-apps/portage/portage-3.0.50.ebuild
+++ b/sys-apps/portage/portage-3.0.50.ebuild
@@ -177,7 +177,7 @@ src_test() {
 }
 
 pkg_preinst() {
-   if ! use build; then
+   if ! use build && [[ -z ${ROOT} ]]; then
python_setup
local sitedir=$(python_get_sitedir)
[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such 
directory"

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index 91d945df8187..08cbf145abb2 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -177,7 +177,7 @@ src_test() {
 }
 
 pkg_preinst() {
-   if ! use build; then
+   if ! use build && [[ -z ${ROOT} ]]; then
python_setup
local sitedir=$(python_get_sitedir)
[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such 
directory"



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

2023-08-14 Thread Sam James
commit: dd3ca3679a1cf9a775458d22dcb2bb03df82a730
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 15 03:17:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 15 03:17:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd3ca367

sys-apps/portage: Stabilize 3.0.49-r2 ppc, #91

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

 sys-apps/portage/portage-3.0.49-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.49-r2.ebuild 
b/sys-apps/portage/portage-3.0.49-r2.ebuild
index ce4283fbae05..408f1b8f0a3b 100644
--- a/sys-apps/portage/portage-3.0.49-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.49-r2.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-08-13 Thread Arthur Zamarin
commit: eda3d368447236aec9c6d6aae6ce853b6b7218d7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 13 15:36:24 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 13 15:36:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eda3d368

sys-apps/portage: Stabilize 3.0.49-r2 ppc64, #91

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.49-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.49-r2.ebuild 
b/sys-apps/portage/portage-3.0.49-r2.ebuild
index b38c4c871588..ce4283fbae05 100644
--- a/sys-apps/portage/portage-3.0.49-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.49-r2.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-08-13 Thread Arthur Zamarin
commit: 2dcc141727d749c2476ddb31c8867cb8e1060a4a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 13 15:34:14 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 13 15:34:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dcc1417

sys-apps/portage: Stabilize 3.0.49-r2 x86, #91

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.49-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.49-r2.ebuild 
b/sys-apps/portage/portage-3.0.49-r2.ebuild
index ad0f105462c4..a36ecd2b32b9 100644
--- a/sys-apps/portage/portage-3.0.49-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.49-r2.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-08-13 Thread Arthur Zamarin
commit: 4724fc6bfc3a67a3c11bb30efc592b0c75bdb468
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 13 15:34:17 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 13 15:34:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4724fc6b

sys-apps/portage: Stabilize 3.0.49-r2 hppa, #91

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.49-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.49-r2.ebuild 
b/sys-apps/portage/portage-3.0.49-r2.ebuild
index a36ecd2b32b9..b38c4c871588 100644
--- a/sys-apps/portage/portage-3.0.49-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.49-r2.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-08-13 Thread Arthur Zamarin
commit: 94708d5b8036b10f9221c0fc5e7ca602ec44d18d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 13 15:34:08 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 13 15:34:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94708d5b

sys-apps/portage: Stabilize 3.0.49-r2 amd64, #91

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.49-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.49-r2.ebuild 
b/sys-apps/portage/portage-3.0.49-r2.ebuild
index d76d11b53b36..ad0f105462c4 100644
--- a/sys-apps/portage/portage-3.0.49-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.49-r2.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-08-13 Thread Arthur Zamarin
commit: 9fd0613fa669b454bd4b0fa136430132716e1284
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 13 15:33:12 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 13 15:33:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fd0613f

sys-apps/portage: Stabilize 3.0.49-r2 arm64, #91

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.49-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.49-r2.ebuild 
b/sys-apps/portage/portage-3.0.49-r2.ebuild
index bfea826b7585..243499a3e3ef 100644
--- a/sys-apps/portage/portage-3.0.49-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.49-r2.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-08-13 Thread Arthur Zamarin
commit: 069a60ce338a7ff136a452e0f8df4478f8469429
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 13 15:33:13 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 13 15:33:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=069a60ce

sys-apps/portage: Stabilize 3.0.49-r2 sparc, #91

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.49-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.49-r2.ebuild 
b/sys-apps/portage/portage-3.0.49-r2.ebuild
index 9b2f3229b8ed..d76d11b53b36 100644
--- a/sys-apps/portage/portage-3.0.49-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.49-r2.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-08-13 Thread Arthur Zamarin
commit: d5c622a7246e9a08d3c905c5dc8aaea50c2eb2dd
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 13 15:33:13 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 13 15:33:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5c622a7

sys-apps/portage: Stabilize 3.0.49-r2 arm, #91

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/portage/portage-3.0.49-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.49-r2.ebuild 
b/sys-apps/portage/portage-3.0.49-r2.ebuild
index 243499a3e3ef..9b2f3229b8ed 100644
--- a/sys-apps/portage/portage-3.0.49-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.49-r2.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else

SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-08-09 Thread James Le Cuirot
commit: ec78431e571874c6b292dd42b9895e28e07399ce
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Aug  9 17:05:41 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Aug  9 17:05:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec78431e

sys-apps/portage: Fix unprefixed Portage lib path in src_install

Closes: https://bugs.gentoo.org/911966
Signed-off-by: James Le Cuirot  gentoo.org>

 sys-apps/portage/portage-3.0.50.ebuild | 2 +-
 sys-apps/portage/portage-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/portage-3.0.50.ebuild 
b/sys-apps/portage/portage-3.0.50.ebuild
index 23a08b5ce03e..91d945df8187 100644
--- a/sys-apps/portage/portage-3.0.50.ebuild
+++ b/sys-apps/portage/portage-3.0.50.ebuild
@@ -164,7 +164,7 @@ src_install() {
 my_src_install() {
local pydirs=(
"${D}$(python_get_sitedir)"
-   "${D}/usr/lib/portage/${EPYTHON}"
+   "${ED}/usr/lib/portage/${EPYTHON}"
)
 
meson_src_install

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index 23a08b5ce03e..91d945df8187 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -164,7 +164,7 @@ src_install() {
 my_src_install() {
local pydirs=(
"${D}$(python_get_sitedir)"
-   "${D}/usr/lib/portage/${EPYTHON}"
+   "${ED}/usr/lib/portage/${EPYTHON}"
)
 
meson_src_install



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

2023-08-08 Thread Sam James
commit: 858dfd771ac4c6c9315ac5851f4aeeb233fc21d5
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug  9 02:54:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  9 02:54:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=858dfd77

sys-apps/portage: add 3.0.50

Closes: https://bugs.gentoo.org/908971
Closes: https://bugs.gentoo.org/640658
Closes: https://bugs.gentoo.org/894398
Closes: https://bugs.gentoo.org/895908
Closes: https://bugs.gentoo.org/909067
Closes: https://bugs.gentoo.org/909148
Closes: https://bugs.gentoo.org/909853
Closes: https://bugs.gentoo.org/910035
Closes: https://bugs.gentoo.org/910376
Closes: https://bugs.gentoo.org/911594
Closes: https://bugs.gentoo.org/911574
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-3.0.50.ebuild | 229 +
 2 files changed, 230 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b29682a81d71..77e8d2fbd6a3 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -4,3 +4,4 @@ DIST portage-3.0.46.tar.bz2 1148375 BLAKE2B 
d97698eb3341a8d04980e021e5be8650193b
 DIST portage-3.0.47.tar.bz2 1148789 BLAKE2B 
268589c37a6bdc36377f3e407b16bebfb9876adc1d89ee7576f3ebbee42bc0799f5a225dfd53ffedeeded91ca4403383d4811b4f104448c1b2fc6c277ca94ef1
 SHA512 
abbd2446d0da0b5d298a235c2cc7d2d4e001e9f012b6e22149fed4514b52dc938b0377b2551f45e3505b9dddeedd7170951ff967310708ec3b93610b775a7c02
 DIST portage-3.0.48.1.tar.bz2 1150967 BLAKE2B 
ed8822306ef55a776163df3464f67cfe0942a0a2aa55c324921da106019f9f8f19db772d4bee75f49ef6f9b1823b95b2239ef4fe1457fc5c22956fc83419f9c5
 SHA512 
c20cd0557d885329910fade4d5a0b701bb411f179779d96b22c5dc4e1b504d4ed3dbfbd8c28157782a297d794ce3a0021f3c6aaedc7299f3df858294c14f7945
 DIST portage-3.0.49.tar.bz2 1152449 BLAKE2B 
a47f951a35828ba9c8fc88c2eab5222c98ed20240c736c366d8f2e4f4aef773a140bf0e150448cc3796a7adb7471ce006aae4de1816bbbaae6dd83dcf28f52b0
 SHA512 
f07950d10c01bda0915aa30c5c0b6ce2864754fe7dea38b5341336cd7665dcabfdc219969f1a3d2803db59bc23fc4284bc96b4087a596cb27a5d9eb075735469
+DIST portage-3.0.50.tar.bz2 1153508 BLAKE2B 
b90d93f8922acdb5486a52c1354c6c9829fac608971078a641b604b57240065eec4e82cc9cb2fb8b4ba485a7f2d52473c0a90295b29eb578638ad11cd3cf2943
 SHA512 
355841af862077f9203d6f8cbe904f4966516597444f38ef535fc06d0fe5c21d9c1da139a44407fdd69b56eb9c49c286187d856ef4e9b9bc6b21bab5b772a88f

diff --git a/sys-apps/portage/portage-3.0.50.ebuild 
b/sys-apps/portage/portage-3.0.50.ebuild
new file mode 100644
index ..23a08b5ce03e
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.50.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="
+   https://anongit.gentoo.org/git/proj/portage.git
+   https://github.com/gentoo/portage.git
+   "
+   inherit git-r3
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+
+BDEPEND="
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   ' python3_12)
+   test? ( dev-vcs/git )
+"
+DEPEND="
+   ${PYTHON_DEPS}
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   >=sys-apps/sed-4.0.5 sys-devel/patch
+   !build? ( $(python_gen_impl_dep 'ssl(+)') )
+   apidoc? (
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+   )
+   doc? (
+   app-text/xmlto
+   ~app-text/docbook-xml-dtd-4.4
+   )
+"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+RDEPEND="
+   ${PYTHON_DEPS}
+   acct-user/portage
+   app-arch/zstd
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   >=sys-apps/baselayout-2.9
+   >=sys-apps/findutils-4.4
+   !build? (
+   >=app-admin/eselect-1.2
+   >=app-shells/bash-5.0:0
+   >=sys-apps/sed-4.0.5
+   >=sec-keys/openpgp-keys-gentoo-release-20230329
+   rsync-verify? (
+ 

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

2023-08-07 Thread Sam James
commit: 8ffed1deeb1755818d886e0a2121548421792530
Author: Alfred Wingate  protonmail  com>
AuthorDate: Mon Aug  7 08:09:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug  8 04:58:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ffed1de

sys-apps/portage: disable native-extensions for pypy3

Disable native-extensions for pypy3 as they're slow and just a compatibility
layer for cpython extensions in pypy.

[sam: Note that Portage has pure Python fallbacks for almost everything,
except for what Zac points out: "One exception is that the check_locale function
just returns None when the extension is disabled, which prevents a possible
warning when the LC_CTYPE locale is not posixish."]

Signed-off-by: Alfred Wingate  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/portage-.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index 6bb5c1c1d398..23a08b5ce03e 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -127,12 +127,17 @@ my_src_configure() {
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
$(meson_use doc)
$(meson_use apidoc)
-   $(meson_use native-extensions)
$(meson_use gentoo-dev)
$(meson_use ipc)
$(meson_use xattr)
)
 
+   if use native-extensions && [[ "${EPYTHON}" != "pypy3" ]] ; then
+   emesonargs+=( -Dnative-extensions=true )
+   else
+   emesonargs+=( -Dnative-extensions=false )
+   fi
+
if use build; then
emesonargs+=( -Drsync-verify=false )
else



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

2023-08-02 Thread Sam James
commit: fc2ef6fc888746f48a15c17962e3ff848b4f8e48
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug  2 06:49:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  2 06:49:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc2ef6fc

sys-apps/portage: use python_gen_cond_dep

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

 sys-apps/portage/portage-.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index 1db60a413dba..6bb5c1c1d398 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -34,7 +34,9 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
${PYTHON_DEPS}
-   python_targets_python3_12? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+   $(python_gen_cond_dep '
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   ' python3_12)
test? ( dev-vcs/git )
 "
 DEPEND="



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

2023-08-02 Thread Sam James
commit: be37f979f5f838c8a4039aaba379a3e373af0b6f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jul 29 16:00:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  2 06:39:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be37f979

sys-apps/portage: Migrate  to use Meson

Bug: https://bugs.gentoo.org/910035
Signed-off-by: James Le Cuirot  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/32098
Signed-off-by: Sam James  gentoo.org>

 sys-apps/portage/portage-.ebuild | 187 +++
 1 file changed, 58 insertions(+), 129 deletions(-)

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index a322e5529936..1db60a413dba 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -3,13 +3,11 @@
 
 EAPI=7
 
-DISTUTILS_EXT=1
 PYTHON_COMPAT=( pypy3 python3_{10..12} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
-SETUPTOOLS_USE_DISTUTILS=local
 TMPFILES_OPTIONAL=1
 
-inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
+inherit meson linux-info python-r1 tmpfiles
 
 DESCRIPTION="The package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
@@ -28,13 +26,19 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+
 BDEPEND="
-   dev-python/setuptools[${PYTHON_USEDEP}]
+   ${PYTHON_DEPS}
+   python_targets_python3_12? ( dev-python/setuptools[${PYTHON_USEDEP}] )
test? ( dev-vcs/git )
 "
 DEPEND="
+   ${PYTHON_DEPS}
>=app-arch/tar-1.27
dev-lang/python-exec:2
>=sys-apps/sed-4.0.5 sys-devel/patch
@@ -51,6 +55,7 @@ DEPEND="
 # Require sandbox-2.2 for bug #288863.
 # For whirlpool hash, require python[ssl] (bug #425046).
 RDEPEND="
+   ${PYTHON_DEPS}
acct-user/portage
app-arch/zstd
>=app-arch/tar-1.27
@@ -90,154 +95,78 @@ PDEPEND="
)
 "
 
-distutils_enable_tests pytest
-
 pkg_pretend() {
local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
 
-   if use native-extensions && tc-is-cross-compiler; then
-   einfo "Disabling USE=native-extensions for cross-compilation 
(bug #612158)"
-   fi
-
check_extra_config
 }
 
-python_prepare_all() {
-   distutils-r1_python_prepare_all
-
-   if [[ ${PV} !=  ]] ; then
-   sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i 
lib/portage/__init__.py || die
-   fi
-
-   if use gentoo-dev; then
-   einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-   sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-   -i lib/_emerge/create_depgraph_params.py || \
-   die "failed to patch create_depgraph_params.py"
-
-   einfo "Enabling additional FEATURES for gentoo-dev..."
-   echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox 
strict-keepdir warn-on-large-env"' \
-   >> cnf/make.globals || die
-   fi
+src_prepare() {
+   default
 
-   if use native-extensions && ! tc-is-cross-compiler; then
-   printf "[build_ext]\nportage_ext_modules=true\n" >> \
-   setup.cfg || die
-   fi
-
-   if ! use ipc ; then
-   einfo "Disabling ipc..."
-   sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = 
False:" \
-   -i lib/_emerge/AbstractEbuildProcess.py || \
-   die "failed to patch AbstractEbuildProcess.py"
-   fi
-
-   if use xattr && use kernel_linux ; then
-   einfo "Adding FEATURES=xattr to make.globals ..."
-   echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-   || die "failed to append to make.globals"
-   fi
-
-   if use build || ! use rsync-verify; then
-   sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-   -e '/^sync-webrsync-verify-signature/s|yes|no|' \
+   if use prefix-guest; then
+   sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+   -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+   -e "s|^\(sync-uri = 
\).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-i cnf/repos.conf || die "sed failed"
fi
+}
 
-   if [[ -n ${EPREFIX} ]] ; then
-   einfo "Setting portage.const.EPREFIX ..."
-   hprefixify -e 
"s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-   -w "/_BINARY/" lib/portage/const.py
-
-   einfo "Prefixing shebangs ..."
-   > 

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

2023-07-30 Thread Sam James
commit: 477f52c4394e89e894be8665d1fcfd263a3c9f06
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 30 13:10:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 30 13:10:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=477f52c4

sys-apps/portage: backport prefix init script shebang fix

Bug: https://bugs.gentoo.org/640658
Signed-off-by: Sam James  gentoo.org>

 ...age-3.0.49-prefixify-init-script-shebangs.patch |  29 ++
 sys-apps/portage/portage-3.0.49-r2.ebuild  | 303 +
 2 files changed, 332 insertions(+)

diff --git 
a/sys-apps/portage/files/portage-3.0.49-prefixify-init-script-shebangs.patch 
b/sys-apps/portage/files/portage-3.0.49-prefixify-init-script-shebangs.patch
new file mode 100644
index ..d4d050c1741c
--- /dev/null
+++ b/sys-apps/portage/files/portage-3.0.49-prefixify-init-script-shebangs.patch
@@ -0,0 +1,29 @@
+https://gitweb.gentoo.org/proj/portage.git/commit/?id=6066bb766f43ca06a5b0f08baa5946ff678f0c29
+
+From 6066bb766f43ca06a5b0f08baa5946ff678f0c29 Mon Sep 17 00:00:00 2001
+From: Benda Xu 
+Date: Sun, 25 Jun 2023 17:03:00 +0800
+Subject: bin/install-qa-check.d/05prefix: prefixify init-script shebangs.
+
+Init scripts in /etc/init.d have OpenRC shebangs "#!/sbin/openrc-run".
+They should be prefixified like a executable script in a Prefix.
+
+Signed-off-by: Benda Xu 
+Bug: https://bugs.gentoo.org/640658
+Closes: https://github.com/gentoo/portage/pull/1061
+Signed-off-by: Sam James 
+--- a/bin/install-qa-check.d/05prefix
 b/bin/install-qa-check.d/05prefix
+@@ -76,8 +76,8 @@ install_qa_check_prefix() {
+   fi
+   continue
+   fi
+-  # unprefixed shebang, is the script directly in ${PATH}?
+-  if [[ ":${PATH}:" == *":${fp}:"* ]] ; then
++  # unprefixed shebang, is the script directly in ${PATH} or an 
init script?
++  if [[ ":${PATH}:${EPREFIX}/etc/init.d:" == *":${fp}:"* ]] ; then
+   if [[ -e ${EROOT}${line[0]} || -e ${ED}${line[0]} ]] ; 
then
+   # is it unprefixed, but we can just fix it 
because a
+   # prefixed variant exists
+-- 
+cgit v1.2.3-18-g5258

diff --git a/sys-apps/portage/portage-3.0.49-r2.ebuild 
b/sys-apps/portage/portage-3.0.49-r2.ebuild
new file mode 100644
index ..bfea826b7585
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.49-r2.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+SETUPTOOLS_USE_DISTUTILS=local
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="
+   https://anongit.gentoo.org/git/proj/portage.git
+   https://github.com/gentoo/portage.git
+   "
+   inherit git-r3
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   test? ( dev-vcs/git )
+"
+DEPEND="
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   >=sys-apps/sed-4.0.5 sys-devel/patch
+   !build? ( $(python_gen_impl_dep 'ssl(+)') )
+   apidoc? (
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+   )
+   doc? (
+   app-text/xmlto
+   ~app-text/docbook-xml-dtd-4.4
+   )
+"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+   acct-user/portage
+   app-arch/zstd
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   >=sys-apps/baselayout-2.9
+   >=sys-apps/findutils-4.4
+   !build? (
+   >=app-admin/eselect-1.2
+   >=app-shells/bash-5.0:0[readline]
+   >=sys-apps/sed-4.0.5
+   >=sec-keys/openpgp-keys-gentoo-release-20230329
+   rsync-verify? (
+   >=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+   >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+   )
+   )
+   elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+   elibc_musl? ( >=sys-apps/sandbox-2.2 )
+   kernel_linux? ( 

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

2023-07-19 Thread Sam James
commit: c23e354f4b39e06608177bcd5e3fe051ed6c100c
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 19 20:11:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 19 20:18:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c23e354f

sys-apps/portage: drop outdated gemato comment

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

 sys-apps/portage/portage-.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index d8eb0c8817c0..a322e5529936 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -50,8 +50,6 @@ DEPEND="
 "
 # Require sandbox-2.2 for bug #288863.
 # For whirlpool hash, require python[ssl] (bug #425046).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
 RDEPEND="
acct-user/portage
app-arch/zstd



  1   2   3   4   5   6   7   8   9   10   >