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

2026-01-02 Thread Fabian Groffen
commit: bb856890e4dab05a1f0df0f00423531fc08a23f4
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Jan  2 10:22:32 2026 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Jan  2 10:22:32 2026 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bb856890

sys-apps/portage-3.0.74: version bump

Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   3 +-
 ...portage-3.0.63.ebuild => portage-3.0.74.ebuild} | 104 +++--
 2 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 0cbd4235ce..0d991dd607 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,3 @@
-DIST prefix-portage-3.0.62.tar.bz2 1540010 BLAKE2B 
5228459672b9928881fcce58b01c30af4974cf56c5227f6b9a83ae14579821a65b5914a2c538ce3a2e6805a2abde226fb4a9c6b8fb4c8035a5b8a931e813e5b9
 SHA512 
07bb343c243ada777dd606318b49fb76b436c189d02f086ce069d6a1dbb4ce9fe5539b26c8bb0bb223ea981acaa92397ec43b21a669a8fcea89b4f4fc94d0b1d
-DIST prefix-portage-3.0.63.tar.bz2 1501121 BLAKE2B 
4d9ec570e958dca53b8adf7057d2f2b88083bfd7570b75594d54513e7bb3a4641b7d1f4b87689a863e092215f764f8609d53bc8becdbdb91108b9801a8ccc1ca
 SHA512 
df63d040d91912d81dbc15373618e6b2c043641bd93afd035c373c38d2616d3dcc87591e45eceeed17095ccddef90502684460e20f73ee451aa65bdac761
 DIST prefix-portage-3.0.72.tar.bz2 1533963 BLAKE2B 
3e97a868841819d3ac96efdb16fc1e09f3d25c3640971e9844fe34b677c162d0afcd4d8f8cfb51a047b161154153804414cb9eba38fd9b1a31750a99c7da6c5b
 SHA512 
50b145d4c6f10c3b0d00fa9b0bbf8cbb1fb6e6a1b33bfbf2df498de287aa76da477302b27b997f6c23aefe6a7f154539fb47c9a25b1e86a71d7b8e22bb973d6d
 DIST prefix-portage-3.0.73.tar.bz2 1546048 BLAKE2B 
990a442ce67c669a55cec73817dedf83fd420ac582bc1572609341545217be06a12192f7b48ce112a62a3093c8a27a521c73df3e9d2e51be95bd5e3accab1052
 SHA512 
9173d0fe8112ee52b4893550adf07896a5b1d2848736b78a769df08e8cf093d94e3f4a7cc76f2b8b1b32a671f03be3422797c9a2267977db271e0225a8aa16bd
+DIST prefix-portage-3.0.74.tar.bz2 1535061 BLAKE2B 
662008ba8bd4f1d837d9380c4a509463b323061d3f6c6dc0bf068535f4af6ba141ec60255aee1f60241bcf719cc056402ca3fdfc1d9f8f4048ad0e040d963262
 SHA512 
27ff3180e98452996b6a02f9b700ffa696e8e95125333dd2540ff50f305b725e12638b8432a4b98ff3bf6fb4be4540a48a5af02973cf5ec32871191bc72daf84

diff --git a/sys-apps/portage/portage-3.0.63.ebuild 
b/sys-apps/portage/portage-3.0.74.ebuild
similarity index 78%
rename from sys-apps/portage/portage-3.0.63.ebuild
rename to sys-apps/portage/portage-3.0.74.ebuild
index feab3a566f..963e3c03f2 100644
--- a/sys-apps/portage/portage-3.0.63.ebuild
+++ b/sys-apps/portage/portage-3.0.74.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( pypy3 python3_{10..13} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
@@ -74,7 +74,7 @@ RDEPEND="
!build? (
>=app-admin/eselect-1.2
!prefix? ( app-portage/getuto )
-   >=app-shells/bash-5.0:0
+   >=app-shells/bash-5.3:0
>=sec-keys/openpgp-keys-gentoo-release-20230329
>=sys-apps/sed-4.0.5
rsync-verify? (
@@ -125,55 +125,15 @@ src_prepare() {
-e "s|^\(sync-uri = 
\).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-i cnf/repos.conf || die "sed failed"
 
-   # PREFIX LOCAL: only hack const_autotool
-   # ok, we can't rely on PORTAGE_ROOT_USER being there yet, as 
people
-   # tend not to update that often, as long as we are a separate 
ebuild
-   # we can assume when unset, it's time for some older trick
-   if [[ -z ${PORTAGE_ROOT_USER} ]] ; then
-   PORTAGE_ROOT_USER=$(python -c 'from portage.const 
import rootuser; print rootuser')
-   fi
-   # We need to probe for bash in the Prefix, because it may not
-   # exist, in which case we fall back to the currently in use
-   # bash.  This logic is necessary in particular during bootstrap,
-   # where we pull ourselves out of a temporary place with tools
-   local bash="${EPREFIX}/bin/bash"
-   [[ ! -x ${bash} ]] && bash=${BASH}
-
-   einfo "Adjusting sources for ${EPREFIX}"
-   sed -e "s|@PORTAGE_EPREFIX@|${EPREFIX}|" \
-   -e "s|@PORTAGE_MV@|$(type -P mv)|" \
-   -e "s|@PORTAGE_BASH@|${bash}|" \
-   -e "s|@portagegroup@|${PORTAGE_GROUP:-portage}|" \
-   -e "s|@portageuser@|${PORTAGE_USER:-portage}|" \
-   -e "s|@rootuser@|${PORTAGE_ROOT_USER:-root}|" \
-   -e "s|@rootuid@|$(id -u ${PORTAGE_ROOT_USER:-root})|" \
-   -e "s|@rootgid

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

2025-12-17 Thread Fabian Groffen
commit: 0a8e42cac8243c8a89bcf10887535da616b6b480
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Dec 18 07:50:25 2025 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Dec 18 07:50:25 2025 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0a8e42ca

app-portage/portage-2.0.73: EAPI 9 requires bash 5.3

Signed-off-by: Fabian Groffen  gentoo.org>

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

diff --git a/sys-apps/portage/portage-3.0.73.ebuild 
b/sys-apps/portage/portage-3.0.73.ebuild
index f29a01d676..39b8130988 100644
--- a/sys-apps/portage/portage-3.0.73.ebuild
+++ b/sys-apps/portage/portage-3.0.73.ebuild
@@ -74,7 +74,7 @@ RDEPEND="
!build? (
>=app-admin/eselect-1.2
!prefix? ( app-portage/getuto )
-   >=app-shells/bash-5.0:0
+   >=app-shells/bash-5.3:0
>=sec-keys/openpgp-keys-gentoo-release-20230329
>=sys-apps/sed-4.0.5
rsync-verify? (



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

2025-12-16 Thread Fabian Groffen
commit: 429889525e2179b69aef6d728003c0ebc54a5d28
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Dec 16 19:21:37 2025 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Dec 16 19:21:37 2025 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=42988952

sys-apps/portage-3.0.73: version bump

This version migrates user settings from make.globals to make.conf, it
is essential that this completes for portage to be able to function
after upgrading to this version.  Should it somehow fail, then the
following variables need to be added to make.conf with the appropriate
values:

PORTAGE_USERNAME
PORTAGE_GRPNAME
PORTAGE_INST_UID
PORTAGE_INST_GID

Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |  1 +
 ...portage-3.0.62.ebuild => portage-3.0.73.ebuild} | 89 ++
 2 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 931d367a99..0cbd4235ce 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,4 @@
 DIST prefix-portage-3.0.62.tar.bz2 1540010 BLAKE2B 
5228459672b9928881fcce58b01c30af4974cf56c5227f6b9a83ae14579821a65b5914a2c538ce3a2e6805a2abde226fb4a9c6b8fb4c8035a5b8a931e813e5b9
 SHA512 
07bb343c243ada777dd606318b49fb76b436c189d02f086ce069d6a1dbb4ce9fe5539b26c8bb0bb223ea981acaa92397ec43b21a669a8fcea89b4f4fc94d0b1d
 DIST prefix-portage-3.0.63.tar.bz2 1501121 BLAKE2B 
4d9ec570e958dca53b8adf7057d2f2b88083bfd7570b75594d54513e7bb3a4641b7d1f4b87689a863e092215f764f8609d53bc8becdbdb91108b9801a8ccc1ca
 SHA512 
df63d040d91912d81dbc15373618e6b2c043641bd93afd035c373c38d2616d3dcc87591e45eceeed17095ccddef90502684460e20f73ee451aa65bdac761
 DIST prefix-portage-3.0.72.tar.bz2 1533963 BLAKE2B 
3e97a868841819d3ac96efdb16fc1e09f3d25c3640971e9844fe34b677c162d0afcd4d8f8cfb51a047b161154153804414cb9eba38fd9b1a31750a99c7da6c5b
 SHA512 
50b145d4c6f10c3b0d00fa9b0bbf8cbb1fb6e6a1b33bfbf2df498de287aa76da477302b27b997f6c23aefe6a7f154539fb47c9a25b1e86a71d7b8e22bb973d6d
+DIST prefix-portage-3.0.73.tar.bz2 1546048 BLAKE2B 
990a442ce67c669a55cec73817dedf83fd420ac582bc1572609341545217be06a12192f7b48ce112a62a3093c8a27a521c73df3e9d2e51be95bd5e3accab1052
 SHA512 
9173d0fe8112ee52b4893550adf07896a5b1d2848736b78a769df08e8cf093d94e3f4a7cc76f2b8b1b32a671f03be3422797c9a2267977db271e0225a8aa16bd

diff --git a/sys-apps/portage/portage-3.0.62.ebuild 
b/sys-apps/portage/portage-3.0.73.ebuild
similarity index 79%
rename from sys-apps/portage/portage-3.0.62.ebuild
rename to sys-apps/portage/portage-3.0.73.ebuild
index 7f20a5531f..f29a01d676 100644
--- a/sys-apps/portage/portage-3.0.62.ebuild
+++ b/sys-apps/portage/portage-3.0.73.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 TMPFILES_OPTIONAL=1
 
@@ -125,38 +125,13 @@ src_prepare() {
-e "s|^\(sync-uri = 
\).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-i cnf/repos.conf || die "sed failed"
 
-   # PREFIX LOCAL: only hack const_autotool
-   # ok, we can't rely on PORTAGE_ROOT_USER being there yet, as 
people
-   # tend not to update that often, as long as we are a separate 
ebuild
-   # we can assume when unset, it's time for some older trick
-   if [[ -z ${PORTAGE_ROOT_USER} ]] ; then
-   PORTAGE_ROOT_USER=$(python -c 'from portage.const 
import rootuser; print rootuser')
-   fi
-   # We need to probe for bash in the Prefix, because it may not
-   # exist, in which case we fall back to the currently in use
-   # bash.  This logic is necessary in particular during bootstrap,
-   # where we pull ourselves out of a temporary place with tools
-   local bash="${EPREFIX}/bin/bash"
-   [[ ! -x ${bash} ]] && bash=${BASH}
-
-   einfo "Adjusting sources for ${EPREFIX}"
-   sed -e "s|@PORTAGE_EPREFIX@|${EPREFIX}|" \
-   -e "s|@PORTAGE_MV@|$(type -P mv)|" \
-   -e "s|@PORTAGE_BASH@|${bash}|" \
-   -e "s|@portagegroup@|${PORTAGE_GROUP:-portage}|" \
-   -e "s|@portageuser@|${PORTAGE_USER:-portage}|" \
-   -e "s|@rootuser@|${PORTAGE_ROOT_USER:-root}|" \
-   -e "s|@rootuid@|$(id -u ${PORTAGE_ROOT_USER:-root})|" \
-   -e "s|@rootgid@|$(id -g ${PORTAGE_ROOT_USER:-root})|" \
-   -e "s|@sysconfdir@|${EPREFIX}/etc|" \
-   -i \
-   lib/portage/const_autotool.py cnf/make.globals \
-   || d

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

2025-12-09 Thread Fabian Groffen
commit: 6ea8fba1db783272b090a19950dd186a5cd2f4b5
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Dec  9 10:18:23 2025 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Dec  9 10:18:23 2025 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6ea8fba1

sys-apps/portage-3.0.72: quote PORTAGE_{USER,GRP}NAME in migration

As pointed out in bug #967030, this can contain weird values, so don't
trust them to be sane.

Signed-off-by: Fabian Groffen  gentoo.org>

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

diff --git a/sys-apps/portage/portage-3.0.72.ebuild 
b/sys-apps/portage/portage-3.0.72.ebuild
index 0bc964eb99..9f4d553c9e 100644
--- a/sys-apps/portage/portage-3.0.72.ebuild
+++ b/sys-apps/portage/portage-3.0.72.ebuild
@@ -318,10 +318,10 @@ pkg_postinst() {
elog "Due to a change in how Prefix Portage handles 
user and group"
elog "administration, you must add the following in 
your"
elog "  ${EROOT}/etc/portage/make.conf"
-   elog "PORTAGE_USERNAME=${PORTAGE_USERNAME}"
-   elog "PORTAGE_GRPNAME=${PORTAGE_GRPNAME}"
-   elog "PORTAGE_INST_UID=${PORTAGE_INST_UID}"
-   elog "PORTAGE_INST_GID=${PORTAGE_INST_GID}"
+   elog "PORTAGE_USERNAME=\"${PORTAGE_USERNAME}\""
+   elog "PORTAGE_GRPNAME=\"${PORTAGE_GRPNAME}\""
+   elog "PORTAGE_INST_UID=\"${PORTAGE_INST_UID}\""
+   elog "PORTAGE_INST_GID=\"${PORTAGE_INST_GID}\""
eerror "your installation will break without these 
settings"
 
local conffile="${EROOT}/etc/portage/make.conf"
@@ -343,10 +343,10 @@ pkg_postinst() {
echo "# added by ${P} at $(date)"
echo "# this was done as part of a 
migration of these"
echo "# values from make.globals to 
user configuration"
-   echo 
"PORTAGE_USERNAME=${PORTAGE_USERNAME}"
-   echo 
"PORTAGE_GRPNAME=${PORTAGE_GRPNAME}"
-   echo 
"PORTAGE_INST_UID=${PORTAGE_INST_UID}"
-   echo 
"PORTAGE_INST_GID=${PORTAGE_INST_GID}"
+   echo 
"PORTAGE_USERNAME=\"${PORTAGE_USERNAME}\""
+   echo 
"PORTAGE_GRPNAME=\"${PORTAGE_GRPNAME}\""
+   echo 
"PORTAGE_INST_UID=\"${PORTAGE_INST_UID}\""
+   echo 
"PORTAGE_INST_GID=\"${PORTAGE_INST_GID}\""
} >> "${conffile}"
elog "user configuration variables were 
automatically added"
elog "to your ${conffile}, please review"



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

2025-12-04 Thread Fabian Groffen
commit: 004f9dbb4a7b1b1515adbfabdd407ce51bf2021d
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Dec  4 08:34:52 2025 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Dec  4 08:34:52 2025 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=004f9dbb

sys-apps/portage-3.0.72: add code to migrate a users' config

Migrate Portage's user/group setup to make.conf (or the first file if it
is a directory) to try and keep a system running without manual
intervention.

This code is in this version "dead", since the install still puts it in
make.globals, but the next version will not.

Signed-off-by: Fabian Groffen  gentoo.org>

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

diff --git a/sys-apps/portage/portage-3.0.72.ebuild 
b/sys-apps/portage/portage-3.0.72.ebuild
index bc6a9767b1..0bc964eb99 100644
--- a/sys-apps/portage/portage-3.0.72.ebuild
+++ b/sys-apps/portage/portage-3.0.72.ebuild
@@ -305,4 +305,52 @@ pkg_postinst() {
eerror "Please remove this from ${bashrc} to avoid problems."
eerror "See bug 867010 for more details."
fi
+
+   # migrate to setup where user/group are in the users' config
+   if use prefix-guest; then
+   python_setup
+
+   local P_USER=$(
+   env -u PORTAGE_USERNAME \
+   "${PYTHON}" -c 'from portage.data import 
_portage_username; print(_portage_username)')
+   if [[ ${P_USER} != ${PORTAGE_USERNAME} ]] ; then
+   elog "Your Portage configuration is incomplete."
+   elog "Due to a change in how Prefix Portage handles 
user and group"
+   elog "administration, you must add the following in 
your"
+   elog "  ${EROOT}/etc/portage/make.conf"
+   elog "PORTAGE_USERNAME=${PORTAGE_USERNAME}"
+   elog "PORTAGE_GRPNAME=${PORTAGE_GRPNAME}"
+   elog "PORTAGE_INST_UID=${PORTAGE_INST_UID}"
+   elog "PORTAGE_INST_GID=${PORTAGE_INST_GID}"
+   eerror "your installation will break without these 
settings"
+
+   local conffile="${EROOT}/etc/portage/make.conf"
+   if [[ -d ${conffile} ]] ; then
+   local f
+   for f in ${conffile}/* ; do
+   if [[ -w ${f} ]] ; then
+   conffile=${f}
+   break;
+   fi
+   done
+   fi
+   if [[ ! -w ${conffile} ]] ; then
+   eerror "could not find a file in your make.conf 
to write to"
+   eerror "you must add the variables yourself!"
+   else
+   {
+   echo ""
+   echo "# added by ${P} at $(date)"
+   echo "# this was done as part of a 
migration of these"
+   echo "# values from make.globals to 
user configuration"
+   echo 
"PORTAGE_USERNAME=${PORTAGE_USERNAME}"
+   echo 
"PORTAGE_GRPNAME=${PORTAGE_GRPNAME}"
+   echo 
"PORTAGE_INST_UID=${PORTAGE_INST_UID}"
+   echo 
"PORTAGE_INST_GID=${PORTAGE_INST_GID}"
+   } >> "${conffile}"
+   elog "user configuration variables were 
automatically added"
+   elog "to your ${conffile}, please review"
+   fi
+   fi
+   fi
 }



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

2025-12-03 Thread Fabian Groffen
commit: 3987ecc0f429638dca8a71b2c88c05b9442af765
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Dec  4 07:14:25 2025 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Dec  4 07:14:25 2025 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3987ecc0

sys-apps/portage-3.0.72: avoid assigning reserved variables

PORTAGE_GID is a read-only Portage var

Signed-off-by: Fabian Groffen  gentoo.org>

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

diff --git a/sys-apps/portage/portage-3.0.72.ebuild 
b/sys-apps/portage/portage-3.0.72.ebuild
index 11e34a547d..bc6a9767b1 100644
--- a/sys-apps/portage/portage-3.0.72.ebuild
+++ b/sys-apps/portage/portage-3.0.72.ebuild
@@ -126,16 +126,16 @@ src_prepare() {
-i cnf/repos.conf || die "sed failed"
 
# PREFIX LOCAL: do the work of configure with expansions here
-   PORTAGE_GROUP=${PORTAGE_GRPNAME}
-   PORTAGE_USER=${PORTAGE_USERNAME}
-   [[ -z ${PORTAGE_GROUP} ]] && \
-   PORTAGE_GROUP=$(python -c 'from portage.const import 
portagegroup; print(portagegroup)')
-   [[ -z ${PORTAGE_USER} ]] && \
-   PORTAGE_USER=$(python -c 'from portage.const import 
portageuser; print(portageuser)')
-   [[ -z ${PORTAGE_GROUP} ]] && PORTAGE_GROUP=portage
-   [[ -z ${PORTAGE_USER}  ]] && PORTAGE_USER=portage
-   PORTAGE_GID=$(python -c "import grp; 
print(grp.getgrnam('${PORTAGE_GROUP}').gr_gid)")
-   PORTAGE_UID=$(id -u ${PORTAGE_USER})
+   P_GROUP=${PORTAGE_GRPNAME}
+   P_USER=${PORTAGE_USERNAME}
+   [[ -z ${P_GROUP} ]] && \
+   P_GROUP=$(python -c 'from portage.const import 
portagegroup; print(portagegroup)')
+   [[ -z ${P_USER} ]] && \
+   P_USER=$(python -c 'from portage.const import 
portageuser; print(portageuser)')
+   [[ -z ${P_GROUP} ]] && P_GROUP=portage
+   [[ -z ${P_USER}  ]] && P_USER=portage
+   P_GID=$(python -c "import grp; 
print(grp.getgrnam('${P_GROUP}').gr_gid)")
+   P_UID=$(id -u ${P_USER})
 
# We need to probe for bash in the Prefix, because it may not
# exist, in which case we fall back to the currently in use
@@ -148,10 +148,10 @@ src_prepare() {
sed -e "s|@PORTAGE_EPREFIX@|${EPREFIX}|" \
-e "s|@PORTAGE_MV@|$(type -P mv)|" \
-e "s|@PORTAGE_BASH@|${bash}|" \
-   -e "s|@portagegroup@|${PORTAGE_GROUP}|" \
-   -e "s|@portageuser@|${PORTAGE_USER}|" \
-   -e "s|@rootuid@|${PORTAGE_UID}|" \
-   -e "s|@rootgid@|${PORTAGE_GID}|" \
+   -e "s|@portagegroup@|${P_GROUP}|" \
+   -e "s|@portageuser@|${P_USER}|" \
+   -e "s|@rootuid@|${P_UID}|" \
+   -e "s|@rootgid@|${P_GID}|" \
-e "s|@sysconfdir@|${EPREFIX}/etc|" \
-i \
lib/portage/const_autotool.py cnf/make.globals \



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

2025-12-01 Thread Fabian Groffen
commit: ce0201b96643e66f98d76fbb7838f32e510c2954
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Dec  2 07:30:58 2025 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Dec  2 07:30:58 2025 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ce0201b9

sys-apps/portage: rootuser has disappeared, use portage instead

Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/portage-3.0.72.ebuild | 19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/sys-apps/portage/portage-3.0.72.ebuild 
b/sys-apps/portage/portage-3.0.72.ebuild
index 5d1000df01..11e34a547d 100644
--- a/sys-apps/portage/portage-3.0.72.ebuild
+++ b/sys-apps/portage/portage-3.0.72.ebuild
@@ -125,17 +125,17 @@ src_prepare() {
-e "s|^\(sync-uri = 
\).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-i cnf/repos.conf || die "sed failed"
 
-   # PREFIX LOCAL: only hack const_autotool
+   # PREFIX LOCAL: do the work of configure with expansions here
PORTAGE_GROUP=${PORTAGE_GRPNAME}
PORTAGE_USER=${PORTAGE_USERNAME}
-   PORTAGE_ROOT_USER=$(python -c 'from portage.const import 
rootuser; print(rootuser)')
[[ -z ${PORTAGE_GROUP} ]] && \
PORTAGE_GROUP=$(python -c 'from portage.const import 
portagegroup; print(portagegroup)')
[[ -z ${PORTAGE_USER} ]] && \
PORTAGE_USER=$(python -c 'from portage.const import 
portageuser; print(portageuser)')
-   [[ -z ${PORTAGE_ROOT_USER} ]] && PORTAGE_ROOT_USER=root
[[ -z ${PORTAGE_GROUP} ]] && PORTAGE_GROUP=portage
[[ -z ${PORTAGE_USER}  ]] && PORTAGE_USER=portage
+   PORTAGE_GID=$(python -c "import grp; 
print(grp.getgrnam('${PORTAGE_GROUP}').gr_gid)")
+   PORTAGE_UID=$(id -u ${PORTAGE_USER})
 
# We need to probe for bash in the Prefix, because it may not
# exist, in which case we fall back to the currently in use
@@ -150,20 +150,19 @@ src_prepare() {
-e "s|@PORTAGE_BASH@|${bash}|" \
-e "s|@portagegroup@|${PORTAGE_GROUP}|" \
-e "s|@portageuser@|${PORTAGE_USER}|" \
-   -e "s|@rootuser@|${PORTAGE_ROOT_USER}|" \
-   -e "s|@rootuid@|$(id -u ${PORTAGE_ROOT_USER})|" \
-   -e "s|@rootgid@|$(id -g ${PORTAGE_ROOT_USER})|" \
+   -e "s|@rootuid@|${PORTAGE_UID}|" \
+   -e "s|@rootgid@|${PORTAGE_GID}|" \
-e "s|@sysconfdir@|${EPREFIX}/etc|" \
-   -e "s|@portageuser@|${PORTAGE_USER}|" \
-   -e "s|@portagegroup@|${PORTAGE_GROUP}|" \
-i \
lib/portage/const_autotool.py cnf/make.globals \
|| die "Failed to patch sources"
 
sed -e "s|@PREFIX_PORTAGE_PYTHON@|$(type -P python)|" \
-i \
-   bin/ebuild-helpers/dohtml bin/ebuild-pyhelper \
-   bin/misc-functions.sh bin/phase-functions.sh \
+   bin/ebuild-helpers/dohtml \
+   bin/ebuild-pyhelper \
+   bin/misc-functions.sh \
+   bin/phase-functions.sh \
|| die "Failed to patch sources"
 
# remove Makefiles, or else they will get installed



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

2025-11-22 Thread Fabian Groffen
commit: df3f7a7261e2cee3808dcce85f90668b79ad3d81
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 22 19:31:19 2025 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 22 19:31:19 2025 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=df3f7a72

sys-apps/portage-3.0.72: version bump

Closes: https://bugs.gentoo.org/966267
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   2 +-
 .../portage/files/portage-3.0.30-ebuildshell.patch | 349 -
 .../files/portage-3.0.30-prefix-stack.patch|  81 -
 ...portage-3.0.70.ebuild => portage-3.0.72.ebuild} |  29 +-
 4 files changed, 19 insertions(+), 442 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index bc958da6b6..931d367a99 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
 DIST prefix-portage-3.0.62.tar.bz2 1540010 BLAKE2B 
5228459672b9928881fcce58b01c30af4974cf56c5227f6b9a83ae14579821a65b5914a2c538ce3a2e6805a2abde226fb4a9c6b8fb4c8035a5b8a931e813e5b9
 SHA512 
07bb343c243ada777dd606318b49fb76b436c189d02f086ce069d6a1dbb4ce9fe5539b26c8bb0bb223ea981acaa92397ec43b21a669a8fcea89b4f4fc94d0b1d
 DIST prefix-portage-3.0.63.tar.bz2 1501121 BLAKE2B 
4d9ec570e958dca53b8adf7057d2f2b88083bfd7570b75594d54513e7bb3a4641b7d1f4b87689a863e092215f764f8609d53bc8becdbdb91108b9801a8ccc1ca
 SHA512 
df63d040d91912d81dbc15373618e6b2c043641bd93afd035c373c38d2616d3dcc87591e45eceeed17095ccddef90502684460e20f73ee451aa65bdac761
-DIST prefix-portage-3.0.70.tar.bz2 1544606 BLAKE2B 
e0d27e497f0f869a6b2c7c43e825e09a14122064a29809ebd1b77db19478c1e19fa44936c3d2c6d8b1cacec78705d3c57e5b8773bb6cd4ec40cc31c43ec0e91a
 SHA512 
393f0c451a8867dd14137209aaab45b5a76e79df85443603848c3abff4c1b8775d91494da3c39a4e599226ff300291d9b17c42cf059984e471e400b705598107
+DIST prefix-portage-3.0.72.tar.bz2 1533963 BLAKE2B 
3e97a868841819d3ac96efdb16fc1e09f3d25c3640971e9844fe34b677c162d0afcd4d8f8cfb51a047b161154153804414cb9eba38fd9b1a31750a99c7da6c5b
 SHA512 
50b145d4c6f10c3b0d00fa9b0bbf8cbb1fb6e6a1b33bfbf2df498de287aa76da477302b27b997f6c23aefe6a7f154539fb47c9a25b1e86a71d7b8e22bb973d6d

diff --git a/sys-apps/portage/files/portage-3.0.30-ebuildshell.patch 
b/sys-apps/portage/files/portage-3.0.30-ebuildshell.patch
deleted file mode 100644
index 20f0aab813..00
--- a/sys-apps/portage/files/portage-3.0.30-ebuildshell.patch
+++ /dev/null
@@ -1,349 +0,0 @@
-From 8c6b115fa0325b5bed2e1a9c4c8e8af45cdecc2e Mon Sep 17 00:00:00 2001
-From: Michael Haubenwallner 
-Date: Wed, 6 Nov 2013 12:40:05 +0100
-Subject: [PATCH 1/2] Add ebuildshell feature, bug#155161.
-

- bin/ebuild.sh| 146 ++-
- bin/filter-bash-environment.py   |  55 +
- bin/save-ebuild-env.sh   |   2 +-
- man/make.conf.5  |   6 ++
- lib/_emerge/AbstractEbuildProcess.py |   1 +
- lib/portage/const.py |   1 +
- 6 files changed, 194 insertions(+), 17 deletions(-)
-
-diff --git a/bin/ebuild.sh b/bin/ebuild.sh
-index f76a48d8e..683a4e9c1 100755
 a/bin/ebuild.sh
-+++ b/bin/ebuild.sh
-@@ -121,7 +121,7 @@ __qa_source() {
- __qa_call() {
-   local shopts=$(shopt) OLDIFS="$IFS"
-   local retval
--  "$@"
-+  __call-ebuildshell "$@"
-   retval=$?
-   set +e
-   [[ $shopts != $(shopt) ]] &&
-@@ -547,6 +547,150 @@ if [[ -n ${QA_INTERCEPTORS} ]] ; then
-   unset BIN_PATH BIN BODY FUNC_SRC
- fi
- 
-+__call-ebuildshell() {
-+  if ! has ebuildshell ${FEATURES}; then
-+  "$@"
-+  return $?
-+  fi
-+  local __ebuildshell_args=( "$@" )
-+  # These are the variables I have seen 'bash -i' maintaining the values 
for:
-+  local __ebuildshell_bash_i_vars="__ebuildshell_.*
-+  _ BASH_ARGC BASH_ARGV BASH_COMMAND BASH_LINENO BASH_SOURCE
-+  BASH_VERSINFO BASH_SUBSHELL BASHOPTS BASHPID COMP_WORDBREAKS
-+  DIRSTACK EUID FUNCNAME GROUPS HISTCMD HISTFILE LINENO PIPESTATUS
-+  PPID PS1 PS2 PS3 PS4 PWD RANDOM SECONDS SHELLOPTS UID"
-+  # Allow recursive ebuildshell, for use in multibuild.eclass and similar:
-+  local __ebuildshell_pid=${BASHPID:-$(__bashpid)}
-+  local __ebuildshell_tmpf="${T}/ebuildshell.${__ebuildshell_pid}"
-+  rm -f "${__ebuildshell_tmpf}."{ebuild,return}-{env,rovars}
-+  (
-+  cat <<-EOE
-+  # local variables of functions using recursive 
ebuildshell are
-+  # visible to the EXIT trap of that recursive 
ebuildshell.  To
-+  # keep them local, we have to filter them from that 
recursive
-+  # ebuildshell's return-env.  As 'declare -p' is unable 
to tell
-+  # local-ity of variables, we abuse the trace attribute 
for local
-+  # variables to filter them from the return-env.  So we 
need t

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

2025-11-01 Thread Fabian Groffen
commit: d6c5bfe77dad3aca60fb331c14c165ecccb496ad
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov  1 20:04:30 2025 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Nov  1 20:05:01 2025 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d6c5bfe7

sys-apps/portage-3.0.70: version bump

Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest | 2 +-
 sys-apps/portage/{portage-3.0.56.ebuild => portage-3.0.70.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 60de4ca8f3..bc958da6b6 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
-DIST prefix-portage-3.0.56.tar.bz2 1461156 BLAKE2B 
2b654c65c5b1e358789774f21e6ee0c6e0dfba0d3d7ca6159f89a6c3d99686f52bbcbace08456d679a4dce62e16547f8b3f85723924e41f0270c644fed16d32c
 SHA512 
10fcf17813dcdf216ac2d31aac9097ca53f4b31a01440c48d53b6d46908fa1c47a31237988b5e583cb7cc26bb8689340f5cf7dc3db0f10e463ed8f6ab375de61
 DIST prefix-portage-3.0.62.tar.bz2 1540010 BLAKE2B 
5228459672b9928881fcce58b01c30af4974cf56c5227f6b9a83ae14579821a65b5914a2c538ce3a2e6805a2abde226fb4a9c6b8fb4c8035a5b8a931e813e5b9
 SHA512 
07bb343c243ada777dd606318b49fb76b436c189d02f086ce069d6a1dbb4ce9fe5539b26c8bb0bb223ea981acaa92397ec43b21a669a8fcea89b4f4fc94d0b1d
 DIST prefix-portage-3.0.63.tar.bz2 1501121 BLAKE2B 
4d9ec570e958dca53b8adf7057d2f2b88083bfd7570b75594d54513e7bb3a4641b7d1f4b87689a863e092215f764f8609d53bc8becdbdb91108b9801a8ccc1ca
 SHA512 
df63d040d91912d81dbc15373618e6b2c043641bd93afd035c373c38d2616d3dcc87591e45eceeed17095ccddef90502684460e20f73ee451aa65bdac761
+DIST prefix-portage-3.0.70.tar.bz2 1544606 BLAKE2B 
e0d27e497f0f869a6b2c7c43e825e09a14122064a29809ebd1b77db19478c1e19fa44936c3d2c6d8b1cacec78705d3c57e5b8773bb6cd4ec40cc31c43ec0e91a
 SHA512 
393f0c451a8867dd14137209aaab45b5a76e79df85443603848c3abff4c1b8775d91494da3c39a4e599226ff300291d9b17c42cf059984e471e400b705598107

diff --git a/sys-apps/portage/portage-3.0.56.ebuild 
b/sys-apps/portage/portage-3.0.70.ebuild
similarity index 99%
rename from sys-apps/portage/portage-3.0.56.ebuild
rename to sys-apps/portage/portage-3.0.70.ebuild
index 7f20a5531f..35594c0fae 100644
--- a/sys-apps/portage/portage-3.0.56.ebuild
+++ b/sys-apps/portage/portage-3.0.70.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 TMPFILES_OPTIONAL=1
 



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

2025-05-01 Thread Fabian Groffen
commit: fffcad4589fa966852e3cf14eb9178dc22878613
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu May  1 15:12:43 2025 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu May  1 15:12:43 2025 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fffcad45

sys-apps/portage-3.0.63: allow python 3.13

Signed-off-by: Fabian Groffen  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 7f20a5531f..35594c0fae 100644
--- a/sys-apps/portage/portage-3.0.63.ebuild
+++ b/sys-apps/portage/portage-3.0.63.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 TMPFILES_OPTIONAL=1
 



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

2024-02-25 Thread Fabian Groffen
commit: 5bf97c7c80512561f6c635d41101e128dd7eb178
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Feb 25 09:53:55 2024 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Feb 25 09:53:55 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5bf97c7c

sys-apps/portage-3.0.63: version bump

Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   2 +-
 sys-apps/portage/portage-3.0.49.ebuild | 311 -
 sys-apps/portage/portage-3.0.63.ebuild | 302 
 3 files changed, 303 insertions(+), 312 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 529b7d9c4f..60de4ca8f3 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
-DIST prefix-portage-3.0.49.tar.bz2 1421955 BLAKE2B 
ac6e5b512f943826d0bf06225037885a138f3810db973a60c6dbca4f80d516e3aef3054b532f42a143b35702661a3d35ee59945f745b849dcd6fefbd4ff8f3cc
 SHA512 
dee0035e048b1bfde5859b809bf6ffa3ca0674cd1d59d9cfcc14a279d87215223a6b4497274db7e443f27fd6dd05eadb043ae6872feb8fa8523994d9946b6879
 DIST prefix-portage-3.0.56.tar.bz2 1461156 BLAKE2B 
2b654c65c5b1e358789774f21e6ee0c6e0dfba0d3d7ca6159f89a6c3d99686f52bbcbace08456d679a4dce62e16547f8b3f85723924e41f0270c644fed16d32c
 SHA512 
10fcf17813dcdf216ac2d31aac9097ca53f4b31a01440c48d53b6d46908fa1c47a31237988b5e583cb7cc26bb8689340f5cf7dc3db0f10e463ed8f6ab375de61
 DIST prefix-portage-3.0.62.tar.bz2 1540010 BLAKE2B 
5228459672b9928881fcce58b01c30af4974cf56c5227f6b9a83ae14579821a65b5914a2c538ce3a2e6805a2abde226fb4a9c6b8fb4c8035a5b8a931e813e5b9
 SHA512 
07bb343c243ada777dd606318b49fb76b436c189d02f086ce069d6a1dbb4ce9fe5539b26c8bb0bb223ea981acaa92397ec43b21a669a8fcea89b4f4fc94d0b1d
+DIST prefix-portage-3.0.63.tar.bz2 1501121 BLAKE2B 
4d9ec570e958dca53b8adf7057d2f2b88083bfd7570b75594d54513e7bb3a4641b7d1f4b87689a863e092215f764f8609d53bc8becdbdb91108b9801a8ccc1ca
 SHA512 
df63d040d91912d81dbc15373618e6b2c043641bd93afd035c373c38d2616d3dcc87591e45eceeed17095ccddef90502684460e20f73ee451aa65bdac761

diff --git a/sys-apps/portage/portage-3.0.49.ebuild 
b/sys-apps/portage/portage-3.0.49.ebuild
deleted file mode 100644
index 7574500eaf..00
--- a/sys-apps/portage/portage-3.0.49.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
-
-DESCRIPTION="The package management system for Gentoo Prefix"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
-SRC_URI="https://dev.gentoo.org/~grobian/distfiles/prefix-${P}.tar.bz2";
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos 
~x64-solaris"
-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="
-   !prefix? ( acct-user/portage )
-   app-arch/zstd
-   >=app-arch/tar-1.27
-   dev-lang/python-exec:2
-   >=sys-apps/findutils-4.4
-   !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-20180706
-   >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-   )
-   )
-   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
-   elibc_musl? ( >=sys-apps/sandbox-2.2 )
-   kernel_linux? ( sys-apps/util-linux )
-   >=app-misc/pax-utils-0.1.18
-   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-   xattr? ( kernel_linux? (
-   >=sys-apps/install-xattr-0.3
-   ) )
-   !> cnf/make.globals || die
-   fi
-
-   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 = 

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

2024-02-21 Thread Fabian Groffen
commit: 468f5ff8c93f28533ca890a29998b4a6941b179c
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Feb 22 07:54:45 2024 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Feb 22 07:54:45 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=468f5ff8

sys-apps/portage-3.0.62: version bump

Closes: https://bugs.gentoo.org/923644
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   2 +-
 .../files/portage-2.3.62-prefix-stack.patch|  80 --
 sys-apps/portage/portage-3.0.34.2.ebuild   | 311 -
 sys-apps/portage/portage-3.0.62.ebuild | 302 
 4 files changed, 303 insertions(+), 392 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index dbd547b19e..529b7d9c4f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
-DIST prefix-portage-3.0.34.2.tar.bz2 1498499 BLAKE2B 
47f53e4917bdf204eb23dadd9dc821c06da07d2e5c68cf0a3de908089e4121d45542e2120e57744db1c808a156595624915956e77f547ab671b1584b2c67cf0b
 SHA512 
121dd885a73153e780e28c2e514d4b3babc44368aa6915b2009ed0b205051c2f6c37dd3ccfe8be5ea567e7bab2f9f9b0c5c5b81c49990fbac7360261721a5bb7
 DIST prefix-portage-3.0.49.tar.bz2 1421955 BLAKE2B 
ac6e5b512f943826d0bf06225037885a138f3810db973a60c6dbca4f80d516e3aef3054b532f42a143b35702661a3d35ee59945f745b849dcd6fefbd4ff8f3cc
 SHA512 
dee0035e048b1bfde5859b809bf6ffa3ca0674cd1d59d9cfcc14a279d87215223a6b4497274db7e443f27fd6dd05eadb043ae6872feb8fa8523994d9946b6879
 DIST prefix-portage-3.0.56.tar.bz2 1461156 BLAKE2B 
2b654c65c5b1e358789774f21e6ee0c6e0dfba0d3d7ca6159f89a6c3d99686f52bbcbace08456d679a4dce62e16547f8b3f85723924e41f0270c644fed16d32c
 SHA512 
10fcf17813dcdf216ac2d31aac9097ca53f4b31a01440c48d53b6d46908fa1c47a31237988b5e583cb7cc26bb8689340f5cf7dc3db0f10e463ed8f6ab375de61
+DIST prefix-portage-3.0.62.tar.bz2 1540010 BLAKE2B 
5228459672b9928881fcce58b01c30af4974cf56c5227f6b9a83ae14579821a65b5914a2c538ce3a2e6805a2abde226fb4a9c6b8fb4c8035a5b8a931e813e5b9
 SHA512 
07bb343c243ada777dd606318b49fb76b436c189d02f086ce069d6a1dbb4ce9fe5539b26c8bb0bb223ea981acaa92397ec43b21a669a8fcea89b4f4fc94d0b1d

diff --git a/sys-apps/portage/files/portage-2.3.62-prefix-stack.patch 
b/sys-apps/portage/files/portage-2.3.62-prefix-stack.patch
deleted file mode 100644
index b0bdf2a20e..00
--- a/sys-apps/portage/files/portage-2.3.62-prefix-stack.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 1fe30e79c368ce71e024d70c3ec07a6aed3ef262 Mon Sep 17 00:00:00 2001
-From: Michael Haubenwallner 
-Date: Fri, 22 Mar 2019 17:52:05 +0100
-Subject: [PATCH] from FEATURES=stacked-prefix to USE=prefix-stack
-
-Rather than telling the base prefix' portage to support stacked prefix,
-be explicit in the stacked prefix about to USE that feature.
-Bug: https://bugs.gentoo.org/658572

- bin/install-qa-check.d/05prefix | 10 +++---
- bin/phase-helpers.sh| 12 
- lib/portage/const.py|  1 -
- 3 files changed, 7 insertions(+), 16 deletions(-)
-
-diff --git a/bin/install-qa-check.d/05prefix b/bin/install-qa-check.d/05prefix
-index 03da3bbce..4f48e4216 100644
 a/bin/install-qa-check.d/05prefix
-+++ b/bin/install-qa-check.d/05prefix
-@@ -36,16 +36,12 @@ install_qa_check_prefix() {
-   local WHITELIST=" /usr/bin/env "
-   # shebang can be an absolutised path, bug #342929
-   local eprefix=$(canonicalize ${EPREFIX})
--  # Without the stacked-prefix feature, tests using BPREFIX
--  # are redundant to EPREFIX, but run only if we will fail.
-+  # Without USE=prefix-stack, tests using BPREFIX are
-+  # redundant to EPREFIX, but run only if we will fail.
-   # Otherways, BPREFIX really is BROOT (the EAPI 7 one).
-   local BPREFIX=${EPREFIX}
-   local bprefix=${eprefix}
--  if has stacked-prefix ${FEATURES} &&
-- [[ -z ${ROOT%/} ]] &&
-- [[ ${CBUILD} == ${CHOST} ]]&&
-- [[ ${EPREFIX} != ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}} ]] &&
--  :; then
-+  if has prefix-stack ${USE} ; then
-   BPREFIX=${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}
-   bprefix=$(canonicalize ${BPREFIX})
-   fi
-diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
-index 606b1cdfd..c64f1106b 100644
 a/bin/phase-helpers.sh
-+++ b/bin/phase-helpers.sh
-@@ -932,18 +932,14 @@ ___best_version_and_has_version_common() {
-   fi ;;
-   esac
- 
--  # PREFIX LOCAL: stacked-prefix feature
-+  # PREFIX LOCAL: prefix-stack feature
-   if ___eapi_has_prefix_variables &&
-  has "${root_arg}" '--host-root' '-b' &&
-- has stacked-prefix ${FEATURES}   &&
-+ has prefix-stack ${USE}  &&
-  [[ -z ${ROOT%/} ]]   &&
-- [[ ${CBUILD} == ${CHOST} ]]  &&
-- [[ ${EPREFIX} != ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}} ]] &&
-   :; then
--

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

2024-01-14 Thread Fabian Groffen
commit: ea90320d2a4c7e91e9216b3fea2453cdf7ee9997
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Jan 14 10:19:20 2024 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Jan 14 10:19:20 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ea90320d

sys-apps/portage-3.0.56: fix pkgmoved meson dep

Signed-off-by: Fabian Groffen  gentoo.org>

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

diff --git a/sys-apps/portage/portage-3.0.56.ebuild 
b/sys-apps/portage/portage-3.0.56.ebuild
index 834760c3c0..7f20a5531f 100644
--- a/sys-apps/portage/portage-3.0.56.ebuild
+++ b/sys-apps/portage/portage-3.0.56.ebuild
@@ -35,7 +35,7 @@ RESTRICT="!test? ( test )"
 # >=meson-1.2.1-r1 for bug #912051
 BDEPEND="
${PYTHON_DEPS}
-   >=dev-util/meson-1.2.1-r1
+   >=dev-build/meson-1.2.1-r1
$(python_gen_cond_dep '
dev-python/setuptools[${PYTHON_USEDEP}]
' python3_12)



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

2024-01-14 Thread Fabian Groffen
commit: 448456dd44a41ce38cb36bde914bbf6d9b3e8156
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Jan 14 10:15:44 2024 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Jan 14 10:16:59 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=448456dd

sys-apps/portage-3.0.49: fix applying interrevisions patch

Signed-off-by: Fabian Groffen  gentoo.org>

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

diff --git a/sys-apps/portage/portage-3.0.49.ebuild 
b/sys-apps/portage/portage-3.0.49.ebuild
index 148d1f4259..7574500eaf 100644
--- a/sys-apps/portage/portage-3.0.49.ebuild
+++ b/sys-apps/portage/portage-3.0.49.ebuild
@@ -91,7 +91,7 @@ python_prepare_all() {
# "${FILESDIR}"/${PN}-3.0.30-prefix-stack.patch # 658572
# disabled in 3.0.24: does not apply, while useful, rarely used 
if ever
# "${FILESDIR}"/${PN}-3.0.30-ebuildshell.patch # 155161
-   "${FILESDIR}"/${PN}-3.0.30-interrevisions.patch # 832062
+   "${FILESDIR}"/${PN}-3.0.55.1-interrevisions.patch # 832062
)
 
distutils-r1_python_prepare_all



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

2023-12-03 Thread Fabian Groffen
commit: dee6d4d7a9612d4a2a793d40a8b5db62bdada60e
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Dec  3 10:16:57 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Dec  3 10:16:57 2023 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dee6d4d7

sys-apps/portage-3.0.56: version bump

Fix interaction between old Prefix path adjustments and recent newer
ones via meson.  Double handling could cause bugs such as #918717 when
the chosen offset prefix matches the paths replaced by hprefixify (e.g.
something starting with /usr).

Closes: https://bugs.gentoo.org/918717
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |  2 +-
 ...rtage-3.0.55.1.ebuild => portage-3.0.56.ebuild} | 46 +++---
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 2abec9a5f7..dbd547b19e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
 DIST prefix-portage-3.0.34.2.tar.bz2 1498499 BLAKE2B 
47f53e4917bdf204eb23dadd9dc821c06da07d2e5c68cf0a3de908089e4121d45542e2120e57744db1c808a156595624915956e77f547ab671b1584b2c67cf0b
 SHA512 
121dd885a73153e780e28c2e514d4b3babc44368aa6915b2009ed0b205051c2f6c37dd3ccfe8be5ea567e7bab2f9f9b0c5c5b81c49990fbac7360261721a5bb7
 DIST prefix-portage-3.0.49.tar.bz2 1421955 BLAKE2B 
ac6e5b512f943826d0bf06225037885a138f3810db973a60c6dbca4f80d516e3aef3054b532f42a143b35702661a3d35ee59945f745b849dcd6fefbd4ff8f3cc
 SHA512 
dee0035e048b1bfde5859b809bf6ffa3ca0674cd1d59d9cfcc14a279d87215223a6b4497274db7e443f27fd6dd05eadb043ae6872feb8fa8523994d9946b6879
-DIST prefix-portage-3.0.55.1.tar.bz2 1460599 BLAKE2B 
07982a1e6af0df7c7849aeab7ed2479bb2fe7ede16183bddba93d25d8839224f87967b0aa776c2cbc124f322b69a275e628e2817c7f3e01c9353a0eeda38fea8
 SHA512 
5f87c84baa9d13f0ad5aa534013ef7bf8219d742f940cad8a07bfea8630615885950aa6d7cf030fe6012061504d177a3e024a1bdc2da3a02bed550816805
+DIST prefix-portage-3.0.56.tar.bz2 1461156 BLAKE2B 
2b654c65c5b1e358789774f21e6ee0c6e0dfba0d3d7ca6159f89a6c3d99686f52bbcbace08456d679a4dce62e16547f8b3f85723924e41f0270c644fed16d32c
 SHA512 
10fcf17813dcdf216ac2d31aac9097ca53f4b31a01440c48d53b6d46908fa1c47a31237988b5e583cb7cc26bb8689340f5cf7dc3db0f10e463ed8f6ab375de61

diff --git a/sys-apps/portage/portage-3.0.55.1.ebuild 
b/sys-apps/portage/portage-3.0.56.ebuild
similarity index 91%
rename from sys-apps/portage/portage-3.0.55.1.ebuild
rename to sys-apps/portage/portage-3.0.56.ebuild
index 3f24547b1e..834760c3c0 100644
--- a/sys-apps/portage/portage-3.0.55.1.ebuild
+++ b/sys-apps/portage/portage-3.0.56.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
!prefix? ( app-portage/getuto )
@@ -83,7 +83,7 @@ RDEPEND="
)
)
elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
-   elibc_musl? ( >=sys-apps/sandbox-2.2 )
+   elibc_musl? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
kernel_linux? ( sys-apps/util-linux )
selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
xattr? ( kernel_linux? (
@@ -126,7 +126,6 @@ src_prepare() {
-i cnf/repos.conf || die "sed failed"
 
# PREFIX LOCAL: only hack const_autotool
-   local extrapath="/usr/sbin:/usr/bin:/sbin:/bin"
# ok, we can't rely on PORTAGE_ROOT_USER being there yet, as 
people
# tend not to update that often, as long as we are a separate 
ebuild
# we can assume when unset, it's time for some older trick
@@ -141,36 +140,39 @@ src_prepare() {
[[ ! -x ${bash} ]] && bash=${BASH}
 
einfo "Adjusting sources for ${EPREFIX}"
-   find . -type f -exec \
sed -e "s|@PORTAGE_EPREFIX@|${EPREFIX}|" \
-e "s|@PORTAGE_MV@|$(type -P mv)|" \
-e "s|@PORTAGE_BASH@|${bash}|" \
-   -e "s|@PREFIX_PORTAGE_PYTHON@|$(type -P python)|" \
-   -e "s|@EXTRA_PATH@|${extrapath}|" \
-e "s|@portagegroup@|${PORTAGE_GROUP:-portage}|" \
-e "s|@portageuser@|${PORTAGE_USER:-portage}|" \
-e "s|@rootuser@|${PORTAGE_ROOT_USER:-root}|" \
-e "s|@rootuid@|$(id -u ${PORTAGE_ROOT_USER:-root})|" \
-e "s|@rootgid@|$(id -g ${PORTAGE_ROOT_USER:-root})|" \
-e "s|@sysconfdir@|${EPREFIX}/etc|" \
-   -e "1s|/usr/bin/env |${EPREFIX}/usr/bin/|" \
-   -i '{}' + || \
-   die "Failed to patch sources"
+   -i \
+   lib/portage/const_aut

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

2023-12-03 Thread Fabian Groffen
commit: 213ae19a34cd7a54b9548d7bcedc34c1eba1a4e4
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Dec  3 09:55:35 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Dec  3 09:55:35 2023 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=213ae19a

sys-apps/portage: cleanup + update interrevisions patch

Bug: https://bugs.gentoo.org/918717
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   2 -
 .../portage/files/portage-2.3.45-ebuildshell.patch | 354 -
 ...patch => portage-3.0.55.1-interrevisions.patch} |  10 +-
 sys-apps/portage/portage-3.0.21.ebuild | 307 --
 sys-apps/portage/portage-3.0.30.1-r1.ebuild| 305 --
 sys-apps/portage/portage-3.0.30.1.ebuild   | 308 --
 sys-apps/portage/portage-3.0.55.1.ebuild   |   4 +
 7 files changed, 9 insertions(+), 1281 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 996a88e823..2abec9a5f7 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,5 +1,3 @@
-DIST prefix-portage-3.0.21.tar.bz2 1339211 BLAKE2B 
019cf0f3d2d1c45e7849221fc40b49e2c84949b74c8a8c74fbd2ca451a2dd075fb7b8bfec121a173ca0848c57a5a57a62d465b2957c4eb4d87f6a180299da91e
 SHA512 
0aff5004ae80e2cd9dce740c56c3c2643ef390510c3b3821d893e5c76733d3a8d4e7648963febb29479b9ee155868ec11526a393beb3b383e741451178f39e5a
-DIST prefix-portage-3.0.30.1.tar.bz2 1476396 BLAKE2B 
955db5832b1d7d19e25c4ee644f7daa0dbfc7a259ea7018f207865aa8cf5eb8e1e8e2a31c90578162e181af6c043590f239b042e652c3eb2cba9f442bbfc0476
 SHA512 
1ff8afbee4b204488eb0ecb4bdd216bf754ae015a3bcd298d7b6fb0dd7a671ccbf31d9a4a49be8e3182708641abe008f25df5319e135aa25363b979d49517506
 DIST prefix-portage-3.0.34.2.tar.bz2 1498499 BLAKE2B 
47f53e4917bdf204eb23dadd9dc821c06da07d2e5c68cf0a3de908089e4121d45542e2120e57744db1c808a156595624915956e77f547ab671b1584b2c67cf0b
 SHA512 
121dd885a73153e780e28c2e514d4b3babc44368aa6915b2009ed0b205051c2f6c37dd3ccfe8be5ea567e7bab2f9f9b0c5c5b81c49990fbac7360261721a5bb7
 DIST prefix-portage-3.0.49.tar.bz2 1421955 BLAKE2B 
ac6e5b512f943826d0bf06225037885a138f3810db973a60c6dbca4f80d516e3aef3054b532f42a143b35702661a3d35ee59945f745b849dcd6fefbd4ff8f3cc
 SHA512 
dee0035e048b1bfde5859b809bf6ffa3ca0674cd1d59d9cfcc14a279d87215223a6b4497274db7e443f27fd6dd05eadb043ae6872feb8fa8523994d9946b6879
 DIST prefix-portage-3.0.55.1.tar.bz2 1460599 BLAKE2B 
07982a1e6af0df7c7849aeab7ed2479bb2fe7ede16183bddba93d25d8839224f87967b0aa776c2cbc124f322b69a275e628e2817c7f3e01c9353a0eeda38fea8
 SHA512 
5f87c84baa9d13f0ad5aa534013ef7bf8219d742f940cad8a07bfea8630615885950aa6d7cf030fe6012061504d177a3e024a1bdc2da3a02bed550816805

diff --git a/sys-apps/portage/files/portage-2.3.45-ebuildshell.patch 
b/sys-apps/portage/files/portage-2.3.45-ebuildshell.patch
deleted file mode 100644
index e495ee4c24..00
--- a/sys-apps/portage/files/portage-2.3.45-ebuildshell.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-From 8c6b115fa0325b5bed2e1a9c4c8e8af45cdecc2e Mon Sep 17 00:00:00 2001
-From: Michael Haubenwallner 
-Date: Wed, 6 Nov 2013 12:40:05 +0100
-Subject: [PATCH 1/2] Add ebuildshell feature, bug#155161.
-

- bin/ebuild.sh| 146 ++-
- bin/filter-bash-environment.py   |  55 +
- bin/save-ebuild-env.sh   |   2 +-
- man/make.conf.5  |   6 ++
- lib/_emerge/AbstractEbuildProcess.py |   1 +
- lib/portage/const.py |   1 +
- 6 files changed, 194 insertions(+), 17 deletions(-)
-
-diff --git a/bin/ebuild.sh b/bin/ebuild.sh
-index f76a48d8e..683a4e9c1 100755
 a/bin/ebuild.sh
-+++ b/bin/ebuild.sh
-@@ -121,7 +121,7 @@ __qa_source() {
- __qa_call() {
-   local shopts=$(shopt) OLDIFS="$IFS"
-   local retval
--  "$@"
-+  __call-ebuildshell "$@"
-   retval=$?
-   set +e
-   [[ $shopts != $(shopt) ]] &&
-@@ -547,6 +547,150 @@ if [[ -n ${QA_INTERCEPTORS} ]] ; then
-   unset BIN_PATH BIN BODY FUNC_SRC
- fi
- 
-+__call-ebuildshell() {
-+  if ! has ebuildshell ${FEATURES}; then
-+  "$@"
-+  return $?
-+  fi
-+  local __ebuildshell_args=( "$@" )
-+  # These are the variables I have seen 'bash -i' maintaining the values 
for:
-+  local __ebuildshell_bash_i_vars="__ebuildshell_.*
-+  _ BASH_ARGC BASH_ARGV BASH_COMMAND BASH_LINENO BASH_SOURCE
-+  BASH_VERSINFO BASH_SUBSHELL BASHOPTS BASHPID COMP_WORDBREAKS
-+  DIRSTACK EUID FUNCNAME GROUPS HISTCMD HISTFILE LINENO PIPESTATUS
-+  PPID PS1 PS2 PS3 PS4 PWD RANDOM SECONDS SHELLOPTS UID"
-+  # Allow recursive ebuildshell, for use in multibuild.eclass and similar:
-+  local __ebuildshell_pid=${BASHPID:-$(__bashpid)}
-+  local __ebuildshell_tmpf="${T}/ebuildshell.${__ebuildshell_pid}"
-+  rm -f "${__ebuildshell_tmpf}."{ebuild,return}-{env,rova

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

2023-11-25 Thread Fabian Groffen
commit: a689a2e36711c86b149a6707fa2ad65bd696633b
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 25 19:13:48 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 25 19:13:48 2023 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a689a2e3

sys-apps/portage-3.0.55.1: fix LinkageMapMachO error

Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest   | 2 +-
 sys-apps/portage/{portage-3.0.55.ebuild => portage-3.0.55.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a4e5776821..996a88e823 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,4 +2,4 @@ DIST prefix-portage-3.0.21.tar.bz2 1339211 BLAKE2B 
019cf0f3d2d1c45e7849221fc40b4
 DIST prefix-portage-3.0.30.1.tar.bz2 1476396 BLAKE2B 
955db5832b1d7d19e25c4ee644f7daa0dbfc7a259ea7018f207865aa8cf5eb8e1e8e2a31c90578162e181af6c043590f239b042e652c3eb2cba9f442bbfc0476
 SHA512 
1ff8afbee4b204488eb0ecb4bdd216bf754ae015a3bcd298d7b6fb0dd7a671ccbf31d9a4a49be8e3182708641abe008f25df5319e135aa25363b979d49517506
 DIST prefix-portage-3.0.34.2.tar.bz2 1498499 BLAKE2B 
47f53e4917bdf204eb23dadd9dc821c06da07d2e5c68cf0a3de908089e4121d45542e2120e57744db1c808a156595624915956e77f547ab671b1584b2c67cf0b
 SHA512 
121dd885a73153e780e28c2e514d4b3babc44368aa6915b2009ed0b205051c2f6c37dd3ccfe8be5ea567e7bab2f9f9b0c5c5b81c49990fbac7360261721a5bb7
 DIST prefix-portage-3.0.49.tar.bz2 1421955 BLAKE2B 
ac6e5b512f943826d0bf06225037885a138f3810db973a60c6dbca4f80d516e3aef3054b532f42a143b35702661a3d35ee59945f745b849dcd6fefbd4ff8f3cc
 SHA512 
dee0035e048b1bfde5859b809bf6ffa3ca0674cd1d59d9cfcc14a279d87215223a6b4497274db7e443f27fd6dd05eadb043ae6872feb8fa8523994d9946b6879
-DIST prefix-portage-3.0.55.tar.bz2 1460532 BLAKE2B 
840ce4036eddfba2b1a5c8e4c510174a5b4bcee72b00a3acdc8546b7778e0d0838e4aa75887fd8501bf1f811e74c0bf96c264569c28ce007a3705f1a22d8f1aa
 SHA512 
00e5f9783a30d5da60da3686f616b23f4ec2413038bd8e8ee34665cc56ff2a2b0b0d0da8744a4d6dd6b99e20549e8031347a5db68d92d50ba5012c2cef782442
+DIST prefix-portage-3.0.55.1.tar.bz2 1460599 BLAKE2B 
07982a1e6af0df7c7849aeab7ed2479bb2fe7ede16183bddba93d25d8839224f87967b0aa776c2cbc124f322b69a275e628e2817c7f3e01c9353a0eeda38fea8
 SHA512 
5f87c84baa9d13f0ad5aa534013ef7bf8219d742f940cad8a07bfea8630615885950aa6d7cf030fe6012061504d177a3e024a1bdc2da3a02bed550816805

diff --git a/sys-apps/portage/portage-3.0.55.ebuild 
b/sys-apps/portage/portage-3.0.55.1.ebuild
similarity index 100%
rename from sys-apps/portage/portage-3.0.55.ebuild
rename to sys-apps/portage/portage-3.0.55.1.ebuild



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

2023-11-25 Thread Fabian Groffen
commit: c76337d093276f39b5a24d896b52253840d393a1
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 25 18:45:06 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 25 18:45:06 2023 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c76337d0

sys-apps/portage-3.0.55: don't depend on getuto

Prefix doesn't have (official) binpkgs, and getuto isn't Prefix ready.

Signed-off-by: Fabian Groffen  gentoo.org>

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

diff --git a/sys-apps/portage/portage-3.0.55.ebuild 
b/sys-apps/portage/portage-3.0.55.ebuild
index de98eda274..c64c5d2776 100644
--- a/sys-apps/portage/portage-3.0.55.ebuild
+++ b/sys-apps/portage/portage-3.0.55.ebuild
@@ -73,7 +73,7 @@ RDEPEND="
>=sys-apps/findutils-4.4
!build? (
>=app-admin/eselect-1.2
-   app-portage/getuto
+   !prefix? ( 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/proj/prefix:master commit in: sys-apps/portage/files/, sys-apps/portage/

2023-11-24 Thread Fabian Groffen
commit: 108f1b7b98ffb347d4f55d18eacdc86d233c98be
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Nov 24 20:57:01 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Nov 24 20:57:01 2023 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=108f1b7b

sys-apps/portage-3.0.55: version bump

This version is meson-based, unforseen problems may arise...

Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/files/portage-tmpdir.conf |   2 +
 sys-apps/portage/portage-3.0.55.ebuild | 296 +
 3 files changed, 299 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f2df550c6d..a4e5776821 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,3 +2,4 @@ DIST prefix-portage-3.0.21.tar.bz2 1339211 BLAKE2B 
019cf0f3d2d1c45e7849221fc40b4
 DIST prefix-portage-3.0.30.1.tar.bz2 1476396 BLAKE2B 
955db5832b1d7d19e25c4ee644f7daa0dbfc7a259ea7018f207865aa8cf5eb8e1e8e2a31c90578162e181af6c043590f239b042e652c3eb2cba9f442bbfc0476
 SHA512 
1ff8afbee4b204488eb0ecb4bdd216bf754ae015a3bcd298d7b6fb0dd7a671ccbf31d9a4a49be8e3182708641abe008f25df5319e135aa25363b979d49517506
 DIST prefix-portage-3.0.34.2.tar.bz2 1498499 BLAKE2B 
47f53e4917bdf204eb23dadd9dc821c06da07d2e5c68cf0a3de908089e4121d45542e2120e57744db1c808a156595624915956e77f547ab671b1584b2c67cf0b
 SHA512 
121dd885a73153e780e28c2e514d4b3babc44368aa6915b2009ed0b205051c2f6c37dd3ccfe8be5ea567e7bab2f9f9b0c5c5b81c49990fbac7360261721a5bb7
 DIST prefix-portage-3.0.49.tar.bz2 1421955 BLAKE2B 
ac6e5b512f943826d0bf06225037885a138f3810db973a60c6dbca4f80d516e3aef3054b532f42a143b35702661a3d35ee59945f745b849dcd6fefbd4ff8f3cc
 SHA512 
dee0035e048b1bfde5859b809bf6ffa3ca0674cd1d59d9cfcc14a279d87215223a6b4497274db7e443f27fd6dd05eadb043ae6872feb8fa8523994d9946b6879
+DIST prefix-portage-3.0.55.tar.bz2 1460532 BLAKE2B 
840ce4036eddfba2b1a5c8e4c510174a5b4bcee72b00a3acdc8546b7778e0d0838e4aa75887fd8501bf1f811e74c0bf96c264569c28ce007a3705f1a22d8f1aa
 SHA512 
00e5f9783a30d5da60da3686f616b23f4ec2413038bd8e8ee34665cc56ff2a2b0b0d0da8744a4d6dd6b99e20549e8031347a5db68d92d50ba5012c2cef782442

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

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 00..de98eda274
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.55.ebuild
@@ -0,0 +1,296 @@
+# 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 Prefix"
+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://dev.gentoo.org/~grobian/distfiles/prefix-${P}.tar.bz2";
+   KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos 
~x64-solaris"
+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}
+   !prefix? ( 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/findutil

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

2023-06-22 Thread Fabian Groffen
commit: 538900cc665a647d1f2eef564114d2b0ab06687a
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Jun 22 11:10:40 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Jun 22 11:10:59 2023 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=538900cc

sys-apps/portage-3.0.49: bump to official release

Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest   | 2 +-
 .../portage/{portage-3.0.48.1..ebuild => portage-3.0.49.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 75e9fca4db..f2df550c6d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,4 @@
 DIST prefix-portage-3.0.21.tar.bz2 1339211 BLAKE2B 
019cf0f3d2d1c45e7849221fc40b49e2c84949b74c8a8c74fbd2ca451a2dd075fb7b8bfec121a173ca0848c57a5a57a62d465b2957c4eb4d87f6a180299da91e
 SHA512 
0aff5004ae80e2cd9dce740c56c3c2643ef390510c3b3821d893e5c76733d3a8d4e7648963febb29479b9ee155868ec11526a393beb3b383e741451178f39e5a
 DIST prefix-portage-3.0.30.1.tar.bz2 1476396 BLAKE2B 
955db5832b1d7d19e25c4ee644f7daa0dbfc7a259ea7018f207865aa8cf5eb8e1e8e2a31c90578162e181af6c043590f239b042e652c3eb2cba9f442bbfc0476
 SHA512 
1ff8afbee4b204488eb0ecb4bdd216bf754ae015a3bcd298d7b6fb0dd7a671ccbf31d9a4a49be8e3182708641abe008f25df5319e135aa25363b979d49517506
 DIST prefix-portage-3.0.34.2.tar.bz2 1498499 BLAKE2B 
47f53e4917bdf204eb23dadd9dc821c06da07d2e5c68cf0a3de908089e4121d45542e2120e57744db1c808a156595624915956e77f547ab671b1584b2c67cf0b
 SHA512 
121dd885a73153e780e28c2e514d4b3babc44368aa6915b2009ed0b205051c2f6c37dd3ccfe8be5ea567e7bab2f9f9b0c5c5b81c49990fbac7360261721a5bb7
-DIST prefix-portage-3.0.48.1..tar.bz2 1370261 BLAKE2B 
051628582a75d4ef17c8fb7e29a860fd21b44ed84a821a17d475cec7cb67211986bf3729982116021bb0ff3f79cf213da9fa92323b903b042a61cd31bdd40b34
 SHA512 
ed5655301428439659d5a8921be82f5f0cf5db0ad0042216a077738e89c7b6fae73b3e6f986500e450facbb1fbc847860f3b2b6122ca8c3d702a8d4600dcc321
+DIST prefix-portage-3.0.49.tar.bz2 1421955 BLAKE2B 
ac6e5b512f943826d0bf06225037885a138f3810db973a60c6dbca4f80d516e3aef3054b532f42a143b35702661a3d35ee59945f745b849dcd6fefbd4ff8f3cc
 SHA512 
dee0035e048b1bfde5859b809bf6ffa3ca0674cd1d59d9cfcc14a279d87215223a6b4497274db7e443f27fd6dd05eadb043ae6872feb8fa8523994d9946b6879

diff --git a/sys-apps/portage/portage-3.0.48.1..ebuild 
b/sys-apps/portage/portage-3.0.49.ebuild
similarity index 100%
rename from sys-apps/portage/portage-3.0.48.1..ebuild
rename to sys-apps/portage/portage-3.0.49.ebuild



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

2023-06-17 Thread Fabian Groffen
commit: ef6d49320a5eb50dc3873d20a6bea4238097ab17
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Jun 17 09:06:25 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Jun 17 09:06:25 2023 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ef6d4932

sys-apps/portage-3.0.48.1.: version bump

Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest |   1 +
 sys-apps/portage/portage-3.0.48.1..ebuild | 311 ++
 2 files changed, 312 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f00a43e3af..75e9fca4db 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,4 @@
 DIST prefix-portage-3.0.21.tar.bz2 1339211 BLAKE2B 
019cf0f3d2d1c45e7849221fc40b49e2c84949b74c8a8c74fbd2ca451a2dd075fb7b8bfec121a173ca0848c57a5a57a62d465b2957c4eb4d87f6a180299da91e
 SHA512 
0aff5004ae80e2cd9dce740c56c3c2643ef390510c3b3821d893e5c76733d3a8d4e7648963febb29479b9ee155868ec11526a393beb3b383e741451178f39e5a
 DIST prefix-portage-3.0.30.1.tar.bz2 1476396 BLAKE2B 
955db5832b1d7d19e25c4ee644f7daa0dbfc7a259ea7018f207865aa8cf5eb8e1e8e2a31c90578162e181af6c043590f239b042e652c3eb2cba9f442bbfc0476
 SHA512 
1ff8afbee4b204488eb0ecb4bdd216bf754ae015a3bcd298d7b6fb0dd7a671ccbf31d9a4a49be8e3182708641abe008f25df5319e135aa25363b979d49517506
 DIST prefix-portage-3.0.34.2.tar.bz2 1498499 BLAKE2B 
47f53e4917bdf204eb23dadd9dc821c06da07d2e5c68cf0a3de908089e4121d45542e2120e57744db1c808a156595624915956e77f547ab671b1584b2c67cf0b
 SHA512 
121dd885a73153e780e28c2e514d4b3babc44368aa6915b2009ed0b205051c2f6c37dd3ccfe8be5ea567e7bab2f9f9b0c5c5b81c49990fbac7360261721a5bb7
+DIST prefix-portage-3.0.48.1..tar.bz2 1370261 BLAKE2B 
051628582a75d4ef17c8fb7e29a860fd21b44ed84a821a17d475cec7cb67211986bf3729982116021bb0ff3f79cf213da9fa92323b903b042a61cd31bdd40b34
 SHA512 
ed5655301428439659d5a8921be82f5f0cf5db0ad0042216a077738e89c7b6fae73b3e6f986500e450facbb1fbc847860f3b2b6122ca8c3d702a8d4600dcc321

diff --git a/sys-apps/portage/portage-3.0.48.1..ebuild 
b/sys-apps/portage/portage-3.0.48.1..ebuild
new file mode 100644
index 00..148d1f4259
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.48.1..ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
+
+DESCRIPTION="The package management system for Gentoo Prefix"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
+SRC_URI="https://dev.gentoo.org/~grobian/distfiles/prefix-${P}.tar.bz2";
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos 
~x64-solaris"
+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="
+   !prefix? ( acct-user/portage )
+   app-arch/zstd
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   >=sys-apps/findutils-4.4
+   !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-20180706
+   >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+   )
+   )
+   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   elibc_musl? ( >=sys-apps/sandbox-2.2 )
+   kernel_linux? ( sys-apps/util-linux )
+   >=app-misc/pax-utils-0.1.18
+   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+   xattr? ( kernel_linux? (
+   >=sys-apps/install-xattr-0.3
+   ) )
+   !> cnf/make.globals || die
+   fi
+
+   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:" \
+  

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

2023-02-01 Thread Sam James
commit: a0f6de14853ef353725e6ef1c77ef4c937d73c4a
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb  1 20:07:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb  1 20:07:19 2023 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a0f6de14

sys-apps/portage: add Python 3.10, 3.11 to older Portages

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

 sys-apps/portage/portage-3.0.21.ebuild  | 2 +-
 sys-apps/portage/portage-3.0.30.1-r1.ebuild | 2 +-
 sys-apps/portage/portage-3.0.30.1.ebuild| 2 +-
 sys-apps/portage/portage-3.0.34.2.ebuild| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-apps/portage/portage-3.0.21.ebuild 
b/sys-apps/portage/portage-3.0.21.ebuild
index 6505c08858..eee34697b0 100644
--- a/sys-apps/portage/portage-3.0.21.ebuild
+++ b/sys-apps/portage/portage-3.0.21.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
 inherit distutils-r1 linux-info systemd prefix

diff --git a/sys-apps/portage/portage-3.0.30.1-r1.ebuild 
b/sys-apps/portage/portage-3.0.30.1-r1.ebuild
index f3986eb874..383e4fddfe 100644
--- a/sys-apps/portage/portage-3.0.30.1-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.30.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 TMPFILES_OPTIONAL=1
 

diff --git a/sys-apps/portage/portage-3.0.30.1.ebuild 
b/sys-apps/portage/portage-3.0.30.1.ebuild
index 90eda9f188..e931e05c8a 100644
--- a/sys-apps/portage/portage-3.0.30.1.ebuild
+++ b/sys-apps/portage/portage-3.0.30.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
 inherit distutils-r1 linux-info systemd prefix

diff --git a/sys-apps/portage/portage-3.0.34.2.ebuild 
b/sys-apps/portage/portage-3.0.34.2.ebuild
index bce3173afc..6b5027abc3 100644
--- a/sys-apps/portage/portage-3.0.34.2.ebuild
+++ b/sys-apps/portage/portage-3.0.34.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 TMPFILES_OPTIONAL=1
 



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

2022-07-26 Thread Fabian Groffen
commit: 1967db27a408446c789a1f04ad36810dc21b1aeb
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Jul 26 19:44:17 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Jul 26 19:44:17 2022 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1967db27

sys-apps/portage-3.0.34.2: version bump to fix #861305

This fixes the shebang rewrite, and also includes a bunch of changes
made to reduce differences with master.

Closes: https://bugs.gentoo.org/861305
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest | 2 +-
 sys-apps/portage/{portage-3.0.34.1.ebuild => portage-3.0.34.2.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 245e0bd51f..f00a43e3af 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
 DIST prefix-portage-3.0.21.tar.bz2 1339211 BLAKE2B 
019cf0f3d2d1c45e7849221fc40b49e2c84949b74c8a8c74fbd2ca451a2dd075fb7b8bfec121a173ca0848c57a5a57a62d465b2957c4eb4d87f6a180299da91e
 SHA512 
0aff5004ae80e2cd9dce740c56c3c2643ef390510c3b3821d893e5c76733d3a8d4e7648963febb29479b9ee155868ec11526a393beb3b383e741451178f39e5a
 DIST prefix-portage-3.0.30.1.tar.bz2 1476396 BLAKE2B 
955db5832b1d7d19e25c4ee644f7daa0dbfc7a259ea7018f207865aa8cf5eb8e1e8e2a31c90578162e181af6c043590f239b042e652c3eb2cba9f442bbfc0476
 SHA512 
1ff8afbee4b204488eb0ecb4bdd216bf754ae015a3bcd298d7b6fb0dd7a671ccbf31d9a4a49be8e3182708641abe008f25df5319e135aa25363b979d49517506
-DIST prefix-portage-3.0.34.1.tar.bz2 1528372 BLAKE2B 
4a955e672de49c3d6674dc6326c64578a8e310326ba272005e5ea558f958db62f4c9da6bf9ceb71c41f89608524ca086d789fc990ad9ebed784a8ae884df0e0e
 SHA512 
c1da29f283d23cba38ed8fb9e53d412943cb3489530c3507cef25c654336233f8b8eed961227dbe7d4f534e7294173656bbdb0db6db9954e545fa8a72d0c3181
+DIST prefix-portage-3.0.34.2.tar.bz2 1498499 BLAKE2B 
47f53e4917bdf204eb23dadd9dc821c06da07d2e5c68cf0a3de908089e4121d45542e2120e57744db1c808a156595624915956e77f547ab671b1584b2c67cf0b
 SHA512 
121dd885a73153e780e28c2e514d4b3babc44368aa6915b2009ed0b205051c2f6c37dd3ccfe8be5ea567e7bab2f9f9b0c5c5b81c49990fbac7360261721a5bb7

diff --git a/sys-apps/portage/portage-3.0.34.1.ebuild 
b/sys-apps/portage/portage-3.0.34.2.ebuild
similarity index 100%
rename from sys-apps/portage/portage-3.0.34.1.ebuild
rename to sys-apps/portage/portage-3.0.34.2.ebuild



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

2022-07-24 Thread Fabian Groffen
commit: 89144649dce09fcf12eaae0769154b5616244983
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Jul 24 13:57:34 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Jul 24 19:37:39 2022 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=89144649

sys-apps/portage-3.0.34.1: version bump

Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest|   1 +
 sys-apps/portage/portage-3.0.34.1.ebuild | 311 +++
 2 files changed, 312 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 23c719e776..245e0bd51f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,3 @@
 DIST prefix-portage-3.0.21.tar.bz2 1339211 BLAKE2B 
019cf0f3d2d1c45e7849221fc40b49e2c84949b74c8a8c74fbd2ca451a2dd075fb7b8bfec121a173ca0848c57a5a57a62d465b2957c4eb4d87f6a180299da91e
 SHA512 
0aff5004ae80e2cd9dce740c56c3c2643ef390510c3b3821d893e5c76733d3a8d4e7648963febb29479b9ee155868ec11526a393beb3b383e741451178f39e5a
 DIST prefix-portage-3.0.30.1.tar.bz2 1476396 BLAKE2B 
955db5832b1d7d19e25c4ee644f7daa0dbfc7a259ea7018f207865aa8cf5eb8e1e8e2a31c90578162e181af6c043590f239b042e652c3eb2cba9f442bbfc0476
 SHA512 
1ff8afbee4b204488eb0ecb4bdd216bf754ae015a3bcd298d7b6fb0dd7a671ccbf31d9a4a49be8e3182708641abe008f25df5319e135aa25363b979d49517506
+DIST prefix-portage-3.0.34.1.tar.bz2 1528372 BLAKE2B 
4a955e672de49c3d6674dc6326c64578a8e310326ba272005e5ea558f958db62f4c9da6bf9ceb71c41f89608524ca086d789fc990ad9ebed784a8ae884df0e0e
 SHA512 
c1da29f283d23cba38ed8fb9e53d412943cb3489530c3507cef25c654336233f8b8eed961227dbe7d4f534e7294173656bbdb0db6db9954e545fa8a72d0c3181

diff --git a/sys-apps/portage/portage-3.0.34.1.ebuild 
b/sys-apps/portage/portage-3.0.34.1.ebuild
new file mode 100644
index 00..bce3173afc
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.34.1.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
+
+DESCRIPTION="The package management system for Gentoo Prefix"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
+SRC_URI="https://dev.gentoo.org/~grobian/distfiles/prefix-${P}.tar.bz2";
+
+LICENSE="GPL-2"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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="
+   !prefix? ( acct-user/portage )
+   app-arch/zstd
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   >=sys-apps/findutils-4.4
+   !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-20180706
+   >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+   )
+   )
+   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   elibc_musl? ( >=sys-apps/sandbox-2.2 )
+   kernel_linux? ( sys-apps/util-linux )
+   >=app-misc/pax-utils-0.1.18
+   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+   xattr? ( kernel_linux? (
+   >=sys-apps/install-xattr-0.3
+   ) )
+   !> cnf/make.globals || die
+   fi
+
+   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"' >> 

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

2022-07-03 Thread Fabian Groffen
commit: 899eedd6e815e5b867bb9445594d2e2f895cbf70
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Jul  3 19:04:41 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Jul  3 19:04:41 2022 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=899eedd6

sys-apps/portage-3.0.30.1-r1: revbump for py310, sync

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Fabian Groffen  gentoo.org>

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

diff --git a/sys-apps/portage/portage-3.0.30.1-r1.ebuild 
b/sys-apps/portage/portage-3.0.30.1-r1.ebuild
new file mode 100644
index 00..f3986eb874
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.30.1-r1.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
+
+DESCRIPTION="Portage package manager used in Gentoo Prefix"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
+SRC_URI="https://dev.gentoo.org/~grobian/distfiles/prefix-${P}.tar.bz2";
+
+LICENSE="GPL-2"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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="
+   !prefix? ( acct-user/portage )
+   app-arch/zstd
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   >=sys-apps/findutils-4.4
+   !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-20180706
+   >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+   )
+   )
+   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   elibc_musl? ( >=sys-apps/sandbox-2.2 )
+   kernel_linux? ( sys-apps/util-linux )
+   >=app-misc/pax-utils-0.1.18
+   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+   xattr? ( kernel_linux? (
+   >=sys-apps/install-xattr-0.3
+   ) )
+   !> cnf/make.globals || die
+   fi
+
+   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|' \
+   -i cnf/repos.conf || die "sed failed"
+   fi
+
+   if [[ -n ${EPREFIX} ]] ; then
+   # PREFIX LOCAL: only hack const_autotool
+   local extrapath="/usr/sbin:/usr/bin:/sbin:/bin"
+   # ok, we can't rely on PORTAGE_ROOT_USER being there yet, as 
people
+   # tend not to update that often, as long as we are a separate 
ebuild
+   # we can assume when unset, it's time for some older trick
+   if [[ -z ${PORTAGE_ROOT_USER} ]] ; then
+   PORTAGE_ROOT_USER=$(python -c 'from portage.const 
import rootuser; print rootuser')
+   fi
+   # We need to probe for bash in the Prefix, because it may not
+   # exist, in which case we fall back to the currently in use
+   # bash

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

2022-01-25 Thread Fabian Groffen
commit: 78bc2780900963532f21545b65fe0c6a91379fa7
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan 26 07:21:40 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan 26 07:21:40 2022 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=78bc2780

sys-apps/portage-3.0.30.1: add interrevisions patch

Closes: https://bugs.gentoo.org/832062
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Fabian Groffen  gentoo.org>

 .../files/portage-3.0.30-interrevisions.patch  | 68 ++
 sys-apps/portage/portage-3.0.30.1.ebuild   |  1 +
 2 files changed, 69 insertions(+)

diff --git a/sys-apps/portage/files/portage-3.0.30-interrevisions.patch 
b/sys-apps/portage/files/portage-3.0.30-interrevisions.patch
new file mode 100644
index 00..e53fbd233a
--- /dev/null
+++ b/sys-apps/portage/files/portage-3.0.30-interrevisions.patch
@@ -0,0 +1,68 @@
+https://bugs.gentoo.org/832062
+
+add (back) inter-revision support for Prefix Portage
+
+--- a/lib/portage/versions.py
 b/lib/portage/versions.py
+@@ -53,7 +53,9 @@
+ }
+ 
+ _v = r"(\d+)((\.\d+)*)([a-z]?)((_(pre|p|beta|alpha|rc)\d*)*)"
+-_rev = r"\d+"
++# PREFIX_LOCAL hack: -r(\d+) -> -r(\d+|\d+\.\d+) (see below)
++_rev = r"(\d+|\d+\.\d+)"
++# END_PREFIX_LOCAL
+ _vr = _v + "(-r(" + _rev + "))?"
+ 
+ _cp = {
+@@ -287,15 +289,47 @@
+ if rval:
+ return rval
+ 
+-# the suffix part is equal to, so finally check the revision
++# PREFIX_LOCAL
++# The suffix part is equal too, so finally check the revision
++# Prefix hack: historically a revision starting with 0 was an
++# 'inter-revision', which means that it is possible to create
++# revisions on revisions.  An example is -r01.1 which is the
++# first revision of -r1.  Note that a period (.) is used to
++# separate the real revision and the secondary revision number.
++# In the current state, the leading 0 is no longer used, and
++# versions just can have a dot, which means the version is an
++# inter-revision.
++# This trick is in use to allow revision bumps in ebuilds synced
++# from the main tree for Prefix changes, while still staying in
++# the main tree versioning scheme.  As such it can be used in
++# any other overlay where ebuilds from the another tree are
++# shadowed.
+ if match1.group(9):
+-r1 = int(match1.group(9))
++if '.' in match1.group(9):
++t = match1.group(9).split(".")
++r1 = int(t[0])
++r3 = int(t[1])
++else:
++r1 = int(match1.group(9))
++r3 = 0
+ else:
+ r1 = 0
++r3 = 0
+ if match2.group(9):
+-r2 = int(match2.group(9))
++if '.' in match2.group(9):
++t = match2.group(9).split(".")
++r2 = int(t[0])
++r4 = int(t[1])
++else:
++r2 = int(match2.group(9))
++r4 = 0
++# END_PREFIX_LOCAL
+ else:
+ r2 = 0
++r4 = 0
++if r1 == r2 and (r3 != 0 or r4 != 0):
++r1 = r3
++r2 = r4
+ rval = (r1 > r2) - (r1 < r2)
+ return rval
+ 

diff --git a/sys-apps/portage/portage-3.0.30.1.ebuild 
b/sys-apps/portage/portage-3.0.30.1.ebuild
index 88a5cd8eac..90eda9f188 100644
--- a/sys-apps/portage/portage-3.0.30.1.ebuild
+++ b/sys-apps/portage/portage-3.0.30.1.ebuild
@@ -100,6 +100,7 @@ python_prepare_all() {
 
eapply "${FILESDIR}"/${PN}-3.0.30-prefix-stack.patch # 658572
eapply "${FILESDIR}"/${PN}-3.0.30-ebuildshell.patch # 155161
+   eapply "${FILESDIR}"/${PN}-3.0.30-interrevisions.patch # 832062
if use gentoo-dev; then
einfo "Disabling --dynamic-deps by default for gentoo-dev..."
sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \



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

2022-01-16 Thread Fabian Groffen
commit: f091e18053badb883388330444a12739343f7eb1
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Jan 16 10:04:50 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Jan 16 10:05:30 2022 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f091e180

sys-apps/portage-3.0.30.1: version bump for Darwin

Closes: https://bugs.gentoo.org/831285
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest   | 2 +-
 sys-apps/portage/{portage-3.0.30.ebuild => portage-3.0.30.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 59b77c8363..23c719e776 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
 DIST prefix-portage-3.0.21.tar.bz2 1339211 BLAKE2B 
019cf0f3d2d1c45e7849221fc40b49e2c84949b74c8a8c74fbd2ca451a2dd075fb7b8bfec121a173ca0848c57a5a57a62d465b2957c4eb4d87f6a180299da91e
 SHA512 
0aff5004ae80e2cd9dce740c56c3c2643ef390510c3b3821d893e5c76733d3a8d4e7648963febb29479b9ee155868ec11526a393beb3b383e741451178f39e5a
-DIST prefix-portage-3.0.30.tar.bz2 1465506 BLAKE2B 
5a575bc6c6c537518a1d4738f59d6f5eec467c834d434493e83cb0262c9c121b0e55906b9f1b877b6e68b4b78f69548df03d8901a619ce1c69d9ffe5f2623e55
 SHA512 
52bb91057c8c983f227f1d30dcda1bdf915aecc1de89375b2af648e7bfc5543a30f9b670b3d7720724f8277f3e65745a22dfe670038222d61e939fd75c9b7bfd
+DIST prefix-portage-3.0.30.1.tar.bz2 1476396 BLAKE2B 
955db5832b1d7d19e25c4ee644f7daa0dbfc7a259ea7018f207865aa8cf5eb8e1e8e2a31c90578162e181af6c043590f239b042e652c3eb2cba9f442bbfc0476
 SHA512 
1ff8afbee4b204488eb0ecb4bdd216bf754ae015a3bcd298d7b6fb0dd7a671ccbf31d9a4a49be8e3182708641abe008f25df5319e135aa25363b979d49517506

diff --git a/sys-apps/portage/portage-3.0.30.ebuild 
b/sys-apps/portage/portage-3.0.30.1.ebuild
similarity index 100%
rename from sys-apps/portage/portage-3.0.30.ebuild
rename to sys-apps/portage/portage-3.0.30.1.ebuild



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

2022-01-14 Thread Fabian Groffen
commit: c6c1c09765855d9a1984b358066b4cadfb3c92da
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Jan 14 12:28:16 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Jan 14 12:28:16 2022 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c6c1c097

sys-apps/portage-3.0.30: version bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 .../portage/files/portage-3.0.30-ebuildshell.patch | 349 +
 .../files/portage-3.0.30-prefix-stack.patch|  81 +
 sys-apps/portage/portage-3.0.30.ebuild | 307 ++
 4 files changed, 738 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 13a1d23d2a..59b77c8363 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1 +1,2 @@
 DIST prefix-portage-3.0.21.tar.bz2 1339211 BLAKE2B 
019cf0f3d2d1c45e7849221fc40b49e2c84949b74c8a8c74fbd2ca451a2dd075fb7b8bfec121a173ca0848c57a5a57a62d465b2957c4eb4d87f6a180299da91e
 SHA512 
0aff5004ae80e2cd9dce740c56c3c2643ef390510c3b3821d893e5c76733d3a8d4e7648963febb29479b9ee155868ec11526a393beb3b383e741451178f39e5a
+DIST prefix-portage-3.0.30.tar.bz2 1465506 BLAKE2B 
5a575bc6c6c537518a1d4738f59d6f5eec467c834d434493e83cb0262c9c121b0e55906b9f1b877b6e68b4b78f69548df03d8901a619ce1c69d9ffe5f2623e55
 SHA512 
52bb91057c8c983f227f1d30dcda1bdf915aecc1de89375b2af648e7bfc5543a30f9b670b3d7720724f8277f3e65745a22dfe670038222d61e939fd75c9b7bfd

diff --git a/sys-apps/portage/files/portage-3.0.30-ebuildshell.patch 
b/sys-apps/portage/files/portage-3.0.30-ebuildshell.patch
new file mode 100644
index 00..20f0aab813
--- /dev/null
+++ b/sys-apps/portage/files/portage-3.0.30-ebuildshell.patch
@@ -0,0 +1,349 @@
+From 8c6b115fa0325b5bed2e1a9c4c8e8af45cdecc2e Mon Sep 17 00:00:00 2001
+From: Michael Haubenwallner 
+Date: Wed, 6 Nov 2013 12:40:05 +0100
+Subject: [PATCH 1/2] Add ebuildshell feature, bug#155161.
+
+---
+ bin/ebuild.sh| 146 ++-
+ bin/filter-bash-environment.py   |  55 +
+ bin/save-ebuild-env.sh   |   2 +-
+ man/make.conf.5  |   6 ++
+ lib/_emerge/AbstractEbuildProcess.py |   1 +
+ lib/portage/const.py |   1 +
+ 6 files changed, 194 insertions(+), 17 deletions(-)
+
+diff --git a/bin/ebuild.sh b/bin/ebuild.sh
+index f76a48d8e..683a4e9c1 100755
+--- a/bin/ebuild.sh
 b/bin/ebuild.sh
+@@ -121,7 +121,7 @@ __qa_source() {
+ __qa_call() {
+   local shopts=$(shopt) OLDIFS="$IFS"
+   local retval
+-  "$@"
++  __call-ebuildshell "$@"
+   retval=$?
+   set +e
+   [[ $shopts != $(shopt) ]] &&
+@@ -547,6 +547,150 @@ if [[ -n ${QA_INTERCEPTORS} ]] ; then
+   unset BIN_PATH BIN BODY FUNC_SRC
+ fi
+ 
++__call-ebuildshell() {
++  if ! has ebuildshell ${FEATURES}; then
++  "$@"
++  return $?
++  fi
++  local __ebuildshell_args=( "$@" )
++  # These are the variables I have seen 'bash -i' maintaining the values 
for:
++  local __ebuildshell_bash_i_vars="__ebuildshell_.*
++  _ BASH_ARGC BASH_ARGV BASH_COMMAND BASH_LINENO BASH_SOURCE
++  BASH_VERSINFO BASH_SUBSHELL BASHOPTS BASHPID COMP_WORDBREAKS
++  DIRSTACK EUID FUNCNAME GROUPS HISTCMD HISTFILE LINENO PIPESTATUS
++  PPID PS1 PS2 PS3 PS4 PWD RANDOM SECONDS SHELLOPTS UID"
++  # Allow recursive ebuildshell, for use in multibuild.eclass and similar:
++  local __ebuildshell_pid=${BASHPID:-$(__bashpid)}
++  local __ebuildshell_tmpf="${T}/ebuildshell.${__ebuildshell_pid}"
++  rm -f "${__ebuildshell_tmpf}."{ebuild,return}-{env,rovars}
++  (
++  cat <<-EOE
++  # local variables of functions using recursive 
ebuildshell are
++  # visible to the EXIT trap of that recursive 
ebuildshell.  To
++  # keep them local, we have to filter them from that 
recursive
++  # ebuildshell's return-env.  As 'declare -p' is unable 
to tell
++  # local-ity of variables, we abuse the trace attribute 
for local
++  # variables to filter them from the return-env.  So we 
need the
++  # local alias active before declaring any functions.
++  # On a sidehand, this allows for copy&paste of function 
body
++  # lines including the local keyword.
++  alias local='declare -t'
++  shopt -s expand_aliases
++  EOE
++  (
++  declare -p
++  declare -fp
++  shopt -p
++  [[ ${BASH_VERSINFO[0]} == 3 ]] && export
++  ) |
++  (
++  # we need everything but the bash vars after 'e

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

2022-01-13 Thread Fabian Groffen
commit: e1c3ede1b49379645456c4d1d4fa5b45725a1fb4
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Jan 14 07:45:18 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Jan 14 07:45:18 2022 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e1c3ede1

sys-apps/portage-3.0.21: sync ebuild with gx86

Package-Manager: Portage-3.0.21-prefix, Repoman-3.0.3
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   2 -
 sys-apps/portage/portage-3.0.14.ebuild | 298 -
 sys-apps/portage/portage-3.0.18.ebuild | 298 -
 sys-apps/portage/portage-3.0.21.ebuild |  41 +++--
 4 files changed, 25 insertions(+), 614 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 128f2ba77a..13a1d23d2a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1 @@
-DIST prefix-portage-3.0.14.tar.bz2 1314909 BLAKE2B 
5e5e0390466e5073795fece5d75800e7181f691d9fb81affdf5eb291b72a917a51976a83b9df5db6f5069a567c4c96e94e4ddb485cbff8b6827d281770006f2a
 SHA512 
a41dee35ae3e5eb1c77801640d6cedd75a706993a38d3260348ad13d570c128101443bc761ef6f207a305c0d03aa45fb8a88c29237e116c426382f2e2fd265e6
-DIST prefix-portage-3.0.18.tar.bz2 1348023 BLAKE2B 
fe0a39611e0a4c2af60f6b73bf56a432193dd859bd3d0a7ab91d5b716b980abe55823c48fa7811bacf152ff9ebfc499792ba37ff94920d3a0d5604536a119d3c
 SHA512 
ca0b78ceda58f225ab5f27e0998d5d9486d9f6609dc94b4471f4b5613fbdb6275c019ff994736cf9d85abb127e207e7065f00aea9f36ad6ebd36c196272cbfb1
 DIST prefix-portage-3.0.21.tar.bz2 1339211 BLAKE2B 
019cf0f3d2d1c45e7849221fc40b49e2c84949b74c8a8c74fbd2ca451a2dd075fb7b8bfec121a173ca0848c57a5a57a62d465b2957c4eb4d87f6a180299da91e
 SHA512 
0aff5004ae80e2cd9dce740c56c3c2643ef390510c3b3821d893e5c76733d3a8d4e7648963febb29479b9ee155868ec11526a393beb3b383e741451178f39e5a

diff --git a/sys-apps/portage/portage-3.0.14.ebuild 
b/sys-apps/portage/portage-3.0.14.ebuild
deleted file mode 100644
index bf3300c246..00
--- a/sys-apps/portage/portage-3.0.14.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 linux-info systemd prefix
-
-DESCRIPTION="Portage package manager used in Gentoo Prefix"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
-
-LICENSE="GPL-2"
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions rsync-verify selinux 
xattr"
-
-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
-   dev-python/sphinx-epytext
-   )"
-# 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="
-   app-arch/zstd
-   >=app-arch/tar-1.27
-   dev-lang/python-exec:2
-   !build? (
-   >=sys-apps/sed-4.0.5
-   app-shells/bash:0[readline]
-   >=app-admin/eselect-1.2
-   rsync-verify? (
-   >=app-portage/gemato-14[${PYTHON_USEDEP}]
-   >=app-crypt/openpgp-keys-gentoo-release-20180706
-   >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-   )
-   )
-   elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
-   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
-   elibc_uclibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
-   kernel_linux? ( >=app-misc/pax-utils-0.1.17 )
-   kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 )
-   kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 )
-   kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 )
-   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-   xattr? ( kernel_linux? (
-   >=sys-apps/install-xattr-0.3
-   ) )
-   !https://dev.gentoo.org/~zmedico/portage/archives 
https://dev.gentoo.org/~grobian/distfiles";
-
-prefix_src_archives() {
-   local x y
-   for x in ${@}; do
-   for y in ${SRC_ARCHIVES}; do
-   echo ${y}/${x}
-   done
-   done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/prefix-${PN}-${TARBALL_PV}.tar.bz2
-   $(prefix_src_archives prefix-${PN}-${TARBALL_PV}.tar.bz2)"
-
-S="${WORKDIR}"/prefix-${PN}-${TARBALL_PV}
-
-pkg_pretend() {
-   local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-   check_extra_config
-}
-
-

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

2021-07-06 Thread Fabian Groffen
commit: ce8ed85db9415e413c54037cf369cea781fac8c5
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Jul  6 07:35:25 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Jul  6 07:35:25 2021 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ce8ed85d

sys-apps/portage-3.0.21: version bump for EAPI=8

Package-Manager: Portage-3.0.21-prefix, Repoman-3.0.3
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   3 +-
 sys-apps/portage/portage-3.0.12.ebuild | 298 -
 ...age-3.0.12.0.2.ebuild => portage-3.0.21.ebuild} |   0
 3 files changed, 1 insertion(+), 300 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 51c88c4215..128f2ba77a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,3 @@
-DIST prefix-portage-3.0.12.0.2.tar.bz2 1321851 BLAKE2B 
80e8596531800d690083bddc8363f74d295839d70c6f86da0b5c385260836e593136e5baa5bd07d745e8eb82c894d0c97441aa2a0eb28bab8f1b83876a9aa3e5
 SHA512 
7dc1167058eb9aec756b59479a055c85037f4a7924a7a2dccbaf405a5d8464e04aef8796b02c8b7402e1f3446676d4d94789a170ef6b7e597c09a9600c2d2dae
-DIST prefix-portage-3.0.12.tar.bz2 1309809 BLAKE2B 
04b037b7d2d5077845f7d37d8dcedc03758191804d2dd44af4d87b5bbd94c8108ea673f9e06fce45342a5f8c26890bf2aa2dd482103fecb774cb14e314351d4c
 SHA512 
8fc179f571c6094b12fabca5e371e7d91d86d2799d282bc4ce2acf096950b18462a0c8dc766e7f4dc29ebba5f188c66375573f8539f8d1d0b1edf385a1d4078e
 DIST prefix-portage-3.0.14.tar.bz2 1314909 BLAKE2B 
5e5e0390466e5073795fece5d75800e7181f691d9fb81affdf5eb291b72a917a51976a83b9df5db6f5069a567c4c96e94e4ddb485cbff8b6827d281770006f2a
 SHA512 
a41dee35ae3e5eb1c77801640d6cedd75a706993a38d3260348ad13d570c128101443bc761ef6f207a305c0d03aa45fb8a88c29237e116c426382f2e2fd265e6
 DIST prefix-portage-3.0.18.tar.bz2 1348023 BLAKE2B 
fe0a39611e0a4c2af60f6b73bf56a432193dd859bd3d0a7ab91d5b716b980abe55823c48fa7811bacf152ff9ebfc499792ba37ff94920d3a0d5604536a119d3c
 SHA512 
ca0b78ceda58f225ab5f27e0998d5d9486d9f6609dc94b4471f4b5613fbdb6275c019ff994736cf9d85abb127e207e7065f00aea9f36ad6ebd36c196272cbfb1
+DIST prefix-portage-3.0.21.tar.bz2 1339211 BLAKE2B 
019cf0f3d2d1c45e7849221fc40b49e2c84949b74c8a8c74fbd2ca451a2dd075fb7b8bfec121a173ca0848c57a5a57a62d465b2957c4eb4d87f6a180299da91e
 SHA512 
0aff5004ae80e2cd9dce740c56c3c2643ef390510c3b3821d893e5c76733d3a8d4e7648963febb29479b9ee155868ec11526a393beb3b383e741451178f39e5a

diff --git a/sys-apps/portage/portage-3.0.12.ebuild 
b/sys-apps/portage/portage-3.0.12.ebuild
deleted file mode 100644
index bf3300c246..00
--- a/sys-apps/portage/portage-3.0.12.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 linux-info systemd prefix
-
-DESCRIPTION="Portage package manager used in Gentoo Prefix"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
-
-LICENSE="GPL-2"
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions rsync-verify selinux 
xattr"
-
-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
-   dev-python/sphinx-epytext
-   )"
-# 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="
-   app-arch/zstd
-   >=app-arch/tar-1.27
-   dev-lang/python-exec:2
-   !build? (
-   >=sys-apps/sed-4.0.5
-   app-shells/bash:0[readline]
-   >=app-admin/eselect-1.2
-   rsync-verify? (
-   >=app-portage/gemato-14[${PYTHON_USEDEP}]
-   >=app-crypt/openpgp-keys-gentoo-release-20180706
-   >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-   )
-   )
-   elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
-   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
-   elibc_uclibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
-   kernel_linux? ( >=app-misc/pax-utils-0.1.17 )
-   kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 )
-   kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 )
-   kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 )
-   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-   xattr? ( kernel_linux? (
-   >=sys-apps/install-xattr-0.3
-   ) )
-   !https://d

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

2021-04-16 Thread Fabian Groffen
commit: df5404d501c3630c8a71f79f1841275ed63f1e23
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Apr 16 13:12:56 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Apr 16 13:12:56 2021 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=df5404d5

sys-apps/portage-3.0.18: version bump

Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-3.0.18.ebuild | 298 +
 2 files changed, 299 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 2bcf934896..51c88c4215 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,4 @@
 DIST prefix-portage-3.0.12.0.2.tar.bz2 1321851 BLAKE2B 
80e8596531800d690083bddc8363f74d295839d70c6f86da0b5c385260836e593136e5baa5bd07d745e8eb82c894d0c97441aa2a0eb28bab8f1b83876a9aa3e5
 SHA512 
7dc1167058eb9aec756b59479a055c85037f4a7924a7a2dccbaf405a5d8464e04aef8796b02c8b7402e1f3446676d4d94789a170ef6b7e597c09a9600c2d2dae
 DIST prefix-portage-3.0.12.tar.bz2 1309809 BLAKE2B 
04b037b7d2d5077845f7d37d8dcedc03758191804d2dd44af4d87b5bbd94c8108ea673f9e06fce45342a5f8c26890bf2aa2dd482103fecb774cb14e314351d4c
 SHA512 
8fc179f571c6094b12fabca5e371e7d91d86d2799d282bc4ce2acf096950b18462a0c8dc766e7f4dc29ebba5f188c66375573f8539f8d1d0b1edf385a1d4078e
 DIST prefix-portage-3.0.14.tar.bz2 1314909 BLAKE2B 
5e5e0390466e5073795fece5d75800e7181f691d9fb81affdf5eb291b72a917a51976a83b9df5db6f5069a567c4c96e94e4ddb485cbff8b6827d281770006f2a
 SHA512 
a41dee35ae3e5eb1c77801640d6cedd75a706993a38d3260348ad13d570c128101443bc761ef6f207a305c0d03aa45fb8a88c29237e116c426382f2e2fd265e6
+DIST prefix-portage-3.0.18.tar.bz2 1348023 BLAKE2B 
fe0a39611e0a4c2af60f6b73bf56a432193dd859bd3d0a7ab91d5b716b980abe55823c48fa7811bacf152ff9ebfc499792ba37ff94920d3a0d5604536a119d3c
 SHA512 
ca0b78ceda58f225ab5f27e0998d5d9486d9f6609dc94b4471f4b5613fbdb6275c019ff994736cf9d85abb127e207e7065f00aea9f36ad6ebd36c196272cbfb1

diff --git a/sys-apps/portage/portage-3.0.18.ebuild 
b/sys-apps/portage/portage-3.0.18.ebuild
new file mode 100644
index 00..bf3300c246
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.18.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info systemd prefix
+
+DESCRIPTION="Portage package manager used in Gentoo Prefix"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
+
+LICENSE="GPL-2"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions rsync-verify selinux 
xattr"
+
+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
+   dev-python/sphinx-epytext
+   )"
+# 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="
+   app-arch/zstd
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   !build? (
+   >=sys-apps/sed-4.0.5
+   app-shells/bash:0[readline]
+   >=app-admin/eselect-1.2
+   rsync-verify? (
+   >=app-portage/gemato-14[${PYTHON_USEDEP}]
+   >=app-crypt/openpgp-keys-gentoo-release-20180706
+   >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+   )
+   )
+   elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
+   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   elibc_uclibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   kernel_linux? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 )
+   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+   xattr? ( kernel_linux? (
+   >=sys-apps/install-xattr-0.3
+   ) )
+   !https://dev.gentoo.org/~zmedico/portage/archives 
https://dev.gentoo.org/~grobian/distfiles";
+
+prefix_src_archives() {
+   local x y
+   for x in ${@}; do
+   for y in ${SRC_ARCHIVES}; do
+   echo ${y}/${x}
+   done
+   done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/prefix-${PN}-${TARBALL_PV}.tar.bz2
+   $(prefix_src_archives prefix-${PN}-${TARBALL_PV}.tar.bz

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

2021-04-10 Thread Sam James
commit: a931a268d96910397d3bfcf761b43b88325a853c
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 10 07:06:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 10 07:06:45 2021 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a931a268

sys-apps/portage: clena up EAPI 5 version (2.3.100-r1)

Broken by EAPI 5 support removal from python-utils-r1.

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

 sys-apps/portage/Manifest  |   1 -
 sys-apps/portage/portage-2.3.100-r1.ebuild | 296 -
 2 files changed, 297 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3510a9dbf2..2bcf934896 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,3 @@
-DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 
165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db
 SHA512 
8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c
 DIST prefix-portage-3.0.12.0.2.tar.bz2 1321851 BLAKE2B 
80e8596531800d690083bddc8363f74d295839d70c6f86da0b5c385260836e593136e5baa5bd07d745e8eb82c894d0c97441aa2a0eb28bab8f1b83876a9aa3e5
 SHA512 
7dc1167058eb9aec756b59479a055c85037f4a7924a7a2dccbaf405a5d8464e04aef8796b02c8b7402e1f3446676d4d94789a170ef6b7e597c09a9600c2d2dae
 DIST prefix-portage-3.0.12.tar.bz2 1309809 BLAKE2B 
04b037b7d2d5077845f7d37d8dcedc03758191804d2dd44af4d87b5bbd94c8108ea673f9e06fce45342a5f8c26890bf2aa2dd482103fecb774cb14e314351d4c
 SHA512 
8fc179f571c6094b12fabca5e371e7d91d86d2799d282bc4ce2acf096950b18462a0c8dc766e7f4dc29ebba5f188c66375573f8539f8d1d0b1edf385a1d4078e
 DIST prefix-portage-3.0.14.tar.bz2 1314909 BLAKE2B 
5e5e0390466e5073795fece5d75800e7181f691d9fb81affdf5eb291b72a917a51976a83b9df5db6f5069a567c4c96e94e4ddb485cbff8b6827d281770006f2a
 SHA512 
a41dee35ae3e5eb1c77801640d6cedd75a706993a38d3260348ad13d570c128101443bc761ef6f207a305c0d03aa45fb8a88c29237e116c426382f2e2fd265e6

diff --git a/sys-apps/portage/portage-2.3.100-r1.ebuild 
b/sys-apps/portage/portage-2.3.100-r1.ebuild
deleted file mode 100644
index 8677cb5462..00
--- a/sys-apps/portage/portage-2.3.100-r1.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 epatch linux-info prefix
-
-DESCRIPTION="Portage package manager used in Gentoo Prefix"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
-
-LICENSE="GPL-2"
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions rsync-verify selinux 
xattr"
-
-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
-   dev-python/sphinx-epytext
-   )"
-# 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="
-   app-arch/zstd
-   >=app-arch/tar-1.27
-   dev-lang/python-exec:2
-   !build? (
-   >=sys-apps/sed-4.0.5
-   app-shells/bash:0[readline]
-   >=app-admin/eselect-1.2
-   rsync-verify? (
-   >=app-portage/gemato-14[${PYTHON_USEDEP}]
-   >=app-crypt/openpgp-keys-gentoo-release-20180706
-   >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-   )
-   )
-   elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
-   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
-   elibc_uclibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
-   kernel_linux? ( >=app-misc/pax-utils-0.1.17 )
-   kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 )
-   kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 )
-   kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 )
-   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-   xattr? ( kernel_linux? (
-   >=sys-apps/install-xattr-0.3
-   ) )
-   !https://dev.gentoo.org/~zmedico/portage/archives 
https://dev.gentoo.org/~grobian/distfiles";
-
-prefix_src_archives() {
-   local x y
-   for x in ${@}; do
-   for y in ${SRC_ARCHIVES}; do
-   echo ${y}/${x}
-   done
-   done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/prefix-${PN}-${TARBALL_PV}.tar.bz2
-   $(prefix_src_archives prefix-${P

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

2021-01-24 Thread Fabian Groffen
commit: 79fb2cb8161adf27ea60baa3785c168d941ca391
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Jan 24 09:41:54 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Jan 24 09:41:54 2021 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=79fb2cb8

sys-apps/portage-3.0.14: version bump

Package-Manager: Portage-3.0.14-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest   | 1 +
 sys-apps/portage/portage-2.3.100-r1.ebuild  | 6 +++---
 sys-apps/portage/portage-3.0.12.0.2.ebuild  | 4 ++--
 sys-apps/portage/portage-3.0.12.ebuild  | 6 +++---
 .../portage/{portage-3.0.12.0.2.ebuild => portage-3.0.14.ebuild}| 4 ++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 22db22cfe7..3510a9dbf2 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,4 @@
 DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 
165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db
 SHA512 
8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c
 DIST prefix-portage-3.0.12.0.2.tar.bz2 1321851 BLAKE2B 
80e8596531800d690083bddc8363f74d295839d70c6f86da0b5c385260836e593136e5baa5bd07d745e8eb82c894d0c97441aa2a0eb28bab8f1b83876a9aa3e5
 SHA512 
7dc1167058eb9aec756b59479a055c85037f4a7924a7a2dccbaf405a5d8464e04aef8796b02c8b7402e1f3446676d4d94789a170ef6b7e597c09a9600c2d2dae
 DIST prefix-portage-3.0.12.tar.bz2 1309809 BLAKE2B 
04b037b7d2d5077845f7d37d8dcedc03758191804d2dd44af4d87b5bbd94c8108ea673f9e06fce45342a5f8c26890bf2aa2dd482103fecb774cb14e314351d4c
 SHA512 
8fc179f571c6094b12fabca5e371e7d91d86d2799d282bc4ce2acf096950b18462a0c8dc766e7f4dc29ebba5f188c66375573f8539f8d1d0b1edf385a1d4078e
+DIST prefix-portage-3.0.14.tar.bz2 1314909 BLAKE2B 
5e5e0390466e5073795fece5d75800e7181f691d9fb81affdf5eb291b72a917a51976a83b9df5db6f5069a567c4c96e94e4ddb485cbff8b6827d281770006f2a
 SHA512 
a41dee35ae3e5eb1c77801640d6cedd75a706993a38d3260348ad13d570c128101443bc761ef6f207a305c0d03aa45fb8a88c29237e116c426382f2e2fd265e6

diff --git a/sys-apps/portage/portage-2.3.100-r1.ebuild 
b/sys-apps/portage/portage-2.3.100-r1.ebuild
index 4b9d294bfd..8677cb5462 100644
--- a/sys-apps/portage/portage-2.3.100-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.100-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
 inherit distutils-r1 epatch linux-info prefix
@@ -13,7 +13,7 @@ DESCRIPTION="Portage package manager used in Gentoo Prefix"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
 
 LICENSE="GPL-2"
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions rsync-verify selinux 
xattr"
 

diff --git a/sys-apps/portage/portage-3.0.12.0.2.ebuild 
b/sys-apps/portage/portage-3.0.12.0.2.ebuild
index 1383f395f6..bf3300c246 100644
--- a/sys-apps/portage/portage-3.0.12.0.2.ebuild
+++ b/sys-apps/portage/portage-3.0.12.0.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
 inherit distutils-r1 linux-info systemd prefix
@@ -13,7 +13,7 @@ DESCRIPTION="Portage package manager used in Gentoo Prefix"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
 
 LICENSE="GPL-2"
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions rsync-verify selinux 
xattr"
 

diff --git a/sys-apps/portage/portage-3.0.12.ebuild 
b/sys-apps/portage/portage-3.0.12.ebuild
index 96122f0c71..bf3300c246 100644
--- a/sys-apps/portage/portage-3.0.12.ebuild
+++ b/sys-apps/portage/portage-3.0.12.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
 PYTHON_REQ_USE='bzip2(+),thre

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

2021-01-04 Thread Fabian Groffen
commit: fbc146fd7ec39c04da33cf85c507ec401748e57d
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Jan  4 12:11:50 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Jan  4 12:11:50 2021 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fbc146fd

sys-apps/portage-3.0.12.0.2: more complete fix for Darwin spawn problems

Bug: https://bugs.gentoo.org/758230
Package-Manager: Portage-3.0.12.0.2-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-3.0.12.0.2.ebuild | 298 +
 2 files changed, 299 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 32f96fef4f..22db22cfe7 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,3 @@
 DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 
165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db
 SHA512 
8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c
+DIST prefix-portage-3.0.12.0.2.tar.bz2 1321851 BLAKE2B 
80e8596531800d690083bddc8363f74d295839d70c6f86da0b5c385260836e593136e5baa5bd07d745e8eb82c894d0c97441aa2a0eb28bab8f1b83876a9aa3e5
 SHA512 
7dc1167058eb9aec756b59479a055c85037f4a7924a7a2dccbaf405a5d8464e04aef8796b02c8b7402e1f3446676d4d94789a170ef6b7e597c09a9600c2d2dae
 DIST prefix-portage-3.0.12.tar.bz2 1309809 BLAKE2B 
04b037b7d2d5077845f7d37d8dcedc03758191804d2dd44af4d87b5bbd94c8108ea673f9e06fce45342a5f8c26890bf2aa2dd482103fecb774cb14e314351d4c
 SHA512 
8fc179f571c6094b12fabca5e371e7d91d86d2799d282bc4ce2acf096950b18462a0c8dc766e7f4dc29ebba5f188c66375573f8539f8d1d0b1edf385a1d4078e

diff --git a/sys-apps/portage/portage-3.0.12.0.2.ebuild 
b/sys-apps/portage/portage-3.0.12.0.2.ebuild
new file mode 100644
index 00..1383f395f6
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.12.0.2.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info systemd prefix
+
+DESCRIPTION="Portage package manager used in Gentoo Prefix"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
+
+LICENSE="GPL-2"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions rsync-verify selinux 
xattr"
+
+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
+   dev-python/sphinx-epytext
+   )"
+# 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="
+   app-arch/zstd
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   !build? (
+   >=sys-apps/sed-4.0.5
+   app-shells/bash:0[readline]
+   >=app-admin/eselect-1.2
+   rsync-verify? (
+   >=app-portage/gemato-14[${PYTHON_USEDEP}]
+   >=app-crypt/openpgp-keys-gentoo-release-20180706
+   >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+   )
+   )
+   elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
+   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   elibc_uclibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   kernel_linux? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 )
+   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+   xattr? ( kernel_linux? (
+   >=sys-apps/install-xattr-0.3
+   ) )
+   !https://dev.gentoo.org/~zmedico/portage/archives 
https://dev.gentoo.org/~grobian/distfiles";
+
+prefix_src_archives() {
+   local x y
+   for x in ${@}; do
+   for y in ${SRC_ARCHIVES}; do
+   echo ${y}/${x}
+   done
+   done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/prefix-${PN}-${TARBALL_PV}.tar.bz2
+   $(prefix_src_archives prefix-${PN}-${TARBALL_PV}.tar.bz2)"
+
+S="${WORKDIR}"/prefix-${PN}-${TARBALL_PV}
+
+pkg_pretend() {
+   local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+   check_extra_config
+}
+
+python_prepare_all() {
+   distutils-r1_python_pr

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

2021-01-04 Thread Fabian Groffen
commit: bf96f53348cbd41697dcc22818a6fdae81a2e683
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Jan  4 11:00:18 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Jan  4 11:00:18 2021 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bf96f533

sys-apps/portage-3.0.12.0.1: drop broken version

Package-Manager: Portage-3.0.12.0.1-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   1 -
 sys-apps/portage/portage-3.0.12.0.1.ebuild | 298 -
 2 files changed, 299 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 1351917fcc..32f96fef4f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,2 @@
 DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 
165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db
 SHA512 
8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c
-DIST prefix-portage-3.0.12.0.1.tar.bz2 1318662 BLAKE2B 
444b0bc76a0a2fe47b44c773e4766ad2e36b082fd1770db360ec3689312590feb2c116b93471a6da9e553c27a47df831063d13e00e49e1532b94dddf68a29a42
 SHA512 
110f568ec00c6b49b5b9c37f5448b2e56e575369074ad28b536f2978191c40226aaee3f1743226f9211892cda6197d1efa14fe8c404d9cb20374bbb4cb95e39b
 DIST prefix-portage-3.0.12.tar.bz2 1309809 BLAKE2B 
04b037b7d2d5077845f7d37d8dcedc03758191804d2dd44af4d87b5bbd94c8108ea673f9e06fce45342a5f8c26890bf2aa2dd482103fecb774cb14e314351d4c
 SHA512 
8fc179f571c6094b12fabca5e371e7d91d86d2799d282bc4ce2acf096950b18462a0c8dc766e7f4dc29ebba5f188c66375573f8539f8d1d0b1edf385a1d4078e

diff --git a/sys-apps/portage/portage-3.0.12.0.1.ebuild 
b/sys-apps/portage/portage-3.0.12.0.1.ebuild
deleted file mode 100644
index 1383f395f6..00
--- a/sys-apps/portage/portage-3.0.12.0.1.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 linux-info systemd prefix
-
-DESCRIPTION="Portage package manager used in Gentoo Prefix"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
-
-LICENSE="GPL-2"
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions rsync-verify selinux 
xattr"
-
-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
-   dev-python/sphinx-epytext
-   )"
-# 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="
-   app-arch/zstd
-   >=app-arch/tar-1.27
-   dev-lang/python-exec:2
-   !build? (
-   >=sys-apps/sed-4.0.5
-   app-shells/bash:0[readline]
-   >=app-admin/eselect-1.2
-   rsync-verify? (
-   >=app-portage/gemato-14[${PYTHON_USEDEP}]
-   >=app-crypt/openpgp-keys-gentoo-release-20180706
-   >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-   )
-   )
-   elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
-   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
-   elibc_uclibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
-   kernel_linux? ( >=app-misc/pax-utils-0.1.17 )
-   kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 )
-   kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 )
-   kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 )
-   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-   xattr? ( kernel_linux? (
-   >=sys-apps/install-xattr-0.3
-   ) )
-   !https://dev.gentoo.org/~zmedico/portage/archives 
https://dev.gentoo.org/~grobian/distfiles";
-
-prefix_src_archives() {
-   local x y
-   for x in ${@}; do
-   for y in ${SRC_ARCHIVES}; do
-   echo ${y}/${x}
-   done
-   done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/prefix-${PN}-${TARBALL_PV}.tar.bz2
-   $(prefix_src_archives prefix-${PN}-${TARBALL_PV}.tar.bz2)"
-
-S="${WORKDIR}"/prefix-${PN}-${TARBALL_PV}
-
-pkg_pretend() {
-   local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-   check_extra_config
-}
-
-python_prepare_all() {
-   distutils-r1_python_prepare_all
-
-   eapply "${FILESDIR}"/${PN}-2.3.62-pre

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

2021-01-04 Thread Fabian Groffen
commit: e98f6e88302bb22954be5bbd89b0d3afcc240b54
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Jan  4 10:53:12 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Jan  4 10:53:12 2021 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e98f6e88

sys-apps/portage-3.0.12.0.1: bump for real Darwin multiprocessing fix

Package-Manager: Portage-3.0.12.0.1-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-3.0.12.0.1.ebuild | 298 +
 2 files changed, 299 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 32f96fef4f..1351917fcc 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,3 @@
 DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 
165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db
 SHA512 
8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c
+DIST prefix-portage-3.0.12.0.1.tar.bz2 1318662 BLAKE2B 
444b0bc76a0a2fe47b44c773e4766ad2e36b082fd1770db360ec3689312590feb2c116b93471a6da9e553c27a47df831063d13e00e49e1532b94dddf68a29a42
 SHA512 
110f568ec00c6b49b5b9c37f5448b2e56e575369074ad28b536f2978191c40226aaee3f1743226f9211892cda6197d1efa14fe8c404d9cb20374bbb4cb95e39b
 DIST prefix-portage-3.0.12.tar.bz2 1309809 BLAKE2B 
04b037b7d2d5077845f7d37d8dcedc03758191804d2dd44af4d87b5bbd94c8108ea673f9e06fce45342a5f8c26890bf2aa2dd482103fecb774cb14e314351d4c
 SHA512 
8fc179f571c6094b12fabca5e371e7d91d86d2799d282bc4ce2acf096950b18462a0c8dc766e7f4dc29ebba5f188c66375573f8539f8d1d0b1edf385a1d4078e

diff --git a/sys-apps/portage/portage-3.0.12.0.1.ebuild 
b/sys-apps/portage/portage-3.0.12.0.1.ebuild
new file mode 100644
index 00..1383f395f6
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.12.0.1.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info systemd prefix
+
+DESCRIPTION="Portage package manager used in Gentoo Prefix"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
+
+LICENSE="GPL-2"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions rsync-verify selinux 
xattr"
+
+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
+   dev-python/sphinx-epytext
+   )"
+# 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="
+   app-arch/zstd
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   !build? (
+   >=sys-apps/sed-4.0.5
+   app-shells/bash:0[readline]
+   >=app-admin/eselect-1.2
+   rsync-verify? (
+   >=app-portage/gemato-14[${PYTHON_USEDEP}]
+   >=app-crypt/openpgp-keys-gentoo-release-20180706
+   >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+   )
+   )
+   elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
+   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   elibc_uclibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   kernel_linux? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 )
+   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+   xattr? ( kernel_linux? (
+   >=sys-apps/install-xattr-0.3
+   ) )
+   !https://dev.gentoo.org/~zmedico/portage/archives 
https://dev.gentoo.org/~grobian/distfiles";
+
+prefix_src_archives() {
+   local x y
+   for x in ${@}; do
+   for y in ${SRC_ARCHIVES}; do
+   echo ${y}/${x}
+   done
+   done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/prefix-${PN}-${TARBALL_PV}.tar.bz2
+   $(prefix_src_archives prefix-${PN}-${TARBALL_PV}.tar.bz2)"
+
+S="${WORKDIR}"/prefix-${PN}-${TARBALL_PV}
+
+pkg_pretend() {
+   local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+   check_extra_config
+}
+
+python_prepare_all() {
+   distutils-r1_python_prepare_all
+
+   eapply "${FILESDIR}

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

2020-12-27 Thread Fabian Groffen
commit: 68902b285af5b9f86a04c01137f4a4ab6209d9a8
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Dec 27 11:04:55 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Dec 27 11:04:55 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=68902b28

sys-apps/portage: drop ~m68k-mint

Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

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

diff --git a/sys-apps/portage/portage-2.3.100-r1.ebuild 
b/sys-apps/portage/portage-2.3.100-r1.ebuild
index 41d7f0f7ef..4b9d294bfd 100644
--- a/sys-apps/portage/portage-2.3.100-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.100-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Portage package manager used in Gentoo Prefix"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
 
 LICENSE="GPL-2"
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions rsync-verify selinux 
xattr"
 

diff --git a/sys-apps/portage/portage-3.0.12.ebuild 
b/sys-apps/portage/portage-3.0.12.ebuild
index 98ff87dcd3..96122f0c71 100644
--- a/sys-apps/portage/portage-3.0.12.ebuild
+++ b/sys-apps/portage/portage-3.0.12.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Portage package manager used in Gentoo Prefix"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
 
 LICENSE="GPL-2"
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions rsync-verify selinux 
xattr"
 



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

2020-12-22 Thread Fabian Groffen
commit: 9598e86278cbfbd6eee394faa546f1c16cd33ac0
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Dec 22 21:06:50 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Dec 22 21:06:50 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9598e862

sys-apps/portage: drop ~ppc-aix

Bug: https://bugs.gentoo.org/760057
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/portage-2.3.100-r1.ebuild | 3 +--
 sys-apps/portage/portage-3.0.12.ebuild | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/sys-apps/portage/portage-2.3.100-r1.ebuild 
b/sys-apps/portage/portage-2.3.100-r1.ebuild
index e4c795008a..41d7f0f7ef 100644
--- a/sys-apps/portage/portage-2.3.100-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.100-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Portage package manager used in Gentoo Prefix"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
 
 LICENSE="GPL-2"
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions rsync-verify selinux 
xattr"
 
@@ -52,7 +52,6 @@ RDEPEND="
kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 )
kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 )
kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 )
-   kernel_AIX? ( >=sys-apps/aix-miscutils-0.1.1634 )
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-3.0.12.ebuild 
b/sys-apps/portage/portage-3.0.12.ebuild
index cf3cc74f4b..98ff87dcd3 100644
--- a/sys-apps/portage/portage-3.0.12.ebuild
+++ b/sys-apps/portage/portage-3.0.12.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Portage package manager used in Gentoo Prefix"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
 
 LICENSE="GPL-2"
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions rsync-verify selinux 
xattr"
 
@@ -52,7 +52,6 @@ RDEPEND="
kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 )
kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 )
kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 )
-   kernel_AIX? ( >=sys-apps/aix-miscutils-0.1.1634 )
selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
xattr? ( kernel_linux? (
>=sys-apps/install-xattr-0.3



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

2020-12-07 Thread Fabian Groffen
commit: f2225a34eaa02778907b77103bb920f2cd88a8de
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Dec  7 17:38:50 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Dec  7 17:38:50 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f2225a34

sys-apps/portage-3.0.12: version bump

Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |  2 +-
 .../portage-3.0.10-multiprocessing-no-spawn.patch  | 32 --
 ...ge-3.0.10.3-r1.ebuild => portage-3.0.12.ebuild} |  3 --
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a2010f89eb..32f96fef4f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
 DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 
165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db
 SHA512 
8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c
-DIST prefix-portage-3.0.10.3.tar.bz2 1316420 BLAKE2B 
296a26cd39f84f477434fc125a53ea0569b43c78f30d3aba6a59f07a112f7d55d6f1286f596c0cc4dcce5c1154cf20e78432fc50b04f7f5b92969c5f81cddc89
 SHA512 
1ebc43be3a6108bccc8bd8f3fa2c781402d0a73f18e012b341959fff5fc52603e27d5a8bd8fe08b82188d6694f041381654a0d3cd566e3f05b559d83ccbddbee
+DIST prefix-portage-3.0.12.tar.bz2 1309809 BLAKE2B 
04b037b7d2d5077845f7d37d8dcedc03758191804d2dd44af4d87b5bbd94c8108ea673f9e06fce45342a5f8c26890bf2aa2dd482103fecb774cb14e314351d4c
 SHA512 
8fc179f571c6094b12fabca5e371e7d91d86d2799d282bc4ce2acf096950b18462a0c8dc766e7f4dc29ebba5f188c66375573f8539f8d1d0b1edf385a1d4078e

diff --git 
a/sys-apps/portage/files/portage-3.0.10-multiprocessing-no-spawn.patch 
b/sys-apps/portage/files/portage-3.0.10-multiprocessing-no-spawn.patch
deleted file mode 100644
index e93d2fc046..00
--- a/sys-apps/portage/files/portage-3.0.10-multiprocessing-no-spawn.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Alteration of the following patch to force fork mode iso spawn
-
-From f093da4a3a457d539e5682ccecdf91f254addd8c Mon Sep 17 00:00:00 2001
-From: Zac Medico 
-Date: Thu, 3 Dec 2020 21:37:39 -0800
-Subject: [PATCH] runTests.py: multiprocessing.set_start_method('spawn') for
- debugging bug 758230
-
-Force fork mode because spawn mode requires all argument to be
-pickle-able, which currently is not the case.  This is an issue because
-Python 3.8 changed the default from fork to spawn on macOS.
-
-diff --git a/bin/emerge b/bin/emerge
-index 8f1db61a6..3731a9081 100755
 a/bin/emerge
-+++ b/bin/emerge
-@@ -2,6 +2,7 @@
- # Copyright 2006-2020 Gentoo Authors
- # Distributed under the terms of the GNU General Public License v2
- 
-+import multiprocessing
- import platform
- import signal
- import sys
-@@ -44,6 +45,7 @@ try:
-   from _emerge.main import emerge_main
- 
-   if __name__ == "__main__":
-+  multiprocessing.set_start_method('fork')
-   from portage.exception import IsADirectory, ParseError, \
-   PermissionDenied
-   portage.process.sanitize_fds()

diff --git a/sys-apps/portage/portage-3.0.10.3-r1.ebuild 
b/sys-apps/portage/portage-3.0.12.ebuild
similarity index 98%
rename from sys-apps/portage/portage-3.0.10.3-r1.ebuild
rename to sys-apps/portage/portage-3.0.12.ebuild
index c3bac2e8fc..cf3cc74f4b 100644
--- a/sys-apps/portage/portage-3.0.10.3-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.12.ebuild
@@ -94,9 +94,6 @@ pkg_pretend() {
 python_prepare_all() {
distutils-r1_python_prepare_all
 
-   # drop this patch when bug 758230 gets resolved
-   eapply "${FILESDIR}"/${PN}-3.0.10-multiprocessing-no-spawn.patch # 
758230
-
eapply "${FILESDIR}"/${PN}-2.3.62-prefix-stack.patch # 658572
eapply "${FILESDIR}"/${PN}-2.3.45-ebuildshell.patch # 155161
if use gentoo-dev; then



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

2020-12-04 Thread Fabian Groffen
commit: a425220505c4e94abe9df6c7d7f64a9ee71764d3
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Dec  4 11:44:02 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Dec  4 11:44:02 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a4252205

sys-apps/portage-3.0.10.3-r1: use correct multiprocessing patch

Package-Manager: Portage-3.0.10.3-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 .../portage-3.0.10-multiprocessing-no-spawn.patch  | 32 +++---
 ...-3.0.10.3.ebuild => portage-3.0.10.3-r1.ebuild} |  0
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git 
a/sys-apps/portage/files/portage-3.0.10-multiprocessing-no-spawn.patch 
b/sys-apps/portage/files/portage-3.0.10-multiprocessing-no-spawn.patch
index 19ae16b5ac..e93d2fc046 100644
--- a/sys-apps/portage/files/portage-3.0.10-multiprocessing-no-spawn.patch
+++ b/sys-apps/portage/files/portage-3.0.10-multiprocessing-no-spawn.patch
@@ -1,4 +1,4 @@
-Alteration of the original patch to force fork mode iso spawn
+Alteration of the following patch to force fork mode iso spawn
 
 From f093da4a3a457d539e5682ccecdf91f254addd8c Mon Sep 17 00:00:00 2001
 From: Zac Medico 
@@ -10,23 +10,23 @@ Force fork mode because spawn mode requires all argument to 
be
 pickle-able, which currently is not the case.  This is an issue because
 Python 3.8 changed the default from fork to spawn on macOS.
 
-diff --git a/lib/portage/tests/runTests.py b/lib/portage/tests/runTests.py
-index 9514abebe0..6e33077aef 100755
 a/lib/portage/tests/runTests.py
-+++ b/lib/portage/tests/runTests.py
-@@ -4,6 +4,7 @@
+diff --git a/bin/emerge b/bin/emerge
+index 8f1db61a6..3731a9081 100755
+--- a/bin/emerge
 b/bin/emerge
+@@ -2,6 +2,7 @@
+ # Copyright 2006-2020 Gentoo Authors
  # Distributed under the terms of the GNU General Public License v2
  
- import grp
 +import multiprocessing
- import os
- import os.path as osp
  import platform
-@@ -60,6 +61,7 @@ def debug_signal(signum, frame):
-   os.environ["PATH"] = ":".join(path)
+ import signal
+ import sys
+@@ -44,6 +45,7 @@ try:
+   from _emerge.main import emerge_main
  
- if __name__ == "__main__":
-+  multiprocessing.set_start_method('fork')
-   try:
-   sys.exit(tests.main())
-   finally:
+   if __name__ == "__main__":
++  multiprocessing.set_start_method('fork')
+   from portage.exception import IsADirectory, ParseError, \
+   PermissionDenied
+   portage.process.sanitize_fds()

diff --git a/sys-apps/portage/portage-3.0.10.3.ebuild 
b/sys-apps/portage/portage-3.0.10.3-r1.ebuild
similarity index 100%
rename from sys-apps/portage/portage-3.0.10.3.ebuild
rename to sys-apps/portage/portage-3.0.10.3-r1.ebuild



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

2020-12-04 Thread Fabian Groffen
commit: c6672f91217e0b0ec7739faebbdfba76fd6e83e5
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Dec  4 10:34:49 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Dec  4 10:37:54 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c6672f91

sys-apps/portage-3.0.10.3: fix Python 3.8 on macOS interaction

- added patch to temp force fork mode, to ensure we can run Portage with
  Python 3.8 (the only configured target nowadays) on Darwin
- this release includes a fix for Linux/Solaris users (ELF-targets) to
  silence invalid soname dependencies warnings about missing
  host-provided libs

Bug: https://bugs.gentoo.org/758230
Package-Manager: Portage-3.0.10.3-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   3 +-
 .../portage-3.0.10-multiprocessing-no-spawn.patch  |  32 +++
 ...age-3.0.10.2.ebuild => portage-3.0.10.3.ebuild} |   3 +
 sys-apps/portage/portage-3.0.8.ebuild  | 299 -
 4 files changed, 36 insertions(+), 301 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 18b009f14a..a2010f89eb 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,2 @@
 DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 
165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db
 SHA512 
8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c
-DIST prefix-portage-3.0.10.2.tar.bz2 1332430 BLAKE2B 
cade8c882fa67abf1f1cd3f8589dc7976ac4d555aa92733cc4d360b1669467c81b18a27140f6255d34f7efbca0e92103e791144e6fec6a7de8285958c7491fc5
 SHA512 
ce13c8b93aec5bad9febdfd7911b2169c6418ddf351cbe6fb5226f01236c51607b7ad2cc0bf0b31bf3ba8aa78c3eaa05fbcffb81da59820d4040e98f79f50e6f
-DIST prefix-portage-3.0.8.tar.bz2 1360204 BLAKE2B 
b4d3046e4a2ac7ae611a54b1a669d3d13b337aa29a9adb540f6da5104b47ca8d41798cc268bc4ab464f553bb280173a598127b5b290871ba0bf57f2fbd15bf58
 SHA512 
fb532b4145952f9467e1a86349e753e80d20b8b35d17d2d99ede590ff5aa6d367f16be41f2335738ed01c82238e2f93179e9b35d588ad92859f4b1f135539a00
+DIST prefix-portage-3.0.10.3.tar.bz2 1316420 BLAKE2B 
296a26cd39f84f477434fc125a53ea0569b43c78f30d3aba6a59f07a112f7d55d6f1286f596c0cc4dcce5c1154cf20e78432fc50b04f7f5b92969c5f81cddc89
 SHA512 
1ebc43be3a6108bccc8bd8f3fa2c781402d0a73f18e012b341959fff5fc52603e27d5a8bd8fe08b82188d6694f041381654a0d3cd566e3f05b559d83ccbddbee

diff --git 
a/sys-apps/portage/files/portage-3.0.10-multiprocessing-no-spawn.patch 
b/sys-apps/portage/files/portage-3.0.10-multiprocessing-no-spawn.patch
new file mode 100644
index 00..19ae16b5ac
--- /dev/null
+++ b/sys-apps/portage/files/portage-3.0.10-multiprocessing-no-spawn.patch
@@ -0,0 +1,32 @@
+Alteration of the original patch to force fork mode iso spawn
+
+From f093da4a3a457d539e5682ccecdf91f254addd8c Mon Sep 17 00:00:00 2001
+From: Zac Medico 
+Date: Thu, 3 Dec 2020 21:37:39 -0800
+Subject: [PATCH] runTests.py: multiprocessing.set_start_method('spawn') for
+ debugging bug 758230
+
+Force fork mode because spawn mode requires all argument to be
+pickle-able, which currently is not the case.  This is an issue because
+Python 3.8 changed the default from fork to spawn on macOS.
+
+diff --git a/lib/portage/tests/runTests.py b/lib/portage/tests/runTests.py
+index 9514abebe0..6e33077aef 100755
+--- a/lib/portage/tests/runTests.py
 b/lib/portage/tests/runTests.py
+@@ -4,6 +4,7 @@
+ # Distributed under the terms of the GNU General Public License v2
+ 
+ import grp
++import multiprocessing
+ import os
+ import os.path as osp
+ import platform
+@@ -60,6 +61,7 @@ def debug_signal(signum, frame):
+   os.environ["PATH"] = ":".join(path)
+ 
+ if __name__ == "__main__":
++  multiprocessing.set_start_method('fork')
+   try:
+   sys.exit(tests.main())
+   finally:

diff --git a/sys-apps/portage/portage-3.0.10.2.ebuild 
b/sys-apps/portage/portage-3.0.10.3.ebuild
similarity index 98%
rename from sys-apps/portage/portage-3.0.10.2.ebuild
rename to sys-apps/portage/portage-3.0.10.3.ebuild
index cf3cc74f4b..c3bac2e8fc 100644
--- a/sys-apps/portage/portage-3.0.10.2.ebuild
+++ b/sys-apps/portage/portage-3.0.10.3.ebuild
@@ -94,6 +94,9 @@ pkg_pretend() {
 python_prepare_all() {
distutils-r1_python_prepare_all
 
+   # drop this patch when bug 758230 gets resolved
+   eapply "${FILESDIR}"/${PN}-3.0.10-multiprocessing-no-spawn.patch # 
758230
+
eapply "${FILESDIR}"/${PN}-2.3.62-prefix-stack.patch # 658572
eapply "${FILESDIR}"/${PN}-2.3.45-ebuildshell.patch # 155161
if use gentoo-dev; then

diff --git a/sys-apps/portage/portage-3.0.8.ebuild 
b/sys-apps/portage/portage-3.0.8.ebuild
deleted file mode 100644
index cf3cc74f4b..00
--- a/sys-apps/portage/portage-3.0.8.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 19

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

2020-11-28 Thread Fabian Groffen
commit: 80d619334821e50f62f8ba7433687caafbef75df
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 28 20:06:30 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 28 20:06:30 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=80d61933

sys-apps/portage-3.0.10.2: bump to fix library resolution on macOS

Closes: https://bugs.gentoo.org/757240
Package-Manager: Portage-3.0.10-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest | 2 +-
 sys-apps/portage/{portage-3.0.10.1.ebuild => portage-3.0.10.2.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7ce942d939..18b009f14a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
 DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 
165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db
 SHA512 
8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c
-DIST prefix-portage-3.0.10.1.tar.bz2 1316537 BLAKE2B 
a844265ed7ff74f5effa5827205fd87547351675045dc5e9a565eb210af88f50c9f1b77065db250bbfb4866ae4b271599158ee1b2e271bafd4627dd42887
 SHA512 
5e6b95fa1ecf3591360dac42866421f5d574e8402acd2c804347ecfc8a234bb484f3e756bb62297e0cd12f6dbc953b6f14238a098d60332cd41308737e2ee9b3
+DIST prefix-portage-3.0.10.2.tar.bz2 1332430 BLAKE2B 
cade8c882fa67abf1f1cd3f8589dc7976ac4d555aa92733cc4d360b1669467c81b18a27140f6255d34f7efbca0e92103e791144e6fec6a7de8285958c7491fc5
 SHA512 
ce13c8b93aec5bad9febdfd7911b2169c6418ddf351cbe6fb5226f01236c51607b7ad2cc0bf0b31bf3ba8aa78c3eaa05fbcffb81da59820d4040e98f79f50e6f
 DIST prefix-portage-3.0.8.tar.bz2 1360204 BLAKE2B 
b4d3046e4a2ac7ae611a54b1a669d3d13b337aa29a9adb540f6da5104b47ca8d41798cc268bc4ab464f553bb280173a598127b5b290871ba0bf57f2fbd15bf58
 SHA512 
fb532b4145952f9467e1a86349e753e80d20b8b35d17d2d99ede590ff5aa6d367f16be41f2335738ed01c82238e2f93179e9b35d588ad92859f4b1f135539a00

diff --git a/sys-apps/portage/portage-3.0.10.1.ebuild 
b/sys-apps/portage/portage-3.0.10.2.ebuild
similarity index 100%
rename from sys-apps/portage/portage-3.0.10.1.ebuild
rename to sys-apps/portage/portage-3.0.10.2.ebuild



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

2020-11-23 Thread Fabian Groffen
commit: d74690c60e79b075f9fc162ae3783d5514e8e9fe
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 23 07:56:20 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 23 07:56:20 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d74690c6

sys-apps/portage-3.0.10.1: version bump

Package-Manager: Portage-3.0.10-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest   | 2 +-
 sys-apps/portage/{portage-3.0.10.ebuild => portage-3.0.10.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b4c2dac774..7ce942d939 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
 DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 
165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db
 SHA512 
8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c
-DIST prefix-portage-3.0.10.tar.bz2 1358206 BLAKE2B 
846a5da7c1316eff7e906a658b3f204a999dbf7137704a97f04341661516215f731c749c9ed6ec83124ee71307104cc3d22dda593fb26523d5892a573eac5339
 SHA512 
2bed81c51ea0b8dea4abb9f793f4fac3e32a20b277bc262310115d380b0b766f7ac7bdee2eeaf4f6b899f9030a8c0d57b5ff051c758447deeab186b1a15b49bb
+DIST prefix-portage-3.0.10.1.tar.bz2 1316537 BLAKE2B 
a844265ed7ff74f5effa5827205fd87547351675045dc5e9a565eb210af88f50c9f1b77065db250bbfb4866ae4b271599158ee1b2e271bafd4627dd42887
 SHA512 
5e6b95fa1ecf3591360dac42866421f5d574e8402acd2c804347ecfc8a234bb484f3e756bb62297e0cd12f6dbc953b6f14238a098d60332cd41308737e2ee9b3
 DIST prefix-portage-3.0.8.tar.bz2 1360204 BLAKE2B 
b4d3046e4a2ac7ae611a54b1a669d3d13b337aa29a9adb540f6da5104b47ca8d41798cc268bc4ab464f553bb280173a598127b5b290871ba0bf57f2fbd15bf58
 SHA512 
fb532b4145952f9467e1a86349e753e80d20b8b35d17d2d99ede590ff5aa6d367f16be41f2335738ed01c82238e2f93179e9b35d588ad92859f4b1f135539a00

diff --git a/sys-apps/portage/portage-3.0.10.ebuild 
b/sys-apps/portage/portage-3.0.10.1.ebuild
similarity index 100%
rename from sys-apps/portage/portage-3.0.10.ebuild
rename to sys-apps/portage/portage-3.0.10.1.ebuild



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

2020-11-22 Thread Fabian Groffen
commit: 6cc6802a01746c6b683d0320d37620b442cb4049
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Nov 22 11:30:53 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Nov 22 11:30:53 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6cc6802a

sys-apps/portage-3.0.10: version bump

Package-Manager: Portage-3.0.10-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest| 2 +-
 sys-apps/portage/{portage-3.0.1.ebuild => portage-3.0.10.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7c17104cbe..b4c2dac774 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
 DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 
165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db
 SHA512 
8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c
-DIST prefix-portage-3.0.1.tar.bz2 1279330 BLAKE2B 
ac94a2c2b56f23cf35cb229ae8719077e41fe7fb8e74d16beb3542b43d246d6c26dce73b9cec4c126b65b9bf0b4452bc233a83aeb4c873e8dd7c8d5742008221
 SHA512 
5c141b80e20f11aad6990e5f42fcc2cddb6475e03fc978fd1446773dd6833dd4ccf96b07440e1184cb95e210654218011b383872004907a915164813da22663c
+DIST prefix-portage-3.0.10.tar.bz2 1358206 BLAKE2B 
846a5da7c1316eff7e906a658b3f204a999dbf7137704a97f04341661516215f731c749c9ed6ec83124ee71307104cc3d22dda593fb26523d5892a573eac5339
 SHA512 
2bed81c51ea0b8dea4abb9f793f4fac3e32a20b277bc262310115d380b0b766f7ac7bdee2eeaf4f6b899f9030a8c0d57b5ff051c758447deeab186b1a15b49bb
 DIST prefix-portage-3.0.8.tar.bz2 1360204 BLAKE2B 
b4d3046e4a2ac7ae611a54b1a669d3d13b337aa29a9adb540f6da5104b47ca8d41798cc268bc4ab464f553bb280173a598127b5b290871ba0bf57f2fbd15bf58
 SHA512 
fb532b4145952f9467e1a86349e753e80d20b8b35d17d2d99ede590ff5aa6d367f16be41f2335738ed01c82238e2f93179e9b35d588ad92859f4b1f135539a00

diff --git a/sys-apps/portage/portage-3.0.1.ebuild 
b/sys-apps/portage/portage-3.0.10.ebuild
similarity index 100%
rename from sys-apps/portage/portage-3.0.1.ebuild
rename to sys-apps/portage/portage-3.0.10.ebuild



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

2020-09-26 Thread Fabian Groffen
commit: 5c9f39cb53279acde0d96b29df31d2dba55f1643
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Sep 26 11:37:02 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Sep 26 11:37:02 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5c9f39cb

sys-apps/portage-3.0.8: version bump

Package-Manager: Portage-3.0.8-prefix, Repoman-2.3.23
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest |   1 +
 sys-apps/portage/portage-3.0.8.ebuild | 299 ++
 2 files changed, 300 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 40b9f12b82..7c17104cbe 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,3 @@
 DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 
165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db
 SHA512 
8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c
 DIST prefix-portage-3.0.1.tar.bz2 1279330 BLAKE2B 
ac94a2c2b56f23cf35cb229ae8719077e41fe7fb8e74d16beb3542b43d246d6c26dce73b9cec4c126b65b9bf0b4452bc233a83aeb4c873e8dd7c8d5742008221
 SHA512 
5c141b80e20f11aad6990e5f42fcc2cddb6475e03fc978fd1446773dd6833dd4ccf96b07440e1184cb95e210654218011b383872004907a915164813da22663c
+DIST prefix-portage-3.0.8.tar.bz2 1360204 BLAKE2B 
b4d3046e4a2ac7ae611a54b1a669d3d13b337aa29a9adb540f6da5104b47ca8d41798cc268bc4ab464f553bb280173a598127b5b290871ba0bf57f2fbd15bf58
 SHA512 
fb532b4145952f9467e1a86349e753e80d20b8b35d17d2d99ede590ff5aa6d367f16be41f2335738ed01c82238e2f93179e9b35d588ad92859f4b1f135539a00

diff --git a/sys-apps/portage/portage-3.0.8.ebuild 
b/sys-apps/portage/portage-3.0.8.ebuild
new file mode 100644
index 00..cf3cc74f4b
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.8.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info systemd prefix
+
+DESCRIPTION="Portage package manager used in Gentoo Prefix"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
+
+LICENSE="GPL-2"
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions rsync-verify selinux 
xattr"
+
+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
+   dev-python/sphinx-epytext
+   )"
+# 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="
+   app-arch/zstd
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   !build? (
+   >=sys-apps/sed-4.0.5
+   app-shells/bash:0[readline]
+   >=app-admin/eselect-1.2
+   rsync-verify? (
+   >=app-portage/gemato-14[${PYTHON_USEDEP}]
+   >=app-crypt/openpgp-keys-gentoo-release-20180706
+   >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+   )
+   )
+   elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
+   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   elibc_uclibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   kernel_linux? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 )
+   kernel_AIX? ( >=sys-apps/aix-miscutils-0.1.1634 )
+   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+   xattr? ( kernel_linux? (
+   >=sys-apps/install-xattr-0.3
+   ) )
+   !https://dev.gentoo.org/~zmedico/portage/archives 
https://dev.gentoo.org/~grobian/distfiles";
+
+prefix_src_archives() {
+   local x y
+   for x in ${@}; do
+   for y in ${SRC_ARCHIVES}; do
+   echo ${y}/${x}
+   done
+   done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/prefix-${PN}-${TARBALL_PV}.tar.bz2
+   $(prefix_src_archives prefix-${PN}-${TARBALL_PV}.tar.bz2)"
+
+S="${WORKDIR}"/prefix-${PN}-${TARBALL_PV}
+
+pkg_pretend() {
+   local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+   check_extra_config
+}
+
+python_prepare_all() {
+   distutils-r1_python_prepare_all
+
+   eapp

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

2020-08-02 Thread Fabian Groffen
commit: e4209bd2ca1ed72324cac02cd49a0634114c5f10
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Aug  2 11:43:06 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Aug  2 11:43:06 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e4209bd2

sys-apps/portage: cleanup and version bump 3.0.1

Package-Manager: Portage-3.0.1-prefix, Repoman-2.3.23
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   3 +-
 sys-apps/portage/files/05portage.envd  |   1 -
 sys-apps/portage/files/portage-2.2.28-cygwin.patch |  16 -
 .../files/portage-2.2.28-ebuildshell-r1.patch  | 354 
 .../portage/files/portage-2.3.10-ebuildshell.patch | 355 -
 .../portage/files/portage-2.3.40-ebuildshell.patch | 354 
 sys-apps/portage/files/portage-ccache.conf |   2 +
 sys-apps/portage/metadata.xml  |   1 -
 sys-apps/portage/portage-2.3.100.ebuild| 264 ---
 sys-apps/portage/portage-2.3.68.ebuild | 264 ---
 ...{portage-2.3.84.ebuild => portage-3.0.1.ebuild} | 117 ---
 11 files changed, 79 insertions(+), 1652 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7e8f3291c5..40b9f12b82 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,2 @@
 DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 
165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db
 SHA512 
8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c
-DIST prefix-portage-2.3.68.tar.bz2 1283044 BLAKE2B 
81a9462c2b34b64baff78bc046676abf147a6840f7fb2872c9e26eef5a110e2c53b550ac213f734f7c4e70e4b220ea62d885cd99652d9093448f6e5c4633a115
 SHA512 
7c6124e0b01fd1fdba68a5cb68882baa2301945faf559bb61afd6b632128ca435d7e9a596b1079bd744ed4155041399ba0a3779190c9fa891b5dc815ccb46813
-DIST prefix-portage-2.3.84.tar.bz2 1289922 BLAKE2B 
1644b7c1a03b7fbccabe24bfd9c8378d12aeabeda2db35e286372901898d5f572c39e36625fbc2914334ca64e38e1320adca0143a9898fca64223be7d8a877cc
 SHA512 
e243e21405a53e6ff234a7851fc4ef869450dc213acd6ed2168329c7c947289a97c60104aa31bd85319b3fef0abbc2c5759608abd795edc426b06ddea2ce3cdb
+DIST prefix-portage-3.0.1.tar.bz2 1279330 BLAKE2B 
ac94a2c2b56f23cf35cb229ae8719077e41fe7fb8e74d16beb3542b43d246d6c26dce73b9cec4c126b65b9bf0b4452bc233a83aeb4c873e8dd7c8d5742008221
 SHA512 
5c141b80e20f11aad6990e5f42fcc2cddb6475e03fc978fd1446773dd6833dd4ccf96b07440e1184cb95e210654218011b383872004907a915164813da22663c

diff --git a/sys-apps/portage/files/05portage.envd 
b/sys-apps/portage/files/05portage.envd
deleted file mode 100644
index ec949055ca..00
--- a/sys-apps/portage/files/05portage.envd
+++ /dev/null
@@ -1 +0,0 @@
-PYTHONPATH="@GENTOO_PORTAGE_EPREFIX@/usr/lib/portage/pym"

diff --git a/sys-apps/portage/files/portage-2.2.28-cygwin.patch 
b/sys-apps/portage/files/portage-2.2.28-cygwin.patch
deleted file mode 100644
index 9a9bbec43a..00
--- a/sys-apps/portage/files/portage-2.2.28-cygwin.patch
+++ /dev/null
@@ -1,16 +0,0 @@
 prefix-portage-2.2.28/bin/helper-functions.sh.orig 2016-11-16 
15:43:02.338368826 +0100
-+++ prefix-portage-2.2.28/bin/helper-functions.sh  2016-11-16 
15:43:21.498359600 +0100
-@@ -21,11 +21,12 @@
-   # Setup a pipe for children to write their pids to when they finish.
-   # We have to allocate two fd's because POSIX has undefined behavior
-   # when you open a FIFO for simultaneous read/write. #487056
-+  # And Cygwin supports just one read/write fd at once. #583962
-   local pipe=$(mktemp -t multijob.XX)
-   rm -f "${pipe}"
-   mkfifo -m 600 "${pipe}"
--  __redirect_alloc_fd mj_write_fd "${pipe}"
-   __redirect_alloc_fd mj_read_fd "${pipe}"
-+  __redirect_alloc_fd mj_write_fd "${pipe}" '>'
-   rm -f "${pipe}"
- 
-   # See how many children we can fork based on the user's settings.

diff --git a/sys-apps/portage/files/portage-2.2.28-ebuildshell-r1.patch 
b/sys-apps/portage/files/portage-2.2.28-ebuildshell-r1.patch
deleted file mode 100644
index 298f0a0b08..00
--- a/sys-apps/portage/files/portage-2.2.28-ebuildshell-r1.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-From bd58cc5f041558ab0885a1bf733319c38a24f24b Mon Sep 17 00:00:00 2001
-From: Michael Haubenwallner 
-Date: Wed, 6 Nov 2013 12:40:05 +0100
-Subject: [PATCH] Add the ebuildshell feature, bug#155161.
-

- bin/ebuild.sh| 145 ++-
- bin/filter-bash-environment.py   |  57 ++
- bin/save-ebuild-env.sh   |   2 +-
- man/make.conf.5  |   6 ++
- pym/_emerge/AbstractEbuildProcess.py |   1 +
- pym/portage/const.py |   1 +
- 6 files changed, 194 insertions(+), 18 deletions(-)
-
-dif

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

2020-06-08 Thread Fabian Groffen
commit: 47dc628aec373f64a232a874e4d8f909f57d38a8
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Jun  8 08:20:16 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Jun  8 08:20:16 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=47dc628a

sys-apps/portage-2.3.100-r1: revbump to sync ebuild with gx86

Package-Manager: Portage-2.3.84-prefix, Repoman-2.3.22
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/metadata.xml  |   7 +
 sys-apps/portage/portage-2.3.100-r1.ebuild | 297 +
 2 files changed, 304 insertions(+)

diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index c66241962c..1ffd22f625 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -5,12 +5,15 @@
 mailto:[email protected]
 
https://gitweb.gentoo.org/proj/portage.git/plain/RELEASE-NOTES
 https://wiki.gentoo.org/wiki/Handbook:AMD64/Working/Portage
+cpe:/a:gentoo:portage
   
   
 [email protected]
   
   
 Build html API documentation with epydoc.
+Build html API documentation with sphinx-apidoc.
+Enable features required for Gentoo ebuild 
development.
 Use inter-process communication between portage and
 running ebuilds.
 
@@ -20,6 +23,10 @@
 This should only be temporarily disabled for some bootstrapping
 operations.  Cross-compilation is not supported.
 
+
+Enable full-tree cryptographic verification of Gentoo repository
+rsync checkouts using app-portage/gemato.
+
 Preserve extended attributes (filesystem-stored 
metadata)
 when installing files. Usually only required for hardened systems.
 

diff --git a/sys-apps/portage/portage-2.3.100-r1.ebuild 
b/sys-apps/portage/portage-2.3.100-r1.ebuild
new file mode 100644
index 00..e4c795008a
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.100-r1.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 epatch linux-info prefix
+
+DESCRIPTION="Portage package manager used in Gentoo Prefix"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
+
+LICENSE="GPL-2"
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions rsync-verify selinux 
xattr"
+
+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
+   dev-python/sphinx-epytext
+   )"
+# 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="
+   app-arch/zstd
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   !build? (
+   >=sys-apps/sed-4.0.5
+   app-shells/bash:0[readline]
+   >=app-admin/eselect-1.2
+   rsync-verify? (
+   >=app-portage/gemato-14[${PYTHON_USEDEP}]
+   >=app-crypt/openpgp-keys-gentoo-release-20180706
+   >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+   )
+   )
+   elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
+   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   elibc_uclibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   kernel_linux? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 )
+   kernel_AIX? ( >=sys-apps/aix-miscutils-0.1.1634 )
+   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+   xattr? ( kernel_linux? (
+   >=sys-apps/install-xattr-0.3
+   ) )
+   !https://dev.gentoo.org/~zmedico/portage/archives 
https://dev.gentoo.org/~grobian/distfiles";
+
+prefix_src_archives() {
+   local x y
+   for x in ${@}; do
+   for y in ${SRC_ARCHIVES}; do
+   echo ${y}/${x}
+   done
+   done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/prefix-${PN}-${TARBALL_PV}.tar.bz2
+   $(prefix_src_archives prefix-${PN}-${TARBALL_PV}.tar.bz2)"
+
+S="${WORKDIR}"/prefix-${PN}-${TARBALL_PV}
+
+pkg_pretend() {
+   local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+   check_extra_config
+}
+
+python_prepare_all() {
+   distutils-r

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

2020-06-06 Thread Fabian Groffen
commit: 6728782f1d96e26a5058a05eecfa7d618146792e
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Jun  6 08:09:30 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Jun  6 08:09:30 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6728782f

sys-apps/portage-2.3.100: version bump

Package-Manager: Portage-2.3.84-prefix, Repoman-2.3.22
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  | 2 +-
 sys-apps/portage/{portage-2.3.67.ebuild => portage-2.3.100.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8d022cb000..7e8f3291c5 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
-DIST prefix-portage-2.3.67.tar.bz2 1264791 BLAKE2B 
3df7fa5d0698128c7bf57df6924ebeadcc07f6d7427376ba44750faffc25d32095d48d9bd0760a02c0b8a8a913383d5119987f3e24bfe7b2ef23f711ea8ced2f
 SHA512 
06126db6dbf5669ad0b1d367d563fc6015f8dbfcc6ec32c625037596c649bf3755ca63efc8f8ca9fe352a435d3e679580d41fe830b624028047f52b648d209dd
+DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 
165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db
 SHA512 
8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c
 DIST prefix-portage-2.3.68.tar.bz2 1283044 BLAKE2B 
81a9462c2b34b64baff78bc046676abf147a6840f7fb2872c9e26eef5a110e2c53b550ac213f734f7c4e70e4b220ea62d885cd99652d9093448f6e5c4633a115
 SHA512 
7c6124e0b01fd1fdba68a5cb68882baa2301945faf559bb61afd6b632128ca435d7e9a596b1079bd744ed4155041399ba0a3779190c9fa891b5dc815ccb46813
 DIST prefix-portage-2.3.84.tar.bz2 1289922 BLAKE2B 
1644b7c1a03b7fbccabe24bfd9c8378d12aeabeda2db35e286372901898d5f572c39e36625fbc2914334ca64e38e1320adca0143a9898fca64223be7d8a877cc
 SHA512 
e243e21405a53e6ff234a7851fc4ef869450dc213acd6ed2168329c7c947289a97c60104aa31bd85319b3fef0abbc2c5759608abd795edc426b06ddea2ce3cdb

diff --git a/sys-apps/portage/portage-2.3.67.ebuild 
b/sys-apps/portage/portage-2.3.100.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.3.67.ebuild
rename to sys-apps/portage/portage-2.3.100.ebuild
index 083ed2521d..a651d7eeb5 100644
--- a/sys-apps/portage/portage-2.3.67.ebuild
+++ b/sys-apps/portage/portage-2.3.100.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 PYTHON_COMPAT=(
pypy3
-   python3_6 python3_7
+   python3_{6,7,8,9}
python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'



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

2020-01-08 Thread Fabian Groffen
commit: 0dd82e483a0603dc9f1d49503f8477cbf32cd81f
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  8 19:22:02 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  8 19:22:02 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0dd82e48

sys-apps/portage-2.3.84: version bump

Package-Manager: Portage-2.3.84-prefix, Repoman-2.3.17
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest   |  2 +-
 sys-apps/portage/portage-2.3.67.ebuild  |  6 +++---
 sys-apps/portage/portage-2.3.68.ebuild  |  6 +++---
 .../{portage-2.3.62.ebuild => portage-2.3.84.ebuild}| 13 +++--
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e8fd3704e3..8d022cb000 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
-DIST prefix-portage-2.3.62.tar.bz2 1274936 BLAKE2B 
e6e9af5626b1d75b5ff56cbd33324eae2f3d8bbc0aa9c1fe8a7b622b85770234b73d8394aa26af90f96bd9ff0906edb97814effdc6263b3d1f9c1e7ad8241b3c
 SHA512 
ebc6ccd07daed60a620cd7fe68227d7ac9d48c65dafed5e4285f30c5c25ce43e8c5683ffa87cbf863a2fcfb547cd9cd34b1fe1aec875a6416cad7f19a135ef20
 DIST prefix-portage-2.3.67.tar.bz2 1264791 BLAKE2B 
3df7fa5d0698128c7bf57df6924ebeadcc07f6d7427376ba44750faffc25d32095d48d9bd0760a02c0b8a8a913383d5119987f3e24bfe7b2ef23f711ea8ced2f
 SHA512 
06126db6dbf5669ad0b1d367d563fc6015f8dbfcc6ec32c625037596c649bf3755ca63efc8f8ca9fe352a435d3e679580d41fe830b624028047f52b648d209dd
 DIST prefix-portage-2.3.68.tar.bz2 1283044 BLAKE2B 
81a9462c2b34b64baff78bc046676abf147a6840f7fb2872c9e26eef5a110e2c53b550ac213f734f7c4e70e4b220ea62d885cd99652d9093448f6e5c4633a115
 SHA512 
7c6124e0b01fd1fdba68a5cb68882baa2301945faf559bb61afd6b632128ca435d7e9a596b1079bd744ed4155041399ba0a3779190c9fa891b5dc815ccb46813
+DIST prefix-portage-2.3.84.tar.bz2 1289922 BLAKE2B 
1644b7c1a03b7fbccabe24bfd9c8378d12aeabeda2db35e286372901898d5f572c39e36625fbc2914334ca64e38e1320adca0143a9898fca64223be7d8a877cc
 SHA512 
e243e21405a53e6ff234a7851fc4ef869450dc213acd6ed2168329c7c947289a97c60104aa31bd85319b3fef0abbc2c5759608abd795edc426b06ddea2ce3cdb

diff --git a/sys-apps/portage/portage-2.3.67.ebuild 
b/sys-apps/portage/portage-2.3.67.ebuild
index 2adb83959c..083ed2521d 100644
--- a/sys-apps/portage/portage-2.3.67.ebuild
+++ b/sys-apps/portage/portage-2.3.67.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PYTHON_COMPAT=(
-   pypy
-   python3_5 python3_6 python3_7
+   pypy3
+   python3_6 python3_7
python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'

diff --git a/sys-apps/portage/portage-2.3.68.ebuild 
b/sys-apps/portage/portage-2.3.68.ebuild
index 2adb83959c..083ed2521d 100644
--- a/sys-apps/portage/portage-2.3.68.ebuild
+++ b/sys-apps/portage/portage-2.3.68.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PYTHON_COMPAT=(
-   pypy
-   python3_5 python3_6 python3_7
+   pypy3
+   python3_6 python3_7
python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'

diff --git a/sys-apps/portage/portage-2.3.62.ebuild 
b/sys-apps/portage/portage-2.3.84.ebuild
similarity index 96%
rename from sys-apps/portage/portage-2.3.62.ebuild
rename to sys-apps/portage/portage-2.3.84.ebuild
index 8dab4da44e..083ed2521d 100644
--- a/sys-apps/portage/portage-2.3.62.ebuild
+++ b/sys-apps/portage/portage-2.3.84.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PYTHON_COMPAT=(
-   pypy
-   python3_4 python3_5 python3_6 python3_7
+   pypy3
+   python3_6 python3_7
python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
@@ -166,13 +166,6 @@ python_prepare_all() {
einfo "Making absent gemato non-fatal"
sed -i -e '/exitcode = 127/d' \
lib/portage/sync/modules/rsync/rsync.py || die
-
-   if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-   # asyncio triggers some python bug, not worth fixing on
-   # ppc-macos, bug #656830
-   sed -i -e '/^_asyncio_enabled/s/=.*$/= False/' \
-   
lib/portage/util/_eventloop/global_event_loop.py || die
-   fi
# END PREFIX LOCAL
fi
 



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

2019-07-01 Thread Fabian Groffen
commit: 01a971d7d2853ec7602e08639f973b3ad9aec1b3
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Jul  1 13:27:04 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Jul  1 13:27:55 2019 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=01a971d7

sys-apps/portage: version bump

Package-Manager: Portage-2.3.68-prefix, Repoman-2.3.15
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |  2 +-
 .../portage/{portage-2.3.55.1.ebuild => portage-2.3.68.ebuild} | 10 ++
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ca034b9231..e8fd3704e3 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
-DIST prefix-portage-2.3.55.1.tar.bz2 1240409 BLAKE2B 
db6d62768382f93fbe933ba1dcbe8ac203529d3fcbe3e53063bdd9e5b67ec7ab10e99fcd8a2ad0d83494fa838b8b2e17f16ad16f45cc9dc4cf9801793babffe7
 SHA512 
11a6c80edd9e4a22e2996ad02ea7d9c5e88f074526d0350d0944d70c31087db11a1357026b2e2987e40e6f9d155524e5cae63aff7348a5692c5e7dcf16ac7a1b
 DIST prefix-portage-2.3.62.tar.bz2 1274936 BLAKE2B 
e6e9af5626b1d75b5ff56cbd33324eae2f3d8bbc0aa9c1fe8a7b622b85770234b73d8394aa26af90f96bd9ff0906edb97814effdc6263b3d1f9c1e7ad8241b3c
 SHA512 
ebc6ccd07daed60a620cd7fe68227d7ac9d48c65dafed5e4285f30c5c25ce43e8c5683ffa87cbf863a2fcfb547cd9cd34b1fe1aec875a6416cad7f19a135ef20
 DIST prefix-portage-2.3.67.tar.bz2 1264791 BLAKE2B 
3df7fa5d0698128c7bf57df6924ebeadcc07f6d7427376ba44750faffc25d32095d48d9bd0760a02c0b8a8a913383d5119987f3e24bfe7b2ef23f711ea8ced2f
 SHA512 
06126db6dbf5669ad0b1d367d563fc6015f8dbfcc6ec32c625037596c649bf3755ca63efc8f8ca9fe352a435d3e679580d41fe830b624028047f52b648d209dd
+DIST prefix-portage-2.3.68.tar.bz2 1283044 BLAKE2B 
81a9462c2b34b64baff78bc046676abf147a6840f7fb2872c9e26eef5a110e2c53b550ac213f734f7c4e70e4b220ea62d885cd99652d9093448f6e5c4633a115
 SHA512 
7c6124e0b01fd1fdba68a5cb68882baa2301945faf559bb61afd6b632128ca435d7e9a596b1079bd744ed4155041399ba0a3779190c9fa891b5dc815ccb46813

diff --git a/sys-apps/portage/portage-2.3.55.1.ebuild 
b/sys-apps/portage/portage-2.3.68.ebuild
similarity index 96%
rename from sys-apps/portage/portage-2.3.55.1.ebuild
rename to sys-apps/portage/portage-2.3.68.ebuild
index e2ca476f68..2adb83959c 100644
--- a/sys-apps/portage/portage-2.3.55.1.ebuild
+++ b/sys-apps/portage/portage-2.3.68.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 PYTHON_COMPAT=(
pypy
-   python3_4 python3_5 python3_6 python3_7
+   python3_5 python3_6 python3_7
python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
@@ -91,6 +91,7 @@ pkg_setup() {
 python_prepare_all() {
distutils-r1_python_prepare_all
 
+   epatch "${FILESDIR}"/${PN}-2.3.62-prefix-stack.patch # 658572
epatch "${FILESDIR}"/${PN}-2.3.45-ebuildshell.patch # 155161
 
if use native-extensions; then
@@ -165,13 +166,6 @@ python_prepare_all() {
einfo "Making absent gemato non-fatal"
sed -i -e '/exitcode = 127/d' \
lib/portage/sync/modules/rsync/rsync.py || die
-
-   if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-   # asyncio triggers some python bug, not worth fixing on
-   # ppc-macos, bug #656830
-   sed -i -e '/^_asyncio_enabled/s/=.*$/= False/' \
-   
lib/portage/util/_eventloop/global_event_loop.py || die
-   fi
# END PREFIX LOCAL
fi
 



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

2019-06-18 Thread Fabian Groffen
commit: b64077d9e52a7cdd8fa2c28d6eb54d3e7db54183
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Jun 18 13:59:07 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Jun 18 14:01:32 2019 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b64077d9

sys-apps/portage: drop asyncio kludge for Darwin9, python was fixed

Bug: https://bugs.gentoo.org/656830
Package-Manager: Portage-2.3.67-prefix, Repoman-2.3.14
Signed-off-by: Fabian Groffen  gentoo.org>

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

diff --git a/sys-apps/portage/portage-2.3.67.ebuild 
b/sys-apps/portage/portage-2.3.67.ebuild
index 1dbd5b1874..2adb83959c 100644
--- a/sys-apps/portage/portage-2.3.67.ebuild
+++ b/sys-apps/portage/portage-2.3.67.ebuild
@@ -166,13 +166,6 @@ python_prepare_all() {
einfo "Making absent gemato non-fatal"
sed -i -e '/exitcode = 127/d' \
lib/portage/sync/modules/rsync/rsync.py || die
-
-   if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-   # asyncio triggers some python bug, not worth fixing on
-   # ppc-macos, bug #656830
-   sed -i -e '/^_asyncio_enabled/s/=.*$/= False/' \
-   
lib/portage/util/_eventloop/global_event_loop.py || die
-   fi
# END PREFIX LOCAL
fi
 



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

2019-05-30 Thread Fabian Groffen
commit: 89a6cd1ff076ccc3ffc28fa6046cc09b340cfe39
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu May 30 09:27:00 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu May 30 09:27:00 2019 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=89a6cd1f

sys-apps/portage: version bump

Package-Manager: Portage-2.3.67-prefix, Repoman-2.3.13
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest   | 2 +-
 sys-apps/portage/{portage-2.3.52.2.ebuild => portage-2.3.67.ebuild} | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3fa7fc897d..ca034b9231 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
-DIST prefix-portage-2.3.52.2.tar.bz2 1258301 BLAKE2B 
1334532e50df0c35a4694242f091395721ff8c6c5cd525c32d0b26cf11b207b17f42198ded88a49d7f2599fa3ad34feef0de2ac4219efe806e24913cb061a236
 SHA512 
d5f199b6c7545f49a8faa3ccdfcdecdb4bc3723513dad2c683db9d3a89a662c474aea0c95fead521f7dc8db71dd38cc55ac0cac9973710364032d8fc7877fbc2
 DIST prefix-portage-2.3.55.1.tar.bz2 1240409 BLAKE2B 
db6d62768382f93fbe933ba1dcbe8ac203529d3fcbe3e53063bdd9e5b67ec7ab10e99fcd8a2ad0d83494fa838b8b2e17f16ad16f45cc9dc4cf9801793babffe7
 SHA512 
11a6c80edd9e4a22e2996ad02ea7d9c5e88f074526d0350d0944d70c31087db11a1357026b2e2987e40e6f9d155524e5cae63aff7348a5692c5e7dcf16ac7a1b
 DIST prefix-portage-2.3.62.tar.bz2 1274936 BLAKE2B 
e6e9af5626b1d75b5ff56cbd33324eae2f3d8bbc0aa9c1fe8a7b622b85770234b73d8394aa26af90f96bd9ff0906edb97814effdc6263b3d1f9c1e7ad8241b3c
 SHA512 
ebc6ccd07daed60a620cd7fe68227d7ac9d48c65dafed5e4285f30c5c25ce43e8c5683ffa87cbf863a2fcfb547cd9cd34b1fe1aec875a6416cad7f19a135ef20
+DIST prefix-portage-2.3.67.tar.bz2 1264791 BLAKE2B 
3df7fa5d0698128c7bf57df6924ebeadcc07f6d7427376ba44750faffc25d32095d48d9bd0760a02c0b8a8a913383d5119987f3e24bfe7b2ef23f711ea8ced2f
 SHA512 
06126db6dbf5669ad0b1d367d563fc6015f8dbfcc6ec32c625037596c649bf3755ca63efc8f8ca9fe352a435d3e679580d41fe830b624028047f52b648d209dd

diff --git a/sys-apps/portage/portage-2.3.52.2.ebuild 
b/sys-apps/portage/portage-2.3.67.ebuild
similarity index 98%
rename from sys-apps/portage/portage-2.3.52.2.ebuild
rename to sys-apps/portage/portage-2.3.67.ebuild
index e2ca476f68..1dbd5b1874 100644
--- a/sys-apps/portage/portage-2.3.52.2.ebuild
+++ b/sys-apps/portage/portage-2.3.67.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 PYTHON_COMPAT=(
pypy
-   python3_4 python3_5 python3_6 python3_7
+   python3_5 python3_6 python3_7
python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
@@ -91,6 +91,7 @@ pkg_setup() {
 python_prepare_all() {
distutils-r1_python_prepare_all
 
+   epatch "${FILESDIR}"/${PN}-2.3.62-prefix-stack.patch # 658572
epatch "${FILESDIR}"/${PN}-2.3.45-ebuildshell.patch # 155161
 
if use native-extensions; then



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

2019-05-30 Thread Fabian Groffen
commit: 7d3f27a474ff2fc086c95440e29d0319b64f80b0
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu May 30 09:16:17 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu May 30 09:16:17 2019 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7d3f27a4

sys-apps/portage: remove interrevision

Package-Manager: Portage-2.3.62-prefix, Repoman-2.3.13
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/portage-2.3.62-r00.1.ebuild | 271 ---
 sys-apps/portage/portage-2.3.62.ebuild   |   1 +
 2 files changed, 1 insertion(+), 271 deletions(-)

diff --git a/sys-apps/portage/portage-2.3.62-r00.1.ebuild 
b/sys-apps/portage/portage-2.3.62-r00.1.ebuild
deleted file mode 100644
index 8dab4da44e..00
--- a/sys-apps/portage/portage-2.3.62-r00.1.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-   pypy
-   python3_4 python3_5 python3_6 python3_7
-   python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit eutils distutils-r1 multilib
-
-DESCRIPTION="Portage package manager used in Gentoo Prefix"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
-LICENSE="GPL-2"
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
-
-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 )
-   epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="
-   >=app-arch/tar-1.27
-   dev-lang/python-exec:2
-   !build? (
-   >=sys-apps/sed-4.0.5
-   app-shells/bash:0[readline]
-   >=app-admin/eselect-1.2
-   $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-   python{2_7,3_4,3_5} pypy)
-   )
-   elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
-   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
-   elibc_uclibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
-   kernel_linux? ( >=app-misc/pax-utils-0.1.17 )
-   kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 )
-   kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 )
-   kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 )
-   kernel_AIX? ( >=sys-apps/aix-miscutils-0.1.1634 )
-   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-   xattr? ( kernel_linux? (
-   >=sys-apps/install-xattr-0.3
-   $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-   python2_7 pypy)
-   ) )
-   !https://dev.gentoo.org/~zmedico/portage/archives 
https://dev.gentoo.org/~grobian/distfiles";
-
-prefix_src_archives() {
-   local x y
-   for x in ${@}; do
-   for y in ${SRC_ARCHIVES}; do
-   echo ${y}/${x}
-   done
-   done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/prefix-${PN}-${TARBALL_PV}.tar.bz2
-   $(prefix_src_archives prefix-${PN}-${TARBALL_PV}.tar.bz2)"
-
-S="${WORKDIR}"/prefix-${PN}-${TARBALL_PV}
-
-pkg_setup() {
-   use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-   distutils-r1_python_prepare_all
-
-   epatch "${FILESDIR}"/${PN}-2.3.62-prefix-stack.patch # 658572
-   epatch "${FILESDIR}"/${PN}-2.3.45-ebuildshell.patch # 155161
-
-   if use native-extensions; 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 [[ -n ${EPREFIX} ]] ; then
-   # PREFIX LOCAL: only hack const_autotool
-

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

2019-02-28 Thread Fabian Groffen
commit: 80f77b5c973849c2e0599bcde99b5af203e68b68
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Feb 28 12:50:07 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Feb 28 12:50:07 2019 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=80f77b5c

sys-apps/portage: version bump

Package-Manager: Portage-2.3.62-prefix, Repoman-2.3.12
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-2.3.62.ebuild | 272 +
 2 files changed, 273 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e314960b4d..3fa7fc897d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,3 @@
 DIST prefix-portage-2.3.52.2.tar.bz2 1258301 BLAKE2B 
1334532e50df0c35a4694242f091395721ff8c6c5cd525c32d0b26cf11b207b17f42198ded88a49d7f2599fa3ad34feef0de2ac4219efe806e24913cb061a236
 SHA512 
d5f199b6c7545f49a8faa3ccdfcdecdb4bc3723513dad2c683db9d3a89a662c474aea0c95fead521f7dc8db71dd38cc55ac0cac9973710364032d8fc7877fbc2
 DIST prefix-portage-2.3.55.1.tar.bz2 1240409 BLAKE2B 
db6d62768382f93fbe933ba1dcbe8ac203529d3fcbe3e53063bdd9e5b67ec7ab10e99fcd8a2ad0d83494fa838b8b2e17f16ad16f45cc9dc4cf9801793babffe7
 SHA512 
11a6c80edd9e4a22e2996ad02ea7d9c5e88f074526d0350d0944d70c31087db11a1357026b2e2987e40e6f9d155524e5cae63aff7348a5692c5e7dcf16ac7a1b
+DIST prefix-portage-2.3.62.tar.bz2 1274936 BLAKE2B 
e6e9af5626b1d75b5ff56cbd33324eae2f3d8bbc0aa9c1fe8a7b622b85770234b73d8394aa26af90f96bd9ff0906edb97814effdc6263b3d1f9c1e7ad8241b3c
 SHA512 
ebc6ccd07daed60a620cd7fe68227d7ac9d48c65dafed5e4285f30c5c25ce43e8c5683ffa87cbf863a2fcfb547cd9cd34b1fe1aec875a6416cad7f19a135ef20

diff --git a/sys-apps/portage/portage-2.3.62.ebuild 
b/sys-apps/portage/portage-2.3.62.ebuild
new file mode 100644
index 00..9528084055
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.62.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+   pypy
+   python3_4 python3_5 python3_6 python3_7
+   python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit eutils distutils-r1 multilib
+
+DESCRIPTION="Portage package manager used in Gentoo Prefix"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
+LICENSE="GPL-2"
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="build doc epydoc +ipc +native-extensions selinux xattr prefix-chaining"
+
+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 )
+   epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   !build? (
+   >=sys-apps/sed-4.0.5
+   app-shells/bash:0[readline]
+   >=app-admin/eselect-1.2
+   $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+   python{2_7,3_4,3_5} pypy)
+   )
+   elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
+   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   elibc_uclibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   kernel_linux? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 )
+   kernel_AIX? ( >=sys-apps/aix-miscutils-0.1.1634 )
+   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+   xattr? ( kernel_linux? (
+   >=sys-apps/install-xattr-0.3
+   $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+   python2_7 pypy)
+   ) )
+   !https://dev.gentoo.org/~zmedico/portage/archives 
https://dev.gentoo.org/~grobian/distfiles";
+
+prefix_src_archives() {
+   local x y
+   for x in ${@}; do
+   for y in ${SRC_ARCHIVES}; do
+   echo ${y}/${x}
+   done
+   done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/prefix-${PN}-${TARBALL_PV}.tar.bz2
+   $(prefix_src_archives prefix-${PN}-${TARBALL_PV}.tar.bz2)"
+
+S="${WORKDIR}"/prefix-${PN}-${TARBALL_PV}
+
+pkg_setup() {
+

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

2019-01-12 Thread Fabian Groffen
commit: 7c9b7493663d6656f9d9e8c060f71e0ec72b0a13
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Jan 12 09:13:10 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Jan 12 09:13:10 2019 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7c9b7493

sys-apps/portage: bump for Darwin backtrace

Package-Manager: Portage-2.3.55-prefix, Repoman-2.3.12
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   3 +-
 ...rtage-2.3.54.ebuild => portage-2.3.55.1.ebuild} |   0
 sys-apps/portage/portage-2.3.55.ebuild | 272 -
 3 files changed, 1 insertion(+), 274 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 49bff9efbb..e314960b4d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,2 @@
 DIST prefix-portage-2.3.52.2.tar.bz2 1258301 BLAKE2B 
1334532e50df0c35a4694242f091395721ff8c6c5cd525c32d0b26cf11b207b17f42198ded88a49d7f2599fa3ad34feef0de2ac4219efe806e24913cb061a236
 SHA512 
d5f199b6c7545f49a8faa3ccdfcdecdb4bc3723513dad2c683db9d3a89a662c474aea0c95fead521f7dc8db71dd38cc55ac0cac9973710364032d8fc7877fbc2
-DIST prefix-portage-2.3.54.tar.bz2 1257276 BLAKE2B 
6ed45b075261944e9aad237b7f525a2ad0b924f60e6f5a8fe1faca4c958412178360706c9cef61f5727b9e98bec3e9ff19a48617711a8c7170e321e1fecb1e1f
 SHA512 
c4c4cfc9133c011df0953c6c984f3f914c27a36ff98bc01083f53d9e8169e63ec5a1333b04b092257c6f8f98ebf191f19cbec21c7a79006a2156115c37aefb1b
-DIST prefix-portage-2.3.55.tar.bz2 1288259 BLAKE2B 
aeefb168797d474a15b6ff9e5a988f1c905f805c904620a43cfd31174ce110b564081ec6ac73a360547ae5f418ca4ed43b6ef0022901086efb159f31e7a0d607
 SHA512 
a9d65c3cb4c32cff6ebb6742bb48fac346bb7e841f064e481830ef78deeed16c0b832d89b8b8ef27f208fc141828643ec1ca10e30c0d4730d4c7150357a6403b
+DIST prefix-portage-2.3.55.1.tar.bz2 1240409 BLAKE2B 
db6d62768382f93fbe933ba1dcbe8ac203529d3fcbe3e53063bdd9e5b67ec7ab10e99fcd8a2ad0d83494fa838b8b2e17f16ad16f45cc9dc4cf9801793babffe7
 SHA512 
11a6c80edd9e4a22e2996ad02ea7d9c5e88f074526d0350d0944d70c31087db11a1357026b2e2987e40e6f9d155524e5cae63aff7348a5692c5e7dcf16ac7a1b

diff --git a/sys-apps/portage/portage-2.3.54.ebuild 
b/sys-apps/portage/portage-2.3.55.1.ebuild
similarity index 100%
rename from sys-apps/portage/portage-2.3.54.ebuild
rename to sys-apps/portage/portage-2.3.55.1.ebuild

diff --git a/sys-apps/portage/portage-2.3.55.ebuild 
b/sys-apps/portage/portage-2.3.55.ebuild
deleted file mode 100644
index 9528084055..00
--- a/sys-apps/portage/portage-2.3.55.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-   pypy
-   python3_4 python3_5 python3_6 python3_7
-   python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit eutils distutils-r1 multilib
-
-DESCRIPTION="Portage package manager used in Gentoo Prefix"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
-LICENSE="GPL-2"
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="build doc epydoc +ipc +native-extensions selinux xattr prefix-chaining"
-
-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 )
-   epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="
-   >=app-arch/tar-1.27
-   dev-lang/python-exec:2
-   !build? (
-   >=sys-apps/sed-4.0.5
-   app-shells/bash:0[readline]
-   >=app-admin/eselect-1.2
-   $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-   python{2_7,3_4,3_5} pypy)
-   )
-   elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
-   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
-   elibc_uclibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
-   kernel_linux? ( >=app-misc/pax-utils-0.1.17 )
-   kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 )
-   kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 )
-   kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 )
-   kernel_AIX? ( >=sys-apps/aix-miscutils-0.1.1634 )
-   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-   xattr? ( kernel_linux? (
-   >=sys-apps/install-xattr-0

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

2019-01-11 Thread Fabian Groffen
commit: 470917c87da53792bfa85b4fd90bb1a06d25eeb2
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Jan 11 10:42:59 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Jan 11 10:42:59 2019 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=470917c8

sys-apps/portage: version bump

Package-Manager: Portage-2.3.55-prefix, Repoman-2.3.12
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-2.3.55.ebuild | 272 +
 2 files changed, 273 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 07d6b3a9c1..49bff9efbb 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,3 @@
 DIST prefix-portage-2.3.52.2.tar.bz2 1258301 BLAKE2B 
1334532e50df0c35a4694242f091395721ff8c6c5cd525c32d0b26cf11b207b17f42198ded88a49d7f2599fa3ad34feef0de2ac4219efe806e24913cb061a236
 SHA512 
d5f199b6c7545f49a8faa3ccdfcdecdb4bc3723513dad2c683db9d3a89a662c474aea0c95fead521f7dc8db71dd38cc55ac0cac9973710364032d8fc7877fbc2
 DIST prefix-portage-2.3.54.tar.bz2 1257276 BLAKE2B 
6ed45b075261944e9aad237b7f525a2ad0b924f60e6f5a8fe1faca4c958412178360706c9cef61f5727b9e98bec3e9ff19a48617711a8c7170e321e1fecb1e1f
 SHA512 
c4c4cfc9133c011df0953c6c984f3f914c27a36ff98bc01083f53d9e8169e63ec5a1333b04b092257c6f8f98ebf191f19cbec21c7a79006a2156115c37aefb1b
+DIST prefix-portage-2.3.55.tar.bz2 1288259 BLAKE2B 
aeefb168797d474a15b6ff9e5a988f1c905f805c904620a43cfd31174ce110b564081ec6ac73a360547ae5f418ca4ed43b6ef0022901086efb159f31e7a0d607
 SHA512 
a9d65c3cb4c32cff6ebb6742bb48fac346bb7e841f064e481830ef78deeed16c0b832d89b8b8ef27f208fc141828643ec1ca10e30c0d4730d4c7150357a6403b

diff --git a/sys-apps/portage/portage-2.3.55.ebuild 
b/sys-apps/portage/portage-2.3.55.ebuild
new file mode 100644
index 00..9528084055
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.55.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+   pypy
+   python3_4 python3_5 python3_6 python3_7
+   python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit eutils distutils-r1 multilib
+
+DESCRIPTION="Portage package manager used in Gentoo Prefix"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
+LICENSE="GPL-2"
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="build doc epydoc +ipc +native-extensions selinux xattr prefix-chaining"
+
+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 )
+   epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   !build? (
+   >=sys-apps/sed-4.0.5
+   app-shells/bash:0[readline]
+   >=app-admin/eselect-1.2
+   $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+   python{2_7,3_4,3_5} pypy)
+   )
+   elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
+   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   elibc_uclibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   kernel_linux? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 )
+   kernel_AIX? ( >=sys-apps/aix-miscutils-0.1.1634 )
+   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+   xattr? ( kernel_linux? (
+   >=sys-apps/install-xattr-0.3
+   $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+   python2_7 pypy)
+   ) )
+   !https://dev.gentoo.org/~zmedico/portage/archives 
https://dev.gentoo.org/~grobian/distfiles";
+
+prefix_src_archives() {
+   local x y
+   for x in ${@}; do
+   for y in ${SRC_ARCHIVES}; do
+   echo ${y}/${x}
+   done
+   done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/prefix-${PN}-${TARBALL_PV}.tar.bz2
+   $(prefix_src_archives prefix-${PN}-${TARBALL_PV}.tar.bz2)"
+
+S="${WORKDIR}"/prefix-${PN}-${TARBALL_PV}
+
+pkg_setup() {
+  

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

2019-01-07 Thread Fabian Groffen
commit: 93238854e9c55e69875a44e6031d9140f5fd0deb
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Jan  7 10:36:18 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Jan  7 10:36:18 2019 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=93238854

sys-apps/portage: version bump

Package-Manager: Portage-2.3.54-prefix, Repoman-2.3.12
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-2.3.54.ebuild | 272 +
 2 files changed, 273 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7a17270e13..07d6b3a9c1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1 +1,2 @@
 DIST prefix-portage-2.3.52.2.tar.bz2 1258301 BLAKE2B 
1334532e50df0c35a4694242f091395721ff8c6c5cd525c32d0b26cf11b207b17f42198ded88a49d7f2599fa3ad34feef0de2ac4219efe806e24913cb061a236
 SHA512 
d5f199b6c7545f49a8faa3ccdfcdecdb4bc3723513dad2c683db9d3a89a662c474aea0c95fead521f7dc8db71dd38cc55ac0cac9973710364032d8fc7877fbc2
+DIST prefix-portage-2.3.54.tar.bz2 1257276 BLAKE2B 
6ed45b075261944e9aad237b7f525a2ad0b924f60e6f5a8fe1faca4c958412178360706c9cef61f5727b9e98bec3e9ff19a48617711a8c7170e321e1fecb1e1f
 SHA512 
c4c4cfc9133c011df0953c6c984f3f914c27a36ff98bc01083f53d9e8169e63ec5a1333b04b092257c6f8f98ebf191f19cbec21c7a79006a2156115c37aefb1b

diff --git a/sys-apps/portage/portage-2.3.54.ebuild 
b/sys-apps/portage/portage-2.3.54.ebuild
new file mode 100644
index 00..9528084055
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.54.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+   pypy
+   python3_4 python3_5 python3_6 python3_7
+   python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit eutils distutils-r1 multilib
+
+DESCRIPTION="Portage package manager used in Gentoo Prefix"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
+LICENSE="GPL-2"
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="build doc epydoc +ipc +native-extensions selinux xattr prefix-chaining"
+
+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 )
+   epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   !build? (
+   >=sys-apps/sed-4.0.5
+   app-shells/bash:0[readline]
+   >=app-admin/eselect-1.2
+   $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+   python{2_7,3_4,3_5} pypy)
+   )
+   elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
+   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   elibc_uclibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   kernel_linux? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 )
+   kernel_AIX? ( >=sys-apps/aix-miscutils-0.1.1634 )
+   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+   xattr? ( kernel_linux? (
+   >=sys-apps/install-xattr-0.3
+   $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+   python2_7 pypy)
+   ) )
+   !https://dev.gentoo.org/~zmedico/portage/archives 
https://dev.gentoo.org/~grobian/distfiles";
+
+prefix_src_archives() {
+   local x y
+   for x in ${@}; do
+   for y in ${SRC_ARCHIVES}; do
+   echo ${y}/${x}
+   done
+   done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/prefix-${PN}-${TARBALL_PV}.tar.bz2
+   $(prefix_src_archives prefix-${PN}-${TARBALL_PV}.tar.bz2)"
+
+S="${WORKDIR}"/prefix-${PN}-${TARBALL_PV}
+
+pkg_setup() {
+   use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+   distutils-r1_python_prepare_all
+
+   epatch "${FILESDIR}"/${PN}-2.3.45-ebuildshell.patch # 155161
+   use prefix-chaining && # maybe useful even with stacked-prefix
+   epatch "${FILESDIR}"/${PN}-2.3.40-pre

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

2019-01-07 Thread Fabian Groffen
commit: e04b7e3bec0d7c6c53c1d3fd3c0f3ffce11cd74b
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Jan  7 10:27:58 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Jan  7 10:27:58 2019 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e04b7e3b

sys-apps/portage: cleanup old, some unusable, versions

Package-Manager: Portage-2.3.52.2-prefix, Repoman-2.3.12
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest |   5 -
 sys-apps/portage/portage-2.2.28-r5.ebuild | 259 
 sys-apps/portage/portage-2.3.13.ebuild| 255 ---
 sys-apps/portage/portage-2.3.18.ebuild| 263 
 sys-apps/portage/portage-2.3.40.3.ebuild  | 274 --
 sys-apps/portage/portage-2.3.45.ebuild| 274 --
 6 files changed, 1330 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 994147bd0f..7a17270e13 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1 @@
-DIST prefix-portage-2.2.28.tar.bz2 1187416 BLAKE2B 
1ec27def0b427f60b38dc60178461c2395d388500b6f20d5f9dcd76090c5e68e6578da0073cb5cc3b5b2beb2c2c55ef12afef70d7562fba0a6f0cf90847624ea
 SHA512 
ea0661783d421d204272b9a210745aa2040a18ea347299b3d768588e10ca8dd2e24b46975249bf30010bf565514aea640f4edb9db2ca064312c899304a8c1f42
-DIST prefix-portage-2.3.13.tar.bz2 1205509 BLAKE2B 
851492dc1d3bd55721dfc1662af98a193c8071d87b6b64a09a736864031fa6482fe59a1662789ce8320b156241470688a9a815d79f7367b79500e590a41604f5
 SHA512 
4d59d04b9d6a896a545a40e04973a1c29f421b5d90f08012cb00a27ba1081eb914ddb625f543c26c93c8c75ba690f6ec72e4d9301f4f8e01a5fc68a3438cf46c
-DIST prefix-portage-2.3.18.tar.bz2 1230290 BLAKE2B 
9a7a290493293f166520931aab32a720519ebec15f4c74fe0b0dcd7cc930d591c24e3c87cae4722da119d57826b020b37092ec492bb4e12b774e51334eccf156
 SHA512 
508a5891fc28297e68baf031f4e99674a58c6268b16d50e094adc6676fb42f81bb81bd6f3dc70c24636be64ae015db51df86c49267c8c5a98129fe5e006310d7
-DIST prefix-portage-2.3.40.3.tar.bz2 1253190 BLAKE2B 
53e60b561e1f9b2a5367a1a23a74ba315358b8e7eb05eead2a46078198b92786745dbd07ab1bf69587866f462955a5dd6c0bc3eb51dbe507bfbff31d899c5f45
 SHA512 
67c2d7554c9236748b25a8b9f0f60736beda535298395ba2eb86dd5634b6520d645df193914f079d2c61cfa0d8f263f67c3476828319e2395dec2e45cf4b9b14
-DIST prefix-portage-2.3.45.tar.bz2 1255719 BLAKE2B 
2a53b526418747edc02ab4cc8127425b92e8ae0f7fdc27af730f991f7cb6074aac51cdfd0ca75f7e6376c8059df1e02817963a0386cf1b1986eb798f21b8cf8c
 SHA512 
dfea0774b5d801b3ca02fdd570c89c08b78f4e02e57c1b897a50af0056d4ed4522c6d236dcaf98ea3f1c446b0164abd1b45fd2cae12ed5ef6c34c83668894b5b
 DIST prefix-portage-2.3.52.2.tar.bz2 1258301 BLAKE2B 
1334532e50df0c35a4694242f091395721ff8c6c5cd525c32d0b26cf11b207b17f42198ded88a49d7f2599fa3ad34feef0de2ac4219efe806e24913cb061a236
 SHA512 
d5f199b6c7545f49a8faa3ccdfcdecdb4bc3723513dad2c683db9d3a89a662c474aea0c95fead521f7dc8db71dd38cc55ac0cac9973710364032d8fc7877fbc2

diff --git a/sys-apps/portage/portage-2.2.28-r5.ebuild 
b/sys-apps/portage/portage-2.2.28-r5.ebuild
deleted file mode 100644
index c8ecc510ce..00
--- a/sys-apps/portage/portage-2.2.28-r5.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(
-   pypy
-   python3_3 python3_4 python3_5
-   python2_7
-)
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit eutils distutils-r1 multilib
-
-DESCRIPTION="Portage package manager used in Gentoo Prefix"
-HOMEPAGE="http://prefix.gentoo.org/";
-LICENSE="GPL-2"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="build doc epydoc +ipc selinux xattr prefix-chaining"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-   >=sys-devel/make-3.82
-   >=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 )
-   epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="
-   >=app-arch/tar-1.27
-   dev-lang/python-exec:2
-   !build? (
-   >=sys-apps/sed-4.0.5
-   app-shells/bash:0[readline]
-   >=app-admin/eselect-1.2
-   )
-   elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
-   elibc_glibc? ( !prefix? ( >=sys-a

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

2018-12-23 Thread Fabian Groffen
commit: de3b992cc02c1423320ce29bb1f9b99b8ea19123
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Dec 23 20:04:21 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Dec 23 20:04:21 2018 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=de3b992c

sys-apps/portage: version bump

Package-Manager: Portage-2.3.52.2-prefix, Repoman-2.3.12
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest|   1 +
 sys-apps/portage/portage-2.3.52.2.ebuild | 272 +++
 2 files changed, 273 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f2ff336e7c..994147bd0f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,3 +3,4 @@ DIST prefix-portage-2.3.13.tar.bz2 1205509 BLAKE2B 
851492dc1d3bd55721dfc1662af98
 DIST prefix-portage-2.3.18.tar.bz2 1230290 BLAKE2B 
9a7a290493293f166520931aab32a720519ebec15f4c74fe0b0dcd7cc930d591c24e3c87cae4722da119d57826b020b37092ec492bb4e12b774e51334eccf156
 SHA512 
508a5891fc28297e68baf031f4e99674a58c6268b16d50e094adc6676fb42f81bb81bd6f3dc70c24636be64ae015db51df86c49267c8c5a98129fe5e006310d7
 DIST prefix-portage-2.3.40.3.tar.bz2 1253190 BLAKE2B 
53e60b561e1f9b2a5367a1a23a74ba315358b8e7eb05eead2a46078198b92786745dbd07ab1bf69587866f462955a5dd6c0bc3eb51dbe507bfbff31d899c5f45
 SHA512 
67c2d7554c9236748b25a8b9f0f60736beda535298395ba2eb86dd5634b6520d645df193914f079d2c61cfa0d8f263f67c3476828319e2395dec2e45cf4b9b14
 DIST prefix-portage-2.3.45.tar.bz2 1255719 BLAKE2B 
2a53b526418747edc02ab4cc8127425b92e8ae0f7fdc27af730f991f7cb6074aac51cdfd0ca75f7e6376c8059df1e02817963a0386cf1b1986eb798f21b8cf8c
 SHA512 
dfea0774b5d801b3ca02fdd570c89c08b78f4e02e57c1b897a50af0056d4ed4522c6d236dcaf98ea3f1c446b0164abd1b45fd2cae12ed5ef6c34c83668894b5b
+DIST prefix-portage-2.3.52.2.tar.bz2 1258301 BLAKE2B 
1334532e50df0c35a4694242f091395721ff8c6c5cd525c32d0b26cf11b207b17f42198ded88a49d7f2599fa3ad34feef0de2ac4219efe806e24913cb061a236
 SHA512 
d5f199b6c7545f49a8faa3ccdfcdecdb4bc3723513dad2c683db9d3a89a662c474aea0c95fead521f7dc8db71dd38cc55ac0cac9973710364032d8fc7877fbc2

diff --git a/sys-apps/portage/portage-2.3.52.2.ebuild 
b/sys-apps/portage/portage-2.3.52.2.ebuild
new file mode 100644
index 00..9797e183cd
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.52.2.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+   pypy
+   python3_4 python3_5 python3_6 python3_7
+   python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit eutils distutils-r1 multilib
+
+DESCRIPTION="Portage package manager used in Gentoo Prefix"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
+LICENSE="GPL-2"
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="build doc epydoc +ipc +native-extensions selinux xattr prefix-chaining"
+
+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 )
+   epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   !build? (
+   >=sys-apps/sed-4.0.5
+   app-shells/bash:0[readline]
+   >=app-admin/eselect-1.2
+   $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+   python{2_7,3_4,3_5} pypy)
+   )
+   elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
+   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   elibc_uclibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   kernel_linux? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 )
+   kernel_AIX? ( >=sys-apps/aix-miscutils-0.1.1634 )
+   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+   xattr? ( kernel_linux? (
+   >=sys-apps/install-xattr-0.3
+   $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+   python2_7 pypy)
+   ) )
+   !https://dev.gentoo.org/~zmedico/portage/archives 
https://dev.gentoo.org/~grobian/distfil

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

2018-12-06 Thread Fabian Groffen
commit: f88f91600be7bd6772d19885d117b29096110001
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Dec  6 13:49:23 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Dec  6 13:49:23 2018 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f88f9160

sys-apps/portage: small version bump to allow newer repoman

Package-Manager: Portage-2.3.45-prefix, Repoman-2.3.12
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 .../portage/files/portage-2.3.45-ebuildshell.patch | 354 +
 sys-apps/portage/portage-2.3.45.ebuild | 274 
 3 files changed, 629 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 61a3d79f0d..f2ff336e7c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,3 +2,4 @@ DIST prefix-portage-2.2.28.tar.bz2 1187416 BLAKE2B 
1ec27def0b427f60b38dc60178461
 DIST prefix-portage-2.3.13.tar.bz2 1205509 BLAKE2B 
851492dc1d3bd55721dfc1662af98a193c8071d87b6b64a09a736864031fa6482fe59a1662789ce8320b156241470688a9a815d79f7367b79500e590a41604f5
 SHA512 
4d59d04b9d6a896a545a40e04973a1c29f421b5d90f08012cb00a27ba1081eb914ddb625f543c26c93c8c75ba690f6ec72e4d9301f4f8e01a5fc68a3438cf46c
 DIST prefix-portage-2.3.18.tar.bz2 1230290 BLAKE2B 
9a7a290493293f166520931aab32a720519ebec15f4c74fe0b0dcd7cc930d591c24e3c87cae4722da119d57826b020b37092ec492bb4e12b774e51334eccf156
 SHA512 
508a5891fc28297e68baf031f4e99674a58c6268b16d50e094adc6676fb42f81bb81bd6f3dc70c24636be64ae015db51df86c49267c8c5a98129fe5e006310d7
 DIST prefix-portage-2.3.40.3.tar.bz2 1253190 BLAKE2B 
53e60b561e1f9b2a5367a1a23a74ba315358b8e7eb05eead2a46078198b92786745dbd07ab1bf69587866f462955a5dd6c0bc3eb51dbe507bfbff31d899c5f45
 SHA512 
67c2d7554c9236748b25a8b9f0f60736beda535298395ba2eb86dd5634b6520d645df193914f079d2c61cfa0d8f263f67c3476828319e2395dec2e45cf4b9b14
+DIST prefix-portage-2.3.45.tar.bz2 1255719 BLAKE2B 
2a53b526418747edc02ab4cc8127425b92e8ae0f7fdc27af730f991f7cb6074aac51cdfd0ca75f7e6376c8059df1e02817963a0386cf1b1986eb798f21b8cf8c
 SHA512 
dfea0774b5d801b3ca02fdd570c89c08b78f4e02e57c1b897a50af0056d4ed4522c6d236dcaf98ea3f1c446b0164abd1b45fd2cae12ed5ef6c34c83668894b5b

diff --git a/sys-apps/portage/files/portage-2.3.45-ebuildshell.patch 
b/sys-apps/portage/files/portage-2.3.45-ebuildshell.patch
new file mode 100644
index 00..e495ee4c24
--- /dev/null
+++ b/sys-apps/portage/files/portage-2.3.45-ebuildshell.patch
@@ -0,0 +1,354 @@
+From 8c6b115fa0325b5bed2e1a9c4c8e8af45cdecc2e Mon Sep 17 00:00:00 2001
+From: Michael Haubenwallner 
+Date: Wed, 6 Nov 2013 12:40:05 +0100
+Subject: [PATCH 1/2] Add ebuildshell feature, bug#155161.
+
+---
+ bin/ebuild.sh| 146 ++-
+ bin/filter-bash-environment.py   |  55 +
+ bin/save-ebuild-env.sh   |   2 +-
+ man/make.conf.5  |   6 ++
+ lib/_emerge/AbstractEbuildProcess.py |   1 +
+ lib/portage/const.py |   1 +
+ 6 files changed, 194 insertions(+), 17 deletions(-)
+
+diff --git a/bin/ebuild.sh b/bin/ebuild.sh
+index f76a48d8e..683a4e9c1 100755
+--- a/bin/ebuild.sh
 b/bin/ebuild.sh
+@@ -121,7 +121,7 @@ __qa_source() {
+ __qa_call() {
+   local shopts=$(shopt) OLDIFS="$IFS"
+   local retval
+-  "$@"
++  __call-ebuildshell "$@"
+   retval=$?
+   set +e
+   [[ $shopts != $(shopt) ]] &&
+@@ -547,6 +547,150 @@ if [[ -n ${QA_INTERCEPTORS} ]] ; then
+   unset BIN_PATH BIN BODY FUNC_SRC
+ fi
+ 
++__call-ebuildshell() {
++  if ! has ebuildshell ${FEATURES}; then
++  "$@"
++  return $?
++  fi
++  local __ebuildshell_args=( "$@" )
++  # These are the variables I have seen 'bash -i' maintaining the values 
for:
++  local __ebuildshell_bash_i_vars="__ebuildshell_.*
++  _ BASH_ARGC BASH_ARGV BASH_COMMAND BASH_LINENO BASH_SOURCE
++  BASH_VERSINFO BASH_SUBSHELL BASHOPTS BASHPID COMP_WORDBREAKS
++  DIRSTACK EUID FUNCNAME GROUPS HISTCMD HISTFILE LINENO PIPESTATUS
++  PPID PS1 PS2 PS3 PS4 PWD RANDOM SECONDS SHELLOPTS UID"
++  # Allow recursive ebuildshell, for use in multibuild.eclass and similar:
++  local __ebuildshell_pid=${BASHPID:-$(__bashpid)}
++  local __ebuildshell_tmpf="${T}/ebuildshell.${__ebuildshell_pid}"
++  rm -f "${__ebuildshell_tmpf}."{ebuild,return}-{env,rovars}
++  (
++  cat <<-EOE
++  # local variables of functions using recursive 
ebuildshell are
++  # visible to the EXIT trap of that recursive 
ebuildshell.  To
++  # keep them local, we have to filter them from that 
recursive
++  # ebuildshell's return-env.  As 'declare -p' is unable 
to tell
++  # local-ity of variables, we abuse the trace attribute 
for local
++  # variables 

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

2018-06-25 Thread Fabian Groffen
commit: f9b96df9c0561a60758f442b80ea99023154
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Jun 25 08:39:40 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Jun 25 08:39:40 2018 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f9b9

sys-apps/portage: version bump, includes stacked-prefix feature

Package-Manager: Portage-2.3.40.2-prefix, Repoman-2.3.9

 sys-apps/portage/Manifest  |  2 +-
 .../files/portage-2.3.40-stacked-prefix.patch  | 59 --
 ...age-2.3.40.2.ebuild => portage-2.3.40.3.ebuild} |  1 -
 3 files changed, 1 insertion(+), 61 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d89f09de53..61a3d79f0d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,4 @@
 DIST prefix-portage-2.2.28.tar.bz2 1187416 BLAKE2B 
1ec27def0b427f60b38dc60178461c2395d388500b6f20d5f9dcd76090c5e68e6578da0073cb5cc3b5b2beb2c2c55ef12afef70d7562fba0a6f0cf90847624ea
 SHA512 
ea0661783d421d204272b9a210745aa2040a18ea347299b3d768588e10ca8dd2e24b46975249bf30010bf565514aea640f4edb9db2ca064312c899304a8c1f42
 DIST prefix-portage-2.3.13.tar.bz2 1205509 BLAKE2B 
851492dc1d3bd55721dfc1662af98a193c8071d87b6b64a09a736864031fa6482fe59a1662789ce8320b156241470688a9a815d79f7367b79500e590a41604f5
 SHA512 
4d59d04b9d6a896a545a40e04973a1c29f421b5d90f08012cb00a27ba1081eb914ddb625f543c26c93c8c75ba690f6ec72e4d9301f4f8e01a5fc68a3438cf46c
 DIST prefix-portage-2.3.18.tar.bz2 1230290 BLAKE2B 
9a7a290493293f166520931aab32a720519ebec15f4c74fe0b0dcd7cc930d591c24e3c87cae4722da119d57826b020b37092ec492bb4e12b774e51334eccf156
 SHA512 
508a5891fc28297e68baf031f4e99674a58c6268b16d50e094adc6676fb42f81bb81bd6f3dc70c24636be64ae015db51df86c49267c8c5a98129fe5e006310d7
-DIST prefix-portage-2.3.40.2.tar.bz2 1216158 BLAKE2B 
d8806b4047ded791e8646ea64c568f9fe0354a5cf2a54a1616c1fc1050f0476b218522c56a9f06636e2a70f70571d762186ba30057efe213ffb7270bc7ef503c
 SHA512 
d85e3eea4149f2fe3ec8dc2fb15d1fd65c5d78c67828c36f064f0663b6305c5d06c1a29f3d62c777f0d1b619aa60178e5a3fbfbadb0a03bbde0570c5913b0675
+DIST prefix-portage-2.3.40.3.tar.bz2 1253190 BLAKE2B 
53e60b561e1f9b2a5367a1a23a74ba315358b8e7eb05eead2a46078198b92786745dbd07ab1bf69587866f462955a5dd6c0bc3eb51dbe507bfbff31d899c5f45
 SHA512 
67c2d7554c9236748b25a8b9f0f60736beda535298395ba2eb86dd5634b6520d645df193914f079d2c61cfa0d8f263f67c3476828319e2395dec2e45cf4b9b14

diff --git a/sys-apps/portage/files/portage-2.3.40-stacked-prefix.patch 
b/sys-apps/portage/files/portage-2.3.40-stacked-prefix.patch
deleted file mode 100644
index d967d1faf7..00
--- a/sys-apps/portage/files/portage-2.3.40-stacked-prefix.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 8a121d477a9a13569be3fb50eaeaa1162ed884bd Mon Sep 17 00:00:00 2001
-From: Michael Haubenwallner 
-Date: Tue, 19 Jun 2018 16:39:12 +0200
-Subject: [PATCH 1/2] introduce the 'stacked-prefix' FEATURE
-
-When we merge into another EPREFIX, but not into some ROOT,
-and CHOST is equal to CBUILD, build tools found in EPREFIX
-perfectly work for the current build environment.
-In a "stacked prefix" we explicitly utilize this situation.
-
-This is useful during prefix bootstrap (#655414, #655326), but also to
-build packages for targets unable to support the full portage toolchain
-(native Windows, MinGW), but otherwise do not require a full cross
-compilation setup.

- bin/phase-helpers.sh | 14 ++
- pym/portage/const.py |  1 +
- 2 files changed, 15 insertions(+)
-
-diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
-index 75d92b407..c5a818db7 100644
 a/bin/phase-helpers.sh
-+++ b/bin/phase-helpers.sh
-@@ -927,6 +927,20 @@ ___best_version_and_has_version_common() {
-   fi ;;
-   esac
- 
-+  if ___eapi_has_prefix_variables &&
-+ has "${root_arg}" '--host-root' '-b' &&
-+ has stacked-prefix ${FEATURES}   &&
-+ [[ -z ${ROOT%/} ]]   &&
-+ [[ ${CBUILD} == ${CHOST} ]]  &&
-+ [[ ${EPREFIX} != ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}} ]] &&
-+  :; then
-+  # When we merge into another EPREFIX, but not into some ROOT,
-+  # and CHOST is equal to CBUILD, build tools found in EPREFIX
-+  # perfectly work for the current build environment.
-+  # In a "stacked prefix" we explicitly utilize this situation.
-+  "${FUNCNAME[1]}" "${atom}" && return 0
-+  fi
-+
-   if [[ -n $PORTAGE_IPC_DAEMON ]] ; then
-   cmd+=("${PORTAGE_BIN_PATH}"/ebuild-ipc "${FUNCNAME[1]}" 
"${root}" "${atom}")
-   else
-diff --git a/pym/portage/const.py b/pym/portage/const.py
-index d9c57f300..be7bf1036 100644
 a/pym/portage/const.py
-+++ b/pym/portage/const.py
-@@ -203,6 +203,7 @@ SUPPORTED_FEATURES   = frozenset([
-   "splitdebug",
-   "split-elog",
-   "split-log",
-+  "stacked-prefix",
-   "strict",
-   "strict-keepdi

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

2018-06-22 Thread Michael Haubenwallner
commit: b69fe7bafe8c39c105de5545dc3903af76f233f4
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Fri Jun 22 13:34:27 2018 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Fri Jun 22 13:45:09 2018 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b69fe7ba

sys-apps/portage: add the stacked-prefix patch (#658572)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/portage-2.3.40-stacked-prefix.patch  | 59 ++
 sys-apps/portage/portage-2.3.40.2.ebuild   |  3 +-
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/sys-apps/portage/files/portage-2.3.40-stacked-prefix.patch 
b/sys-apps/portage/files/portage-2.3.40-stacked-prefix.patch
new file mode 100644
index 00..d967d1faf7
--- /dev/null
+++ b/sys-apps/portage/files/portage-2.3.40-stacked-prefix.patch
@@ -0,0 +1,59 @@
+From 8a121d477a9a13569be3fb50eaeaa1162ed884bd Mon Sep 17 00:00:00 2001
+From: Michael Haubenwallner 
+Date: Tue, 19 Jun 2018 16:39:12 +0200
+Subject: [PATCH 1/2] introduce the 'stacked-prefix' FEATURE
+
+When we merge into another EPREFIX, but not into some ROOT,
+and CHOST is equal to CBUILD, build tools found in EPREFIX
+perfectly work for the current build environment.
+In a "stacked prefix" we explicitly utilize this situation.
+
+This is useful during prefix bootstrap (#655414, #655326), but also to
+build packages for targets unable to support the full portage toolchain
+(native Windows, MinGW), but otherwise do not require a full cross
+compilation setup.
+---
+ bin/phase-helpers.sh | 14 ++
+ pym/portage/const.py |  1 +
+ 2 files changed, 15 insertions(+)
+
+diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
+index 75d92b407..c5a818db7 100644
+--- a/bin/phase-helpers.sh
 b/bin/phase-helpers.sh
+@@ -927,6 +927,20 @@ ___best_version_and_has_version_common() {
+   fi ;;
+   esac
+ 
++  if ___eapi_has_prefix_variables &&
++ has "${root_arg}" '--host-root' '-b' &&
++ has stacked-prefix ${FEATURES}   &&
++ [[ -z ${ROOT%/} ]]   &&
++ [[ ${CBUILD} == ${CHOST} ]]  &&
++ [[ ${EPREFIX} != ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}} ]] &&
++  :; then
++  # When we merge into another EPREFIX, but not into some ROOT,
++  # and CHOST is equal to CBUILD, build tools found in EPREFIX
++  # perfectly work for the current build environment.
++  # In a "stacked prefix" we explicitly utilize this situation.
++  "${FUNCNAME[1]}" "${atom}" && return 0
++  fi
++
+   if [[ -n $PORTAGE_IPC_DAEMON ]] ; then
+   cmd+=("${PORTAGE_BIN_PATH}"/ebuild-ipc "${FUNCNAME[1]}" 
"${root}" "${atom}")
+   else
+diff --git a/pym/portage/const.py b/pym/portage/const.py
+index d9c57f300..be7bf1036 100644
+--- a/pym/portage/const.py
 b/pym/portage/const.py
+@@ -203,6 +203,7 @@ SUPPORTED_FEATURES   = frozenset([
+   "splitdebug",
+   "split-elog",
+   "split-log",
++  "stacked-prefix",
+   "strict",
+   "strict-keepdir",
+   "stricter",
+-- 
+2.16.1
+

diff --git a/sys-apps/portage/portage-2.3.40.2.ebuild 
b/sys-apps/portage/portage-2.3.40.2.ebuild
index 8e6b1c32a5..63935aaa09 100644
--- a/sys-apps/portage/portage-2.3.40.2.ebuild
+++ b/sys-apps/portage/portage-2.3.40.2.ebuild
@@ -92,7 +92,8 @@ python_prepare_all() {
distutils-r1_python_prepare_all
 
epatch "${FILESDIR}"/${PN}-2.3.40-ebuildshell.patch # 155161
-   use prefix-chaining &&
+   epatch "${FILESDIR}"/${PN}-2.3.40-stacked-prefix.patch # 658572
+   use prefix-chaining && # maybe useful even with stacked-prefix
epatch "${FILESDIR}"/${PN}-2.3.40-prefix-chaining.patch
 
if use native-extensions; then



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

2018-06-17 Thread Fabian Groffen
commit: 8b753821d5e5b6bb59ddfb346bbbc304cfc083d8
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Jun 17 14:53:22 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Jun 17 14:53:44 2018 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8b753821

sys-apps/portage: bump to include fix for pycache problem

Package-Manager: Portage-2.3.40.2-prefix, Repoman-2.3.9

 sys-apps/portage/Manifest | 2 +-
 sys-apps/portage/{portage-2.3.40.1.ebuild => portage-2.3.40.2.ebuild} | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 5c7335169d..d89f09de53 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,4 @@
 DIST prefix-portage-2.2.28.tar.bz2 1187416 BLAKE2B 
1ec27def0b427f60b38dc60178461c2395d388500b6f20d5f9dcd76090c5e68e6578da0073cb5cc3b5b2beb2c2c55ef12afef70d7562fba0a6f0cf90847624ea
 SHA512 
ea0661783d421d204272b9a210745aa2040a18ea347299b3d768588e10ca8dd2e24b46975249bf30010bf565514aea640f4edb9db2ca064312c899304a8c1f42
 DIST prefix-portage-2.3.13.tar.bz2 1205509 BLAKE2B 
851492dc1d3bd55721dfc1662af98a193c8071d87b6b64a09a736864031fa6482fe59a1662789ce8320b156241470688a9a815d79f7367b79500e590a41604f5
 SHA512 
4d59d04b9d6a896a545a40e04973a1c29f421b5d90f08012cb00a27ba1081eb914ddb625f543c26c93c8c75ba690f6ec72e4d9301f4f8e01a5fc68a3438cf46c
 DIST prefix-portage-2.3.18.tar.bz2 1230290 BLAKE2B 
9a7a290493293f166520931aab32a720519ebec15f4c74fe0b0dcd7cc930d591c24e3c87cae4722da119d57826b020b37092ec492bb4e12b774e51334eccf156
 SHA512 
508a5891fc28297e68baf031f4e99674a58c6268b16d50e094adc6676fb42f81bb81bd6f3dc70c24636be64ae015db51df86c49267c8c5a98129fe5e006310d7
-DIST prefix-portage-2.3.40.1.tar.bz2 1252690 BLAKE2B 
6ecc55c168e8617795df3c03130d2834d301d018ebb1efaac9ce953984d36e5a9a94e3b1f8ae02fa271652cf46c5b52a51a516cd2d8004a085b0ae71fa4a5cda
 SHA512 
4aa664d545048a3b7eb1504dd6245c839f3550de6bc3a02eceb7b0d31646424b5d09b56f12dc3a0a4a83cc3d1f2f7ac18aa1c1e104177902e7b258bef872229c
+DIST prefix-portage-2.3.40.2.tar.bz2 1216158 BLAKE2B 
d8806b4047ded791e8646ea64c568f9fe0354a5cf2a54a1616c1fc1050f0476b218522c56a9f06636e2a70f70571d762186ba30057efe213ffb7270bc7ef503c
 SHA512 
d85e3eea4149f2fe3ec8dc2fb15d1fd65c5d78c67828c36f064f0663b6305c5d06c1a29f3d62c777f0d1b619aa60178e5a3fbfbadb0a03bbde0570c5913b0675

diff --git a/sys-apps/portage/portage-2.3.40.1.ebuild 
b/sys-apps/portage/portage-2.3.40.2.ebuild
similarity index 98%
rename from sys-apps/portage/portage-2.3.40.1.ebuild
rename to sys-apps/portage/portage-2.3.40.2.ebuild
index 6987486d01..8e6b1c32a5 100644
--- a/sys-apps/portage/portage-2.3.40.1.ebuild
+++ b/sys-apps/portage/portage-2.3.40.2.ebuild
@@ -166,6 +166,10 @@ python_prepare_all() {
sed -i -e 's/repo_name=gentoo/repo_name=gentoo_prefix/' \
bin/emerge-webrsync || die
 
+   einfo "Making absent gemato non-fatal"
+   sed -i -e '/exitcode = 127/d' \
+   pym/portage/sync/modules/rsync/rsync.py || die
+
if [[ ${CHOST} == powerpc*-darwin* ]] ; then
# asyncio triggers some python bug, not worth fixing on
# ppc-macos, bug #656830



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

2018-05-30 Thread Michael Haubenwallner
commit: fe071cb671b6135d742c39ba09f40fd8812d41a8
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed May 30 12:42:16 2018 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed May 30 12:42:16 2018 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fe071cb6

sys-apps/portage (ebuildshell): preserve HOME across env -i

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-apps/portage/files/portage-2.3.40-ebuildshell.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-apps/portage/files/portage-2.3.40-ebuildshell.patch 
b/sys-apps/portage/files/portage-2.3.40-ebuildshell.patch
index 167ed3824e..0c1e48a82d 100644
--- a/sys-apps/portage/files/portage-2.3.40-ebuildshell.patch
+++ b/sys-apps/portage/files/portage-2.3.40-ebuildshell.patch
@@ -1,4 +1,4 @@
-From 9075d30d24af87f69d23ae129dc75e1305cd3aa8 Mon Sep 17 00:00:00 2001
+From 8c6b115fa0325b5bed2e1a9c4c8e8af45cdecc2e Mon Sep 17 00:00:00 2001
 From: Michael Haubenwallner 
 Date: Wed, 6 Nov 2013 12:40:05 +0100
 Subject: [PATCH 1/2] Add ebuildshell feature, bug#155161.
@@ -13,7 +13,7 @@ Subject: [PATCH 1/2] Add ebuildshell feature, bug#155161.
  6 files changed, 194 insertions(+), 17 deletions(-)
 
 diff --git a/bin/ebuild.sh b/bin/ebuild.sh
-index f76a48d8e..51ba95cb1 100755
+index f76a48d8e..683a4e9c1 100755
 --- a/bin/ebuild.sh
 +++ b/bin/ebuild.sh
 @@ -121,7 +121,7 @@ __qa_source() {
@@ -148,7 +148,7 @@ index f76a48d8e..51ba95cb1 100755
 +  echo '"$@"' >> ~/.bash_history
 +  chown ${PORTAGE_USER:-portage}:${PORTAGE_GROUP:-portage} 
~/.bash_history &>/dev/null
 +
-+  env -i ${BASH} --rcfile "${__ebuildshell_tmpf}.ebuild-env" -i
++  env -i HOME=~ ${BASH} --rcfile "${__ebuildshell_tmpf}.ebuild-env" -i
 +
 +  # The environment- and exit-status handling after leaving the 
ebuildshell
 +  # prompt is expected to be identical as without the ebuildshell prompt.



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

2018-05-29 Thread Fabian Groffen
commit: 6a9cbaaff7678000846dd253f49c0d87c09bfb66
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue May 29 09:04:31 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue May 29 09:04:31 2018 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6a9cbaaf

sys-apps/portage: disable asyncio for ppc-macos, bug #656830

Bug: https://bugs.gentoo.org/656830
Package-Manager: Portage-2.3.40.1-prefix, Repoman-2.3.9

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

diff --git a/sys-apps/portage/portage-2.3.40.1.ebuild 
b/sys-apps/portage/portage-2.3.40.1.ebuild
index 0bea1d9f01..6987486d01 100644
--- a/sys-apps/portage/portage-2.3.40.1.ebuild
+++ b/sys-apps/portage/portage-2.3.40.1.ebuild
@@ -165,6 +165,13 @@ python_prepare_all() {
einfo "Setting gentoo_prefix as reponame for emerge-webrsync"
sed -i -e 's/repo_name=gentoo/repo_name=gentoo_prefix/' \
bin/emerge-webrsync || die
+
+   if [[ ${CHOST} == powerpc*-darwin* ]] ; then
+   # asyncio triggers some python bug, not worth fixing on
+   # ppc-macos, bug #656830
+   sed -i -e '/^_asyncio_enabled/s/=.*$/= False/' \
+   
pym/portage/util/_eventloop/global_event_loop.py || die
+   fi
# END PREFIX LOCAL
fi
 



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

2018-05-28 Thread Michael Haubenwallner
commit: cb20d3f95bd20b528a14126b3d1c545c4ddb1704
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Mon May 28 16:40:04 2018 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Mon May 28 16:43:59 2018 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=cb20d3f9

sys-apps/portage: bump ebuildshell+prefix-chaining patches

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../portage/files/portage-2.3.40-ebuildshell.patch | 354 
 .../files/portage-2.3.40-prefix-chaining.patch | 921 +
 sys-apps/portage/portage-2.3.40.1.ebuild   |   5 +-
 3 files changed, 1277 insertions(+), 3 deletions(-)

diff --git a/sys-apps/portage/files/portage-2.3.40-ebuildshell.patch 
b/sys-apps/portage/files/portage-2.3.40-ebuildshell.patch
new file mode 100644
index 00..167ed3824e
--- /dev/null
+++ b/sys-apps/portage/files/portage-2.3.40-ebuildshell.patch
@@ -0,0 +1,354 @@
+From 9075d30d24af87f69d23ae129dc75e1305cd3aa8 Mon Sep 17 00:00:00 2001
+From: Michael Haubenwallner 
+Date: Wed, 6 Nov 2013 12:40:05 +0100
+Subject: [PATCH 1/2] Add ebuildshell feature, bug#155161.
+
+---
+ bin/ebuild.sh| 146 ++-
+ bin/filter-bash-environment.py   |  55 +
+ bin/save-ebuild-env.sh   |   2 +-
+ man/make.conf.5  |   6 ++
+ pym/_emerge/AbstractEbuildProcess.py |   1 +
+ pym/portage/const.py |   1 +
+ 6 files changed, 194 insertions(+), 17 deletions(-)
+
+diff --git a/bin/ebuild.sh b/bin/ebuild.sh
+index f76a48d8e..51ba95cb1 100755
+--- a/bin/ebuild.sh
 b/bin/ebuild.sh
+@@ -121,7 +121,7 @@ __qa_source() {
+ __qa_call() {
+   local shopts=$(shopt) OLDIFS="$IFS"
+   local retval
+-  "$@"
++  __call-ebuildshell "$@"
+   retval=$?
+   set +e
+   [[ $shopts != $(shopt) ]] &&
+@@ -547,6 +547,150 @@ if [[ -n ${QA_INTERCEPTORS} ]] ; then
+   unset BIN_PATH BIN BODY FUNC_SRC
+ fi
+ 
++__call-ebuildshell() {
++  if ! has ebuildshell ${FEATURES}; then
++  "$@"
++  return $?
++  fi
++  local __ebuildshell_args=( "$@" )
++  # These are the variables I have seen 'bash -i' maintaining the values 
for:
++  local __ebuildshell_bash_i_vars="__ebuildshell_.*
++  _ BASH_ARGC BASH_ARGV BASH_COMMAND BASH_LINENO BASH_SOURCE
++  BASH_VERSINFO BASH_SUBSHELL BASHOPTS BASHPID COMP_WORDBREAKS
++  DIRSTACK EUID FUNCNAME GROUPS HISTCMD HISTFILE LINENO PIPESTATUS
++  PPID PS1 PS2 PS3 PS4 PWD RANDOM SECONDS SHELLOPTS UID"
++  # Allow recursive ebuildshell, for use in multibuild.eclass and similar:
++  local __ebuildshell_pid=${BASHPID:-$(__bashpid)}
++  local __ebuildshell_tmpf="${T}/ebuildshell.${__ebuildshell_pid}"
++  rm -f "${__ebuildshell_tmpf}."{ebuild,return}-{env,rovars}
++  (
++  cat <<-EOE
++  # local variables of functions using recursive 
ebuildshell are
++  # visible to the EXIT trap of that recursive 
ebuildshell.  To
++  # keep them local, we have to filter them from that 
recursive
++  # ebuildshell's return-env.  As 'declare -p' is unable 
to tell
++  # local-ity of variables, we abuse the trace attribute 
for local
++  # variables to filter them from the return-env.  So we 
need the
++  # local alias active before declaring any functions.
++  # On a sidehand, this allows for copy&paste of function 
body
++  # lines including the local keyword.
++  alias local='declare -t'
++  shopt -s expand_aliases
++  EOE
++  (
++  declare -p
++  declare -fp
++  shopt -p
++  [[ ${BASH_VERSINFO[0]} == 3 ]] && export
++  ) |
++  (
++  # we need everything but the bash vars after 'env -i'
++  2>"${__ebuildshell_tmpf}.ebuild-rovars" \
++  
"${PORTAGE_PYTHON:-/tools/haubi/gentoo/s01en24/usr/bin/python}" \
++  
"${PORTAGE_BIN_PATH}"/filter-bash-environment.py \
++  --report-readonly-variables \
++  --preserve-readonly-attribute \
++  "${__ebuildshell_bash_i_vars}" \
++  || die "filter-bash-environment.py failed"
++  )
++  # 'declare -g' is available since bash-4.2,
++  # https://bugs.gentoo.org/show_bug.cgi?id=155161#c35
++  if (( ${BASH_VERSINFO[0]} > 4 )) ||
++ (( ${BASH_VERSINFO[0]} == 4 && ${BASH_VERSINFO[1]} >= 2 ))
++  then
++  __ebuildshell_bash42_true=

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

2018-05-28 Thread Fabian Groffen
commit: ce88d2d539253ccd00027cdc2cd87677bba0e2e5
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon May 28 15:34:25 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon May 28 15:34:25 2018 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ce88d2d5

sys-apps/portage: version bump to include fix for python2

Package-Manager: Portage-2.3.40-prefix, Repoman-2.3.9

 sys-apps/portage/Manifest   | 2 +-
 sys-apps/portage/{portage-2.3.40.ebuild => portage-2.3.40.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 5f8e220820..5c7335169d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,4 @@
 DIST prefix-portage-2.2.28.tar.bz2 1187416 BLAKE2B 
1ec27def0b427f60b38dc60178461c2395d388500b6f20d5f9dcd76090c5e68e6578da0073cb5cc3b5b2beb2c2c55ef12afef70d7562fba0a6f0cf90847624ea
 SHA512 
ea0661783d421d204272b9a210745aa2040a18ea347299b3d768588e10ca8dd2e24b46975249bf30010bf565514aea640f4edb9db2ca064312c899304a8c1f42
 DIST prefix-portage-2.3.13.tar.bz2 1205509 BLAKE2B 
851492dc1d3bd55721dfc1662af98a193c8071d87b6b64a09a736864031fa6482fe59a1662789ce8320b156241470688a9a815d79f7367b79500e590a41604f5
 SHA512 
4d59d04b9d6a896a545a40e04973a1c29f421b5d90f08012cb00a27ba1081eb914ddb625f543c26c93c8c75ba690f6ec72e4d9301f4f8e01a5fc68a3438cf46c
 DIST prefix-portage-2.3.18.tar.bz2 1230290 BLAKE2B 
9a7a290493293f166520931aab32a720519ebec15f4c74fe0b0dcd7cc930d591c24e3c87cae4722da119d57826b020b37092ec492bb4e12b774e51334eccf156
 SHA512 
508a5891fc28297e68baf031f4e99674a58c6268b16d50e094adc6676fb42f81bb81bd6f3dc70c24636be64ae015db51df86c49267c8c5a98129fe5e006310d7
-DIST prefix-portage-2.3.40.tar.bz2 1255669 BLAKE2B 
5798c6df2a552952c27c7fd8564f9d3699752c5e2e1c4465f709bd0b33d1b9c91167a2b4652aad7e4366e8a9cdb3f2689a2670705771db3fbc94d2d658cd80bb
 SHA512 
5c85248f5a1f7f694a5271bb8cb62534ffaa5355469123909f2df2d25f85c684f88306ecc63a2549cb4d990c1a4d3e0126c3d3467739cfb3a979d8b286c6b83b
+DIST prefix-portage-2.3.40.1.tar.bz2 1252690 BLAKE2B 
6ecc55c168e8617795df3c03130d2834d301d018ebb1efaac9ce953984d36e5a9a94e3b1f8ae02fa271652cf46c5b52a51a516cd2d8004a085b0ae71fa4a5cda
 SHA512 
4aa664d545048a3b7eb1504dd6245c839f3550de6bc3a02eceb7b0d31646424b5d09b56f12dc3a0a4a83cc3d1f2f7ac18aa1c1e104177902e7b258bef872229c

diff --git a/sys-apps/portage/portage-2.3.40.ebuild 
b/sys-apps/portage/portage-2.3.40.1.ebuild
similarity index 100%
rename from sys-apps/portage/portage-2.3.40.ebuild
rename to sys-apps/portage/portage-2.3.40.1.ebuild



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

2018-05-25 Thread Fabian Groffen
commit: 9f340d4cd4e4d8ce5caa8e3e42f033195c781aa4
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri May 25 20:06:20 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri May 25 20:06:31 2018 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9f340d4c

sys-apps/portage: version bump to 2.3.40

Package-Manager: Portage-2.3.40-prefix, Repoman-2.3.9

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-2.3.40.ebuild | 264 +
 2 files changed, 265 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d2ea65..5f8e220820 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,4 @@
 DIST prefix-portage-2.2.28.tar.bz2 1187416 BLAKE2B 
1ec27def0b427f60b38dc60178461c2395d388500b6f20d5f9dcd76090c5e68e6578da0073cb5cc3b5b2beb2c2c55ef12afef70d7562fba0a6f0cf90847624ea
 SHA512 
ea0661783d421d204272b9a210745aa2040a18ea347299b3d768588e10ca8dd2e24b46975249bf30010bf565514aea640f4edb9db2ca064312c899304a8c1f42
 DIST prefix-portage-2.3.13.tar.bz2 1205509 BLAKE2B 
851492dc1d3bd55721dfc1662af98a193c8071d87b6b64a09a736864031fa6482fe59a1662789ce8320b156241470688a9a815d79f7367b79500e590a41604f5
 SHA512 
4d59d04b9d6a896a545a40e04973a1c29f421b5d90f08012cb00a27ba1081eb914ddb625f543c26c93c8c75ba690f6ec72e4d9301f4f8e01a5fc68a3438cf46c
 DIST prefix-portage-2.3.18.tar.bz2 1230290 BLAKE2B 
9a7a290493293f166520931aab32a720519ebec15f4c74fe0b0dcd7cc930d591c24e3c87cae4722da119d57826b020b37092ec492bb4e12b774e51334eccf156
 SHA512 
508a5891fc28297e68baf031f4e99674a58c6268b16d50e094adc6676fb42f81bb81bd6f3dc70c24636be64ae015db51df86c49267c8c5a98129fe5e006310d7
+DIST prefix-portage-2.3.40.tar.bz2 1255669 BLAKE2B 
5798c6df2a552952c27c7fd8564f9d3699752c5e2e1c4465f709bd0b33d1b9c91167a2b4652aad7e4366e8a9cdb3f2689a2670705771db3fbc94d2d658cd80bb
 SHA512 
5c85248f5a1f7f694a5271bb8cb62534ffaa5355469123909f2df2d25f85c684f88306ecc63a2549cb4d990c1a4d3e0126c3d3467739cfb3a979d8b286c6b83b

diff --git a/sys-apps/portage/portage-2.3.40.ebuild 
b/sys-apps/portage/portage-2.3.40.ebuild
new file mode 100644
index 00..bf7393b3ac
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.40.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+   pypy
+   python3_4 python3_5 python3_6
+   python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit eutils distutils-r1 multilib
+
+DESCRIPTION="Portage package manager used in Gentoo Prefix"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
+LICENSE="GPL-2"
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="build doc epydoc +ipc +native-extensions selinux xattr prefix-chaining"
+
+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 )
+   epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   !build? (
+   >=sys-apps/sed-4.0.5
+   app-shells/bash:0[readline]
+   >=app-admin/eselect-1.2
+   $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+   python{2_7,3_4,3_5} pypy)
+   )
+   elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
+   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   elibc_uclibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   kernel_linux? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 )
+   kernel_AIX? ( >=sys-apps/aix-miscutils-0.1.1634 )
+   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+   xattr? ( kernel_linux? (
+   >=sys-apps/install-xattr-0.3
+   $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+   python2_7 pypy)
+   ) )
+   !https://dev.gentoo.org/~zmedico/portage/archives 
https://dev.gentoo.org/~grobian/distfiles";
+
+prefix_src_archives() {
+   local x y
+   for x in ${@}; do
+   for y in ${SRC_ARCHIVES}; do
+   

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

2018-01-18 Thread Michael Haubenwallner
commit: f6230e5caf431d35944fa927827fa97ac596251f
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Thu Jan 18 12:00:32 2018 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Thu Jan 18 12:00:32 2018 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f6230e5c

sys-apps/portage: rebase prefix-chaining patch

Closes: https://bugs.gentoo.org/642456
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../files/portage-2.3.18-prefix-chaining.patch | 90 ++
 1 file changed, 60 insertions(+), 30 deletions(-)

diff --git a/sys-apps/portage/files/portage-2.3.18-prefix-chaining.patch 
b/sys-apps/portage/files/portage-2.3.18-prefix-chaining.patch
index 1c2537eb00..728b3261ba 100644
--- a/sys-apps/portage/files/portage-2.3.18-prefix-chaining.patch
+++ b/sys-apps/portage/files/portage-2.3.18-prefix-chaining.patch
@@ -1,10 +1,8 @@
-From: [email protected]
+From 2ce322b10b0f1971b174067ca9dac373322e4035 Mon Sep 17 00:00:00 2001
 From: Michael Haubenwallner 
 Date: Thu, 23 Mar 2017 13:52:32 +0100
 Subject: [PATCH] add prefix-chaining support
 
-updated for 2.3.18
-
 ---
  bin/install-qa-check.d/05prefix| 30 ++-
  bin/phase-helpers.sh   | 28 ++
@@ -23,6 +21,8 @@ updated for 2.3.18
  pym/portage/util/_dyn_libs/LinkageMapELF.py|  4 +-
  15 files changed, 376 insertions(+), 47 deletions(-)
 
+diff --git a/bin/install-qa-check.d/05prefix b/bin/install-qa-check.d/05prefix
+index 32561e263..0c1147367 100644
 --- a/bin/install-qa-check.d/05prefix
 +++ b/bin/install-qa-check.d/05prefix
 @@ -79,16 +79,42 @@ install_qa_check_prefix() {
@@ -70,6 +70,8 @@ updated for 2.3.18
continue
else
# this is definitely wrong: script in $PATH and 
invalid shebang
+diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
+index 2cac6f426..b7b5c8ce6 100644
 --- a/bin/phase-helpers.sh
 +++ b/bin/phase-helpers.sh
 @@ -868,6 +868,10 @@ has_version() {
@@ -149,6 +151,8 @@ updated for 2.3.18
retval=$?
[[ -n ${output} ]] && echo "${output}"
case "${retval}" in
+diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
+index 1d37d0ece..2b185ef73 100644
 --- a/pym/_emerge/actions.py
 +++ b/pym/_emerge/actions.py
 @@ -39,7 +39,7 @@ from portage import os
@@ -160,7 +164,7 @@ updated for 2.3.18
  from portage.const import GLOBAL_CONFIG_PATH, VCS_DIRS, 
_DEPCLEAN_LIB_CHECK_DEFAULT
  from portage.const import SUPPORTED_BINPKG_FORMATS, TIMESTAMP_FORMAT
  from portage.dbapi.dep_expand import dep_expand
-@@ -65,6 +65,7 @@ from portage.util.SlotObject import Slot
+@@ -65,6 +65,7 @@ from portage.util.SlotObject import SlotObject
  from portage.util._async.run_main_scheduler import run_main_scheduler
  from portage.util._async.SchedulerInterface import SchedulerInterface
  from portage.util._eventloop.global_event_loop import global_event_loop
@@ -168,7 +172,7 @@ updated for 2.3.18
  from portage._global_updates import _global_updates
  from portage.sync.old_tree_timestamp import old_tree_timestamp_warn
  from portage.localization import _
-@@ -2659,6 +2660,9 @@ def missing_sets_warning(root_config, mi
+@@ -2659,6 +2660,9 @@ def missing_sets_warning(root_config, missing_sets):
if portage.const.EPREFIX:
global_config_path = os.path.join(portage.const.EPREFIX,
portage.const.GLOBAL_CONFIG_PATH.lstrip(os.sep))
@@ -178,6 +182,8 @@ updated for 2.3.18
msg.append("This usually means that '%s'" % \
(os.path.join(global_config_path, "sets/portage.conf"),))
msg.append("is missing or corrupt.")
+diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
+index 8d00f93df..fe317f119 100644
 --- a/pym/_emerge/depgraph.py
 +++ b/pym/_emerge/depgraph.py
 @@ -3239,15 +3239,15 @@ class depgraph(object):
@@ -200,18 +206,17 @@ updated for 2.3.18
self._priority(buildtime=True,
optional=(pkg.built or ignore_hdepend_deps),
ignored=ignore_hdepend_deps)),
-@@ -3255,8 +3255,8 @@ class depgraph(object):
+@@ -3255,7 +3255,8 @@ class depgraph(object):
  
debug = "--debug" in self._frozen_config.myopts
  
 -  for dep_root, dep_string, dep_priority in deps:
--  if not dep_string:
 +  for dep_root, dep_type, dep_priority in deps:
-+  if not dep_string:
++  dep_string = edepend[dep_type]
+   if not dep_string:
continue
if debug:
-   writemsg_level("\nParent:%s\n" % 
(pkg,),
-@@ -3293,7 +3293,7 @@ class depgraph(object):
+@@ -3293,7 +3294,7 @@ class depgraph(object)

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

2018-01-18 Thread Michael Haubenwallner
commit: 093df4b0e448f90a4ab47b706c860577283fa5f9
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Thu Jan 18 11:59:38 2018 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Thu Jan 18 11:59:38 2018 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=093df4b0

sys-apps/portage: Remove linguas_* from IUSE.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-apps/portage/portage-2.2.28-r5.ebuild | 4 ++--
 sys-apps/portage/portage-2.3.13.ebuild| 4 ++--
 sys-apps/portage/portage-2.3.18.ebuild| 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-apps/portage/portage-2.2.28-r5.ebuild 
b/sys-apps/portage/portage-2.2.28-r5.ebuild
index 47a0bd4d69..c8ecc510ce 100644
--- a/sys-apps/portage/portage-2.2.28-r5.ebuild
+++ b/sys-apps/portage/portage-2.2.28-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://prefix.gentoo.org/";
 LICENSE="GPL-2"
 KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru selinux xattr prefix-chaining"
+IUSE="build doc epydoc +ipc selinux xattr prefix-chaining"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
>=sys-devel/make-3.82

diff --git a/sys-apps/portage/portage-2.3.13.ebuild 
b/sys-apps/portage/portage-2.3.13.ebuild
index 9471ca7f8d..6ed633fbda 100644
--- a/sys-apps/portage/portage-2.3.13.ebuild
+++ b/sys-apps/portage/portage-2.3.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ HOMEPAGE="http://prefix.gentoo.org/";
 LICENSE="GPL-2"
 KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr 
prefix-chaining"
+IUSE="build doc epydoc +ipc +native-extensions selinux xattr prefix-chaining"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
>=app-arch/tar-1.27

diff --git a/sys-apps/portage/portage-2.3.18.ebuild 
b/sys-apps/portage/portage-2.3.18.ebuild
index 7e4bf1ab37..f1b6e82970 100644
--- a/sys-apps/portage/portage-2.3.18.ebuild
+++ b/sys-apps/portage/portage-2.3.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
 LICENSE="GPL-2"
 KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr 
prefix-chaining"
+IUSE="build doc epydoc +ipc +native-extensions selinux xattr prefix-chaining"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
>=app-arch/tar-1.27



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

2017-12-29 Thread Fabian Groffen
commit: 2790e4405fc6cbeb3e5e6e138f357d09cbc4b46f
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Dec 29 13:06:43 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Dec 29 13:06:43 2017 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2790e440

sys-apps/portage: add/update patch for prefix-chaining, bug #642456

Closes: https://bugs.gentoo.org/642456
Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6

 .../portage-2.2.00.15801-prefix-chaining.patch | 693 -
 .../portage-2.2.01.18826-aix-preservelibs.patch|  32 -
 .../portage-2.2.01.19247-aix-preserve-libs.patch   | 163 -
 ...portage-2.2.10.1-brokentty-more-platforms.patch |  35 --
 .../portage-2.2.10.1-case-insensitive-fs.patch | 375 ---
 ...ortage-2.2.7-macho-relative-install_names.patch |  68 --
 sys-apps/portage/files/portage-2.2.7-sandbox.patch |  21 -
 .../files/portage-2.2.7-shebang-fixes.patch| 153 -
 patch => portage-2.3.18-prefix-chaining.patch} | 182 +++---
 .../files/portage-2.3.4-mj-safe-econf.patch|  39 --
 sys-apps/portage/portage-2.3.18.ebuild |   2 +-
 11 files changed, 80 insertions(+), 1683 deletions(-)

diff --git a/sys-apps/portage/files/portage-2.2.00.15801-prefix-chaining.patch 
b/sys-apps/portage/files/portage-2.2.00.15801-prefix-chaining.patch
deleted file mode 100644
index 01e5934448..00
--- a/sys-apps/portage/files/portage-2.2.00.15801-prefix-chaining.patch
+++ /dev/null
@@ -1,693 +0,0 @@
-diff -ru prefix-portage-2.2.00.15801.orig/bin/ebuild.sh 
prefix-portage-2.2.00.15801/bin/ebuild.sh
 prefix-portage-2.2.00.15801.orig/bin/ebuild.sh 2010-03-11 10:39:16 
+0100
-+++ prefix-portage-2.2.00.15801/bin/ebuild.sh  2010-03-11 10:38:21 +0100
-@@ -123,6 +123,83 @@
- # Unset some variables that break things.
- unset GZIP BZIP BZIP2 CDPATH GREP_OPTIONS GREP_COLOR GLOBIGNORE
- 
-+if [[ -n "${PORTAGE_READONLY_EPREFIXES}" ]]; then
-+  new_PATH=${PATH}
-+
-+  prefixes="${PORTAGE_READONLY_EPREFIXES}:${EPREFIX}"
-+
-+  # build up a PATH for the current environment. the path has to
-+  # contain all the paths the start with $EPREFIX _first_, and
-+  # after that, all the others. We have to re-order the new_PATH,
-+  # so that EPREFIX paths move to the front. after that, the paths
-+  # of all parent prefixes are added, and finally, after that, the
-+  # paths not containing any prefix are added.
-+
-+  save_IFS=$IFS
-+  IFS=':'
-+  pth_pfx=
-+  pth_nopfx=
-+  for pth in ${new_PATH}; do
-+  IFS=$save_IFS
-+  if [[ "${pth#${EPREFIX}}" == "${pth}" ]]; then
-+  [[ ":${pth_nopfx}:" == *":${pth}:"* ]] && continue
-+  if [[ -z "${pth_nopfx}" ]]; then
-+  pth_nopfx="${pth}"
-+  else
-+  pth_nopfx="${pth_nopfx}:${pth}"
-+  fi
-+  else
-+  [[ ":${pth_pfx}:" == *":${pth}:"* ]] && continue
-+  if [[ -z "${pth_pfx}" ]]; then
-+  pth_pfx="${pth}"
-+  else
-+  pth_pfx="${pth_pfx}:${pth}"
-+  fi
-+  fi
-+  done
-+  IFS=$save_IFS
-+
-+  new_PATH=
-+
-+  save_IFS=$IFS
-+  IFS=':'
-+  for eroot in ${prefixes}; do
-+  IFS=$save_IFS
-+  if [[ -f ${eroot}/usr/share/portage/config/make.globals ]]; then
-+  # ok, there is a portage instance installed in this 
prefix,
-+  # so we can ask (politely) for the DEFAULT_PATH of it :)
-+
-+  defpath="$(. ${eroot}/etc/make.globals && echo 
$DEFAULT_PATH)"
-+  okpath=
-+  save_IFS2=$IFS
-+  IFS=':'
-+  for p in $defpath; do
-+  IFS=$save_IFS2
-+  # we have that one already...
-+  [[ ":${new_PATH}:" == *":$p:"* ]] && continue
-+  # we skip paths, that are outside our prefix ...
-+  [[ "${p#${eroot}}" == "${p}" ]] && continue
-+  if [[ -z "${okpath}" ]]; then
-+  okpath="${p}"
-+  else
-+  okpath="${okpath}:${p}"
-+  fi
-+  done
-+  IFS=$save_IFS2
-+
-+  new_PATH="${okpath}:${new_PATH}"
-+  else
-+  # no portage installed in this prefix. this means we 
have to
-+  # somehow fiddle together a sane path for that prefix 
for at
-+  # least the standard things to work.
-+  
new_PATH="${eroot}/usr/bi

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

2017-12-12 Thread Fabian Groffen
commit: f4d7438d093f5263ba07e229377ed8002f08506f
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Dec 12 09:13:44 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Dec 12 09:14:06 2017 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f4d7438d

sys-apps/portage: version bump to 2.3.18, includes seatbelt fix for High Sierra

Bug: https://bugs.gentoo.org/640240
Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6

 sys-apps/portage/Manifest|  2 +-
 .../{portage-2.3.11.ebuild => portage-2.3.18.ebuild} | 20 ++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3b63ea0d87..d8a1695c45 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
 DIST prefix-portage-2.2.28.tar.bz2 1187416 SHA256 
e4bb6c08a65252cfb3faf777ff9bb6aab162174766202f811154c0bbe301b45e SHA512 
ea0661783d421d204272b9a210745aa2040a18ea347299b3d768588e10ca8dd2e24b46975249bf30010bf565514aea640f4edb9db2ca064312c899304a8c1f42
 WHIRLPOOL 
d2d3feab14c4b0dc706db9336e08637897d963d0cbd7e1995431701c8c1914f6f42f57917470a2c89cdc8596d2ed8183c80f3814eba7512b5216611595da38a1
-DIST prefix-portage-2.3.11.tar.bz2 1204510 SHA256 
58532d75cf08a1bced4ed8b2fe9693d00f825d0b15b01961c1df5736a314edb1 SHA512 
f84820c076273fa40c036910b9482141221a78dd640b7c7a56e4b0b8b619452e87e9d2ea60ff922391ab344c68cbaf5135ebe7f5c70888400b97cb78cb89c1f7
 WHIRLPOOL 
fdb70b14b810dd0013947836b5769de266a85b13d1ffeee22133bd9b57eb4f441621e5c019576a1d115c2a5d4f5f86f532ce288ba8a9004742873e0cb5d54156
 DIST prefix-portage-2.3.13.tar.bz2 1205509 SHA256 
70378a489aad579972fa12ca8cb64297964fcb3b4758e52f37d129d25cc14272 SHA512 
4d59d04b9d6a896a545a40e04973a1c29f421b5d90f08012cb00a27ba1081eb914ddb625f543c26c93c8c75ba690f6ec72e4d9301f4f8e01a5fc68a3438cf46c
 WHIRLPOOL 
d91f0e70436c14b3fc22fb0d708439b0a9a402fb9461e9e6ee776e826859d1786beabd0c81f6db6d1205f3da9f717d02c57588109970d8954123ef8c9f56a25e
+DIST prefix-portage-2.3.18.tar.bz2 1230290 SHA256 
297e637a380c44dde8b725d5c194eacca8e92fc107ae85c7a082abe9d2b9d8ad SHA512 
508a5891fc28297e68baf031f4e99674a58c6268b16d50e094adc6676fb42f81bb81bd6f3dc70c24636be64ae015db51df86c49267c8c5a98129fe5e006310d7
 WHIRLPOOL 
9105c69d47171c92342e4349f9986bd8f45fcdaf3624090bb7a2ef019fec2028b4d16ee907d884473ba5cd8bd4cfdae37d594fc9ea6b32beda05d980126ead67

diff --git a/sys-apps/portage/portage-2.3.11.ebuild 
b/sys-apps/portage/portage-2.3.18.ebuild
similarity index 94%
rename from sys-apps/portage/portage-2.3.11.ebuild
rename to sys-apps/portage/portage-2.3.18.ebuild
index 9471ca7f8d..a7abe3406a 100644
--- a/sys-apps/portage/portage-2.3.11.ebuild
+++ b/sys-apps/portage/portage-2.3.18.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 PYTHON_COMPAT=(
pypy
-   python3_3 python3_4 python3_5 python3_6
+   python3_4 python3_5 python3_6
python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
@@ -13,7 +13,7 @@ PYTHON_REQ_USE='bzip2(+),threads(+)'
 inherit eutils distutils-r1 multilib
 
 DESCRIPTION="Portage package manager used in Gentoo Prefix"
-HOMEPAGE="http://prefix.gentoo.org/";
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
 LICENSE="GPL-2"
 KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
@@ -39,6 +39,8 @@ RDEPEND="
>=sys-apps/sed-4.0.5
app-shells/bash:0[readline]
>=app-admin/eselect-1.2
+   $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+   python{2_7,3_4,3_5} pypy)
)
elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
@@ -54,7 +56,7 @@ RDEPEND="
$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
python2_7 pypy)
) )
-   !prefix? ( !https://dev.gentoo.org/~dolsen/releases/portage 
https://dev.gentoo.org/~grobian/distfiles";
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives 
https://dev.gentoo.org/~grobian/distfiles";
 
 prefix_src_archives() {
local x y
@@ -213,8 +215,14 @@ python_install_all() {
distutils-r1_python_install_all
 
local targets=()
-   use doc && targets+=( install_docbook )
-   use epydoc && targets+=( install_epydoc )
+   use doc && targets+=(
+   install_docbook
+   --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+   )
+   use epydoc && targets+=(
+   install_epydoc
+   --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+   )
 
# install docs
if [[ ${targets[@]} ]]; then



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

2017-10-29 Thread Fabian Groffen
commit: 1e25e5e276c2f7058eb8473c97d6cf713e1fe739
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Oct 29 15:07:10 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Oct 29 15:07:10 2017 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1e25e5e2

sys-apps/portage: version bump to 2.3.13

Package-Manager: Portage-2.3.13-prefix, Repoman-2.3.4

 sys-apps/portage/Manifest | 2 +-
 sys-apps/portage/{portage-2.3.10.ebuild => portage-2.3.13.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e3289c9274..3b63ea0d87 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
 DIST prefix-portage-2.2.28.tar.bz2 1187416 SHA256 
e4bb6c08a65252cfb3faf777ff9bb6aab162174766202f811154c0bbe301b45e SHA512 
ea0661783d421d204272b9a210745aa2040a18ea347299b3d768588e10ca8dd2e24b46975249bf30010bf565514aea640f4edb9db2ca064312c899304a8c1f42
 WHIRLPOOL 
d2d3feab14c4b0dc706db9336e08637897d963d0cbd7e1995431701c8c1914f6f42f57917470a2c89cdc8596d2ed8183c80f3814eba7512b5216611595da38a1
-DIST prefix-portage-2.3.10.tar.bz2 1231703 SHA256 
47a73d3589a7cd3223ee5a2843db42dd75a0ba921feff9e974db70652219ad8d SHA512 
f9cdee051296c83e00483738292c640ce80ab66ddafd3b78cb5648abc0293ecd735532efba96881ddf59bdca3b8b7bd6a48cd142163c48066f03ba7c7b091625
 WHIRLPOOL 
7464f646c719c05f58c4935591b57c6f873875a2c73aefb4db2f7da1787d435df03f91f911788779789db9d264b229b0f84d121361d214f41057fce0b29c
 DIST prefix-portage-2.3.11.tar.bz2 1204510 SHA256 
58532d75cf08a1bced4ed8b2fe9693d00f825d0b15b01961c1df5736a314edb1 SHA512 
f84820c076273fa40c036910b9482141221a78dd640b7c7a56e4b0b8b619452e87e9d2ea60ff922391ab344c68cbaf5135ebe7f5c70888400b97cb78cb89c1f7
 WHIRLPOOL 
fdb70b14b810dd0013947836b5769de266a85b13d1ffeee22133bd9b57eb4f441621e5c019576a1d115c2a5d4f5f86f532ce288ba8a9004742873e0cb5d54156
+DIST prefix-portage-2.3.13.tar.bz2 1205509 SHA256 
70378a489aad579972fa12ca8cb64297964fcb3b4758e52f37d129d25cc14272 SHA512 
4d59d04b9d6a896a545a40e04973a1c29f421b5d90f08012cb00a27ba1081eb914ddb625f543c26c93c8c75ba690f6ec72e4d9301f4f8e01a5fc68a3438cf46c
 WHIRLPOOL 
d91f0e70436c14b3fc22fb0d708439b0a9a402fb9461e9e6ee776e826859d1786beabd0c81f6db6d1205f3da9f717d02c57588109970d8954123ef8c9f56a25e

diff --git a/sys-apps/portage/portage-2.3.10.ebuild 
b/sys-apps/portage/portage-2.3.13.ebuild
similarity index 100%
rename from sys-apps/portage/portage-2.3.10.ebuild
rename to sys-apps/portage/portage-2.3.13.ebuild



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

2017-10-03 Thread Fabian Groffen
commit: 5c9acfc996af0e91888518458ae1103d6bb2483a
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Oct  3 07:40:40 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Oct  3 07:40:55 2017 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5c9acfc9

sys-apps/portage: version bump

Package-Manager: Portage-2.3.11-prefix, Repoman-2.3.3

 sys-apps/portage/Manifest| 2 +-
 sys-apps/portage/{portage-2.3.8.ebuild => portage-2.3.11.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a7b107dbe1..e3289c9274 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
 DIST prefix-portage-2.2.28.tar.bz2 1187416 SHA256 
e4bb6c08a65252cfb3faf777ff9bb6aab162174766202f811154c0bbe301b45e SHA512 
ea0661783d421d204272b9a210745aa2040a18ea347299b3d768588e10ca8dd2e24b46975249bf30010bf565514aea640f4edb9db2ca064312c899304a8c1f42
 WHIRLPOOL 
d2d3feab14c4b0dc706db9336e08637897d963d0cbd7e1995431701c8c1914f6f42f57917470a2c89cdc8596d2ed8183c80f3814eba7512b5216611595da38a1
 DIST prefix-portage-2.3.10.tar.bz2 1231703 SHA256 
47a73d3589a7cd3223ee5a2843db42dd75a0ba921feff9e974db70652219ad8d SHA512 
f9cdee051296c83e00483738292c640ce80ab66ddafd3b78cb5648abc0293ecd735532efba96881ddf59bdca3b8b7bd6a48cd142163c48066f03ba7c7b091625
 WHIRLPOOL 
7464f646c719c05f58c4935591b57c6f873875a2c73aefb4db2f7da1787d435df03f91f911788779789db9d264b229b0f84d121361d214f41057fce0b29c
-DIST prefix-portage-2.3.8.tar.bz2 1241658 SHA256 
ca59e2a8886a9e84fba1c71aabf771ddcb514d2f1b207fae5bf7b054693744a7 SHA512 
88a871b320ba1ef8ec7da467dad62f13094f7d2ca565d9f0b4ccd6ed8f74815f000c9e26a7c1da808a199aa3a24f540406237c33bb5716ac535d72c6dc73203e
 WHIRLPOOL 
0832b71c3c9a4d0385c05408677093d51812e1a7b6906db4b85faf49ee889cc9e15ceaafd5253494279c04f0f506c3e9cab4d0a423a17cf6e394e766128e3044
+DIST prefix-portage-2.3.11.tar.bz2 1204510 SHA256 
58532d75cf08a1bced4ed8b2fe9693d00f825d0b15b01961c1df5736a314edb1 SHA512 
f84820c076273fa40c036910b9482141221a78dd640b7c7a56e4b0b8b619452e87e9d2ea60ff922391ab344c68cbaf5135ebe7f5c70888400b97cb78cb89c1f7
 WHIRLPOOL 
fdb70b14b810dd0013947836b5769de266a85b13d1ffeee22133bd9b57eb4f441621e5c019576a1d115c2a5d4f5f86f532ce288ba8a9004742873e0cb5d54156

diff --git a/sys-apps/portage/portage-2.3.8.ebuild 
b/sys-apps/portage/portage-2.3.11.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.3.8.ebuild
rename to sys-apps/portage/portage-2.3.11.ebuild
index 07490db2e3..9471ca7f8d 100644
--- a/sys-apps/portage/portage-2.3.8.ebuild
+++ b/sys-apps/portage/portage-2.3.11.ebuild
@@ -89,7 +89,7 @@ pkg_setup() {
 python_prepare_all() {
distutils-r1_python_prepare_all
 
-   epatch "${FILESDIR}"/${PN}-2.2.28-ebuildshell-r1.patch # 155161
+   epatch "${FILESDIR}"/${PN}-2.3.10-ebuildshell.patch # 155161
use prefix-chaining &&
epatch "${FILESDIR}"/${PN}-2.3.8-prefix-chaining.patch
 



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

2017-09-29 Thread Michael Haubenwallner
commit: d9f6cf75e9fc38cb9f4cd7158e9ae19d39585332
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Tue Sep 26 14:05:54 2017 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Tue Sep 26 14:05:54 2017 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d9f6cf75

sys-apps/portage: bump ebuildshell patch

The change actually is for FEATURES=userpriv in main Gentoo Linux.

Package-Manager: Portage-2.3.10-prefix, Repoman-2.3.3

 .../files/portage-2.2.01.18213-ebuildshell.patch   | 105 --
 .../files/portage-2.2.01.18980-ebuildshell.patch   | 103 --
 .../files/portage-2.2.01.19247-ebuildshell.patch   | 105 --
 .../files/portage-2.2.01.19981-ebuildshell.patch   | 105 --
 .../files/portage-2.2.01.20020-ebuildshell.patch   | 137 --
 .../files/portage-2.2.01.20239-ebuildshell.patch   | 148 ---
 .../portage/files/portage-2.2.7-ebuildshell.patch  | 158 -
 .../portage/files/portage-2.2.8-ebuildshell.patch  | 157 
 ...hell.patch => portage-2.3.10-ebuildshell.patch} |  37 ++---
 sys-apps/portage/portage-2.3.10.ebuild |   2 +-
 10 files changed, 21 insertions(+), 1036 deletions(-)

diff --git a/sys-apps/portage/files/portage-2.2.01.18213-ebuildshell.patch 
b/sys-apps/portage/files/portage-2.2.01.18213-ebuildshell.patch
deleted file mode 100644
index 59e98af020..00
--- a/sys-apps/portage/files/portage-2.2.01.18213-ebuildshell.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=155161
-
 portage/bin/ebuild.sh.orig 2010-12-15 11:12:12.466527126 +0100
-+++ portage/bin/ebuild.sh  2010-12-15 11:11:04.757062756 +0100
-@@ -59,7 +59,7 @@
- qa_call() {
-   local shopts=$(shopt) OLDIFS="$IFS"
-   local retval
--  "$@"
-+  call-ebuildshell "$@"
-   retval=$?
-   set +e
-   [[ $shopts != $(shopt) ]] &&
-@@ -1765,7 +1765,7 @@
- filter_readonly_variables() {
-   local x filtered_vars
-   local readonly_bash_vars="BASHOPTS BASHPID DIRSTACK EUID
--  FUNCNAME GROUPS PIPESTATUS PPID SHELLOPTS UID"
-+  FUNCNAME GROUPS PIPESTATUS PPID SHELLOPTS UID BASH_VERSINFO"
-   local bash_misc_vars="BASH BASH_.* COMP_WORDBREAKS HISTCMD
-   HISTFILE HOSTNAME HOSTTYPE IFS LINENO MACHTYPE OLDPWD
-   OPTERR OPTIND OSTYPE POSIXLY_CORRECT PS4 PWD RANDOM
-@@ -1774,8 +1774,10 @@
-   SANDBOX_DEBUG_LOG SANDBOX_DISABLED SANDBOX_LIB
-   SANDBOX_LOG SANDBOX_ON"
-   local misc_garbage_vars="_portage_filter_opts"
--  filtered_vars="$readonly_bash_vars $bash_misc_vars
--  $PORTAGE_READONLY_VARS $misc_garbage_vars"
-+  filtered_vars="$readonly_bash_vars"
-+  if ! hasq --filter-for-subshell $* ; then
-+  filtered_vars="$filtered_vars $bash_misc_vars 
$PORTAGE_READONLY_VARS $misc_garbage_vars"
-+  fi
- 
-   # Don't filter/interfere with prefix variables unless they are
-   # supported by the current EAPI.
-@@ -1805,7 +1807,11 @@
-   LC_CTYPE LC_MESSAGES LC_MONETARY
-   LC_NUMERIC LC_PAPER LC_TIME"
-   fi
--  if ! hasq --allow-extra-vars $* ; then
-+  if hasq --filter-metadata $* ; then
-+  filtered_vars="$filtered_vars $PORTAGE_READONLY_METADATA"
-+  fi
-+  if ! hasq --allow-extra-vars $* &&
-+ ! hasq --filter-for-subshell $* ; then
-   filtered_vars="
-   ${filtered_vars}
-   ${PORTAGE_SAVED_READONLY_VARS}
-@@ -1936,6 +1942,56 @@
-   unset BIN_PATH BIN BODY FUNC_SRC
- fi
- 
-+call-ebuildshell() {
-+  if ! hasq ebuildshell ${FEATURES}; then
-+  "$@"
-+  return $?
-+  fi
-+  (
-+  umask 002
-+  (
-+  (
-+  set
-+  declare -p
-+  declare -fp
-+  shopt -p
-+  if [[ ${BASH_VERSINFO[0]} == 3 ]]; then
-+  export
-+  fi
-+  ) | filter_readonly_variables --filter-for-subshell
-+  echo 'declare -r $PORTAGE_READONLY_METADATA 
$PORTAGE_READONLY_VARS'
-+  echo "export PS1='EBUILD ${PN} $1 \$ '" 
-+  echo 'unset ENV'
-+  echo "type $1"
-+  echo "echo WANTED: $@"
-+  echo "trap '"
-+  echo "umask 002"
-+  echo "("
-+  echo "  set"
-+  echo "  declare -p"
-+  echo "  declare -fp"
-+  echo "  shopt -p"
-+  if [[ ${BASH_VERSINFO[0]} == 3 ]]; then
-+  echo "  export"
-+  fi

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

2017-09-22 Thread Fabian Groffen
commit: 3e2be9e63e9365696818d058fd0528f971a900ee
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Sep 22 10:38:16 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Sep 22 10:38:16 2017 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3e2be9e6

sys-apps/portage: version bump to 2.3.10

Package-Manager: Portage-2.3.10-prefix, Repoman-2.3.3

 sys-apps/portage/Manifest| 2 +-
 sys-apps/portage/{portage-2.3.7.ebuild => portage-2.3.10.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 42c02f90e1..a7b107dbe1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
 DIST prefix-portage-2.2.28.tar.bz2 1187416 SHA256 
e4bb6c08a65252cfb3faf777ff9bb6aab162174766202f811154c0bbe301b45e SHA512 
ea0661783d421d204272b9a210745aa2040a18ea347299b3d768588e10ca8dd2e24b46975249bf30010bf565514aea640f4edb9db2ca064312c899304a8c1f42
 WHIRLPOOL 
d2d3feab14c4b0dc706db9336e08637897d963d0cbd7e1995431701c8c1914f6f42f57917470a2c89cdc8596d2ed8183c80f3814eba7512b5216611595da38a1
-DIST prefix-portage-2.3.7.tar.bz2 1228627 SHA256 
3d6c0818520d6e39df0c0a94b7fc206e1c82e596f88146c729245a8489968ceb SHA512 
bff82ccac9cbb249f196c656311ba0d29cd93ee803bc2f3744e028cf85c0b622cabacdee9bc634cf06bb92afc342f0790e19e2cc6ff87d6593228f6b79b7c332
 WHIRLPOOL 
d6f236a618cd8c2e2817e4d1a9d3dac5072cd012cf8756bd144d652b63e09fca6134ab84780911674563aa977458532eda6a04b024e413b1e732e75984581563
+DIST prefix-portage-2.3.10.tar.bz2 1231703 SHA256 
47a73d3589a7cd3223ee5a2843db42dd75a0ba921feff9e974db70652219ad8d SHA512 
f9cdee051296c83e00483738292c640ce80ab66ddafd3b78cb5648abc0293ecd735532efba96881ddf59bdca3b8b7bd6a48cd142163c48066f03ba7c7b091625
 WHIRLPOOL 
7464f646c719c05f58c4935591b57c6f873875a2c73aefb4db2f7da1787d435df03f91f911788779789db9d264b229b0f84d121361d214f41057fce0b29c
 DIST prefix-portage-2.3.8.tar.bz2 1241658 SHA256 
ca59e2a8886a9e84fba1c71aabf771ddcb514d2f1b207fae5bf7b054693744a7 SHA512 
88a871b320ba1ef8ec7da467dad62f13094f7d2ca565d9f0b4ccd6ed8f74815f000c9e26a7c1da808a199aa3a24f540406237c33bb5716ac535d72c6dc73203e
 WHIRLPOOL 
0832b71c3c9a4d0385c05408677093d51812e1a7b6906db4b85faf49ee889cc9e15ceaafd5253494279c04f0f506c3e9cab4d0a423a17cf6e394e766128e3044

diff --git a/sys-apps/portage/portage-2.3.7.ebuild 
b/sys-apps/portage/portage-2.3.10.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.3.7.ebuild
rename to sys-apps/portage/portage-2.3.10.ebuild
index 60f0e15afe..07490db2e3 100644
--- a/sys-apps/portage/portage-2.3.7.ebuild
+++ b/sys-apps/portage/portage-2.3.10.ebuild
@@ -91,7 +91,7 @@ python_prepare_all() {
 
epatch "${FILESDIR}"/${PN}-2.2.28-ebuildshell-r1.patch # 155161
use prefix-chaining &&
-   epatch "${FILESDIR}"/${PN}-2.3.5-prefix-chaining.patch
+   epatch "${FILESDIR}"/${PN}-2.3.8-prefix-chaining.patch
 
if use native-extensions; then
printf "[build_ext]\nportage-ext-modules=true\n" >> \



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

2017-09-18 Thread Michael Haubenwallner
commit: 4b7e34b956d910b3723354b9351d21d8f010788f
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Mon Sep 18 14:08:44 2017 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Mon Sep 18 14:08:44 2017 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4b7e34b9

sys-apps/portage: bump prefix-chaining.patch

Package-Manager: Portage-2.3.8-prefix, Repoman-2.3.3

 .../files/portage-2.3.8-prefix-chaining.patch  | 927 +
 sys-apps/portage/portage-2.3.8.ebuild  |   2 +-
 2 files changed, 928 insertions(+), 1 deletion(-)

diff --git a/sys-apps/portage/files/portage-2.3.8-prefix-chaining.patch 
b/sys-apps/portage/files/portage-2.3.8-prefix-chaining.patch
new file mode 100644
index 00..036d022191
--- /dev/null
+++ b/sys-apps/portage/files/portage-2.3.8-prefix-chaining.patch
@@ -0,0 +1,927 @@
+From 448d210bb312ed0930763376d5182ebfbed1abd8 Mon Sep 17 00:00:00 2001
+From: Michael Haubenwallner 
+Date: Thu, 23 Mar 2017 13:52:32 +0100
+Subject: [PATCH] add prefix-chaining support
+
+---
+ bin/install-qa-check.d/05prefix| 30 ++-
+ bin/phase-helpers.sh   | 28 ++
+ pym/_emerge/actions.py |  6 +-
+ pym/_emerge/depgraph.py| 51 ++-
+ pym/_emerge/resolver/output.py | 40 -
+ pym/portage/_sets/__init__.py  |  5 ++
+ pym/portage/const.py   |  6 ++
+ pym/portage/dbapi/vartree.py   | 34 ++--
+ pym/portage/dep/dep_check.py   | 99 +-
+ .../package/ebuild/_config/LocationsManager.py |  3 +
+ pym/portage/package/ebuild/config.py   | 62 ++
+ pym/portage/package/ebuild/doebuild.py | 24 +-
+ pym/portage/package/ebuild/fetch.py|  4 +
+ pym/portage/sync/controller.py | 27 +++---
+ pym/portage/util/_dyn_libs/LinkageMapELF.py|  4 +-
+ 15 files changed, 376 insertions(+), 47 deletions(-)
+
+diff --git a/bin/install-qa-check.d/05prefix b/bin/install-qa-check.d/05prefix
+index 32561e2..0c11473 100644
+--- a/bin/install-qa-check.d/05prefix
 b/bin/install-qa-check.d/05prefix
+@@ -79,16 +79,42 @@ install_qa_check_prefix() {
+   # 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
++  
all_epfs="$PORTAGE_READONLY_EPREFIXES:$EPREFIX:$EROOT:$ED"
++  save_IFS=$IFS
++  IFS=:
++  epfs=( $all_epfs )
++  IFS=$save_IFS
++
++  found=
++  for x in "${epfs[@]}"; do
++  [[ -z "${x}" ]] && continue
++  check="${x}${line[0]}"
++
++  # might already contain a prefix
++  if [[ "${line[0]}" == "${x}"* ]]; then
++  check="${line[0]}"
++  fi
++
++  if [[ -e ${check} ]]; then
++  found="${check}"
++  fi
++  done
++
++  if [[ -n ${found} ]] ; then
+   # is it unprefixed, but we can just fix it 
because a
+   # prefixed variant exists
+   eqawarn "prefixing shebang of ${fn#${D}}"
++
++  if [[ ${found} == "${ED}"* || ${found} == 
"${EROOT}"* ]]; then
++  found="${EPREFIX}${line[0]}"
++  fi
++
+   # statement is made idempotent on purpose, 
because
+   # symlinks may point to the same target, and 
hence the
+   # same real file may be sedded multiple times 
since we
+   # read the shebangs in one go upfront for 
performance
+   # reasons
+-  sed -i -e '1s:^#! 
\?'"${line[0]}"':#!'"${EPREFIX}"${line[0]}':' "${rf}"
++  sed -i -e '1s:^#! 
\?'"${line[0]}"':#!'"${found}"':' "${rf}"
+   continue
+   else
+   # this is definitely wrong: script in $PATH and 
invalid shebang
+diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
+index b28fd92..dcfd263 100644
+--- a/bin/phase-helpers.sh
 b/bin/phase-helpers.sh
+@@ -867,6 +867,10 @@ has_version() {
+   "${PORTAGE_BIN_PATH}/ebuild-helpers/portageq" has_version 
"${eroot}" "${atom}"
+   

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

2017-08-21 Thread Fabian Groffen
commit: 7bcd1c0bae33f370b78e16783b5864e4d9220214
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Aug 21 13:33:38 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Aug 21 13:33:38 2017 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7bcd1c0b

sys-apps/portage: version bump

Package-Manager: Portage-2.3.8-prefix, Repoman-2.3.3

 sys-apps/portage/Manifest   | 2 +-
 sys-apps/portage/{portage-2.3.6.ebuild => portage-2.3.8.ebuild} | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 9b4865e225..42c02f90e1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
 DIST prefix-portage-2.2.28.tar.bz2 1187416 SHA256 
e4bb6c08a65252cfb3faf777ff9bb6aab162174766202f811154c0bbe301b45e SHA512 
ea0661783d421d204272b9a210745aa2040a18ea347299b3d768588e10ca8dd2e24b46975249bf30010bf565514aea640f4edb9db2ca064312c899304a8c1f42
 WHIRLPOOL 
d2d3feab14c4b0dc706db9336e08637897d963d0cbd7e1995431701c8c1914f6f42f57917470a2c89cdc8596d2ed8183c80f3814eba7512b5216611595da38a1
-DIST prefix-portage-2.3.6.tar.bz2 1214157 SHA256 
3a2b4494a7fc97dae8c2c50a02004ae47281d01338a878e99a756b9b62194417 SHA512 
065d0d6eee144473ffb3b16e1df43f54a9e5295e11c5dac4e0a5ceb416d36d7b7fac2e4194777f0b352a181bc24d80fac10ea53c11356fee34ed98a8bd6a2fea
 WHIRLPOOL 
45c19dde4a0f6fa5750515707d81f31b446e36dd90d66daf44e8baebcd6b337cb16a85fc962c4181532c419552af223388ef77262ca407979dfb16f797446f40
 DIST prefix-portage-2.3.7.tar.bz2 1228627 SHA256 
3d6c0818520d6e39df0c0a94b7fc206e1c82e596f88146c729245a8489968ceb SHA512 
bff82ccac9cbb249f196c656311ba0d29cd93ee803bc2f3744e028cf85c0b622cabacdee9bc634cf06bb92afc342f0790e19e2cc6ff87d6593228f6b79b7c332
 WHIRLPOOL 
d6f236a618cd8c2e2817e4d1a9d3dac5072cd012cf8756bd144d652b63e09fca6134ab84780911674563aa977458532eda6a04b024e413b1e732e75984581563
+DIST prefix-portage-2.3.8.tar.bz2 1241658 SHA256 
ca59e2a8886a9e84fba1c71aabf771ddcb514d2f1b207fae5bf7b054693744a7 SHA512 
88a871b320ba1ef8ec7da467dad62f13094f7d2ca565d9f0b4ccd6ed8f74815f000c9e26a7c1da808a199aa3a24f540406237c33bb5716ac535d72c6dc73203e
 WHIRLPOOL 
0832b71c3c9a4d0385c05408677093d51812e1a7b6906db4b85faf49ee889cc9e15ceaafd5253494279c04f0f506c3e9cab4d0a423a17cf6e394e766128e3044

diff --git a/sys-apps/portage/portage-2.3.6.ebuild 
b/sys-apps/portage/portage-2.3.8.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.3.6.ebuild
rename to sys-apps/portage/portage-2.3.8.ebuild
index 7a9c900b20..60f0e15afe 100644
--- a/sys-apps/portage/portage-2.3.6.ebuild
+++ b/sys-apps/portage/portage-2.3.8.ebuild
@@ -90,7 +90,6 @@ python_prepare_all() {
distutils-r1_python_prepare_all
 
epatch "${FILESDIR}"/${PN}-2.2.28-ebuildshell-r1.patch # 155161
-   epatch "${FILESDIR}"/${PN}-2.3.4-mj-safe-econf.patch
use prefix-chaining &&
epatch "${FILESDIR}"/${PN}-2.3.5-prefix-chaining.patch
 



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

2017-08-13 Thread Fabian Groffen
commit: 1e824fca3dda7ab268078adb478479de81ae05c1
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Aug 13 07:43:37 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Aug 13 07:43:37 2017 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1e824fca

sys-apps/portage: use https for dev.g.o

Package-Manager: Portage-2.3.7-prefix, Repoman-2.3.3

 sys-apps/portage/portage-2.2.28-r5.ebuild | 2 +-
 sys-apps/portage/portage-2.3.6.ebuild | 2 +-
 sys-apps/portage/portage-2.3.7.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-apps/portage/portage-2.2.28-r5.ebuild 
b/sys-apps/portage/portage-2.2.28-r5.ebuild
index 8a873f61ee..47a0bd4d69 100644
--- a/sys-apps/portage/portage-2.2.28-r5.ebuild
+++ b/sys-apps/portage/portage-2.2.28-r5.ebuild
@@ -67,7 +67,7 @@ PDEPEND="
 
 REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
 
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage 
http://dev.gentoo.org/~grobian/distfiles";
+SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage 
https://dev.gentoo.org/~grobian/distfiles";
 
 prefix_src_archives() {
local x y

diff --git a/sys-apps/portage/portage-2.3.6.ebuild 
b/sys-apps/portage/portage-2.3.6.ebuild
index e103f7c8cc..7a9c900b20 100644
--- a/sys-apps/portage/portage-2.3.6.ebuild
+++ b/sys-apps/portage/portage-2.3.6.ebuild
@@ -65,7 +65,7 @@ PDEPEND="
 
 REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
 
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage 
http://dev.gentoo.org/~grobian/distfiles";
+SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage 
https://dev.gentoo.org/~grobian/distfiles";
 
 prefix_src_archives() {
local x y

diff --git a/sys-apps/portage/portage-2.3.7.ebuild 
b/sys-apps/portage/portage-2.3.7.ebuild
index af55c0f34b..60f0e15afe 100644
--- a/sys-apps/portage/portage-2.3.7.ebuild
+++ b/sys-apps/portage/portage-2.3.7.ebuild
@@ -65,7 +65,7 @@ PDEPEND="
 
 REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
 
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage 
http://dev.gentoo.org/~grobian/distfiles";
+SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage 
https://dev.gentoo.org/~grobian/distfiles";
 
 prefix_src_archives() {
local x y



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

2017-08-13 Thread Fabian Groffen
commit: bff822005b671778d4f3a45ad3d9983512a86377
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Aug 13 07:41:53 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Aug 13 07:41:53 2017 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bff82200

sys-apps/portage: version bump to 2.3.7

Package-Manager: Portage-2.3.7-prefix, Repoman-2.3.3

 sys-apps/portage/Manifest |  2 +-
 .../portage/{portage-2.3.5.ebuild => portage-2.3.7.ebuild}| 11 ++-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 1615291209..9b4865e225 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
 DIST prefix-portage-2.2.28.tar.bz2 1187416 SHA256 
e4bb6c08a65252cfb3faf777ff9bb6aab162174766202f811154c0bbe301b45e SHA512 
ea0661783d421d204272b9a210745aa2040a18ea347299b3d768588e10ca8dd2e24b46975249bf30010bf565514aea640f4edb9db2ca064312c899304a8c1f42
 WHIRLPOOL 
d2d3feab14c4b0dc706db9336e08637897d963d0cbd7e1995431701c8c1914f6f42f57917470a2c89cdc8596d2ed8183c80f3814eba7512b5216611595da38a1
-DIST prefix-portage-2.3.5.tar.bz2 1163747 SHA256 
d0a0d3c3b09f8abd10ea7569f87d5dbb57623baba1972258461c4afd16fc98af SHA512 
0ae5a043b41c57e24dee60cb2ac8ab0896e562e815544685a75b106c8f22f3c0540077755f6f9f462130d13ef2995e54dfd63a8c9b529c6646c5dcf7fda3575d
 WHIRLPOOL 
89e939c6c35e9056dbff78e663a07317500b9b7efe1ba32f585ba1f9752f97b78363bab2b301dae21bebcd5c859f625d38b12b056b885776bf8c51ece6d84595
 DIST prefix-portage-2.3.6.tar.bz2 1214157 SHA256 
3a2b4494a7fc97dae8c2c50a02004ae47281d01338a878e99a756b9b62194417 SHA512 
065d0d6eee144473ffb3b16e1df43f54a9e5295e11c5dac4e0a5ceb416d36d7b7fac2e4194777f0b352a181bc24d80fac10ea53c11356fee34ed98a8bd6a2fea
 WHIRLPOOL 
45c19dde4a0f6fa5750515707d81f31b446e36dd90d66daf44e8baebcd6b337cb16a85fc962c4181532c419552af223388ef77262ca407979dfb16f797446f40
+DIST prefix-portage-2.3.7.tar.bz2 1228627 SHA256 
3d6c0818520d6e39df0c0a94b7fc206e1c82e596f88146c729245a8489968ceb SHA512 
bff82ccac9cbb249f196c656311ba0d29cd93ee803bc2f3744e028cf85c0b622cabacdee9bc634cf06bb92afc342f0790e19e2cc6ff87d6593228f6b79b7c332
 WHIRLPOOL 
d6f236a618cd8c2e2817e4d1a9d3dac5072cd012cf8756bd144d652b63e09fca6134ab84780911674563aa977458532eda6a04b024e413b1e732e75984581563

diff --git a/sys-apps/portage/portage-2.3.5.ebuild 
b/sys-apps/portage/portage-2.3.7.ebuild
similarity index 95%
rename from sys-apps/portage/portage-2.3.5.ebuild
rename to sys-apps/portage/portage-2.3.7.ebuild
index 231f912693..af55c0f34b 100644
--- a/sys-apps/portage/portage-2.3.5.ebuild
+++ b/sys-apps/portage/portage-2.3.7.ebuild
@@ -90,7 +90,6 @@ python_prepare_all() {
distutils-r1_python_prepare_all
 
epatch "${FILESDIR}"/${PN}-2.2.28-ebuildshell-r1.patch # 155161
-   epatch "${FILESDIR}"/${PN}-2.3.4-mj-safe-econf.patch
use prefix-chaining &&
epatch "${FILESDIR}"/${PN}-2.3.5-prefix-chaining.patch
 
@@ -114,19 +113,13 @@ python_prepare_all() {
 
if [[ -n ${EPREFIX} ]] ; then
# PREFIX LOCAL: only hack const_autotool
-   local extrapath="/usr/bin:/bin"
+   local extrapath="/usr/sbin:/usr/bin:/sbin:/bin"
# ok, we can't rely on PORTAGE_ROOT_USER being there yet, as 
people
# tend not to update that often, as long as we are a separate 
ebuild
# we can assume when unset, it's time for some older trick
if [[ -z ${PORTAGE_ROOT_USER} ]] ; then
PORTAGE_ROOT_USER=$(python -c 'from portage.const 
import rootuser; print rootuser')
fi
-   # lazy check, but works for now
-   if [[ ${PORTAGE_ROOT_USER} == "root" ]] ; then
-   # we need this for e.g. mtree on FreeBSD (and Darwin) 
which is in
-   # /usr/sbin
-   extrapath="/usr/sbin:/usr/bin:/sbin:/bin"
-   fi
local 
defaultpath="${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin"
# We need to probe for bash in the Prefix, because it may not
# exist, in which case we fall back to the currently in use
@@ -151,7 +144,7 @@ python_prepare_all() {
-e "s|@sysconfdir@|${EPREFIX}/etc|" \
-i '{}' + || \
die "Failed to patch sources"
-   # We don't need the below, since setup.py deal with this (and
+   # We don't need the below, since setup.py deals with this (and
# more) so we don't have to make this correct
#   -e 
"s|@PORTAGE_BASE@|${EPREFIX}/usr/lib/portage/${EPYTHON}|" \
 



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

2017-08-13 Thread Fabian Groffen
commit: 26f5f36c024ec832c705fd837f26314059282f32
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Aug 13 07:44:19 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Aug 13 07:44:19 2017 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=26f5f36c

sys-apps/portage: consistently use spaces in metadata.xml

Package-Manager: Portage-2.3.7-prefix, Repoman-2.3.3

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

diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index 23c04a89b2..1e859c1071 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -23,6 +23,6 @@
 Preserve extended attributes (filesystem-stored 
metadata)
 when installing files. Usually only required for hardened systems.
 
-   mduft's experimental prefix chaining 
facilities
+mduft's experimental prefix chaining 
facilities
   
 



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

2016-05-13 Thread Michael Haubenwallner
commit: 5fc496c38e3464658a258557d31849ebd9598109
Author: Michael Haubenwallner  ssi-schaefer 
 com>
AuthorDate: Fri May 13 11:38:53 2016 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Fri May 13 11:39:24 2016 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5fc496c3

+sys-apps/portage-2.2.28-r4: bump ebuildshell patch to bug#155161 comment#36

Package-Manager: portage-2.2.28-prefix

 .../portage/files/portage-2.2.28-ebuildshell.patch | 50 +++---
 ...e-2.2.28-r3.ebuild => portage-2.2.28-r4.ebuild} |  0
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/sys-apps/portage/files/portage-2.2.28-ebuildshell.patch 
b/sys-apps/portage/files/portage-2.2.28-ebuildshell.patch
index 69373f6..4674506 100644
--- a/sys-apps/portage/files/portage-2.2.28-ebuildshell.patch
+++ b/sys-apps/portage/files/portage-2.2.28-ebuildshell.patch
@@ -1,19 +1,19 @@
-From 3ae829681363c032c9863d4e5a41a762af89f93e Mon Sep 17 00:00:00 2001
+From 5e3167845640624f328969355db2e7f16cad2c83 Mon Sep 17 00:00:00 2001
 From: Michael Haubenwallner 
 Date: Wed, 6 Nov 2013 12:40:05 +0100
 Subject: [PATCH] Add ebuildshell feature, bug#155161.
 
 ---
- bin/ebuild.sh| 123 ++-
- bin/filter-bash-environment.py   |  57 +++-
+ bin/ebuild.sh| 143 ++-
+ bin/filter-bash-environment.py   |  57 ++
  bin/save-ebuild-env.sh   |   2 +-
  man/make.conf.5  |   6 ++
  pym/_emerge/AbstractEbuildProcess.py |   1 +
  pym/portage/const.py |   1 +
- 6 files changed, 172 insertions(+), 18 deletions(-)
+ 6 files changed, 192 insertions(+), 18 deletions(-)
 
 diff --git a/bin/ebuild.sh b/bin/ebuild.sh
-index f1586b2..8231a98 100755
+index f1586b2..d42ffd4 100755
 --- a/bin/ebuild.sh
 +++ b/bin/ebuild.sh
 @@ -130,7 +130,7 @@ __qa_source() {
@@ -25,7 +25,7 @@ index f1586b2..8231a98 100755
retval=$?
set +e
[[ $shopts != $(shopt) ]] &&
-@@ -537,6 +537,127 @@ if [[ -n ${QA_INTERCEPTORS} ]] ; then
+@@ -537,6 +537,147 @@ if [[ -n ${QA_INTERCEPTORS} ]] ; then
unset BIN_PATH BIN BODY FUNC_SRC
  fi
  
@@ -46,6 +46,19 @@ index f1586b2..8231a98 100755
 +  local __ebuildshell_tmpf="${T}/ebuildshell.${__ebuildshell_pid}"
 +  rm -f "${__ebuildshell_tmpf}."{ebuild,return}-{env,rovars}
 +  (
++  cat <<-EOE
++  # local variables of functions using recursive 
ebuildshell are
++  # visible to the EXIT trap of that recursive 
ebuildshell.  To
++  # keep them local, we have to filter them from that 
recursive
++  # ebuildshell's return-env.  As 'declare -p' is unable 
to tell
++  # local-ity of variables, we abuse the trace attribute 
for local
++  # variables to filter them from the return-env.  So we 
need the
++  # local alias active before declaring any functions.
++  # On a sidehand, this allows for copy&paste of function 
body
++  # lines including the local keyword.
++  alias local='declare -t'
++  shopt -s expand_aliases
++  EOE
 +  (
 +  declare -p
 +  declare -fp
@@ -62,6 +75,17 @@ index f1586b2..8231a98 100755
 +  "${__ebuildshell_bash_i_vars}" \
 +  || die "filter-bash-environment.py failed"
 +  )
++  # 'declare -g' is available since bash-4.2,
++  # https://bugs.gentoo.org/show_bug.cgi?id=155161#c35
++  if (( ${BASH_VERSINFO[0]} > 4 )) ||
++ (( ${BASH_VERSINFO[0]} == 4 && ${BASH_VERSINFO[1]} >= 2 ))
++  then
++  __ebuildshell_bash42_true=
++  __ebuildshell_bash42_false='#bash-4.2#'
++  else
++  __ebuildshell_bash42_true='#bash-4.2#'
++  __ebuildshell_bash42_false=
++  fi
 +  # The already readonly variables, without bash maintained ones:
 +  
__ebuildshell_ro_ebuild_vars=$(<"${__ebuildshell_tmpf}.ebuild-rovars")
 +  cat <<-EOE
@@ -72,6 +96,7 @@ index f1586b2..8231a98 100755
 +  # be informative about what to do
 +  PS1="EBUILD ${PN} $1 \$ "
 +  type $1
++  ${__ebuildshell_bash42_false}echo 'warning: preserving 
variables across phases requires bash-4.2'
 +  echo "WANTED: \$@"
 +  echo "or use: \"\\\$@\""
 +  # use bash history, but not the 'user's real one
@@ -79,12 +104,6 @@ index f1586b2..8231a98 100755
 +  # but do not use history-expansion with '!',
 +   

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

2016-05-03 Thread Michael Haubenwallner
commit: 4fcd3c6826ab0f73d202305307d9c9d80a85fe05
Author: Michael Haubenwallner  ssi-schaefer 
 com>
AuthorDate: Tue May  3 15:31:35 2016 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Tue May  3 15:33:07 2016 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4fcd3c68

+portage-2.2.28-r3: bump ebuildshell patch bug#155161 comment#34

Package-Manager: portage-2.2.28-prefix

 .../portage/files/portage-2.2.28-ebuildshell.patch | 113 +++--
 ...e-2.2.28-r2.ebuild => portage-2.2.28-r3.ebuild} |   0
 2 files changed, 60 insertions(+), 53 deletions(-)

diff --git a/sys-apps/portage/files/portage-2.2.28-ebuildshell.patch 
b/sys-apps/portage/files/portage-2.2.28-ebuildshell.patch
index afd2f39..69373f6 100644
--- a/sys-apps/portage/files/portage-2.2.28-ebuildshell.patch
+++ b/sys-apps/portage/files/portage-2.2.28-ebuildshell.patch
@@ -1,19 +1,19 @@
-From c93cb045630db71f8fbc0e0b67960a28764a6852 Mon Sep 17 00:00:00 2001
+From 3ae829681363c032c9863d4e5a41a762af89f93e Mon Sep 17 00:00:00 2001
 From: Michael Haubenwallner 
 Date: Wed, 6 Nov 2013 12:40:05 +0100
 Subject: [PATCH] Add ebuildshell feature, bug#155161.
 
 ---
- bin/ebuild.sh| 131 ++-
- bin/filter-bash-environment.py   |  50 -
+ bin/ebuild.sh| 123 ++-
+ bin/filter-bash-environment.py   |  57 +++-
  bin/save-ebuild-env.sh   |   2 +-
  man/make.conf.5  |   6 ++
  pym/_emerge/AbstractEbuildProcess.py |   1 +
  pym/portage/const.py |   1 +
- 6 files changed, 173 insertions(+), 18 deletions(-)
+ 6 files changed, 172 insertions(+), 18 deletions(-)
 
 diff --git a/bin/ebuild.sh b/bin/ebuild.sh
-index f1586b2..cb487c0 100755
+index f1586b2..8231a98 100755
 --- a/bin/ebuild.sh
 +++ b/bin/ebuild.sh
 @@ -130,7 +130,7 @@ __qa_source() {
@@ -25,7 +25,7 @@ index f1586b2..cb487c0 100755
retval=$?
set +e
[[ $shopts != $(shopt) ]] &&
-@@ -537,6 +537,135 @@ if [[ -n ${QA_INTERCEPTORS} ]] ; then
+@@ -537,6 +537,127 @@ if [[ -n ${QA_INTERCEPTORS} ]] ; then
unset BIN_PATH BIN BODY FUNC_SRC
  fi
  
@@ -39,8 +39,8 @@ index f1586b2..cb487c0 100755
 +  local __ebuildshell_bash_i_vars="__ebuildshell_.*
 +  _ BASH_ARGC BASH_ARGV BASH_COMMAND BASH_LINENO BASH_SOURCE
 +  BASH_VERSINFO BASH_SUBSHELL BASHOPTS BASHPID COMP_WORDBREAKS
-+  DIRSTACK EUID FUNCNAME GROUPS HISTCMD HISTFILE LINENO
-+  PIPESTATUS PPID PWD RANDOM SECONDS SHELLOPTS UID"
++  DIRSTACK EUID FUNCNAME GROUPS HISTCMD HISTFILE LINENO PIPESTATUS
++  PPID PS1 PS2 PS3 PS4 PWD RANDOM SECONDS SHELLOPTS UID"
 +  # Allow recursive ebuildshell, for use in multibuild.eclass and similar:
 +  local __ebuildshell_pid=${BASHPID:-$(__bashpid)}
 +  local __ebuildshell_tmpf="${T}/ebuildshell.${__ebuildshell_pid}"
@@ -76,56 +76,50 @@ index f1586b2..cb487c0 100755
 +  echo "or use: \"\\\$@\""
 +  # use bash history, but not the 'user's real one
 +  HISTFILE=~/.bash_history
-+  # for copy&paste function body lines containing: !
++  # but do not use history-expansion with '!',
++  # for copy&paste of function body lines containing: !
 +  set +H
-+  # Support the 'local' keyword outside any shell function
-+  # for copy&paste of function body lines: Remember these
-+  # "local" variable names for filtering from return-env.
-+  __ebuildshell_local_vars=
-+  __ebuildshell_local() {
-+  local __ebuildshell_local_attr=
-+  while [[ \${1} == -* ]]; do
-+  __ebuildshell_local_attr+=" \${1}"
-+  shift
-+  done
-+  __ebuildshell_local_vars+=" \${1%%=*} "
-+  # Need to declare into the global shell 
namespace,
-+  # as we are in some shell function here 
apparently.
-+  declare -g \${__ebuildshell_local_attr} "\$@"
-+  }
-+  # within some function, BASH_LINENO is set, and we use 
real 'local'
-+  alias local='\$( (( \${#BASH_LINENO} > 0 )) && echo 
local || echo __ebuildshell_local)'
++  # For copy&paste of function body lines, we want the 
'local'
++  # keyword available at the shell prompt as well.  So we 
alias
++  # the 'local' keyword to 'declare -t', to identify local
++  # variables by their trace attribute.
++  alias 

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

2016-05-02 Thread Michael Haubenwallner
commit: 9df60459337bfbe3f3fe7bb2b48ef18c076284af
Author: Michael Haubenwallner  ssi-schaefer 
 com>
AuthorDate: Mon May  2 09:15:21 2016 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Mon May  2 11:14:56 2016 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9df60459

+portage-2.2.28-r2: bump ebuildshell patch bug#155161 comment#32

Package-Manager: portage-2.2.28-prefix

 .../portage/files/portage-2.2.28-ebuildshell.patch | 92 +-
 ...e-2.2.28-r1.ebuild => portage-2.2.28-r2.ebuild} |  0
 2 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/sys-apps/portage/files/portage-2.2.28-ebuildshell.patch 
b/sys-apps/portage/files/portage-2.2.28-ebuildshell.patch
index 7e7e71d..afd2f39 100644
--- a/sys-apps/portage/files/portage-2.2.28-ebuildshell.patch
+++ b/sys-apps/portage/files/portage-2.2.28-ebuildshell.patch
@@ -1,19 +1,19 @@
-From 096a74009cea9c79bcc2729d18a3cbcb99783aeb Mon Sep 17 00:00:00 2001
+From c93cb045630db71f8fbc0e0b67960a28764a6852 Mon Sep 17 00:00:00 2001
 From: Michael Haubenwallner 
 Date: Wed, 6 Nov 2013 12:40:05 +0100
 Subject: [PATCH] Add ebuildshell feature, bug#155161.
 
 ---
- bin/ebuild.sh| 102 ++-
- bin/filter-bash-environment.py   |  65 --
+ bin/ebuild.sh| 131 ++-
+ bin/filter-bash-environment.py   |  50 -
  bin/save-ebuild-env.sh   |   2 +-
- man/make.conf.5  |   6 +++
+ man/make.conf.5  |   6 ++
  pym/_emerge/AbstractEbuildProcess.py |   1 +
  pym/portage/const.py |   1 +
- 6 files changed, 159 insertions(+), 18 deletions(-)
+ 6 files changed, 173 insertions(+), 18 deletions(-)
 
 diff --git a/bin/ebuild.sh b/bin/ebuild.sh
-index f1586b2..06c90df 100755
+index f1586b2..cb487c0 100755
 --- a/bin/ebuild.sh
 +++ b/bin/ebuild.sh
 @@ -130,7 +130,7 @@ __qa_source() {
@@ -25,7 +25,7 @@ index f1586b2..06c90df 100755
retval=$?
set +e
[[ $shopts != $(shopt) ]] &&
-@@ -537,6 +537,106 @@ if [[ -n ${QA_INTERCEPTORS} ]] ; then
+@@ -537,6 +537,135 @@ if [[ -n ${QA_INTERCEPTORS} ]] ; then
unset BIN_PATH BIN BODY FUNC_SRC
  fi
  
@@ -74,14 +74,31 @@ index f1586b2..06c90df 100755
 +  type $1
 +  echo "WANTED: \$@"
 +  echo "or use: \"\\\$@\""
-+  # use bash history, but not the user's real one
++  # use bash history, but not the 'user's real one
 +  HISTFILE=~/.bash_history
-+  # for copy&paste function body lines containing: local
-+  alias local=declare
 +  # for copy&paste function body lines containing: !
 +  set +H
++  # Support the 'local' keyword outside any shell function
++  # for copy&paste of function body lines: Remember these
++  # "local" variable names for filtering from return-env.
++  __ebuildshell_local_vars=
++  __ebuildshell_local() {
++  local __ebuildshell_local_attr=
++  while [[ \${1} == -* ]]; do
++  __ebuildshell_local_attr+=" \${1}"
++  shift
++  done
++  __ebuildshell_local_vars+=" \${1%%=*} "
++  # Need to declare into the global shell 
namespace,
++  # as we are in some shell function here 
apparently.
++  declare -g \${__ebuildshell_local_attr} "\$@"
++  }
++  # within some function, BASH_LINENO is set, and we use 
real 'local'
++  alias local='\$( (( \${#BASH_LINENO} > 0 )) && echo 
local || echo __ebuildshell_local)'
 +  # at exit, dump the current environment
 +  trap "
++  unalias local
++  unset -f __ebuildshell_local
 +  rm -f '${__ebuildshell_tmpf}.return-'*
 +  (
 +  (
@@ -93,13 +110,14 @@ index f1586b2..06c90df 100755
 +  (
 +  # We may have more readonly 
variables now, but we
 +  # need to filter variables that 
are readonly already.
-+  
2>"${__ebuildshell_tmpf}.return-rovars" \
-+  
'${PORTAGE_PYTHON:-/tools/haubi/gentoo/s01en24/usr/bin/python}' \
++  
2>'${__ebuildshell_tmpf}.re

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

2016-04-27 Thread Michael Haubenwallner
commit: 8c67d8b37ea1f8ce7e29233e80229fc8fbf9fd35
Author: Michael Haubenwallner  ssi-schaefer 
 com>
AuthorDate: Wed Apr 27 13:03:36 2016 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Apr 27 13:03:36 2016 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8c67d8b3

prefix-portage: bump ebuildshell patch, bug#155161

 .../portage/files/portage-2.2.28-ebuildshell.patch | 311 +
 sys-apps/portage/portage-2.2.28-r1.ebuild  | 259 +
 2 files changed, 570 insertions(+)

diff --git a/sys-apps/portage/files/portage-2.2.28-ebuildshell.patch 
b/sys-apps/portage/files/portage-2.2.28-ebuildshell.patch
new file mode 100644
index 000..7e7e71d
--- /dev/null
+++ b/sys-apps/portage/files/portage-2.2.28-ebuildshell.patch
@@ -0,0 +1,311 @@
+From 096a74009cea9c79bcc2729d18a3cbcb99783aeb Mon Sep 17 00:00:00 2001
+From: Michael Haubenwallner 
+Date: Wed, 6 Nov 2013 12:40:05 +0100
+Subject: [PATCH] Add ebuildshell feature, bug#155161.
+
+---
+ bin/ebuild.sh| 102 ++-
+ bin/filter-bash-environment.py   |  65 --
+ bin/save-ebuild-env.sh   |   2 +-
+ man/make.conf.5  |   6 +++
+ pym/_emerge/AbstractEbuildProcess.py |   1 +
+ pym/portage/const.py |   1 +
+ 6 files changed, 159 insertions(+), 18 deletions(-)
+
+diff --git a/bin/ebuild.sh b/bin/ebuild.sh
+index f1586b2..06c90df 100755
+--- a/bin/ebuild.sh
 b/bin/ebuild.sh
+@@ -130,7 +130,7 @@ __qa_source() {
+ __qa_call() {
+   local shopts=$(shopt) OLDIFS="$IFS"
+   local retval
+-  "$@"
++  __call-ebuildshell "$@"
+   retval=$?
+   set +e
+   [[ $shopts != $(shopt) ]] &&
+@@ -537,6 +537,106 @@ if [[ -n ${QA_INTERCEPTORS} ]] ; then
+   unset BIN_PATH BIN BODY FUNC_SRC
+ fi
+ 
++__call-ebuildshell() {
++  if ! has ebuildshell ${FEATURES}; then
++  "$@"
++  return $?
++  fi
++  local __ebuildshell_args=( "$@" )
++  # These are the variables I have seen 'bash -i' maintaining the values 
for:
++  local __ebuildshell_bash_i_vars="__ebuildshell_.*
++  _ BASH_ARGC BASH_ARGV BASH_COMMAND BASH_LINENO BASH_SOURCE
++  BASH_VERSINFO BASH_SUBSHELL BASHOPTS BASHPID COMP_WORDBREAKS
++  DIRSTACK EUID FUNCNAME GROUPS HISTCMD HISTFILE LINENO
++  PIPESTATUS PPID PWD RANDOM SECONDS SHELLOPTS UID"
++  # Allow recursive ebuildshell, for use in multibuild.eclass and similar:
++  local __ebuildshell_pid=${BASHPID:-$(__bashpid)}
++  local __ebuildshell_tmpf="${T}/ebuildshell.${__ebuildshell_pid}"
++  rm -f "${__ebuildshell_tmpf}."{ebuild,return}-{env,rovars}
++  (
++  (
++  declare -p
++  declare -fp
++  shopt -p
++  [[ ${BASH_VERSINFO[0]} == 3 ]] && export
++  ) |
++  (
++  # we need everything but the bash vars after 'env -i'
++  2>"${__ebuildshell_tmpf}.ebuild-rovars" \
++  
"${PORTAGE_PYTHON:-/tools/haubi/gentoo/s01en24/usr/bin/python}" \
++  
"${PORTAGE_BIN_PATH}"/filter-bash-environment.py \
++  --report-readonly-variables \
++  --preserve-readonly-attribute \
++  "${__ebuildshell_bash_i_vars}" \
++  || die "filter-bash-environment.py failed"
++  )
++  # The already readonly variables, without bash maintained ones:
++  
__ebuildshell_ro_ebuild_vars=$(<"${__ebuildshell_tmpf}.ebuild-rovars")
++  cat <<-EOE
++  # properly quote the function arguments
++  $(declare -p __ebuildshell_args)
++  set -- "\${__ebuildshell_args[@]}"
++  unset __ebuildshell_args
++  # be informative about what to do
++  PS1="EBUILD ${PN} $1 \$ "
++  type $1
++  echo "WANTED: \$@"
++  echo "or use: \"\\\$@\""
++  # use bash history, but not the user's real one
++  HISTFILE=~/.bash_history
++  # for copy&paste function body lines containing: local
++  alias local=declare
++  # for copy&paste function body lines containing: !
++  set +H
++  # at exit, dump the current environment
++  trap "
++  rm -f '${__ebuildshell_tmpf}.return-'*
++  (
++  (
++  declare -p
++  declare -f

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

2016-04-18 Thread Fabian Groffen
commit: 61210cd17364416da121e0daab57082f79b0b68d
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Apr 18 07:36:24 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Apr 18 07:36:24 2016 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=61210cd1

sys-apps/portage: add non-applying prefix-chaining patch, bug #509136

Package-Manager: portage-2.2.28-prefix

 sys-apps/portage/Manifest  |   1 -
 .../files/portage-2.2.14-prefix-chaining.patch | 873 +
 sys-apps/portage/metadata.xml  |  26 +-
 sys-apps/portage/portage-2.2.20.ebuild | 583 --
 sys-apps/portage/portage-2.2.28.ebuild |   2 +
 5 files changed, 892 insertions(+), 593 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 6043692..ec3802d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,2 @@
-DIST prefix-portage-2.2.20.tar.bz2 1205876 SHA256 
8c32e08af042384e7793a4580cbde892a66ec9ea2ad3bae739b2a9e476ac10cc SHA512 
e219ca4b0dcfc6f6a4d221ebfb7e951f6676b739609e8f2d6651ac120d250797eb6fa8bde16ee0fd373403d09a7fd1c59b7e9de7b001da83300492d953ccd1a2
 WHIRLPOOL 
4ec1fca787e587097088009950165a1117e425365583e6f6952cabc2587bea8c7d8bb88ed8a038be41ffb33cba1a374e99d2e01707a5749449d4a246a43be1b4
 DIST prefix-portage-2.2.27.tar.bz2 1230727 SHA256 
51bf3f427b23dfd1d050a2071895b5134cf7f515eb00612e0f57adf645a38299 SHA512 
bb528ee059c7fc06702882eaa9aad33962ad2eff7e468aa51a8b185e8b3e4ba3eaf88b2ee0f61df9c38493f0f37028e471ba2cc766fa53086ad6b975ead9b332
 WHIRLPOOL 
b0601462462d6dd322ffd9e806c92fd425483fc769a8c6b36c5874a4a28e21e250386ce16479e238577754ab4b194ce700bca7a0407dca919d59fd6ada87970c
 DIST prefix-portage-2.2.28.tar.bz2 1187416 SHA256 
e4bb6c08a65252cfb3faf777ff9bb6aab162174766202f811154c0bbe301b45e SHA512 
ea0661783d421d204272b9a210745aa2040a18ea347299b3d768588e10ca8dd2e24b46975249bf30010bf565514aea640f4edb9db2ca064312c899304a8c1f42
 WHIRLPOOL 
d2d3feab14c4b0dc706db9336e08637897d963d0cbd7e1995431701c8c1914f6f42f57917470a2c89cdc8596d2ed8183c80f3814eba7512b5216611595da38a1

diff --git a/sys-apps/portage/files/portage-2.2.14-prefix-chaining.patch 
b/sys-apps/portage/files/portage-2.2.14-prefix-chaining.patch
new file mode 100644
index 000..5c38795
--- /dev/null
+++ b/sys-apps/portage/files/portage-2.2.14-prefix-chaining.patch
@@ -0,0 +1,873 @@
+diff -ru prefix-portage-2.2.14.orig/bin/install-qa-check.d/05prefix 
prefix-portage-2.2.14/bin/install-qa-check.d/05prefix
+--- prefix-portage-2.2.14.orig/bin/install-qa-check.d/05prefix 2014-09-28 
19:31:20.0 +0200
 prefix-portage-2.2.14/bin/install-qa-check.d/05prefix  2015-06-17 
10:08:15.074682823 +0200
+@@ -79,16 +79,42 @@
+   # 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
++  
all_epfs="$PORTAGE_READONLY_EPREFIXES:$EPREFIX:$EROOT:$ED"
++  save_IFS=$IFS
++  IFS=:
++  epfs=( $all_epfs )
++  IFS=$save_IFS
++
++  found=
++  for x in "${epfs[@]}"; do
++  [[ -z "${x}" ]] && continue
++  check="${x}${line[0]}"
++
++  # might already contain a prefix
++  if [[ "${line[0]}" == "${x}"* ]]; then
++  check="${line[0]}"
++  fi
++
++  if [[ -e ${check} ]]; then
++  found="${check}"
++  fi
++  done
++
++  if [[ -n ${found} ]] ; then
+   # is it unprefixed, but we can just fix it 
because a
+   # prefixed variant exists
+   eqawarn "prefixing shebang of ${fn#${D}}"
++
++  if [[ ${found} == "${ED}"* || ${found} == 
"${EROOT}"* ]]; then
++  found="${EPREFIX}${line[0]}"
++  fi
++
+   # statement is made idempotent on purpose, 
because
+   # symlinks may point to the same target, and 
hence the
+   # same real file may be sedded multiple times 
since we
+   # read the shebangs in one go upfront for 
performance
+   # reasons
+-  sed -i -e '1s:^#! 
\?'"${line[0]}"':#!'"${EPREFIX}"${line[0]}':' "${rf}"
++  sed -i -e '1s:^#! 
\?'"${line[0]}"':#!'"${found}"':' "${rf}"
+  

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

2016-04-03 Thread Fabian Groffen
commit: ed5c05f06cc314bf365cc9a13b769850e79c3643
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Apr  3 18:08:56 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Apr  3 18:08:56 2016 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ed5c05f0

sys-apps/portage: use prefix bash if it exists

 sys-apps/portage/portage-2.2.28.ebuild | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/sys-apps/portage/portage-2.2.28.ebuild 
b/sys-apps/portage/portage-2.2.28.ebuild
index 2edcee5..dc0bdab 100644
--- a/sys-apps/portage/portage-2.2.28.ebuild
+++ b/sys-apps/portage/portage-2.2.28.ebuild
@@ -70,8 +70,6 @@ REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
 
 SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage 
http://dev.gentoo.org/~grobian/distfiles";
 
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives 
http://dev.gentoo.org/~grobian/distfiles";
-
 prefix_src_archives() {
local x y
for x in ${@}; do
@@ -129,12 +127,18 @@ python_prepare_all() {
extrapath="/usr/sbin:/usr/bin:/sbin:/bin"
fi
local 
defaultpath="${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin"
+   # We need to probe for bash in the Prefix, because it may not
+   # exist, in which case we fall back to the currently in use
+   # bash.  This logic is necessary in particular during bootstrap,
+   # where we pull ourselves out of a temporary place with tools
+   local bash="${EPREFIX}/bin/bash"
+   [[ ! -x ${bash} ]] && bash=${BASH}
 
einfo "Adjusting sources for ${EPREFIX}"
find . -type f -exec \
sed -e "s|@PORTAGE_EPREFIX@|${EPREFIX}|" \
-e "s|@PORTAGE_MV@|$(type -P mv)|" \
-   -e "s|@PORTAGE_BASH@|${BASH}|" \
+   -e "s|@PORTAGE_BASH@|${bash}|" \
-e "s|@PREFIX_PORTAGE_PYTHON@|$(type -P python)|" \
-e "s|@DEFAULT_PATH@|${defaultpath}|" \
-e "s|@EXTRA_PATH@|${extrapath}|" \



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

2016-03-20 Thread Fabian Groffen
commit: d2cc4c8390ea63822aa85770bb44c50056548357
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Mar 20 20:02:20 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Mar 20 20:02:20 2016 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d2cc4c83

sys-apps/portage: version bump to 2.2.28 with fix for bug #556694

Package-Manager: portage-2.2.28-prefix
RepoMan-Options: --force

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-2.2.28.ebuild | 253 +
 2 files changed, 254 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 96d1ec6..6043692 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,3 @@
 DIST prefix-portage-2.2.20.tar.bz2 1205876 SHA256 
8c32e08af042384e7793a4580cbde892a66ec9ea2ad3bae739b2a9e476ac10cc SHA512 
e219ca4b0dcfc6f6a4d221ebfb7e951f6676b739609e8f2d6651ac120d250797eb6fa8bde16ee0fd373403d09a7fd1c59b7e9de7b001da83300492d953ccd1a2
 WHIRLPOOL 
4ec1fca787e587097088009950165a1117e425365583e6f6952cabc2587bea8c7d8bb88ed8a038be41ffb33cba1a374e99d2e01707a5749449d4a246a43be1b4
 DIST prefix-portage-2.2.27.tar.bz2 1230727 SHA256 
51bf3f427b23dfd1d050a2071895b5134cf7f515eb00612e0f57adf645a38299 SHA512 
bb528ee059c7fc06702882eaa9aad33962ad2eff7e468aa51a8b185e8b3e4ba3eaf88b2ee0f61df9c38493f0f37028e471ba2cc766fa53086ad6b975ead9b332
 WHIRLPOOL 
b0601462462d6dd322ffd9e806c92fd425483fc769a8c6b36c5874a4a28e21e250386ce16479e238577754ab4b194ce700bca7a0407dca919d59fd6ada87970c
+DIST prefix-portage-2.2.28.tar.bz2 1187416 SHA256 
e4bb6c08a65252cfb3faf777ff9bb6aab162174766202f811154c0bbe301b45e SHA512 
ea0661783d421d204272b9a210745aa2040a18ea347299b3d768588e10ca8dd2e24b46975249bf30010bf565514aea640f4edb9db2ca064312c899304a8c1f42
 WHIRLPOOL 
d2d3feab14c4b0dc706db9336e08637897d963d0cbd7e1995431701c8c1914f6f42f57917470a2c89cdc8596d2ed8183c80f3814eba7512b5216611595da38a1

diff --git a/sys-apps/portage/portage-2.2.28.ebuild 
b/sys-apps/portage/portage-2.2.28.ebuild
new file mode 100644
index 000..2edcee5
--- /dev/null
+++ b/sys-apps/portage/portage-2.2.28.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(
+   pypy
+   python3_3 python3_4 python3_5
+   python2_7
+)
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit eutils distutils-r1 multilib
+
+DESCRIPTION="Portage package manager used in Gentoo Prefix"
+HOMEPAGE="http://prefix.gentoo.org/";
+LICENSE="GPL-2"
+KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux 
~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_ru selinux xattr prefix-chaining"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+   >=sys-devel/make-3.82
+   >=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 )
+   epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   !build? (
+   >=sys-apps/sed-4.0.5
+   app-shells/bash:0[readline]
+   >=app-admin/eselect-1.2
+   )
+   elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) )
+   elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   elibc_uclibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) )
+   kernel_linux? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 )
+   kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 )
+   kernel_HPUX? ( !hppa-hpux? ( >=app-misc/pax-utils-0.1.19 ) )
+   kernel_AIX? ( >=sys-apps/aix-miscutils-0.1.1634 )
+   selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+   xattr? ( kernel_linux? (
+   >=sys-apps/install-xattr-0.3
+   $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+   python2_7 pypy)
+   ) )
+   !prefix? ( !https://dev.gentoo.org/~dolsen/releases/portage 
http://dev.gentoo.org/~grobian/distfiles";
+
+SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives 
http://dev.gentoo.org/~grobian/distfiles";
+
+prefix_src_archives() {
+   local x y
+   for x in ${@}; do
+ 

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

2016-02-29 Thread Fabian Groffen
commit: adc30d5d61bbcac8b8bcbbbc88a3164df5b9930e
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Feb 29 18:31:57 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Feb 29 18:31:57 2016 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=adc30d5d

sys-apps/portage: fix version signature

Package-Manager: portage-2.2.27-prefix
RepoMan-Options: --force

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

diff --git a/sys-apps/portage/portage-2.2.27.ebuild 
b/sys-apps/portage/portage-2.2.27.ebuild
index 50bb724..2edcee5 100644
--- a/sys-apps/portage/portage-2.2.27.ebuild
+++ b/sys-apps/portage/portage-2.2.27.ebuild
@@ -91,11 +91,15 @@ pkg_setup() {
use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
 }
 
-python_prepare() {
+python_prepare_all() {
distutils-r1_python_prepare_all
 
epatch "${FILESDIR}"/${PN}-2.2.8-ebuildshell.patch # 155161
 
+   # solved in git already, remove at next version
+   sed -i -e "s/version = '2.2.27'/version = '2.2.27-prefix'/" \
+   setup.py || die
+
if ! use ipc ; then
einfo "Disabling ipc..."
sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = 
False:" \
@@ -129,7 +133,6 @@ python_prepare() {
einfo "Adjusting sources for ${EPREFIX}"
find . -type f -exec \
sed -e "s|@PORTAGE_EPREFIX@|${EPREFIX}|" \
-   -e 
"s|@PORTAGE_BASE@|${EPREFIX}/usr/lib/portage/${EPYTHON}|" \
-e "s|@PORTAGE_MV@|$(type -P mv)|" \
-e "s|@PORTAGE_BASH@|${BASH}|" \
-e "s|@PREFIX_PORTAGE_PYTHON@|$(type -P python)|" \
@@ -143,6 +146,9 @@ python_prepare() {
-e "s|@sysconfdir@|${EPREFIX}/etc|" \
-i '{}' + || \
die "Failed to patch sources"
+   # We don't need the below, since setup.py deal with this (and
+   # more) so we don't have to make this correct
+   #   -e 
"s|@PORTAGE_BASE@|${EPREFIX}/usr/lib/portage/${EPYTHON}|" \
 
# remove Makefiles, or else they will get installed
find . -name "Makefile.*" -delete



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

2016-02-21 Thread Fabian Groffen
commit: e88a4cfdbc8bcebbfd0e6052d09612cac5b69815
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Feb 21 09:10:05 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Feb 21 09:10:05 2016 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e88a4cfd

sys-apps/portage: version bump, ebuild now uses python-based install 
(non-autotools)

Package-Manager: portage-2.2.27
RepoMan-Options: --force

 sys-apps/portage/Manifest   |   3 +-
 sys-apps/portage/portage-2.2.10.1-r1.ebuild | 592 
 sys-apps/portage/portage-2.2.10.1.ebuild| 586 ---
 sys-apps/portage/portage-2.2.14.ebuild  | 582 ---
 sys-apps/portage/portage-2.2.27.ebuild  | 247 
 5 files changed, 248 insertions(+), 1762 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 6ec2906..96d1ec6 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,2 @@
-DIST prefix-portage-2.2.10.1.tar.bz2 1116228 SHA256 
c0b3960b466098dc1913890e6aacc6b64e0f1bb97fbf18c96ab2f648a6daa1e9 SHA512 
4d824119707936b6c73ec90a4dff8916a59d0d339e94dddbb9d0b241b550e1a982b475ca8708badf413aaca0aceab2b37f7dfeb62fa90eef7e27c91e41a61cec
 WHIRLPOOL 
9910b2486c513d5b61a8985acf7318d6801d2b425bb3e79759c1d7e692762b02f8489275bb9d361fe5be01e8847cbc540d9dd157afa7a27bbfa9aec9f5834bc5
-DIST prefix-portage-2.2.14.tar.bz2 1133962 SHA256 
5e7aa542f99fbad1bd371d9e6b5ba5ebaeb8b613a8730dd8966a1be5c9dabf72 SHA512 
a107f603139c484caef11eade196876679a79c3800cce1aac58e958aff62a28df734e30d0e66b2f14f4622c606610e7527d59ed7677ced2c475f17768ea1
 WHIRLPOOL 
bb857797d0db06e7dead010346887be36ed066979298efba3598361aca06df3cb19a5da924fae65a0ace7a6ad25b9d59d757e058d0c97036a10fb43ac2698b33
 DIST prefix-portage-2.2.20.tar.bz2 1205876 SHA256 
8c32e08af042384e7793a4580cbde892a66ec9ea2ad3bae739b2a9e476ac10cc SHA512 
e219ca4b0dcfc6f6a4d221ebfb7e951f6676b739609e8f2d6651ac120d250797eb6fa8bde16ee0fd373403d09a7fd1c59b7e9de7b001da83300492d953ccd1a2
 WHIRLPOOL 
4ec1fca787e587097088009950165a1117e425365583e6f6952cabc2587bea8c7d8bb88ed8a038be41ffb33cba1a374e99d2e01707a5749449d4a246a43be1b4
+DIST prefix-portage-2.2.27.tar.bz2 1230727 SHA256 
51bf3f427b23dfd1d050a2071895b5134cf7f515eb00612e0f57adf645a38299 SHA512 
bb528ee059c7fc06702882eaa9aad33962ad2eff7e468aa51a8b185e8b3e4ba3eaf88b2ee0f61df9c38493f0f37028e471ba2cc766fa53086ad6b975ead9b332
 WHIRLPOOL 
b0601462462d6dd322ffd9e806c92fd425483fc769a8c6b36c5874a4a28e21e250386ce16479e238577754ab4b194ce700bca7a0407dca919d59fd6ada87970c

diff --git a/sys-apps/portage/portage-2.2.10.1-r1.ebuild 
b/sys-apps/portage/portage-2.2.10.1-r1.ebuild
deleted file mode 100644
index 570635f..000
--- a/sys-apps/portage/portage-2.2.10.1-r1.ebuild
+++ /dev/null
@@ -1,592 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id: portage-2.2.01.16270.ebuild 58665 2010-09-05 19:54:38Z grobian $
-
-# Require EAPI 2 since we now require at least python-2.6 (for python 3
-# syntax support) which also requires EAPI 2.
-EAPI=3
-PYTHON_COMPAT=(
-   pypy1_9 pypy2_0
-   python3_1 python3_2 python3_3 python3_4
-   python2_6 python2_7
-)
-inherit eutils multilib
-
-DESCRIPTION="Prefix branch of the Portage Package Manager, used in Gentoo 
Prefix"
-HOMEPAGE="http://www.gentoo.org/proj/en/gentoo-alt/prefix/";
-LICENSE="GPL-2"
-KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux 
~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr 
prefix-chaining"
-
-for _pyimpl in ${PYTHON_COMPAT[@]} ; do
-   IUSE+=" python_targets_${_pyimpl}"
-done
-unset _pyimpl
-
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
-python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
-   !pypy2_0? ( !python2? ( !python3? (
-   || ( >=dev-lang/python-2.7[ssl] 
dev-lang/python:2.6[threads,ssl] )
-   ) ) )
-   pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) )
-   python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] 
dev-lang/python:2.6[ssl,threads] ) ) )"
-python_dep="${python_dep_ssl//\[ssl\]}"
-python_dep="${python_dep//,ssl}"
-python_dep="${python_dep//ssl,}"
-
-python_dep="${python_dep}
-   python_targets_pypy1_9? ( dev-python/pypy:1.9 )
-   python_targets_pypy2_0? ( dev-python/pypy:2.0 )
-   python_targets_python2_6? ( dev-lang/python:2.6 )
-   python_targets_python2_7? ( dev-lang/python:2.7 )
-   python_targets_python3_1? ( dev-lang/python:3.1 )
-   python_targets_python3_2? ( dev-lang/python:3.2 )
-   python_targets_python3_3? ( dev-lang/python:3.3 )
-   python_targets_python3_4? ( dev-lang/python:3.4 )

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

2016-01-21 Thread Fabian Groffen
commit: dec35b10624b15a599c6b7df5a387db055936845
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Jan 21 12:11:41 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Jan 21 12:11:41 2016 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dec35b10

sys-apps/portage: add python-3.5 to the list of suported python 
implementations, bug #572502

Package-Manager: portage-2.2.20-prefix

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

diff --git a/sys-apps/portage/portage-2.2.20.ebuild 
b/sys-apps/portage/portage-2.2.20.ebuild
index df28e3a..537888c 100644
--- a/sys-apps/portage/portage-2.2.20.ebuild
+++ b/sys-apps/portage/portage-2.2.20.ebuild
@@ -7,7 +7,7 @@
 EAPI=3
 PYTHON_COMPAT=(
pypy1_9 pypy2_0
-   python3_1 python3_2 python3_3 python3_4
+   python3_1 python3_2 python3_3 python3_4 python3_5
python2_6 python2_7
 )
 inherit eutils multilib