commit:     935570dbd797db4f0818a5c377ab056c8e0bb272
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 25 07:49:50 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 07:56:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=935570db

sys-apps/portage: Bump to version 2.3.96

 #714480 DirectoryNotFound: /var/tmp/portage/category-directory

Bug: https://bugs.gentoo.org/711148
Bug: https://bugs.gentoo.org/714480
Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 sys-apps/portage/Manifest              |   1 +
 sys-apps/portage/portage-2.3.96.ebuild | 267 +++++++++++++++++++++++++++++++++
 2 files changed, 268 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c39a63cd43f..b5a1ac908e1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,3 +2,4 @@ DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 
22a06370d9db8f8954f609a4435983b914f0
 DIST portage-2.3.89.tar.bz2 1048621 BLAKE2B 
1353f0697a977eb395abd857c8cc43c839912f4bd31436c6620d10e3dc29dc32ee9970478ad0f569b02f14989c48a7d956a233c7db22e172897a49a98fd2a94d
 SHA512 
fa453d3134139fc1f435d6388aa7d6271cd680d08ea1736269a917c12500bb463a81afc956ddd0045e98784bcdbb6541c333be6ff0c2a00feeb482b637f08e98
 DIST portage-2.3.94.tar.bz2 1050104 BLAKE2B 
8e812e4f56f5dd94cab6d806f83ae4db5507192860f5d74f43f409586def75642378416ab34371adbe9718bcd77298d9fa5f2b0d2d5e79ce18bf71a5287f0b00
 SHA512 
7f04fa6b0e5cc38dbb21df9fdf0efc0e4ced7f040fa9c34cab367f0bb514571e536b5fc6ea841ad89cb6934ecf6adc370160ed6e0a9bbd5fb280add9ca3c29ed
 DIST portage-2.3.95.tar.bz2 1050834 BLAKE2B 
0864f0887cc2f35d2f56300a040672d4f76f310784b843dbea70c358489ab4f5d385fd92d5b48292b6f2067c0e7a2e30088b44bec71c542c56c15cd12d709826
 SHA512 
971dd3455f9e2156bb92c474f0d4bf6a1443995a3a243ed7d3499aebbdd8cfe4c9e16668c7fec45ec4546cddd1b437d81d704f4d26e7f5af03f1ccd164aceb46
+DIST portage-2.3.96.tar.bz2 1050446 BLAKE2B 
0cb61c70b3ea7557eeeb832ac1dfd3ee9a5cc84a5c9102e18f91fd61f046d738011b563a03203dd96e5164d5949b06945868f908e9c26abcd2971930421fae43
 SHA512 
4e291cda81cc735375e9e7ca122ec5a7e7f4c626e466c02dd91a0058b7468fedec057e231d5b724b6e111b2853c6c493d824ca385443ef39f8b5776624d3b70e

diff --git a/sys-apps/portage/portage-2.3.96.ebuild 
b/sys-apps/portage/portage-2.3.96.ebuild
new file mode 100644
index 00000000000..1e0dc18322b
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.96.ebuild
@@ -0,0 +1,267 @@
+# 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_5 python3_6 python3_7 python3_8 )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info systemd prefix
+
+DESCRIPTION="Portage is the package management and distribution system for 
Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86"
+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 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).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+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_5} pypy)
+               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? ( sys-freebsd/freebsd-bin )
+       elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+       elibc_musl? ( >=sys-apps/sandbox-2.2 )
+       elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+       kernel_linux? ( sys-apps/util-linux )
+       >=app-misc/pax-utils-0.1.17
+       selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+       xattr? ( kernel_linux? (
+               >=sys-apps/install-xattr-0.3
+               $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+                       python2_7 pypy)
+       ) )
+       !<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";
+
+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/${PN}-${TARBALL_PV}.tar.bz2
+       $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_pretend() {
+       local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
+
+       check_extra_config
+}
+
+python_prepare_all() {
+       distutils-r1_python_prepare_all
+
+       sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i 
lib/portage/__init__.py || die
+
+       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
+               einfo "Setting portage.const.EPREFIX ..."
+               hprefixify -e 
"s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+                       -w "/_BINARY/" lib/portage/const.py
+
+               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 "Adjusting make.globals, repos.conf and etc-update ..."
+               hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+               if use prefix-guest ; then
+                       sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+                               -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+                               -e "s|^\(sync-uri = 
\).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+                               -i cnf/repos.conf || die "sed failed"
+               fi
+
+               einfo "Adding FEATURES=force-prefix to make.globals ..."
+               echo -e '\nFEATURES="${FEATURES} force-prefix"' >> 
cnf/make.globals \
+                       || die "failed to append to make.globals"
+       fi
+
+       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
+}
+
+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
+
+       # 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:portage "${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