commit: 17df5c4bb8a2b2985b09769c1491cd2d3cd137fa
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 12:09:17 2020 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 12:09:17 2020 +0000
URL:
https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=17df5c4b
sys-apps/portage: Revision bump, fix commit to pull, drop old
Package-Manager: Portage-2.3.83, Repoman-2.3.23
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
sys-apps/portage/Manifest | 15 +-
sys-apps/portage/metadata.xml | 1 -
...ge-2.3.103.ebuild => portage-2.3.103-r1.ebuild} | 6 +-
sys-apps/portage/portage-2.3.83.ebuild | 272 ---------------------
4 files changed, 10 insertions(+), 284 deletions(-)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 4d5cdbdb1..8217635a5 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,16 +3,15 @@ Hash: SHA256
AUX README.RESCUE 137 BLAKE2B
af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da
SHA512
dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
AUX portage-ccache.conf 60 BLAKE2B
b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941
SHA512
36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-EBUILD portage-2.3.103.ebuild 8777 BLAKE2B
f65204d53da0012b484a1209ad55d180eddb41ce1e8bb2049f28dc1f70fe59f577038dd9a4f2b0e8a7c4d98cd2ae56cfaf1d60633cf11241b882e38d9bb404d1
SHA512
fc6c9c93bf0d51a315ceb24c736a2680714baaaac0009b967ddcd786f2895df0bf198b3812a07747fdadcd5819692efdec9ec28f91ce8c800c9759a53deba440
-EBUILD portage-2.3.83.ebuild 8660 BLAKE2B
1f0fb7d4e07f1773b6ba00394ddfbcc0901b16ebb652cbc097f4d6957e47ed42d7437bf45b17c40cbcf02649ec2e7cc2fec6b6cdbf8d1bff664191e090659f94
SHA512
664ba48f86e5fb7571b4ea693c9c7d750baeb604d6cc093ca74680030180cefebded21a6a2ab30927b2277a565923aa097942a904e0c13ac98eea097f3f87a9a
-MISC metadata.xml 1555 BLAKE2B
dabf3d2f4c13dbbded9faf3c59e038c26a0f83a3dea57358334b92f8d04a605f3d3be8cef23815e33054560c27f19b30dded120e0234556fd2d0231691071608
SHA512
b2edbe91929d66f53140c133c27aba4b4962b1043992ce79ecd3c7482b75724e93c3ce6b6f4e00b306247359abe8a5449631b7d0f1c02e0dce1cfc26dc9760f5
+EBUILD portage-2.3.103-r1.ebuild 8768 BLAKE2B
0b7453cea3babe0c9a194ed09cf774d971cfb2fc2a5638fad18295efd0e1c8dc6f9af47dcaf9a2a5f173e670c990025cba6ba9826f822eded49b9248c2df52ad
SHA512
ecbe93b4e6f91df99f86c5349663b2719bcad4a7ac16a259f7ed4fa7dac08d666e444f2085d547ed42d664a4f33423de5420b756d67b89cdb601f9aaa84b60a7
+MISC metadata.xml 1482 BLAKE2B
1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b
SHA512
5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
-----BEGIN PGP SIGNATURE-----
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAl8BnHBfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAl9CXGdfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGdaJAQA1ewTGjlswsteZzhKni1li3aLS0Mo89FROw+w+H5uGviAbmS2mrXhEZ8p
-JsMZDnt7CtN9NRtGrgXvemzn4p393sqhT2puEqnxe+klScA0XfTBfuD3wBimKp2i
-vhq3Pabkd+eQ11Z7EUiLVHJjKqY0WRg/xzV0M2VmQgmUCgRTC2E=
-=xpx6
+kGdZ+AQAuanArlQstllQIvCulfqGUo+SN7glPlavckZt872tE4nXDv/4IOBWgPGP
+r7CgICt4mAeT0jYOXcErLyrVKyt3IB2kl8OhOn4q0EDmGxwddwPUSJejMtoyNkaW
+jIfPOXaDZqonfZ/ORivVLKvIn0E6X5F4QhVHWUr4jwMXywcHu8U=
+=I4a6
-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index 5302ba2df..062dafe62 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -12,7 +12,6 @@
</maintainer>
<use>
<flag name="apidoc">Build html API documentation with sphinx-apidoc.</flag>
- <flag name="epydoc">Build html API documentation with epydoc.</flag>
<flag name="gentoo-dev">Enable features required for Gentoo ebuild
development.</flag>
<flag name="ipc">Use inter-process communication between portage and
running ebuilds.
diff --git a/sys-apps/portage/portage-2.3.103.ebuild
b/sys-apps/portage/portage-2.3.103-r1.ebuild
similarity index 97%
rename from sys-apps/portage/portage-2.3.103.ebuild
rename to sys-apps/portage/portage-2.3.103-r1.ebuild
index d162fa178..223a1fd7e 100644
--- a/sys-apps/portage/portage-2.3.103.ebuild
+++ b/sys-apps/portage/portage-2.3.103-r1.ebuild
@@ -11,12 +11,12 @@ inherit distutils-r1 git-r3 linux-info multilib systemd
prefix
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git";
EGIT_BRANCH="multilib"
-EGIT_COMMIT="8045fb9bb75cea8a9195d7e71297ffd55f48c68c"
+EGIT_COMMIT="661e707be59a3e3c2973b81ac1cbe376248ed0d9"
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 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc
~x86"
SLOT="0"
IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify
selinux xattr"
@@ -44,7 +44,7 @@ RDEPEND="
app-shells/bash:0[readline]
>=app-admin/eselect-1.2
rsync-verify? (
- >=app-portage/gemato-14[${PYTHON_USEDEP}]
+ >=app-portage/gemato-14.4-r1[${PYTHON_USEDEP}]
>=app-crypt/openpgp-keys-gentoo-release-20180706
>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
)
diff --git a/sys-apps/portage/portage-2.3.83.ebuild
b/sys-apps/portage/portage-2.3.83.ebuild
deleted file mode 100644
index 8496a7ebf..000000000
--- a/sys-apps/portage/portage-2.3.83.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=(
- pypy
- python3_5 python3_6 python3_7 python3_8
- python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 git-r3 linux-info multilib systemd prefix
-
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git";
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="d0102f790d48ba22877d8ca0d0c0698e54154efb"
-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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86"
-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 )
- >=sys-apps/abi-wrapper-1.0-r6
- epydoc? (
- $(python_gen_cond_dep '
- >=dev-python/epydoc-2.0[${PYTHON_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
- >=sys-apps/abi-wrapper-1.0-r6
- !<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*') )"
-
-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
-}
-
-pkg_postinst() {
- einfo
- elog "For setup instructions after switching to portage-multilib"
- elog "read doc/portage-multilib-instructions inside the multilib
overlay"
- einfo
- elog "The bin/ dir of the overlay has some scripts to switch from lib32"
- elog "to MULTILIB_ABI or to add the default MULTILIB_ABI flags"
-
- einfo ""
- einfo "This release of portage NO LONGER contains the repoman code
base."
- einfo "Repoman has its own ebuild and release package."
- einfo "For repoman functionality please emerge app-portage/repoman"
- einfo "Please report any bugs you may encounter."
- einfo ""
-}
