commit:     5c9f39cb53279acde0d96b29df31d2dba55f1643
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 11:37:02 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 11:37:02 2020 +0000
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 <grobian <AT> 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 0000000000..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
+       ) )
+       !<app-admin/logrotate-3.8.0
+       !<app-portage/gentoolkit-0.4.6
+       !<app-portage/repoman-2.3.10"
+PDEPEND="
+       !build? (
+               >=net-misc/rsync-2.6.4
+               userland_GNU? ( >=sys-apps/coreutils-6.4 )
+       )"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+SRC_ARCHIVES="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-prefix-stack.patch # 658572
+       eapply "${FILESDIR}"/${PN}-2.3.45-ebuildshell.patch # 155161
+       if use gentoo-dev; then
+               einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+               sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+                       -i lib/_emerge/create_depgraph_params.py || \
+                       die "failed to patch create_depgraph_params.py"
+
+               einfo "Enabling additional FEATURES for gentoo-dev..."
+               echo 'FEATURES="${FEATURES} strict-keepdir"' \
+                       >> cnf/make.globals || die
+       fi
+
+       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 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.  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|@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|" \
+                       -i '{}' + || \
+                       die "Failed to patch sources"
+               # 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}|" \
+
+               # remove Makefiles, or else they will get installed
+               find . -name "Makefile.*" -delete
+
+               einfo "Prefixing shebangs ..."
+               while read -r -d $'\0' ; do
+                       local shebang=$(head -n1 "$REPLY")
+                       if [[ ${shebang} == "#!"* && ! ${shebang} == 
"#!${EPREFIX}/"* ]] ; then
+                               sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" 
"$REPLY" || \
+                                       die "sed failed"
+                       fi
+               done < <(find . -type f ! -name etc-update -print0)
+
+               einfo "Setting gentoo_prefix as reponame for emerge-webrsync"
+               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' \
+                       lib/portage/sync/modules/rsync/rsync.py || die
+               # END PREFIX LOCAL
+       fi
+
+       # PREFIX LOCAL: make.conf is written by bootstrap-prefix.sh
+       if use !prefix ; then
+       cd "${S}/cnf" || die
+       if [ -f "make.conf.example.${ARCH}".diff ]; then
+               patch make.conf.example "make.conf.example.${ARCH}".diff || \
+                       die "Failed to patch make.conf.example"
+       else
+               eerror ""
+               eerror "Portage does not have an arch-specific configuration 
for this arch."
+               eerror "Please notify the arch maintainer about this issue. 
Using generic."
+               eerror ""
+       fi
+       fi
+}
+
+python_compile_all() {
+       local targets=()
+       use doc && targets+=( docbook )
+       use apidoc && targets+=( apidoc )
+
+       if [[ ${targets[@]} ]]; then
+               esetup.py "${targets[@]}"
+       fi
+}
+
+python_test() {
+       esetup.py test
+}
+
+python_install() {
+       # Install sbin scripts to bindir for python-exec linking
+       # they will be relocated in pkg_preinst()
+       distutils-r1_python_install \
+               --system-prefix="${EPREFIX}/usr" \
+               --bindir="$(python_get_scriptdir)" \
+               --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+               --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+               --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+               --sbindir="$(python_get_scriptdir)" \
+               --sysconfdir="${EPREFIX}/etc" \
+               "${@}"
+}
+
+python_install_all() {
+       distutils-r1_python_install_all
+
+       local targets=()
+       use doc && targets+=(
+               install_docbook
+               --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+       )
+       use apidoc && targets+=(
+               install_apidoc
+               --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+       )
+
+       # install docs
+       if [[ ${targets[@]} ]]; then
+               esetup.py "${targets[@]}"
+       fi
+
+       systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+       # Due to distutils/python-exec limitations
+       # these must be installed to /usr/bin.
+       local sbin_relocations='archive-conf dispatch-conf emaint env-update 
etc-update fixpackages regenworld'
+       einfo "Moving admin scripts to the correct directory"
+       dodir /usr/sbin
+       for target in ${sbin_relocations}; do
+               einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+               mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die 
"sbin scripts move failed!"
+       done
+}
+
+pkg_preinst() {
+       python_setup
+       local sitedir=$(python_get_sitedir)
+       [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+       env -u DISTDIR \
+               -u PORTAGE_OVERRIDE_EPREFIX \
+               -u PORTAGE_REPOSITORIES \
+               -u PORTDIR \
+               -u PORTDIR_OVERLAY \
+               PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+               "${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+       env -u BINPKG_COMPRESS \
+               PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+               "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+       # elog dir must exist to avoid logrotate error for bug #415911.
+       # This code runs in preinst in order to bypass the mapping of
+       # portage:portage to root:root which happens after src_install.
+       keepdir /var/log/portage/elog
+       # This is allowed to fail if the user/group are invalid for prefix 
users.
+       if chown ${PORTAGE_USER}:${PORTAGE_GROUP} 
"${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+               chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+       fi
+
+       if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+               elog "The emerge --autounmask option is now disabled by 
default, except for"
+               elog "portions of behavior which are controlled by the 
--autounmask-use and"
+               elog "--autounmask-license options. For backward compatibility, 
previous"
+               elog "behavior of --autounmask=y and --autounmask=n is entirely 
preserved."
+               elog "Users can get the old behavior simply by adding 
--autounmask to the"
+               elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale 
for this"
+               elog "change, see https://bugs.gentoo.org/658648.";
+       fi
+}

Reply via email to