commit:     39bc8967e254a5c83d5e0e22db6a0b6d772ed01e
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 12 02:15:52 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Sep 12 02:35:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39bc8967

sys-apps/portage: Bump to version 2.3.76

 #693836 erroneous firefox downgrade
 #693980 x11-module-rebuild: support SYMLINK_LIB=no
 #694000 OwnerSet: fix exclude-files support

Bug: https://bugs.gentoo.org/691278
Bug: https://bugs.gentoo.org/693836
Bug: https://bugs.gentoo.org/693980
Bug: https://bugs.gentoo.org/694000
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 sys-apps/portage/Manifest              |   1 +
 sys-apps/portage/portage-2.3.76.ebuild | 261 +++++++++++++++++++++++++++++++++
 2 files changed, 262 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 4536a40778c..b563e536c96 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,5 @@
 DIST portage-2.3.66.tar.bz2 1023966 BLAKE2B 
dc378b714101b287fa33defeb778e586da83275cdc2d0bc7a98e9f2ea568568313d6a2767f693f3111fc41f0c6f07451315021186a1719bd52520da327c103d6
 SHA512 
f8642237e0127d9838c6e91430a19b8886295f8ce6b18cf915d6eb63204c7a8c65783f1554eec90b7ce7d0b613ef4206643eec8751b0594de1dcb4ede4491779
 DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 
22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545cccca0f516a5724e331e
 SHA512 
20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
 DIST portage-2.3.75.tar.bz2 1032575 BLAKE2B 
c4f3e9a7e7056af19da6a56599fb79a26331d6ab88981f966b77e2d17ee5dac1a585f54b1185f64855c9c2af544684b759143f657a529878a4e6eb9df4757340
 SHA512 
06dabc9bff2992b197575ceab5b4f117aca01a10d2556bb006bb28bd4c1d99edfbff753e83aba706782da1e365b923e081ce2037053fed31e18baa5fab6da4a2
+DIST portage-2.3.76.tar.bz2 1033462 BLAKE2B 
1be0641337cd7d2a55f8aaba6f84bbfa7182503050e669fb28cd00e4de13cce31ec6e33cc2794e372d1a67b7d2f27e6bb85969f720f2ed449c619598b708b903
 SHA512 
e7774cf89e3865cb1ca5465fc961b452cc8529ccf09e86b7ebd16cca049f1efb527dca9aba892392d5909283cf12930117b1d33fa58e1e429f4408cf50181921
 DIST repoman-bug-685482-fbebef9677d6.patch 3350 BLAKE2B 
f715267e2731c1ec7c780aa9c6cffe1f848b3ad050273646579677a0522483df6fef844ffd87fb22f7dad53f1ec60221acd0d81a813569baf768ba62a6c1921c
 SHA512 
0e44625aeec7c239d7db8fdcf6a13313f4a8c1275e0e474cc2f05e5476d86214881cec2917d816c8b63f69d508c0bfa69e6a8e05b614b405463c998a4fb7ce12

diff --git a/sys-apps/portage/portage-2.3.76.ebuild 
b/sys-apps/portage/portage-2.3.76.ebuild
new file mode 100644
index 00000000000..b45fedf3529
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.76.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+       pypy
+       python3_5 python3_6 python3_7
+       python2_7
+)
+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 ~amd64-fbsd"
+SLOT="0"
+IUSE="build doc epydoc 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 )
+       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).
+# 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
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+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
+}
+
+pkg_setup() {
+       use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+       distutils-r1_python_prepare_all
+
+       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 epydoc && targets+=( epydoc )
+
+       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 epydoc && targets+=(
+               install_epydoc
+               --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
+       python_export PYTHON_SITEDIR
+       [[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No 
such directory"
+       env -u DISTDIR \
+               -u PORTAGE_OVERRIDE_EPREFIX \
+               -u PORTAGE_REPOSITORIES \
+               -u PORTDIR \
+               -u PORTDIR_OVERLAY \
+               
PYTHONPATH="${D%/}${PYTHON_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
+}

Reply via email to