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

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

[Thomas Sachau]

commit:     a432498b794bd16bc280291420b1058469eb9261
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 12:27:50 2020 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 12:27:50 2020 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=a432498b

sys-apps/portage: Version bump

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest             |  11 +-
 sys-apps/portage/portage-3.0.4.ebuild | 269 ++++++++++++++++++++++++++++++++++
 2 files changed, 275 insertions(+), 5 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8217635a5..2dbcd2981 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -4,14 +4,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-r1.ebuild 8768 BLAKE2B 0b7453cea3babe0c9a194ed09cf774d971cfb2fc2a5638fad18295efd0e1c8dc6f9af47dcaf9a2a5f173e670c990025cba6ba9826f822eded49b9248c2df52ad SHA512 ecbe93b4e6f91df99f86c5349663b2719bcad4a7ac16a259f7ed4fa7dac08d666e444f2085d547ed42d664a4f33423de5420b756d67b89cdb601f9aaa84b60a7
+EBUILD portage-3.0.4.ebuild 8764 BLAKE2B 25c438cdbc500eccf27f8613fcbd16107f05e23be37413b9badb660e7455bace25a503c5e6299375505f0fd804e75e0ff3e4738b57beacf2950d4cf8a27c53d6 SHA512 569d2b903931e1704542468c46718e206ca5a524e48d9531eb302e4c0ab4580490ddee5292d3e8da77fcddf3ae8ef3b6c4e4149a15e83ba129a6422212263d6e
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAl9CXGdfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAl9CYMBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGdZ+AQAuanArlQstllQIvCulfqGUo+SN7glPlavckZt872tE4nXDv/4IOBWgPGP
-r7CgICt4mAeT0jYOXcErLyrVKyt3IB2kl8OhOn4q0EDmGxwddwPUSJejMtoyNkaW
-jIfPOXaDZqonfZ/ORivVLKvIn0E6X5F4QhVHWUr4jwMXywcHu8U=
-=I4a6
+kGe9xgP/XPxDCwemHXJN0nyUvY3wLSjDzH2rHTPYomYPsmeX/An8sC0RBjS8CQCY
+YfAqvRDA2lPSntJ/HZ8GNepxQQxPyVT4MA9P+ZvhDRuO/mltTT0SWuFFoAj7BSHD
+OyyvMnDCBRz5Nc7zcghoaBYwdA6H7njch27gTSshvWCYh9FKve0=
+=7iNc
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.4.ebuild b/sys-apps/portage/portage-3.0.4.ebuild
new file mode 100644
index 000000000..55845626a
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.4.ebuild
@@ -0,0 +1,269 @@
+# 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 git-r3 linux-info multilib systemd prefix
+
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="9ab4d534816dd92345df6c0cc2a1c1343415a6bd"
+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 ~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 )
+	>=sys-apps/abi-wrapper-1.0-r6
+	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.4-r1[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	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
+	) )
+	!<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
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_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
+
+	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: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
+}
+
+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 ""
+}

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

[Thomas Sachau]

commit:     4d15376e4b0317e61ddf6cfd4b19a9633f0e335c
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon May 22 12:49:09 2023 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon May 22 12:49:09 2023 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=4d15376e

sys-apps/portage: Revision bump for libgpg-error

Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest                 |   1 +
 sys-apps/portage/portage-3.0.47-r2.ebuild | 296 ++++++++++++++++++++++++++++++
 2 files changed, 297 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 26480a198..1475e97a2 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,5 +3,6 @@ AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205b40a0a0640ce2a7ae553a84d7aa8d8c11a776cac44b7573b842951ec11f8ab393145edb1786d6837e79 SHA512 4810d8ae1f8291d34b756897972841d30d5f50b48597a430cb8ddb102dab07a7f0d78c3901b6fdd6763180e92b5ae90a3cb88ae5a5c1cae845b23b49d03a87fd
 EBUILD portage-3.0.47-r1.ebuild 9442 BLAKE2B 5754e10b90bc60baaedbdbcc2a00ee6d619ec710bd95465275a26d5308661a7721e22bd3653f1d40eaa194d945435c13313462eaa04ed19ed5c3902daba083d1 SHA512 2bd84d464d59bffd5076aa7e983299cccf3d833d6259d090b00d1610de0c3e312eb631047542241e254f7409f04b28f0df0fc248db66ee6ce8b1909215370f33
+EBUILD portage-3.0.47-r2.ebuild 9442 BLAKE2B e42dc97b4da0864a365652c6005335c85a49966e55b67cffac19b317003a8b9360be977435b410e6fe2cdda1f4584e0d18c3e01a9829d6f6e4071a523f95b279 SHA512 b35b13021188a944cf9ba8d1cff2f6578f4e0ca18c5b6fe59f92f69e79badc92f993837cb963b3102f7ab5833b9359c804aa0c9e3c2808058123e543b7768011
 EBUILD portage-3.0.47.ebuild 9442 BLAKE2B d41744c444cbd95835498c6b4d7bbf01fe489edc99ec897d758821eb8bff5596d05c6c6fc8ef8a51eef5e00ba0d248ac9f2ca309c6753e8dfbe42cf9c4f8583c SHA512 9c6c9422272607b803df08d01960e45f8e9d79b133380bfca7147ec601b96cf2e589851d5e6f823c88d1e5fa702fe5ca330174dfac3bca404c94c17fbd421a98
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a

diff --git a/sys-apps/portage/portage-3.0.47-r2.ebuild b/sys-apps/portage/portage-3.0.47-r2.ebuild
new file mode 100644
index 000000000..324db59a4
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.47-r2.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 git-r3 linux-info toolchain-funcs multilib tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+EGIT_REPO_URI="https://github.com/TommyD/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="c8e2b6d064e81a9052538db71c88177a8c82936e"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+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 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 )
+	>=sys-apps/abi-wrapper-1.0-r6
+	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="
+	acct-user/portage
+	app-arch/zstd
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/baselayout-2.9
+	>=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-20220101
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=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
+	) )
+	!<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
+	!~app-portage/repoman-3.0.0
+"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/coreutils-6.4
+		>=sys-apps/file-5.44-r3
+	)
+"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	if use native-extensions && tc-is-cross-compiler; then
+		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
+	fi
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	local PATCHES=(
+	)
+
+	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} ipc-sandbox network-sandbox strict-keepdir warn-on-large-env"' \
+			>> 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
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		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
+	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
+
+	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.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() {
+	if ! use build; then
+		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 -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+		env -u FEATURES -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+	fi
+
+	# 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
+}
+
+pkg_postinst() {
+	# Warn about obsolete "enotice" script, bug #867010
+	local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
+	if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
+		eerror "Obsolete 'enotice' script detected!"
+		eerror "Please remove this from ${bashrc} to avoid problems."
+		eerror "See bug 867010 for more details."
+	fi
+	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"
+}

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

[Thomas Sachau]

commit:     81ceec445a86a2d30110da8878fd7eb471ee4a94
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 10:49:50 2023 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun May 21 10:49:50 2023 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=81ceec44

sys-apps/portage: Revsion bump for QA check fix

Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest                 |   5 +-
 sys-apps/portage/portage-3.0.47-r1.ebuild | 296 ++++++++++++++++++++++++++++++
 2 files changed, 297 insertions(+), 4 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8c76e21a1..26480a198 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,9 +2,6 @@ AUX 3.0.30-revert-default-enable-soname-dependencies.patch 2342 BLAKE2B 3852da21
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205b40a0a0640ce2a7ae553a84d7aa8d8c11a776cac44b7573b842951ec11f8ab393145edb1786d6837e79 SHA512 4810d8ae1f8291d34b756897972841d30d5f50b48597a430cb8ddb102dab07a7f0d78c3901b6fdd6763180e92b5ae90a3cb88ae5a5c1cae845b23b49d03a87fd
-EBUILD portage-3.0.30.ebuild 9370 BLAKE2B c77fcdd1b0b80c0a398ae06272c9b97b680db6e4c49ad3a2d916682a048aef076c5247f8ed21d56981555325e7f7651e13ffb3b5910b02afd778dca1cdb4975b SHA512 0e364ba2730d372b39d8ed04996a2f17e4557c90f8d5eb5e425fbc790b721ebf2e0a2f5f12ece6d24205e5be3065fc812d9c5258e403cab6b78eb900d2c7a08c
-EBUILD portage-3.0.34.ebuild 9480 BLAKE2B d431b911a224ce672154bf136c11642c2205fa25dee87e446a7111ec6e1ecd09666849373f1817a9d4adc648a743dcc311783d8bec1c6b6af60d03fd4dd83916 SHA512 bf3c6159cff3015cc1102b19e0a7d4b87230709ffaa104a24ed55e04c16981aca81cb8c18d383155bedef723e2a0538fd9d78ee365793be1eec50850293ec11e
-EBUILD portage-3.0.36.ebuild 9480 BLAKE2B 98e7d90bcb6500b5eef1bf12c1fb523bff36fc89797f6fad5533bda83e5a80e2915a7668dcb54eef7f76b780097c55f1969af4cc91b251568fe6cbf577a9e2dc SHA512 e3e6b0f0d463ae37daf1e2b90add6a3b1bf784dba5d063b80a1fedfaba8ef7897a8f60d1f44d00d3ebe80ab2616e04cace828eb174f3edef3187eecf57a431db
-EBUILD portage-3.0.42.ebuild 9822 BLAKE2B ebadf2ffa6d6616a6a4ca845b19020ba8fcdc7c3bb45831c99fc8667a8cf7034893261c90bacc30ea441fce3b9dc9b38bb2c7a9298d599d19c2fee0ea72b36e7 SHA512 51ed25ac141eda68d33c04a776ea8e27fe3da9131086cf80c62f4dbda00690fb0871ea49beba9c6d9e4f8177a565abea13ba27b4e82a261c5e267334a245c72a
+EBUILD portage-3.0.47-r1.ebuild 9442 BLAKE2B 5754e10b90bc60baaedbdbcc2a00ee6d619ec710bd95465275a26d5308661a7721e22bd3653f1d40eaa194d945435c13313462eaa04ed19ed5c3902daba083d1 SHA512 2bd84d464d59bffd5076aa7e983299cccf3d833d6259d090b00d1610de0c3e312eb631047542241e254f7409f04b28f0df0fc248db66ee6ce8b1909215370f33
 EBUILD portage-3.0.47.ebuild 9442 BLAKE2B d41744c444cbd95835498c6b4d7bbf01fe489edc99ec897d758821eb8bff5596d05c6c6fc8ef8a51eef5e00ba0d248ac9f2ca309c6753e8dfbe42cf9c4f8583c SHA512 9c6c9422272607b803df08d01960e45f8e9d79b133380bfca7147ec601b96cf2e589851d5e6f823c88d1e5fa702fe5ca330174dfac3bca404c94c17fbd421a98
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a

diff --git a/sys-apps/portage/portage-3.0.47-r1.ebuild b/sys-apps/portage/portage-3.0.47-r1.ebuild
new file mode 100644
index 000000000..6ec131012
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.47-r1.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 git-r3 linux-info toolchain-funcs multilib tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+EGIT_REPO_URI="https://github.com/TommyD/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="dcdc7fafab730a6ef0de386ad32f950eba50973a"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+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 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 )
+	>=sys-apps/abi-wrapper-1.0-r6
+	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="
+	acct-user/portage
+	app-arch/zstd
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/baselayout-2.9
+	>=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-20220101
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=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
+	) )
+	!<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
+	!~app-portage/repoman-3.0.0
+"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/coreutils-6.4
+		>=sys-apps/file-5.44-r3
+	)
+"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	if use native-extensions && tc-is-cross-compiler; then
+		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
+	fi
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	local PATCHES=(
+	)
+
+	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} ipc-sandbox network-sandbox strict-keepdir warn-on-large-env"' \
+			>> 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
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		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
+	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
+
+	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.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() {
+	if ! use build; then
+		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 -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+		env -u FEATURES -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+	fi
+
+	# 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
+}
+
+pkg_postinst() {
+	# Warn about obsolete "enotice" script, bug #867010
+	local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
+	if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
+		eerror "Obsolete 'enotice' script detected!"
+		eerror "Please remove this from ${bashrc} to avoid problems."
+		eerror "See bug 867010 for more details."
+	fi
+	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"
+}

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

[Thomas Sachau]

commit:     96cd7f285a10d3f7c8d3af6f3bfb1e63b77d4b36
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 15:26:56 2023 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat May 20 15:26:56 2023 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=96cd7f28

sys-apps/portage: drop 3.0.42

Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/portage-3.0.42.ebuild | 300 ---------------------------------
 1 file changed, 300 deletions(-)

diff --git a/sys-apps/portage/portage-3.0.42.ebuild b/sys-apps/portage/portage-3.0.42.ebuild
deleted file mode 100644
index 01ce6ee5d..000000000
--- a/sys-apps/portage/portage-3.0.42.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# 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 git-r3 linux-info toolchain-funcs multilib tmpfiles prefix
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-EGIT_REPO_URI="https://github.com/TommyD/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="64a71265f05e8bd6683c32babadb5d1516f9aaa2"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-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 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 )
-	>=sys-apps/abi-wrapper-1.0-r6
-	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="
-	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-20220101
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=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
-	) )
-	!<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
-	!~app-portage/repoman-3.0.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		>=sys-apps/file-5.41
-		>=sys-apps/coreutils-6.4
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	if use native-extensions && tc-is-cross-compiler; then
-		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
-	fi
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	local PATCHES=(
-	)
-
-	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} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> 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
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		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
-
-	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.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() {
-	if ! use build; then
-		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 -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-		env -u FEATURES -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
-	fi
-
-	# 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
-}
-
-pkg_postinst() {
-	# Warn about obsolete "enotice" script, bug #867010
-	local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
-	if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
-		eerror "Obsolete 'enotice' script detected!"
-		eerror "Please remove this from ${bashrc} to avoid problems."
-		eerror "See bug 867010 for more details."
-	fi
-	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 ""
-}

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

[Thomas Sachau]

commit:     a12aa53ecbe17efe437f93440706fe40811a362a
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 15:25:49 2023 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat May 20 15:25:49 2023 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=a12aa53e

sys-apps/portage: drop 3.0.34

Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/portage-3.0.34.ebuild | 293 ---------------------------------
 1 file changed, 293 deletions(-)

diff --git a/sys-apps/portage/portage-3.0.34.ebuild b/sys-apps/portage/portage-3.0.34.ebuild
deleted file mode 100644
index e7d5e4d35..000000000
--- a/sys-apps/portage/portage-3.0.34.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# 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 git-r3 linux-info toolchain-funcs multilib tmpfiles prefix
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-EGIT_REPO_URI="https://github.com/TommyD/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="3b6ad9bd495bb1d31c330133e069fa3140bcbe8c"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-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 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 )
-	>=sys-apps/abi-wrapper-1.0-r6
-	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="
-	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? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=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
-	) )
-	!<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
-	!~app-portage/repoman-3.0.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		>=sys-apps/file-5.41
-		>=sys-apps/coreutils-6.4
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	if use native-extensions && tc-is-cross-compiler; then
-		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
-	fi
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	local PATCHES=(
-	)
-
-	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} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> 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
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		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
-
-	dotmpfiles "${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() {
-	if ! use build; then
-		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 -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-		env -u FEATURES -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
-	fi
-
-	# 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
-}
-
-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 ""
-}

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

[Thomas Sachau]

commit:     b64f6923fcb8de1f51dd9e34f0887c714285f546
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 15:26:09 2023 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat May 20 15:26:09 2023 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=b64f6923

sys-apps/portage: drop 3.0.36

Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/portage-3.0.36.ebuild | 293 ---------------------------------
 1 file changed, 293 deletions(-)

diff --git a/sys-apps/portage/portage-3.0.36.ebuild b/sys-apps/portage/portage-3.0.36.ebuild
deleted file mode 100644
index 16f5fbd78..000000000
--- a/sys-apps/portage/portage-3.0.36.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# 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 git-r3 linux-info toolchain-funcs multilib tmpfiles prefix
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-EGIT_REPO_URI="https://github.com/TommyD/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="a2d2029887f414dc8e106fe7e40ccfe102a62561"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-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 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 )
-	>=sys-apps/abi-wrapper-1.0-r6
-	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="
-	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? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=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
-	) )
-	!<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
-	!~app-portage/repoman-3.0.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		>=sys-apps/file-5.41
-		>=sys-apps/coreutils-6.4
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	if use native-extensions && tc-is-cross-compiler; then
-		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
-	fi
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	local PATCHES=(
-	)
-
-	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} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> 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
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		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
-
-	dotmpfiles "${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() {
-	if ! use build; then
-		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 -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-		env -u FEATURES -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
-	fi
-
-	# 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
-}
-
-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 ""
-}

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

[Thomas Sachau]

commit:     f8bdf21efd019080a035cc667d02fd3f01af2609
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 15:23:46 2023 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat May 20 15:23:46 2023 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=f8bdf21e

sys-apps/portage: add 3.0.47

Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |   1 +
 sys-apps/portage/portage-3.0.47.ebuild | 296 +++++++++++++++++++++++++++++++++
 2 files changed, 297 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index db56a9491..8c76e21a1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,4 +6,5 @@ EBUILD portage-3.0.30.ebuild 9370 BLAKE2B c77fcdd1b0b80c0a398ae06272c9b97b680db6
 EBUILD portage-3.0.34.ebuild 9480 BLAKE2B d431b911a224ce672154bf136c11642c2205fa25dee87e446a7111ec6e1ecd09666849373f1817a9d4adc648a743dcc311783d8bec1c6b6af60d03fd4dd83916 SHA512 bf3c6159cff3015cc1102b19e0a7d4b87230709ffaa104a24ed55e04c16981aca81cb8c18d383155bedef723e2a0538fd9d78ee365793be1eec50850293ec11e
 EBUILD portage-3.0.36.ebuild 9480 BLAKE2B 98e7d90bcb6500b5eef1bf12c1fb523bff36fc89797f6fad5533bda83e5a80e2915a7668dcb54eef7f76b780097c55f1969af4cc91b251568fe6cbf577a9e2dc SHA512 e3e6b0f0d463ae37daf1e2b90add6a3b1bf784dba5d063b80a1fedfaba8ef7897a8f60d1f44d00d3ebe80ab2616e04cace828eb174f3edef3187eecf57a431db
 EBUILD portage-3.0.42.ebuild 9822 BLAKE2B ebadf2ffa6d6616a6a4ca845b19020ba8fcdc7c3bb45831c99fc8667a8cf7034893261c90bacc30ea441fce3b9dc9b38bb2c7a9298d599d19c2fee0ea72b36e7 SHA512 51ed25ac141eda68d33c04a776ea8e27fe3da9131086cf80c62f4dbda00690fb0871ea49beba9c6d9e4f8177a565abea13ba27b4e82a261c5e267334a245c72a
+EBUILD portage-3.0.47.ebuild 9442 BLAKE2B d41744c444cbd95835498c6b4d7bbf01fe489edc99ec897d758821eb8bff5596d05c6c6fc8ef8a51eef5e00ba0d248ac9f2ca309c6753e8dfbe42cf9c4f8583c SHA512 9c6c9422272607b803df08d01960e45f8e9d79b133380bfca7147ec601b96cf2e589851d5e6f823c88d1e5fa702fe5ca330174dfac3bca404c94c17fbd421a98
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a

diff --git a/sys-apps/portage/portage-3.0.47.ebuild b/sys-apps/portage/portage-3.0.47.ebuild
new file mode 100644
index 000000000..7ef37124f
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.47.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 git-r3 linux-info toolchain-funcs multilib tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+EGIT_REPO_URI="https://github.com/TommyD/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="05ae40a197a95bf4d521a58403e204d48d7d796a"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+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 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 )
+	>=sys-apps/abi-wrapper-1.0-r6
+	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="
+	acct-user/portage
+	app-arch/zstd
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/baselayout-2.9
+	>=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-20220101
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=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
+	) )
+	!<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
+	!~app-portage/repoman-3.0.0
+"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/coreutils-6.4
+		>=sys-apps/file-5.44-r3
+	)
+"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	if use native-extensions && tc-is-cross-compiler; then
+		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
+	fi
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	local PATCHES=(
+	)
+
+	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} ipc-sandbox network-sandbox strict-keepdir warn-on-large-env"' \
+			>> 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
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		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
+	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
+
+	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.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() {
+	if ! use build; then
+		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 -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+		env -u FEATURES -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+	fi
+
+	# 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
+}
+
+pkg_postinst() {
+	# Warn about obsolete "enotice" script, bug #867010
+	local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
+	if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
+		eerror "Obsolete 'enotice' script detected!"
+		eerror "Please remove this from ${bashrc} to avoid problems."
+		eerror "See bug 867010 for more details."
+	fi
+	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"
+}

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

[Thomas Sachau]

commit:     e32d96724b6486e96e42d3b8d9abf751c8c9c357
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 15:25:33 2023 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat May 20 15:25:33 2023 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=e32d9672

sys-apps/portage: drop 3.0.30

Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/portage-3.0.30.ebuild | 290 ---------------------------------
 1 file changed, 290 deletions(-)

diff --git a/sys-apps/portage/portage-3.0.30.ebuild b/sys-apps/portage/portage-3.0.30.ebuild
deleted file mode 100644
index 0b979c1fe..000000000
--- a/sys-apps/portage/portage-3.0.30.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-EGIT_REPO_URI="https://github.com/TommyD/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="a5893dcca4aae2fdcccbcb6578bf48c203f5e1d9"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-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 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 )
-	>=sys-apps/abi-wrapper-1.0-r6
-	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="
-	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? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=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
-	) )
-	!<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
-	!~app-portage/repoman-3.0.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		>=sys-apps/file-5.41
-		>=sys-apps/coreutils-6.4
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/3.0.30-revert-default-enable-soname-dependencies.patch"
-	)
-
-	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} ipc-sandbox network-sandbox 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 ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		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
-
-	dotmpfiles "${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() {
-	if ! use build; then
-		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 -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-		env -u FEATURES -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
-	fi
-
-	# 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
-}
-
-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 ""
-}

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

[Thomas Sachau]

commit:     a09104549b791703d592e855de1164bb0793063f
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 14:42:55 2023 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat May 20 14:42:55 2023 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=a0910454

sys-apps/portage: add 3.0.36

Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |   1 +
 sys-apps/portage/portage-3.0.36.ebuild | 293 +++++++++++++++++++++++++++++++++
 2 files changed, 294 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f5c70c298..63fab8ca9 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,4 +3,5 @@ AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 EBUILD portage-3.0.30.ebuild 9370 BLAKE2B c77fcdd1b0b80c0a398ae06272c9b97b680db6e4c49ad3a2d916682a048aef076c5247f8ed21d56981555325e7f7651e13ffb3b5910b02afd778dca1cdb4975b SHA512 0e364ba2730d372b39d8ed04996a2f17e4557c90f8d5eb5e425fbc790b721ebf2e0a2f5f12ece6d24205e5be3065fc812d9c5258e403cab6b78eb900d2c7a08c
 EBUILD portage-3.0.34.ebuild 9480 BLAKE2B d431b911a224ce672154bf136c11642c2205fa25dee87e446a7111ec6e1ecd09666849373f1817a9d4adc648a743dcc311783d8bec1c6b6af60d03fd4dd83916 SHA512 bf3c6159cff3015cc1102b19e0a7d4b87230709ffaa104a24ed55e04c16981aca81cb8c18d383155bedef723e2a0538fd9d78ee365793be1eec50850293ec11e
+EBUILD portage-3.0.36.ebuild 9480 BLAKE2B 98e7d90bcb6500b5eef1bf12c1fb523bff36fc89797f6fad5533bda83e5a80e2915a7668dcb54eef7f76b780097c55f1969af4cc91b251568fe6cbf577a9e2dc SHA512 e3e6b0f0d463ae37daf1e2b90add6a3b1bf784dba5d063b80a1fedfaba8ef7897a8f60d1f44d00d3ebe80ab2616e04cace828eb174f3edef3187eecf57a431db
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a

diff --git a/sys-apps/portage/portage-3.0.36.ebuild b/sys-apps/portage/portage-3.0.36.ebuild
new file mode 100644
index 000000000..16f5fbd78
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.36.ebuild
@@ -0,0 +1,293 @@
+# 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 git-r3 linux-info toolchain-funcs multilib tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+EGIT_REPO_URI="https://github.com/TommyD/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="a2d2029887f414dc8e106fe7e40ccfe102a62561"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+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 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 )
+	>=sys-apps/abi-wrapper-1.0-r6
+	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="
+	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? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=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
+	) )
+	!<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
+	!~app-portage/repoman-3.0.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/file-5.41
+		>=sys-apps/coreutils-6.4
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	if use native-extensions && tc-is-cross-compiler; then
+		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
+	fi
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	local PATCHES=(
+	)
+
+	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} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> 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
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		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
+
+	dotmpfiles "${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() {
+	if ! use build; then
+		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 -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+		env -u FEATURES -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+	fi
+
+	# 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
+}
+
+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 ""
+}

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

[Thomas Sachau]

commit:     05c9c5a8a57d87e33c6ab3e9f07bc9de6d38ee78
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 14:33:53 2023 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat May 20 14:33:53 2023 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=05c9c5a8

sys-apps/portage: drop 3.0.28

Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |   4 -
 sys-apps/portage/portage-3.0.28.ebuild | 292 ---------------------------------
 2 files changed, 296 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 16a26e321..f5c70c298 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,10 +1,6 @@
 AUX 3.0.30-revert-default-enable-soname-dependencies.patch 2342 BLAKE2B 3852da2110ef498700e113495daf568bbd06d700a43d8719f4179179a9a96e7a809da15281cd2485b6608fa22e2bb8d43cb36140d91242ed281d7034a790c1bf SHA512 fc0cf492b9ca9f8937dc5ac432954245ffb6e1225c51d350efe6546535e42efd5a551028cfdc0c1cf0a1561aa5bb02d6b238ab485a8c8ba1500cbf7064c683ea
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-DIST portage-3.0.28-setuptools-install-depr.patch 1191 BLAKE2B 1601b8943be27fbebea8bfc5e927e9ba6c5e18b6b76a89f8b2b8525595f4693fe014d0bfd936b513a5d03524aba64797ef1bb1e85b0965426a6f36b6c9e9e07c SHA512 bb06c3f705e4a3e6fcc170fe36aa522184c573ef6e05dea3678ff9158472722d1b68fc480b89f4656786e024be6c5f6f656c386aeda467744bf8e9acdb6ffef5
-DIST portage-3.0.28.tar.bz2 1153994 BLAKE2B 8d9e3af04acd9bb5fdb3cff5b928abbf707db13f6c25afdac4399ea47adb67b2621ebb733927b4f9386e3f285fa7daac0423ae3fb0509a9df747b41c82865313 SHA512 148484b0384672116f2f2187eaddb56f646548324cd5f6c8e187a02bc965fb2bea6632214aed9b40c615acb89eb6124ab831ad85c59bac9a416b02a07506669b
-EBUILD portage-3.0.23.ebuild 9194 BLAKE2B 6f431c48d77629c17989178aa142506634134729e3bc4ecbcd146965fe0a144fbf0f603ef088f1b5f6afeeb50efd62a7a93fa73e8b888ac857b9300524554f47 SHA512 8ef955c59b3d3009a80cdb3bab5c7e2dddc6d91d56ee99ff967c7a489ea2e1564091176d7df7792a86d6644efc6b31d39241ce56aeb776c55031b7dd3cf051a9
-EBUILD portage-3.0.28.ebuild 9519 BLAKE2B 3972e8c02eea3cfee9bfc4ce75467abee6a69b7007b60df608e34291c171ee0598b18043a0dfe5e8cbbc35cc08258bc4245f7f063ef89ce52fdce0da9c40935c SHA512 8a20e7d2feaaf5ebcab2407f81d691935d98592b44cc3b645839f2336be08bedd1133bdeec85244c91db1883892736f26ce272810b7c2ee232517e571050ed42
 EBUILD portage-3.0.30.ebuild 9370 BLAKE2B c77fcdd1b0b80c0a398ae06272c9b97b680db6e4c49ad3a2d916682a048aef076c5247f8ed21d56981555325e7f7651e13ffb3b5910b02afd778dca1cdb4975b SHA512 0e364ba2730d372b39d8ed04996a2f17e4557c90f8d5eb5e425fbc790b721ebf2e0a2f5f12ece6d24205e5be3065fc812d9c5258e403cab6b78eb900d2c7a08c
 EBUILD portage-3.0.34.ebuild 9480 BLAKE2B d431b911a224ce672154bf136c11642c2205fa25dee87e446a7111ec6e1ecd09666849373f1817a9d4adc648a743dcc311783d8bec1c6b6af60d03fd4dd83916 SHA512 bf3c6159cff3015cc1102b19e0a7d4b87230709ffaa104a24ed55e04c16981aca81cb8c18d383155bedef723e2a0538fd9d78ee365793be1eec50850293ec11e
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a

diff --git a/sys-apps/portage/portage-3.0.28.ebuild b/sys-apps/portage/portage-3.0.28.ebuild
deleted file mode 100644
index 7d986e237..000000000
--- a/sys-apps/portage/portage-3.0.28.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-EGIT_REPO_URI="https://github.com/TommyD/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="e2085b63a9063d3a548347ec37f0a8448e6d35e7"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-SRC_URI="
-	https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2
-	https://gitweb.gentoo.org/proj/portage.git/patch/?id=c309328c4e1f6254251d31149ee47b4266d4d70f
-		-> ${P}-setuptools-install-depr.patch"
-
-LICENSE="GPL-2"
-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 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 )
-	>=sys-apps/abi-wrapper-1.0-r6
-	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="
-	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? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=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
-	) )
-	!<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
-	!~app-portage/repoman-3.0.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		>=sys-apps/file-5.41
-		>=sys-apps/coreutils-6.4
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	local PATCHES=(
-		"${DISTDIR}"/${P}-setuptools-install-depr.patch
-	)
-
-	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} ipc-sandbox network-sandbox 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 ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		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
-
-	dotmpfiles "${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 -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-	env -u FEATURES -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || 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
-}
-
-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 ""
-}

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

[Thomas Sachau]

commit:     9015db4daa56de53973597fa2e86aec768b9e2c2
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 14:33:11 2023 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat May 20 14:33:11 2023 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=9015db4d

sys-apps/portage: drop 3.0.23

Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/portage-3.0.23.ebuild | 284 ---------------------------------
 1 file changed, 284 deletions(-)

diff --git a/sys-apps/portage/portage-3.0.23.ebuild b/sys-apps/portage/portage-3.0.23.ebuild
deleted file mode 100644
index 8aca06b7a..000000000
--- a/sys-apps/portage/portage-3.0.23.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-EGIT_REPO_URI="https://github.com/TommyD/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="a7727547b795a3399883a2b7547657d43978d783"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-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 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 )
-	>=sys-apps/abi-wrapper-1.0-r6
-	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="
-	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: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? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=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
-	) )
-	!<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
-	!~app-portage/repoman-3.0.0"
-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
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_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 ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		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
-
-	dotmpfiles "${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 -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-	env -u FEATURES -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || 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
-}
-
-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 ""
-}

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

[Thomas Sachau]

commit:     8d81a06e7d97036e22a448e3da50a568ca6604c8
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 14:32:34 2023 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat May 20 14:32:34 2023 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=8d81a06e

sys-apps/portage: drop 3.0.20

Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |   6 -
 sys-apps/portage/portage-3.0.20.ebuild | 305 ---------------------------------
 2 files changed, 311 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index eb0de3954..16a26e321 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,14 +1,8 @@
 AUX 3.0.30-revert-default-enable-soname-dependencies.patch 2342 BLAKE2B 3852da2110ef498700e113495daf568bbd06d700a43d8719f4179179a9a96e7a809da15281cd2485b6608fa22e2bb8d43cb36140d91242ed281d7034a790c1bf SHA512 fc0cf492b9ca9f8937dc5ac432954245ffb6e1225c51d350efe6546535e42efd5a551028cfdc0c1cf0a1561aa5bb02d6b238ab485a8c8ba1500cbf7064c683ea
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-DIST portage-3.0.20-bug-777492-209be9a.patch 1758 BLAKE2B 9ed7b18ef8b73c59a08e5a2c2fba9365b37bd8cace32d5a275a4003cbf3f40f6a0a5a4d168dae987169e2017222a3af291d9a860a4494c994ef51ca851620db1 SHA512 38f402d1ecf125af7c454afdcee12221fa715f4e043c1a59073422025a12508a06a4bb77503bb75f6ed9603ff507499558bc1032157f5fc0aee9573bb18a6e4b
-DIST portage-3.0.20-bug-777492-a4d8829.patch 4549 BLAKE2B 9023c7bd3d173b48e1bfcf6d48c87f6b01731d6ec154132797c820a4c24ffedcaaf2eabf380d08c43238b377cb33c1be090fe8d213f8aef39b813ba2fab25672 SHA512 5575015216534bc0ddc0aa79bd2c1a96180d40dd8b3df61bb95e49a2d86e60da10a5eb8d658bf616da3f3f15ff6f4377d82e72ceca770304d2d79f1f25a26a11
-DIST portage-3.0.20-bug-796584-693f6bf.patch 2335 BLAKE2B 4922fad1fc34977b786555f1811e7b3b80e910bb940492eb735e95349f2ebb6c6f52642908fdc49e87c5f8b14f9171c8f32c627fe5ab472e645d5bc41c55bf33 SHA512 4032aef8de565e9ab166bf0f1b0fe4b4aec755eac4b8960dde57f89e08b00609a33cdce56f0f469292facb46aa088da4f3465cec935811cae4d00cca2254763b
-DIST portage-3.0.20-bug-796812-2ce11f0.patch 1292 BLAKE2B b7ca91f6d24e0eaf398ecdae8534ba19f88649ae91316a1cf074a04755a433038c04be49bce4d06306a03e25f7b83899205b971e40fba9248a56d5e65c48a2a8 SHA512 7de6d01d35e6e65be631a31e886b0b7d56d87211aeb1d5d3b8a60c3c6c510db368cca9280ea430675fd101434a15b3d1aef47d2a1d90a28fb634de46c2152768
-DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 9ffcf396b983accef3263efa9f7a6d515cb5b669643abc5dfe610577abec80713d8a202950d37ed78625446f2db37559639002745dea7cc973d47f8befadca06 SHA512 f4cdf3dec98f7ba7da4d5454f4e75408b64934f59e4e1fc9f391a8fe4832b03c4598eef0affba01a415bcc2135d09d682fa612116ed1dbd753783268af243aa8
 DIST portage-3.0.28-setuptools-install-depr.patch 1191 BLAKE2B 1601b8943be27fbebea8bfc5e927e9ba6c5e18b6b76a89f8b2b8525595f4693fe014d0bfd936b513a5d03524aba64797ef1bb1e85b0965426a6f36b6c9e9e07c SHA512 bb06c3f705e4a3e6fcc170fe36aa522184c573ef6e05dea3678ff9158472722d1b68fc480b89f4656786e024be6c5f6f656c386aeda467744bf8e9acdb6ffef5
 DIST portage-3.0.28.tar.bz2 1153994 BLAKE2B 8d9e3af04acd9bb5fdb3cff5b928abbf707db13f6c25afdac4399ea47adb67b2621ebb733927b4f9386e3f285fa7daac0423ae3fb0509a9df747b41c82865313 SHA512 148484b0384672116f2f2187eaddb56f646548324cd5f6c8e187a02bc965fb2bea6632214aed9b40c615acb89eb6124ab831ad85c59bac9a416b02a07506669b
-EBUILD portage-3.0.20.ebuild 10548 BLAKE2B b9a291335494091efdf19901f47bcd29f907dd63aec65ae1f3be84a289faa8764e70a7bfeda7b439467cb3b8611f25693bdba96dcba02efb04cce399acc10a7c SHA512 bbbf59ebe8a744e29020246645d24f12d62f08c5df87f662f8b5b49958e9b1df8c24235622113647fadc64f8c1cc5f8964d9afdade0d65885010009e0ddca778
 EBUILD portage-3.0.23.ebuild 9194 BLAKE2B 6f431c48d77629c17989178aa142506634134729e3bc4ecbcd146965fe0a144fbf0f603ef088f1b5f6afeeb50efd62a7a93fa73e8b888ac857b9300524554f47 SHA512 8ef955c59b3d3009a80cdb3bab5c7e2dddc6d91d56ee99ff967c7a489ea2e1564091176d7df7792a86d6644efc6b31d39241ce56aeb776c55031b7dd3cf051a9
 EBUILD portage-3.0.28.ebuild 9519 BLAKE2B 3972e8c02eea3cfee9bfc4ce75467abee6a69b7007b60df608e34291c171ee0598b18043a0dfe5e8cbbc35cc08258bc4245f7f063ef89ce52fdce0da9c40935c SHA512 8a20e7d2feaaf5ebcab2407f81d691935d98592b44cc3b645839f2336be08bedd1133bdeec85244c91db1883892736f26ce272810b7c2ee232517e571050ed42
 EBUILD portage-3.0.30.ebuild 9370 BLAKE2B c77fcdd1b0b80c0a398ae06272c9b97b680db6e4c49ad3a2d916682a048aef076c5247f8ed21d56981555325e7f7651e13ffb3b5910b02afd778dca1cdb4975b SHA512 0e364ba2730d372b39d8ed04996a2f17e4557c90f8d5eb5e425fbc790b721ebf2e0a2f5f12ece6d24205e5be3065fc812d9c5258e403cab6b78eb900d2c7a08c

diff --git a/sys-apps/portage/portage-3.0.20.ebuild b/sys-apps/portage/portage-3.0.20.ebuild
deleted file mode 100644
index 6928e13c2..000000000
--- a/sys-apps/portage/portage-3.0.20.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
-
-EGIT_REPO_URI="https://github.com/TommyD/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="2be6680750aee41ae5c9eaaade8d8a924e842066"
-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 ~sparc ~x86"
-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 )
-	>=sys-apps/abi-wrapper-1.0-r6
-	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="
-	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: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? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=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
-	) )
-	!<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
-
-SRC_URI="
-	https://github.com/gentoo/portage/commit/a4d882964ee1931462f911d0c46a80e27e59fa48.patch -> portage-3.0.20-bug-777492-a4d8829.patch
-	https://github.com/gentoo/portage/commit/209be9a8bee13384dd04a4762436b4c2a5e35bc6.patch -> portage-3.0.20-bug-777492-209be9a.patch
-	https://github.com/gentoo/portage/compare/8e47286b7082aac21fe25402a1f9d03db968cd30...693f6bf5a54e2424e2ad49e1838b61f76bf78e40.patch -> portage-3.0.20-bug-796584-693f6bf.patch
-	https://github.com/gentoo/portage/commit/2ce11f06e48290efb2d4b6743c8edf01c176b0fc.patch -> portage-3.0.20-bug-796812-2ce11f0.patch
-	https://github.com/gentoo/portage/compare/2ce11f06e48290efb2d4b6743c8edf01c176b0fc...c3e4919fd004ce0f5c91c67ea377bbda83558ca9.patch -> portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Revert due to regressions:
-	# https://bugs.gentoo.org/777492
-	# https://github.com/gentoo/portage/pull/728
-	eapply -R "${DISTDIR}/portage-3.0.20-bug-777492-209be9a.patch"
-	eapply -R "${DISTDIR}/portage-3.0.20-bug-777492-a4d8829.patch"
-
-	# Apply regression fix for https://bugs.gentoo.org/796584.
-	eapply "${DISTDIR}/portage-3.0.20-bug-796584-693f6bf.patch"
-
-	# Apply EAPI 8 fix for https://bugs.gentoo.org/796812.
-	eapply "${DISTDIR}/portage-3.0.20-bug-796812-2ce11f0.patch"
-
-	# Apply EAPI 8 fix for https://bugs.gentoo.org/796959
-	eapply "${DISTDIR}/portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch"
-
-	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 ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		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
-
-	dotmpfiles "${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 -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-	env -u FEATURES -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || 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
-}
-
-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 ""
-}

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

[Thomas Sachau]

commit:     3f0eba8efc528e9bc8c1b7bab9b5c357901bab45
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 14:01:39 2023 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat May 20 14:01:39 2023 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=3f0eba8e

sys-apps/portage: add 3.0.34

Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |  14 +-
 sys-apps/portage/portage-3.0.34.ebuild | 293 +++++++++++++++++++++++++++++++++
 2 files changed, 294 insertions(+), 13 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c0863e2b8..eb0de3954 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 3.0.30-revert-default-enable-soname-dependencies.patch 2342 BLAKE2B 3852da2110ef498700e113495daf568bbd06d700a43d8719f4179179a9a96e7a809da15281cd2485b6608fa22e2bb8d43cb36140d91242ed281d7034a790c1bf SHA512 fc0cf492b9ca9f8937dc5ac432954245ffb6e1225c51d350efe6546535e42efd5a551028cfdc0c1cf0a1561aa5bb02d6b238ab485a8c8ba1500cbf7064c683ea
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
@@ -15,14 +12,5 @@ EBUILD portage-3.0.20.ebuild 10548 BLAKE2B b9a291335494091efdf19901f47bcd29f907d
 EBUILD portage-3.0.23.ebuild 9194 BLAKE2B 6f431c48d77629c17989178aa142506634134729e3bc4ecbcd146965fe0a144fbf0f603ef088f1b5f6afeeb50efd62a7a93fa73e8b888ac857b9300524554f47 SHA512 8ef955c59b3d3009a80cdb3bab5c7e2dddc6d91d56ee99ff967c7a489ea2e1564091176d7df7792a86d6644efc6b31d39241ce56aeb776c55031b7dd3cf051a9
 EBUILD portage-3.0.28.ebuild 9519 BLAKE2B 3972e8c02eea3cfee9bfc4ce75467abee6a69b7007b60df608e34291c171ee0598b18043a0dfe5e8cbbc35cc08258bc4245f7f063ef89ce52fdce0da9c40935c SHA512 8a20e7d2feaaf5ebcab2407f81d691935d98592b44cc3b645839f2336be08bedd1133bdeec85244c91db1883892736f26ce272810b7c2ee232517e571050ed42
 EBUILD portage-3.0.30.ebuild 9370 BLAKE2B c77fcdd1b0b80c0a398ae06272c9b97b680db6e4c49ad3a2d916682a048aef076c5247f8ed21d56981555325e7f7651e13ffb3b5910b02afd778dca1cdb4975b SHA512 0e364ba2730d372b39d8ed04996a2f17e4557c90f8d5eb5e425fbc790b721ebf2e0a2f5f12ece6d24205e5be3065fc812d9c5258e403cab6b78eb900d2c7a08c
+EBUILD portage-3.0.34.ebuild 9480 BLAKE2B d431b911a224ce672154bf136c11642c2205fa25dee87e446a7111ec6e1ecd09666849373f1817a9d4adc648a743dcc311783d8bec1c6b6af60d03fd4dd83916 SHA512 bf3c6159cff3015cc1102b19e0a7d4b87230709ffaa104a24ed55e04c16981aca81cb8c18d383155bedef723e2a0538fd9d78ee365793be1eec50850293ec11e
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
------BEGIN PGP SIGNATURE-----
-
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmMcocBfFIAAAAAALgAo
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
-MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGcvTwP/TFJpJeTw8ZnQN+W1qM6AWE5lgxppqF4xR+NnPt1bbVUNC4WBXrya1AnB
-f6WiObAWgS7AYkqOe+WfHbBT98klQol+XXZVPY+Hn8m0JoU7h9yjtsAMyTep2GRB
-Zd7o4k5vK139sZl5y5/XQ7f4RszhQvc0G/FTu9ovpCwMJREpLM4=
-=+g+3
------END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.34.ebuild b/sys-apps/portage/portage-3.0.34.ebuild
new file mode 100644
index 000000000..e7d5e4d35
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.34.ebuild
@@ -0,0 +1,293 @@
+# 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 git-r3 linux-info toolchain-funcs multilib tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+EGIT_REPO_URI="https://github.com/TommyD/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="3b6ad9bd495bb1d31c330133e069fa3140bcbe8c"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+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 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 )
+	>=sys-apps/abi-wrapper-1.0-r6
+	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="
+	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? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=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
+	) )
+	!<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
+	!~app-portage/repoman-3.0.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/file-5.41
+		>=sys-apps/coreutils-6.4
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	if use native-extensions && tc-is-cross-compiler; then
+		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
+	fi
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	local PATCHES=(
+	)
+
+	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} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> 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
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		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
+
+	dotmpfiles "${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() {
+	if ! use build; then
+		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 -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+		env -u FEATURES -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+	fi
+
+	# 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
+}
+
+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 ""
+}

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

[Thomas Sachau]

commit:     de9c5db81686a9d68f6121a0783b3e09416279d9
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 14:40:07 2022 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 14:41:44 2022 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=de9c5db8

sys-apps/portage: Update EGIT_REPO_URI

Package-Manager: Portage-3.0.34, Repoman-3.0.3
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              | 18 +++++++++---------
 sys-apps/portage/portage-3.0.20.ebuild |  2 +-
 sys-apps/portage/portage-3.0.23.ebuild |  2 +-
 sys-apps/portage/portage-3.0.28.ebuild |  2 +-
 sys-apps/portage/portage-3.0.30.ebuild |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b77100aa6..c0863e2b8 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -11,18 +11,18 @@ DIST portage-3.0.20-bug-796812-2ce11f0.patch 1292 BLAKE2B b7ca91f6d24e0eaf398ecd
 DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 9ffcf396b983accef3263efa9f7a6d515cb5b669643abc5dfe610577abec80713d8a202950d37ed78625446f2db37559639002745dea7cc973d47f8befadca06 SHA512 f4cdf3dec98f7ba7da4d5454f4e75408b64934f59e4e1fc9f391a8fe4832b03c4598eef0affba01a415bcc2135d09d682fa612116ed1dbd753783268af243aa8
 DIST portage-3.0.28-setuptools-install-depr.patch 1191 BLAKE2B 1601b8943be27fbebea8bfc5e927e9ba6c5e18b6b76a89f8b2b8525595f4693fe014d0bfd936b513a5d03524aba64797ef1bb1e85b0965426a6f36b6c9e9e07c SHA512 bb06c3f705e4a3e6fcc170fe36aa522184c573ef6e05dea3678ff9158472722d1b68fc480b89f4656786e024be6c5f6f656c386aeda467744bf8e9acdb6ffef5
 DIST portage-3.0.28.tar.bz2 1153994 BLAKE2B 8d9e3af04acd9bb5fdb3cff5b928abbf707db13f6c25afdac4399ea47adb67b2621ebb733927b4f9386e3f285fa7daac0423ae3fb0509a9df747b41c82865313 SHA512 148484b0384672116f2f2187eaddb56f646548324cd5f6c8e187a02bc965fb2bea6632214aed9b40c615acb89eb6124ab831ad85c59bac9a416b02a07506669b
-EBUILD portage-3.0.20.ebuild 10558 BLAKE2B cf023ea7bd0ccca2fae50869e9b6ebf2b944714f4058f17b55b42ade66272390c986ebbd55bb43ca4b0a03d3e4b89083f3f5b64f842835a5e1ec8cde967d5de9 SHA512 7f4e7c54476bb25b7890cce87a8b12fe554882df0a88e1b59bbb35d485aadca226fc88fabdfe04c4c55dd79989ccea975d7a8beaa543694c56d3f5a34cf47f22
-EBUILD portage-3.0.23.ebuild 9204 BLAKE2B 81b345b0334473ee1d4608f4ecf536cfc4fb82c209fac385491aa0d122cc49f37d646c9879d190e2b6211be419c99ef56f12ae2ed4073fb207ce62a3aeb3f745 SHA512 b15e87fe5261241a899f8d36eda06d82a539b4e83809e576a275b832608eb3ea1705e7ad5a99d0910a20245a644379fc96e4d213a792e57349a55ebdbec5b928
-EBUILD portage-3.0.28.ebuild 9529 BLAKE2B 499c3e5177925bb8dd6f09a4903945b3f488a9c33d4b32b26b64f26a2b6c5d9d81a685755021f6d13840acab8148fd61ba5cfeda9ad37415f048e8befa490813 SHA512 4a37a197ac2f497b2061ae9286fbd4f38857b16af0d1ae452f0bb50f5e1506bd42f7fbaea5b5b4c1012e594c6488388fe305df24ca37209f5cb5ca7abaf07d2d
-EBUILD portage-3.0.30.ebuild 9380 BLAKE2B caf264cd2ae25e8441f6d7407f532814a6c55b899e83b5acf6089934eb92e064c5020a6548dbb4b42e11aa1768e39aea07853d040d3ddd6faa8b3571bacb102c SHA512 79788509230fa9654b999640dd59912c41a930603cada3ae80bb6fc7818f1a69a93d2333e041c5d05184b666ba4cdeadb95786d8a89e3af49377ee3d683d14bd
+EBUILD portage-3.0.20.ebuild 10548 BLAKE2B b9a291335494091efdf19901f47bcd29f907dd63aec65ae1f3be84a289faa8764e70a7bfeda7b439467cb3b8611f25693bdba96dcba02efb04cce399acc10a7c SHA512 bbbf59ebe8a744e29020246645d24f12d62f08c5df87f662f8b5b49958e9b1df8c24235622113647fadc64f8c1cc5f8964d9afdade0d65885010009e0ddca778
+EBUILD portage-3.0.23.ebuild 9194 BLAKE2B 6f431c48d77629c17989178aa142506634134729e3bc4ecbcd146965fe0a144fbf0f603ef088f1b5f6afeeb50efd62a7a93fa73e8b888ac857b9300524554f47 SHA512 8ef955c59b3d3009a80cdb3bab5c7e2dddc6d91d56ee99ff967c7a489ea2e1564091176d7df7792a86d6644efc6b31d39241ce56aeb776c55031b7dd3cf051a9
+EBUILD portage-3.0.28.ebuild 9519 BLAKE2B 3972e8c02eea3cfee9bfc4ce75467abee6a69b7007b60df608e34291c171ee0598b18043a0dfe5e8cbbc35cc08258bc4245f7f063ef89ce52fdce0da9c40935c SHA512 8a20e7d2feaaf5ebcab2407f81d691935d98592b44cc3b645839f2336be08bedd1133bdeec85244c91db1883892736f26ce272810b7c2ee232517e571050ed42
+EBUILD portage-3.0.30.ebuild 9370 BLAKE2B c77fcdd1b0b80c0a398ae06272c9b97b680db6e4c49ad3a2d916682a048aef076c5247f8ed21d56981555325e7f7651e13ffb3b5910b02afd778dca1cdb4975b SHA512 0e364ba2730d372b39d8ed04996a2f17e4557c90f8d5eb5e425fbc790b721ebf2e0a2f5f12ece6d24205e5be3065fc812d9c5258e403cab6b78eb900d2c7a08c
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4aclfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmMcocBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGePFwP+KMcs8dXvfJwTDZyZZFfAfYtQecj551E1LJx0xsQjOtzounWPFE4LE1Li
-fvM0+/UNE65sfTz8bcef21VxEgoB4KcLhh+qk6NHYLwjUuv9uwktOx9OJJyvM4/h
-kXcSfIUDKoSPojI3v1+MJtnVnVlSUbVb/o798jzYAogyD1Clb1A=
-=+3Vx
+kGcvTwP/TFJpJeTw8ZnQN+W1qM6AWE5lgxppqF4xR+NnPt1bbVUNC4WBXrya1AnB
+f6WiObAWgS7AYkqOe+WfHbBT98klQol+XXZVPY+Hn8m0JoU7h9yjtsAMyTep2GRB
+Zd7o4k5vK139sZl5y5/XQ7f4RszhQvc0G/FTu9ovpCwMJREpLM4=
+=+g+3
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.20.ebuild b/sys-apps/portage/portage-3.0.20.ebuild
index c99ca3586..6928e13c2 100644
--- a/sys-apps/portage/portage-3.0.20.ebuild
+++ b/sys-apps/portage/portage-3.0.20.ebuild
@@ -10,7 +10,7 @@ TMPFILES_OPTIONAL=1
 
 inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
 
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+EGIT_REPO_URI="https://github.com/TommyD/portage.git"
 EGIT_BRANCH="multilib"
 EGIT_COMMIT="2be6680750aee41ae5c9eaaade8d8a924e842066"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"

diff --git a/sys-apps/portage/portage-3.0.23.ebuild b/sys-apps/portage/portage-3.0.23.ebuild
index f2df1b479..8aca06b7a 100644
--- a/sys-apps/portage/portage-3.0.23.ebuild
+++ b/sys-apps/portage/portage-3.0.23.ebuild
@@ -11,7 +11,7 @@ TMPFILES_OPTIONAL=1
 inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
 
 DESCRIPTION="The package management and distribution system for Gentoo"
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+EGIT_REPO_URI="https://github.com/TommyD/portage.git"
 EGIT_BRANCH="multilib"
 EGIT_COMMIT="a7727547b795a3399883a2b7547657d43978d783"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"

diff --git a/sys-apps/portage/portage-3.0.28.ebuild b/sys-apps/portage/portage-3.0.28.ebuild
index 0d48c8c94..7d986e237 100644
--- a/sys-apps/portage/portage-3.0.28.ebuild
+++ b/sys-apps/portage/portage-3.0.28.ebuild
@@ -10,7 +10,7 @@ TMPFILES_OPTIONAL=1
 inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
 
 DESCRIPTION="The package management and distribution system for Gentoo"
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+EGIT_REPO_URI="https://github.com/TommyD/portage.git"
 EGIT_BRANCH="multilib"
 EGIT_COMMIT="e2085b63a9063d3a548347ec37f0a8448e6d35e7"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"

diff --git a/sys-apps/portage/portage-3.0.30.ebuild b/sys-apps/portage/portage-3.0.30.ebuild
index 179f67e33..0b979c1fe 100644
--- a/sys-apps/portage/portage-3.0.30.ebuild
+++ b/sys-apps/portage/portage-3.0.30.ebuild
@@ -10,7 +10,7 @@ TMPFILES_OPTIONAL=1
 inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
 
 DESCRIPTION="The package management and distribution system for Gentoo"
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+EGIT_REPO_URI="https://github.com/TommyD/portage.git"
 EGIT_BRANCH="multilib"
 EGIT_COMMIT="a5893dcca4aae2fdcccbcb6578bf48c203f5e1d9"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"

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

[Thomas Sachau]

commit:     1d123c2829ccf732a41af929074d3d98f30a7969
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 12:04:09 2022 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 12:04:09 2022 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=1d123c28

sys-apps/portage: Drop old version 3.0.26

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |  11 +-
 sys-apps/portage/portage-3.0.26.ebuild | 283 ---------------------------------
 2 files changed, 5 insertions(+), 289 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index eff6f4274..b4496e423 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -13,18 +13,17 @@ DIST portage-3.0.28-setuptools-install-depr.patch 1191 BLAKE2B 1601b8943be27fbeb
 DIST portage-3.0.28.tar.bz2 1153994 BLAKE2B 8d9e3af04acd9bb5fdb3cff5b928abbf707db13f6c25afdac4399ea47adb67b2621ebb733927b4f9386e3f285fa7daac0423ae3fb0509a9df747b41c82865313 SHA512 148484b0384672116f2f2187eaddb56f646548324cd5f6c8e187a02bc965fb2bea6632214aed9b40c615acb89eb6124ab831ad85c59bac9a416b02a07506669b
 EBUILD portage-3.0.20.ebuild 10558 BLAKE2B cf023ea7bd0ccca2fae50869e9b6ebf2b944714f4058f17b55b42ade66272390c986ebbd55bb43ca4b0a03d3e4b89083f3f5b64f842835a5e1ec8cde967d5de9 SHA512 7f4e7c54476bb25b7890cce87a8b12fe554882df0a88e1b59bbb35d485aadca226fc88fabdfe04c4c55dd79989ccea975d7a8beaa543694c56d3f5a34cf47f22
 EBUILD portage-3.0.23.ebuild 9204 BLAKE2B 81b345b0334473ee1d4608f4ecf536cfc4fb82c209fac385491aa0d122cc49f37d646c9879d190e2b6211be419c99ef56f12ae2ed4073fb207ce62a3aeb3f745 SHA512 b15e87fe5261241a899f8d36eda06d82a539b4e83809e576a275b832608eb3ea1705e7ad5a99d0910a20245a644379fc96e4d213a792e57349a55ebdbec5b928
-EBUILD portage-3.0.26.ebuild 9205 BLAKE2B c924bca8c7f639d882096f08a1b51cc1287f9228f778dfe4605b2035ead78cc629160f6888c0e0d07c3a1d962c429fe8bf4cca75a8339a31cf9ac84ac4fb2586 SHA512 02425fc3585580866f740831d64c7e2f43c02cd9571d98a605ee3aad1c290a5130111936ec52bdd4bbbff23024bf2bf96d0088166977bbb076c08756db752b0d
 EBUILD portage-3.0.28.ebuild 9529 BLAKE2B 499c3e5177925bb8dd6f09a4903945b3f488a9c33d4b32b26b64f26a2b6c5d9d81a685755021f6d13840acab8148fd61ba5cfeda9ad37415f048e8befa490813 SHA512 4a37a197ac2f497b2061ae9286fbd4f38857b16af0d1ae452f0bb50f5e1506bd42f7fbaea5b5b4c1012e594c6488388fe305df24ca37209f5cb5ca7abaf07d2d
 EBUILD portage-3.0.29.ebuild 9267 BLAKE2B 87e4bee8b06cbb5c75fa9ce5668d921b3cdaba9cefb178c7f3f37155e855ebdb2d1d2691be069d531f6e4495a469bf2a268ac7f0c551b71afc9558803d96ac00 SHA512 de0a7a48dbb616158f8add0b7c0b86dee8b388da0a30420b2b128f2d67bebce723b16bfd924564e52f2a4e5e500ba1b5d6d6eeba18b0fc5cdf8e4fa4d4c6bf2c
 EBUILD portage-3.0.30.ebuild 9380 BLAKE2B caf264cd2ae25e8441f6d7407f532814a6c55b899e83b5acf6089934eb92e064c5020a6548dbb4b42e11aa1768e39aea07853d040d3ddd6faa8b3571bacb102c SHA512 79788509230fa9654b999640dd59912c41a930603cada3ae80bb6fc7818f1a69a93d2333e041c5d05184b666ba4cdeadb95786d8a89e3af49377ee3d683d14bd
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4aaVfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4ablfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGcqzQP9HwNWC3jNNtXXk5fUsj8iXQvg5ZmfgZTvzruHwUOqjLyefrNhVJpfGMlg
-yeGwDt6ZhWtrKp8kyi0Nc73KXkY6EzTCkXVAVc1g0WMki+jFCQWsbVZB3wDn1lJM
-1A08uDWRtHLzK4NzPPPLApYzPyOI+wCkwYvJ+9bbZnD9nRCYA0E=
-=t7X7
+kGfxHAP/fTAm02j5NBzfRvs2Ogwyy+KgfaUjqm9OgG9Z/To6FoUTcDqWi+6KIQOZ
+14cZ8gTJT4QndQ7EpCg4Lt5OIKz89i/vVAkZpN/KGxbvdiLCAswYmAU8C80P2T+M
+7z7DzQIZVCVYETy+RjzUbEyblJv0jSss+9+tKcIX2nEmUz+h39I=
+=OpBw
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.26.ebuild b/sys-apps/portage/portage-3.0.26.ebuild
deleted file mode 100644
index 6e7b4a14b..000000000
--- a/sys-apps/portage/portage-3.0.26.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="ce24ddf9e0a9ba9e86f9ccf38004559c6367d756"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-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 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 )
-	>=sys-apps/abi-wrapper-1.0-r6
-	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="
-	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? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=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
-	) )
-	!<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
-	!~app-portage/repoman-3.0.0"
-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
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_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} ipc-sandbox network-sandbox 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 ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		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
-
-	dotmpfiles "${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 -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-	env -u FEATURES -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || 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
-}
-
-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 ""
-}

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

[Thomas Sachau]

commit:     1e79f9aef040bc31d9dfd17da3b7f444a9f7fdbe
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 12:03:49 2022 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 12:03:49 2022 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=1e79f9ae

sys-apps/portage: Drop old version 3.0.24

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |  11 +-
 sys-apps/portage/portage-3.0.24.ebuild | 283 ---------------------------------
 2 files changed, 5 insertions(+), 289 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f1e540710..eff6f4274 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -13,7 +13,6 @@ DIST portage-3.0.28-setuptools-install-depr.patch 1191 BLAKE2B 1601b8943be27fbeb
 DIST portage-3.0.28.tar.bz2 1153994 BLAKE2B 8d9e3af04acd9bb5fdb3cff5b928abbf707db13f6c25afdac4399ea47adb67b2621ebb733927b4f9386e3f285fa7daac0423ae3fb0509a9df747b41c82865313 SHA512 148484b0384672116f2f2187eaddb56f646548324cd5f6c8e187a02bc965fb2bea6632214aed9b40c615acb89eb6124ab831ad85c59bac9a416b02a07506669b
 EBUILD portage-3.0.20.ebuild 10558 BLAKE2B cf023ea7bd0ccca2fae50869e9b6ebf2b944714f4058f17b55b42ade66272390c986ebbd55bb43ca4b0a03d3e4b89083f3f5b64f842835a5e1ec8cde967d5de9 SHA512 7f4e7c54476bb25b7890cce87a8b12fe554882df0a88e1b59bbb35d485aadca226fc88fabdfe04c4c55dd79989ccea975d7a8beaa543694c56d3f5a34cf47f22
 EBUILD portage-3.0.23.ebuild 9204 BLAKE2B 81b345b0334473ee1d4608f4ecf536cfc4fb82c209fac385491aa0d122cc49f37d646c9879d190e2b6211be419c99ef56f12ae2ed4073fb207ce62a3aeb3f745 SHA512 b15e87fe5261241a899f8d36eda06d82a539b4e83809e576a275b832608eb3ea1705e7ad5a99d0910a20245a644379fc96e4d213a792e57349a55ebdbec5b928
-EBUILD portage-3.0.24.ebuild 9199 BLAKE2B 6ef7deb3179caec623206e941af071655653cec6b72c88a16fca0c9215a871e772405fc04dcd0157cfbf66204b466cf6f31f3960cb22bb9a909e53b40c20cc93 SHA512 01756c98f699cedb88278f17444d55921da9a8826cdcc38c331ca2dc01740d1874f70829f7a8f5aeb2cf0260bdbee8ee25a317fa559b6dd0f614908239133b04
 EBUILD portage-3.0.26.ebuild 9205 BLAKE2B c924bca8c7f639d882096f08a1b51cc1287f9228f778dfe4605b2035ead78cc629160f6888c0e0d07c3a1d962c429fe8bf4cca75a8339a31cf9ac84ac4fb2586 SHA512 02425fc3585580866f740831d64c7e2f43c02cd9571d98a605ee3aad1c290a5130111936ec52bdd4bbbff23024bf2bf96d0088166977bbb076c08756db752b0d
 EBUILD portage-3.0.28.ebuild 9529 BLAKE2B 499c3e5177925bb8dd6f09a4903945b3f488a9c33d4b32b26b64f26a2b6c5d9d81a685755021f6d13840acab8148fd61ba5cfeda9ad37415f048e8befa490813 SHA512 4a37a197ac2f497b2061ae9286fbd4f38857b16af0d1ae452f0bb50f5e1506bd42f7fbaea5b5b4c1012e594c6488388fe305df24ca37209f5cb5ca7abaf07d2d
 EBUILD portage-3.0.29.ebuild 9267 BLAKE2B 87e4bee8b06cbb5c75fa9ce5668d921b3cdaba9cefb178c7f3f37155e855ebdb2d1d2691be069d531f6e4495a469bf2a268ac7f0c551b71afc9558803d96ac00 SHA512 de0a7a48dbb616158f8add0b7c0b86dee8b388da0a30420b2b128f2d67bebce723b16bfd924564e52f2a4e5e500ba1b5d6d6eeba18b0fc5cdf8e4fa4d4c6bf2c
@@ -21,11 +20,11 @@ EBUILD portage-3.0.30.ebuild 9380 BLAKE2B caf264cd2ae25e8441f6d7407f532814a6c55b
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4aRdfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4aaVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGfYmwP/dohTo87heQAz+9ZhlL6P1f8Z2kg/UwFiUrF3VxhwoFZErWJ4j8EpO5yV
-x59Smqz8HuwpwhWFZYXxBKO5LUa+RKz9erz3MJxJIldGYt+sm4gFDCoqDSuWBX8G
-nCVMbXwRtlFQqFpSJVfSJIpRK6JnPcmyOXddnR1lUbowI8izJ/I=
-=dTBb
+kGcqzQP9HwNWC3jNNtXXk5fUsj8iXQvg5ZmfgZTvzruHwUOqjLyefrNhVJpfGMlg
+yeGwDt6ZhWtrKp8kyi0Nc73KXkY6EzTCkXVAVc1g0WMki+jFCQWsbVZB3wDn1lJM
+1A08uDWRtHLzK4NzPPPLApYzPyOI+wCkwYvJ+9bbZnD9nRCYA0E=
+=t7X7
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.24.ebuild b/sys-apps/portage/portage-3.0.24.ebuild
deleted file mode 100644
index 881cb9137..000000000
--- a/sys-apps/portage/portage-3.0.24.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="ce24ddf9e0a9ba9e86f9ccf38004559c6367d756"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-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 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 )
-	>=sys-apps/abi-wrapper-1.0-r6
-	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="
-	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? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=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
-	) )
-	!<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
-	!~app-portage/repoman-3.0.0"
-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
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_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} ipc-sandbox network-sandbox 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 ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		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
-
-	dotmpfiles "${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 -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-	env -u FEATURES -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || 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
-}
-
-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 ""
-}

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

[Thomas Sachau]

commit:     d4b1a5279d16403ea51a04a83908d2df5e526280
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 12:04:25 2022 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 12:04:25 2022 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=d4b1a527

sys-apps/portage: Drop old version 3.0.29

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |  11 +-
 sys-apps/portage/portage-3.0.29.ebuild | 287 ---------------------------------
 2 files changed, 5 insertions(+), 293 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b4496e423..b77100aa6 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -14,16 +14,15 @@ DIST portage-3.0.28.tar.bz2 1153994 BLAKE2B 8d9e3af04acd9bb5fdb3cff5b928abbf707d
 EBUILD portage-3.0.20.ebuild 10558 BLAKE2B cf023ea7bd0ccca2fae50869e9b6ebf2b944714f4058f17b55b42ade66272390c986ebbd55bb43ca4b0a03d3e4b89083f3f5b64f842835a5e1ec8cde967d5de9 SHA512 7f4e7c54476bb25b7890cce87a8b12fe554882df0a88e1b59bbb35d485aadca226fc88fabdfe04c4c55dd79989ccea975d7a8beaa543694c56d3f5a34cf47f22
 EBUILD portage-3.0.23.ebuild 9204 BLAKE2B 81b345b0334473ee1d4608f4ecf536cfc4fb82c209fac385491aa0d122cc49f37d646c9879d190e2b6211be419c99ef56f12ae2ed4073fb207ce62a3aeb3f745 SHA512 b15e87fe5261241a899f8d36eda06d82a539b4e83809e576a275b832608eb3ea1705e7ad5a99d0910a20245a644379fc96e4d213a792e57349a55ebdbec5b928
 EBUILD portage-3.0.28.ebuild 9529 BLAKE2B 499c3e5177925bb8dd6f09a4903945b3f488a9c33d4b32b26b64f26a2b6c5d9d81a685755021f6d13840acab8148fd61ba5cfeda9ad37415f048e8befa490813 SHA512 4a37a197ac2f497b2061ae9286fbd4f38857b16af0d1ae452f0bb50f5e1506bd42f7fbaea5b5b4c1012e594c6488388fe305df24ca37209f5cb5ca7abaf07d2d
-EBUILD portage-3.0.29.ebuild 9267 BLAKE2B 87e4bee8b06cbb5c75fa9ce5668d921b3cdaba9cefb178c7f3f37155e855ebdb2d1d2691be069d531f6e4495a469bf2a268ac7f0c551b71afc9558803d96ac00 SHA512 de0a7a48dbb616158f8add0b7c0b86dee8b388da0a30420b2b128f2d67bebce723b16bfd924564e52f2a4e5e500ba1b5d6d6eeba18b0fc5cdf8e4fa4d4c6bf2c
 EBUILD portage-3.0.30.ebuild 9380 BLAKE2B caf264cd2ae25e8441f6d7407f532814a6c55b899e83b5acf6089934eb92e064c5020a6548dbb4b42e11aa1768e39aea07853d040d3ddd6faa8b3571bacb102c SHA512 79788509230fa9654b999640dd59912c41a930603cada3ae80bb6fc7818f1a69a93d2333e041c5d05184b666ba4cdeadb95786d8a89e3af49377ee3d683d14bd
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4ablfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4aclfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGfxHAP/fTAm02j5NBzfRvs2Ogwyy+KgfaUjqm9OgG9Z/To6FoUTcDqWi+6KIQOZ
-14cZ8gTJT4QndQ7EpCg4Lt5OIKz89i/vVAkZpN/KGxbvdiLCAswYmAU8C80P2T+M
-7z7DzQIZVCVYETy+RjzUbEyblJv0jSss+9+tKcIX2nEmUz+h39I=
-=OpBw
+kGePFwP+KMcs8dXvfJwTDZyZZFfAfYtQecj551E1LJx0xsQjOtzounWPFE4LE1Li
+fvM0+/UNE65sfTz8bcef21VxEgoB4KcLhh+qk6NHYLwjUuv9uwktOx9OJJyvM4/h
+kXcSfIUDKoSPojI3v1+MJtnVnVlSUbVb/o798jzYAogyD1Clb1A=
+=+3Vx
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.29.ebuild b/sys-apps/portage/portage-3.0.29.ebuild
deleted file mode 100644
index c75ba7a73..000000000
--- a/sys-apps/portage/portage-3.0.29.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="c492a43e90013713e05ba3e0ede1de30dc9a48e2"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-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 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 )
-	>=sys-apps/abi-wrapper-1.0-r6
-	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="
-	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? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=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
-	) )
-	!<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
-	!~app-portage/repoman-3.0.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		>=sys-apps/file-5.41
-		>=sys-apps/coreutils-6.4
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	local PATCHES=(
-	)
-
-	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} ipc-sandbox network-sandbox 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 ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		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
-
-	dotmpfiles "${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 -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-	env -u FEATURES -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || 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
-}
-
-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 ""
-}

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

[Thomas Sachau]

commit:     1e9092b1542a0659ac3ee5bbf1da7fcc17c22819
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 11:45:59 2022 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 11:45:59 2022 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=1e9092b1

sys-apps/portage: Version bump to 3.0.29

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |  11 +-
 sys-apps/portage/portage-3.0.29.ebuild | 287 +++++++++++++++++++++++++++++++++
 2 files changed, 293 insertions(+), 5 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 749da8a06..abafb6dc5 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -15,14 +15,15 @@ EBUILD portage-3.0.23.ebuild 9204 BLAKE2B 81b345b0334473ee1d4608f4ecf536cfc4fb82
 EBUILD portage-3.0.24.ebuild 9199 BLAKE2B 6ef7deb3179caec623206e941af071655653cec6b72c88a16fca0c9215a871e772405fc04dcd0157cfbf66204b466cf6f31f3960cb22bb9a909e53b40c20cc93 SHA512 01756c98f699cedb88278f17444d55921da9a8826cdcc38c331ca2dc01740d1874f70829f7a8f5aeb2cf0260bdbee8ee25a317fa559b6dd0f614908239133b04
 EBUILD portage-3.0.26.ebuild 9205 BLAKE2B c924bca8c7f639d882096f08a1b51cc1287f9228f778dfe4605b2035ead78cc629160f6888c0e0d07c3a1d962c429fe8bf4cca75a8339a31cf9ac84ac4fb2586 SHA512 02425fc3585580866f740831d64c7e2f43c02cd9571d98a605ee3aad1c290a5130111936ec52bdd4bbbff23024bf2bf96d0088166977bbb076c08756db752b0d
 EBUILD portage-3.0.28.ebuild 9529 BLAKE2B 499c3e5177925bb8dd6f09a4903945b3f488a9c33d4b32b26b64f26a2b6c5d9d81a685755021f6d13840acab8148fd61ba5cfeda9ad37415f048e8befa490813 SHA512 4a37a197ac2f497b2061ae9286fbd4f38857b16af0d1ae452f0bb50f5e1506bd42f7fbaea5b5b4c1012e594c6488388fe305df24ca37209f5cb5ca7abaf07d2d
+EBUILD portage-3.0.29.ebuild 9267 BLAKE2B 87e4bee8b06cbb5c75fa9ce5668d921b3cdaba9cefb178c7f3f37155e855ebdb2d1d2691be069d531f6e4495a469bf2a268ac7f0c551b71afc9558803d96ac00 SHA512 de0a7a48dbb616158f8add0b7c0b86dee8b388da0a30420b2b128f2d67bebce723b16bfd924564e52f2a4e5e500ba1b5d6d6eeba18b0fc5cdf8e4fa4d4c6bf2c
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4Y79fFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4ZXdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGdAcAP5AXXsJufD+yW3pCCYBIGAUR5kR3qDThHBWpoaxJt7QkP90yYeaknYrvf/
-LgfkcoW420lTu0hlxCG2Y+o4Gq9vSWJKCzFI3RD5DwvhY/GS7XdNNrUhI+GSxhcU
-DATopf7yN5FDWQFuZ1/alyLcOPdugzgXpnBTWbrGDop5E+VVfTc=
-=MS/k
+kGf7uQP/T+/7X12Raztv6FqtVkgDHdU01UE3sgzmvjRTeEnEsVsFiB2tHP0XxHJJ
+1qkM8tyRPhOB3iuQf2IAj2NARNNtX3IqlWtkWsAZqm0ojHCmiM00LJj49PsOnwbG
+4Qj1jndHscmIKnZ07ECd6m0kr9+yEozenzqoBSLGgFcJacDzxIc=
+=woLh
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.29.ebuild b/sys-apps/portage/portage-3.0.29.ebuild
new file mode 100644
index 000000000..c75ba7a73
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.29.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="c492a43e90013713e05ba3e0ede1de30dc9a48e2"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+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 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 )
+	>=sys-apps/abi-wrapper-1.0-r6
+	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="
+	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? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=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
+	) )
+	!<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
+	!~app-portage/repoman-3.0.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/file-5.41
+		>=sys-apps/coreutils-6.4
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	local PATCHES=(
+	)
+
+	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} ipc-sandbox network-sandbox 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 ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		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
+
+	dotmpfiles "${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 -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+	env -u FEATURES -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || 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
+}
+
+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 ""
+}

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

[Thomas Sachau]

commit:     b14d533643287ba7c6b26d467dd781c0a7ab0f4b
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 11:38:39 2022 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 11:38:39 2022 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=b14d5336

sys-apps/portage: Version bump to 3.0.28

Package-Manager: Portage-3.0.24, Repoman-3.0.3
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |  13 +-
 sys-apps/portage/portage-3.0.28.ebuild | 292 +++++++++++++++++++++++++++++++++
 2 files changed, 300 insertions(+), 5 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 97718bf2c..749da8a06 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -8,18 +8,21 @@ DIST portage-3.0.20-bug-777492-a4d8829.patch 4549 BLAKE2B 9023c7bd3d173b48e1bfcf
 DIST portage-3.0.20-bug-796584-693f6bf.patch 2335 BLAKE2B 4922fad1fc34977b786555f1811e7b3b80e910bb940492eb735e95349f2ebb6c6f52642908fdc49e87c5f8b14f9171c8f32c627fe5ab472e645d5bc41c55bf33 SHA512 4032aef8de565e9ab166bf0f1b0fe4b4aec755eac4b8960dde57f89e08b00609a33cdce56f0f469292facb46aa088da4f3465cec935811cae4d00cca2254763b
 DIST portage-3.0.20-bug-796812-2ce11f0.patch 1292 BLAKE2B b7ca91f6d24e0eaf398ecdae8534ba19f88649ae91316a1cf074a04755a433038c04be49bce4d06306a03e25f7b83899205b971e40fba9248a56d5e65c48a2a8 SHA512 7de6d01d35e6e65be631a31e886b0b7d56d87211aeb1d5d3b8a60c3c6c510db368cca9280ea430675fd101434a15b3d1aef47d2a1d90a28fb634de46c2152768
 DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 9ffcf396b983accef3263efa9f7a6d515cb5b669643abc5dfe610577abec80713d8a202950d37ed78625446f2db37559639002745dea7cc973d47f8befadca06 SHA512 f4cdf3dec98f7ba7da4d5454f4e75408b64934f59e4e1fc9f391a8fe4832b03c4598eef0affba01a415bcc2135d09d682fa612116ed1dbd753783268af243aa8
+DIST portage-3.0.28-setuptools-install-depr.patch 1191 BLAKE2B 1601b8943be27fbebea8bfc5e927e9ba6c5e18b6b76a89f8b2b8525595f4693fe014d0bfd936b513a5d03524aba64797ef1bb1e85b0965426a6f36b6c9e9e07c SHA512 bb06c3f705e4a3e6fcc170fe36aa522184c573ef6e05dea3678ff9158472722d1b68fc480b89f4656786e024be6c5f6f656c386aeda467744bf8e9acdb6ffef5
+DIST portage-3.0.28.tar.bz2 1153994 BLAKE2B 8d9e3af04acd9bb5fdb3cff5b928abbf707db13f6c25afdac4399ea47adb67b2621ebb733927b4f9386e3f285fa7daac0423ae3fb0509a9df747b41c82865313 SHA512 148484b0384672116f2f2187eaddb56f646548324cd5f6c8e187a02bc965fb2bea6632214aed9b40c615acb89eb6124ab831ad85c59bac9a416b02a07506669b
 EBUILD portage-3.0.20.ebuild 10558 BLAKE2B cf023ea7bd0ccca2fae50869e9b6ebf2b944714f4058f17b55b42ade66272390c986ebbd55bb43ca4b0a03d3e4b89083f3f5b64f842835a5e1ec8cde967d5de9 SHA512 7f4e7c54476bb25b7890cce87a8b12fe554882df0a88e1b59bbb35d485aadca226fc88fabdfe04c4c55dd79989ccea975d7a8beaa543694c56d3f5a34cf47f22
 EBUILD portage-3.0.23.ebuild 9204 BLAKE2B 81b345b0334473ee1d4608f4ecf536cfc4fb82c209fac385491aa0d122cc49f37d646c9879d190e2b6211be419c99ef56f12ae2ed4073fb207ce62a3aeb3f745 SHA512 b15e87fe5261241a899f8d36eda06d82a539b4e83809e576a275b832608eb3ea1705e7ad5a99d0910a20245a644379fc96e4d213a792e57349a55ebdbec5b928
 EBUILD portage-3.0.24.ebuild 9199 BLAKE2B 6ef7deb3179caec623206e941af071655653cec6b72c88a16fca0c9215a871e772405fc04dcd0157cfbf66204b466cf6f31f3960cb22bb9a909e53b40c20cc93 SHA512 01756c98f699cedb88278f17444d55921da9a8826cdcc38c331ca2dc01740d1874f70829f7a8f5aeb2cf0260bdbee8ee25a317fa559b6dd0f614908239133b04
 EBUILD portage-3.0.26.ebuild 9205 BLAKE2B c924bca8c7f639d882096f08a1b51cc1287f9228f778dfe4605b2035ead78cc629160f6888c0e0d07c3a1d962c429fe8bf4cca75a8339a31cf9ac84ac4fb2586 SHA512 02425fc3585580866f740831d64c7e2f43c02cd9571d98a605ee3aad1c290a5130111936ec52bdd4bbbff23024bf2bf96d0088166977bbb076c08756db752b0d
+EBUILD portage-3.0.28.ebuild 9529 BLAKE2B 499c3e5177925bb8dd6f09a4903945b3f488a9c33d4b32b26b64f26a2b6c5d9d81a685755021f6d13840acab8148fd61ba5cfeda9ad37415f048e8befa490813 SHA512 4a37a197ac2f497b2061ae9286fbd4f38857b16af0d1ae452f0bb50f5e1506bd42f7fbaea5b5b4c1012e594c6488388fe305df24ca37209f5cb5ca7abaf07d2d
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4Yb5fFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4Y79fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGdFvwQAhVqt9V1Warki9E2V8SpLZLralaupe2eOMEZSxAw6AaHZYkv8LAy/2N/D
-oMg9wqITJzF0VD/ss8LSljP0aZ0rKVLYMLohnqE3HDQhNYYkr/KI0A1aqgbqu7HD
-SFPzdlS3vvubHK+m5jyuk6zpV4rfMxyKzPvQXz8Kqmt6pBDotrI=
-=w7jB
+kGdAcAP5AXXsJufD+yW3pCCYBIGAUR5kR3qDThHBWpoaxJt7QkP90yYeaknYrvf/
+LgfkcoW420lTu0hlxCG2Y+o4Gq9vSWJKCzFI3RD5DwvhY/GS7XdNNrUhI+GSxhcU
+DATopf7yN5FDWQFuZ1/alyLcOPdugzgXpnBTWbrGDop5E+VVfTc=
+=MS/k
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.28.ebuild b/sys-apps/portage/portage-3.0.28.ebuild
new file mode 100644
index 000000000..0d48c8c94
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.28.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="e2085b63a9063d3a548347ec37f0a8448e6d35e7"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+SRC_URI="
+	https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2
+	https://gitweb.gentoo.org/proj/portage.git/patch/?id=c309328c4e1f6254251d31149ee47b4266d4d70f
+		-> ${P}-setuptools-install-depr.patch"
+
+LICENSE="GPL-2"
+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 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 )
+	>=sys-apps/abi-wrapper-1.0-r6
+	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="
+	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? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=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
+	) )
+	!<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
+	!~app-portage/repoman-3.0.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/file-5.41
+		>=sys-apps/coreutils-6.4
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	local PATCHES=(
+		"${DISTDIR}"/${P}-setuptools-install-depr.patch
+	)
+
+	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} ipc-sandbox network-sandbox 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 ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		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
+
+	dotmpfiles "${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 -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+	env -u FEATURES -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || 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
+}
+
+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 ""
+}

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

[Thomas Sachau]

commit:     638010c004ed1f2dce17437e175de79392cb4c19
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 11:30:06 2022 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 11:30:06 2022 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=638010c0

sys-apps/portage: Version bump to 3.0.26

Package-Manager: Portage-3.0.24, Repoman-3.0.3
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |  11 +-
 sys-apps/portage/portage-3.0.26.ebuild | 283 +++++++++++++++++++++++++++++++++
 2 files changed, 289 insertions(+), 5 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ab7a3b1d4..97718bf2c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -11,14 +11,15 @@ DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 9ffcf396b983a
 EBUILD portage-3.0.20.ebuild 10558 BLAKE2B cf023ea7bd0ccca2fae50869e9b6ebf2b944714f4058f17b55b42ade66272390c986ebbd55bb43ca4b0a03d3e4b89083f3f5b64f842835a5e1ec8cde967d5de9 SHA512 7f4e7c54476bb25b7890cce87a8b12fe554882df0a88e1b59bbb35d485aadca226fc88fabdfe04c4c55dd79989ccea975d7a8beaa543694c56d3f5a34cf47f22
 EBUILD portage-3.0.23.ebuild 9204 BLAKE2B 81b345b0334473ee1d4608f4ecf536cfc4fb82c209fac385491aa0d122cc49f37d646c9879d190e2b6211be419c99ef56f12ae2ed4073fb207ce62a3aeb3f745 SHA512 b15e87fe5261241a899f8d36eda06d82a539b4e83809e576a275b832608eb3ea1705e7ad5a99d0910a20245a644379fc96e4d213a792e57349a55ebdbec5b928
 EBUILD portage-3.0.24.ebuild 9199 BLAKE2B 6ef7deb3179caec623206e941af071655653cec6b72c88a16fca0c9215a871e772405fc04dcd0157cfbf66204b466cf6f31f3960cb22bb9a909e53b40c20cc93 SHA512 01756c98f699cedb88278f17444d55921da9a8826cdcc38c331ca2dc01740d1874f70829f7a8f5aeb2cf0260bdbee8ee25a317fa559b6dd0f614908239133b04
+EBUILD portage-3.0.26.ebuild 9205 BLAKE2B c924bca8c7f639d882096f08a1b51cc1287f9228f778dfe4605b2035ead78cc629160f6888c0e0d07c3a1d962c429fe8bf4cca75a8339a31cf9ac84ac4fb2586 SHA512 02425fc3585580866f740831d64c7e2f43c02cd9571d98a605ee3aad1c290a5130111936ec52bdd4bbbff23024bf2bf96d0088166977bbb076c08756db752b0d
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4X8xfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4Yb5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGf/fgP/b9h6Ns1hG4SY+yyeQy/PBLs7RGhKIAVbgCRHCo3YI0qNghzSzCGFHE1/
-g20d4S6GadDwcU1o7/5e3XB6HFgMazZdN3xyFJAxW2fbmgeMPEokjPti8k4RnHg6
-pOcp7/JPwvhPYDSoUNJCKKeiqxj9eR0/wMtqRVfuyRlrc07QbCQ=
-=Az1F
+kGdFvwQAhVqt9V1Warki9E2V8SpLZLralaupe2eOMEZSxAw6AaHZYkv8LAy/2N/D
+oMg9wqITJzF0VD/ss8LSljP0aZ0rKVLYMLohnqE3HDQhNYYkr/KI0A1aqgbqu7HD
+SFPzdlS3vvubHK+m5jyuk6zpV4rfMxyKzPvQXz8Kqmt6pBDotrI=
+=w7jB
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.26.ebuild b/sys-apps/portage/portage-3.0.26.ebuild
new file mode 100644
index 000000000..6e7b4a14b
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.26.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="ce24ddf9e0a9ba9e86f9ccf38004559c6367d756"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+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 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 )
+	>=sys-apps/abi-wrapper-1.0-r6
+	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="
+	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? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=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
+	) )
+	!<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
+	!~app-portage/repoman-3.0.0"
+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
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_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} ipc-sandbox network-sandbox 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 ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		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
+
+	dotmpfiles "${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 -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+	env -u FEATURES -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || 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
+}
+
+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 ""
+}

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

[Thomas Sachau]

commit:     dce497f91d1e04d7fd7992bb31d4b9172420dfd3
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 08:24:18 2022 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 08:24:18 2022 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=dce497f9

sys-apps/portage: Drop old version: 3.0.18

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |  11 +-
 sys-apps/portage/portage-3.0.18.ebuild | 283 ---------------------------------
 2 files changed, 5 insertions(+), 289 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c6c3ab8a9..c80a45255 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -8,17 +8,16 @@ DIST portage-3.0.20-bug-777492-a4d8829.patch 4549 BLAKE2B 9023c7bd3d173b48e1bfcf
 DIST portage-3.0.20-bug-796584-693f6bf.patch 2335 BLAKE2B 4922fad1fc34977b786555f1811e7b3b80e910bb940492eb735e95349f2ebb6c6f52642908fdc49e87c5f8b14f9171c8f32c627fe5ab472e645d5bc41c55bf33 SHA512 4032aef8de565e9ab166bf0f1b0fe4b4aec755eac4b8960dde57f89e08b00609a33cdce56f0f469292facb46aa088da4f3465cec935811cae4d00cca2254763b
 DIST portage-3.0.20-bug-796812-2ce11f0.patch 1292 BLAKE2B b7ca91f6d24e0eaf398ecdae8534ba19f88649ae91316a1cf074a04755a433038c04be49bce4d06306a03e25f7b83899205b971e40fba9248a56d5e65c48a2a8 SHA512 7de6d01d35e6e65be631a31e886b0b7d56d87211aeb1d5d3b8a60c3c6c510db368cca9280ea430675fd101434a15b3d1aef47d2a1d90a28fb634de46c2152768
 DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 9ffcf396b983accef3263efa9f7a6d515cb5b669643abc5dfe610577abec80713d8a202950d37ed78625446f2db37559639002745dea7cc973d47f8befadca06 SHA512 f4cdf3dec98f7ba7da4d5454f4e75408b64934f59e4e1fc9f391a8fe4832b03c4598eef0affba01a415bcc2135d09d682fa612116ed1dbd753783268af243aa8
-EBUILD portage-3.0.18.ebuild 9180 BLAKE2B 34afef0b39a00f419f3320e3b89fd2d0a5c1ea96b6e7e001a3589483821a2ce0d1e564b3e08c075de77ef6b020733924e6fe1d96c84e50f4e5a88a4175ebe9a3 SHA512 9fd7428f55ebd53ac9c9b174f562e50a2c2085c9f5d4a40f39343ac6c830e84d29d96800fc2077191bbe5ba4c296e63df38c7fc5d2851496bebe79524fe6bea1
 EBUILD portage-3.0.20.ebuild 10558 BLAKE2B cf023ea7bd0ccca2fae50869e9b6ebf2b944714f4058f17b55b42ade66272390c986ebbd55bb43ca4b0a03d3e4b89083f3f5b64f842835a5e1ec8cde967d5de9 SHA512 7f4e7c54476bb25b7890cce87a8b12fe554882df0a88e1b59bbb35d485aadca226fc88fabdfe04c4c55dd79989ccea975d7a8beaa543694c56d3f5a34cf47f22
 EBUILD portage-3.0.23.ebuild 9204 BLAKE2B 81b345b0334473ee1d4608f4ecf536cfc4fb82c209fac385491aa0d122cc49f37d646c9879d190e2b6211be419c99ef56f12ae2ed4073fb207ce62a3aeb3f745 SHA512 b15e87fe5261241a899f8d36eda06d82a539b4e83809e576a275b832608eb3ea1705e7ad5a99d0910a20245a644379fc96e4d213a792e57349a55ebdbec5b928
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4NhxfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4NjJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGdkvQQAjLbv1IGTOOV3a0Wxc2SqjNUot6LL1l2SBaAIQfa0xifpNrQRGhPQ4ug5
-RZXXc1Vffl6aH/Auaz8B42iP2yizLO5+hKu9xZAtITTYdm8Tl2Nju+f8eX2AHgAu
-DbI1pNxxq1HVTKqsOB6wUnVot2xMYnRMzCQ8y4TFxR0XGgpawZ8=
-=NXJQ
+kGdBhwP/QgVzBuIbn0PQvkm4/fi4NANsgoTrsn+nGlYnRV9p7lMrJfhFygpRpkQT
+60VzwwEiMCHNIRvtI5sMI/QwwzCNTfvaz2+xwFz/vSf+EPzAUQHy+tJgjPBFfzcn
+EGg2uuzhtTlVPMg7aIYaoF97n5ExHIXcCG0Hj7wa81X8n+KIv38=
+=ckyN
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.18.ebuild b/sys-apps/portage/portage-3.0.18.ebuild
deleted file mode 100644
index c0b262e23..000000000
--- a/sys-apps/portage/portage-3.0.18.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2022 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(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
-
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="639064263dbd0d1a0753d8e754c53ac0ff10768b"
-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 ~sparc ~x86"
-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 )
-	>=sys-apps/abi-wrapper-1.0-r6
-	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="
-	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: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? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=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
-	) )
-	!<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
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_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 ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		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
-
-	dotmpfiles "${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 -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-	env -u FEATURES -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || 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
-}
-
-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 ""
-}

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

[Thomas Sachau]

commit:     22c86a798931c85dccb830cac70806ffa0027535
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 11:21:55 2022 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 11:21:55 2022 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=22c86a79

sys-apps/portage: Update commit for 2.0.24

Package-Manager: Portage-3.0.24, Repoman-3.0.3
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              | 12 ++++++------
 sys-apps/portage/portage-3.0.24.ebuild |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3d055025f..ab7a3b1d4 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -10,15 +10,15 @@ DIST portage-3.0.20-bug-796812-2ce11f0.patch 1292 BLAKE2B b7ca91f6d24e0eaf398ecd
 DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 9ffcf396b983accef3263efa9f7a6d515cb5b669643abc5dfe610577abec80713d8a202950d37ed78625446f2db37559639002745dea7cc973d47f8befadca06 SHA512 f4cdf3dec98f7ba7da4d5454f4e75408b64934f59e4e1fc9f391a8fe4832b03c4598eef0affba01a415bcc2135d09d682fa612116ed1dbd753783268af243aa8
 EBUILD portage-3.0.20.ebuild 10558 BLAKE2B cf023ea7bd0ccca2fae50869e9b6ebf2b944714f4058f17b55b42ade66272390c986ebbd55bb43ca4b0a03d3e4b89083f3f5b64f842835a5e1ec8cde967d5de9 SHA512 7f4e7c54476bb25b7890cce87a8b12fe554882df0a88e1b59bbb35d485aadca226fc88fabdfe04c4c55dd79989ccea975d7a8beaa543694c56d3f5a34cf47f22
 EBUILD portage-3.0.23.ebuild 9204 BLAKE2B 81b345b0334473ee1d4608f4ecf536cfc4fb82c209fac385491aa0d122cc49f37d646c9879d190e2b6211be419c99ef56f12ae2ed4073fb207ce62a3aeb3f745 SHA512 b15e87fe5261241a899f8d36eda06d82a539b4e83809e576a275b832608eb3ea1705e7ad5a99d0910a20245a644379fc96e4d213a792e57349a55ebdbec5b928
-EBUILD portage-3.0.24.ebuild 9199 BLAKE2B 69ffefb919f70abaee40d8714d9f6c62c6cad586eaf4bfe4af6567eac382b70adda6608c0a7679a2ccd192d6ab0dafef19630258d364ae83f2819df5c1db5b8d SHA512 92fccb49e0795288beb5c4482b0b338c560243be0f7a944c7dc65ee0766be30cc3503bfe62b1c8a1f6fd42523ccb63e55e6bacc494748dc51a9b4e527349fbe8
+EBUILD portage-3.0.24.ebuild 9199 BLAKE2B 6ef7deb3179caec623206e941af071655653cec6b72c88a16fca0c9215a871e772405fc04dcd0157cfbf66204b466cf6f31f3960cb22bb9a909e53b40c20cc93 SHA512 01756c98f699cedb88278f17444d55921da9a8826cdcc38c331ca2dc01740d1874f70829f7a8f5aeb2cf0260bdbee8ee25a317fa559b6dd0f614908239133b04
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4Tn9fFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4X8xfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGcvuwP+P5ZltrHtax+n55RcuzPot16jXdj6fo5cnB/5SxxzcceSeI8tNjGhrul3
-eBwO+vMpHUA419CCz/NwwQUzggSrUFXMGV54ABtqno8jipTW1RR9eHfGLUTyRABN
-M819VZy3YyzUYRCAg/xGw5ZV2mNg4Syr4PNnTxfZTvUDtGD+u0Q=
-=dI8P
+kGf/fgP/b9h6Ns1hG4SY+yyeQy/PBLs7RGhKIAVbgCRHCo3YI0qNghzSzCGFHE1/
+g20d4S6GadDwcU1o7/5e3XB6HFgMazZdN3xyFJAxW2fbmgeMPEokjPti8k4RnHg6
+pOcp7/JPwvhPYDSoUNJCKKeiqxj9eR0/wMtqRVfuyRlrc07QbCQ=
+=Az1F
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.24.ebuild b/sys-apps/portage/portage-3.0.24.ebuild
index 7ff00cf65..881cb9137 100644
--- a/sys-apps/portage/portage-3.0.24.ebuild
+++ b/sys-apps/portage/portage-3.0.24.ebuild
@@ -12,7 +12,7 @@ inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
 DESCRIPTION="The package management and distribution system for Gentoo"
 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="53e3b05235f8e438e1426ada3bd42fd1125b7b6d"
+EGIT_COMMIT="ce24ddf9e0a9ba9e86f9ccf38004559c6367d756"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     f467ae766f34c306704a4e7bc32a9cbb1b3eb7b3
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 10:08:06 2022 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 10:08:06 2022 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=f467ae76

sys-apps/portage: Version bump to 2.0.24

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |  11 +-
 sys-apps/portage/portage-3.0.24.ebuild | 283 +++++++++++++++++++++++++++++++++
 2 files changed, 289 insertions(+), 5 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c80a45255..3d055025f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -10,14 +10,15 @@ DIST portage-3.0.20-bug-796812-2ce11f0.patch 1292 BLAKE2B b7ca91f6d24e0eaf398ecd
 DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 9ffcf396b983accef3263efa9f7a6d515cb5b669643abc5dfe610577abec80713d8a202950d37ed78625446f2db37559639002745dea7cc973d47f8befadca06 SHA512 f4cdf3dec98f7ba7da4d5454f4e75408b64934f59e4e1fc9f391a8fe4832b03c4598eef0affba01a415bcc2135d09d682fa612116ed1dbd753783268af243aa8
 EBUILD portage-3.0.20.ebuild 10558 BLAKE2B cf023ea7bd0ccca2fae50869e9b6ebf2b944714f4058f17b55b42ade66272390c986ebbd55bb43ca4b0a03d3e4b89083f3f5b64f842835a5e1ec8cde967d5de9 SHA512 7f4e7c54476bb25b7890cce87a8b12fe554882df0a88e1b59bbb35d485aadca226fc88fabdfe04c4c55dd79989ccea975d7a8beaa543694c56d3f5a34cf47f22
 EBUILD portage-3.0.23.ebuild 9204 BLAKE2B 81b345b0334473ee1d4608f4ecf536cfc4fb82c209fac385491aa0d122cc49f37d646c9879d190e2b6211be419c99ef56f12ae2ed4073fb207ce62a3aeb3f745 SHA512 b15e87fe5261241a899f8d36eda06d82a539b4e83809e576a275b832608eb3ea1705e7ad5a99d0910a20245a644379fc96e4d213a792e57349a55ebdbec5b928
+EBUILD portage-3.0.24.ebuild 9199 BLAKE2B 69ffefb919f70abaee40d8714d9f6c62c6cad586eaf4bfe4af6567eac382b70adda6608c0a7679a2ccd192d6ab0dafef19630258d364ae83f2819df5c1db5b8d SHA512 92fccb49e0795288beb5c4482b0b338c560243be0f7a944c7dc65ee0766be30cc3503bfe62b1c8a1f6fd42523ccb63e55e6bacc494748dc51a9b4e527349fbe8
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4NjJfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4Tn9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGdBhwP/QgVzBuIbn0PQvkm4/fi4NANsgoTrsn+nGlYnRV9p7lMrJfhFygpRpkQT
-60VzwwEiMCHNIRvtI5sMI/QwwzCNTfvaz2+xwFz/vSf+EPzAUQHy+tJgjPBFfzcn
-EGg2uuzhtTlVPMg7aIYaoF97n5ExHIXcCG0Hj7wa81X8n+KIv38=
-=ckyN
+kGcvuwP+P5ZltrHtax+n55RcuzPot16jXdj6fo5cnB/5SxxzcceSeI8tNjGhrul3
+eBwO+vMpHUA419CCz/NwwQUzggSrUFXMGV54ABtqno8jipTW1RR9eHfGLUTyRABN
+M819VZy3YyzUYRCAg/xGw5ZV2mNg4Syr4PNnTxfZTvUDtGD+u0Q=
+=dI8P
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.24.ebuild b/sys-apps/portage/portage-3.0.24.ebuild
new file mode 100644
index 000000000..7ff00cf65
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.24.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="53e3b05235f8e438e1426ada3bd42fd1125b7b6d"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+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 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 )
+	>=sys-apps/abi-wrapper-1.0-r6
+	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="
+	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? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=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
+	) )
+	!<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
+	!~app-portage/repoman-3.0.0"
+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
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_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} ipc-sandbox network-sandbox 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 ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		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
+
+	dotmpfiles "${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 -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+	env -u FEATURES -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || 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
+}
+
+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 ""
+}

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

[Thomas Sachau]

commit:     5409a982b0f0a5c99ad0eeed2a96f72791ae7b77
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 08:23:12 2022 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 08:23:12 2022 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=5409a982

sys-apps/portage: Version bump to 2.0.23

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |  11 +-
 sys-apps/portage/portage-3.0.23.ebuild | 284 +++++++++++++++++++++++++++++++++
 2 files changed, 290 insertions(+), 5 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 2969ec1fd..76a480564 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -11,14 +11,15 @@ DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 9ffcf396b983a
 EBUILD portage-3.0.14.ebuild 8819 BLAKE2B 560eb7cea19b3cc023c079b05cc91bc84187d1afcce9e123dca099ec5d1464db3af6624c590228fe4e4f877ae8e8b4d975d2dafcf91f1dea89baefdad9d2a161 SHA512 5cd0626585d8a0b47c203b061d4c19f7a7d563c1cf4c959a14f98215a1a75022445a17d2e3b55437b58cdcef418e62e6622d580a4362d71f34a4ac92bc38bf04
 EBUILD portage-3.0.18.ebuild 9180 BLAKE2B 34afef0b39a00f419f3320e3b89fd2d0a5c1ea96b6e7e001a3589483821a2ce0d1e564b3e08c075de77ef6b020733924e6fe1d96c84e50f4e5a88a4175ebe9a3 SHA512 9fd7428f55ebd53ac9c9b174f562e50a2c2085c9f5d4a40f39343ac6c830e84d29d96800fc2077191bbe5ba4c296e63df38c7fc5d2851496bebe79524fe6bea1
 EBUILD portage-3.0.20.ebuild 10558 BLAKE2B cf023ea7bd0ccca2fae50869e9b6ebf2b944714f4058f17b55b42ade66272390c986ebbd55bb43ca4b0a03d3e4b89083f3f5b64f842835a5e1ec8cde967d5de9 SHA512 7f4e7c54476bb25b7890cce87a8b12fe554882df0a88e1b59bbb35d485aadca226fc88fabdfe04c4c55dd79989ccea975d7a8beaa543694c56d3f5a34cf47f22
+EBUILD portage-3.0.23.ebuild 9204 BLAKE2B 81b345b0334473ee1d4608f4ecf536cfc4fb82c209fac385491aa0d122cc49f37d646c9879d190e2b6211be419c99ef56f12ae2ed4073fb207ce62a3aeb3f745 SHA512 b15e87fe5261241a899f8d36eda06d82a539b4e83809e576a275b832608eb3ea1705e7ad5a99d0910a20245a644379fc96e4d213a792e57349a55ebdbec5b928
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmIG0/lfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4NelfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGc9igP/d6SjlYY2whAktF8WKs/ze6uiS1MG14PrCXNUQwIi7qWDABNTCP3Uke2h
-UbFF6ir2bPcMbRxwn1Q+0h3tox8wmh4wsaBAIWEfNr2Vrwqt6R2/kz4S3EXacz2B
-58LG4KgpKcfJNr6ONxMh9Hn4PdD8juUUgct2hO2T7xkFHxZqpXc=
-=JJGK
+kGfbOQQAxSivu4RSxPCMoPmPAXydtE5E/duDGuAYUp4YxrdxufEgEGhcD1fqVIC+
+d4tRalhnemaKzGlvZgGE97uM+Bn375qeq1z1kM1jxYxFg9Xv9ciuXTibv9j0cl8Z
+Z/rbtyTiJclZjkDwmsibyGpFAjvYlVIHZi81gVuZHf/HRZabeRw=
+=raBn
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.23.ebuild b/sys-apps/portage/portage-3.0.23.ebuild
new file mode 100644
index 000000000..f2df1b479
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.23.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="a7727547b795a3399883a2b7547657d43978d783"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+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 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 )
+	>=sys-apps/abi-wrapper-1.0-r6
+	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="
+	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: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? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=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
+	) )
+	!<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
+	!~app-portage/repoman-3.0.0"
+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
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_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 ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		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
+
+	dotmpfiles "${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 -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+	env -u FEATURES -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || 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
+}
+
+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 ""
+}

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

[Thomas Sachau]

commit:     ad5a874a70b237e4c97c6810aa9d46ed029b90f3
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 08:23:56 2022 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 08:23:56 2022 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=ad5a874a

sys-apps/portage: Drop old version: 3.0.14

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |  11 +-
 sys-apps/portage/portage-3.0.14.ebuild | 272 ---------------------------------
 2 files changed, 5 insertions(+), 278 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 76a480564..c6c3ab8a9 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -8,18 +8,17 @@ DIST portage-3.0.20-bug-777492-a4d8829.patch 4549 BLAKE2B 9023c7bd3d173b48e1bfcf
 DIST portage-3.0.20-bug-796584-693f6bf.patch 2335 BLAKE2B 4922fad1fc34977b786555f1811e7b3b80e910bb940492eb735e95349f2ebb6c6f52642908fdc49e87c5f8b14f9171c8f32c627fe5ab472e645d5bc41c55bf33 SHA512 4032aef8de565e9ab166bf0f1b0fe4b4aec755eac4b8960dde57f89e08b00609a33cdce56f0f469292facb46aa088da4f3465cec935811cae4d00cca2254763b
 DIST portage-3.0.20-bug-796812-2ce11f0.patch 1292 BLAKE2B b7ca91f6d24e0eaf398ecdae8534ba19f88649ae91316a1cf074a04755a433038c04be49bce4d06306a03e25f7b83899205b971e40fba9248a56d5e65c48a2a8 SHA512 7de6d01d35e6e65be631a31e886b0b7d56d87211aeb1d5d3b8a60c3c6c510db368cca9280ea430675fd101434a15b3d1aef47d2a1d90a28fb634de46c2152768
 DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 9ffcf396b983accef3263efa9f7a6d515cb5b669643abc5dfe610577abec80713d8a202950d37ed78625446f2db37559639002745dea7cc973d47f8befadca06 SHA512 f4cdf3dec98f7ba7da4d5454f4e75408b64934f59e4e1fc9f391a8fe4832b03c4598eef0affba01a415bcc2135d09d682fa612116ed1dbd753783268af243aa8
-EBUILD portage-3.0.14.ebuild 8819 BLAKE2B 560eb7cea19b3cc023c079b05cc91bc84187d1afcce9e123dca099ec5d1464db3af6624c590228fe4e4f877ae8e8b4d975d2dafcf91f1dea89baefdad9d2a161 SHA512 5cd0626585d8a0b47c203b061d4c19f7a7d563c1cf4c959a14f98215a1a75022445a17d2e3b55437b58cdcef418e62e6622d580a4362d71f34a4ac92bc38bf04
 EBUILD portage-3.0.18.ebuild 9180 BLAKE2B 34afef0b39a00f419f3320e3b89fd2d0a5c1ea96b6e7e001a3589483821a2ce0d1e564b3e08c075de77ef6b020733924e6fe1d96c84e50f4e5a88a4175ebe9a3 SHA512 9fd7428f55ebd53ac9c9b174f562e50a2c2085c9f5d4a40f39343ac6c830e84d29d96800fc2077191bbe5ba4c296e63df38c7fc5d2851496bebe79524fe6bea1
 EBUILD portage-3.0.20.ebuild 10558 BLAKE2B cf023ea7bd0ccca2fae50869e9b6ebf2b944714f4058f17b55b42ade66272390c986ebbd55bb43ca4b0a03d3e4b89083f3f5b64f842835a5e1ec8cde967d5de9 SHA512 7f4e7c54476bb25b7890cce87a8b12fe554882df0a88e1b59bbb35d485aadca226fc88fabdfe04c4c55dd79989ccea975d7a8beaa543694c56d3f5a34cf47f22
 EBUILD portage-3.0.23.ebuild 9204 BLAKE2B 81b345b0334473ee1d4608f4ecf536cfc4fb82c209fac385491aa0d122cc49f37d646c9879d190e2b6211be419c99ef56f12ae2ed4073fb207ce62a3aeb3f745 SHA512 b15e87fe5261241a899f8d36eda06d82a539b4e83809e576a275b832608eb3ea1705e7ad5a99d0910a20245a644379fc96e4d213a792e57349a55ebdbec5b928
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4NelfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4NhxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGfbOQQAxSivu4RSxPCMoPmPAXydtE5E/duDGuAYUp4YxrdxufEgEGhcD1fqVIC+
-d4tRalhnemaKzGlvZgGE97uM+Bn375qeq1z1kM1jxYxFg9Xv9ciuXTibv9j0cl8Z
-Z/rbtyTiJclZjkDwmsibyGpFAjvYlVIHZi81gVuZHf/HRZabeRw=
-=raBn
+kGdkvQQAjLbv1IGTOOV3a0Wxc2SqjNUot6LL1l2SBaAIQfa0xifpNrQRGhPQ4ug5
+RZXXc1Vffl6aH/Auaz8B42iP2yizLO5+hKu9xZAtITTYdm8Tl2Nju+f8eX2AHgAu
+DbI1pNxxq1HVTKqsOB6wUnVot2xMYnRMzCQ8y4TFxR0XGgpawZ8=
+=NXJQ
 -----END PGP SIGNATURE-----

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 a1bc6d541..000000000
--- a/sys-apps/portage/portage-3.0.14.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2022 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 git-r3 linux-info multilib tmpfiles prefix
-
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="2663f1d5badc58440f289f67c53d7f661b90ee4e"
-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 ~sparc ~x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
-RESTRICT="!test? ( test )"
-
-BDEPEND="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 )
-	>=sys-apps/abi-wrapper-1.0-r6
-	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="
-	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: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? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=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
-	) )
-	!<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
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_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
-
-	dotmpfiles "${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: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
-}
-
-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 ""
-}

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

[Thomas Sachau]

commit:     a53c47345a731af01560c25ae744cfbd1217a329
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 21:24:21 2022 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 21:24:21 2022 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=a53c4734

sys-apps/portage: Drop eclibc_uclibc USE condition

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              | 16 ++++++++--------
 sys-apps/portage/portage-3.0.14.ebuild |  3 +--
 sys-apps/portage/portage-3.0.18.ebuild |  3 +--
 sys-apps/portage/portage-3.0.20.ebuild |  3 +--
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 36eaf01ff..2969ec1fd 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -8,17 +8,17 @@ DIST portage-3.0.20-bug-777492-a4d8829.patch 4549 BLAKE2B 9023c7bd3d173b48e1bfcf
 DIST portage-3.0.20-bug-796584-693f6bf.patch 2335 BLAKE2B 4922fad1fc34977b786555f1811e7b3b80e910bb940492eb735e95349f2ebb6c6f52642908fdc49e87c5f8b14f9171c8f32c627fe5ab472e645d5bc41c55bf33 SHA512 4032aef8de565e9ab166bf0f1b0fe4b4aec755eac4b8960dde57f89e08b00609a33cdce56f0f469292facb46aa088da4f3465cec935811cae4d00cca2254763b
 DIST portage-3.0.20-bug-796812-2ce11f0.patch 1292 BLAKE2B b7ca91f6d24e0eaf398ecdae8534ba19f88649ae91316a1cf074a04755a433038c04be49bce4d06306a03e25f7b83899205b971e40fba9248a56d5e65c48a2a8 SHA512 7de6d01d35e6e65be631a31e886b0b7d56d87211aeb1d5d3b8a60c3c6c510db368cca9280ea430675fd101434a15b3d1aef47d2a1d90a28fb634de46c2152768
 DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 9ffcf396b983accef3263efa9f7a6d515cb5b669643abc5dfe610577abec80713d8a202950d37ed78625446f2db37559639002745dea7cc973d47f8befadca06 SHA512 f4cdf3dec98f7ba7da4d5454f4e75408b64934f59e4e1fc9f391a8fe4832b03c4598eef0affba01a415bcc2135d09d682fa612116ed1dbd753783268af243aa8
-EBUILD portage-3.0.14.ebuild 8861 BLAKE2B bf125145f9d3a8f1a1f7cdadf24eb762254fd5d23008933c38fe7ce818d1d0c203e92d9ea328ea1f00fd02a2a839e90ba2a79f16e7b650e56f84843bf2f0daa8 SHA512 9c3e5df3f2ba35ebfcfbd4f38d4e01d00ca9af6fb2ff0a8a2f00be3188de35e0fc3f1c15bcf104ad48f9469fa9eec52e39dfe01daac1852faee6569719691dc8
-EBUILD portage-3.0.18.ebuild 9222 BLAKE2B f1ac060766e60ab9a0d772ef9dd0394181e5f7e3dae5187391c6748ffd6a8dc63be88becc6932629f7508f0f63e4eb166b37f156953a93923bc04852a2f397d4 SHA512 cd86bfcb550beb89fd2229bcdd1b8cb80a8e4729b09131ad070a845a49659ac05e1735fb547f9384599e74325723c5309c97f0dcd0406f9492d20b5279d1d1a9
-EBUILD portage-3.0.20.ebuild 10600 BLAKE2B 6ec9401c1e8eb9c4c9766449efd3b3c1aaca3bdeb8c585bf5ce9178c6f4df7dc9ad5873bc96cbbfe59713a56c4ec70f77a4335162eb9af2ac13a8d8970c693d4 SHA512 f7c2dd76337f754504cf081d45809ad94f42ba3929d9122cda37621090e52e0d45c2942916462f75ef69488220f3f0ac5a3899075ebc42a4edc4fa5d1762c018
+EBUILD portage-3.0.14.ebuild 8819 BLAKE2B 560eb7cea19b3cc023c079b05cc91bc84187d1afcce9e123dca099ec5d1464db3af6624c590228fe4e4f877ae8e8b4d975d2dafcf91f1dea89baefdad9d2a161 SHA512 5cd0626585d8a0b47c203b061d4c19f7a7d563c1cf4c959a14f98215a1a75022445a17d2e3b55437b58cdcef418e62e6622d580a4362d71f34a4ac92bc38bf04
+EBUILD portage-3.0.18.ebuild 9180 BLAKE2B 34afef0b39a00f419f3320e3b89fd2d0a5c1ea96b6e7e001a3589483821a2ce0d1e564b3e08c075de77ef6b020733924e6fe1d96c84e50f4e5a88a4175ebe9a3 SHA512 9fd7428f55ebd53ac9c9b174f562e50a2c2085c9f5d4a40f39343ac6c830e84d29d96800fc2077191bbe5ba4c296e63df38c7fc5d2851496bebe79524fe6bea1
+EBUILD portage-3.0.20.ebuild 10558 BLAKE2B cf023ea7bd0ccca2fae50869e9b6ebf2b944714f4058f17b55b42ade66272390c986ebbd55bb43ca4b0a03d3e4b89083f3f5b64f842835a5e1ec8cde967d5de9 SHA512 7f4e7c54476bb25b7890cce87a8b12fe554882df0a88e1b59bbb35d485aadca226fc88fabdfe04c4c55dd79989ccea975d7a8beaa543694c56d3f5a34cf47f22
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmHHazRfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmIG0/lfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGfrZgQAxoXWKKM6nwvAaMDkQZLIJNni3k4N5olRbvsoeVnLlp7wl1+3YgLvTu9c
-vPF42jU9UfKceSS+iypYnuN7RUkU7F3HRuK/3hOxUZurS1MFiqIiFYRVla6uD0wQ
-blGzbjmXoUQ50RaykWAUCWmS0xCl5nO2s7jAY5Gmp/JHGXjHNyw=
-=jkjI
+kGc9igP/d6SjlYY2whAktF8WKs/ze6uiS1MG14PrCXNUQwIi7qWDABNTCP3Uke2h
+UbFF6ir2bPcMbRxwn1Q+0h3tox8wmh4wsaBAIWEfNr2Vrwqt6R2/kz4S3EXacz2B
+58LG4KgpKcfJNr6ONxMh9Hn4PdD8juUUgct2hO2T7xkFHxZqpXc=
+=JJGK
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.14.ebuild b/sys-apps/portage/portage-3.0.14.ebuild
index 823635754..a1bc6d541 100644
--- a/sys-apps/portage/portage-3.0.14.ebuild
+++ b/sys-apps/portage/portage-3.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -55,7 +55,6 @@ RDEPEND="
 	)
 	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}] )

diff --git a/sys-apps/portage/portage-3.0.18.ebuild b/sys-apps/portage/portage-3.0.18.ebuild
index af235913c..c0b262e23 100644
--- a/sys-apps/portage/portage-3.0.18.ebuild
+++ b/sys-apps/portage/portage-3.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -58,7 +58,6 @@ RDEPEND="
 	)
 	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}] )

diff --git a/sys-apps/portage/portage-3.0.20.ebuild b/sys-apps/portage/portage-3.0.20.ebuild
index afa341daa..c99ca3586 100644
--- a/sys-apps/portage/portage-3.0.20.ebuild
+++ b/sys-apps/portage/portage-3.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -58,7 +58,6 @@ RDEPEND="
 	)
 	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}] )

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

[Thomas Sachau]

commit:     b64c1a9119416c303099dacc114dece7b3f746fa
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 25 19:04:26 2021 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Dec 25 19:04:26 2021 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=b64c1a91

sys-apps/portage: Update dependencies

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              | 16 ++++++++--------
 sys-apps/portage/portage-3.0.14.ebuild |  2 +-
 sys-apps/portage/portage-3.0.18.ebuild |  2 +-
 sys-apps/portage/portage-3.0.20.ebuild |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 54ad893fd..36eaf01ff 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -8,17 +8,17 @@ DIST portage-3.0.20-bug-777492-a4d8829.patch 4549 BLAKE2B 9023c7bd3d173b48e1bfcf
 DIST portage-3.0.20-bug-796584-693f6bf.patch 2335 BLAKE2B 4922fad1fc34977b786555f1811e7b3b80e910bb940492eb735e95349f2ebb6c6f52642908fdc49e87c5f8b14f9171c8f32c627fe5ab472e645d5bc41c55bf33 SHA512 4032aef8de565e9ab166bf0f1b0fe4b4aec755eac4b8960dde57f89e08b00609a33cdce56f0f469292facb46aa088da4f3465cec935811cae4d00cca2254763b
 DIST portage-3.0.20-bug-796812-2ce11f0.patch 1292 BLAKE2B b7ca91f6d24e0eaf398ecdae8534ba19f88649ae91316a1cf074a04755a433038c04be49bce4d06306a03e25f7b83899205b971e40fba9248a56d5e65c48a2a8 SHA512 7de6d01d35e6e65be631a31e886b0b7d56d87211aeb1d5d3b8a60c3c6c510db368cca9280ea430675fd101434a15b3d1aef47d2a1d90a28fb634de46c2152768
 DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 9ffcf396b983accef3263efa9f7a6d515cb5b669643abc5dfe610577abec80713d8a202950d37ed78625446f2db37559639002745dea7cc973d47f8befadca06 SHA512 f4cdf3dec98f7ba7da4d5454f4e75408b64934f59e4e1fc9f391a8fe4832b03c4598eef0affba01a415bcc2135d09d682fa612116ed1dbd753783268af243aa8
-EBUILD portage-3.0.14.ebuild 8862 BLAKE2B 73e2b035fe7b2354bc54509bee2f881bc456138ebc71bee5bee95e82770df788fa5abc67010832b252fc9a7315fc53f5d7d60e6da3755e06511a88feb6b08b75 SHA512 534b91282a3939e7bcac69208a9a14573de7c107422c3e5dedb7bd5461ed479cb69f38e7e135660b212da093f29266fd05852ced346794d17d44c58b4b9e34e4
-EBUILD portage-3.0.18.ebuild 9223 BLAKE2B 9ead807d1a6894c88422c90204d8c39e5673b42b7fd9998640cbb57d56dfb115e6112ead8f8c962c0777a15eeafac0093b84a5a24cc8f1395911756fa1a5b668 SHA512 c5da02f09fe22111f7d87594fa83a7a28fb7c7431c9d0cc8e0d0c4a19fd761066b652b120a66b3166d3ac2c22d397e168d8467ae83be3a7c2aecd5cb6e4d0f28
-EBUILD portage-3.0.20.ebuild 10601 BLAKE2B 1859efb2a1af1a15fcbfabb2397c174e542f3eeedea8e792fe805c7b76a3fd033e656c0de5b4efc3872d204873499ecc3b77c1f2b8fc501e74b6b082eeebceea SHA512 e9d8a40e33480211abcddc1fd486befaf814aa225dcb6234d881af05c0f7db1f73220cbc7e522c6d80998d2450de969e4d89712143235f0c0c6eaf3c41f87c8b
+EBUILD portage-3.0.14.ebuild 8861 BLAKE2B bf125145f9d3a8f1a1f7cdadf24eb762254fd5d23008933c38fe7ce818d1d0c203e92d9ea328ea1f00fd02a2a839e90ba2a79f16e7b650e56f84843bf2f0daa8 SHA512 9c3e5df3f2ba35ebfcfbd4f38d4e01d00ca9af6fb2ff0a8a2f00be3188de35e0fc3f1c15bcf104ad48f9469fa9eec52e39dfe01daac1852faee6569719691dc8
+EBUILD portage-3.0.18.ebuild 9222 BLAKE2B f1ac060766e60ab9a0d772ef9dd0394181e5f7e3dae5187391c6748ffd6a8dc63be88becc6932629f7508f0f63e4eb166b37f156953a93923bc04852a2f397d4 SHA512 cd86bfcb550beb89fd2229bcdd1b8cb80a8e4729b09131ad070a845a49659ac05e1735fb547f9384599e74325723c5309c97f0dcd0406f9492d20b5279d1d1a9
+EBUILD portage-3.0.20.ebuild 10600 BLAKE2B 6ec9401c1e8eb9c4c9766449efd3b3c1aaca3bdeb8c585bf5ce9178c6f4df7dc9ad5873bc96cbbfe59713a56c4ec70f77a4335162eb9af2ac13a8d8970c693d4 SHA512 f7c2dd76337f754504cf081d45809ad94f42ba3929d9122cda37621090e52e0d45c2942916462f75ef69488220f3f0ac5a3899075ebc42a4edc4fa5d1762c018
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmD9UeNfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmHHazRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGfumQP/VUxMGri4yQ2tY5z4BlEiXUftqFec8SpznNebXnqnxzu0hcVxfRVfUtaq
-1TEffRlCxn3FHN7bcEJHCu+n9WvzHvCACFOSSfehNyP+jedRRbdXhyHOGIA51UrJ
-5seMAVu30PuTFJ4JyqewYV7GPhQx0Uwt2rqYVbSP/jbazWu+Vyk=
-=pnqn
+kGfrZgQAxoXWKKM6nwvAaMDkQZLIJNni3k4N5olRbvsoeVnLlp7wl1+3YgLvTu9c
+vPF42jU9UfKceSS+iypYnuN7RUkU7F3HRuK/3hOxUZurS1MFiqIiFYRVla6uD0wQ
+blGzbjmXoUQ50RaykWAUCWmS0xCl5nO2s7jAY5Gmp/JHGXjHNyw=
+=jkjI
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.14.ebuild b/sys-apps/portage/portage-3.0.14.ebuild
index 851a1c9e4..823635754 100644
--- a/sys-apps/portage/portage-3.0.14.ebuild
+++ b/sys-apps/portage/portage-3.0.14.ebuild
@@ -49,7 +49,7 @@ RDEPEND="
 		>=app-admin/eselect-1.2
 		rsync-verify? (
 			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=sec-keys/openpgp-keys-gentoo-release-20180706
 			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
 	)

diff --git a/sys-apps/portage/portage-3.0.18.ebuild b/sys-apps/portage/portage-3.0.18.ebuild
index cefb7bf30..af235913c 100644
--- a/sys-apps/portage/portage-3.0.18.ebuild
+++ b/sys-apps/portage/portage-3.0.18.ebuild
@@ -52,7 +52,7 @@ RDEPEND="
 		>=app-admin/eselect-1.2
 		rsync-verify? (
 			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=sec-keys/openpgp-keys-gentoo-release-20180706
 			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
 	)

diff --git a/sys-apps/portage/portage-3.0.20.ebuild b/sys-apps/portage/portage-3.0.20.ebuild
index c00c57f80..afa341daa 100644
--- a/sys-apps/portage/portage-3.0.20.ebuild
+++ b/sys-apps/portage/portage-3.0.20.ebuild
@@ -52,7 +52,7 @@ RDEPEND="
 		>=app-admin/eselect-1.2
 		rsync-verify? (
 			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=sec-keys/openpgp-keys-gentoo-release-20180706
 			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
 	)

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

[Thomas Sachau]

commit:     f7468e788096446463a48f326955335db5d9f11b
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 25 11:58:27 2021 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jul 25 11:58:27 2021 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=f7468e78

sys-apps/portage: Update git commit

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              | 12 ++++++------
 sys-apps/portage/portage-3.0.20.ebuild |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3afd32d14..54ad893fd 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -10,15 +10,15 @@ DIST portage-3.0.20-bug-796812-2ce11f0.patch 1292 BLAKE2B b7ca91f6d24e0eaf398ecd
 DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 9ffcf396b983accef3263efa9f7a6d515cb5b669643abc5dfe610577abec80713d8a202950d37ed78625446f2db37559639002745dea7cc973d47f8befadca06 SHA512 f4cdf3dec98f7ba7da4d5454f4e75408b64934f59e4e1fc9f391a8fe4832b03c4598eef0affba01a415bcc2135d09d682fa612116ed1dbd753783268af243aa8
 EBUILD portage-3.0.14.ebuild 8862 BLAKE2B 73e2b035fe7b2354bc54509bee2f881bc456138ebc71bee5bee95e82770df788fa5abc67010832b252fc9a7315fc53f5d7d60e6da3755e06511a88feb6b08b75 SHA512 534b91282a3939e7bcac69208a9a14573de7c107422c3e5dedb7bd5461ed479cb69f38e7e135660b212da093f29266fd05852ced346794d17d44c58b4b9e34e4
 EBUILD portage-3.0.18.ebuild 9223 BLAKE2B 9ead807d1a6894c88422c90204d8c39e5673b42b7fd9998640cbb57d56dfb115e6112ead8f8c962c0777a15eeafac0093b84a5a24cc8f1395911756fa1a5b668 SHA512 c5da02f09fe22111f7d87594fa83a7a28fb7c7431c9d0cc8e0d0c4a19fd761066b652b120a66b3166d3ac2c22d397e168d8467ae83be3a7c2aecd5cb6e4d0f28
-EBUILD portage-3.0.20.ebuild 10601 BLAKE2B 288e0c815f1dd6eaec386987f5d78d36ec0cd61a029e6fc4c9101377a6ac541c850bd791f921a41912570b0882772ac8629d6cd24a2a7dce9dea361f3da728b8 SHA512 c3002bf9b96a3a41c25ed72805699b2a03dbdc2aa79e01a1900deb73209dfce486947fd6e6395fd0a453330bfd63760a0a2627f18946020c78437c5ed044ef04
+EBUILD portage-3.0.20.ebuild 10601 BLAKE2B 1859efb2a1af1a15fcbfabb2397c174e542f3eeedea8e792fe805c7b76a3fd033e656c0de5b4efc3872d204873499ecc3b77c1f2b8fc501e74b6b082eeebceea SHA512 e9d8a40e33480211abcddc1fd486befaf814aa225dcb6234d881af05c0f7db1f73220cbc7e522c6d80998d2450de969e4d89712143235f0c0c6eaf3c41f87c8b
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmD9UVZfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmD9UeNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGdKwQQAvdB83U83NzxT0SudXgFNl3JkSdLVhNyqzgy2UjYANGP97sjpvS4W5pfd
-x8HqSVgj6gBznFAwaBCGl23kZA4hG3u/jRaBRWaX2NP3JPQrb2HPQyHXQO6T0Gzw
-pNN1bx35Uuphn344qQ9EeURui4sailoMwQSJFL7vvkFFdelJgnk=
-=W9mO
+kGfumQP/VUxMGri4yQ2tY5z4BlEiXUftqFec8SpznNebXnqnxzu0hcVxfRVfUtaq
+1TEffRlCxn3FHN7bcEJHCu+n9WvzHvCACFOSSfehNyP+jedRRbdXhyHOGIA51UrJ
+5seMAVu30PuTFJ4JyqewYV7GPhQx0Uwt2rqYVbSP/jbazWu+Vyk=
+=pnqn
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.20.ebuild b/sys-apps/portage/portage-3.0.20.ebuild
index 1251839da..c00c57f80 100644
--- a/sys-apps/portage/portage-3.0.20.ebuild
+++ b/sys-apps/portage/portage-3.0.20.ebuild
@@ -12,7 +12,7 @@ inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
 
 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="c0a00cde2d10eda4c207d488e01b48e0bfc75ce9"
+EGIT_COMMIT="2be6680750aee41ae5c9eaaade8d8a924e842066"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 

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

[Thomas Sachau]

commit:     3ac601a8e7e069cabae762134571f0f100f70451
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 25 11:56:18 2021 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jul 25 11:56:18 2021 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=3ac601a8

sys-apps/portage: Version bump

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |  16 +-
 sys-apps/portage/portage-3.0.20.ebuild | 306 +++++++++++++++++++++++++++++++++
 2 files changed, 317 insertions(+), 5 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f155fecf5..3afd32d14 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,16 +3,22 @@ Hash: SHA256
 
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
+DIST portage-3.0.20-bug-777492-209be9a.patch 1758 BLAKE2B 9ed7b18ef8b73c59a08e5a2c2fba9365b37bd8cace32d5a275a4003cbf3f40f6a0a5a4d168dae987169e2017222a3af291d9a860a4494c994ef51ca851620db1 SHA512 38f402d1ecf125af7c454afdcee12221fa715f4e043c1a59073422025a12508a06a4bb77503bb75f6ed9603ff507499558bc1032157f5fc0aee9573bb18a6e4b
+DIST portage-3.0.20-bug-777492-a4d8829.patch 4549 BLAKE2B 9023c7bd3d173b48e1bfcf6d48c87f6b01731d6ec154132797c820a4c24ffedcaaf2eabf380d08c43238b377cb33c1be090fe8d213f8aef39b813ba2fab25672 SHA512 5575015216534bc0ddc0aa79bd2c1a96180d40dd8b3df61bb95e49a2d86e60da10a5eb8d658bf616da3f3f15ff6f4377d82e72ceca770304d2d79f1f25a26a11
+DIST portage-3.0.20-bug-796584-693f6bf.patch 2335 BLAKE2B 4922fad1fc34977b786555f1811e7b3b80e910bb940492eb735e95349f2ebb6c6f52642908fdc49e87c5f8b14f9171c8f32c627fe5ab472e645d5bc41c55bf33 SHA512 4032aef8de565e9ab166bf0f1b0fe4b4aec755eac4b8960dde57f89e08b00609a33cdce56f0f469292facb46aa088da4f3465cec935811cae4d00cca2254763b
+DIST portage-3.0.20-bug-796812-2ce11f0.patch 1292 BLAKE2B b7ca91f6d24e0eaf398ecdae8534ba19f88649ae91316a1cf074a04755a433038c04be49bce4d06306a03e25f7b83899205b971e40fba9248a56d5e65c48a2a8 SHA512 7de6d01d35e6e65be631a31e886b0b7d56d87211aeb1d5d3b8a60c3c6c510db368cca9280ea430675fd101434a15b3d1aef47d2a1d90a28fb634de46c2152768
+DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 9ffcf396b983accef3263efa9f7a6d515cb5b669643abc5dfe610577abec80713d8a202950d37ed78625446f2db37559639002745dea7cc973d47f8befadca06 SHA512 f4cdf3dec98f7ba7da4d5454f4e75408b64934f59e4e1fc9f391a8fe4832b03c4598eef0affba01a415bcc2135d09d682fa612116ed1dbd753783268af243aa8
 EBUILD portage-3.0.14.ebuild 8862 BLAKE2B 73e2b035fe7b2354bc54509bee2f881bc456138ebc71bee5bee95e82770df788fa5abc67010832b252fc9a7315fc53f5d7d60e6da3755e06511a88feb6b08b75 SHA512 534b91282a3939e7bcac69208a9a14573de7c107422c3e5dedb7bd5461ed479cb69f38e7e135660b212da093f29266fd05852ced346794d17d44c58b4b9e34e4
 EBUILD portage-3.0.18.ebuild 9223 BLAKE2B 9ead807d1a6894c88422c90204d8c39e5673b42b7fd9998640cbb57d56dfb115e6112ead8f8c962c0777a15eeafac0093b84a5a24cc8f1395911756fa1a5b668 SHA512 c5da02f09fe22111f7d87594fa83a7a28fb7c7431c9d0cc8e0d0c4a19fd761066b652b120a66b3166d3ac2c22d397e168d8467ae83be3a7c2aecd5cb6e4d0f28
+EBUILD portage-3.0.20.ebuild 10601 BLAKE2B 288e0c815f1dd6eaec386987f5d78d36ec0cd61a029e6fc4c9101377a6ac541c850bd791f921a41912570b0882772ac8629d6cd24a2a7dce9dea361f3da728b8 SHA512 c3002bf9b96a3a41c25ed72805699b2a03dbdc2aa79e01a1900deb73209dfce486947fd6e6395fd0a453330bfd63760a0a2627f18946020c78437c5ed044ef04
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmBoKlhfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmD9UVZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGe2YwQAvJISLNpnX3Vsw6uweHVFh341Obf9NXcXYfO9I50I+MNAZxYPOpfwm79Y
-HQegXyhilo/APxeDL3nKVQwnBf/xduCO4R82xPyDanWondFmeUN76T9P/UEpvdlH
-WuhmKbaOGVin9Yipc5XrQ4hsk3awClbOJX0jWc4H/0JRdzp8BrA=
-=VcPc
+kGdKwQQAvdB83U83NzxT0SudXgFNl3JkSdLVhNyqzgy2UjYANGP97sjpvS4W5pfd
+x8HqSVgj6gBznFAwaBCGl23kZA4hG3u/jRaBRWaX2NP3JPQrb2HPQyHXQO6T0Gzw
+pNN1bx35Uuphn344qQ9EeURui4sailoMwQSJFL7vvkFFdelJgnk=
+=W9mO
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.20.ebuild b/sys-apps/portage/portage-3.0.20.ebuild
new file mode 100644
index 000000000..1251839da
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.20.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
+
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="c0a00cde2d10eda4c207d488e01b48e0bfc75ce9"
+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 ~sparc ~x86"
+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 )
+	>=sys-apps/abi-wrapper-1.0-r6
+	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="
+	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:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	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
+	) )
+	!<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
+
+SRC_URI="
+	https://github.com/gentoo/portage/commit/a4d882964ee1931462f911d0c46a80e27e59fa48.patch -> portage-3.0.20-bug-777492-a4d8829.patch
+	https://github.com/gentoo/portage/commit/209be9a8bee13384dd04a4762436b4c2a5e35bc6.patch -> portage-3.0.20-bug-777492-209be9a.patch
+	https://github.com/gentoo/portage/compare/8e47286b7082aac21fe25402a1f9d03db968cd30...693f6bf5a54e2424e2ad49e1838b61f76bf78e40.patch -> portage-3.0.20-bug-796584-693f6bf.patch
+	https://github.com/gentoo/portage/commit/2ce11f06e48290efb2d4b6743c8edf01c176b0fc.patch -> portage-3.0.20-bug-796812-2ce11f0.patch
+	https://github.com/gentoo/portage/compare/2ce11f06e48290efb2d4b6743c8edf01c176b0fc...c3e4919fd004ce0f5c91c67ea377bbda83558ca9.patch -> portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Revert due to regressions:
+	# https://bugs.gentoo.org/777492
+	# https://github.com/gentoo/portage/pull/728
+	eapply -R "${DISTDIR}/portage-3.0.20-bug-777492-209be9a.patch"
+	eapply -R "${DISTDIR}/portage-3.0.20-bug-777492-a4d8829.patch"
+
+	# Apply regression fix for https://bugs.gentoo.org/796584.
+	eapply "${DISTDIR}/portage-3.0.20-bug-796584-693f6bf.patch"
+
+	# Apply EAPI 8 fix for https://bugs.gentoo.org/796812.
+	eapply "${DISTDIR}/portage-3.0.20-bug-796812-2ce11f0.patch"
+
+	# Apply EAPI 8 fix for https://bugs.gentoo.org/796959
+	eapply "${DISTDIR}/portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch"
+
+	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 ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		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
+
+	dotmpfiles "${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 -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+	env -u FEATURES -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || 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
+}
+
+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 ""
+}

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

[Thomas Sachau]

commit:     0ac7ac3af7beb10b67816c3610b61bd86b02f16e
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  3 08:36:00 2021 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Apr  3 08:36:00 2021 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=0ac7ac3a

sys-apps/portage: Version bump

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |  11 +-
 sys-apps/portage/portage-3.0.18.ebuild | 284 +++++++++++++++++++++++++++++++++
 2 files changed, 290 insertions(+), 5 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 9691ad5df..9cd0b1c96 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,14 +5,15 @@ AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 EBUILD portage-3.0.13.ebuild 8862 BLAKE2B fb6876b6bace59c6a11209b07eb7d0a11a292a04ee00f8f3517e8d24bc9089e83b2ad8fd1934b6ee435f579831fdc80cc690317c6439ad84791d6cdd5bf750de SHA512 0b10d05f1389fb054428254f0ba60b0fd90aa28e4d3e81b9b87944280f90120307e5aba92e61f8f28732292d161a50eab3636f51cf8459e5c518c3b3d9c8b0b7
 EBUILD portage-3.0.14.ebuild 8862 BLAKE2B 73e2b035fe7b2354bc54509bee2f881bc456138ebc71bee5bee95e82770df788fa5abc67010832b252fc9a7315fc53f5d7d60e6da3755e06511a88feb6b08b75 SHA512 534b91282a3939e7bcac69208a9a14573de7c107422c3e5dedb7bd5461ed479cb69f38e7e135660b212da093f29266fd05852ced346794d17d44c58b4b9e34e4
+EBUILD portage-3.0.18.ebuild 9223 BLAKE2B 9ead807d1a6894c88422c90204d8c39e5673b42b7fd9998640cbb57d56dfb115e6112ead8f8c962c0777a15eeafac0093b84a5a24cc8f1395911756fa1a5b668 SHA512 c5da02f09fe22111f7d87594fa83a7a28fb7c7431c9d0cc8e0d0c4a19fd761066b652b120a66b3166d3ac2c22d397e168d8467ae83be3a7c2aecd5cb6e4d0f28
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmAL87hfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmBoKOhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGeMEgQAh1JcxlSt/zI47gXneDE2qbNI3/YyZJUwD6EXjXb7cC1Qdfculj4t/48Q
-+XESVlmWbosHIYvQZiuaHfQdfkdaSK2goB9TlaEHCEcT/h91DcvaO5EaFUFhbTSZ
-OE8Jea0xVQraWNrVAV69693otQS2SykqAejdaP0Iynm810CNCaI=
-=0YyC
+kGdl+AP+J/IvkZA6xbrBuDW9eZpI8zL++g+SlXs9WrUwvz5anLFF9mlNWatnwF5x
+/QhxYX7CvozmfR9SgtQXnH+bdQKM2z1eJ6IxH1JO54YxqkCbzhLTxWCiQbyVHsZ6
+39c5FBHO8FL/SkrY+s5DKXRCKj+qKvr7qtzVzJsp44qbbMaROio=
+=3qhR
 -----END PGP SIGNATURE-----

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 000000000..cefb7bf30
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.18.ebuild
@@ -0,0 +1,284 @@
+# 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(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
+
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="639064263dbd0d1a0753d8e754c53ac0ff10768b"
+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 ~sparc ~x86"
+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 )
+	>=sys-apps/abi-wrapper-1.0-r6
+	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="
+	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:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	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
+	) )
+	!<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
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_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 ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		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
+
+	dotmpfiles "${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 -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+	env -u FEATURES -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || 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
+}
+
+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 ""
+}

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

[Thomas Sachau]

commit:     67ebdd862bb1cf8326d93668d507583715f39e1e
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  3 08:42:07 2021 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Apr  3 08:42:07 2021 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=67ebdd86

sys-apps/portage: Drop old version

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |  11 +-
 sys-apps/portage/portage-3.0.13.ebuild | 273 ---------------------------------
 2 files changed, 5 insertions(+), 279 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 9cd0b1c96..f155fecf5 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,17 +3,16 @@ Hash: SHA256
 
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-EBUILD portage-3.0.13.ebuild 8862 BLAKE2B fb6876b6bace59c6a11209b07eb7d0a11a292a04ee00f8f3517e8d24bc9089e83b2ad8fd1934b6ee435f579831fdc80cc690317c6439ad84791d6cdd5bf750de SHA512 0b10d05f1389fb054428254f0ba60b0fd90aa28e4d3e81b9b87944280f90120307e5aba92e61f8f28732292d161a50eab3636f51cf8459e5c518c3b3d9c8b0b7
 EBUILD portage-3.0.14.ebuild 8862 BLAKE2B 73e2b035fe7b2354bc54509bee2f881bc456138ebc71bee5bee95e82770df788fa5abc67010832b252fc9a7315fc53f5d7d60e6da3755e06511a88feb6b08b75 SHA512 534b91282a3939e7bcac69208a9a14573de7c107422c3e5dedb7bd5461ed479cb69f38e7e135660b212da093f29266fd05852ced346794d17d44c58b4b9e34e4
 EBUILD portage-3.0.18.ebuild 9223 BLAKE2B 9ead807d1a6894c88422c90204d8c39e5673b42b7fd9998640cbb57d56dfb115e6112ead8f8c962c0777a15eeafac0093b84a5a24cc8f1395911756fa1a5b668 SHA512 c5da02f09fe22111f7d87594fa83a7a28fb7c7431c9d0cc8e0d0c4a19fd761066b652b120a66b3166d3ac2c22d397e168d8467ae83be3a7c2aecd5cb6e4d0f28
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmBoKOhfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmBoKlhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGdl+AP+J/IvkZA6xbrBuDW9eZpI8zL++g+SlXs9WrUwvz5anLFF9mlNWatnwF5x
-/QhxYX7CvozmfR9SgtQXnH+bdQKM2z1eJ6IxH1JO54YxqkCbzhLTxWCiQbyVHsZ6
-39c5FBHO8FL/SkrY+s5DKXRCKj+qKvr7qtzVzJsp44qbbMaROio=
-=3qhR
+kGe2YwQAvJISLNpnX3Vsw6uweHVFh341Obf9NXcXYfO9I50I+MNAZxYPOpfwm79Y
+HQegXyhilo/APxeDL3nKVQwnBf/xduCO4R82xPyDanWondFmeUN76T9P/UEpvdlH
+WuhmKbaOGVin9Yipc5XrQ4hsk3awClbOJX0jWc4H/0JRdzp8BrA=
+=VcPc
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.13.ebuild b/sys-apps/portage/portage-3.0.13.ebuild
deleted file mode 100644
index 19d6e2157..000000000
--- a/sys-apps/portage/portage-3.0.13.ebuild
+++ /dev/null
@@ -1,273 +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 git-r3 linux-info multilib tmpfiles prefix
-
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="2cf0e1224b7d8f4016dda0c197539c85d86ec65c"
-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 ~sparc ~x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
-RESTRICT="!test? ( test )"
-
-BDEPEND="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 )
-	>=sys-apps/abi-wrapper-1.0-r6
-	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="
-	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:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	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
-	) )
-	!<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
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_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
-
-	dotmpfiles "${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: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
-}
-
-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 ""
-}

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

[Thomas Sachau]

commit:     9f53cd53c5a330bb4dc13ae472702fb72b6d04fd
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 10:00:24 2021 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 10:00:24 2021 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=9f53cd53

sys-apps/portage: Drop old version

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest             |  11 +-
 sys-apps/portage/portage-3.0.8.ebuild | 270 ----------------------------------
 2 files changed, 5 insertions(+), 276 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 4737756f7..9691ad5df 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,15 +5,14 @@ AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 EBUILD portage-3.0.13.ebuild 8862 BLAKE2B fb6876b6bace59c6a11209b07eb7d0a11a292a04ee00f8f3517e8d24bc9089e83b2ad8fd1934b6ee435f579831fdc80cc690317c6439ad84791d6cdd5bf750de SHA512 0b10d05f1389fb054428254f0ba60b0fd90aa28e4d3e81b9b87944280f90120307e5aba92e61f8f28732292d161a50eab3636f51cf8459e5c518c3b3d9c8b0b7
 EBUILD portage-3.0.14.ebuild 8862 BLAKE2B 73e2b035fe7b2354bc54509bee2f881bc456138ebc71bee5bee95e82770df788fa5abc67010832b252fc9a7315fc53f5d7d60e6da3755e06511a88feb6b08b75 SHA512 534b91282a3939e7bcac69208a9a14573de7c107422c3e5dedb7bd5461ed479cb69f38e7e135660b212da093f29266fd05852ced346794d17d44c58b4b9e34e4
-EBUILD portage-3.0.8.ebuild 8784 BLAKE2B 0678de7a5633682e184b021a68fba45369ea9a74c2b889f0480594d196e7531ed1e75443dd7c9d68e5c312c10b6ebaf5bf6bc5d13ab2958b87d3336702956a4c SHA512 9187fedf56d88c62d4ea8f5569aa5674ab7fabf16eed707c293011e07d89a127fd1ec74182e5c8e50be7bb9335ff8debe74566fa02ca841021fa85c7e5f8161b
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmAL86RfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmAL87hfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGeSIgQAxLvGOD/63GmtunklX4Twbj23RWYkJKOh45otihCWF8QYEfXZfCYhnMdk
-YE/zfoei8P7l5eEkQhFznACNoseLXkVLZu/qpuVT19sEhq3W4LBgf5czQy1Cy9iH
-QShch1cZK9HEsUI39FTGN7DvENETLpSNGUwmRphxg8KKaoophiE=
-=bL7t
+kGeMEgQAh1JcxlSt/zI47gXneDE2qbNI3/YyZJUwD6EXjXb7cC1Qdfculj4t/48Q
++XESVlmWbosHIYvQZiuaHfQdfkdaSK2goB9TlaEHCEcT/h91DcvaO5EaFUFhbTSZ
+OE8Jea0xVQraWNrVAV69693otQS2SykqAejdaP0Iynm810CNCaI=
+=0YyC
 -----END PGP SIGNATURE-----

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 a58d103cc..000000000
--- a/sys-apps/portage/portage-3.0.8.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# 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 git-r3 linux-info multilib tmpfiles prefix
-
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="06ad89f7678ba2284636a30db1e27f41450ea1e3"
-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 ~sparc ~x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test 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
-	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
-	>=sys-apps/findutils-4.4
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	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
-	) )
-	!<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
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_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
-
-	dotmpfiles "${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: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
-}
-
-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 ""
-}

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

[Thomas Sachau]

commit:     f86c2259bbaf5ae4518119e0157f428458da5e8b
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 10:00:04 2021 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 10:00:04 2021 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=f86c2259

sys-apps/portage: Drop old version

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest             |  11 +-
 sys-apps/portage/portage-3.0.4.ebuild | 269 ----------------------------------
 2 files changed, 5 insertions(+), 275 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b7f05e436..4737756f7 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,16 +5,15 @@ AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 EBUILD portage-3.0.13.ebuild 8862 BLAKE2B fb6876b6bace59c6a11209b07eb7d0a11a292a04ee00f8f3517e8d24bc9089e83b2ad8fd1934b6ee435f579831fdc80cc690317c6439ad84791d6cdd5bf750de SHA512 0b10d05f1389fb054428254f0ba60b0fd90aa28e4d3e81b9b87944280f90120307e5aba92e61f8f28732292d161a50eab3636f51cf8459e5c518c3b3d9c8b0b7
 EBUILD portage-3.0.14.ebuild 8862 BLAKE2B 73e2b035fe7b2354bc54509bee2f881bc456138ebc71bee5bee95e82770df788fa5abc67010832b252fc9a7315fc53f5d7d60e6da3755e06511a88feb6b08b75 SHA512 534b91282a3939e7bcac69208a9a14573de7c107422c3e5dedb7bd5461ed479cb69f38e7e135660b212da093f29266fd05852ced346794d17d44c58b4b9e34e4
-EBUILD portage-3.0.4.ebuild 8764 BLAKE2B 25c438cdbc500eccf27f8613fcbd16107f05e23be37413b9badb660e7455bace25a503c5e6299375505f0fd804e75e0ff3e4738b57beacf2950d4cf8a27c53d6 SHA512 569d2b903931e1704542468c46718e206ca5a524e48d9531eb302e4c0ab4580490ddee5292d3e8da77fcddf3ae8ef3b6c4e4149a15e83ba129a6422212263d6e
 EBUILD portage-3.0.8.ebuild 8784 BLAKE2B 0678de7a5633682e184b021a68fba45369ea9a74c2b889f0480594d196e7531ed1e75443dd7c9d68e5c312c10b6ebaf5bf6bc5d13ab2958b87d3336702956a4c SHA512 9187fedf56d88c62d4ea8f5569aa5674ab7fabf16eed707c293011e07d89a127fd1ec74182e5c8e50be7bb9335ff8debe74566fa02ca841021fa85c7e5f8161b
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmAL8olfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmAL86RfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGdt2AQApxn87oA7gX7P6xXMl2bB8AMm+TYOmW6FcIxFMyEnLG7+ZGHsOSnr3CJl
-j1IYDrta/0DXGQ68pDSbIgYWo5Y41/eH2ArOKM6AEHTNn6js37IYeUILLsiBb8h4
-ajlZPj1WAuGuznerkxRvfYsGuzI0nf2uPMP8r385GP/Dzz5sy9U=
-=K0+m
+kGeSIgQAxLvGOD/63GmtunklX4Twbj23RWYkJKOh45otihCWF8QYEfXZfCYhnMdk
+YE/zfoei8P7l5eEkQhFznACNoseLXkVLZu/qpuVT19sEhq3W4LBgf5czQy1Cy9iH
+QShch1cZK9HEsUI39FTGN7DvENETLpSNGUwmRphxg8KKaoophiE=
+=bL7t
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.4.ebuild b/sys-apps/portage/portage-3.0.4.ebuild
deleted file mode 100644
index 55845626a..000000000
--- a/sys-apps/portage/portage-3.0.4.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# 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 git-r3 linux-info multilib systemd prefix
-
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="9ab4d534816dd92345df6c0cc2a1c1343415a6bd"
-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 ~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 )
-	>=sys-apps/abi-wrapper-1.0-r6
-	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.4-r1[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	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
-	) )
-	!<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
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_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
-
-	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: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
-}
-
-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 ""
-}

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

[Thomas Sachau]

commit:     7f331eeebb5057ae6833b9bcae8e32bea3045c38
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 09:55:21 2021 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 09:55:21 2021 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=7f331eee

sys-apps/portage: Version bump

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |  11 +-
 sys-apps/portage/portage-3.0.14.ebuild | 273 +++++++++++++++++++++++++++++++++
 2 files changed, 279 insertions(+), 5 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 5c33538e0..b7f05e436 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -4,16 +4,17 @@ Hash: SHA256
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 EBUILD portage-3.0.13.ebuild 8862 BLAKE2B fb6876b6bace59c6a11209b07eb7d0a11a292a04ee00f8f3517e8d24bc9089e83b2ad8fd1934b6ee435f579831fdc80cc690317c6439ad84791d6cdd5bf750de SHA512 0b10d05f1389fb054428254f0ba60b0fd90aa28e4d3e81b9b87944280f90120307e5aba92e61f8f28732292d161a50eab3636f51cf8459e5c518c3b3d9c8b0b7
+EBUILD portage-3.0.14.ebuild 8862 BLAKE2B 73e2b035fe7b2354bc54509bee2f881bc456138ebc71bee5bee95e82770df788fa5abc67010832b252fc9a7315fc53f5d7d60e6da3755e06511a88feb6b08b75 SHA512 534b91282a3939e7bcac69208a9a14573de7c107422c3e5dedb7bd5461ed479cb69f38e7e135660b212da093f29266fd05852ced346794d17d44c58b4b9e34e4
 EBUILD portage-3.0.4.ebuild 8764 BLAKE2B 25c438cdbc500eccf27f8613fcbd16107f05e23be37413b9badb660e7455bace25a503c5e6299375505f0fd804e75e0ff3e4738b57beacf2950d4cf8a27c53d6 SHA512 569d2b903931e1704542468c46718e206ca5a524e48d9531eb302e4c0ab4580490ddee5292d3e8da77fcddf3ae8ef3b6c4e4149a15e83ba129a6422212263d6e
 EBUILD portage-3.0.8.ebuild 8784 BLAKE2B 0678de7a5633682e184b021a68fba45369ea9a74c2b889f0480594d196e7531ed1e75443dd7c9d68e5c312c10b6ebaf5bf6bc5d13ab2958b87d3336702956a4c SHA512 9187fedf56d88c62d4ea8f5569aa5674ab7fabf16eed707c293011e07d89a127fd1ec74182e5c8e50be7bb9335ff8debe74566fa02ca841021fa85c7e5f8161b
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmABzkhfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmAL8olfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGfTfAP5AROK6rj2XJleDkpl02Cwf9LdsCoogFS4E/uGRFJaAD03Ahhl99MRewm+
-UyNPDWOQbVXmvXbqG12f5dLlgV1ezRVEHaVyFc1s/Vml7qZgkUOAIPkwjt1aLVUh
-4WCbdTjbW9VRcw7P/CoQrDatgulxG2drKIQvT6Hf/OUBhOGrvvs=
-=SXhe
+kGdt2AQApxn87oA7gX7P6xXMl2bB8AMm+TYOmW6FcIxFMyEnLG7+ZGHsOSnr3CJl
+j1IYDrta/0DXGQ68pDSbIgYWo5Y41/eH2ArOKM6AEHTNn6js37IYeUILLsiBb8h4
+ajlZPj1WAuGuznerkxRvfYsGuzI0nf2uPMP8r385GP/Dzz5sy9U=
+=K0+m
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.14.ebuild b/sys-apps/portage/portage-3.0.14.ebuild
new file mode 100644
index 000000000..851a1c9e4
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.14.ebuild
@@ -0,0 +1,273 @@
+# 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 git-r3 linux-info multilib tmpfiles prefix
+
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="2663f1d5badc58440f289f67c53d7f661b90ee4e"
+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 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+RESTRICT="!test? ( test )"
+
+BDEPEND="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 )
+	>=sys-apps/abi-wrapper-1.0-r6
+	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="
+	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:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	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
+	) )
+	!<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
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_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
+
+	dotmpfiles "${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: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
+}
+
+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 ""
+}

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

[Thomas Sachau]

commit:     8a0fa195f026a5c72dbb4e84767954d111e43ec9
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 17:18:00 2021 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 17:18:00 2021 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=8a0fa195

sys-apps/portage: Update git commit

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              | 12 ++++++------
 sys-apps/portage/portage-3.0.13.ebuild |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 927436014..5c33538e0 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,17 +3,17 @@ Hash: SHA256
 
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-EBUILD portage-3.0.13.ebuild 8862 BLAKE2B 52241e311b5f848aeb1adb83422d20b0eda278b24985ab97ba6de67a577a140f1c113c140d00a78232dfd9e439b32b81aec55ef112aac74267b7cc4981580770 SHA512 c62efef1c0547dd6377840c9539fa476e975e1a66c0f13f8d41541591ddd7d474ff4edbd4a8989a573df4f89d20b0e46f08d2b3d6f9a7886a3652a5d256e2eeb
+EBUILD portage-3.0.13.ebuild 8862 BLAKE2B fb6876b6bace59c6a11209b07eb7d0a11a292a04ee00f8f3517e8d24bc9089e83b2ad8fd1934b6ee435f579831fdc80cc690317c6439ad84791d6cdd5bf750de SHA512 0b10d05f1389fb054428254f0ba60b0fd90aa28e4d3e81b9b87944280f90120307e5aba92e61f8f28732292d161a50eab3636f51cf8459e5c518c3b3d9c8b0b7
 EBUILD portage-3.0.4.ebuild 8764 BLAKE2B 25c438cdbc500eccf27f8613fcbd16107f05e23be37413b9badb660e7455bace25a503c5e6299375505f0fd804e75e0ff3e4738b57beacf2950d4cf8a27c53d6 SHA512 569d2b903931e1704542468c46718e206ca5a524e48d9531eb302e4c0ab4580490ddee5292d3e8da77fcddf3ae8ef3b6c4e4149a15e83ba129a6422212263d6e
 EBUILD portage-3.0.8.ebuild 8784 BLAKE2B 0678de7a5633682e184b021a68fba45369ea9a74c2b889f0480594d196e7531ed1e75443dd7c9d68e5c312c10b6ebaf5bf6bc5d13ab2958b87d3336702956a4c SHA512 9187fedf56d88c62d4ea8f5569aa5674ab7fabf16eed707c293011e07d89a127fd1ec74182e5c8e50be7bb9335ff8debe74566fa02ca841021fa85c7e5f8161b
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmABwvlfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmABzkhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGdfEwP+KRpWTFY2I6BNjbPIGdgg62bWgBdO7CzfTBpLvd9rmIua+r6NSLdP7l2B
-fmwRrTLabmBIIxCyPUtJMaKAC+x9ezIwvFoTbhW8ogh7QJtPpqf7ewHGrWG6AYX4
-yZFw05LC+y+3m8wZZPhX4mSnieYIdNIojrBWA2/XLpfL0i6VNZU=
-=jZ8p
+kGfTfAP5AROK6rj2XJleDkpl02Cwf9LdsCoogFS4E/uGRFJaAD03Ahhl99MRewm+
+UyNPDWOQbVXmvXbqG12f5dLlgV1ezRVEHaVyFc1s/Vml7qZgkUOAIPkwjt1aLVUh
+4WCbdTjbW9VRcw7P/CoQrDatgulxG2drKIQvT6Hf/OUBhOGrvvs=
+=SXhe
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-3.0.13.ebuild b/sys-apps/portage/portage-3.0.13.ebuild
index c6be34a63..19d6e2157 100644
--- a/sys-apps/portage/portage-3.0.13.ebuild
+++ b/sys-apps/portage/portage-3.0.13.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
 
 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="688a2012b8e4d5d66406e7d3ee2eb140569a4b20"
+EGIT_COMMIT="2cf0e1224b7d8f4016dda0c197539c85d86ec65c"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 

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

[Thomas Sachau]

commit:     82771e5f29a0aa32eb72807cc25080e7cf605e94
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 16:29:52 2021 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 16:29:52 2021 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=82771e5f

sys-apps/portage: Version bump

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest                          | 12 ++++-----
 ...age-2.3.103-r1.ebuild => portage-3.0.13.ebuild} | 30 ++++++++++++----------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 6728f60a5..927436014 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,17 +3,17 @@ Hash: SHA256
 
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-EBUILD portage-2.3.103-r1.ebuild 8768 BLAKE2B 0b7453cea3babe0c9a194ed09cf774d971cfb2fc2a5638fad18295efd0e1c8dc6f9af47dcaf9a2a5f173e670c990025cba6ba9826f822eded49b9248c2df52ad SHA512 ecbe93b4e6f91df99f86c5349663b2719bcad4a7ac16a259f7ed4fa7dac08d666e444f2085d547ed42d664a4f33423de5420b756d67b89cdb601f9aaa84b60a7
+EBUILD portage-3.0.13.ebuild 8862 BLAKE2B 52241e311b5f848aeb1adb83422d20b0eda278b24985ab97ba6de67a577a140f1c113c140d00a78232dfd9e439b32b81aec55ef112aac74267b7cc4981580770 SHA512 c62efef1c0547dd6377840c9539fa476e975e1a66c0f13f8d41541591ddd7d474ff4edbd4a8989a573df4f89d20b0e46f08d2b3d6f9a7886a3652a5d256e2eeb
 EBUILD portage-3.0.4.ebuild 8764 BLAKE2B 25c438cdbc500eccf27f8613fcbd16107f05e23be37413b9badb660e7455bace25a503c5e6299375505f0fd804e75e0ff3e4738b57beacf2950d4cf8a27c53d6 SHA512 569d2b903931e1704542468c46718e206ca5a524e48d9531eb302e4c0ab4580490ddee5292d3e8da77fcddf3ae8ef3b6c4e4149a15e83ba129a6422212263d6e
 EBUILD portage-3.0.8.ebuild 8784 BLAKE2B 0678de7a5633682e184b021a68fba45369ea9a74c2b889f0480594d196e7531ed1e75443dd7c9d68e5c312c10b6ebaf5bf6bc5d13ab2958b87d3336702956a4c SHA512 9187fedf56d88c62d4ea8f5569aa5674ab7fabf16eed707c293011e07d89a127fd1ec74182e5c8e50be7bb9335ff8debe74566fa02ca841021fa85c7e5f8161b
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAl+b8dFfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmABwvlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGdBAwP/cUhHw/288GZ41wUxtJne4AFPVG1tg05RKDvKIIECXoH7oKmbxZOj1k2m
-47YpqzA5dtPB2WUVnEy70ZgmnsdyEKutRkjxSPtvCstMQu14Pa2Jab3buHuD0y90
-TNglXZJ+vJsWMoGB2pjATG+z0XWs9YSKBBu4fTJ9v/TG34OSDnA=
-=qAbt
+kGdfEwP+KRpWTFY2I6BNjbPIGdgg62bWgBdO7CzfTBpLvd9rmIua+r6NSLdP7l2B
+fmwRrTLabmBIIxCyPUtJMaKAC+x9ezIwvFoTbhW8ogh7QJtPpqf7ewHGrWG6AYX4
+yZFw05LC+y+3m8wZZPhX4mSnieYIdNIojrBWA2/XLpfL0i6VNZU=
+=jZ8p
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-2.3.103-r1.ebuild b/sys-apps/portage/portage-3.0.13.ebuild
similarity index 90%
rename from sys-apps/portage/portage-2.3.103-r1.ebuild
rename to sys-apps/portage/portage-3.0.13.ebuild
index 223a1fd7e..c6be34a63 100644
--- a/sys-apps/portage/portage-2.3.103-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.13.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_{6..9} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 git-r3 linux-info multilib systemd prefix
+inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
 
 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="661e707be59a3e3c2973b81ac1cbe376248ed0d9"
+EGIT_COMMIT="688a2012b8e4d5d66406e7d3ee2eb140569a4b20"
 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 ~sparc ~x86"
 SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+RESTRICT="!test? ( test )"
 
+BDEPEND="test? ( dev-vcs/git )"
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
@@ -36,15 +38,17 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 # app-portage/gemato goes without PYTHON_USEDEP since we're calling
 # the executable.
 RDEPEND="
+	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:0[readline]
 		>=app-admin/eselect-1.2
 		rsync-verify? (
-			>=app-portage/gemato-14.4-r1[${PYTHON_USEDEP}]
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
 			>=app-crypt/openpgp-keys-gentoo-release-20180706
 			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
@@ -203,7 +207,7 @@ python_install_all() {
 		esetup.py "${targets[@]}"
 	fi
 
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+	dotmpfiles "${FILESDIR}"/portage-ccache.conf
 
 	# Due to distutils/python-exec limitations
 	# these must be installed to /usr/bin.
@@ -212,24 +216,24 @@ python_install_all() {
 	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!"
+		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"
+	[[ -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}}" \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
 		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
 	env -u BINPKG_COMPRESS \
-		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
 		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
 
 	# elog dir must exist to avoid logrotate error for bug #415911.
@@ -237,8 +241,8 @@ pkg_preinst() {
 	# 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}
+	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

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

[Thomas Sachau]

commit:     48e4392027554d55e149a82aa02b2ad6bc3eeb75
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 10:58:25 2020 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 10:58:25 2020 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=48e43920

sys-apps/portage: Version bump

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest             |  11 +-
 sys-apps/portage/portage-3.0.8.ebuild | 270 ++++++++++++++++++++++++++++++++++
 2 files changed, 276 insertions(+), 5 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 2dbcd2981..6728f60a5 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,14 +5,15 @@ AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 EBUILD portage-2.3.103-r1.ebuild 8768 BLAKE2B 0b7453cea3babe0c9a194ed09cf774d971cfb2fc2a5638fad18295efd0e1c8dc6f9af47dcaf9a2a5f173e670c990025cba6ba9826f822eded49b9248c2df52ad SHA512 ecbe93b4e6f91df99f86c5349663b2719bcad4a7ac16a259f7ed4fa7dac08d666e444f2085d547ed42d664a4f33423de5420b756d67b89cdb601f9aaa84b60a7
 EBUILD portage-3.0.4.ebuild 8764 BLAKE2B 25c438cdbc500eccf27f8613fcbd16107f05e23be37413b9badb660e7455bace25a503c5e6299375505f0fd804e75e0ff3e4738b57beacf2950d4cf8a27c53d6 SHA512 569d2b903931e1704542468c46718e206ca5a524e48d9531eb302e4c0ab4580490ddee5292d3e8da77fcddf3ae8ef3b6c4e4149a15e83ba129a6422212263d6e
+EBUILD portage-3.0.8.ebuild 8784 BLAKE2B 0678de7a5633682e184b021a68fba45369ea9a74c2b889f0480594d196e7531ed1e75443dd7c9d68e5c312c10b6ebaf5bf6bc5d13ab2958b87d3336702956a4c SHA512 9187fedf56d88c62d4ea8f5569aa5674ab7fabf16eed707c293011e07d89a127fd1ec74182e5c8e50be7bb9335ff8debe74566fa02ca841021fa85c7e5f8161b
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAl9CYMBfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAl+b8dFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGe9xgP/XPxDCwemHXJN0nyUvY3wLSjDzH2rHTPYomYPsmeX/An8sC0RBjS8CQCY
-YfAqvRDA2lPSntJ/HZ8GNepxQQxPyVT4MA9P+ZvhDRuO/mltTT0SWuFFoAj7BSHD
-OyyvMnDCBRz5Nc7zcghoaBYwdA6H7njch27gTSshvWCYh9FKve0=
-=7iNc
+kGdBAwP/cUhHw/288GZ41wUxtJne4AFPVG1tg05RKDvKIIECXoH7oKmbxZOj1k2m
+47YpqzA5dtPB2WUVnEy70ZgmnsdyEKutRkjxSPtvCstMQu14Pa2Jab3buHuD0y90
+TNglXZJ+vJsWMoGB2pjATG+z0XWs9YSKBBu4fTJ9v/TG34OSDnA=
+=qAbt
 -----END PGP SIGNATURE-----

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 000000000..a58d103cc
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.8.ebuild
@@ -0,0 +1,270 @@
+# 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 git-r3 linux-info multilib tmpfiles prefix
+
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="06ad89f7678ba2284636a30db1e27f41450ea1e3"
+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 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test 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
+	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
+	>=sys-apps/findutils-4.4
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	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
+	) )
+	!<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
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_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
+
+	dotmpfiles "${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: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
+}
+
+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 ""
+}

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

[Thomas Sachau]

commit:     7e6ac30871dd77d3f69e953b276dee1fe68e09ff
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  5 09:25:13 2020 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  5 09:25:13 2020 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=7e6ac308

sys-apps/portage: Version bump

Package-Manager: Portage-2.3.83, Repoman-2.3.22
RepoMan-Options: --force
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest               |  13 +-
 sys-apps/portage/metadata.xml           |   2 +
 sys-apps/portage/portage-2.3.103.ebuild | 269 ++++++++++++++++++++++++++++++++
 3 files changed, 278 insertions(+), 6 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index db4c1caaa..4d5cdbdb1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,15 +3,16 @@ 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 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
+MISC metadata.xml 1555 BLAKE2B dabf3d2f4c13dbbded9faf3c59e038c26a0f83a3dea57358334b92f8d04a605f3d3be8cef23815e33054560c27f19b30dded120e0234556fd2d0231691071608 SHA512 b2edbe91929d66f53140c133c27aba4b4962b1043992ce79ecd3c7482b75724e93c3ce6b6f4e00b306247359abe8a5449631b7d0f1c02e0dce1cfc26dc9760f5
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAl5ag0RfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAl8BnHBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGdUVwP/Qnt5jsoWMxQDXpGpdq0yOoq57JoT01cmXVAhFYUVoc8N5ule/NROxwrV
-iESsn8nSRca1D9twQxMH0CJLDhKVTXBm5Y56CdWxx9cDaBXyJMmL4UGbEPkb5EB3
-+e3/oJzss5gxjZCgkIt/7GKk/uGGsBgBYLC4CE/KyOyUG/ppPZA=
-=rRY7
+kGdaJAQA1ewTGjlswsteZzhKni1li3aLS0Mo89FROw+w+H5uGviAbmS2mrXhEZ8p
+JsMZDnt7CtN9NRtGrgXvemzn4p393sqhT2puEqnxe+klScA0XfTBfuD3wBimKp2i
+vhq3Pabkd+eQ11Z7EUiLVHJjKqY0WRg/xzV0M2VmQgmUCgRTC2E=
+=xpx6
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index 5d99599f6..5302ba2df 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -5,11 +5,13 @@
     <bugs-to>mailto:dev-portage@gentoo.org</bugs-to>
     <changelog>https://gitweb.gentoo.org/proj/portage.git/plain/RELEASE-NOTES</changelog>
     <doc>https://wiki.gentoo.org/wiki/Handbook:AMD64/Working/Portage</doc>
+    <remote-id type="cpe">cpe:/a:gentoo:portage</remote-id>
   </upstream>
   <maintainer type="project">
     <email>dev-portage@gentoo.org</email>
   </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

diff --git a/sys-apps/portage/portage-2.3.103.ebuild b/sys-apps/portage/portage-2.3.103.ebuild
new file mode 100644
index 000000000..d162fa178
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.103.ebuild
@@ -0,0 +1,269 @@
+# 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 git-r3 linux-info multilib systemd prefix
+
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="8045fb9bb75cea8a9195d7e71297ffd55f48c68c"
+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"
+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 )
+	>=sys-apps/abi-wrapper-1.0-r6
+	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_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
+	) )
+	!<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
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_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
+
+	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: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
+}
+
+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 ""
+}

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

[Thomas Sachau]

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 ""
-}

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

[Thomas Sachau]

commit:     abe22f182afbb7b5c00d659a8b439e0fadd78dd3
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 29 15:29:08 2020 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Feb 29 15:29:08 2020 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=abe22f18

sys-apps/portage: Update to git-r3 eclass, update repo_uri to https

Package-Manager: Portage-2.3.83, Repoman-2.3.20
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              | 12 ++++++------
 sys-apps/portage/portage-2.3.83.ebuild |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 928230528..db4c1caaa 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,15 +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.83.ebuild 8653 BLAKE2B e7a9892e867929c241a43ccd0c2afc758994aafc98db458a159e144dc6ee2f7b4019012deb4a4612678b2a85602a7bc2d35cb0ff947afb446b47307c285159f7 SHA512 6ce1e72eb76b9959b0fa3303448697a2e4a2ccc70358ade26bddd16b3fac897d0c98628c415456213fbf3d0abb3bb26e3349347992b27ee3253f026c39055a07
+EBUILD portage-2.3.83.ebuild 8660 BLAKE2B 1f0fb7d4e07f1773b6ba00394ddfbcc0901b16ebb652cbc097f4d6957e47ed42d7437bf45b17c40cbcf02649ec2e7cc2fec6b6cdbf8d1bff664191e090659f94 SHA512 664ba48f86e5fb7571b4ea693c9c7d750baeb604d6cc093ca74680030180cefebded21a6a2ab30927b2277a565923aa097942a904e0c13ac98eea097f3f87a9a
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAl5agtVfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAl5ag0RfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGeiPgQAphjQ0LQ3zj7/Dpe9qOBFSRYks3+klYgrenmOIzsV0MuaEuBnK64hIBSr
-PE9fe8v0szwiF/TPWjqF0OUCeepsm49qk76/oQa2p33ossWYMWjLUzMWmdwNFaI+
-i+VqrcyqIt0dolzFL184lMvLAatUQBnn+nYjFS0V3SQfFIRT0mc=
-=EoRj
+kGdUVwP/Qnt5jsoWMxQDXpGpdq0yOoq57JoT01cmXVAhFYUVoc8N5ule/NROxwrV
+iESsn8nSRca1D9twQxMH0CJLDhKVTXBm5Y56CdWxx9cDaBXyJMmL4UGbEPkb5EB3
++e3/oJzss5gxjZCgkIt/7GKk/uGGsBgBYLC4CE/KyOyUG/ppPZA=
+=rRY7
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-2.3.83.ebuild b/sys-apps/portage/portage-2.3.83.ebuild
index 15fc5f1b4..8496a7ebf 100644
--- a/sys-apps/portage/portage-2.3.83.ebuild
+++ b/sys-apps/portage/portage-2.3.83.ebuild
@@ -11,9 +11,9 @@ PYTHON_COMPAT=(
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 git-2 linux-info multilib systemd prefix
+inherit distutils-r1 git-r3 linux-info multilib systemd prefix
 
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
+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"

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

[Thomas Sachau]

commit:     653a4430aa189c31f10e448b312b1cec2fbf220d
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 29 15:27:24 2020 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Feb 29 15:27:24 2020 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=653a4430

sys-apps/portage: Drop old versions, update keywords

Package-Manager: Portage-2.3.83, Repoman-2.3.20
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |  17 +-
 sys-apps/portage/portage-2.3.52.ebuild | 270 --------------------------------
 sys-apps/portage/portage-2.3.62.ebuild | 277 ---------------------------------
 sys-apps/portage/portage-2.3.83.ebuild |   4 +-
 4 files changed, 16 insertions(+), 552 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 56f99ad0f..928230528 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-EBUILD portage-2.3.52.ebuild 9177 BLAKE2B 9582e49b6f99b0fe143c4fdbbdc860df052124b7223a51666a7739b8460cf87c0e845753de93360820f6af610e9977a72b6bb245fdba23915619c37b191378d9 SHA512 d726efed19ebe00514e57bd5ce7bd5e549aaa7164ce003eee36cab792288a7ce628fda61ec4be7eba229eece6449da8c52b276fe74c7e979fa762fd5558e1daf
-EBUILD portage-2.3.62.ebuild 9313 BLAKE2B 791935ee2bcdda2507dfe709cf198103b7bf4c1379ad66ac73655367cef90b4812a111e85cb08ed942d4bc65b0d4361d5927714739aec84e1fd3555ec5178cfd SHA512 c17efef67c6e1f9b65acd05d1e9aa0cd81e5b53438530529d7cb991baa2fab4d5346bbe6cc46589a8c20fff35e273ef62b9c17a02d302db891fc2ccf1479801b
-EBUILD portage-2.3.83.ebuild 8667 BLAKE2B e667865b0d9aad012bafa73b798fe110862c1d373a10ab43344d91387b55b056e616e14df6ff81ed75c97b05d2b8a4aca7126c656f1e350e50a3dc668ff8960c SHA512 5aa05757d228ee66ca2a17b9e54f030f77429576c1c6a0d79f9b2502f4b828a628146b786eee9dfbb1505714f2501d01961541ccb82684fcb096d0ada3be696a
+EBUILD portage-2.3.83.ebuild 8653 BLAKE2B e7a9892e867929c241a43ccd0c2afc758994aafc98db458a159e144dc6ee2f7b4019012deb4a4612678b2a85602a7bc2d35cb0ff947afb446b47307c285159f7 SHA512 6ce1e72eb76b9959b0fa3303448697a2e4a2ccc70358ade26bddd16b3fac897d0c98628c415456213fbf3d0abb3bb26e3349347992b27ee3253f026c39055a07
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
+-----BEGIN PGP SIGNATURE-----
+
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAl5agtVfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
+MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
+kGeiPgQAphjQ0LQ3zj7/Dpe9qOBFSRYks3+klYgrenmOIzsV0MuaEuBnK64hIBSr
+PE9fe8v0szwiF/TPWjqF0OUCeepsm49qk76/oQa2p33ossWYMWjLUzMWmdwNFaI+
+i+VqrcyqIt0dolzFL184lMvLAatUQBnn+nYjFS0V3SQfFIRT0mc=
+=EoRj
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-2.3.52.ebuild b/sys-apps/portage/portage-2.3.52.ebuild
deleted file mode 100644
index 06b72fd8f..000000000
--- a/sys-apps/portage/portage-2.3.52.ebuild
+++ /dev/null
@@ -1,270 +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 distutils-r1 git-2 multilib systemd
-
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="533044621a8608b0186ae79eeaa994a0a40a7204"
-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 ~mips ~ppc ~ppc64 ~s390 ~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 )
-	>=sys-apps/abi-wrapper-1.0-r6
-	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_4,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 )
-	>=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/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_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} ipc-sandbox network-sandbox 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|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i lib/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		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 -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		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() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# 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 ""
-}

diff --git a/sys-apps/portage/portage-2.3.62.ebuild b/sys-apps/portage/portage-2.3.62.ebuild
deleted file mode 100644
index 61d17e9bb..000000000
--- a/sys-apps/portage/portage-2.3.62.ebuild
+++ /dev/null
@@ -1,277 +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 distutils-r1 git-2 linux-info multilib systemd
-
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="88a712b0cf17c1bc47de174f8f1219d24912eee6"
-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 ~mips ~ppc ~ppc64 ~s390 ~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 )
-	>=sys-apps/abi-wrapper-1.0-r6
-	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_4,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/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} ipc-sandbox network-sandbox 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|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i lib/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		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 -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		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() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# 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 ""
-}

diff --git a/sys-apps/portage/portage-2.3.83.ebuild b/sys-apps/portage/portage-2.3.83.ebuild
index c8470d3c8..15fc5f1b4 100644
--- a/sys-apps/portage/portage-2.3.83.ebuild
+++ b/sys-apps/portage/portage-2.3.83.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 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"
+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"
 

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

[Thomas Sachau]

commit:     ed5d95a6fcfd7e2ee48a2d8a94b2ba6fe77f132e
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 12:38:10 2019 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 12:38:10 2019 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=ed5d95a6

Bump to fixed version

Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              | 2 +-
 sys-apps/portage/portage-2.3.83.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8d7a60d78..56f99ad0f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,5 +2,5 @@ AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 EBUILD portage-2.3.52.ebuild 9177 BLAKE2B 9582e49b6f99b0fe143c4fdbbdc860df052124b7223a51666a7739b8460cf87c0e845753de93360820f6af610e9977a72b6bb245fdba23915619c37b191378d9 SHA512 d726efed19ebe00514e57bd5ce7bd5e549aaa7164ce003eee36cab792288a7ce628fda61ec4be7eba229eece6449da8c52b276fe74c7e979fa762fd5558e1daf
 EBUILD portage-2.3.62.ebuild 9313 BLAKE2B 791935ee2bcdda2507dfe709cf198103b7bf4c1379ad66ac73655367cef90b4812a111e85cb08ed942d4bc65b0d4361d5927714739aec84e1fd3555ec5178cfd SHA512 c17efef67c6e1f9b65acd05d1e9aa0cd81e5b53438530529d7cb991baa2fab4d5346bbe6cc46589a8c20fff35e273ef62b9c17a02d302db891fc2ccf1479801b
-EBUILD portage-2.3.83.ebuild 8667 BLAKE2B 0ab6b9807b25e59933a781ffdd2524be94d2f05528e7c547268b79b5daa9de16489a35caeb7a06d58ced75b9aec8a8f34e961ef7b8079155002bf2a7612a2802 SHA512 9da0aa9fc4c8c5773349ca51b5520754a16585911a4c262865eada2ab55b10d0d3c8ae808d2897db39ee58fbb3232e8c5c610a4c0333773478a42893d10cfa6c
+EBUILD portage-2.3.83.ebuild 8667 BLAKE2B e667865b0d9aad012bafa73b798fe110862c1d373a10ab43344d91387b55b056e616e14df6ff81ed75c97b05d2b8a4aca7126c656f1e350e50a3dc668ff8960c SHA512 5aa05757d228ee66ca2a17b9e54f030f77429576c1c6a0d79f9b2502f4b828a628146b786eee9dfbb1505714f2501d01961541ccb82684fcb096d0ada3be696a
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59

diff --git a/sys-apps/portage/portage-2.3.83.ebuild b/sys-apps/portage/portage-2.3.83.ebuild
index 7105fe198..c8470d3c8 100644
--- a/sys-apps/portage/portage-2.3.83.ebuild
+++ b/sys-apps/portage/portage-2.3.83.ebuild
@@ -15,7 +15,7 @@ inherit distutils-r1 git-2 linux-info multilib systemd prefix
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="a757c986855dee5574a1b773f45d3d976d55edd0"
+EGIT_COMMIT="d0102f790d48ba22877d8ca0d0c0698e54154efb"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 

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

[Thomas Sachau]

commit:     1fbc6d3cdddcf3e2733be51240e61536a0f02a46
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 12:10:20 2019 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 12:10:20 2019 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=1fbc6d3c

Add missing Manifest

Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b50568742..8d7a60d78 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,17 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-EBUILD portage-2.3.48.ebuild 9180 BLAKE2B f0ef7de50ec4cbbd8aba17a54de8daccb26ebaa285a413e28a21a8445a728d564a0cc5653392bb6489f56e1195bb9f734174231926552e56ab989a01f3a0166c SHA512 1bc66f56d8bf7c49cd543b8e95053f5753bbf0951dceea788d7c48b71948c32051ffdf63b81c501ac9f8fadb6af3575c5a391b06909e66925088fa22e0ad6e4e
 EBUILD portage-2.3.52.ebuild 9177 BLAKE2B 9582e49b6f99b0fe143c4fdbbdc860df052124b7223a51666a7739b8460cf87c0e845753de93360820f6af610e9977a72b6bb245fdba23915619c37b191378d9 SHA512 d726efed19ebe00514e57bd5ce7bd5e549aaa7164ce003eee36cab792288a7ce628fda61ec4be7eba229eece6449da8c52b276fe74c7e979fa762fd5558e1daf
 EBUILD portage-2.3.62.ebuild 9313 BLAKE2B 791935ee2bcdda2507dfe709cf198103b7bf4c1379ad66ac73655367cef90b4812a111e85cb08ed942d4bc65b0d4361d5927714739aec84e1fd3555ec5178cfd SHA512 c17efef67c6e1f9b65acd05d1e9aa0cd81e5b53438530529d7cb991baa2fab4d5346bbe6cc46589a8c20fff35e273ef62b9c17a02d302db891fc2ccf1479801b
+EBUILD portage-2.3.83.ebuild 8667 BLAKE2B 0ab6b9807b25e59933a781ffdd2524be94d2f05528e7c547268b79b5daa9de16489a35caeb7a06d58ced75b9aec8a8f34e961ef7b8079155002bf2a7612a2802 SHA512 9da0aa9fc4c8c5773349ca51b5520754a16585911a4c262865eada2ab55b10d0d3c8ae808d2897db39ee58fbb3232e8c5c610a4c0333773478a42893d10cfa6c
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
------BEGIN PGP SIGNATURE-----
-
-iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCXI4yIQAKCRAbuSpxNYmQ
-Z1/kA/43MIHniq4mN/nfKRa7EougrMFcHayXu2cEA2qdvSs9zfjEvafA7e/bn5AZ
-SavaW9yLcwc1s9KmqN/2SL6AYz/HbYhA86KnWje1gJTNTmMjJoVKgtzTCnDbVjCM
-cjZ3vPnIkbvdRV4n6w+RJCzLeWVzivNs9gjjXLnVPhWv28kBvQ==
-=CYJu
------END PGP SIGNATURE-----

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

[Thomas Sachau]

commit:     a6a6bb1ada57fd1f63b9a5c4edbe580312976ebb
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 12:08:04 2019 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 12:08:04 2019 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=a6a6bb1a

Version bump, drop old

Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 ...portage-2.3.48.ebuild => portage-2.3.83.ebuild} | 72 +++++++++++-----------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/sys-apps/portage/portage-2.3.48.ebuild b/sys-apps/portage/portage-2.3.83.ebuild
similarity index 79%
rename from sys-apps/portage/portage-2.3.48.ebuild
rename to sys-apps/portage/portage-2.3.83.ebuild
index c7e23d65e..7105fe198 100644
--- a/sys-apps/portage/portage-2.3.48.ebuild
+++ b/sys-apps/portage/portage-2.3.83.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=(
 	pypy
-	python3_4 python3_5 python3_6 python3_7
+	python3_5 python3_6 python3_7 python3_8
 	python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 git-2 multilib systemd
+inherit distutils-r1 git-2 linux-info multilib systemd prefix
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="cb6737033d90f57168ed12e4b0cec8711b311b36"
+EGIT_COMMIT="a757c986855dee5574a1b773f45d3d976d55edd0"
 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
@@ -29,7 +30,11 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=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? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+	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
@@ -47,7 +52,7 @@ RDEPEND="
 		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)
+			python{2_7,3_5} pypy)
 		rsync-verify? (
 			>=app-portage/gemato-14[${PYTHON_USEDEP}]
 			>=app-crypt/openpgp-keys-gentoo-release-20180706
@@ -58,6 +63,7 @@ RDEPEND="
 	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? (
@@ -67,6 +73,7 @@ RDEPEND="
 	) )
 	!<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? (
@@ -78,6 +85,12 @@ PDEPEND="
 
 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 )
 }
@@ -92,7 +105,7 @@ python_prepare_all() {
 			die "failed to patch create_depgraph_params.py"
 
 		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+		echo 'FEATURES="${FEATURES} strict-keepdir"' \
 			>> cnf/make.globals || die
 	fi
 
@@ -116,19 +129,14 @@ python_prepare_all() {
 
 	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 ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i lib/portage/const.py || \
-			die "Failed to patch 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
@@ -137,17 +145,11 @@ python_prepare_all() {
 				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
 					die "sed failed"
 			fi
-		done < <(find . -type f -print0)
+		done < <(find . -type f ! -name etc-update -print0)
 
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
 
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
 		if use prefix-guest ; then
 			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
 				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
@@ -232,16 +234,16 @@ python_install_all() {
 }
 
 pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
+	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

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

[Thomas Sachau]

commit:     14dc153dcf85fc70fa7a874667f9506a6f85b6d6
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 11:40:22 2019 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 11:40:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=14dc153d

sys-apps/portage: Version bump

Package-Manager: Portage-2.3.52, Repoman-2.3.12
RepoMan-Options: --force
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |  11 +-
 sys-apps/portage/portage-2.3.62.ebuild | 277 +++++++++++++++++++++++++++++++++
 2 files changed, 283 insertions(+), 5 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f0606db8c..b50568742 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,12 +5,13 @@ AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 EBUILD portage-2.3.48.ebuild 9180 BLAKE2B f0ef7de50ec4cbbd8aba17a54de8daccb26ebaa285a413e28a21a8445a728d564a0cc5653392bb6489f56e1195bb9f734174231926552e56ab989a01f3a0166c SHA512 1bc66f56d8bf7c49cd543b8e95053f5753bbf0951dceea788d7c48b71948c32051ffdf63b81c501ac9f8fadb6af3575c5a391b06909e66925088fa22e0ad6e4e
 EBUILD portage-2.3.52.ebuild 9177 BLAKE2B 9582e49b6f99b0fe143c4fdbbdc860df052124b7223a51666a7739b8460cf87c0e845753de93360820f6af610e9977a72b6bb245fdba23915619c37b191378d9 SHA512 d726efed19ebe00514e57bd5ce7bd5e549aaa7164ce003eee36cab792288a7ce628fda61ec4be7eba229eece6449da8c52b276fe74c7e979fa762fd5558e1daf
+EBUILD portage-2.3.62.ebuild 9313 BLAKE2B 791935ee2bcdda2507dfe709cf198103b7bf4c1379ad66ac73655367cef90b4812a111e85cb08ed942d4bc65b0d4361d5927714739aec84e1fd3555ec5178cfd SHA512 c17efef67c6e1f9b65acd05d1e9aa0cd81e5b53438530529d7cb991baa2fab4d5346bbe6cc46589a8c20fff35e273ef62b9c17a02d302db891fc2ccf1479801b
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
 -----BEGIN PGP SIGNATURE-----
 
-iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCXI4v1wAKCRAbuSpxNYmQ
-Z0tUA/94DNka/e0klp5zk0ahHNS2cQsP13DeO7EvGktWesJR+QAta463/1RA0mkz
-R4SOXOhQqdvag5RDROTzXkHHV1Gt80Zigc0xKCpplSgwpUnSpBjxjXLy9LrHkvQy
-bX/PBYDygxUmTpVaRZ1LP+zfF8Xb6Gz5jUMghHua67/YgpUzfA==
-=/kDN
+iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCXI4yIQAKCRAbuSpxNYmQ
+Z1/kA/43MIHniq4mN/nfKRa7EougrMFcHayXu2cEA2qdvSs9zfjEvafA7e/bn5AZ
+SavaW9yLcwc1s9KmqN/2SL6AYz/HbYhA86KnWje1gJTNTmMjJoVKgtzTCnDbVjCM
+cjZ3vPnIkbvdRV4n6w+RJCzLeWVzivNs9gjjXLnVPhWv28kBvQ==
+=CYJu
 -----END PGP SIGNATURE-----

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 000000000..61d17e9bb
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.62.ebuild
@@ -0,0 +1,277 @@
+# 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 distutils-r1 git-2 linux-info multilib systemd
+
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="88a712b0cf17c1bc47de174f8f1219d24912eee6"
+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 ~mips ~ppc ~ppc64 ~s390 ~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 )
+	>=sys-apps/abi-wrapper-1.0-r6
+	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_4,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/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} ipc-sandbox network-sandbox 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|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i lib/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		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 -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+			-i cnf/repos.conf || die "sed failed"
+		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() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# 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 ""
+}

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

[Thomas Sachau]

commit:     c24338aa18e64ea3e12c91112fbe7ac23b4bae6a
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 11:29:28 2019 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 11:29:28 2019 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=c24338aa

sys-apps/portage: Version bump

Package-Manager: Portage-2.3.48, Repoman-2.3.12
RepoMan-Options: --force
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |  12 ++
 sys-apps/portage/portage-2.3.52.ebuild | 270 +++++++++++++++++++++++++++++++++
 2 files changed, 282 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 9200dbdf7..14388a302 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 EBUILD portage-2.3.38.ebuild 9488 BLAKE2B 612ab5e2a56c01242447390f4a241727732589d1a5dde7bec9c3c98b0b05196d41f6f5a7dfd89d8b7d78327a0fc33b4f0a9cecfe3b0587086072cb769b32f3c9 SHA512 a7171a525d60d590b37f403822325861995b5ab5f7280e31b6822dae76142c88e733cf0455a2b82044aca790d767b6fe862ae563b9122c0bb7ec7be570062d0d
 EBUILD portage-2.3.48.ebuild 9180 BLAKE2B f0ef7de50ec4cbbd8aba17a54de8daccb26ebaa285a413e28a21a8445a728d564a0cc5653392bb6489f56e1195bb9f734174231926552e56ab989a01f3a0166c SHA512 1bc66f56d8bf7c49cd543b8e95053f5753bbf0951dceea788d7c48b71948c32051ffdf63b81c501ac9f8fadb6af3575c5a391b06909e66925088fa22e0ad6e4e
+EBUILD portage-2.3.52.ebuild 9177 BLAKE2B 9582e49b6f99b0fe143c4fdbbdc860df052124b7223a51666a7739b8460cf87c0e845753de93360820f6af610e9977a72b6bb245fdba23915619c37b191378d9 SHA512 d726efed19ebe00514e57bd5ce7bd5e549aaa7164ce003eee36cab792288a7ce628fda61ec4be7eba229eece6449da8c52b276fe74c7e979fa762fd5558e1daf
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
+-----BEGIN PGP SIGNATURE-----
+
+iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCXI4vkQAKCRAbuSpxNYmQ
+Z4e7BACRIOBmsaSU+GsW5eN+DLUg9KcHdjBttQwvgpk73cYWzNn0qwZ5u0wMZ88K
+sROscAfEZxqy1f88nOT5RNADxOMd3x18irg/nc6JKsl2a8sxFZuVrseCMO4H1ffu
+VZ/zCB2h+7D90naH24A0QkaOylg3s5HDMN52n+K32TKAhAzR8Q==
+=yj/n
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-2.3.52.ebuild b/sys-apps/portage/portage-2.3.52.ebuild
new file mode 100644
index 000000000..06b72fd8f
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.52.ebuild
@@ -0,0 +1,270 @@
+# 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 distutils-r1 git-2 multilib systemd
+
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="533044621a8608b0186ae79eeaa994a0a40a7204"
+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 ~mips ~ppc ~ppc64 ~s390 ~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 )
+	>=sys-apps/abi-wrapper-1.0-r6
+	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_4,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 )
+	>=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/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_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} ipc-sandbox network-sandbox 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|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i lib/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		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 -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+			-i cnf/repos.conf || die "sed failed"
+		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() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# 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 ""
+}

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

[Thomas Sachau]

commit:     6280b5337fff05a41a1f7e223b0635891099017f
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 11:30:31 2019 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 11:30:31 2019 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=6280b533

sys-apps/portage: Drop old

Package-Manager: Portage-2.3.48, Repoman-2.3.12
RepoMan-Options: --force
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 sys-apps/portage/Manifest              |  11 +-
 sys-apps/portage/portage-2.3.38.ebuild | 282 ---------------------------------
 2 files changed, 5 insertions(+), 288 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 14388a302..f0606db8c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,15 +3,14 @@ Hash: SHA256
 
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-EBUILD portage-2.3.38.ebuild 9488 BLAKE2B 612ab5e2a56c01242447390f4a241727732589d1a5dde7bec9c3c98b0b05196d41f6f5a7dfd89d8b7d78327a0fc33b4f0a9cecfe3b0587086072cb769b32f3c9 SHA512 a7171a525d60d590b37f403822325861995b5ab5f7280e31b6822dae76142c88e733cf0455a2b82044aca790d767b6fe862ae563b9122c0bb7ec7be570062d0d
 EBUILD portage-2.3.48.ebuild 9180 BLAKE2B f0ef7de50ec4cbbd8aba17a54de8daccb26ebaa285a413e28a21a8445a728d564a0cc5653392bb6489f56e1195bb9f734174231926552e56ab989a01f3a0166c SHA512 1bc66f56d8bf7c49cd543b8e95053f5753bbf0951dceea788d7c48b71948c32051ffdf63b81c501ac9f8fadb6af3575c5a391b06909e66925088fa22e0ad6e4e
 EBUILD portage-2.3.52.ebuild 9177 BLAKE2B 9582e49b6f99b0fe143c4fdbbdc860df052124b7223a51666a7739b8460cf87c0e845753de93360820f6af610e9977a72b6bb245fdba23915619c37b191378d9 SHA512 d726efed19ebe00514e57bd5ce7bd5e549aaa7164ce003eee36cab792288a7ce628fda61ec4be7eba229eece6449da8c52b276fe74c7e979fa762fd5558e1daf
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
 -----BEGIN PGP SIGNATURE-----
 
-iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCXI4vkQAKCRAbuSpxNYmQ
-Z4e7BACRIOBmsaSU+GsW5eN+DLUg9KcHdjBttQwvgpk73cYWzNn0qwZ5u0wMZ88K
-sROscAfEZxqy1f88nOT5RNADxOMd3x18irg/nc6JKsl2a8sxFZuVrseCMO4H1ffu
-VZ/zCB2h+7D90naH24A0QkaOylg3s5HDMN52n+K32TKAhAzR8Q==
-=yj/n
+iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCXI4v1wAKCRAbuSpxNYmQ
+Z0tUA/94DNka/e0klp5zk0ahHNS2cQsP13DeO7EvGktWesJR+QAta463/1RA0mkz
+R4SOXOhQqdvag5RDROTzXkHHV1Gt80Zigc0xKCpplSgwpUnSpBjxjXLy9LrHkvQy
+bX/PBYDygxUmTpVaRZ1LP+zfF8Xb6Gz5jUMghHua67/YgpUzfA==
+=/kDN
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-2.3.38.ebuild b/sys-apps/portage/portage-2.3.38.ebuild
deleted file mode 100644
index e3afb0c82..000000000
--- a/sys-apps/portage/portage-2.3.38.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# 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 distutils-r1 git-2 multilib systemd
-
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="370a5832a66713a17ff010f137fda7cfc7a26fe3"
-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 ~mips ~ppc ~ppc64 ~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 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )
-	>=sys-apps/abi-wrapper-1.0-r6"
-# 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_4,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-12.1
-			app-crypt/openpgp-keys-gentoo-release
-			>=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 )
-	>=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"
-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_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 pym/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox 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 pym/_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|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		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 -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		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() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# 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.1" && \
-		has_version "<${CATEGORY}/${PN}-2.3.3"; then
-		SYNC_DEPTH_UPGRADE=true
-	else
-		SYNC_DEPTH_UPGRADE=false
-	fi
-}
-
-pkg_postinst() {
-	if ${SYNC_DEPTH_UPGRADE}; then
-		ewarn "Please note that this release no longer respects sync-depth for"
-		ewarn "git repositories.  There have been too many problems and"
-		ewarn "performance issues.  See bugs 552814, 559008"
-	fi
-
-	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 ""
-}

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

[Thomas Sachau]

commit:     a31780f7d5d601390f055bcd9457482fd8830d82
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  1 10:57:27 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Sep  1 10:57:27 2018 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=a31780f7

Version bump, drop old

 sys-apps/portage/Manifest                          | 13 +-------
 ...portage-2.3.28.ebuild => portage-2.3.48.ebuild} | 36 ++++++++--------------
 2 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a24caa97a..9200dbdf7 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,16 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-EBUILD portage-2.3.28.ebuild 9472 BLAKE2B 1aff941173e46a1773970efc55a475241b9a4e7f48a265cd1b6e5227909d317b4ef02b7ff4284e3170923ce896ec3b0cfc42fa5e282b0a776d3527dc28069e64 SHA512 e227ac35eb4c57f6c7ad5c79f1d7b0cd7c39348c27dedecc9e81d28ad8e84ef774c1124b4ecac3b838540346dbfc34715ac2d9b3556702f537d0919549493dc5
 EBUILD portage-2.3.38.ebuild 9488 BLAKE2B 612ab5e2a56c01242447390f4a241727732589d1a5dde7bec9c3c98b0b05196d41f6f5a7dfd89d8b7d78327a0fc33b4f0a9cecfe3b0587086072cb769b32f3c9 SHA512 a7171a525d60d590b37f403822325861995b5ab5f7280e31b6822dae76142c88e733cf0455a2b82044aca790d767b6fe862ae563b9122c0bb7ec7be570062d0d
+EBUILD portage-2.3.48.ebuild 9180 BLAKE2B f0ef7de50ec4cbbd8aba17a54de8daccb26ebaa285a413e28a21a8445a728d564a0cc5653392bb6489f56e1195bb9f734174231926552e56ab989a01f3a0166c SHA512 1bc66f56d8bf7c49cd543b8e95053f5753bbf0951dceea788d7c48b71948c32051ffdf63b81c501ac9f8fadb6af3575c5a391b06909e66925088fa22e0ad6e4e
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
------BEGIN PGP SIGNATURE-----
-
-iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCWwVi5AAKCRAbuSpxNYmQ
-Z4REA/0dqnLkuz3U7zeNZ/rqFybrLT5vLkJweDuDnmMXs6sRHTDqHtnlEliaVnz8
-38LmjOXjwZ6r2gEIhucZ3/uFFr/8Ja/cIF5S0zE7gp+TvIb2zPjuOvo80clgJKph
-stpqjtWUTpztA/uLLySyYWFqXq2m3JSB2JjgiiT2GnGzyUZxMA==
-=ikeW
------END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-2.3.28.ebuild b/sys-apps/portage/portage-2.3.48.ebuild
similarity index 92%
rename from sys-apps/portage/portage-2.3.28.ebuild
rename to sys-apps/portage/portage-2.3.48.ebuild
index 69cb0e980..c7e23d65e 100644
--- a/sys-apps/portage/portage-2.3.28.ebuild
+++ b/sys-apps/portage/portage-2.3.48.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 PYTHON_COMPAT=(
 	pypy
-	python3_4 python3_5 python3_6
+	python3_4 python3_5 python3_6 python3_7
 	python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
@@ -14,12 +14,12 @@ inherit distutils-r1 git-2 multilib systemd
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="bc55fa6c10f027ba1eb986d3fc6698cd009eff54"
+EGIT_COMMIT="cb6737033d90f57168ed12e4b0cec8711b311b36"
 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 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
@@ -28,8 +28,8 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	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*')] )
-	>=sys-apps/abi-wrapper-1.0-r6"
+	>=sys-apps/abi-wrapper-1.0-r6
+	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
@@ -49,8 +49,8 @@ RDEPEND="
 		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
 			python{2_7,3_4,3_5} pypy)
 		rsync-verify? (
-			>=app-portage/gemato-12.1
-			app-crypt/gentoo-keys
+			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
 			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
 	)
@@ -66,7 +66,8 @@ RDEPEND="
 			python2_7 pypy)
 	) )
 	!<app-admin/logrotate-3.8.0
-	>=sys-apps/abi-wrapper-1.0-r6"
+	>=sys-apps/abi-wrapper-1.0-r6
+	!<app-portage/repoman-2.3.10"
 PDEPEND="
 	!build? (
 		>=net-misc/rsync-2.6.4
@@ -87,7 +88,7 @@ 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 pym/_emerge/create_depgraph_params.py || \
+			-i lib/_emerge/create_depgraph_params.py || \
 			die "failed to patch create_depgraph_params.py"
 
 		einfo "Enabling additional FEATURES for gentoo-dev..."
@@ -103,7 +104,7 @@ python_prepare_all() {
 	if ! use ipc ; then
 		einfo "Disabling ipc..."
 		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
 			die "failed to patch AbstractEbuildProcess.py"
 	fi
 
@@ -126,7 +127,7 @@ python_prepare_all() {
 			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
 			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
 			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
+			-i lib/portage/const.py || \
 			die "Failed to patch portage.const.EPREFIX"
 
 		einfo "Prefixing shebangs ..."
@@ -250,22 +251,9 @@ pkg_preinst() {
 	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.1" && \
-		has_version "<${CATEGORY}/${PN}-2.3.3"; then
-		SYNC_DEPTH_UPGRADE=true
-	else
-		SYNC_DEPTH_UPGRADE=false
-	fi
 }
 
 pkg_postinst() {
-	if ${SYNC_DEPTH_UPGRADE}; then
-		ewarn "Please note that this release no longer respects sync-depth for"
-		ewarn "git repositories.  There have been too many problems and"
-		ewarn "performance issues.  See bugs 552814, 559008"
-	fi
-
 	einfo
 	elog "For setup instructions after switching to portage-multilib"
 	elog "read doc/portage-multilib-instructions inside the multilib overlay"

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

[Thomas Sachau]

commit:     1e59cd89e664555492d525db8920d08c0a3378c9
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Wed May 23 12:33:12 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Wed May 23 12:33:12 2018 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=1e59cd89

sys-apps/portage: Version bump, drop old

Package-Manager: Portage-2.3.28, Repoman-2.3.9
Manifest-Sign-Key: 0xC05330B3211CA2D4

 sys-apps/portage/Manifest                          |  16 +-
 sys-apps/portage/portage-2.3.28.ebuild             |   2 +-
 ...portage-2.3.24.ebuild => portage-2.3.38.ebuild} |  10 +-
 sys-apps/portage/portage-2.3.6-r1.ebuild           | 275 ---------------------
 4 files changed, 19 insertions(+), 284 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f387c6834..a6d67341b 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-EBUILD portage-2.3.24.ebuild 9445 BLAKE2B a81f62ec06cd28837b8ec92bbbb2009eb01cc524b291d75ed144d279eef308cfc1abdd84c25e9cf01fb271f8212ce68693114a0d67e395b52b6cb3ac5d4ce490 SHA512 8d483d6eeff3cd77b3f0e64e32883321522e3ab09de0c1afbe9ef66df39b93d4ebc74738da30f6083b8b389db89661c3b0257561d84f4240ed73c45097b63836
-EBUILD portage-2.3.28.ebuild 9484 BLAKE2B 705df8b4545d81239364258a33ce5b79afe7274ebd4fe06dd6e2354015e18626c2b5cc152c096a8ddb5a4ea56c889f49298ee659f1e1076bd454b2f9dae5921e SHA512 9ca0e65ea17e13c96aef27bcdb5bcb0953935d9f328cc79416329b486555ce2a66b40fff6a728bc95cb10cfa5e0352a27318efd52501b24733966d2e2e1c9daf
-EBUILD portage-2.3.6-r1.ebuild 8865 BLAKE2B 1b23e2d79aa89d8b30faf5eee38d95e75df43086b61a64606675d920cc477200151e7bb3d3a920b70457761f391072f3e746283c005adc1ed6eaccef997f3afa SHA512 50991bc94f2934454f5254dce47460a57d4e933a78e26cb2db9374856efff135c7d0564a52297f0416d922a22bb011ef6cc0623d17fa8b1ad9a880395c8e2f6c
+EBUILD portage-2.3.28.ebuild 9472 BLAKE2B 1aff941173e46a1773970efc55a475241b9a4e7f48a265cd1b6e5227909d317b4ef02b7ff4284e3170923ce896ec3b0cfc42fa5e282b0a776d3527dc28069e64 SHA512 e227ac35eb4c57f6c7ad5c79f1d7b0cd7c39348c27dedecc9e81d28ad8e84ef774c1124b4ecac3b838540346dbfc34715ac2d9b3556702f537d0919549493dc5
+EBUILD portage-2.3.38.ebuild 9488 BLAKE2B 1d92f0d50c4c918ccbfee33ef76d532509a3e392b9fb41d48217167b03eec3e961dd94affa10886a1d6bf4862dc96c135ca62dd726f4018b530f48e0a38dc794 SHA512 fb977e96f2033df5e39aa17168aec68a4679b3840e06f8794dc17696389b7fc3588625885f9b286b961627f9b92ca3f32cd23a5fca41e6903f6a84d715e9636e
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
+-----BEGIN PGP SIGNATURE-----
+
+iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCWwVfgAAKCRAbuSpxNYmQ
+ZwR6A/4ztf1hEl4Biu//4460EHCF7676AhDjDZUCaD0yFa2EQTDdcp3fG1Y4n70x
+nHCQqF6BDVsnlqzyLuHOgx/SjCSmXc/WoPK0RQC4gELt/zT3KaFsUWncx1OiXuLc
+roCj7g7WadZX2Pe+dwiAb2YwUGgql7Fw+iebsQMmlcYPMD0gwg==
+=gyTY
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-2.3.28.ebuild b/sys-apps/portage/portage-2.3.28.ebuild
index f6238e782..69cb0e980 100644
--- a/sys-apps/portage/portage-2.3.28.ebuild
+++ b/sys-apps/portage/portage-2.3.28.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 

diff --git a/sys-apps/portage/portage-2.3.24.ebuild b/sys-apps/portage/portage-2.3.38.ebuild
similarity index 97%
rename from sys-apps/portage/portage-2.3.24.ebuild
rename to sys-apps/portage/portage-2.3.38.ebuild
index 7c532f6bd..172a4f3b9 100644
--- a/sys-apps/portage/portage-2.3.24.ebuild
+++ b/sys-apps/portage/portage-2.3.38.ebuild
@@ -14,12 +14,12 @@ inherit distutils-r1 git-2 multilib systemd
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="3228956aed7ba7caaaad7a07e48ed6013f73e523"
+EGIT_COMMIT="b74e878839a2b1e8d6148776d5a44019d8fffbc1"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
@@ -49,9 +49,9 @@ RDEPEND="
 		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
 			python{2_7,3_4,3_5} pypy)
 		rsync-verify? (
-			>=app-portage/gemato-10
-			app-crypt/gentoo-keys
-			app-crypt/gnupg[ssl(-)]
+			>=app-portage/gemato-12.1
+			app-crypt/openpgp-keys-gentoo-release
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
 	)
 	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )

diff --git a/sys-apps/portage/portage-2.3.6-r1.ebuild b/sys-apps/portage/portage-2.3.6-r1.ebuild
deleted file mode 100644
index 97dcf36b0..000000000
--- a/sys-apps/portage/portage-2.3.6-r1.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# 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 distutils-r1 git-2 multilib
-
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="c7938eca955a49b2fc7c7ce714bf0ab6d1a53c7b"
-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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru +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*')] )
-	>=sys-apps/abi-wrapper-1.0-r6"
-# 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? ( 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 )
-	>=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"
-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_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	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 pym/_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
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		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 -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-			-e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-			-i cnf/repos.conf || die "sed failed"
-
-		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 )
-	use epydoc && targets+=( install_epydoc )
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	# 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() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# 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.1" && \
-		has_version "<${CATEGORY}/${PN}-2.3.3"; then
-		SYNC_DEPTH_UPGRADE=true
-	else
-		SYNC_DEPTH_UPGRADE=false
-	fi
-}
-
-get_ownership() {
-	case ${USERLAND} in
-		BSD)
-			stat -f '%Su:%Sg' "${1}"
-			;;
-		*)
-			stat -c '%U:%G' "${1}"
-			;;
-	esac
-}
-
-new_config_protect() {
-	# Generate a ._cfg file even if the target file
-	# does not exist, ensuring that the user will
-	# notice the config change.
-	local basename=${1##*/}
-	local dirname=${1%/*}
-	local i=0
-	while true ; do
-		local filename=$(
-			echo -n "${dirname}/._cfg"
-			printf "%04d" ${i}
-			echo -n "_${basename}"
-		)
-		[[ -e ${filename} ]] || break
-		(( i++ ))
-	done
-	echo "${filename}"
-}
-
-pkg_postinst() {
-	if ${SYNC_DEPTH_UPGRADE}; then
-		ewarn "Please note that this release no longer respects sync-depth for"
-		ewarn "git repositories.  There have been too many problems and"
-		ewarn "performance issues.  See bugs 552814, 559008"
-	fi
-
-	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 ""
-}

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

[Thomas Sachau]

commit:     5d9ab8899149b7b87971b594fdef1a91c88b981f
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Wed May 23 12:47:32 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Wed May 23 12:47:32 2018 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=5d9ab889

sys-apps/portage: Use fixed commit

Package-Manager: Portage-2.3.38, Repoman-2.3.9
Manifest-Sign-Key: 0xC05330B3211CA2D4

 sys-apps/portage/Manifest              | 12 ++++++------
 sys-apps/portage/portage-2.3.38.ebuild |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a6d67341b..a24caa97a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 EBUILD portage-2.3.28.ebuild 9472 BLAKE2B 1aff941173e46a1773970efc55a475241b9a4e7f48a265cd1b6e5227909d317b4ef02b7ff4284e3170923ce896ec3b0cfc42fa5e282b0a776d3527dc28069e64 SHA512 e227ac35eb4c57f6c7ad5c79f1d7b0cd7c39348c27dedecc9e81d28ad8e84ef774c1124b4ecac3b838540346dbfc34715ac2d9b3556702f537d0919549493dc5
-EBUILD portage-2.3.38.ebuild 9488 BLAKE2B 1d92f0d50c4c918ccbfee33ef76d532509a3e392b9fb41d48217167b03eec3e961dd94affa10886a1d6bf4862dc96c135ca62dd726f4018b530f48e0a38dc794 SHA512 fb977e96f2033df5e39aa17168aec68a4679b3840e06f8794dc17696389b7fc3588625885f9b286b961627f9b92ca3f32cd23a5fca41e6903f6a84d715e9636e
+EBUILD portage-2.3.38.ebuild 9488 BLAKE2B 612ab5e2a56c01242447390f4a241727732589d1a5dde7bec9c3c98b0b05196d41f6f5a7dfd89d8b7d78327a0fc33b4f0a9cecfe3b0587086072cb769b32f3c9 SHA512 a7171a525d60d590b37f403822325861995b5ab5f7280e31b6822dae76142c88e733cf0455a2b82044aca790d767b6fe862ae563b9122c0bb7ec7be570062d0d
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
 -----BEGIN PGP SIGNATURE-----
 
-iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCWwVfgAAKCRAbuSpxNYmQ
-ZwR6A/4ztf1hEl4Biu//4460EHCF7676AhDjDZUCaD0yFa2EQTDdcp3fG1Y4n70x
-nHCQqF6BDVsnlqzyLuHOgx/SjCSmXc/WoPK0RQC4gELt/zT3KaFsUWncx1OiXuLc
-roCj7g7WadZX2Pe+dwiAb2YwUGgql7Fw+iebsQMmlcYPMD0gwg==
-=gyTY
+iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCWwVi5AAKCRAbuSpxNYmQ
+Z4REA/0dqnLkuz3U7zeNZ/rqFybrLT5vLkJweDuDnmMXs6sRHTDqHtnlEliaVnz8
+38LmjOXjwZ6r2gEIhucZ3/uFFr/8Ja/cIF5S0zE7gp+TvIb2zPjuOvo80clgJKph
+stpqjtWUTpztA/uLLySyYWFqXq2m3JSB2JjgiiT2GnGzyUZxMA==
+=ikeW
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-2.3.38.ebuild b/sys-apps/portage/portage-2.3.38.ebuild
index 172a4f3b9..e3afb0c82 100644
--- a/sys-apps/portage/portage-2.3.38.ebuild
+++ b/sys-apps/portage/portage-2.3.38.ebuild
@@ -14,7 +14,7 @@ inherit distutils-r1 git-2 multilib systemd
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="b74e878839a2b1e8d6148776d5a44019d8fffbc1"
+EGIT_COMMIT="370a5832a66713a17ff010f137fda7cfc7a26fe3"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 

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

[Thomas Sachau]

commit:     503d37f046a376e54bf51ef283f412f15b00c779
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 14 12:33:55 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 12:33:55 2018 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=503d37f0

Update 2.3.28 to use fixed commit

 sys-apps/portage/Manifest              | 2 +-
 sys-apps/portage/portage-2.3.28.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 30d9f6e40..f387c6834 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,6 @@
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 EBUILD portage-2.3.24.ebuild 9445 BLAKE2B a81f62ec06cd28837b8ec92bbbb2009eb01cc524b291d75ed144d279eef308cfc1abdd84c25e9cf01fb271f8212ce68693114a0d67e395b52b6cb3ac5d4ce490 SHA512 8d483d6eeff3cd77b3f0e64e32883321522e3ab09de0c1afbe9ef66df39b93d4ebc74738da30f6083b8b389db89661c3b0257561d84f4240ed73c45097b63836
-EBUILD portage-2.3.28.ebuild 9484 BLAKE2B 58fc66f28956fa48feb497e6a5ef4e68bf1647d913a70dedb54a6255ab07737bb10ff550f53de7a6b749c98d0196213f70eb2ee0871574d5981a9629a6932240 SHA512 16a80e1b6636323d072c5ed0329c974e90632d20ea617337b4b3363e600428f76d32e84ed518b5019237259f4cf5aaac6c22c6bad915dfa75aaf3ba979bf842e
+EBUILD portage-2.3.28.ebuild 9484 BLAKE2B 705df8b4545d81239364258a33ce5b79afe7274ebd4fe06dd6e2354015e18626c2b5cc152c096a8ddb5a4ea56c889f49298ee659f1e1076bd454b2f9dae5921e SHA512 9ca0e65ea17e13c96aef27bcdb5bcb0953935d9f328cc79416329b486555ce2a66b40fff6a728bc95cb10cfa5e0352a27318efd52501b24733966d2e2e1c9daf
 EBUILD portage-2.3.6-r1.ebuild 8865 BLAKE2B 1b23e2d79aa89d8b30faf5eee38d95e75df43086b61a64606675d920cc477200151e7bb3d3a920b70457761f391072f3e746283c005adc1ed6eaccef997f3afa SHA512 50991bc94f2934454f5254dce47460a57d4e933a78e26cb2db9374856efff135c7d0564a52297f0416d922a22bb011ef6cc0623d17fa8b1ad9a880395c8e2f6c
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59

diff --git a/sys-apps/portage/portage-2.3.28.ebuild b/sys-apps/portage/portage-2.3.28.ebuild
index 9e8dd1f8b..f6238e782 100644
--- a/sys-apps/portage/portage-2.3.28.ebuild
+++ b/sys-apps/portage/portage-2.3.28.ebuild
@@ -14,7 +14,7 @@ inherit distutils-r1 git-2 multilib systemd
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="ee29b930b880050eb9a04c06d0f1a0edd0e1fc27"
+EGIT_COMMIT="bc55fa6c10f027ba1eb986d3fc6698cd009eff54"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 

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

[Thomas Sachau]

commit:     4aad4758a38cf034649d23f75f55de1717cfe288
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 14 12:15:21 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 12:15:21 2018 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=4aad4758

Version bump

 sys-apps/portage/Manifest | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 6dc30111a..30d9f6e40 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,5 +1,6 @@
-AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
-AUX portage-ccache.conf 60 SHA256 5175a18d3b81bd0aa499e0da6a2f44b920cf26f650e8dadea8dc2dc6551f8a39 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c WHIRLPOOL f79ec05596e022d2d73cc18656e398cbca9c55c7ff65c51634f7ccd1a46af1845ef66649267773b93a2bcff9e1de621785231a1a18d42fff97026ff12594a3bc
-EBUILD portage-2.3.24.ebuild 9445 SHA256 57da92c1891acaf68c1c89f9916edfc81a0cd62725720c6e0b738a509cdf64e1 SHA512 8d483d6eeff3cd77b3f0e64e32883321522e3ab09de0c1afbe9ef66df39b93d4ebc74738da30f6083b8b389db89661c3b0257561d84f4240ed73c45097b63836 WHIRLPOOL 6c91c2af74942cb1fb710361cac3d6f468683db247617c0f76298b69f4a68bbf5ceea7139beca86f5ab670abbdd14edec0c5ee4fa496b8f33b18f60ae4a3bb62
-EBUILD portage-2.3.6-r1.ebuild 8865 SHA256 c4c300df276931854a9b35178cfa3ad517bc70cef438289b36b66d75ed4ff765 SHA512 50991bc94f2934454f5254dce47460a57d4e933a78e26cb2db9374856efff135c7d0564a52297f0416d922a22bb011ef6cc0623d17fa8b1ad9a880395c8e2f6c WHIRLPOOL de1a86c97dec170bc36f3afe548b1515ed3f84c8b79bba16edf288133391d9c1e76df388ab073921775968edc02f66852b7d70b7a339ca11c79cc3d31eabc0de
-MISC metadata.xml 1415 SHA256 515be4f712305f3b6dea6a40e02023ab21a9a3c2980a95248152f4e310bf0edd SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59 WHIRLPOOL 8201156e4903cbe504989e570cf8fb4823e9ab8df940f36249e89ba2998e0b625ccf8fa9c5908fb8b63ab019145837264857beba26fbb2f714f5e071e8a7aa7d
+AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
+AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
+EBUILD portage-2.3.24.ebuild 9445 BLAKE2B a81f62ec06cd28837b8ec92bbbb2009eb01cc524b291d75ed144d279eef308cfc1abdd84c25e9cf01fb271f8212ce68693114a0d67e395b52b6cb3ac5d4ce490 SHA512 8d483d6eeff3cd77b3f0e64e32883321522e3ab09de0c1afbe9ef66df39b93d4ebc74738da30f6083b8b389db89661c3b0257561d84f4240ed73c45097b63836
+EBUILD portage-2.3.28.ebuild 9484 BLAKE2B 58fc66f28956fa48feb497e6a5ef4e68bf1647d913a70dedb54a6255ab07737bb10ff550f53de7a6b749c98d0196213f70eb2ee0871574d5981a9629a6932240 SHA512 16a80e1b6636323d072c5ed0329c974e90632d20ea617337b4b3363e600428f76d32e84ed518b5019237259f4cf5aaac6c22c6bad915dfa75aaf3ba979bf842e
+EBUILD portage-2.3.6-r1.ebuild 8865 BLAKE2B 1b23e2d79aa89d8b30faf5eee38d95e75df43086b61a64606675d920cc477200151e7bb3d3a920b70457761f391072f3e746283c005adc1ed6eaccef997f3afa SHA512 50991bc94f2934454f5254dce47460a57d4e933a78e26cb2db9374856efff135c7d0564a52297f0416d922a22bb011ef6cc0623d17fa8b1ad9a880395c8e2f6c
+MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59

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

[Thomas Sachau]

commit:     08a9d60ed932e7043d927995202b3358ebb7fa3c
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 14 12:18:29 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 12:18:29 2018 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=08a9d60e

Version bump

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

diff --git a/sys-apps/portage/portage-2.3.28.ebuild b/sys-apps/portage/portage-2.3.28.ebuild
new file mode 100644
index 000000000..9e8dd1f8b
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.28.ebuild
@@ -0,0 +1,282 @@
+# 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 distutils-r1 git-2 multilib systemd
+
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="ee29b930b880050eb9a04c06d0f1a0edd0e1fc27"
+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 ~mips ~ppc ~ppc64 ~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*')] )
+	>=sys-apps/abi-wrapper-1.0-r6"
+# 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_4,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-12.1
+			app-crypt/gentoo-keys
+			>=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 )
+	>=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"
+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_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 pym/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox 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 pym/_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|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		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 -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+			-i cnf/repos.conf || die "sed failed"
+		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() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# 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.1" && \
+		has_version "<${CATEGORY}/${PN}-2.3.3"; then
+		SYNC_DEPTH_UPGRADE=true
+	else
+		SYNC_DEPTH_UPGRADE=false
+	fi
+}
+
+pkg_postinst() {
+	if ${SYNC_DEPTH_UPGRADE}; then
+		ewarn "Please note that this release no longer respects sync-depth for"
+		ewarn "git repositories.  There have been too many problems and"
+		ewarn "performance issues.  See bugs 552814, 559008"
+	fi
+
+	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 ""
+}

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

[Thomas Sachau]

commit:     3b5054ceecf42f91ed10e03e01b20216b72dcd23
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  3 15:27:46 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar  3 15:27:46 2018 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=3b5054ce

Version bump, fix issue with leftover files

 sys-apps/portage/Manifest                          | 13 +--------
 ...tage-2.3.19-r1.ebuild => portage-2.3.24.ebuild} | 34 ++++++++++++++++++----
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b99f700ca..167ba15b2 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,16 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
 AUX portage-ccache.conf 60 SHA256 5175a18d3b81bd0aa499e0da6a2f44b920cf26f650e8dadea8dc2dc6551f8a39 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c WHIRLPOOL f79ec05596e022d2d73cc18656e398cbca9c55c7ff65c51634f7ccd1a46af1845ef66649267773b93a2bcff9e1de621785231a1a18d42fff97026ff12594a3bc
-EBUILD portage-2.3.19-r1.ebuild 8679 SHA256 aa47dff8267d42498b048f8ab0db28aae05e9597e76eb2684b649dabbe698b8a SHA512 d126e506f32bf1328b01cdd35ecea66b4fd60a22c08cd7d1264d0f9b01535e7981a4b363a3bb4dfe52b979c6f55af2e7670290813b89bc1e5f3a5278dc62622b WHIRLPOOL 633ef2bc54c67beb8e59e66b1a76caeb7490fb96aa31922a78e74901c66945065c1c1d6b5e1ad1c36e7736d4740debadacb9d904bb31c181844eb0bd62e0d358
+EBUILD portage-2.3.24.ebuild 9445 SHA256 57da92c1891acaf68c1c89f9916edfc81a0cd62725720c6e0b738a509cdf64e1 SHA512 8d483d6eeff3cd77b3f0e64e32883321522e3ab09de0c1afbe9ef66df39b93d4ebc74738da30f6083b8b389db89661c3b0257561d84f4240ed73c45097b63836 WHIRLPOOL 6c91c2af74942cb1fb710361cac3d6f468683db247617c0f76298b69f4a68bbf5ceea7139beca86f5ab670abbdd14edec0c5ee4fa496b8f33b18f60ae4a3bb62
 EBUILD portage-2.3.6-r1.ebuild 8865 SHA256 c4c300df276931854a9b35178cfa3ad517bc70cef438289b36b66d75ed4ff765 SHA512 50991bc94f2934454f5254dce47460a57d4e933a78e26cb2db9374856efff135c7d0564a52297f0416d922a22bb011ef6cc0623d17fa8b1ad9a880395c8e2f6c WHIRLPOOL de1a86c97dec170bc36f3afe548b1515ed3f84c8b79bba16edf288133391d9c1e76df388ab073921775968edc02f66852b7d70b7a339ca11c79cc3d31eabc0de
 MISC metadata.xml 1147 SHA256 c4832ae64ab0915c65eadca15e4540680d109c21d572464f69e218d14fe6bd8b SHA512 733193cbfc96da31252b5e4109d0b76f797e339c41eda2c1230cc1d5b0e75912177570ed0140218a7a7b85d9b8bc53e8e6931e88810269c499be87af40e6b86c WHIRLPOOL bf901ca7474f9b8358c458edad904f9c0c853187c6dc8ea0bc0c327bded60940c6f8b20f0231d78d86aa7dc5235b23d70c69f7153cca9e375fa271c7c93707b9
------BEGIN PGP SIGNATURE-----
-
-iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCWlIsfwAKCRAbuSpxNYmQ
-ZxvuBACCyd9oC/2cE42enQVc8v0VSuu2275SxX4fNtZ7hMH2O7cq/D+nkQToMHFj
-IyjVtYYRfb6uPwf9XfbnP4scBqqcoJeDs2Pm2cPLKWGUHsdeHUL5CSaosiYF8MRq
-/Gb8Ms2bH05SHAU//2YDJqrPXqZUdW5PSifjuqTYZqp27UOI3g==
-=1+PK
------END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-2.3.19-r1.ebuild b/sys-apps/portage/portage-2.3.24.ebuild
similarity index 88%
rename from sys-apps/portage/portage-2.3.19-r1.ebuild
rename to sys-apps/portage/portage-2.3.24.ebuild
index 77284a3be..7c532f6bd 100644
--- a/sys-apps/portage/portage-2.3.19-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.24.ebuild
@@ -10,18 +10,18 @@ PYTHON_COMPAT=(
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 git-2 multilib tmpfiles
+inherit distutils-r1 git-2 multilib systemd
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="2186b6acaa669b0bf64312d0e5294050f8aaefd0"
+EGIT_COMMIT="3228956aed7ba7caaaad7a07e48ed6013f73e523"
 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr"
+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
@@ -37,6 +37,8 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 # 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
@@ -46,6 +48,11 @@ RDEPEND="
 		>=app-admin/eselect-1.2
 		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
 			python{2_7,3_4,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-10
+			app-crypt/gentoo-keys
+			app-crypt/gnupg[ssl(-)]
+		)
 	)
 	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
@@ -77,6 +84,17 @@ pkg_setup() {
 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 pym/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
 	if use native-extensions; then
 		printf "[build_ext]\nportage-ext-modules=true\n" >> \
 			setup.cfg || die
@@ -95,6 +113,11 @@ python_prepare_all() {
 			|| die "failed to append to make.globals"
 	fi
 
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
 	if [[ -n ${EPREFIX} ]] ; then
 		einfo "Setting portage.const.EPREFIX ..."
 		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
@@ -122,6 +145,7 @@ python_prepare_all() {
 
 		einfo "Adjusting repos.conf ..."
 		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
 			-i cnf/repos.conf || die "sed failed"
 		if use prefix-guest ; then
 			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
@@ -193,7 +217,7 @@ python_install_all() {
 		esetup.py "${targets[@]}"
 	fi
 
-	dotmpfiles "${FILESDIR}"/portage-ccache.conf
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
 
 	# Due to distutils/python-exec limitations
 	# these must be installed to /usr/bin.

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

[Thomas Sachau]

commit:     c5f984b7ecadbccd34a5ce2f6dcaf0f39a66d330
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  3 15:31:48 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar  3 15:31:48 2018 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=c5f984b7

Sync metadata.xml

 sys-apps/portage/Manifest     | 2 +-
 sys-apps/portage/metadata.xml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 167ba15b2..6dc30111a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,4 +2,4 @@ AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd1
 AUX portage-ccache.conf 60 SHA256 5175a18d3b81bd0aa499e0da6a2f44b920cf26f650e8dadea8dc2dc6551f8a39 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c WHIRLPOOL f79ec05596e022d2d73cc18656e398cbca9c55c7ff65c51634f7ccd1a46af1845ef66649267773b93a2bcff9e1de621785231a1a18d42fff97026ff12594a3bc
 EBUILD portage-2.3.24.ebuild 9445 SHA256 57da92c1891acaf68c1c89f9916edfc81a0cd62725720c6e0b738a509cdf64e1 SHA512 8d483d6eeff3cd77b3f0e64e32883321522e3ab09de0c1afbe9ef66df39b93d4ebc74738da30f6083b8b389db89661c3b0257561d84f4240ed73c45097b63836 WHIRLPOOL 6c91c2af74942cb1fb710361cac3d6f468683db247617c0f76298b69f4a68bbf5ceea7139beca86f5ab670abbdd14edec0c5ee4fa496b8f33b18f60ae4a3bb62
 EBUILD portage-2.3.6-r1.ebuild 8865 SHA256 c4c300df276931854a9b35178cfa3ad517bc70cef438289b36b66d75ed4ff765 SHA512 50991bc94f2934454f5254dce47460a57d4e933a78e26cb2db9374856efff135c7d0564a52297f0416d922a22bb011ef6cc0623d17fa8b1ad9a880395c8e2f6c WHIRLPOOL de1a86c97dec170bc36f3afe548b1515ed3f84c8b79bba16edf288133391d9c1e76df388ab073921775968edc02f66852b7d70b7a339ca11c79cc3d31eabc0de
-MISC metadata.xml 1147 SHA256 c4832ae64ab0915c65eadca15e4540680d109c21d572464f69e218d14fe6bd8b SHA512 733193cbfc96da31252b5e4109d0b76f797e339c41eda2c1230cc1d5b0e75912177570ed0140218a7a7b85d9b8bc53e8e6931e88810269c499be87af40e6b86c WHIRLPOOL bf901ca7474f9b8358c458edad904f9c0c853187c6dc8ea0bc0c327bded60940c6f8b20f0231d78d86aa7dc5235b23d70c69f7153cca9e375fa271c7c93707b9
+MISC metadata.xml 1415 SHA256 515be4f712305f3b6dea6a40e02023ab21a9a3c2980a95248152f4e310bf0edd SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59 WHIRLPOOL 8201156e4903cbe504989e570cf8fb4823e9ab8df940f36249e89ba2998e0b625ccf8fa9c5908fb8b63ab019145837264857beba26fbb2f714f5e071e8a7aa7d

diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index c66241962..5d99599f6 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -11,6 +11,7 @@
   </maintainer>
   <use>
     <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.
     </flag>
@@ -20,6 +21,10 @@
         This should only be temporarily disabled for some bootstrapping
         operations.  Cross-compilation is not supported.
     </flag>
+    <flag name="rsync-verify">
+        Enable full-tree cryptographic verification of Gentoo repository
+        rsync checkouts using <pkg>app-portage/gemato</pkg>.
+    </flag>
     <flag name="xattr">Preserve extended attributes (filesystem-stored metadata)
         when installing files. Usually only required for hardened systems.
     </flag>

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

[Thomas Sachau]

commit:     0603d13f8cdcd67edc687b0454eabf311ea7620e
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 14:19:48 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 14:19:48 2018 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=0603d13f

Sync portage

Package-Manager: portage-2.3.7
Manifest-Sign-Key: 0xC05330B3211CA2D4

 sys-apps/portage/Manifest                          | 12 ++---
 ...ge-2.3.7-r1.ebuild => portage-2.3.19-r1.ebuild} | 59 ++++++++--------------
 2 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 35056361e..b99f700ca 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,14 +3,14 @@ Hash: SHA256
 
 AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
 AUX portage-ccache.conf 60 SHA256 5175a18d3b81bd0aa499e0da6a2f44b920cf26f650e8dadea8dc2dc6551f8a39 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c WHIRLPOOL f79ec05596e022d2d73cc18656e398cbca9c55c7ff65c51634f7ccd1a46af1845ef66649267773b93a2bcff9e1de621785231a1a18d42fff97026ff12594a3bc
+EBUILD portage-2.3.19-r1.ebuild 8679 SHA256 aa47dff8267d42498b048f8ab0db28aae05e9597e76eb2684b649dabbe698b8a SHA512 d126e506f32bf1328b01cdd35ecea66b4fd60a22c08cd7d1264d0f9b01535e7981a4b363a3bb4dfe52b979c6f55af2e7670290813b89bc1e5f3a5278dc62622b WHIRLPOOL 633ef2bc54c67beb8e59e66b1a76caeb7490fb96aa31922a78e74901c66945065c1c1d6b5e1ad1c36e7736d4740debadacb9d904bb31c181844eb0bd62e0d358
 EBUILD portage-2.3.6-r1.ebuild 8865 SHA256 c4c300df276931854a9b35178cfa3ad517bc70cef438289b36b66d75ed4ff765 SHA512 50991bc94f2934454f5254dce47460a57d4e933a78e26cb2db9374856efff135c7d0564a52297f0416d922a22bb011ef6cc0623d17fa8b1ad9a880395c8e2f6c WHIRLPOOL de1a86c97dec170bc36f3afe548b1515ed3f84c8b79bba16edf288133391d9c1e76df388ab073921775968edc02f66852b7d70b7a339ca11c79cc3d31eabc0de
-EBUILD portage-2.3.7-r1.ebuild 8865 SHA256 eda572bf020e8911795c7e51656f4dabb9553065abc9710bb6fd435b288b8ad7 SHA512 05388033a012ddcd0357406d2aa1d550e68d729decc0fb8142efd394be61aca6f46a5eb8f676a1968b8da7654d977f6ca97973990132ee125c45de1bf3e3598d WHIRLPOOL 65e0442f061f42a8e0271cfce930deaf423996b430ab115a3f812c5cc85380c7632115feeae5f5d874e17608bfe20f3b55405772d31a02ee023b1b07e4199fed
 MISC metadata.xml 1147 SHA256 c4832ae64ab0915c65eadca15e4540680d109c21d572464f69e218d14fe6bd8b SHA512 733193cbfc96da31252b5e4109d0b76f797e339c41eda2c1230cc1d5b0e75912177570ed0140218a7a7b85d9b8bc53e8e6931e88810269c499be87af40e6b86c WHIRLPOOL bf901ca7474f9b8358c458edad904f9c0c853187c6dc8ea0bc0c327bded60940c6f8b20f0231d78d86aa7dc5235b23d70c69f7153cca9e375fa271c7c93707b9
 -----BEGIN PGP SIGNATURE-----
 
-iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCWlIXygAKCRAbuSpxNYmQ
-Z5L8A/0fS0jXc2VB6HZeJaHroZVu708ahhwFnT2qZSAXA/o5nX+1nbvZ9KRlM/BQ
-beeIBsDBNxnk970EGF4i337MiFKG/oJhELcf8qe2SQXP1F0ckZVEjIVkQgPzgM7s
-YMh/F+ketJcrt77D+vTTESt1+VgNmO1uQx2183M6149q/mjL+w==
-=E3Qm
+iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCWlIsfwAKCRAbuSpxNYmQ
+ZxvuBACCyd9oC/2cE42enQVc8v0VSuu2275SxX4fNtZ7hMH2O7cq/D+nkQToMHFj
+IyjVtYYRfb6uPwf9XfbnP4scBqqcoJeDs2Pm2cPLKWGUHsdeHUL5CSaosiYF8MRq
+/Gb8Ms2bH05SHAU//2YDJqrPXqZUdW5PSifjuqTYZqp27UOI3g==
+=1+PK
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-2.3.7-r1.ebuild b/sys-apps/portage/portage-2.3.19-r1.ebuild
similarity index 89%
rename from sys-apps/portage/portage-2.3.7-r1.ebuild
rename to sys-apps/portage/portage-2.3.19-r1.ebuild
index e8d70e28f..77284a3be 100644
--- a/sys-apps/portage/portage-2.3.7-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.19-r1.ebuild
@@ -10,11 +10,11 @@ PYTHON_COMPAT=(
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 git-2 multilib
+inherit distutils-r1 git-2 multilib tmpfiles
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="16fcf4998f4b55f1697e4358c7b232e3cab56a11"
+EGIT_COMMIT="2186b6acaa669b0bf64312d0e5294050f8aaefd0"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
@@ -44,6 +44,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? ( sys-freebsd/freebsd-bin )
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
@@ -119,11 +121,14 @@ python_prepare_all() {
 			-i cnf/make.globals || die "sed failed"
 
 		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-			-e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
 			-i cnf/repos.conf || die "sed failed"
+		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 \
@@ -174,14 +179,22 @@ 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
 		esetup.py "${targets[@]}"
 	fi
 
+	dotmpfiles "${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'
@@ -222,36 +235,6 @@ pkg_preinst() {
 	fi
 }
 
-get_ownership() {
-	case ${USERLAND} in
-		BSD)
-			stat -f '%Su:%Sg' "${1}"
-			;;
-		*)
-			stat -c '%U:%G' "${1}"
-			;;
-	esac
-}
-
-new_config_protect() {
-	# Generate a ._cfg file even if the target file
-	# does not exist, ensuring that the user will
-	# notice the config change.
-	local basename=${1##*/}
-	local dirname=${1%/*}
-	local i=0
-	while true ; do
-		local filename=$(
-			echo -n "${dirname}/._cfg"
-			printf "%04d" ${i}
-			echo -n "_${basename}"
-		)
-		[[ -e ${filename} ]] || break
-		(( i++ ))
-	done
-	echo "${filename}"
-}
-
 pkg_postinst() {
 	if ${SYNC_DEPTH_UPGRADE}; then
 		ewarn "Please note that this release no longer respects sync-depth for"

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

[Thomas Sachau]

commit:     cedb5da4083309dd7cdb464978e6c2ada9b46b12
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 10:21:39 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 10:21:39 2018 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=cedb5da4

Sync portage

Package-Manager: portage-2.3.0
Manifest-Sign-Key: 0xC05330B3211CA2D4

 sys-apps/portage/Manifest                          | 15 +++++++++--
 sys-apps/portage/metadata.xml                      | 29 +++++++++++++++++-----
 ...age-2.3.0-r1.ebuild => portage-2.3.1-r1.ebuild} |  4 +--
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7d4974dae..df1069a37 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,13 @@
-EBUILD portage-2.3.0-r1.ebuild 8865 SHA256 c1965aa547240336897094cd5e656a75cd5354238211693b6c8cf5523780e16c SHA512 13a003d6db7991542058553871d440f843de9fda563fb97a23e7baca640a7e8361f7aa646a6fe3f37b255e71966f3e9934514e104160d57ea491def19098d4ab WHIRLPOOL a619a7687811e6c4b08ce64edf3b8be18de2e811b39ca43dc5d77213f81bc3e78e2118422352e8cb43c9426ea11ea1e558c3f2faa012ec92789ae03c0a69a343
-MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD portage-2.3.1-r1.ebuild 8865 SHA256 3ba1c4b9f99df4577740e8045ea7220383812674213b71eb91c06616a21850f0 SHA512 5c99b2bd00245d320930168fba8fd082d4debd60f65b264d9e30775534621daadfbe0a331e249ed75500faee19d0d7a4f3eb84c45383c5507fa2b7b8b648c01b WHIRLPOOL a3c551c2a79b3151fa12753b6f0327a5f560841358f3d29ae87b3cf461e223960ab1d74f02253fb9d6314cbf3f72d77b4a902cc283d722cd043ded7780aa709a
+MISC metadata.xml 1147 SHA256 c4832ae64ab0915c65eadca15e4540680d109c21d572464f69e218d14fe6bd8b SHA512 733193cbfc96da31252b5e4109d0b76f797e339c41eda2c1230cc1d5b0e75912177570ed0140218a7a7b85d9b8bc53e8e6931e88810269c499be87af40e6b86c WHIRLPOOL bf901ca7474f9b8358c458edad904f9c0c853187c6dc8ea0bc0c327bded60940c6f8b20f0231d78d86aa7dc5235b23d70c69f7153cca9e375fa271c7c93707b9
+-----BEGIN PGP SIGNATURE-----
+
+iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCWlH0qQAKCRAbuSpxNYmQ
+ZzGABACc/qtpl348yGJA3hmsjU8vhUlxLG56rw3ip08AN0m85hb14rskKktTfZsX
+cFYUl0Pcwc9/DYo6IadoKwzk2cHNR/50MZMm1Iwd6B6eoHSp0xnu2vVYcyE/Z5GW
+DAB8urNgRhksixE/m4lH7Yy42YGSmZ9xm0rz49VsMPyKXpO14Q==
+=tNIw
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index 5b6b84632..c66241962 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer><email>dev-portage@gentoo.org</email></maintainer>
-<maintainer><email>zmedico@gentoo.org</email></maintainer>
-<use>
-<flag name="epydoc">Build html API documentation with epydoc.</flag>
- </use>
+  <upstream>
+    <bugs-to>mailto:dev-portage@gentoo.org</bugs-to>
+    <changelog>https://gitweb.gentoo.org/proj/portage.git/plain/RELEASE-NOTES</changelog>
+    <doc>https://wiki.gentoo.org/wiki/Handbook:AMD64/Working/Portage</doc>
+  </upstream>
+  <maintainer type="project">
+    <email>dev-portage@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="epydoc">Build html API documentation with epydoc.</flag>
+    <flag name="ipc">Use inter-process communication between portage and
+        running ebuilds.
+    </flag>
+    <flag name="native-extensions">
+        Compiles native "C" extensions (speedups, instead of using python
+        backup code).  Currently includes libc-locales.
+        This should only be temporarily disabled for some bootstrapping
+        operations.  Cross-compilation is not supported.
+    </flag>
+    <flag name="xattr">Preserve extended attributes (filesystem-stored metadata)
+        when installing files. Usually only required for hardened systems.
+    </flag>
+  </use>
 </pkgmetadata>

diff --git a/sys-apps/portage/portage-2.3.0-r1.ebuild b/sys-apps/portage/portage-2.3.1-r1.ebuild
similarity index 98%
rename from sys-apps/portage/portage-2.3.0-r1.ebuild
rename to sys-apps/portage/portage-2.3.1-r1.ebuild
index 553b01f45..f17358fc2 100644
--- a/sys-apps/portage/portage-2.3.0-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.1-r1.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
@@ -14,7 +14,7 @@ inherit distutils-r1 git-2 multilib
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="e69902fbc9c41f0470461561258f596535d9f5c7"
+EGIT_COMMIT="0e3b0c33b73dd0a2b5331106baeb54b8628dae7c"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 

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

[Thomas Sachau]

commit:     ebc98ead590136bf28ac5bcac5e7360dcfb4e731
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 10:02:28 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 10:02:28 2018 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=ebc98ead

Sync portage

 sys-apps/portage/Manifest                          |   2 +-
 ...ge-2.2.28-r1.ebuild => portage-2.3.0-r1.ebuild} | 134 ++++-----------------
 2 files changed, 24 insertions(+), 112 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7255ea5e9..7d4974dae 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.28-r1.ebuild 11932 SHA256 bc5de279f2606bcb9db4bc72346fc8a2abaddd6c9be53de87ddadec2791802a4 SHA512 f650fa58e95502f87006e76b1fc9039dd597c909659f47208c297931e91a52d3f67780091cc36f458023d553651e303e4e8aab8458251e84e081171ad8a90f04 WHIRLPOOL dfc4e3a427f6e848f5e633fc7d89b434f3223c71d5640ba8bfceedee143da127bd1e45ea52bb60f964636b559a49f21c7cb2538cd9bff68a7c3b283d40b0b44c
+EBUILD portage-2.3.0-r1.ebuild 8865 SHA256 c1965aa547240336897094cd5e656a75cd5354238211693b6c8cf5523780e16c SHA512 13a003d6db7991542058553871d440f843de9fda563fb97a23e7baca640a7e8361f7aa646a6fe3f37b255e71966f3e9934514e104160d57ea491def19098d4ab WHIRLPOOL a619a7687811e6c4b08ce64edf3b8be18de2e811b39ca43dc5d77213f81bc3e78e2118422352e8cb43c9426ea11ea1e558c3f2faa012ec92789ae03c0a69a343
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.28-r1.ebuild b/sys-apps/portage/portage-2.3.0-r1.ebuild
similarity index 65%
rename from sys-apps/portage/portage-2.2.28-r1.ebuild
rename to sys-apps/portage/portage-2.3.0-r1.ebuild
index 8aca693f8..553b01f45 100644
--- a/sys-apps/portage/portage-2.2.28-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.0-r1.ebuild
@@ -1,28 +1,27 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 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
+	python3_4 python3_5 python3_6
 	python2_7
 )
-PYTHON_REQ_USE='bzip2(+)'
+PYTHON_REQ_USE='bzip2(+),threads(+)'
 
 inherit distutils-r1 git-2 multilib
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="f89c3c5cd8d1da1e40d9a94a016b3002df237237"
+EGIT_COMMIT="e69902fbc9c41f0470461561258f596535d9f5c7"
 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
+IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
@@ -48,6 +47,7 @@ RDEPEND="
 	)
 	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 )
 	>=app-misc/pax-utils-0.1.17
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
@@ -75,6 +75,11 @@ pkg_setup() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	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:" \
@@ -117,7 +122,7 @@ python_prepare_all() {
 		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
 			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
 			-e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
+			-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
 			-i cnf/repos.conf || die "sed failed"
 
 		einfo "Adding FEATURES=force-prefix to make.globals ..."
@@ -209,21 +214,11 @@ pkg_preinst() {
 		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
 	fi
 
-	if has_version "<${CATEGORY}/${PN}-2.1.13" || \
-		{
-			has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
-			has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
-		} ; then
-		USERPRIV_UPGRADE=true
-		USERSYNC_UPGRADE=true
-		REPOS_CONF_UPGRADE=true
-		REPOS_CONF_SYNC=
-		type -P portageq >/dev/null 2>&1 && \
-			REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
+	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
+		has_version "<${CATEGORY}/${PN}-2.3.3"; then
+		SYNC_DEPTH_UPGRADE=true
 	else
-		USERPRIV_UPGRADE=false
-		USERSYNC_UPGRADE=false
-		REPOS_CONF_UPGRADE=false
+		SYNC_DEPTH_UPGRADE=false
 	fi
 }
 
@@ -258,78 +253,10 @@ new_config_protect() {
 }
 
 pkg_postinst() {
-
-	if ${REPOS_CONF_UPGRADE} ; then
-		einfo "Generating repos.conf"
-		local repo_name=
-		[[ -f ${PORTDIR}/profiles/repo_name ]] && \
-			repo_name=$(< "${PORTDIR}/profiles/repo_name")
-		if [[ -z ${REPOS_CONF_SYNC} ]] ; then
-			REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
-		fi
-		local sync_type=
-		[[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
-		if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
-			sync_type=cvs
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
-		fi
-
-		cat <<-EOF > "${T}/repos.conf"
-		[DEFAULT]
-		main-repo = ${repo_name:-gentoo}
-
-		[${repo_name:-gentoo}]
-		location = ${PORTDIR:-${EPREFIX}/usr/portage}
-		sync-type = ${sync_type:-rsync}
-		sync-uri = ${REPOS_CONF_SYNC}
-		EOF
-
-		[[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
-		local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
-		if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
-			dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
-		fi
-		# Don't install the config update if the desired repos.conf directory
-		# and config file exist, since users may accept it blindly and break
-		# their config (bug #478726).
-		[[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
-			mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
-		if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
-			einfo "Generating make.conf PORTDIR setting for backward compatibility"
-			for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
-				[[ -e ${dest} ]] && break
-			done
-			[[ -d ${dest} ]] && dest=${dest}/portdir.conf
-			rm -rf "${T}/make.conf"
-			[[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
-			cat <<-EOF >> "${T}/make.conf"
-
-			# Set PORTDIR for backward compatibility with various tools:
-			#   gentoo-bashcomp - bug #478444
-			#   euse - bug #474574
-			#   euses and ufed - bug #478318
-			PORTDIR="${EPREFIX}/usr/portage"
-			EOF
-			mkdir -p "${dest%/*}"
-			mv "${T}/make.conf" "$(new_config_protect "${dest}")"
-		fi
-	fi
-
-	local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
-	if ${USERSYNC_UPGRADE} && \
-		[[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
-		local ownership=$(get_ownership "${PORTDIR}")
-		if [[ -n ${ownership} ]] ; then
-			einfo "Adjusting PORTDIR permissions for usersync"
-			find "${PORTDIR}" -path "${distdir%/}" -prune -o \
-				! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
-				-exec chown "${ownership}" {} +
-		fi
+	if ${SYNC_DEPTH_UPGRADE}; then
+		ewarn "Please note that this release no longer respects sync-depth for"
+		ewarn "git repositories.  There have been too many problems and"
+		ewarn "performance issues.  See bugs 552814, 559008"
 	fi
 
 	einfo
@@ -339,25 +266,10 @@ pkg_postinst() {
 	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"
 
-	# Do this last, since it could take a long time if there
-	# are lots of live sources, and the user may be tempted
-	# to kill emerge while it is running.
-	if ${USERPRIV_UPGRADE} && \
-		[[ -d ${distdir} && -w ${distdir} ]] ; then
-		local ownership=$(get_ownership "${distdir}")
-		if [[ ${ownership#*:} == portage ]] ; then
-			einfo "Adjusting DISTDIR permissions for userpriv"
-			find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
-				-exec chown -R portage:portage {} +
-		fi
-	fi
-
 	einfo ""
-	einfo "This release of portage contains the new repoman code base"
-	einfo "This code base is still being developed.  So its API's are"
-	einfo "not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
+	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 ""
 }

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

[Thomas Sachau]

commit:     5bce36a4c85f31317e4766250e02e77b2104cf74
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 10:34:15 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 10:34:15 2018 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=5bce36a4

Sync portage

Package-Manager: portage-2.3.0
Manifest-Sign-Key: 0xC05330B3211CA2D4

 sys-apps/portage/Manifest                                    | 12 ++++++------
 .../{portage-2.3.1-r1.ebuild => portage-2.3.6-r1.ebuild}     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index df1069a37..731f734e4 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD portage-2.3.1-r1.ebuild 8865 SHA256 3ba1c4b9f99df4577740e8045ea7220383812674213b71eb91c06616a21850f0 SHA512 5c99b2bd00245d320930168fba8fd082d4debd60f65b264d9e30775534621daadfbe0a331e249ed75500faee19d0d7a4f3eb84c45383c5507fa2b7b8b648c01b WHIRLPOOL a3c551c2a79b3151fa12753b6f0327a5f560841358f3d29ae87b3cf461e223960ab1d74f02253fb9d6314cbf3f72d77b4a902cc283d722cd043ded7780aa709a
+EBUILD portage-2.3.6-r1.ebuild 8865 SHA256 c4c300df276931854a9b35178cfa3ad517bc70cef438289b36b66d75ed4ff765 SHA512 50991bc94f2934454f5254dce47460a57d4e933a78e26cb2db9374856efff135c7d0564a52297f0416d922a22bb011ef6cc0623d17fa8b1ad9a880395c8e2f6c WHIRLPOOL de1a86c97dec170bc36f3afe548b1515ed3f84c8b79bba16edf288133391d9c1e76df388ab073921775968edc02f66852b7d70b7a339ca11c79cc3d31eabc0de
 MISC metadata.xml 1147 SHA256 c4832ae64ab0915c65eadca15e4540680d109c21d572464f69e218d14fe6bd8b SHA512 733193cbfc96da31252b5e4109d0b76f797e339c41eda2c1230cc1d5b0e75912177570ed0140218a7a7b85d9b8bc53e8e6931e88810269c499be87af40e6b86c WHIRLPOOL bf901ca7474f9b8358c458edad904f9c0c853187c6dc8ea0bc0c327bded60940c6f8b20f0231d78d86aa7dc5235b23d70c69f7153cca9e375fa271c7c93707b9
 -----BEGIN PGP SIGNATURE-----
 
-iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCWlH0qQAKCRAbuSpxNYmQ
-ZzGABACc/qtpl348yGJA3hmsjU8vhUlxLG56rw3ip08AN0m85hb14rskKktTfZsX
-cFYUl0Pcwc9/DYo6IadoKwzk2cHNR/50MZMm1Iwd6B6eoHSp0xnu2vVYcyE/Z5GW
-DAB8urNgRhksixE/m4lH7Yy42YGSmZ9xm0rz49VsMPyKXpO14Q==
-=tNIw
+iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCWlH3pwAKCRAbuSpxNYmQ
+Z/s+A/4w8LHGuSEgUWGuwe6c1mQeJNwdoIhQCSXha7D4FBC1uIE9uknxfe8vcxs2
+mK4y5UKBDUSXEzw6igBKVGYKMCieZtAU9y74Ggv++kSSfkSoFO/uUsS4DySk4ctb
+vUNiJOw0j+/0Ibbu2lkuT3R1SJm/KF18IEmCCC3vwXomxqX7kg==
+=9tA4
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-2.3.1-r1.ebuild b/sys-apps/portage/portage-2.3.6-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.3.1-r1.ebuild
rename to sys-apps/portage/portage-2.3.6-r1.ebuild
index f17358fc2..97dcf36b0 100644
--- a/sys-apps/portage/portage-2.3.1-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.6-r1.ebuild
@@ -14,7 +14,7 @@ inherit distutils-r1 git-2 multilib
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="0e3b0c33b73dd0a2b5331106baeb54b8628dae7c"
+EGIT_COMMIT="c7938eca955a49b2fc7c7ce714bf0ab6d1a53c7b"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 

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

[Thomas Sachau]

commit:     f9c7d115a9b859d97c321b86a05cc59ee472a082
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 09:40:25 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 09:40:25 2018 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=f9c7d115

Sync portage

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

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 98693b116..7255ea5e9 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.27-r1.ebuild 11932 SHA256 4b68ba8d72b8f305aeaeda8b5bb1a6375f827d499745cb2af171e292515cd2fe SHA512 128914f272af0652b36d4511b4eaed33212cf78b577ecc33e302143a16ca35c63b2a078256785eefaeed0aada7b8605b3fd1ab7f10f1f7d8336508b55eca7d30 WHIRLPOOL e5b6c628ab7769c7dfa5171527d317886c8a2a3ad44125c9b9d365e955ed02d87d234113d0de6079f4255dfc0ed02add6e4d9b945f3108596dae8885e4549810
+EBUILD portage-2.2.28-r1.ebuild 11932 SHA256 bc5de279f2606bcb9db4bc72346fc8a2abaddd6c9be53de87ddadec2791802a4 SHA512 f650fa58e95502f87006e76b1fc9039dd597c909659f47208c297931e91a52d3f67780091cc36f458023d553651e303e4e8aab8458251e84e081171ad8a90f04 WHIRLPOOL dfc4e3a427f6e848f5e633fc7d89b434f3223c71d5640ba8bfceedee143da127bd1e45ea52bb60f964636b559a49f21c7cb2538cd9bff68a7c3b283d40b0b44c
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.27-r1.ebuild b/sys-apps/portage/portage-2.2.28-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.27-r1.ebuild
rename to sys-apps/portage/portage-2.2.28-r1.ebuild
index aec2a1724..8aca693f8 100644
--- a/sys-apps/portage/portage-2.2.27-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.28-r1.ebuild
@@ -15,7 +15,7 @@ inherit distutils-r1 git-2 multilib
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="d288acc2d1413a8739e74b2c20050dc2cc3bc69c"
+EGIT_COMMIT="f89c3c5cd8d1da1e40d9a94a016b3002df237237"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 

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

[Thomas Sachau]

commit:     f4f6e85e101e4dc23c1fa0e56b76bf287853cf06
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 12:39:10 2016 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 12:39:10 2016 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=f4f6e85e

Version bump to latest version

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

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 86c5bdc..d45abaa 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.22-r2.ebuild 11882 SHA256 9f4d60b0f1350609293442e8b083cc437b2495b70dedf3a9df29739c08efd90b SHA512 9fea7694f401348d0e267bbc8cf945293655627bb11805dfb3c59f697de156604dfc1b5931a87b1d7e86c83ca045b70b3386d8f10bfd26473d01e5f70091cb6b WHIRLPOOL 94395ac746ba1b17685ae02b3996a89e692e723ce6420222af965b131c3689158021226764df4576e5e30c456e83f48309693d8569a47ca61f76cc04c724cf0f
+EBUILD portage-2.2.27-r1.ebuild 11882 SHA256 9f4d60b0f1350609293442e8b083cc437b2495b70dedf3a9df29739c08efd90b SHA512 9fea7694f401348d0e267bbc8cf945293655627bb11805dfb3c59f697de156604dfc1b5931a87b1d7e86c83ca045b70b3386d8f10bfd26473d01e5f70091cb6b WHIRLPOOL 94395ac746ba1b17685ae02b3996a89e692e723ce6420222af965b131c3689158021226764df4576e5e30c456e83f48309693d8569a47ca61f76cc04c724cf0f
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

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

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

[Thomas Sachau]

commit:     664e56b780e2a5380a0beeab93e99b2b2ce1fc32
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 12:45:07 2016 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 12:45:07 2016 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=664e56b7

Sync with main tree version

 sys-apps/portage/Manifest                 |  2 +-
 sys-apps/portage/portage-2.2.27-r1.ebuild | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d45abaa..e9977f9 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.27-r1.ebuild 11882 SHA256 9f4d60b0f1350609293442e8b083cc437b2495b70dedf3a9df29739c08efd90b SHA512 9fea7694f401348d0e267bbc8cf945293655627bb11805dfb3c59f697de156604dfc1b5931a87b1d7e86c83ca045b70b3386d8f10bfd26473d01e5f70091cb6b WHIRLPOOL 94395ac746ba1b17685ae02b3996a89e692e723ce6420222af965b131c3689158021226764df4576e5e30c456e83f48309693d8569a47ca61f76cc04c724cf0f
+EBUILD portage-2.2.27-r1.ebuild 11932 SHA256 54920803594f786f6075ebdd8d68831b04805936d18bf9c32c48d4ef1f2362d0 SHA512 eb3122cdb47a75b23b93e157d4666b356a49311397b67060664128b86775c762234c74ad1e45f6c0874e09b1dc63281e7dd53fb6ebe47deea58b04cea3f6ede2 WHIRLPOOL eed819493e8a222591d36aa8d86ede7c6b6f570bda37e60685f180ea0b2f3bd27c854601cfd238f932c82c163d91b9d15f6e91e30f15735edae68d84176ed55a
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.27-r1.ebuild b/sys-apps/portage/portage-2.2.27-r1.ebuild
index f81b38c..a1bfb3d 100644
--- a/sys-apps/portage/portage-2.2.27-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.27-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,17 +6,16 @@ EAPI=5
 
 PYTHON_COMPAT=(
 	pypy
-	python3_3 python3_4
+	python3_3 python3_4 python3_5
 	python2_7
 )
-# Note: substituted below
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1 git-2 multilib
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="259272b9ffcf2c3d813487bf0119f761f32476e6"
+EGIT_COMMIT="58fb9ace0cb1bf49df2ce68b13999d303fa25756"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
@@ -25,7 +24,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
 
-DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
+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
@@ -69,6 +68,10 @@ PDEPEND="
 
 REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
 
+pkg_setup() {
+	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 

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

[Thomas Sachau]

commit:     2021d218bd530a28f64dccabd4d69393f02b6d49
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 12:58:30 2016 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 12:58:30 2016 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=2021d218

Sync portage

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

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e9977f9..98693b1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.27-r1.ebuild 11932 SHA256 54920803594f786f6075ebdd8d68831b04805936d18bf9c32c48d4ef1f2362d0 SHA512 eb3122cdb47a75b23b93e157d4666b356a49311397b67060664128b86775c762234c74ad1e45f6c0874e09b1dc63281e7dd53fb6ebe47deea58b04cea3f6ede2 WHIRLPOOL eed819493e8a222591d36aa8d86ede7c6b6f570bda37e60685f180ea0b2f3bd27c854601cfd238f932c82c163d91b9d15f6e91e30f15735edae68d84176ed55a
+EBUILD portage-2.2.27-r1.ebuild 11932 SHA256 4b68ba8d72b8f305aeaeda8b5bb1a6375f827d499745cb2af171e292515cd2fe SHA512 128914f272af0652b36d4511b4eaed33212cf78b577ecc33e302143a16ca35c63b2a078256785eefaeed0aada7b8605b3fd1ab7f10f1f7d8336508b55eca7d30 WHIRLPOOL e5b6c628ab7769c7dfa5171527d317886c8a2a3ad44125c9b9d365e955ed02d87d234113d0de6079f4255dfc0ed02add6e4d9b945f3108596dae8885e4549810
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.27-r1.ebuild b/sys-apps/portage/portage-2.2.27-r1.ebuild
index a1bfb3d..aec2a17 100644
--- a/sys-apps/portage/portage-2.2.27-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.27-r1.ebuild
@@ -15,7 +15,7 @@ inherit distutils-r1 git-2 multilib
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="58fb9ace0cb1bf49df2ce68b13999d303fa25756"
+EGIT_COMMIT="d288acc2d1413a8739e74b2c20050dc2cc3bc69c"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 

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

[Thomas Sachau]

commit:     f07a05296ac95a622f0ef5ef07808e2d866ba925
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  4 15:30:47 2015 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Oct  4 15:30:47 2015 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=f07a0529

Revision bump for converting forced flags from new multilib eclass to the matching ones from multilib-portage

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

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index bef6a88..86c5bdc 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.22-r1.ebuild 11882 SHA256 ed4856c9f7f5c066e07e031133f80db060924e7a48b50f2dffb45d6ec8067f98 SHA512 332ee0f9439a958daa9512fbdffe107c007ed04a4c4b476eae6d5b27b94905fab829ef189c175abdcc83af54786d0cc9a18728b5e61e1119fd6f7398b3170031 WHIRLPOOL a17fa391bbaacec176c9ce5037e7f05651a53bbebeb1fc28e4535b1f621359ea4a8fea870e9b1a664e7760c17bf3f977f3fefc0215da3069623d23d7f06002ec
+EBUILD portage-2.2.22-r2.ebuild 11882 SHA256 9f4d60b0f1350609293442e8b083cc437b2495b70dedf3a9df29739c08efd90b SHA512 9fea7694f401348d0e267bbc8cf945293655627bb11805dfb3c59f697de156604dfc1b5931a87b1d7e86c83ca045b70b3386d8f10bfd26473d01e5f70091cb6b WHIRLPOOL 94395ac746ba1b17685ae02b3996a89e692e723ce6420222af965b131c3689158021226764df4576e5e30c456e83f48309693d8569a47ca61f76cc04c724cf0f
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.22-r1.ebuild b/sys-apps/portage/portage-2.2.22-r2.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.22-r1.ebuild
rename to sys-apps/portage/portage-2.2.22-r2.ebuild
index a16156b..f81b38c 100644
--- a/sys-apps/portage/portage-2.2.22-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.22-r2.ebuild
@@ -16,7 +16,7 @@ inherit distutils-r1 git-2 multilib
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="0c879b950b70c54cd672ddc0541744d7785ee04b"
+EGIT_COMMIT="259272b9ffcf2c3d813487bf0119f761f32476e6"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 

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

[Thomas Sachau]

commit:     df06734c9fdb88b556fc8b4953b2ace2d4263f8b
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  4 12:02:01 2015 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Oct  4 12:02:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=df06734c

Sync with main tree: portage-2.2.22

 sys-apps/portage/Manifest                 |  2 +-
 sys-apps/portage/portage-2.2.22-r1.ebuild | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 6aab9b5..bef6a88 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.22-r1.ebuild 11531 SHA256 e6037e2d6d1beb24b4a02ae67d1490e0761dc9f9bef2a5db7af888bf161b1194 SHA512 05898a198abaa569f6b4635e943072093889adcf3e5e331d9e298fd3b22996c784e0c73d8277253222bc6d1570ee2c2d188d7f0d976bac133f3da0890cb43a4a WHIRLPOOL 4178fe1de35da39f9f6bd291a37516b0f75765370b59235364d1f67a3154c2afeb57f8908be9ae07f0e240bbbb3f7084ffa0f33436301b7daad04ed10e9a53ef
+EBUILD portage-2.2.22-r1.ebuild 11882 SHA256 ed4856c9f7f5c066e07e031133f80db060924e7a48b50f2dffb45d6ec8067f98 SHA512 332ee0f9439a958daa9512fbdffe107c007ed04a4c4b476eae6d5b27b94905fab829ef189c175abdcc83af54786d0cc9a18728b5e61e1119fd6f7398b3170031 WHIRLPOOL a17fa391bbaacec176c9ce5037e7f05651a53bbebeb1fc28e4535b1f621359ea4a8fea870e9b1a664e7760c17bf3f977f3fefc0215da3069623d23d7f06002ec
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.22-r1.ebuild b/sys-apps/portage/portage-2.2.22-r1.ebuild
index d8ae83a..a16156b 100644
--- a/sys-apps/portage/portage-2.2.22-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.22-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.18.ebuild,v 1.9 2015/04/26 15:42:47 zlogene Exp $
+# $Id$
 
 EAPI=5
 
@@ -26,6 +26,7 @@ SLOT="0"
 IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
 
 DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
+	>=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 )
@@ -39,6 +40,7 @@ DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
 # 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
@@ -346,4 +348,13 @@ pkg_postinst() {
 				-exec chown -R portage:portage {} +
 		fi
 	fi
+
+	einfo ""
+	einfo "This release of portage contains the new repoman code base"
+	einfo "This code base is still being developed.  So its API's are"
+	einfo "not to be considered stable and are subject to change."
+	einfo "The code released has been tested and considered ready for use."
+	einfo "This however does not guarantee it to be completely bug free."
+	einfo "Please report any bugs you may encounter."
+	einfo ""
 }

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

[Thomas Sachau]

commit:     adca31f32c6af0be80798e27035e5737df1be982
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  4 11:56:01 2015 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Oct  4 11:56:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=adca31f3

Sync with main tree: portage-2.2.22

 sys-apps/portage/Manifest                          |   3 +-
 sys-apps/portage/portage-2.2.18-r2.ebuild          | 349 ---------------------
 ...e-2.2.18-r1.ebuild => portage-2.2.22-r1.ebuild} |   2 +-
 3 files changed, 2 insertions(+), 352 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index de97c19..6aab9b5 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,2 @@
-EBUILD portage-2.2.18-r1.ebuild 11531 SHA256 f76ea14152df9db2a1c5cea42b63da88f3d247b4983bfa91d5b6a1028f10b1ec SHA512 57ebe740d6a8099f1121d06e4b478ce1c889552909fea29eb984276eee1ba9c1784fa47355ee27b11c69574895b4f25596a0a44894d132f226eeb01175218be3 WHIRLPOOL 0135931c190dd8276088aba25b83837debce91c43f60cd96b0972c4ff510ba650d3cccd0c16b4ef80d4c26c69aee5131f7bf531440d3c2a53576ea770f456fe0
-EBUILD portage-2.2.18-r2.ebuild 11531 SHA256 929f450333687b27d188418a7d06224158310a3044718dd100c08f1dc50dce57 SHA512 76f2c79498e6f2ef44ea7ca6c02dbd30185aa22f456bab869f98bc5a219745ab3755d99ec303f2f13a1807956483601d8673df831f91206541119433342af0d1 WHIRLPOOL 0f496a99925deb084fccfd81a8636a5782b6c8f1a271bb173140ed453ae79fa919d53a817da4cb0ddca90ce236a77b6dddc32f086c093a8a64127228c6284762
+EBUILD portage-2.2.22-r1.ebuild 11531 SHA256 e6037e2d6d1beb24b4a02ae67d1490e0761dc9f9bef2a5db7af888bf161b1194 SHA512 05898a198abaa569f6b4635e943072093889adcf3e5e331d9e298fd3b22996c784e0c73d8277253222bc6d1570ee2c2d188d7f0d976bac133f3da0890cb43a4a WHIRLPOOL 4178fe1de35da39f9f6bd291a37516b0f75765370b59235364d1f67a3154c2afeb57f8908be9ae07f0e240bbbb3f7084ffa0f33436301b7daad04ed10e9a53ef
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.18-r2.ebuild b/sys-apps/portage/portage-2.2.18-r2.ebuild
deleted file mode 100644
index ace3816..0000000
--- a/sys-apps/portage/portage-2.2.18-r2.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.18.ebuild,v 1.9 2015/04/26 15:42:47 zlogene Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_3 python3_4
-	python2_7
-)
-# Note: substituted below
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1 git-2 multilib
-
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="cf7284cba66a1d6e747ce916de24a5c25b5654f8"
-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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
-
-DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
-	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*')] )
-	>=sys-apps/abi-wrapper-1.0-r6"
-# 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="
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=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"
-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*') )"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_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
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		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 -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-			-e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
-			-i cnf/repos.conf || die "sed failed"
-
-		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 )
-	use epydoc && targets+=( install_epydoc )
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	# 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() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# 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.1.13" || \
-		{
-			has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
-			has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
-		} ; then
-		USERPRIV_UPGRADE=true
-		USERSYNC_UPGRADE=true
-		REPOS_CONF_UPGRADE=true
-		REPOS_CONF_SYNC=
-		type -P portageq >/dev/null 2>&1 && \
-			REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
-	else
-		USERPRIV_UPGRADE=false
-		USERSYNC_UPGRADE=false
-		REPOS_CONF_UPGRADE=false
-	fi
-}
-
-get_ownership() {
-	case ${USERLAND} in
-		BSD)
-			stat -f '%Su:%Sg' "${1}"
-			;;
-		*)
-			stat -c '%U:%G' "${1}"
-			;;
-	esac
-}
-
-new_config_protect() {
-	# Generate a ._cfg file even if the target file
-	# does not exist, ensuring that the user will
-	# notice the config change.
-	local basename=${1##*/}
-	local dirname=${1%/*}
-	local i=0
-	while true ; do
-		local filename=$(
-			echo -n "${dirname}/._cfg"
-			printf "%04d" ${i}
-			echo -n "_${basename}"
-		)
-		[[ -e ${filename} ]] || break
-		(( i++ ))
-	done
-	echo "${filename}"
-}
-
-pkg_postinst() {
-
-	if ${REPOS_CONF_UPGRADE} ; then
-		einfo "Generating repos.conf"
-		local repo_name=
-		[[ -f ${PORTDIR}/profiles/repo_name ]] && \
-			repo_name=$(< "${PORTDIR}/profiles/repo_name")
-		if [[ -z ${REPOS_CONF_SYNC} ]] ; then
-			REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
-		fi
-		local sync_type=
-		[[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
-		if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
-			sync_type=cvs
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
-		fi
-
-		cat <<-EOF > "${T}/repos.conf"
-		[DEFAULT]
-		main-repo = ${repo_name:-gentoo}
-
-		[${repo_name:-gentoo}]
-		location = ${PORTDIR:-${EPREFIX}/usr/portage}
-		sync-type = ${sync_type:-rsync}
-		sync-uri = ${REPOS_CONF_SYNC}
-		EOF
-
-		[[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
-		local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
-		if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
-			dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
-		fi
-		# Don't install the config update if the desired repos.conf directory
-		# and config file exist, since users may accept it blindly and break
-		# their config (bug #478726).
-		[[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
-			mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
-		if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
-			einfo "Generating make.conf PORTDIR setting for backward compatibility"
-			for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
-				[[ -e ${dest} ]] && break
-			done
-			[[ -d ${dest} ]] && dest=${dest}/portdir.conf
-			rm -rf "${T}/make.conf"
-			[[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
-			cat <<-EOF >> "${T}/make.conf"
-
-			# Set PORTDIR for backward compatibility with various tools:
-			#   gentoo-bashcomp - bug #478444
-			#   euse - bug #474574
-			#   euses and ufed - bug #478318
-			PORTDIR="${EPREFIX}/usr/portage"
-			EOF
-			mkdir -p "${dest%/*}"
-			mv "${T}/make.conf" "$(new_config_protect "${dest}")"
-		fi
-	fi
-
-	local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
-	if ${USERSYNC_UPGRADE} && \
-		[[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
-		local ownership=$(get_ownership "${PORTDIR}")
-		if [[ -n ${ownership} ]] ; then
-			einfo "Adjusting PORTDIR permissions for usersync"
-			find "${PORTDIR}" -path "${distdir%/}" -prune -o \
-				! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
-				-exec chown "${ownership}" {} +
-		fi
-	fi
-
-	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"
-
-	# Do this last, since it could take a long time if there
-	# are lots of live sources, and the user may be tempted
-	# to kill emerge while it is running.
-	if ${USERPRIV_UPGRADE} && \
-		[[ -d ${distdir} && -w ${distdir} ]] ; then
-		local ownership=$(get_ownership "${distdir}")
-		if [[ ${ownership#*:} == portage ]] ; then
-			einfo "Adjusting DISTDIR permissions for userpriv"
-			find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
-				-exec chown -R portage:portage {} +
-		fi
-	fi
-}

diff --git a/sys-apps/portage/portage-2.2.18-r1.ebuild b/sys-apps/portage/portage-2.2.22-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.18-r1.ebuild
rename to sys-apps/portage/portage-2.2.22-r1.ebuild
index d270faf..d8ae83a 100644
--- a/sys-apps/portage/portage-2.2.18-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.22-r1.ebuild
@@ -16,7 +16,7 @@ inherit distutils-r1 git-2 multilib
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="600cb1fd9daed3b01d8f51b38c29f000376b6513"
+EGIT_COMMIT="0c879b950b70c54cd672ddc0541744d7785ee04b"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 

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

[Thomas Sachau]

commit:     c57843630fa0b9e723d9ce791155f6ce52a58b14
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Tue May  5 13:26:55 2015 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun May 31 10:41:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=c5784363

Use fixed revision

 sys-apps/portage/Manifest                 | 2 +-
 sys-apps/portage/portage-2.2.18-r2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3f58062..de97c19 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
 EBUILD portage-2.2.18-r1.ebuild 11531 SHA256 f76ea14152df9db2a1c5cea42b63da88f3d247b4983bfa91d5b6a1028f10b1ec SHA512 57ebe740d6a8099f1121d06e4b478ce1c889552909fea29eb984276eee1ba9c1784fa47355ee27b11c69574895b4f25596a0a44894d132f226eeb01175218be3 WHIRLPOOL 0135931c190dd8276088aba25b83837debce91c43f60cd96b0972c4ff510ba650d3cccd0c16b4ef80d4c26c69aee5131f7bf531440d3c2a53576ea770f456fe0
-EBUILD portage-2.2.18-r2.ebuild 11531 SHA256 27419daddd85c91a5eeb14f03b511a3e5e9c4da1f1ed7657c2d33f15bdfa4c31 SHA512 38e64e367213676a34231bf81fa676afc335ac8560d167d146a6f5da695fbf0f45b6dcff013a8f28bac441b5def2027f4a3f51791153dc650c48c48159bcaeb6 WHIRLPOOL 232ff0fc8f19bc846efcdfa476f40a04697befe34a9224c180f81606c622598289668d0dd8054d54c2b5e4faba3e0f965bca83d04e81054dec60a689d0bdabfc
+EBUILD portage-2.2.18-r2.ebuild 11531 SHA256 929f450333687b27d188418a7d06224158310a3044718dd100c08f1dc50dce57 SHA512 76f2c79498e6f2ef44ea7ca6c02dbd30185aa22f456bab869f98bc5a219745ab3755d99ec303f2f13a1807956483601d8673df831f91206541119433342af0d1 WHIRLPOOL 0f496a99925deb084fccfd81a8636a5782b6c8f1a271bb173140ed453ae79fa919d53a817da4cb0ddca90ce236a77b6dddc32f086c093a8a64127228c6284762
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.18-r2.ebuild b/sys-apps/portage/portage-2.2.18-r2.ebuild
index a74a037..ace3816 100644
--- a/sys-apps/portage/portage-2.2.18-r2.ebuild
+++ b/sys-apps/portage/portage-2.2.18-r2.ebuild
@@ -16,7 +16,7 @@ inherit distutils-r1 git-2 multilib
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="47c39606998a29f78056f077b7a8a29e0bf20c86"
+EGIT_COMMIT="cf7284cba66a1d6e747ce916de24a5c25b5654f8"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 

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

[Thomas Sachau]

commit:     93c70800e7935baed2d7d6ac53f209c7a43dceea
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Tue May  5 12:12:05 2015 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun May 31 10:41:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=93c70800

Revision bump for fake abi_x86_32 dependency support

 sys-apps/portage/Manifest                 |   1 +
 sys-apps/portage/portage-2.2.18-r2.ebuild | 349 ++++++++++++++++++++++++++++++
 2 files changed, 350 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c455c14..3f58062 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,3 @@
 EBUILD portage-2.2.18-r1.ebuild 11531 SHA256 f76ea14152df9db2a1c5cea42b63da88f3d247b4983bfa91d5b6a1028f10b1ec SHA512 57ebe740d6a8099f1121d06e4b478ce1c889552909fea29eb984276eee1ba9c1784fa47355ee27b11c69574895b4f25596a0a44894d132f226eeb01175218be3 WHIRLPOOL 0135931c190dd8276088aba25b83837debce91c43f60cd96b0972c4ff510ba650d3cccd0c16b4ef80d4c26c69aee5131f7bf531440d3c2a53576ea770f456fe0
+EBUILD portage-2.2.18-r2.ebuild 11531 SHA256 27419daddd85c91a5eeb14f03b511a3e5e9c4da1f1ed7657c2d33f15bdfa4c31 SHA512 38e64e367213676a34231bf81fa676afc335ac8560d167d146a6f5da695fbf0f45b6dcff013a8f28bac441b5def2027f4a3f51791153dc650c48c48159bcaeb6 WHIRLPOOL 232ff0fc8f19bc846efcdfa476f40a04697befe34a9224c180f81606c622598289668d0dd8054d54c2b5e4faba3e0f965bca83d04e81054dec60a689d0bdabfc
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.18-r2.ebuild b/sys-apps/portage/portage-2.2.18-r2.ebuild
new file mode 100644
index 0000000..a74a037
--- /dev/null
+++ b/sys-apps/portage/portage-2.2.18-r2.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.18.ebuild,v 1.9 2015/04/26 15:42:47 zlogene Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_3 python3_4
+	python2_7
+)
+# Note: substituted below
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1 git-2 multilib
+
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="47c39606998a29f78056f077b7a8a29e0bf20c86"
+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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
+
+DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
+	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*')] )
+	>=sys-apps/abi-wrapper-1.0-r6"
+# 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="
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=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"
+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*') )"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_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
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		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 -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+			-e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
+			-i cnf/repos.conf || die "sed failed"
+
+		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 )
+	use epydoc && targets+=( install_epydoc )
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	# 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() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# 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.1.13" || \
+		{
+			has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
+			has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
+		} ; then
+		USERPRIV_UPGRADE=true
+		USERSYNC_UPGRADE=true
+		REPOS_CONF_UPGRADE=true
+		REPOS_CONF_SYNC=
+		type -P portageq >/dev/null 2>&1 && \
+			REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
+	else
+		USERPRIV_UPGRADE=false
+		USERSYNC_UPGRADE=false
+		REPOS_CONF_UPGRADE=false
+	fi
+}
+
+get_ownership() {
+	case ${USERLAND} in
+		BSD)
+			stat -f '%Su:%Sg' "${1}"
+			;;
+		*)
+			stat -c '%U:%G' "${1}"
+			;;
+	esac
+}
+
+new_config_protect() {
+	# Generate a ._cfg file even if the target file
+	# does not exist, ensuring that the user will
+	# notice the config change.
+	local basename=${1##*/}
+	local dirname=${1%/*}
+	local i=0
+	while true ; do
+		local filename=$(
+			echo -n "${dirname}/._cfg"
+			printf "%04d" ${i}
+			echo -n "_${basename}"
+		)
+		[[ -e ${filename} ]] || break
+		(( i++ ))
+	done
+	echo "${filename}"
+}
+
+pkg_postinst() {
+
+	if ${REPOS_CONF_UPGRADE} ; then
+		einfo "Generating repos.conf"
+		local repo_name=
+		[[ -f ${PORTDIR}/profiles/repo_name ]] && \
+			repo_name=$(< "${PORTDIR}/profiles/repo_name")
+		if [[ -z ${REPOS_CONF_SYNC} ]] ; then
+			REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
+			REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
+		fi
+		local sync_type=
+		[[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
+
+		if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
+			sync_type=cvs
+			REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
+		fi
+
+		cat <<-EOF > "${T}/repos.conf"
+		[DEFAULT]
+		main-repo = ${repo_name:-gentoo}
+
+		[${repo_name:-gentoo}]
+		location = ${PORTDIR:-${EPREFIX}/usr/portage}
+		sync-type = ${sync_type:-rsync}
+		sync-uri = ${REPOS_CONF_SYNC}
+		EOF
+
+		[[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
+
+		local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
+		if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
+			dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
+		fi
+		# Don't install the config update if the desired repos.conf directory
+		# and config file exist, since users may accept it blindly and break
+		# their config (bug #478726).
+		[[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
+			mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
+
+		if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
+			einfo "Generating make.conf PORTDIR setting for backward compatibility"
+			for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
+				[[ -e ${dest} ]] && break
+			done
+			[[ -d ${dest} ]] && dest=${dest}/portdir.conf
+			rm -rf "${T}/make.conf"
+			[[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
+			cat <<-EOF >> "${T}/make.conf"
+
+			# Set PORTDIR for backward compatibility with various tools:
+			#   gentoo-bashcomp - bug #478444
+			#   euse - bug #474574
+			#   euses and ufed - bug #478318
+			PORTDIR="${EPREFIX}/usr/portage"
+			EOF
+			mkdir -p "${dest%/*}"
+			mv "${T}/make.conf" "$(new_config_protect "${dest}")"
+		fi
+	fi
+
+	local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
+
+	if ${USERSYNC_UPGRADE} && \
+		[[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
+		local ownership=$(get_ownership "${PORTDIR}")
+		if [[ -n ${ownership} ]] ; then
+			einfo "Adjusting PORTDIR permissions for usersync"
+			find "${PORTDIR}" -path "${distdir%/}" -prune -o \
+				! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
+				-exec chown "${ownership}" {} +
+		fi
+	fi
+
+	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"
+
+	# Do this last, since it could take a long time if there
+	# are lots of live sources, and the user may be tempted
+	# to kill emerge while it is running.
+	if ${USERPRIV_UPGRADE} && \
+		[[ -d ${distdir} && -w ${distdir} ]] ; then
+		local ownership=$(get_ownership "${distdir}")
+		if [[ ${ownership#*:} == portage ]] ; then
+			einfo "Adjusting DISTDIR permissions for userpriv"
+			find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
+				-exec chown -R portage:portage {} +
+		fi
+	fi
+}

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

[Thomas Sachau]

commit:     d42579453d8cdf84ddf7fa5d1a614239f0644d24
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Tue May  5 11:39:12 2015 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Tue May  5 11:39:12 2015 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=d4257945

Version bump

 sys-apps/portage/Manifest                          |  2 +-
 ...e-2.2.15-r1.ebuild => portage-2.2.18-r1.ebuild} | 44 ++++++++++++++++++----
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 0376f0f..336fea5 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.15-r1.ebuild 11045 SHA256 438eb546f222f8f4dd3c8648e38ee09e7fdf8f4701a6f1cea32016f79fccf5f1 SHA512 35bea8693a898313ee282ec86a1a81bb26fa356499ce90e338c627f872f557b055f2e3f9729e9ff60a5712d84a68798fe56f99115d891b3163a7591766c2bd4f WHIRLPOOL a35a92b68bd8858a8649bbe0da29d431a83be7003293a276a65b2dc34699275abe22771caec7e846bd217c5e7accdabb08d1522470a396f331b9d5a144074f94
+EBUILD portage-2.2.18-r1.ebuild 11536 SHA256 2634843e2c2a037ff8d09622b5243c91ee738c466ad4904a8443c60d8e93ef83 SHA512 e1d48cb141f4695179b723c957194af74dd347dec71bb62baf148adbfbe1a5f5eab738dfc9a0569b4e478c342b3ac0ff36a6c73527a0619670f3863a67049ef5 WHIRLPOOL ece7a545654e3d500e69d7dcbbaf95bb27b8f1a7642dfc8ad9856a387701d83e3bb8dc2c5d671ca6e53b1cf24bdb549e83f0e783c8e1267b6d785c4ed9df1691
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.15-r1.ebuild b/sys-apps/portage/portage-2.2.18-r1.ebuild
similarity index 92%
rename from sys-apps/portage/portage-2.2.15-r1.ebuild
rename to sys-apps/portage/portage-2.2.18-r1.ebuild
index 08062c5..211a08b 100644
--- a/sys-apps/portage/portage-2.2.15-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.18-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.15.ebuild,v 1.2 2014/12/06 20:13:44 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.18.ebuild,v 1.9 2015/04/26 15:42:47 zlogene Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=(
 	pypy
-	python3_2 python3_3 python3_4
+	python3_3 python3_4
 	python2_7
 )
 # Note: substituted below
@@ -16,9 +16,9 @@ inherit distutils-r1 git-2 multilib
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="6a8389a3a9f6af80bbb4108d5bb6f4b847b44577"
+EGIT_COMMIT="600cb1fd9daed3b01d8f51b38c29f000376b6513"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
@@ -36,7 +36,7 @@ DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
 # 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] or python-mhash (bug #425046).
+# For whirlpool hash, require python[ssl] (bug #425046).
 # For compgen, require bash[readline] (bug #445576).
 RDEPEND="
 	dev-lang/python-exec:2
@@ -53,7 +53,7 @@ RDEPEND="
 	xattr? ( kernel_linux? (
 		>=sys-apps/install-xattr-0.3
 		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python{2_7,3_2} pypy)
+			python2_7 pypy)
 	) )
 	!<app-admin/logrotate-3.8.0
 	>=sys-apps/abi-wrapper-1.0-r6"
@@ -222,6 +222,36 @@ pkg_preinst() {
 	fi
 }
 
+get_ownership() {
+	case ${USERLAND} in
+		BSD)
+			stat -f '%Su:%Sg' "${1}"
+			;;
+		*)
+			stat -c '%U:%G' "${1}"
+			;;
+	esac
+}
+
+new_config_protect() {
+	# Generate a ._cfg file even if the target file
+	# does not exist, ensuring that the user will
+	# notice the config change.
+	local basename=${1##*/}
+	local dirname=${1%/*}
+	local i=0
+	while true ; do
+		local filename=$(
+			echo -n "${dirname}/._cfg"
+			printf "%04d" ${i}
+			echo -n "_${basename}"
+		)
+		[[ -e ${filename} ]] || break
+		(( i++ ))
+	done
+	echo "${filename}"
+}
+
 pkg_postinst() {
 
 	if ${REPOS_CONF_UPGRADE} ; then

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

[Thomas Sachau]

commit:     a817b3e6605fe49312bc67c9c82919c00ecfc67d
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Tue May  5 11:51:22 2015 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Tue May  5 11:51:22 2015 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=a817b3e6

Update remote uri to pull from

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

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 336fea5..c455c14 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.18-r1.ebuild 11536 SHA256 2634843e2c2a037ff8d09622b5243c91ee738c466ad4904a8443c60d8e93ef83 SHA512 e1d48cb141f4695179b723c957194af74dd347dec71bb62baf148adbfbe1a5f5eab738dfc9a0569b4e478c342b3ac0ff36a6c73527a0619670f3863a67049ef5 WHIRLPOOL ece7a545654e3d500e69d7dcbbaf95bb27b8f1a7642dfc8ad9856a387701d83e3bb8dc2c5d671ca6e53b1cf24bdb549e83f0e783c8e1267b6d785c4ed9df1691
+EBUILD portage-2.2.18-r1.ebuild 11531 SHA256 f76ea14152df9db2a1c5cea42b63da88f3d247b4983bfa91d5b6a1028f10b1ec SHA512 57ebe740d6a8099f1121d06e4b478ce1c889552909fea29eb984276eee1ba9c1784fa47355ee27b11c69574895b4f25596a0a44894d132f226eeb01175218be3 WHIRLPOOL 0135931c190dd8276088aba25b83837debce91c43f60cd96b0972c4ff510ba650d3cccd0c16b4ef80d4c26c69aee5131f7bf531440d3c2a53576ea770f456fe0
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.18-r1.ebuild b/sys-apps/portage/portage-2.2.18-r1.ebuild
index 211a08b..d270faf 100644
--- a/sys-apps/portage/portage-2.2.18-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.18-r1.ebuild
@@ -14,7 +14,7 @@ PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1 git-2 multilib
 
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
 EGIT_COMMIT="600cb1fd9daed3b01d8f51b38c29f000376b6513"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"

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

[Thomas Sachau]

commit:     d52fc6408ba6b97c51cbb9b33afb57b7b3faa8b4
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 12 20:44:31 2014 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Dec 12 20:44:31 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=d52fc640

Sync portage

---
 sys-apps/portage/Manifest                 |   2 +-
 sys-apps/portage/portage-2.2.10-r1.ebuild | 565 ------------------------------
 sys-apps/portage/portage-2.2.15-r1.ebuild | 319 +++++++++++++++++
 3 files changed, 320 insertions(+), 566 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ca1ac98..0376f0f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.10-r1.ebuild 19359 SHA256 a1360fe9e6259719baebbac0a8cac92da30741c65dc0e9a36f5ad9f6e2a9bb81 SHA512 e705109a9d87652d8e321565c36fb95823f7f78f662c49315d5d43d650e27346b233fb6aa3a7d2ef9f0035d17fbdc8e6136ea6a9fa344d65a23b1e5e9fda89a8 WHIRLPOOL a11aa143962f827a07d5232dda38bc3a476e108912489e274629334766a01724bba8978d29b6659175aa17485bb37b3a2fe0ffc6f89e0f146a964cee4d8a334f
+EBUILD portage-2.2.15-r1.ebuild 11045 SHA256 438eb546f222f8f4dd3c8648e38ee09e7fdf8f4701a6f1cea32016f79fccf5f1 SHA512 35bea8693a898313ee282ec86a1a81bb26fa356499ce90e338c627f872f557b055f2e3f9729e9ff60a5712d84a68798fe56f99115d891b3163a7591766c2bd4f WHIRLPOOL a35a92b68bd8858a8649bbe0da29d431a83be7003293a276a65b2dc34699275abe22771caec7e846bd217c5e7accdabb08d1522470a396f331b9d5a144074f94
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.10-r1.ebuild b/sys-apps/portage/portage-2.2.10-r1.ebuild
deleted file mode 100644
index 81e157e..0000000
--- a/sys-apps/portage/portage-2.2.10-r1.ebuild
+++ /dev/null
@@ -1,565 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.10.ebuild,v 1.2 2014/04/06 17:00:03 mgorny Exp $
-
-# Require EAPI 2 since we now require at least python-2.6 (for python 3
-# syntax support) which also requires EAPI 2.
-EAPI=2
-PYTHON_COMPAT=(
-	pypy pypy2_0
-	python3_2 python3_3 python3_4
-	python2_6 python2_7
-)
-inherit eutils git-2 multilib
-
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
-EGIT_BRANCH="multilib"
-EGIT_COMMIT="aa18688b2ff79a1d2c6b2036a3beb79781363051"
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru pypy python2 python3 selinux xattr"
-
-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] )
-	!pypy? ( !python2? ( !python3? (
-		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
-	) ) )
-	pypy? ( !python2? ( !python3? ( virtual/pypy:0[bzip2] ) ) )
-	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_pypy? ( virtual/pypy:0 )
-	python_targets_pypy2_0? ( virtual/pypy:2.0 )
-	python_targets_python2_6? ( dev-lang/python:2.6 )
-	python_targets_python2_7? ( dev-lang/python:2.7 )
-	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 )
-"
-
-# The pysqlite blocker is for bug #282760.
-# make-3.82 is for bug #455858
-DEPEND="${python_dep}
-	>=sys-devel/make-3.82
-	>=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 !<=dev-python/pysqlite-2.4.1 )
-	>=sys-apps/abi-wrapper-1.0-r6"
-# 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] or python-mhash (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5
-		|| ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) )
-		>=app-admin/eselect-1.2
-		|| ( ${python_dep_ssl} dev-python/python-mhash )
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-	xattr? ( kernel_linux? (
-		$(for python_impl in python{2_6,2_7,3_2} pypy pypy2_0; do
-			echo "python_targets_${python_impl}? ( dev-python/pyxattr[python_targets_${python_impl}] )"
-		done) ) )
-	!<app-shells/bash-3.2_p17
-	!<app-admin/logrotate-3.8.0
-	>=sys-apps/abi-wrapper-1.0-r6"
-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
-
-compatible_python_is_selected() {
-	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-current_python_has_xattr() {
-	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
-	local PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	[[ $("${PYTHON}" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
-	"${PYTHON}" -c 'import xattr' 2>/dev/null
-}
-
-call_with_python_impl() {
-	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
-	env EPYTHON=${EPYTHON} "$@"
-}
-
-get_python_interpreter() {
-	[ $# -eq 1 ] || die "expected 1 argument, got $#: $*"
-	local impl=$1 python
-	case "${impl}" in
-		python*)
-			python=${impl/_/.}
-			;;
-		pypy)
-			python=${impl}
-			;;
-		pypy*)
-			python=${impl/_/.}
-			python=${python/pypy/pypy-c}
-			;;
-		*)
-			die "Unrecognized python target: ${impl}"
-	esac
-	echo ${python}
-}
-
-get_python_sitedir() {
-	[ $# -eq 1 ] || die "expected 1 argument, got $#: $*"
-	local impl=$1
-	local site_dir=usr/$(get_libdir)/${impl/_/.}/site-packages
-	[[ -d ${EROOT:-${ROOT}}${site_dir} ]] || \
-		ewarn "site-packages dir missing for ${impl}: ${EROOT:-${ROOT}}${site_dir}"
-	echo "/${site_dir}"
-}
-
-python_compileall() {
-	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
-	local d=${EPREFIX}$1 PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	local d_image=${D}${d#/}
-	[[ -d ${d_image} ]] || die "directory does not exist: ${d_image}"
-	case "${EPYTHON}" in
-		python*)
-			"${PYTHON}" -m compileall -q -f -d "${d}" "${d_image}" || die
-			# Note: Using -OO breaks emaint, since it requires __doc__,
-			# and __doc__ is None when -OO is used.
-			"${PYTHON}" -O -m compileall -q -f -d "${d}" "${d_image}" || die
-			;;
-		pypy*)
-			"${PYTHON}" -m compileall -q -f -d "${d}" "${d_image}" || die
-			;;
-		*)
-			die "Unrecognized EPYTHON value: ${EPYTHON}"
-	esac
-}
-
-pkg_setup() {
-	if use python2 && use python3 ; then
-		ewarn "Both python2 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy && use python3 ; then
-		ewarn "Both pypy and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy && use python2 ; then
-		ewarn "Both pypy and python2 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python2"
-	fi
-	if ! use pypy && ! use python2 && ! use python3 && \
-		! compatible_python_is_selected ; then
-		ewarn "Attempting to select a compatible default python interpreter"
-		local x success=0
-		for x in "${EPREFIX}"/usr/bin/python2.* ; do
-			x=${x#${EPREFIX}/usr/bin/python2.}
-			if [[ $x -ge 6 ]] 2>/dev/null ; then
-				eselect python set python2.$x
-				if compatible_python_is_selected ; then
-					elog "Default python interpreter is now set to python-2.$x"
-					success=1
-					break
-				fi
-			fi
-		done
-		if [ $success != 1 ] ; then
-			eerror "Unable to select a compatible default python interpreter!"
-			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
-		fi
-	fi
-
-	# We use EPYTHON to designate the active python interpreter,
-	# but we only export when needed, via call_with_python_impl.
-	EPYTHON=python
-	export -n EPYTHON
-	if use python3; then
-		EPYTHON=python3
-	elif use python2; then
-		EPYTHON=python2
-	elif use pypy; then
-		EPYTHON=pypy
-	fi
-}
-
-src_prepare() {
-       touch ChangeLog #Makefile requires this file to exist
-	if [ -n "${PATCHVER}" ] ; then
-		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
-			rm "$S/bin/ebuild-helpers/portageq" \
-				|| die "failed to remove portageq helper symlink"
-		fi
-		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
-	fi
-	einfo "Setting portage.VERSION to ${PVR} ..."
-	sed -e "s/^VERSION = .*/VERSION = \"${PVR}\"/" -i pym/portage/__init__.py || \
-		die "Failed to patch portage.VERSION"
-	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
-		die "Failed to patch VERSION in doc/fragment/version"
-	sed -e "1s/VERSION/${PVR}/" -i $(find man -type f) || \
-		die "Failed to patch VERSION in man page headers"
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_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
-
-	local set_shebang=
-	if use python3; then
-		set_shebang=python3
-	elif use python2; then
-		set_shebang=python2
-	elif use pypy; then
-		set_shebang=pypy
-	fi
-	if [[ -n ${set_shebang} ]] ; then
-		einfo "Converting shebangs for ${set_shebang}..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!/usr/bin/python"* ]] ; then
-				sed -i -e "1s:python:${set_shebang}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		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 -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-			-e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
-			-i cnf/repos.conf || die "sed failed"
-
-		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
-}
-
-src_compile() {
-	if use doc; then
-		call_with_python_impl \
-		emake docbook || die
-	fi
-
-	if use epydoc; then
-		einfo "Generating api docs"
-		call_with_python_impl \
-		emake epydoc || die
-	fi
-}
-
-src_test() {
-	# make files executable, in case they were created by patch
-	find bin -type f | xargs chmod +x
-	call_with_python_impl \
-	emake test || die
-}
-
-src_install() {
-	call_with_python_impl \
-	emake DESTDIR="${D}" \
-		sysconfdir="${EPREFIX}/etc" \
-		prefix="${EPREFIX}/usr" \
-		install || die
-
-	# Use dodoc for compression, since the Makefile doesn't do that.
-	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
-
-	# Allow external portage API consumers to import portage python modules
-	# (this used to be done with PYTHONPATH setting in /etc/env.d).
-	# For each of PYTHON_TARGETS, install a tree of *.py symlinks in
-	# site-packages, and compile with the corresponding interpreter.
-	local impl files mod_dir dest_mod_dir python relative_path x
-	for impl in "${PYTHON_COMPAT[@]}" ; do
-		use "python_targets_${impl}" || continue
-		if use build && [[ ${ROOT} == / &&
-			! -x ${EPREFIX}/usr/bin/$(get_python_interpreter ${impl}) ]] ; then
-			# Tolerate --nodeps at beginning of stage1 for catalyst
-			ewarn "skipping python_targets_${impl}, interpreter not found"
-			continue
-		fi
-		while read -r mod_dir ; do
-			cd "${ED:-${D}}usr/lib/portage/pym/${mod_dir}" || die
-			files=$(echo *.py)
-			if [ -z "${files}" ] || [ "${files}" = "*.py" ]; then
-				# __pycache__ directories contain no py files
-				continue
-			fi
-			dest_mod_dir=$(get_python_sitedir ${impl})/${mod_dir}
-			dodir "${dest_mod_dir}" || die
-			relative_path=../../../lib/portage/pym/${mod_dir}
-			x=/${mod_dir}
-			while [ -n "${x}" ] ; do
-				relative_path=../${relative_path}
-				x=${x%/*}
-			done
-			for x in ${files} ; do
-				dosym "${relative_path}/${x}" \
-					"${dest_mod_dir}/${x}" || die
-			done
-		done < <(cd "${ED:-${D}}"usr/lib/portage/pym || die ; find * -type d ! -path "portage/tests*")
-		cd "${S}" || die
-		EPYTHON=$(get_python_interpreter ${impl}) \
-		python_compileall "$(get_python_sitedir ${impl})"
-	done
-
-	# Compile /usr/lib/portage/pym with the active interpreter, since portage
-	# internal commands force this directory to the beginning of sys.path.
-	python_compileall /usr/lib/portage/pym
-}
-
-pkg_preinst() {
-	if [[ $ROOT == / ]] ; then
-		# Run some minimal tests as a sanity check.
-		local test_runner=$(find "${ED:-${D}}" -name runTests)
-		if [[ -n $test_runner && -x $test_runner ]] ; then
-			einfo "Running preinst sanity tests..."
-			"$test_runner" || die "preinst sanity tests failed"
-		fi
-	fi
-
-	if use xattr && ! current_python_has_xattr ; then
-		ewarn "For optimal performance in xattr handling, install"
-		ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
-		ewarn "enable USE=python3 for $CATEGORY/$PN."
-	fi
-
-	# 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:-${D}}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED:-${D}}"var/log/portage{,/elog}
-	fi
-
-	# If portage-2.1.6 is installed and the preserved_libs_registry exists,
-	# assume that the NEEDED.ELF.2 files have already been generated.
-	has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
-		! { [ -e "${EROOT:-${ROOT}}"var/lib/portage/preserved_libs_registry ] && \
-		has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ; } \
-		&& NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
-
-	if has_version "<${CATEGORY}/${PN}-2.1.13" || \
-		{
-			has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
-			has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
-		} ; then
-		USERPRIV_UPGRADE=true
-		USERSYNC_UPGRADE=true
-		REPOS_CONF_UPGRADE=true
-		REPOS_CONF_SYNC=
-		type -P portageq >/dev/null 2>&1 && \
-			REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
-	else
-		USERPRIV_UPGRADE=false
-		USERSYNC_UPGRADE=false
-		REPOS_CONF_UPGRADE=false
-	fi
-}
-
-get_ownership() {
-	case ${USERLAND} in
-		BSD)
-			stat -f '%Su:%Sg' "${1}"
-			;;
-		*)
-			stat -c '%U:%G' "${1}"
-			;;
-	esac
-}
-
-new_config_protect() {
-	# Generate a ._cfg file even if the target file
-	# does not exist, ensuring that the user will
-	# notice the config change.
-	local basename=${1##*/}
-	local dirname=${1%/*}
-	local i=0
-	while true ; do
-		local filename=$(
-			echo -n "${dirname}/._cfg"
-			printf "%04d" ${i}
-			echo -n "_${basename}"
-		)
-		[[ -e ${filename} ]] || break
-		(( i++ ))
-	done
-	echo "${filename}"
-}
-
-pkg_postinst() {
-
-	if ${REPOS_CONF_UPGRADE} ; then
-		einfo "Generating repos.conf"
-		local repo_name=
-		[[ -f ${PORTDIR}/profiles/repo_name ]] && \
-			repo_name=$(< "${PORTDIR}/profiles/repo_name")
-		if [[ -z ${REPOS_CONF_SYNC} ]] ; then
-			REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
-		fi
-		local sync_type=
-		[[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
-		if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
-			sync_type=cvs
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
-		fi
-
-		cat <<-EOF > "${T}/repos.conf"
-		[DEFAULT]
-		main-repo = ${repo_name:-gentoo}
-
-		[${repo_name:-gentoo}]
-		location = ${PORTDIR:-${EPREFIX}/usr/portage}
-		sync-type = ${sync_type:-rsync}
-		sync-uri = ${REPOS_CONF_SYNC}
-		EOF
-
-		[[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
-		local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
-		if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
-			dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
-		fi
-		# Don't install the config update if the desired repos.conf directory
-		# and config file exist, since users may accept it blindly and break
-		# their config (bug #478726).
-		[[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
-			mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
-		if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
-			einfo "Generating make.conf PORTDIR setting for backward compatibility"
-			for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
-				[[ -e ${dest} ]] && break
-			done
-			[[ -d ${dest} ]] && dest=${dest}/portdir.conf
-			rm -rf "${T}/make.conf"
-			[[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
-			cat <<-EOF >> "${T}/make.conf"
-
-			# Set PORTDIR for backward compatibility with various tools:
-			#   gentoo-bashcomp - bug #478444
-			#   euse - bug #474574
-			#   euses and ufed - bug #478318
-			PORTDIR="${EPREFIX}/usr/portage"
-			EOF
-			mkdir -p "${dest%/*}"
-			mv "${T}/make.conf" "$(new_config_protect "${dest}")"
-		fi
-	fi
-
-	if ${NEEDED_REBUILD_UPGRADE} ; then
-		einfo "rebuilding NEEDED.ELF.2 files"
-		local cpv filename line newline
-		for cpv in "${EROOT:-${ROOT}}var/db/pkg"/*/*; do
-			[[ -f "${cpv}/NEEDED" && ! -f "${cpv}/NEEDED.ELF.2" ]] || continue
-			while read -r line; do
-				filename=${line% *}
-				newline=$(scanelf -BF "%a;%F;%S;%r;%n" "${ROOT%/}${filename}")
-				newline=${newline//  -  }
-				[[ ${#ROOT} -gt 1 ]] && newline=${newline/${ROOT%/}}
-				echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
-			done < "${cpv}/NEEDED"
-		done
-	fi
-
-	local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
-	if ${USERSYNC_UPGRADE} && \
-		[[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
-		local ownership=$(get_ownership "${PORTDIR}")
-		if [[ -n ${ownership} ]] ; then
-			einfo "Adjusting PORTDIR permissions for usersync"
-			find "${PORTDIR}" -path "${distdir%/}" -prune -o \
-				! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
-				-exec chown "${ownership}" {} +
-		fi
-	fi
-
-	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"
-
-	# Do this last, since it could take a long time if there
-	# are lots of live sources, and the user may be tempted
-	# to kill emerge while it is running.
-	if ${USERPRIV_UPGRADE} && \
-		[[ -d ${distdir} && -w ${distdir} ]] ; then
-		local ownership=$(get_ownership "${distdir}")
-		if [[ ${ownership#*:} == portage ]] ; then
-			einfo "Adjusting DISTDIR permissions for userpriv"
-			find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
-				-exec chown -R portage:portage {} +
-		fi
-	fi
-}

diff --git a/sys-apps/portage/portage-2.2.15-r1.ebuild b/sys-apps/portage/portage-2.2.15-r1.ebuild
new file mode 100644
index 0000000..08062c5
--- /dev/null
+++ b/sys-apps/portage/portage-2.2.15-r1.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.15.ebuild,v 1.2 2014/12/06 20:13:44 dolsen Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_2 python3_3 python3_4
+	python2_7
+)
+# Note: substituted below
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1 git-2 multilib
+
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="6a8389a3a9f6af80bbb4108d5bb6f4b847b44577"
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
+
+DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
+	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*')] )
+	>=sys-apps/abi-wrapper-1.0-r6"
+# 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] or python-mhash (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=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}]' \
+			python{2_7,3_2} pypy)
+	) )
+	!<app-admin/logrotate-3.8.0
+	>=sys-apps/abi-wrapper-1.0-r6"
+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*') )"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_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
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		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 -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+			-e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
+			-i cnf/repos.conf || die "sed failed"
+
+		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 )
+	use epydoc && targets+=( install_epydoc )
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	# 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() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# 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.1.13" || \
+		{
+			has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
+			has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
+		} ; then
+		USERPRIV_UPGRADE=true
+		USERSYNC_UPGRADE=true
+		REPOS_CONF_UPGRADE=true
+		REPOS_CONF_SYNC=
+		type -P portageq >/dev/null 2>&1 && \
+			REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
+	else
+		USERPRIV_UPGRADE=false
+		USERSYNC_UPGRADE=false
+		REPOS_CONF_UPGRADE=false
+	fi
+}
+
+pkg_postinst() {
+
+	if ${REPOS_CONF_UPGRADE} ; then
+		einfo "Generating repos.conf"
+		local repo_name=
+		[[ -f ${PORTDIR}/profiles/repo_name ]] && \
+			repo_name=$(< "${PORTDIR}/profiles/repo_name")
+		if [[ -z ${REPOS_CONF_SYNC} ]] ; then
+			REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
+			REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
+		fi
+		local sync_type=
+		[[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
+
+		if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
+			sync_type=cvs
+			REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
+		fi
+
+		cat <<-EOF > "${T}/repos.conf"
+		[DEFAULT]
+		main-repo = ${repo_name:-gentoo}
+
+		[${repo_name:-gentoo}]
+		location = ${PORTDIR:-${EPREFIX}/usr/portage}
+		sync-type = ${sync_type:-rsync}
+		sync-uri = ${REPOS_CONF_SYNC}
+		EOF
+
+		[[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
+
+		local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
+		if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
+			dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
+		fi
+		# Don't install the config update if the desired repos.conf directory
+		# and config file exist, since users may accept it blindly and break
+		# their config (bug #478726).
+		[[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
+			mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
+
+		if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
+			einfo "Generating make.conf PORTDIR setting for backward compatibility"
+			for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
+				[[ -e ${dest} ]] && break
+			done
+			[[ -d ${dest} ]] && dest=${dest}/portdir.conf
+			rm -rf "${T}/make.conf"
+			[[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
+			cat <<-EOF >> "${T}/make.conf"
+
+			# Set PORTDIR for backward compatibility with various tools:
+			#   gentoo-bashcomp - bug #478444
+			#   euse - bug #474574
+			#   euses and ufed - bug #478318
+			PORTDIR="${EPREFIX}/usr/portage"
+			EOF
+			mkdir -p "${dest%/*}"
+			mv "${T}/make.conf" "$(new_config_protect "${dest}")"
+		fi
+	fi
+
+	local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
+
+	if ${USERSYNC_UPGRADE} && \
+		[[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
+		local ownership=$(get_ownership "${PORTDIR}")
+		if [[ -n ${ownership} ]] ; then
+			einfo "Adjusting PORTDIR permissions for usersync"
+			find "${PORTDIR}" -path "${distdir%/}" -prune -o \
+				! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
+				-exec chown "${ownership}" {} +
+		fi
+	fi
+
+	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"
+
+	# Do this last, since it could take a long time if there
+	# are lots of live sources, and the user may be tempted
+	# to kill emerge while it is running.
+	if ${USERPRIV_UPGRADE} && \
+		[[ -d ${distdir} && -w ${distdir} ]] ; then
+		local ownership=$(get_ownership "${distdir}")
+		if [[ ${ownership#*:} == portage ]] ; then
+			einfo "Adjusting DISTDIR permissions for userpriv"
+			find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
+				-exec chown -R portage:portage {} +
+		fi
+	fi
+}

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

[Thomas Sachau]

commit:     8958a49a531c23b1063e2a2287a0cf9c5dffb97d
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 20:13:18 2014 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Jun  2 20:13:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=8958a49a

Sync portage

---
 sys-apps/portage/Manifest                          |  2 +-
 ...ge-2.2.6-r1.ebuild => portage-2.2.10-r1.ebuild} | 45 +++++++++++++---------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d3c679c..ca1ac98 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.6-r1.ebuild 19203 SHA256 4b55bde3431be8fc113897279020dc60e294f1050af67d7f4703cfc6a074bd26 SHA512 8b8fd51b4c9473b23eea27050274d7453a68b285dd9eae066cdbbf11572d85fd4185bc11ef31f1d6fa7e616fb2a56d870b21d210b750cba1308474c279453c85 WHIRLPOOL cb33b890bf919fd80b66f2484296b5bf0569e3e8fce365252ac5287467050f03f0da96e1fe62801560788aa5cbff6fc7425c736a87db441b6ad746a9a5a3f955
+EBUILD portage-2.2.10-r1.ebuild 19359 SHA256 a1360fe9e6259719baebbac0a8cac92da30741c65dc0e9a36f5ad9f6e2a9bb81 SHA512 e705109a9d87652d8e321565c36fb95823f7f78f662c49315d5d43d650e27346b233fb6aa3a7d2ef9f0035d17fbdc8e6136ea6a9fa344d65a23b1e5e9fda89a8 WHIRLPOOL a11aa143962f827a07d5232dda38bc3a476e108912489e274629334766a01724bba8978d29b6659175aa17485bb37b3a2fe0ffc6f89e0f146a964cee4d8a334f
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.6-r1.ebuild b/sys-apps/portage/portage-2.2.10-r1.ebuild
similarity index 93%
rename from sys-apps/portage/portage-2.2.6-r1.ebuild
rename to sys-apps/portage/portage-2.2.10-r1.ebuild
index f76f707..81e157e 100644
--- a/sys-apps/portage/portage-2.2.6-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.10-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.5.ebuild,v 1.1 2013/09/15 11:18:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.10.ebuild,v 1.2 2014/04/06 17:00:03 mgorny Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
 EAPI=2
 PYTHON_COMPAT=(
-	pypy2_0
+	pypy pypy2_0
 	python3_2 python3_3 python3_4
 	python2_6 python2_7
 )
@@ -14,13 +14,13 @@ inherit eutils git-2 multilib
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="5e951e83a79c1e7e6ae64d60f768b4b46e4c6f9e"
+EGIT_COMMIT="aa18688b2ff79a1d2c6b2036a3beb79781363051"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr"
+IUSE="build doc epydoc +ipc linguas_ru pypy python2 python3 selinux xattr"
 
 for _pyimpl in ${PYTHON_COMPAT[@]} ; do
 	IUSE+=" python_targets_${_pyimpl}"
@@ -30,16 +30,17 @@ 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? (
+	!pypy? ( !python2? ( !python3? (
 		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
 	) ) )
-	pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) )
+	pypy? ( !python2? ( !python3? ( virtual/pypy:0[bzip2] ) ) )
 	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_pypy? ( virtual/pypy:0 )
 	python_targets_pypy2_0? ( virtual/pypy:2.0 )
 	python_targets_python2_6? ( dev-lang/python:2.6 )
 	python_targets_python2_7? ( dev-lang/python:2.7 )
@@ -73,8 +74,11 @@ RDEPEND="${python_dep}
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
 	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
 	>=app-misc/pax-utils-0.1.17
-	xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
 	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
+	xattr? ( kernel_linux? (
+		$(for python_impl in python{2_6,2_7,3_2} pypy pypy2_0; do
+			echo "python_targets_${python_impl}? ( dev-python/pyxattr[python_targets_${python_impl}] )"
+		done) ) )
 	!<app-shells/bash-3.2_p17
 	!<app-admin/logrotate-3.8.0
 	>=sys-apps/abi-wrapper-1.0-r6"
@@ -109,6 +113,9 @@ get_python_interpreter() {
 		python*)
 			python=${impl/_/.}
 			;;
+		pypy)
+			python=${impl}
+			;;
 		pypy*)
 			python=${impl/_/.}
 			python=${python/pypy/pypy-c}
@@ -153,15 +160,15 @@ pkg_setup() {
 		ewarn "Both python2 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if use pypy2_0 && use python3 ; then
-		ewarn "Both pypy2_0 and python3 USE flags are enabled, but only one"
+	if use pypy && use python3 ; then
+		ewarn "Both pypy and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if use pypy2_0 && use python2 ; then
-		ewarn "Both pypy2_0 and python2 USE flags are enabled, but only one"
+	if use pypy && use python2 ; then
+		ewarn "Both pypy and python2 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python2"
 	fi
-	if ! use pypy2_0 && ! use python2 && ! use python3 && \
+	if ! use pypy && ! use python2 && ! use python3 && \
 		! compatible_python_is_selected ; then
 		ewarn "Attempting to select a compatible default python interpreter"
 		local x success=0
@@ -190,8 +197,8 @@ pkg_setup() {
 		EPYTHON=python3
 	elif use python2; then
 		EPYTHON=python2
-	elif use pypy2_0; then
-		EPYTHON=pypy-c2.0
+	elif use pypy; then
+		EPYTHON=pypy
 	fi
 }
 
@@ -205,7 +212,7 @@ src_prepare() {
 		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
 	fi
 	einfo "Setting portage.VERSION to ${PVR} ..."
-	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
+	sed -e "s/^VERSION = .*/VERSION = \"${PVR}\"/" -i pym/portage/__init__.py || \
 		die "Failed to patch portage.VERSION"
 	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
 		die "Failed to patch VERSION in doc/fragment/version"
@@ -230,8 +237,8 @@ src_prepare() {
 		set_shebang=python3
 	elif use python2; then
 		set_shebang=python2
-	elif use pypy2_0; then
-		set_shebang=pypy-c2.0
+	elif use pypy; then
+		set_shebang=pypy
 	fi
 	if [[ -n ${set_shebang} ]] ; then
 		einfo "Converting shebangs for ${set_shebang}..."
@@ -273,7 +280,7 @@ src_prepare() {
 		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
 			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
 			-e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.freens.org/gentoo-portage-prefix|" \
+			-e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
 			-i cnf/repos.conf || die "sed failed"
 
 		einfo "Adding FEATURES=force-prefix to make.globals ..."

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

[Thomas Sachau]

commit:     1aafaf771f039b56460394158d9adb150c904b0e
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 20:55:23 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 20:55:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=1aafaf77

Sync portage

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

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7a4b76d..d3c679c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.5-r1.ebuild 19203 SHA256 0d406052442f6f7fec1b0c66f0737f88370d5c385cc89a4e85d1c004d3757ec2 SHA512 bd4c2094fbb5e5f64e9b183008f04520ecfb8691f8ca2ec72373c7e54dd8ca124f179cb3a34e9b710c1195c03c61ddab0aa11b752ba07ae1f65fc6b198efa18a WHIRLPOOL d66d05a302ea5d36b8c626374173ff591b1d92822800c78f16e53bfbed3f416bc4533ab4726733d3fac94289993269bdc547bc9199217914b1a68802d3d5eb2e
+EBUILD portage-2.2.6-r1.ebuild 19203 SHA256 4b55bde3431be8fc113897279020dc60e294f1050af67d7f4703cfc6a074bd26 SHA512 8b8fd51b4c9473b23eea27050274d7453a68b285dd9eae066cdbbf11572d85fd4185bc11ef31f1d6fa7e616fb2a56d870b21d210b750cba1308474c279453c85 WHIRLPOOL cb33b890bf919fd80b66f2484296b5bf0569e3e8fce365252ac5287467050f03f0da96e1fe62801560788aa5cbff6fc7425c736a87db441b6ad746a9a5a3f955
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.5-r1.ebuild b/sys-apps/portage/portage-2.2.6-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.5-r1.ebuild
rename to sys-apps/portage/portage-2.2.6-r1.ebuild
index 402764f..f76f707 100644
--- a/sys-apps/portage/portage-2.2.5-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.6-r1.ebuild
@@ -14,7 +14,7 @@ inherit eutils git-2 multilib
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="64e7d296a0dc87d73bcc9d28b09dae71769e2aa1"
+EGIT_COMMIT="5e951e83a79c1e7e6ae64d60f768b4b46e4c6f9e"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     aa26c59dcb20c8cdfa877e94595893a1c69c34bd
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 11:42:35 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 11:42:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=aa26c59d

Sync portage

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

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a8dbe6e..7a4b76d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.4-r1.ebuild 19302 SHA256 aa8e7c72b973c396f8377a202d9059c9fd0033ebfc0aaa15f79338e95259ca5d SHA512 ff9024ff401e736a2ea34a432af3fbf6b190fb0da4206a4b5514827d5b72074eb5d376c7a8dcae57670da5d23386a0ccca9d1e38642e2785db449a2a23783425 WHIRLPOOL f6638c7f3b9242219e2f494b58e67891df731790dab74b17d9dd6017e3e0cf58d4224ad80a8c156175a857241ace69f58d52779edcce5dae62e810f7e44d6562
+EBUILD portage-2.2.5-r1.ebuild 19203 SHA256 0d406052442f6f7fec1b0c66f0737f88370d5c385cc89a4e85d1c004d3757ec2 SHA512 bd4c2094fbb5e5f64e9b183008f04520ecfb8691f8ca2ec72373c7e54dd8ca124f179cb3a34e9b710c1195c03c61ddab0aa11b752ba07ae1f65fc6b198efa18a WHIRLPOOL d66d05a302ea5d36b8c626374173ff591b1d92822800c78f16e53bfbed3f416bc4533ab4726733d3fac94289993269bdc547bc9199217914b1a68802d3d5eb2e
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

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

[Thomas Sachau]

commit:     1ae2962517f3dd4c50959eefdb9e698004832ba7
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 11:42:18 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 11:42:18 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=1ae29625

Sync portage

---
 .../{portage-2.2.4-r1.ebuild => portage-2.2.5-r1.ebuild}   | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/sys-apps/portage/portage-2.2.4-r1.ebuild b/sys-apps/portage/portage-2.2.5-r1.ebuild
similarity index 98%
rename from sys-apps/portage/portage-2.2.4-r1.ebuild
rename to sys-apps/portage/portage-2.2.5-r1.ebuild
index 47411ec..402764f 100644
--- a/sys-apps/portage/portage-2.2.4-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.5-r1.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0.ebuild,v 1.2 2013/08/13 00:59:44 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.5.ebuild,v 1.1 2013/09/15 11:18:49 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
 EAPI=2
 PYTHON_COMPAT=(
-	pypy1_9 pypy2_0
-	python3_1 python3_2 python3_3 python3_4
+	pypy2_0
+	python3_2 python3_3 python3_4
 	python2_6 python2_7
 )
 inherit eutils git-2 multilib
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="b8889dd3884d43f911ff0d7faffa1fd836ad28b0"
+EGIT_COMMIT="64e7d296a0dc87d73bcc9d28b09dae71769e2aa1"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
@@ -40,11 +40,9 @@ python_dep="${python_dep//,ssl}"
 python_dep="${python_dep//ssl,}"
 
 python_dep="${python_dep}
-	python_targets_pypy1_9? ( virtual/pypy:1.9 )
 	python_targets_pypy2_0? ( virtual/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 )
@@ -409,8 +407,8 @@ pkg_preinst() {
 		USERSYNC_UPGRADE=true
 		REPOS_CONF_UPGRADE=true
 		REPOS_CONF_SYNC=
-		type portageq >/dev/null 2>&1 && \
-			REPOS_CONF_SYNC=$(portageq envvar SYNC)
+		type -P portageq >/dev/null 2>&1 && \
+			REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
 	else
 		USERPRIV_UPGRADE=false
 		USERSYNC_UPGRADE=false

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

[Thomas Sachau]

commit:     9358baf73e71b2703ea585bb1534fa0d5eab486a
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 11:07:34 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 11:07:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=9358baf7

Sync portage

---
 sys-apps/portage/{portage-2.2.2-r1.ebuild => portage-2.2.4-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

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

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

[Thomas Sachau]

commit:     5d5e574ca68ccdf4f7b402de7864b6beba36dae4
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 11:08:17 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 11:08:17 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=5d5e574c

Sync portage

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

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 9a01dba..a8dbe6e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.2-r1.ebuild 19302 SHA256 464200b35ad0f05a3165cbdd491af42e68776aaabe1730313cbac28895ca1902 SHA512 713823e23f53172ddcb4bc46af48ecab3e3eab0372e49b3a3fc14328bec445126c75db0b3e42d29d680ecfdd625a0e48f83cf77f4a5df9a9a36ac249b7b1e700 WHIRLPOOL dc1bedcccc60b947a3ab0cbb787a1053fb38330d80272b96e4d5efabd570d7cd1e03583fab0cd41fdd696635ba8e3e3e527d310762916f305c2ac254ad8faa5b
+EBUILD portage-2.2.4-r1.ebuild 19302 SHA256 aa8e7c72b973c396f8377a202d9059c9fd0033ebfc0aaa15f79338e95259ca5d SHA512 ff9024ff401e736a2ea34a432af3fbf6b190fb0da4206a4b5514827d5b72074eb5d376c7a8dcae57670da5d23386a0ccca9d1e38642e2785db449a2a23783425 WHIRLPOOL f6638c7f3b9242219e2f494b58e67891df731790dab74b17d9dd6017e3e0cf58d4224ad80a8c156175a857241ace69f58d52779edcce5dae62e810f7e44d6562
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.4-r1.ebuild b/sys-apps/portage/portage-2.2.4-r1.ebuild
index 725cb93..47411ec 100644
--- a/sys-apps/portage/portage-2.2.4-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.4-r1.ebuild
@@ -14,7 +14,7 @@ inherit eutils git-2 multilib
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="ccdd40c3588b47a3048ec51c2bc0eb28f9023930"
+EGIT_COMMIT="b8889dd3884d43f911ff0d7faffa1fd836ad28b0"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     aa8a520b15374cf8d6120e519371dcc36057d954
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 10 16:54:43 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Tue Sep 10 16:54:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=aa8a520b

Sync portage

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

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 9b62a4b..9a01dba 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.1-r1.ebuild 19302 SHA256 b88f8a14e7412f6acaaaf22333e7278c58d3ad7aa6da92709a4c8d475eede90d SHA512 da1d7376d4688b472a159268d0fbe71d96fe0a53656fdcde4c423414d0f77014f6c08a755e25bb9687cb31aa14018173991ce73de666082edd7f1cd2c6322078 WHIRLPOOL a08ece201b0ca1f6babd9c64f4376002887dc402521502eca6b4eff6e5d721bc4695fb2d54cf0c76908e0d0f822f1c795bafc6b0e6401dea5b53f4b0edf06135
+EBUILD portage-2.2.2-r1.ebuild 19302 SHA256 464200b35ad0f05a3165cbdd491af42e68776aaabe1730313cbac28895ca1902 SHA512 713823e23f53172ddcb4bc46af48ecab3e3eab0372e49b3a3fc14328bec445126c75db0b3e42d29d680ecfdd625a0e48f83cf77f4a5df9a9a36ac249b7b1e700 WHIRLPOOL dc1bedcccc60b947a3ab0cbb787a1053fb38330d80272b96e4d5efabd570d7cd1e03583fab0cd41fdd696635ba8e3e3e527d310762916f305c2ac254ad8faa5b
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.1-r1.ebuild b/sys-apps/portage/portage-2.2.2-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.1-r1.ebuild
rename to sys-apps/portage/portage-2.2.2-r1.ebuild
index fecc039..725cb93 100644
--- a/sys-apps/portage/portage-2.2.1-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.2-r1.ebuild
@@ -14,7 +14,7 @@ inherit eutils git-2 multilib
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="af379d621327813e4a3e41af885c0d13c42999ac"
+EGIT_COMMIT="ccdd40c3588b47a3048ec51c2bc0eb28f9023930"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     c6701c1a10c5a91f5a68957eac02fac0ff11c89e
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 19:51:49 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 19:51:49 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=c6701c1a

Sync portage

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

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c09903e..9b62a4b 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0-r1.ebuild 19302 SHA256 0d1d21b536fc8758bfd8519e9781f8509472bf65f4bc76b04932ab6dcdd39fa6 SHA512 6e7fbdfeace0833bcd5a3337e592255eefd29c761ce48eb635deb6af1c9d986ee19fe3969421233531788a19db18edac578b53329e4086a7a6e1a08bddc235b0 WHIRLPOOL fc34782a6bf462b1cdbc8733a810ef350ce915e216204117bba01ddc326014d7068e522c9adaf3357919ef6fddb908158ebf38a925e73365fd6e362c575203e0
+EBUILD portage-2.2.1-r1.ebuild 19302 SHA256 b88f8a14e7412f6acaaaf22333e7278c58d3ad7aa6da92709a4c8d475eede90d SHA512 da1d7376d4688b472a159268d0fbe71d96fe0a53656fdcde4c423414d0f77014f6c08a755e25bb9687cb31aa14018173991ce73de666082edd7f1cd2c6322078 WHIRLPOOL a08ece201b0ca1f6babd9c64f4376002887dc402521502eca6b4eff6e5d721bc4695fb2d54cf0c76908e0d0f822f1c795bafc6b0e6401dea5b53f4b0edf06135
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0-r1.ebuild b/sys-apps/portage/portage-2.2.1-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0-r1.ebuild
rename to sys-apps/portage/portage-2.2.1-r1.ebuild
index 561b4aa..fecc039 100644
--- a/sys-apps/portage/portage-2.2.0-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.1-r1.ebuild
@@ -14,7 +14,7 @@ inherit eutils git-2 multilib
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="2efeb36f8e3fff17de8230d84081bf6b8a733ea2"
+EGIT_COMMIT="af379d621327813e4a3e41af885c0d13c42999ac"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     89c65fa142fd4cb52bb5229f7ea12b53df730fa6
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 18 21:08:37 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Aug 18 21:08:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=89c65fa1

Sync portage

---
 sys-apps/portage/Manifest                          |  2 +-
 ..._alpha193-r1.ebuild => portage-2.2.0-r1.ebuild} | 50 +++++++++++++---------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3ce2db0..c09903e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha193-r1.ebuild 18950 SHA256 157484fe57693f8b1e72a2c451f93d4d6821aca29e72fa38016f76ac7381870d SHA512 644211e6ca649a5dafd57111493a9be010a0bcd4cbb0051034965cbb431c5413ef2b0f0563fe0ce37669ce948477b2549c8e77e8968bfe6e094a2f52c1c80a88 WHIRLPOOL 4bc887845abb592325fa1557ec7bd2d16ecb333f9688909cab5e020114e9ded1430173ec148c7db892bc4ab81fc4302428b7110ba5dd50c1e1e920602a767344
+EBUILD portage-2.2.0-r1.ebuild 19302 SHA256 0d1d21b536fc8758bfd8519e9781f8509472bf65f4bc76b04932ab6dcdd39fa6 SHA512 6e7fbdfeace0833bcd5a3337e592255eefd29c761ce48eb635deb6af1c9d986ee19fe3969421233531788a19db18edac578b53329e4086a7a6e1a08bddc235b0 WHIRLPOOL fc34782a6bf462b1cdbc8733a810ef350ce915e216204117bba01ddc326014d7068e522c9adaf3357919ef6fddb908158ebf38a925e73365fd6e362c575203e0
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild b/sys-apps/portage/portage-2.2.0-r1.ebuild
similarity index 92%
rename from sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild
rename to sys-apps/portage/portage-2.2.0-r1.ebuild
index 6e164c7..561b4aa 100644
--- a/sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha193.ebuild,v 1.1 2013/08/03 22:44:58 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0.ebuild,v 1.2 2013/08/13 00:59:44 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
-EAPI=3
+EAPI=2
 PYTHON_COMPAT=(
 	pypy1_9 pypy2_0
 	python3_1 python3_2 python3_3 python3_4
@@ -14,11 +14,11 @@ inherit eutils git-2 multilib
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="c7f1ce526769123ea129eb3ec0d5239aa1b5e610"
+EGIT_COMMIT="2efeb36f8e3fff17de8230d84081bf6b8a733ea2"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr"
 
@@ -124,10 +124,10 @@ get_python_interpreter() {
 get_python_sitedir() {
 	[ $# -eq 1 ] || die "expected 1 argument, got $#: $*"
 	local impl=$1
-	local site_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages
-	[[ -d ${EROOT}${site_dir} ]] || \
-		ewarn "site-packages dir missing for ${impl}: ${EROOT}${site_dir}"
-	echo "${site_dir}"
+	local site_dir=usr/$(get_libdir)/${impl/_/.}/site-packages
+	[[ -d ${EROOT:-${ROOT}}${site_dir} ]] || \
+		ewarn "site-packages dir missing for ${impl}: ${EROOT:-${ROOT}}${site_dir}"
+	echo "/${site_dir}"
 }
 
 python_compileall() {
@@ -339,7 +339,7 @@ src_install() {
 			continue
 		fi
 		while read -r mod_dir ; do
-			cd "${ED}/usr/lib/portage/pym/${mod_dir}" || die
+			cd "${ED:-${D}}usr/lib/portage/pym/${mod_dir}" || die
 			files=$(echo *.py)
 			if [ -z "${files}" ] || [ "${files}" = "*.py" ]; then
 				# __pycache__ directories contain no py files
@@ -357,7 +357,7 @@ src_install() {
 				dosym "${relative_path}/${x}" \
 					"${dest_mod_dir}/${x}" || die
 			done
-		done < <(cd "${ED}"/usr/lib/portage/pym || die ; find * -type d ! -path "portage/tests*")
+		done < <(cd "${ED:-${D}}"usr/lib/portage/pym || die ; find * -type d ! -path "portage/tests*")
 		cd "${S}" || die
 		EPYTHON=$(get_python_interpreter ${impl}) \
 		python_compileall "$(get_python_sitedir ${impl})"
@@ -371,7 +371,7 @@ src_install() {
 pkg_preinst() {
 	if [[ $ROOT == / ]] ; then
 		# Run some minimal tests as a sanity check.
-		local test_runner=$(find "$ED" -name runTests)
+		local test_runner=$(find "${ED:-${D}}" -name runTests)
 		if [[ -n $test_runner && -x $test_runner ]] ; then
 			einfo "Running preinst sanity tests..."
 			"$test_runner" || die "preinst sanity tests failed"
@@ -389,14 +389,14 @@ pkg_preinst() {
 	# 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}
+	if chown portage:portage "${ED:-${D}}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED:-${D}}"var/log/portage{,/elog}
 	fi
 
 	# If portage-2.1.6 is installed and the preserved_libs_registry exists,
 	# assume that the NEEDED.ELF.2 files have already been generated.
 	has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
-		! { [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
+		! { [ -e "${EROOT:-${ROOT}}"var/lib/portage/preserved_libs_registry ] && \
 		has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ; } \
 		&& NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
 
@@ -456,12 +456,17 @@ pkg_postinst() {
 		[[ -f ${PORTDIR}/profiles/repo_name ]] && \
 			repo_name=$(< "${PORTDIR}/profiles/repo_name")
 		if [[ -z ${REPOS_CONF_SYNC} ]] ; then
-			REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT}/usr/share/portage/config/repos.conf")
+			REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
 			REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
 		fi
 		local sync_type=
 		[[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
 
+		if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
+			sync_type=cvs
+			REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
+		fi
+
 		cat <<-EOF > "${T}/repos.conf"
 		[DEFAULT]
 		main-repo = ${repo_name:-gentoo}
@@ -471,19 +476,22 @@ pkg_postinst() {
 		sync-type = ${sync_type:-rsync}
 		sync-uri = ${REPOS_CONF_SYNC}
 		EOF
-		local dest=${EROOT}/etc/portage/repos.conf
+
+		[[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
+
+		local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
 		if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
-			dest=${EROOT}/etc/portage/repos.conf/${repo_name:-gentoo}.conf
+			dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
 		fi
 		# Don't install the config update if the desired repos.conf directory
 		# and config file exist, since users may accept it blindly and break
 		# their config (bug #478726).
-		[[ -e ${EROOT}/etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
+		[[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
 			mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
 
 		if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
 			einfo "Generating make.conf PORTDIR setting for backward compatibility"
-			for dest in "${EROOT}/etc/make.conf" "${EROOT}/etc/portage/make.conf" ; do
+			for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
 				[[ -e ${dest} ]] && break
 			done
 			[[ -d ${dest} ]] && dest=${dest}/portdir.conf
@@ -505,7 +513,7 @@ pkg_postinst() {
 	if ${NEEDED_REBUILD_UPGRADE} ; then
 		einfo "rebuilding NEEDED.ELF.2 files"
 		local cpv filename line newline
-		for cpv in "${EROOT}/var/db/pkg"/*/*; do
+		for cpv in "${EROOT:-${ROOT}}var/db/pkg"/*/*; do
 			[[ -f "${cpv}/NEEDED" && ! -f "${cpv}/NEEDED.ELF.2" ]] || continue
 			while read -r line; do
 				filename=${line% *}
@@ -545,7 +553,7 @@ pkg_postinst() {
 		local ownership=$(get_ownership "${distdir}")
 		if [[ ${ownership#*:} == portage ]] ; then
 			einfo "Adjusting DISTDIR permissions for userpriv"
-			find "${distdir}" -maxdepth 1 -type d -uid 0 \
+			find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
 				-exec chown -R portage:portage {} +
 		fi
 	fi

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

[Thomas Sachau]

commit:     b503720b2c9de892be7a0eb65c750185c552664a
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 22:08:47 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 22:13:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=b503720b

Sync portage

---
 sys-apps/portage/Manifest                         | 2 +-
 sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 62ff683..3ce2db0 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha193-r1.ebuild 18950 SHA256 798f890ec5dced7eacf4aff13c505b75dd97708a0d6b4814561b48687000e386 SHA512 63e4f0b7be29e606a5894bb86fee27a1a255db6f926be88a16924ba6ecd3561e4c38c24bcfdeffaf8264f3bf51cd00e98f6fefbcb147a01c580663af3c8ca36a WHIRLPOOL 2788100fd18ba20317cd253d303033d00261bfecee1bf3793207a9e338bfdb62c43af5f12df5db5ce105eb9f5f6c38791d1ebf894c5f24943b81f130e7b220b4
+EBUILD portage-2.2.0_alpha193-r1.ebuild 18950 SHA256 157484fe57693f8b1e72a2c451f93d4d6821aca29e72fa38016f76ac7381870d SHA512 644211e6ca649a5dafd57111493a9be010a0bcd4cbb0051034965cbb431c5413ef2b0f0563fe0ce37669ce948477b2549c8e77e8968bfe6e094a2f52c1c80a88 WHIRLPOOL 4bc887845abb592325fa1557ec7bd2d16ecb333f9688909cab5e020114e9ded1430173ec148c7db892bc4ab81fc4302428b7110ba5dd50c1e1e920602a767344
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild
index 35e1d86..6e164c7 100644
--- a/sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild
@@ -14,7 +14,7 @@ inherit eutils git-2 multilib
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="5f1b2875c4d9ceb6e6fad3db65147e7b5acc86a9"
+EGIT_COMMIT="c7f1ce526769123ea129eb3ec0d5239aa1b5e610"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     775d26ad2f2d4f53a3d494d86f37e05c0b2ffbde
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 11:51:43 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 22:13:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=775d26ad

Sync portage

---
 sys-apps/portage/Manifest                          |   2 +-
 ...-r1.ebuild => portage-2.2.0_alpha193-r1.ebuild} | 337 ++++++++++++++++-----
 2 files changed, 260 insertions(+), 79 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 582dbd0..c24aa54 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha192-r1.ebuild 13411 SHA256 fbb273c60711e51e449a74b9db04ed7543f7da28b065944307b8f30ca3d7d357 SHA512 cf1ca692a6a88390cab7570f2ff5bf0ee11f2c8b7ca18e25c5a182c9296bd4c85817af0e37bc3e8e069fbd13a6937e310f5d1155d643d3d1adf522399001a684 WHIRLPOOL 450ddc9a760549c7faeacf6265dbcfeb8599ef8bfdcaa4576a59bfd28c61433162fd2b3514465af1c23fe1c21eb5c3baec33c9cfcbae3d618558a3c6ef3a2571
+EBUILD portage-2.2.0_alpha193-r1.ebuild 18950 SHA256 417ac6c336723703ba09b70f4b4ebda9a8ba5e7dfd6bd0974ee683787d179798 SHA512 32b71c0c1e39686b128b594b5a6afe6cbe07eb9b08157b91ae61500268233e3f808e2360241f999502778a4ec47d477ce8b81f235e927defed7d5077ad60f0d1 WHIRLPOOL 54d7ba06421355fc2c613bd9a63a22d41a7a0a9dc2aaecbfb8c33252ccf8ae335895728e89ac8a4acab3bdd7c127d625a21cf5e8465b944d65a48682126b309a
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha192-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild
similarity index 53%
rename from sys-apps/portage/portage-2.2.0_alpha192-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild
index c96915e..e42fb3b 100644
--- a/sys-apps/portage/portage-2.2.0_alpha192-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha169.ebuild,v 1.1 2013/03/22 02:43:09 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha193.ebuild,v 1.1 2013/08/03 22:44:58 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -10,17 +10,17 @@ PYTHON_COMPAT=(
 	python3_1 python3_2 python3_3 python3_4
 	python2_6 python2_7
 )
-inherit eutils git-2 python
+inherit eutils git-2 multilib
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="ed2bdce054f8c05045da13241896e2ada5babb6d"
+EGIT_COMMIT="38858c9d01ae9d713b7124c2cb5db63ba137c6b8"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl linguas_ru pypy2_0 python2 python3 selinux xattr"
+IUSE="build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr"
 
 for _pyimpl in ${PYTHON_COMPAT[@]} ; do
 	IUSE+=" python_targets_${_pyimpl}"
@@ -33,15 +33,15 @@ 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] ) ) )
+	pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) )
 	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_pypy1_9? ( virtual/pypy:1.9 )
+	python_targets_pypy2_0? ( virtual/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 )
@@ -93,8 +93,61 @@ compatible_python_is_selected() {
 }
 
 current_python_has_xattr() {
-	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
-	"${EPREFIX}/usr/bin/python" -c 'import xattr' 2>/dev/null
+	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	local PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	[[ $("${PYTHON}" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
+	"${PYTHON}" -c 'import xattr' 2>/dev/null
+}
+
+call_with_python_impl() {
+	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	env EPYTHON=${EPYTHON} "$@"
+}
+
+get_python_interpreter() {
+	[ $# -eq 1 ] || die "expected 1 argument, got $#: $*"
+	local impl=$1 python
+	case "${impl}" in
+		python*)
+			python=${impl/_/.}
+			;;
+		pypy*)
+			python=${impl/_/.}
+			python=${python/pypy/pypy-c}
+			;;
+		*)
+			die "Unrecognized python target: ${impl}"
+	esac
+	echo ${python}
+}
+
+get_python_sitedir() {
+	[ $# -eq 1 ] || die "expected 1 argument, got $#: $*"
+	local impl=$1
+	local site_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages
+	[[ -d ${EROOT}${site_dir} ]] || \
+		ewarn "site-packages dir missing for ${impl}: ${EROOT}${site_dir}"
+	echo "${site_dir}"
+}
+
+python_compileall() {
+	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	local d=${EPREFIX}$1 PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	local d_image=${D}${d#/}
+	[[ -d ${d_image} ]] || die "directory does not exist: ${d_image}"
+	case "${EPYTHON}" in
+		python*)
+			"${PYTHON}" -m compileall -q -f -d "${d}" "${d_image}" || die
+			# Note: Using -OO breaks emaint, since it requires __doc__,
+			# and __doc__ is None when -OO is used.
+			"${PYTHON}" -O -m compileall -q -f -d "${d}" "${d_image}" || die
+			;;
+		pypy*)
+			"${PYTHON}" -m compileall -q -f -d "${d}" "${d_image}" || die
+			;;
+		*)
+			die "Unrecognized EPYTHON value: ${EPYTHON}"
+	esac
 }
 
 pkg_setup() {
@@ -131,12 +184,16 @@ pkg_setup() {
 		fi
 	fi
 
+	# We use EPYTHON to designate the active python interpreter,
+	# but we only export when needed, via call_with_python_impl.
+	EPYTHON=python
+	export -n EPYTHON
 	if use python3; then
-		python_set_active_version 3
+		EPYTHON=python3
 	elif use python2; then
-		python_set_active_version 2
+		EPYTHON=python2
 	elif use pypy2_0; then
-		python_set_active_version 2.7-pypy-2.0
+		EPYTHON=pypy-c2.0
 	fi
 }
 
@@ -170,15 +227,23 @@ src_prepare() {
 			|| die "failed to append to make.globals"
 	fi
 
+	local set_shebang=
 	if use python3; then
-		einfo "Converting shebangs for python3..."
-		python_convert_shebangs -r 3 .
+		set_shebang=python3
 	elif use python2; then
-		einfo "Converting shebangs for python2..."
-		python_convert_shebangs -r 2 .
+		set_shebang=python2
 	elif use pypy2_0; then
-		einfo "Converting shebangs for pypy-c2.0..."
-		python_convert_shebangs -r 2.7-pypy-2.0 .
+		set_shebang=pypy-c2.0
+	fi
+	if [[ -n ${set_shebang} ]] ; then
+		einfo "Converting shebangs for ${set_shebang}..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!/usr/bin/python"* ]] ; then
+				sed -i -e "1s:python:${set_shebang}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
 	fi
 
 	if [[ -n ${EPREFIX} ]] ; then
@@ -193,32 +258,34 @@ src_prepare() {
 			die "Failed to patch portage.const.EPREFIX"
 
 		einfo "Prefixing shebangs ..."
-		find . -type f -print0 | \
 		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
+		done < <(find . -type f -print0)
 
 		einfo "Adjusting make.globals ..."
-		sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \
-			-e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \
-			-e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
 			-i cnf/make.globals || die "sed failed"
 
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+			-e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.freens.org/gentoo-portage-prefix|" \
+			-i cnf/repos.conf || die "sed failed"
+
 		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
 
-	echo -e '\nFEATURES="${FEATURES} preserve-libs"' >> cnf/make.globals \
-		|| die "failed to append to make.globals"
-
 	cd "${S}/cnf" || die
-	if [ -f "make.conf.${ARCH}".diff ]; then
-		patch make.conf "make.conf.${ARCH}".diff || \
+	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 ""
@@ -230,11 +297,13 @@ src_prepare() {
 
 src_compile() {
 	if use doc; then
+		call_with_python_impl \
 		emake docbook || die
 	fi
 
 	if use epydoc; then
 		einfo "Generating api docs"
+		call_with_python_impl \
 		emake epydoc || die
 	fi
 }
@@ -242,10 +311,12 @@ src_compile() {
 src_test() {
 	# make files executable, in case they were created by patch
 	find bin -type f | xargs chmod +x
+	call_with_python_impl \
 	emake test || die
 }
 
 src_install() {
+	call_with_python_impl \
 	emake DESTDIR="${D}" \
 		sysconfdir="${EPREFIX}/etc" \
 		prefix="${EPREFIX}/usr" \
@@ -254,26 +325,27 @@ src_install() {
 	# Use dodoc for compression, since the Makefile doesn't do that.
 	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
 
-	if use linguas_pl; then
-		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die
-		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die
-	fi
-
 	# Allow external portage API consumers to import portage python modules
 	# (this used to be done with PYTHONPATH setting in /etc/env.d).
 	# For each of PYTHON_TARGETS, install a tree of *.py symlinks in
 	# site-packages, and compile with the corresponding interpreter.
-	local impl files mod_dir dest_mod_dir python relative_path files x
+	local impl files mod_dir dest_mod_dir python relative_path x
 	for impl in "${PYTHON_COMPAT[@]}" ; do
 		use "python_targets_${impl}" || continue
+		if use build && [[ ${ROOT} == / &&
+			! -x ${EPREFIX}/usr/bin/$(get_python_interpreter ${impl}) ]] ; then
+			# Tolerate --nodeps at beginning of stage1 for catalyst
+			ewarn "skipping python_targets_${impl}, interpreter not found"
+			continue
+		fi
 		while read -r mod_dir ; do
-			cd "${S}/pym/${mod_dir}" || die
+			cd "${ED}/usr/lib/portage/pym/${mod_dir}" || die
 			files=$(echo *.py)
 			if [ -z "${files}" ] || [ "${files}" = "*.py" ]; then
 				# __pycache__ directories contain no py files
 				continue
 			fi
-			dest_mod_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages/${mod_dir}
+			dest_mod_dir=$(get_python_sitedir ${impl})/${mod_dir}
 			dodir "${dest_mod_dir}" || die
 			relative_path=../../../lib/portage/pym/${mod_dir}
 			x=/${mod_dir}
@@ -285,22 +357,15 @@ src_install() {
 				dosym "${relative_path}/${x}" \
 					"${dest_mod_dir}/${x}" || die
 			done
-		done < <(cd "${S}"/pym || die ; find * -type d ! -path "portage/tests*")
-		dest_mod_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages
-		case "${impl}" in
-			python*)
-				python=${impl/_/.}
-				python=${EPREFIX}/usr/bin/${python}
-				"${python}" -m compileall -q -f -d "${EPREFIX}${dest_mod_dir}" "${ED}${dest_mod_dir#/}" || die
-				"${python}" -OO -m compileall -q -f -d "${EPREFIX}${dest_mod_dir}" "${ED}${dest_mod_dir#/}" || die
-				;;
-			pypy*)
-				python=${impl/_/.}
-				python=${EPREFIX}/usr/bin/${python/pypy/pypy-c}
-				"${python}" -m compileall -q -f -d "${EPREFIX}${dest_mod_dir}" "${ED}${dest_mod_dir#/}" || die
-				;;
-		esac
+		done < <(cd "${ED}"/usr/lib/portage/pym || die ; find * -type d ! -path "portage/tests*")
+		cd "${S}" || die
+		EPYTHON=$(get_python_interpreter ${impl}) \
+		python_compileall "$(get_python_sitedir ${impl})"
 	done
+
+	# Compile /usr/lib/portage/pym with the active interpreter, since portage
+	# internal commands force this directory to the beginning of sys.path.
+	python_compileall /usr/lib/portage/pym
 }
 
 pkg_preinst() {
@@ -319,53 +384,169 @@ pkg_preinst() {
 		ewarn "enable USE=python3 for $CATEGORY/$PN."
 	fi
 
-	has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
-		&& WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
+	# 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 portage-2.1.6 is installed and the preserved_libs_registry exists,
 	# assume that the NEEDED.ELF.2 files have already been generated.
 	has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
-		! ( [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
-		has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) \
+		! { [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
+		has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ; } \
 		&& NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
+
+	if has_version "<${CATEGORY}/${PN}-2.1.13" || \
+		{
+			has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
+			has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
+		} ; then
+		USERPRIV_UPGRADE=true
+		USERSYNC_UPGRADE=true
+		REPOS_CONF_UPGRADE=true
+		REPOS_CONF_SYNC=
+		type portageq >/dev/null 2>&1 && \
+			REPOS_CONF_SYNC=$(portageq envvar SYNC)
+	else
+		USERPRIV_UPGRADE=false
+		USERSYNC_UPGRADE=false
+		REPOS_CONF_UPGRADE=false
+	fi
+}
+
+get_ownership() {
+	case ${USERLAND} in
+		BSD)
+			stat -f '%Su:%Sg' "${1}"
+			;;
+		*)
+			stat -c '%U:%G' "${1}"
+			;;
+	esac
+}
+
+new_config_protect() {
+	# Generate a ._cfg file even if the target file
+	# does not exist, ensuring that the user will
+	# notice the config change.
+	local basename=${1##*/}
+	local dirname=${1%/*}
+	local i=0
+	while true ; do
+		local filename=$(
+			echo -n "${dirname}/._cfg"
+			printf "%04d" ${i}
+			echo -n "_${basename}"
+		)
+		[[ -e ${filename} ]] || break
+		(( i++ ))
+	done
+	echo "${filename}"
 }
 
 pkg_postinst() {
-	if $WORLD_MIGRATION_UPGRADE && \
-		grep -q "^@" "${EROOT}/var/lib/portage/world"; then
-		einfo "moving set references from the worldfile into world_sets"
-		cd "${EROOT}/var/lib/portage/"
-		grep "^@" world >> world_sets
-		sed -i -e '/^@/d' world
+
+	if ${REPOS_CONF_UPGRADE} ; then
+		einfo "Generating repos.conf"
+		local repo_name=
+		[[ -f ${PORTDIR}/profiles/repo_name ]] && \
+			repo_name=$(< "${PORTDIR}/profiles/repo_name")
+		if [[ -z ${REPOS_CONF_SYNC} ]] ; then
+			REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT}/usr/share/portage/config/repos.conf")
+			REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
+		fi
+		local sync_type=
+		[[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
+
+		cat <<-EOF > "${T}/repos.conf"
+		[DEFAULT]
+		main-repo = ${repo_name:-gentoo}
+
+		[${repo_name:-gentoo}]
+		location = ${PORTDIR:-${EPREFIX}/usr/portage}
+		sync-type = ${sync_type:-rsync}
+		sync-uri = ${REPOS_CONF_SYNC}
+		EOF
+		local dest=${EROOT}/etc/portage/repos.conf
+		if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
+			dest=${EROOT}/etc/portage/repos.conf/${repo_name:-gentoo}.conf
+		fi
+		# Don't install the config update if the desired repos.conf directory
+		# and config file exist, since users may accept it blindly and break
+		# their config (bug #478726).
+		[[ -e ${EROOT}/etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
+			mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
+
+		if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
+			einfo "Generating make.conf PORTDIR setting for backward compatibility"
+			for dest in "${EROOT}/etc/make.conf" "${EROOT}/etc/portage/make.conf" ; do
+				[[ -e ${dest} ]] && break
+			done
+			[[ -d ${dest} ]] && dest=${dest}/portdir.conf
+			rm -rf "${T}/make.conf"
+			[[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
+			cat <<-EOF >> "${T}/make.conf"
+
+			# Set PORTDIR for backward compatibility with various tools:
+			#   gentoo-bashcomp - bug #478444
+			#   euse - bug #474574
+			#   euses and ufed - bug #478318
+			PORTDIR="${EPREFIX}/usr/portage"
+			EOF
+			mkdir -p "${dest%/*}"
+			mv "${T}/make.conf" "$(new_config_protect "${dest}")"
+		fi
 	fi
 
-	if $NEEDED_REBUILD_UPGRADE ; then
+	if ${NEEDED_REBUILD_UPGRADE} ; then
 		einfo "rebuilding NEEDED.ELF.2 files"
+		local cpv filename line newline
 		for cpv in "${EROOT}/var/db/pkg"/*/*; do
-			if [ -f "${cpv}/NEEDED" ]; then
-				rm -f "${cpv}/NEEDED.ELF.2"
-				while read line; do
-					filename=${line% *}
-					needed=${line#* }
-					needed=${needed//+/++}
-					needed=${needed//#/##}
-					needed=${needed//%/%%}
-					newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename)
-					newline=${newline//  -  }
-					echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
-				done < "${cpv}/NEEDED"
-			fi
+			[[ -f "${cpv}/NEEDED" && ! -f "${cpv}/NEEDED.ELF.2" ]] || continue
+			while read -r line; do
+				filename=${line% *}
+				newline=$(scanelf -BF "%a;%F;%S;%r;%n" "${ROOT%/}${filename}")
+				newline=${newline//  -  }
+				[[ ${#ROOT} -gt 1 ]] && newline=${newline/${ROOT%/}}
+				echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
+			done < "${cpv}/NEEDED"
 		done
 	fi
 
+	local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
+
+	if ${USERSYNC_UPGRADE} && \
+		[[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
+		local ownership=$(get_ownership "${PORTDIR}")
+		if [[ -n ${ownership} ]] ; then
+			einfo "Adjusting PORTDIR permissions for usersync"
+			find "${PORTDIR}" -path "${distdir%/}" -prune -o \
+				! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
+				-exec chown "${ownership}" {} +
+		fi
+	fi
+
 	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"
-}
 
-pkg_postrm() {
-	python_mod_cleanup /usr/lib/portage/pym
+	# Do this last, since it could take a long time if there
+	# are lots of live sources, and the user may be tempted
+	# to kill emerge while it is running.
+	if ${USERPRIV_UPGRADE} && \
+		[[ -d ${distdir} && -w ${distdir} ]] ; then
+		local ownership=$(get_ownership "${distdir}")
+		if [[ ${ownership#*:} == portage ]] ; then
+			einfo "Adjusting DISTDIR permissions for userpriv"
+			find "${distdir}" -maxdepth 1 -type d -uid 0 \
+				-exec chown -R portage:portage {} +
+		fi
+	fi
 }

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

[Thomas Sachau]

commit:     5688ed0910a1c17b449095d362c6f7eb919f321f
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 20:24:16 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 22:13:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=5688ed09

Sync portage

---
 sys-apps/portage/Manifest                         | 2 +-
 sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c24aa54..62ff683 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha193-r1.ebuild 18950 SHA256 417ac6c336723703ba09b70f4b4ebda9a8ba5e7dfd6bd0974ee683787d179798 SHA512 32b71c0c1e39686b128b594b5a6afe6cbe07eb9b08157b91ae61500268233e3f808e2360241f999502778a4ec47d477ce8b81f235e927defed7d5077ad60f0d1 WHIRLPOOL 54d7ba06421355fc2c613bd9a63a22d41a7a0a9dc2aaecbfb8c33252ccf8ae335895728e89ac8a4acab3bdd7c127d625a21cf5e8465b944d65a48682126b309a
+EBUILD portage-2.2.0_alpha193-r1.ebuild 18950 SHA256 798f890ec5dced7eacf4aff13c505b75dd97708a0d6b4814561b48687000e386 SHA512 63e4f0b7be29e606a5894bb86fee27a1a255db6f926be88a16924ba6ecd3561e4c38c24bcfdeffaf8264f3bf51cd00e98f6fefbcb147a01c580663af3c8ca36a WHIRLPOOL 2788100fd18ba20317cd253d303033d00261bfecee1bf3793207a9e338bfdb62c43af5f12df5db5ce105eb9f5f6c38791d1ebf894c5f24943b81f130e7b220b4
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild
index e42fb3b..35e1d86 100644
--- a/sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha193-r1.ebuild
@@ -14,7 +14,7 @@ inherit eutils git-2 multilib
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="38858c9d01ae9d713b7124c2cb5db63ba137c6b8"
+EGIT_COMMIT="5f1b2875c4d9ceb6e6fad3db65147e7b5acc86a9"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     d02dc59d114e0eaf1cdf234f14e9eef289e3e803
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 11:16:17 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 22:13:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=d02dc59d

Sync portage

---
 sys-apps/portage/Manifest                                               | 2 +-
 ...ortage-2.2.0_alpha177-r1.ebuild => portage-2.2.0_alpha192-r1.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8f91f1f..582dbd0 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha177-r1.ebuild 13411 SHA256 13c6148f30ca2e4dcd1d3a87cfb4ab94dd79dc4a8dc20a2b3e910249dcdafa9c SHA512 ccfcabeb5525b73aa4d411aee3157894968b206f881188b77a3ce5fa99844331e6f18bcc7172c7127e4a50de417986176a0f9985043d0181b0c18b630a239b81 WHIRLPOOL 683a5a6d826c8e2258a9dc4a3f14d3febc9f2d24c39b4ae4a1836eb25fe024629fe1217cb0a08639c938a1bf068ad7498df5f2908a74af895a367c736dc2b775
+EBUILD portage-2.2.0_alpha192-r1.ebuild 13411 SHA256 fbb273c60711e51e449a74b9db04ed7543f7da28b065944307b8f30ca3d7d357 SHA512 cf1ca692a6a88390cab7570f2ff5bf0ee11f2c8b7ca18e25c5a182c9296bd4c85817af0e37bc3e8e069fbd13a6937e310f5d1155d643d3d1adf522399001a684 WHIRLPOOL 450ddc9a760549c7faeacf6265dbcfeb8599ef8bfdcaa4576a59bfd28c61433162fd2b3514465af1c23fe1c21eb5c3baec33c9cfcbae3d618558a3c6ef3a2571
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha177-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha192-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha177-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha192-r1.ebuild
index 9365eba..c96915e 100644
--- a/sys-apps/portage/portage-2.2.0_alpha177-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha192-r1.ebuild
@@ -14,7 +14,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="d14f303a43f380ea8054f2b25b7409c5850eb142"
+EGIT_COMMIT="ed2bdce054f8c05045da13241896e2ada5babb6d"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     cf80bea7819fbfbe541e8ca9ee3c790640e747a3
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 12:17:00 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri May 31 12:17:00 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=cf80bea7

Sync portage

---
 sys-apps/portage/Manifest                                               | 2 +-
 ...ortage-2.2.0_alpha176-r1.ebuild => portage-2.2.0_alpha177-r1.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index bd9e57c..8f91f1f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha176-r1.ebuild 13411 SHA256 5c4d2f1bd98bcf93f566bec28637cdd5ba991beb77a62bfb706bdca19017da3a SHA512 eea261506cd7226486c65ebe90eb7ff44fba32fa79397c3eda9ab7e59e4cd8acf4962ef2b511b6813fbd484cc7c3f457c137833778be1d81b9e6211933bc98b4 WHIRLPOOL ff769cc09ee803b3053b2ac9dd1ce550bc9e6fc4307ada12a68c9dd3fc1b3afdc3838f80541a7f50a0954b9ffad843947cce806208d7fa9a38ebb5c68bc5b9aa
+EBUILD portage-2.2.0_alpha177-r1.ebuild 13411 SHA256 13c6148f30ca2e4dcd1d3a87cfb4ab94dd79dc4a8dc20a2b3e910249dcdafa9c SHA512 ccfcabeb5525b73aa4d411aee3157894968b206f881188b77a3ce5fa99844331e6f18bcc7172c7127e4a50de417986176a0f9985043d0181b0c18b630a239b81 WHIRLPOOL 683a5a6d826c8e2258a9dc4a3f14d3febc9f2d24c39b4ae4a1836eb25fe024629fe1217cb0a08639c938a1bf068ad7498df5f2908a74af895a367c736dc2b775
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha176-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha177-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha176-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha177-r1.ebuild
index 440ca73..9365eba 100644
--- a/sys-apps/portage/portage-2.2.0_alpha176-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha177-r1.ebuild
@@ -14,7 +14,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="dff820f4c52ba830543c00e2d335e531bf7de8c0"
+EGIT_COMMIT="d14f303a43f380ea8054f2b25b7409c5850eb142"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     f44523444f23611bcd560f7e5ff12d52b7204d36
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon May 20 10:41:56 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon May 20 10:41:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=f4452344

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha176-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d98f715..bd9e57c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha174-r1.ebuild 13411 SHA256 a319e25fcb181489e5cf3b7787a557449d1bb53de1dc1d00074bb9489e0dbdeb SHA512 ee766d4195ae0a1b8b6db7857c9e93c3fd6f39cfa98f2e8f27fcfed76b792caca19d237b8924644edd814a7b66a3d70d40ee67f522f5edafb1f23a1ac1acc2f6 WHIRLPOOL e4cc5973e9960e44f59ef041a49d127ebe7c493edc05298895769eb7acd07363a59dd3c24438bc3e7f61c05081c3adc273968ff1fce82f2199859a152465ed51
+EBUILD portage-2.2.0_alpha176-r1.ebuild 13411 SHA256 5c4d2f1bd98bcf93f566bec28637cdd5ba991beb77a62bfb706bdca19017da3a SHA512 eea261506cd7226486c65ebe90eb7ff44fba32fa79397c3eda9ab7e59e4cd8acf4962ef2b511b6813fbd484cc7c3f457c137833778be1d81b9e6211933bc98b4 WHIRLPOOL ff769cc09ee803b3053b2ac9dd1ce550bc9e6fc4307ada12a68c9dd3fc1b3afdc3838f80541a7f50a0954b9ffad843947cce806208d7fa9a38ebb5c68bc5b9aa
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha174-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha176-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha174-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha176-r1.ebuild
index 2944eec..440ca73 100644
--- a/sys-apps/portage/portage-2.2.0_alpha174-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha176-r1.ebuild
@@ -14,7 +14,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="6d529d8fc81dd0d77bf19100db5e1dbea49abe7b"
+EGIT_COMMIT="dff820f4c52ba830543c00e2d335e531bf7de8c0"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     66b037496b5d1cd8c7a799b0bef8463611350c76
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 08:02:53 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri May 10 08:02:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=66b03749

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha174-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d07e9dd..d98f715 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha173-r1.ebuild 13411 SHA256 54f016c3200c8aaf29aef50d8932a29d212e1cd42460f09ce92158e496da9650 SHA512 8aebbf8a02fc9161960b93909fe7992cce6e5927b5746632123b1c76c71077dcd06f568d19902845cb02b4a8dbb1a747fecc75299db6019554c791c987a2b5a1 WHIRLPOOL b80b3fe27741c2225aefe9b1041305af9b0793ffa16b84569eab4973dd637d48a4a78ffd014130184490072c21b92ecf555f720974f6a30816434546a80313f2
+EBUILD portage-2.2.0_alpha174-r1.ebuild 13411 SHA256 a319e25fcb181489e5cf3b7787a557449d1bb53de1dc1d00074bb9489e0dbdeb SHA512 ee766d4195ae0a1b8b6db7857c9e93c3fd6f39cfa98f2e8f27fcfed76b792caca19d237b8924644edd814a7b66a3d70d40ee67f522f5edafb1f23a1ac1acc2f6 WHIRLPOOL e4cc5973e9960e44f59ef041a49d127ebe7c493edc05298895769eb7acd07363a59dd3c24438bc3e7f61c05081c3adc273968ff1fce82f2199859a152465ed51
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha173-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha174-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha173-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha174-r1.ebuild
index 2fa6159..2944eec 100644
--- a/sys-apps/portage/portage-2.2.0_alpha173-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha174-r1.ebuild
@@ -14,7 +14,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="e1a20a8ef35e00a1fbeeaae1a9babfba8828ea4f"
+EGIT_COMMIT="6d529d8fc81dd0d77bf19100db5e1dbea49abe7b"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     b77b435ffcc8dece3e7dc10f6c7582b5c4fc9e22
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 13:30:20 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 13:30:20 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=b77b435f

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha173-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7227f14..d07e9dd 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha171-r1.ebuild 13411 SHA256 5d2aff7c78db5f5a89d5e36028a4557e6be1f4c2113ae2e3ea0a0597fd7219b5 SHA512 4a590c58a6cf469e06b90a29fafba24ce9b096c29c8b3fd93797e7f027ae96e9ae6d9d54c8cdebea9edeacaf3d0411bece744bc48fdc24fa6cb0e05d8bb9afbf WHIRLPOOL e2a7fb9ea3acff651c94bcea60f42ea33f8551b0ad269b78e8a0be91d17ffbf0f06e8ddbbd98a2890ea05796ff7a9e78e6b0c74de8d52addd409066b9e449bc9
+EBUILD portage-2.2.0_alpha173-r1.ebuild 13411 SHA256 54f016c3200c8aaf29aef50d8932a29d212e1cd42460f09ce92158e496da9650 SHA512 8aebbf8a02fc9161960b93909fe7992cce6e5927b5746632123b1c76c71077dcd06f568d19902845cb02b4a8dbb1a747fecc75299db6019554c791c987a2b5a1 WHIRLPOOL b80b3fe27741c2225aefe9b1041305af9b0793ffa16b84569eab4973dd637d48a4a78ffd014130184490072c21b92ecf555f720974f6a30816434546a80313f2
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha171-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha173-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha171-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha173-r1.ebuild
index 949467d..2fa6159 100644
--- a/sys-apps/portage/portage-2.2.0_alpha171-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha173-r1.ebuild
@@ -14,7 +14,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="359a0020ed0f10e598faa8337f1b308b9bcfbe56"
+EGIT_COMMIT="e1a20a8ef35e00a1fbeeaae1a9babfba8828ea4f"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     7cf4df65e44f974b29fa8d49b0c930a1fba3253b
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  3 11:52:05 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Wed Apr  3 11:52:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=7cf4df65

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha171-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ffbc47e..7227f14 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha170-r1.ebuild 13411 SHA256 319b11c2fc8c9f03ba69c6b775986de8296ad36fbf379b695223c5f910242d6a SHA512 edfec4e1b88dc6e229d21e6bb9e30adc6ea4bea19167f7a9cd3d6b78417135010966f6a45c23d5ba5ff3544f855ee25fa848978f7ed14fba5728767fb1a15a1d WHIRLPOOL 83843bfcd0c2438c65fc5a0bf3c53ac07c6d93aa2c1a1c0e5c2708c79885180a2d5fe77ab28c2117c5a5ae6cf3f29f46055e594a01c91f80633ca5b9a62815b3
+EBUILD portage-2.2.0_alpha171-r1.ebuild 13411 SHA256 5d2aff7c78db5f5a89d5e36028a4557e6be1f4c2113ae2e3ea0a0597fd7219b5 SHA512 4a590c58a6cf469e06b90a29fafba24ce9b096c29c8b3fd93797e7f027ae96e9ae6d9d54c8cdebea9edeacaf3d0411bece744bc48fdc24fa6cb0e05d8bb9afbf WHIRLPOOL e2a7fb9ea3acff651c94bcea60f42ea33f8551b0ad269b78e8a0be91d17ffbf0f06e8ddbbd98a2890ea05796ff7a9e78e6b0c74de8d52addd409066b9e449bc9
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha170-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha171-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha170-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha171-r1.ebuild
index 1e7d708..949467d 100644
--- a/sys-apps/portage/portage-2.2.0_alpha170-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha171-r1.ebuild
@@ -14,7 +14,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="efee005bc838284ded7d7672c49b66fd2f5ae799"
+EGIT_COMMIT="359a0020ed0f10e598faa8337f1b308b9bcfbe56"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     e57cd77e50238f1b7ebfe98567f99e283d82c7be
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 19:32:03 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 19:32:03 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=e57cd77e

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha170-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 832b3e1..ffbc47e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha169-r1.ebuild 13411 SHA256 3cc4b36d3de23eb3d25024f111788db8938217256e052adaae40989a1625d00d SHA512 e73f2787468b81649f8d92e490c7afab7d9f5caddb9a68cda91cbbe5f3c5970803d6683041c6530cab13b85e8b3c728e6174a57fd0c9d49f61107323d4f9fbaf WHIRLPOOL 90b52685e176516b50de75dd8cc1c966844c0b3a97cb939bfb43b658ba0b555a2361c5744dd6475754db63a09ac04762cbaa4cfb61d1952dcbcb3c3b55c2f079
+EBUILD portage-2.2.0_alpha170-r1.ebuild 13411 SHA256 319b11c2fc8c9f03ba69c6b775986de8296ad36fbf379b695223c5f910242d6a SHA512 edfec4e1b88dc6e229d21e6bb9e30adc6ea4bea19167f7a9cd3d6b78417135010966f6a45c23d5ba5ff3544f855ee25fa848978f7ed14fba5728767fb1a15a1d WHIRLPOOL 83843bfcd0c2438c65fc5a0bf3c53ac07c6d93aa2c1a1c0e5c2708c79885180a2d5fe77ab28c2117c5a5ae6cf3f29f46055e594a01c91f80633ca5b9a62815b3
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha169-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha170-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha169-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha170-r1.ebuild
index 8fdb698..1e7d708 100644
--- a/sys-apps/portage/portage-2.2.0_alpha169-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha170-r1.ebuild
@@ -14,7 +14,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="5a1193e5acd717b0afa77b56ef15f47036bd3c31"
+EGIT_COMMIT="efee005bc838284ded7d7672c49b66fd2f5ae799"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     416858d00bb3881248e865c64ea10f5238cc9abc
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 16:31:43 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 16:31:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=416858d0

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha169-r1.ebuild} |   92 +++++++++++++++-----
 2 files changed, 70 insertions(+), 24 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 14ca485..832b3e1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha166-r1.ebuild 11941 SHA256 48b5077f719ce48b3f4f3871e895c244ea843039359bdc26c953a053374dcb63 SHA512 aba940bd673da0613a4f5489497064035d2d49b3bae05eb792c4837e4eb108fd18893faf9930cd8a3b91075ec6420a31ec26c1efc66f4c0ac0f1cce6d97b1991 WHIRLPOOL 68845b4d8dd61ad87af3cb83eb497331623987512a96c7710f6204ceaadb84e6f980497f4bcc95330756fbbdd61d58cf61a87295a258f9522396c8e5acb3d35e
+EBUILD portage-2.2.0_alpha169-r1.ebuild 13411 SHA256 3cc4b36d3de23eb3d25024f111788db8938217256e052adaae40989a1625d00d SHA512 e73f2787468b81649f8d92e490c7afab7d9f5caddb9a68cda91cbbe5f3c5970803d6683041c6530cab13b85e8b3c728e6174a57fd0c9d49f61107323d4f9fbaf WHIRLPOOL 90b52685e176516b50de75dd8cc1c966844c0b3a97cb939bfb43b658ba0b555a2361c5744dd6475754db63a09ac04762cbaa4cfb61d1952dcbcb3c3b55c2f079
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha166-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha169-r1.ebuild
similarity index 81%
rename from sys-apps/portage/portage-2.2.0_alpha166-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha169-r1.ebuild
index 19bfeee..8fdb698 100644
--- a/sys-apps/portage/portage-2.2.0_alpha166-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha169-r1.ebuild
@@ -1,15 +1,20 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha161.ebuild,v 1.1 2013/01/24 22:13:22 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha169.ebuild,v 1.1 2013/03/22 02:43:09 zmedico Exp $
 
 # 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 git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="6e28e4f677db82944f5658b47452f195641841bb"
+EGIT_COMMIT="5a1193e5acd717b0afa77b56ef15f47036bd3c31"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
@@ -17,6 +22,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_pl linguas_ru pypy2_0 python2 python3 selinux xattr"
 
+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] )
@@ -29,8 +39,21 @@ 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 )
+"
+
 # The pysqlite blocker is for bug #282760.
+# make-3.82 is for bug #455858
 DEPEND="${python_dep}
+	>=sys-devel/make-3.82
 	>=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 !<=dev-python/pysqlite-2.4.1 )
@@ -91,8 +114,8 @@ pkg_setup() {
 		! compatible_python_is_selected ; then
 		ewarn "Attempting to select a compatible default python interpreter"
 		local x success=0
-		for x in /usr/bin/python2.* ; do
-			x=${x#/usr/bin/python2.}
+		for x in "${EPREFIX}"/usr/bin/python2.* ; do
+			x=${x#${EPREFIX}/usr/bin/python2.}
 			if [[ $x -ge 6 ]] 2>/dev/null ; then
 				eselect python set python2.$x
 				if compatible_python_is_selected ; then
@@ -236,12 +259,48 @@ src_install() {
 		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die
 	fi
 
-	# Set PYTHONPATH for portage API consumers. This way we don't have
-	# to rely on patched python having the correct path, since it has
-	# been known to incorrectly add /usr/libx32/portage/pym to sys.path.
-	echo "PYTHONPATH=\"${EPREFIX}/usr/lib/portage/pym\"" > \
-		"${T}/05portage" || die
-	doenvd "${T}/05portage" || die
+	# Allow external portage API consumers to import portage python modules
+	# (this used to be done with PYTHONPATH setting in /etc/env.d).
+	# For each of PYTHON_TARGETS, install a tree of *.py symlinks in
+	# site-packages, and compile with the corresponding interpreter.
+	local impl files mod_dir dest_mod_dir python relative_path files x
+	for impl in "${PYTHON_COMPAT[@]}" ; do
+		use "python_targets_${impl}" || continue
+		while read -r mod_dir ; do
+			cd "${S}/pym/${mod_dir}" || die
+			files=$(echo *.py)
+			if [ -z "${files}" ] || [ "${files}" = "*.py" ]; then
+				# __pycache__ directories contain no py files
+				continue
+			fi
+			dest_mod_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages/${mod_dir}
+			dodir "${dest_mod_dir}" || die
+			relative_path=../../../lib/portage/pym/${mod_dir}
+			x=/${mod_dir}
+			while [ -n "${x}" ] ; do
+				relative_path=../${relative_path}
+				x=${x%/*}
+			done
+			for x in ${files} ; do
+				dosym "${relative_path}/${x}" \
+					"${dest_mod_dir}/${x}" || die
+			done
+		done < <(cd "${S}"/pym || die ; find * -type d ! -path "portage/tests*")
+		dest_mod_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages
+		case "${impl}" in
+			python*)
+				python=${impl/_/.}
+				python=${EPREFIX}/usr/bin/${python}
+				"${python}" -m compileall -q -f -d "${EPREFIX}${dest_mod_dir}" "${ED}${dest_mod_dir#/}" || die
+				"${python}" -OO -m compileall -q -f -d "${EPREFIX}${dest_mod_dir}" "${ED}${dest_mod_dir#/}" || die
+				;;
+			pypy*)
+				python=${impl/_/.}
+				python=${EPREFIX}/usr/bin/${python/pypy/pypy-c}
+				"${python}" -m compileall -q -f -d "${EPREFIX}${dest_mod_dir}" "${ED}${dest_mod_dir#/}" || die
+				;;
+		esac
+	done
 }
 
 pkg_preinst() {
@@ -260,15 +319,6 @@ pkg_preinst() {
 		ewarn "enable USE=python3 for $CATEGORY/$PN."
 	fi
 
-	if ! use build && ! has_version dev-python/pycrypto && \
-		! has_version '>=dev-lang/python-2.6[ssl]' ; then
-		ewarn "If you are an ebuild developer and you plan to commit ebuilds"
-		ewarn "with this system then please install dev-python/pycrypto or"
-		ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
-		ewarn "to enable RMD160 hash support."
-		ewarn "See bug #198398 for more information."
-	fi
-
 	has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
 		&& WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
 
@@ -281,10 +331,6 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	# Compile all source files recursively. Any orphans
-	# will be identified and removed in postrm.
-	python_mod_optimize /usr/lib/portage/pym
-
 	if $WORLD_MIGRATION_UPGRADE && \
 		grep -q "^@" "${EROOT}/var/lib/portage/world"; then
 		einfo "moving set references from the worldfile into world_sets"

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

[Thomas Sachau]

commit:     830ef164b2368a3f0ed9689be09b5115127002d6
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  8 17:47:23 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 17:47:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=830ef164

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha166-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 644a52b..14ca485 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha164-r1.ebuild 11941 SHA256 a2541865fb64fb5d0bdd005863970d12a8afbbc5bf1fe45104ad0b5c622a162f SHA512 01bd09ca2925a4b7372791602fc1282aa3b07c6ca6bf3441799554889f6d71cee756c8c943a2bd34d293f38a1cad01c7ce6ec31b6193113e9f4323f00ab7156f WHIRLPOOL 75ea78fc8648417474dbfe8acb04dacd6dd2163cb3a3e2216a55b93da753dac1480c24d5c5ab1efeb018deaa342f11ff69fe8151ccfffe11cdb34c7648162b9f
+EBUILD portage-2.2.0_alpha166-r1.ebuild 11941 SHA256 48b5077f719ce48b3f4f3871e895c244ea843039359bdc26c953a053374dcb63 SHA512 aba940bd673da0613a4f5489497064035d2d49b3bae05eb792c4837e4eb108fd18893faf9930cd8a3b91075ec6420a31ec26c1efc66f4c0ac0f1cce6d97b1991 WHIRLPOOL 68845b4d8dd61ad87af3cb83eb497331623987512a96c7710f6204ceaadb84e6f980497f4bcc95330756fbbdd61d58cf61a87295a258f9522396c8e5acb3d35e
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha164-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha166-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha164-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha166-r1.ebuild
index 0ef8089..19bfeee 100644
--- a/sys-apps/portage/portage-2.2.0_alpha164-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha166-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="6f6f51607974bd844eb918e6d7edac8130699c31"
+EGIT_COMMIT="6e28e4f677db82944f5658b47452f195641841bb"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     e4dc856b164bbe62c82ecd1fd2c1ddc117871d9c
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  3 13:45:35 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 13:45:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=e4dc856b

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r2.ebuild => portage-2.2.0_alpha164-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 88853b8..644a52b 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha163-r2.ebuild 11941 SHA256 faa9dd224d4bf35f17440c70fd383d43cb80ffa751008b18521c331a0aced249 SHA512 24ff2d538e5645c2e37459880c485af033ebe8485e1cbbd307a6a746074bb6b18fc8b7a15ddf58bbf433277895cc5e1ad5b39d09a77ec1f09d5243991188b5d9 WHIRLPOOL 79aea2421769456a66d4a50f1aa378bb629e42da711f333b925fca98eb43ad35c78e65c134abce6e9e50d0285ae167f1fd7dc87a72b5327b09486db304de8ee4
+EBUILD portage-2.2.0_alpha164-r1.ebuild 11941 SHA256 a2541865fb64fb5d0bdd005863970d12a8afbbc5bf1fe45104ad0b5c622a162f SHA512 01bd09ca2925a4b7372791602fc1282aa3b07c6ca6bf3441799554889f6d71cee756c8c943a2bd34d293f38a1cad01c7ce6ec31b6193113e9f4323f00ab7156f WHIRLPOOL 75ea78fc8648417474dbfe8acb04dacd6dd2163cb3a3e2216a55b93da753dac1480c24d5c5ab1efeb018deaa342f11ff69fe8151ccfffe11cdb34c7648162b9f
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha163-r2.ebuild b/sys-apps/portage/portage-2.2.0_alpha164-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha163-r2.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha164-r1.ebuild
index 9b7672f..0ef8089 100644
--- a/sys-apps/portage/portage-2.2.0_alpha163-r2.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha164-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="86d8c1bcea663ceb62867eb0131e7769f2914806"
+EGIT_COMMIT="6f6f51607974bd844eb918e6d7edac8130699c31"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     ff0b31c771a1b61098f41f61e4734179aa4073d2
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 27 19:46:16 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 19:46:16 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=ff0b31c7

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha163-r2.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 81d6ea5..88853b8 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha163-r1.ebuild 11941 SHA256 6e11ed25055bcdcc4b820bd66d65d666bc90b02a19f36110f0e80e8b6ec52261 SHA512 8149b1462caac27333f0356376795c6b5b15654f487bc111fc43c7c360f250db6ed3ba502b854d350df46375e37e187f9b97ec54f9156a773c573ea94faf25dc WHIRLPOOL 9d961ac4d4306c2f7f2cba578218512f34d54738ee8669d7ad3dc7e7cca65d3ea3db9ac5edab2037013ca0b169e333c522676ba64fda37b1ebff4e638a7c0199
+EBUILD portage-2.2.0_alpha163-r2.ebuild 11941 SHA256 faa9dd224d4bf35f17440c70fd383d43cb80ffa751008b18521c331a0aced249 SHA512 24ff2d538e5645c2e37459880c485af033ebe8485e1cbbd307a6a746074bb6b18fc8b7a15ddf58bbf433277895cc5e1ad5b39d09a77ec1f09d5243991188b5d9 WHIRLPOOL 79aea2421769456a66d4a50f1aa378bb629e42da711f333b925fca98eb43ad35c78e65c134abce6e9e50d0285ae167f1fd7dc87a72b5327b09486db304de8ee4
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha163-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha163-r2.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha163-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha163-r2.ebuild
index c5c8184..9b7672f 100644
--- a/sys-apps/portage/portage-2.2.0_alpha163-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha163-r2.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="bc8191896c294d8eb8758649ed87c24be2b2dca4"
+EGIT_COMMIT="86d8c1bcea663ceb62867eb0131e7769f2914806"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     07ee60df9e9cb0686a98e282ef07b9f718eeb138
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 16 19:07:42 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 19:07:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=07ee60df

Sync portage

---
 sys-apps/portage/Manifest                         |    2 +-
 sys-apps/portage/portage-2.2.0_alpha163-r1.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index eb737bc..81d6ea5 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha163-r1.ebuild 11941 SHA256 5e607ef8e72b1cf013c01ee7be4279024873a36c53cc485cda99f9877ff44a53 SHA512 25b54bc703555862d3ba6e0651b3022d642aa3425d1e8eb42daa2701362297a439ace5cf0fee85c3984bf1035cd3e2f059c32985489969db46843f16250ad27d WHIRLPOOL 3e07eacc630a268cee7a63d2e715e122fe24f595d3c963df6678b2c886c2a145e5db1a03bfb99558fd99279b09ad4e7ccc74a389505c6213e6c5bea25eb50513
+EBUILD portage-2.2.0_alpha163-r1.ebuild 11941 SHA256 6e11ed25055bcdcc4b820bd66d65d666bc90b02a19f36110f0e80e8b6ec52261 SHA512 8149b1462caac27333f0356376795c6b5b15654f487bc111fc43c7c360f250db6ed3ba502b854d350df46375e37e187f9b97ec54f9156a773c573ea94faf25dc WHIRLPOOL 9d961ac4d4306c2f7f2cba578218512f34d54738ee8669d7ad3dc7e7cca65d3ea3db9ac5edab2037013ca0b169e333c522676ba64fda37b1ebff4e638a7c0199
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha163-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha163-r1.ebuild
index 511f316..c5c8184 100644
--- a/sys-apps/portage/portage-2.2.0_alpha163-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha163-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="7f5b665406eae057457f519ca8fc837f56aba8e2"
+EGIT_COMMIT="bc8191896c294d8eb8758649ed87c24be2b2dca4"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     92b95e4552b3173279e62ecaf462c118b4214afc
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 16 18:50:02 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 18:50:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=92b95e45

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha163-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8614d7a..eb737bc 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha161-r1.ebuild 11941 SHA256 aa2ff4beff698da5a1ea99d5771749da73753d85cc9d5e3bb5fd5e207c9f0539 SHA512 198a27709771b78e740140a98ade3c3b18868c30502afefaa4b6dce8c8c0a919f2d424ebfeabfc46b1cfd62011a68853eaeee1163ad68f266166ed425841dc92 WHIRLPOOL 49f67bc25a8f810cdc809849fff4ca8f6ef91fba8e7ad66c16f83080e0c1f3907afe447ebc7955c749f6f243700d38a71d74db75e85b1b7185660ad8d227a214
+EBUILD portage-2.2.0_alpha163-r1.ebuild 11941 SHA256 5e607ef8e72b1cf013c01ee7be4279024873a36c53cc485cda99f9877ff44a53 SHA512 25b54bc703555862d3ba6e0651b3022d642aa3425d1e8eb42daa2701362297a439ace5cf0fee85c3984bf1035cd3e2f059c32985489969db46843f16250ad27d WHIRLPOOL 3e07eacc630a268cee7a63d2e715e122fe24f595d3c963df6678b2c886c2a145e5db1a03bfb99558fd99279b09ad4e7ccc74a389505c6213e6c5bea25eb50513
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha161-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha163-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha161-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha163-r1.ebuild
index 1ab1548..511f316 100644
--- a/sys-apps/portage/portage-2.2.0_alpha161-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha163-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="d4ea33518c44aa4d07f3f5dcc900a7b5a2d7436a"
+EGIT_COMMIT="7f5b665406eae057457f519ca8fc837f56aba8e2"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     69ee19ce0dac97137d4f8652661594be56ded5d2
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 26 17:23:33 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Jan 26 17:23:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=69ee19ce

Sync portage

---
 sys-apps/portage/Manifest                         |    2 +-
 sys-apps/portage/portage-2.2.0_alpha161-r1.ebuild |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7b54e67..8614d7a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha161-r1.ebuild 11916 SHA256 f761e55bef8365d16c8a205bdf25c4640f217206d9164e1638190bd3b1c1fcdf SHA512 ec12b73d713bb6e587dab885510f56372f433b833431503e086c7b1ad6dff07ca9432031580ebb4d907580ca63e6f58da7ce5fbfb1e7973a87d9df5bdd7013ec WHIRLPOOL 8e3fff86d0ab36e197d45f56c97952d8423a466b63d9994ebc96977fedb608fc8c21e5dbc444358f5f230c9ec1f535f900a20f07739e7cc5680a52d8b68c1ec0
+EBUILD portage-2.2.0_alpha161-r1.ebuild 11941 SHA256 aa2ff4beff698da5a1ea99d5771749da73753d85cc9d5e3bb5fd5e207c9f0539 SHA512 198a27709771b78e740140a98ade3c3b18868c30502afefaa4b6dce8c8c0a919f2d424ebfeabfc46b1cfd62011a68853eaeee1163ad68f266166ed425841dc92 WHIRLPOOL 49f67bc25a8f810cdc809849fff4ca8f6ef91fba8e7ad66c16f83080e0c1f3907afe447ebc7955c749f6f243700d38a71d74db75e85b1b7185660ad8d227a214
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha161-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha161-r1.ebuild
index ea97ca1..1ab1548 100644
--- a/sys-apps/portage/portage-2.2.0_alpha161-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha161-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha128.ebuild,v 1.1 2012/09/14 02:54:07 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha161.ebuild,v 1.1 2013/01/24 22:13:22 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl pypy2_0 python2 python3 selinux xattr"
+IUSE="build doc epydoc +ipc linguas_pl linguas_ru pypy2_0 python2 python3 selinux xattr"
 
 # Import of the io module in python-2.6 raises ImportError for the
 # thread module if threading is disabled.
@@ -131,7 +131,7 @@ src_prepare() {
 		die "Failed to patch portage.VERSION"
 	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
 		die "Failed to patch VERSION in doc/fragment/version"
-	sed -e "1s/VERSION/${PVR}/" -i man/* || \
+	sed -e "1s/VERSION/${PVR}/" -i $(find man -type f) || \
 		die "Failed to patch VERSION in man page headers"
 
 	if ! use ipc ; then

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

[Thomas Sachau]

commit:     68f51fc0bb99a422ef574a38d42f183f1247e399
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 26 17:20:07 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Jan 26 17:20:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=68f51fc0

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha161-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 1e281eb..7b54e67 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha151-r1.ebuild 11916 SHA256 f97988eb5a3861d2a8f22c39156819f26af71e0b794dbf745d4e22bf95b6120b SHA512 7d5c2f6f3d085a494f5eb307f5a302bd1ec1dffe372e2cd283d83704b0ec541b4ba68bf163be9df5aa92a57b08401e7f42c68bb71ea37c0c43abaf7e99a270a0 WHIRLPOOL 11038f5cf3586111655c0c597f00058a51f64a4d9b57857d60c6055d4e181b49f005c95abde41e9966f86c1b326cf436adf64ecacfe734ff7dd31209b89475ed
+EBUILD portage-2.2.0_alpha161-r1.ebuild 11916 SHA256 f761e55bef8365d16c8a205bdf25c4640f217206d9164e1638190bd3b1c1fcdf SHA512 ec12b73d713bb6e587dab885510f56372f433b833431503e086c7b1ad6dff07ca9432031580ebb4d907580ca63e6f58da7ce5fbfb1e7973a87d9df5bdd7013ec WHIRLPOOL 8e3fff86d0ab36e197d45f56c97952d8423a466b63d9994ebc96977fedb608fc8c21e5dbc444358f5f230c9ec1f535f900a20f07739e7cc5680a52d8b68c1ec0
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha151-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha161-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha151-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha161-r1.ebuild
index 5615509..ea97ca1 100644
--- a/sys-apps/portage/portage-2.2.0_alpha151-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha161-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="69dc95fb27bbe290ef60e5d826ec868d6baee4b5"
+EGIT_COMMIT="d4ea33518c44aa4d07f3f5dcc900a7b5a2d7436a"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     332e3408d5e8e343713000dafcbf32cfb77a324d
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 12 11:28:43 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Jan 12 11:28:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=332e3408

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha151-r1.ebuild} |   33 ++++++++++---------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 18df9bf..1e281eb 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha149-r1.ebuild 11792 SHA256 381f06b18523e478b169dca0b21fb955c0469200ea90f9d1613f134eba545f73 SHA512 69c527225e2595f60c5c5beaeb50a1e6a91bd3e5393aba9cb44b9f5cbfde0fde7719263a68faa9e641f4cd2e30db686fd83c098ceb960ae4bedb986526e21460 WHIRLPOOL 2255f7df02f6cfc77be93ee28c6e3fdbf5ae02fa8e2306d29cd90aea1d889a2915e8a63ed60cff5ddf80d13410a389509feb4a5035d23bd6002b5f9364246ece
+EBUILD portage-2.2.0_alpha151-r1.ebuild 11916 SHA256 f97988eb5a3861d2a8f22c39156819f26af71e0b794dbf745d4e22bf95b6120b SHA512 7d5c2f6f3d085a494f5eb307f5a302bd1ec1dffe372e2cd283d83704b0ec541b4ba68bf163be9df5aa92a57b08401e7f42c68bb71ea37c0c43abaf7e99a270a0 WHIRLPOOL 11038f5cf3586111655c0c597f00058a51f64a4d9b57857d60c6055d4e181b49f005c95abde41e9966f86c1b326cf436adf64ecacfe734ff7dd31209b89475ed
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha149-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha151-r1.ebuild
similarity index 92%
rename from sys-apps/portage/portage-2.2.0_alpha149-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha151-r1.ebuild
index da1ead1..5615509 100644
--- a/sys-apps/portage/portage-2.2.0_alpha149-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha151-r1.ebuild
@@ -9,21 +9,21 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="5728c6f5e9099f8b8076d0b8315be059a1244bda"
+EGIT_COMMIT="69dc95fb27bbe290ef60e5d826ec868d6baee4b5"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr"
+IUSE="build doc epydoc +ipc linguas_pl pypy2_0 python2 python3 selinux xattr"
 
 # 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] )
-	!pypy1_9? ( !python2? ( !python3? (
+	!pypy2_0? ( !python2? ( !python3? (
 		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
 	) ) )
-	pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,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}"
@@ -41,9 +41,10 @@ DEPEND="${python_dep}
 # 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] or python-mhash (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
 RDEPEND="${python_dep}
 	!build? ( >=sys-apps/sed-4.0.5
-		>=app-shells/bash-3.2_p17
+		|| ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) )
 		>=app-admin/eselect-1.2
 		|| ( ${python_dep_ssl} dev-python/python-mhash )
 	)
@@ -62,7 +63,7 @@ PDEPEND="
 		userland_GNU? ( >=sys-apps/coreutils-6.4 )
 	)"
 # coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=install-sources requires debugedit and rsync
+# NOTE: FEATURES=installsources requires debugedit and rsync
 
 compatible_python_is_selected() {
 	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
@@ -78,15 +79,15 @@ pkg_setup() {
 		ewarn "Both python2 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if use pypy1_9 && use python3 ; then
-		ewarn "Both pypy1_9 and python3 USE flags are enabled, but only one"
+	if use pypy2_0 && use python3 ; then
+		ewarn "Both pypy2_0 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if use pypy1_9 && use python2 ; then
-		ewarn "Both pypy1_9 and python2 USE flags are enabled, but only one"
+	if use pypy2_0 && use python2 ; then
+		ewarn "Both pypy2_0 and python2 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python2"
 	fi
-	if ! use pypy1_9 && ! use python2 && ! use python3 && \
+	if ! use pypy2_0 && ! use python2 && ! use python3 && \
 		! compatible_python_is_selected ; then
 		ewarn "Attempting to select a compatible default python interpreter"
 		local x success=0
@@ -111,8 +112,8 @@ pkg_setup() {
 		python_set_active_version 3
 	elif use python2; then
 		python_set_active_version 2
-	elif use pypy1_9; then
-		python_set_active_version 2.7-pypy-1.9
+	elif use pypy2_0; then
+		python_set_active_version 2.7-pypy-2.0
 	fi
 }
 
@@ -152,9 +153,9 @@ src_prepare() {
 	elif use python2; then
 		einfo "Converting shebangs for python2..."
 		python_convert_shebangs -r 2 .
-	elif use pypy1_9; then
-		einfo "Converting shebangs for pypy-c1.9..."
-		python_convert_shebangs -r 2.7-pypy-1.9 .
+	elif use pypy2_0; then
+		einfo "Converting shebangs for pypy-c2.0..."
+		python_convert_shebangs -r 2.7-pypy-2.0 .
 	fi
 
 	if [[ -n ${EPREFIX} ]] ; then

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

[Thomas Sachau]

commit:     12a58ed2d5216d3f22f0baa77cb84b51c36a3294
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 16 10:50:27 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 10:50:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=12a58ed2

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha149-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 26e7f0b..18df9bf 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha148-r1.ebuild 11792 SHA256 915561547e69dc2dc786918ca55051d14f968ff355eed5511bc110b0834378de SHA512 83813da6afc0cabcd997ab56aaf6fda0148f582ea74115382cb3d3d05220cd17c1ccd5a940f3da743430eb16d06746c6d7ff5676ea0053d1de2f9f28bf9e2d3a WHIRLPOOL 26a933c89fd88a8cd1bdcd6233f797fe9f11023ff45ea157aa769ea4afc4888c6fba8d27dedcbbf4f10b92c6ab8bfbeec1dbf182761d60ce9f3cfe6c10edd641
+EBUILD portage-2.2.0_alpha149-r1.ebuild 11792 SHA256 381f06b18523e478b169dca0b21fb955c0469200ea90f9d1613f134eba545f73 SHA512 69c527225e2595f60c5c5beaeb50a1e6a91bd3e5393aba9cb44b9f5cbfde0fde7719263a68faa9e641f4cd2e30db686fd83c098ceb960ae4bedb986526e21460 WHIRLPOOL 2255f7df02f6cfc77be93ee28c6e3fdbf5ae02fa8e2306d29cd90aea1d889a2915e8a63ed60cff5ddf80d13410a389509feb4a5035d23bd6002b5f9364246ece
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha148-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha149-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha148-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha149-r1.ebuild
index d5002f7..da1ead1 100644
--- a/sys-apps/portage/portage-2.2.0_alpha148-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha149-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="f4dccb3dc61bd45187f7491fa21d277704c39393"
+EGIT_COMMIT="5728c6f5e9099f8b8076d0b8315be059a1244bda"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     ea4784e065029185eab66aea2e88552152727d0f
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 14 20:15:15 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Dec 14 20:15:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=ea4784e0

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha147-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 72e5584..7d7b421 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha145-r1.ebuild 11792 SHA256 980b47d975f19b85016decd8fd331afaa981fa52b72c257982b069004312238b SHA512 6fb433bcf8a351f14caa61caed0f58a0417c591c42f944ebf994507fa107efcee095953cf06874293d6a334ff5696c3ee6e403d3241ab76e4568ef078755f0ef WHIRLPOOL 5ae01b429a61af495a77ff177f0a609e6d1ed1a75d71bc95858890bb7cea78b78c10cfb2a236e7971d6e0464f802d8485715824ef1d590f9827437978b1ad3c9
+EBUILD portage-2.2.0_alpha147-r1.ebuild 11792 SHA256 1e99ddfacb2f31918317717e2edc845dc4636a5ae25826aa4c930af8b3e11e66 SHA512 2cb9a1391023d77f6b40730980b2053965ad24c31da9af201e988ce2182769ad063ba9812048300d4d73ce06b1df863869c49fed3ca94c628cfddbbce6b43d58 WHIRLPOOL 9ee504b1070a15eafa319fe2af0b0cb3898a60a4f36c58c90139fe6b274fdd322073acd45e2d1e1d574ade37003e6a26032b8deb165aee38b1190d3e7ceb7622
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha145-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha147-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha145-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha147-r1.ebuild
index 1ac37d9..a0b92cd 100644
--- a/sys-apps/portage/portage-2.2.0_alpha145-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha147-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="d9f6551e0b7f7b1b138cc40c51faa72be4bdf09d"
+EGIT_COMMIT="d69ed258bab311ac51f1e2e4c0caaa14677d9b08"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     b472e1da04942072117b2dad703ac0d28fc205f9
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 14 20:17:09 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Dec 14 20:17:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=b472e1da

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha148-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7d7b421..26e7f0b 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha147-r1.ebuild 11792 SHA256 1e99ddfacb2f31918317717e2edc845dc4636a5ae25826aa4c930af8b3e11e66 SHA512 2cb9a1391023d77f6b40730980b2053965ad24c31da9af201e988ce2182769ad063ba9812048300d4d73ce06b1df863869c49fed3ca94c628cfddbbce6b43d58 WHIRLPOOL 9ee504b1070a15eafa319fe2af0b0cb3898a60a4f36c58c90139fe6b274fdd322073acd45e2d1e1d574ade37003e6a26032b8deb165aee38b1190d3e7ceb7622
+EBUILD portage-2.2.0_alpha148-r1.ebuild 11792 SHA256 915561547e69dc2dc786918ca55051d14f968ff355eed5511bc110b0834378de SHA512 83813da6afc0cabcd997ab56aaf6fda0148f582ea74115382cb3d3d05220cd17c1ccd5a940f3da743430eb16d06746c6d7ff5676ea0053d1de2f9f28bf9e2d3a WHIRLPOOL 26a933c89fd88a8cd1bdcd6233f797fe9f11023ff45ea157aa769ea4afc4888c6fba8d27dedcbbf4f10b92c6ab8bfbeec1dbf182761d60ce9f3cfe6c10edd641
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha147-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha148-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha147-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha148-r1.ebuild
index a0b92cd..d5002f7 100644
--- a/sys-apps/portage/portage-2.2.0_alpha147-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha148-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="d69ed258bab311ac51f1e2e4c0caaa14677d9b08"
+EGIT_COMMIT="f4dccb3dc61bd45187f7491fa21d277704c39393"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     c36185698f3f219899e04d4c13c095e0c11ee4bf
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  9 10:54:56 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Dec  9 10:54:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=c3618569

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha145-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ad31d92..72e5584 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha144-r1.ebuild 11792 SHA256 45a85aea18f0e2ed1eae8e368d145d193d6783c3333896cd94e52e78c7acc687 SHA512 6546e503f20fd4c0f0af83034e493fbbed21070dc189143bad0e232a58db81cf1353def575063379897271715d4253988cff18bb834bfb9dd9da82a1dfe04a3d WHIRLPOOL 8968f9bb4928176e839305ab54c53be531e3e2e6959bc3e1b7880d465d79dd9a2d237e955e82a58a1d4058a3a72f7518de08a282c0076e618501c8c21d06592e
+EBUILD portage-2.2.0_alpha145-r1.ebuild 11792 SHA256 980b47d975f19b85016decd8fd331afaa981fa52b72c257982b069004312238b SHA512 6fb433bcf8a351f14caa61caed0f58a0417c591c42f944ebf994507fa107efcee095953cf06874293d6a334ff5696c3ee6e403d3241ab76e4568ef078755f0ef WHIRLPOOL 5ae01b429a61af495a77ff177f0a609e6d1ed1a75d71bc95858890bb7cea78b78c10cfb2a236e7971d6e0464f802d8485715824ef1d590f9827437978b1ad3c9
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha144-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha145-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha144-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha145-r1.ebuild
index 234a213..1ac37d9 100644
--- a/sys-apps/portage/portage-2.2.0_alpha144-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha145-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="2cff6e2b14e2b173f1f56869551bf968cf0a41cf"
+EGIT_COMMIT="d9f6551e0b7f7b1b138cc40c51faa72be4bdf09d"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     432194d76dfa75e4078290c6b50f9a002f19f0e4
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  7 22:25:39 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Dec  7 22:25:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=432194d7

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha144-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 33db4d4..ad31d92 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha143-r1.ebuild 11792 SHA256 0ecfcc1e34454c52d5f6d01eaed76c0c74a93df183ffb47531a43f8757b5962b SHA512 7249d4066c97b5763c269c4c7ff5326d4bc20094618bacea98242ef3e475dc08f135565040227e3b8a77bfafd69893d0e9758ebd051a162d853b7af71e0e0e56 WHIRLPOOL e427e57ecf1d87f9f0d33c59c759cf94cdbafca6d30918bbec8922e94bd0a13ff02e78e851a35830ca3e48f4390a0601c541a5829e09f37d35be29555329ab56
+EBUILD portage-2.2.0_alpha144-r1.ebuild 11792 SHA256 45a85aea18f0e2ed1eae8e368d145d193d6783c3333896cd94e52e78c7acc687 SHA512 6546e503f20fd4c0f0af83034e493fbbed21070dc189143bad0e232a58db81cf1353def575063379897271715d4253988cff18bb834bfb9dd9da82a1dfe04a3d WHIRLPOOL 8968f9bb4928176e839305ab54c53be531e3e2e6959bc3e1b7880d465d79dd9a2d237e955e82a58a1d4058a3a72f7518de08a282c0076e618501c8c21d06592e
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha143-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha144-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha143-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha144-r1.ebuild
index 98deb89..234a213 100644
--- a/sys-apps/portage/portage-2.2.0_alpha143-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha144-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="e934977a22ae99293d4ec03415ddd28be6fee1c6"
+EGIT_COMMIT="2cff6e2b14e2b173f1f56869551bf968cf0a41cf"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     9e61260ccaeefe60b16679dc0e7ea1cc8a6d3b25
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 30 16:59:29 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Nov 30 16:59:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=9e61260c

Sync portage

---
 sys-apps/portage/Manifest                         |    2 +-
 sys-apps/portage/portage-2.2.0_alpha143-r1.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3a839d7..33db4d4 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha143-r1.ebuild 11792 SHA256 c64741b748250c1149afce56c58c4bbf262ea96485b205056748c5903455f0dc SHA512 ed3e7a97a16e097e47a6f3747f92f574c789ee97d6ae6f8d2ea39fed44e218f91fce6d99369541d655301dfb2ef86c2e4f3e6afd43db620636bf8532e7ad4471 WHIRLPOOL e13d21d0a86c106c1807f50ca250c534180f97772038b82a0235fc81fa1ff8507e7bb28b851f97ecc3408eda53b24ef0d8d7425d8b0595ddbea28a0dc2bb262a
+EBUILD portage-2.2.0_alpha143-r1.ebuild 11792 SHA256 0ecfcc1e34454c52d5f6d01eaed76c0c74a93df183ffb47531a43f8757b5962b SHA512 7249d4066c97b5763c269c4c7ff5326d4bc20094618bacea98242ef3e475dc08f135565040227e3b8a77bfafd69893d0e9758ebd051a162d853b7af71e0e0e56 WHIRLPOOL e427e57ecf1d87f9f0d33c59c759cf94cdbafca6d30918bbec8922e94bd0a13ff02e78e851a35830ca3e48f4390a0601c541a5829e09f37d35be29555329ab56
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha143-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha143-r1.ebuild
index 1d43343..98deb89 100644
--- a/sys-apps/portage/portage-2.2.0_alpha143-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha143-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="844f073fdd6626082b5138ae6e1d7b9d0634fe18"
+EGIT_COMMIT="e934977a22ae99293d4ec03415ddd28be6fee1c6"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     769b57e4bf9179e430c84575a98a1a8da83f38f9
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 30 16:49:47 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Nov 30 16:49:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=769b57e4

Sync portage

---
 sys-apps/portage/Manifest                         |    2 +-
 sys-apps/portage/portage-2.2.0_alpha143-r1.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ee426ca..3a839d7 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha143-r1.ebuild 11792 SHA256 4747400737232aee40cf4a35adb80ec6041efa50b755d2ac33834bcbd770b7dd SHA512 7fb2d20e1238c6c8131a82c34db65b24264cd62fd6bdea5d4eb91a2f71f3e743fe283c3a8e0e86377e35712f2f7e1045df58e6a0613d535d0bc159be53858b97 WHIRLPOOL f35b5f15e9110a8ec010b56a7599d90e8c74387c98072eabb51ab24a0d5ea3e88a25431c3de687a8f8978303cc61a33791e3c7f6e67c1cce4365c4cd33afbf58
+EBUILD portage-2.2.0_alpha143-r1.ebuild 11792 SHA256 c64741b748250c1149afce56c58c4bbf262ea96485b205056748c5903455f0dc SHA512 ed3e7a97a16e097e47a6f3747f92f574c789ee97d6ae6f8d2ea39fed44e218f91fce6d99369541d655301dfb2ef86c2e4f3e6afd43db620636bf8532e7ad4471 WHIRLPOOL e13d21d0a86c106c1807f50ca250c534180f97772038b82a0235fc81fa1ff8507e7bb28b851f97ecc3408eda53b24ef0d8d7425d8b0595ddbea28a0dc2bb262a
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha143-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha143-r1.ebuild
index 8da8403..1d43343 100644
--- a/sys-apps/portage/portage-2.2.0_alpha143-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha143-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="56e08beb42f99cdeddaa11bf1fe012a5b1c475b1"
+EGIT_COMMIT="844f073fdd6626082b5138ae6e1d7b9d0634fe18"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     2dad7e9947a507c41fdc46c8b5275db60afe25f9
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 30 16:47:03 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Nov 30 16:47:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=2dad7e99

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha143-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 5c3f15d..ee426ca 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha142-r1.ebuild 11792 SHA256 335b99e640e5e0e427b85cfc8e34cbfec51863a64df68217e143c37e23059e6e SHA512 d101f102caf7e0029dc348e4212eebe99869cc65a2af2edd4bb3bbf0bcf78b394a28a7da5dfd94898571f59c74ef732c702e5a3b66f4222410a5532e0de0d37f WHIRLPOOL c604481dcbf492f93d7ff7733ff27a0c4047e974c8171dee5d5e5a2a2fbb71304bb5b5422d6616d374eadab860ed2a99620f5dd22b6e728ba6fea81ab39aab7a
+EBUILD portage-2.2.0_alpha143-r1.ebuild 11792 SHA256 4747400737232aee40cf4a35adb80ec6041efa50b755d2ac33834bcbd770b7dd SHA512 7fb2d20e1238c6c8131a82c34db65b24264cd62fd6bdea5d4eb91a2f71f3e743fe283c3a8e0e86377e35712f2f7e1045df58e6a0613d535d0bc159be53858b97 WHIRLPOOL f35b5f15e9110a8ec010b56a7599d90e8c74387c98072eabb51ab24a0d5ea3e88a25431c3de687a8f8978303cc61a33791e3c7f6e67c1cce4365c4cd33afbf58
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha142-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha143-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha142-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha143-r1.ebuild
index 91729ab..8da8403 100644
--- a/sys-apps/portage/portage-2.2.0_alpha142-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha143-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="9db5b4a84b2c0723fb8b39c540f6182e46eeb4c3"
+EGIT_COMMIT="56e08beb42f99cdeddaa11bf1fe012a5b1c475b1"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     c3c6aa607c87126ce1986c75377b04208060f2c0
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 29 12:24:42 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Oct 29 12:24:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=c3c6aa60

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha142-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e3b17f7..5c3f15d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha141-r1.ebuild 11792 SHA256 537fac017ce99eedb4684c703fb23ee44a8504956de2adada2a8907233ff069a SHA512 0efe7f920ea394029889fc092a138f1ee84e254a2efc025a53e7b3ff22e2bd253edf90a036823b8288fc08270394f8705e2016b60e3336eca056a09b2142364b WHIRLPOOL c76172a0adbf4d78c1e8999d22d8b7602e3a575c9951179cd0e7d30eef15f3b6753f280ef053c51c1d0c2de3c5cfb634858b34b12359c8721357fb835e357a68
+EBUILD portage-2.2.0_alpha142-r1.ebuild 11792 SHA256 335b99e640e5e0e427b85cfc8e34cbfec51863a64df68217e143c37e23059e6e SHA512 d101f102caf7e0029dc348e4212eebe99869cc65a2af2edd4bb3bbf0bcf78b394a28a7da5dfd94898571f59c74ef732c702e5a3b66f4222410a5532e0de0d37f WHIRLPOOL c604481dcbf492f93d7ff7733ff27a0c4047e974c8171dee5d5e5a2a2fbb71304bb5b5422d6616d374eadab860ed2a99620f5dd22b6e728ba6fea81ab39aab7a
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha142-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha142-r1.ebuild
index 069afbc..91729ab 100644
--- a/sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha142-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="c13439f0d8979387d42ebfa6eaff9799f41918c4"
+EGIT_COMMIT="9db5b4a84b2c0723fb8b39c540f6182e46eeb4c3"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     55bec8cea75f5d1c6dee0cb25e2011c1c67efb90
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 22 09:32:08 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Oct 22 09:32:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=55bec8ce

Sync portage

---
 sys-apps/portage/Manifest                         |    2 +-
 sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ed9ff7c..8e1640f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha141-r1.ebuild 11671 SHA256 b166d3d8d14efc2c3f9bf31dc11e079ad2834b0ac32e763661ca6bc5e9a7d36b SHA512 19996e62c211307fb60d10892a2778b61fafe97cafb91c57da335c2fd32cfaa94202a3bde51e34462d6ee8c1b4a2338499d26340df092b055e39f29c0235ef46 WHIRLPOOL a77ae20ddac4ed669587a63f7b6d722ad92bd07c116604f1bfa8c0dbdd3c505a6c8040abfc728375d9b532e6a07c1da9441587d32117aec0389940c8684d6636
+EBUILD portage-2.2.0_alpha141-r1.ebuild 11792 SHA256 8a6154c339049c0162f92e4ebb9737a89af754515408af07d9e8f0ad7887f62a SHA512 2917e7216d9f15741255fed30f765d5c15aa31601e0efbc62541de0e873d2bfbc2b7692ccd5cb98922b1fa02621ee4976eaaa9e8039e74636e681d190c7480e5 WHIRLPOOL 966166bc6096a04ba1f8deebc7972aac47e786d2e892b058e34f31f8d73978a23f4517caf3f9f4eab4e2b0f78491c25aead57feb68dd3ab047e741b2c8ea58d3
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild
index cf831cc..7c7a130 100644
--- a/sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild
@@ -189,6 +189,9 @@ src_prepare() {
 			|| die "failed to append to make.globals"
 	fi
 
+	echo -e '\nFEATURES="${FEATURES} preserve-libs"' >> cnf/make.globals \
+		|| die "failed to append to make.globals"
+
 	cd "${S}/cnf" || die
 	if [ -f "make.conf.${ARCH}".diff ]; then
 		patch make.conf "make.conf.${ARCH}".diff || \
@@ -235,7 +238,7 @@ src_install() {
 	# Set PYTHONPATH for portage API consumers. This way we don't have
 	# to rely on patched python having the correct path, since it has
 	# been known to incorrectly add /usr/libx32/portage/pym to sys.path.
-	echo "PYTHONPATH=${EPREFIX}/usr/lib/portage/pym" > \
+	echo "PYTHONPATH=\"${EPREFIX}/usr/lib/portage/pym\"" > \
 		"${T}/05portage" || die
 	doenvd "${T}/05portage" || die
 }

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

[Thomas Sachau]

commit:     4322d98d2b3807992d15f5405d564cb8e2ccf18f
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 22 09:44:49 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Oct 22 09:44:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=4322d98d

Sync portage

---
 sys-apps/portage/Manifest                         |    2 +-
 sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8e1640f..e3b17f7 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha141-r1.ebuild 11792 SHA256 8a6154c339049c0162f92e4ebb9737a89af754515408af07d9e8f0ad7887f62a SHA512 2917e7216d9f15741255fed30f765d5c15aa31601e0efbc62541de0e873d2bfbc2b7692ccd5cb98922b1fa02621ee4976eaaa9e8039e74636e681d190c7480e5 WHIRLPOOL 966166bc6096a04ba1f8deebc7972aac47e786d2e892b058e34f31f8d73978a23f4517caf3f9f4eab4e2b0f78491c25aead57feb68dd3ab047e741b2c8ea58d3
+EBUILD portage-2.2.0_alpha141-r1.ebuild 11792 SHA256 537fac017ce99eedb4684c703fb23ee44a8504956de2adada2a8907233ff069a SHA512 0efe7f920ea394029889fc092a138f1ee84e254a2efc025a53e7b3ff22e2bd253edf90a036823b8288fc08270394f8705e2016b60e3336eca056a09b2142364b WHIRLPOOL c76172a0adbf4d78c1e8999d22d8b7602e3a575c9951179cd0e7d30eef15f3b6753f280ef053c51c1d0c2de3c5cfb634858b34b12359c8721357fb835e357a68
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild
index 7c7a130..069afbc 100644
--- a/sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="db4fd960ae7299820d613c080b38c3ece6ed3a3d"
+EGIT_COMMIT="c13439f0d8979387d42ebfa6eaff9799f41918c4"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     0fbf85787d23229bcf991f0caf47df646d8b82cd
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 22 09:25:07 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Oct 22 09:25:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=0fbf8578

Sync portage

---
 sys-apps/portage/Manifest                         |    2 +-
 sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b673872..ed9ff7c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha141-r1.ebuild 11671 SHA256 9716698b749fbf80023019b640aa102167a7b411fbfa628670da2cae3d998cdc SHA512 b18615e7e054c3808124fe78d05bc64e2e6fb1c0d63d9d3564cfcd6edfd62b0340cd45e87de2a8a9573b930d77426d43902eb8a69f19d76fd54250cd53c7a771 WHIRLPOOL a1b1efd2a4a0faed38fb3e52ecd13eb95ef3c6bb42cc86f0c06c4966db707daedadd623b1d1d71241be482ce9ae94571f21fe524cb5ca37e36b2692c90f57f26
+EBUILD portage-2.2.0_alpha141-r1.ebuild 11671 SHA256 b166d3d8d14efc2c3f9bf31dc11e079ad2834b0ac32e763661ca6bc5e9a7d36b SHA512 19996e62c211307fb60d10892a2778b61fafe97cafb91c57da335c2fd32cfaa94202a3bde51e34462d6ee8c1b4a2338499d26340df092b055e39f29c0235ef46 WHIRLPOOL a77ae20ddac4ed669587a63f7b6d722ad92bd07c116604f1bfa8c0dbdd3c505a6c8040abfc728375d9b532e6a07c1da9441587d32117aec0389940c8684d6636
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild
index 10885f2..cf831cc 100644
--- a/sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="1d7ef6f2f086bea07429d3d2a725b72f32715d17"
+EGIT_COMMIT="db4fd960ae7299820d613c080b38c3ece6ed3a3d"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     7d970d9588354a3b38b250ee5100eefa9c5173bd
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 22 08:58:05 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Oct 22 08:58:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=7d970d95

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha141-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e00743a..b673872 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha137-r1.ebuild 11671 SHA256 0e118c6cfe8546eb0806e045e86657ecb55c756eae522be0187c269057a49152 SHA512 af4a27428f1cef2f6f0bc109df4b66ce84ff36fee4346db1b90c1df8421baed134e09a4ef9c5a7d42342a4da30fadf1fad302d43aa04ea64ff25dd4d2cc403ca WHIRLPOOL 828edebd3f06df2a39a2125571ac7ea5ca686f82b809a1572397a0c2483c8d4c8c910b3ff7b2bc589bebb7513afb68d501702a269773131732ff8e4b99107290
+EBUILD portage-2.2.0_alpha141-r1.ebuild 11671 SHA256 9716698b749fbf80023019b640aa102167a7b411fbfa628670da2cae3d998cdc SHA512 b18615e7e054c3808124fe78d05bc64e2e6fb1c0d63d9d3564cfcd6edfd62b0340cd45e87de2a8a9573b930d77426d43902eb8a69f19d76fd54250cd53c7a771 WHIRLPOOL a1b1efd2a4a0faed38fb3e52ecd13eb95ef3c6bb42cc86f0c06c4966db707daedadd623b1d1d71241be482ce9ae94571f21fe524cb5ca37e36b2692c90f57f26
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha137-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha137-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild
index 73f248d..10885f2 100644
--- a/sys-apps/portage/portage-2.2.0_alpha137-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha141-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="cf9860a6c155da9e7d8ea02ab42a8144fea3ee7f"
+EGIT_COMMIT="1d7ef6f2f086bea07429d3d2a725b72f32715d17"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     f2e922329ecc229186ed1508548a1149b5947640
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 09:36:49 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 09:39:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=f2e92232

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha137-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 55ad288..e00743a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha135-r1.ebuild 11671 SHA256 51b4e92c98a4eab6fc67c8a23cb2b2e59815d3bdbc8a512c936a23d597e1360b SHA512 7170b2589da83963878e28b0a6f22137393a623c7b3789e1bd6e9c7558252a8b3467d96a417d21b378aaa4c9520dac13c3726178d90bb302d36bb916237b6a55 WHIRLPOOL 7bf865897de6f528f7f25ad00f3863565150982161485f5abcce51efb505cf22e32637c19f6bdc76c4a569cb374112ff33aec8b8dee1a13362f47b81fda2d61e
+EBUILD portage-2.2.0_alpha137-r1.ebuild 11671 SHA256 0e118c6cfe8546eb0806e045e86657ecb55c756eae522be0187c269057a49152 SHA512 af4a27428f1cef2f6f0bc109df4b66ce84ff36fee4346db1b90c1df8421baed134e09a4ef9c5a7d42342a4da30fadf1fad302d43aa04ea64ff25dd4d2cc403ca WHIRLPOOL 828edebd3f06df2a39a2125571ac7ea5ca686f82b809a1572397a0c2483c8d4c8c910b3ff7b2bc589bebb7513afb68d501702a269773131732ff8e4b99107290
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha135-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha137-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha135-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha137-r1.ebuild
index f59782e..73f248d 100644
--- a/sys-apps/portage/portage-2.2.0_alpha135-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha137-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="e565dbb49b6a69d083cd7dc3769c405bc83cab6d"
+EGIT_COMMIT="cf9860a6c155da9e7d8ea02ab42a8144fea3ee7f"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     88840103bbec7ef427784417ee0188e1e14e6136
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  6 11:35:00 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Oct  6 11:35:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=88840103

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha135-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 6fe7989..55ad288 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha134-r1.ebuild 11671 SHA256 f95a4405310cde284f0ed161af543c6fee19efa2373a4b1adfd7e0f0c56966a6 SHA512 89963d267ff262ae2f89b607bc23b04e44f20efeffdf296af6c3a3de5ebc498674b89568ba66043d85ffd7904185118e2237503cbcdd8931ff56b9976e9ff812 WHIRLPOOL 9cdcb9789a169f0a0f80bd5f820e74179ad18b2ef05962d1b3b593b487449825e9181a884edb232bfc1854cc87e0370c813caa089b095f200703af44b2fea936
+EBUILD portage-2.2.0_alpha135-r1.ebuild 11671 SHA256 51b4e92c98a4eab6fc67c8a23cb2b2e59815d3bdbc8a512c936a23d597e1360b SHA512 7170b2589da83963878e28b0a6f22137393a623c7b3789e1bd6e9c7558252a8b3467d96a417d21b378aaa4c9520dac13c3726178d90bb302d36bb916237b6a55 WHIRLPOOL 7bf865897de6f528f7f25ad00f3863565150982161485f5abcce51efb505cf22e32637c19f6bdc76c4a569cb374112ff33aec8b8dee1a13362f47b81fda2d61e
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha134-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha135-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha134-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha135-r1.ebuild
index 19a4f82..f59782e 100644
--- a/sys-apps/portage/portage-2.2.0_alpha134-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha135-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="80bfb6e67bb021d8b4cee741666570709ce12446"
+EGIT_COMMIT="e565dbb49b6a69d083cd7dc3769c405bc83cab6d"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     0efc3d7aff5800c0a2cbdc8842c17eaba5fd61ac
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 29 12:52:08 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Sep 29 12:52:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=0efc3d7a

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha134-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 5aeef9c..6fe7989 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha132-r1.ebuild 11671 SHA256 20335ee1a05e126adfc703efa588d6461da33ee79f6354bd8f435fcaa80e6b54 SHA512 88c5f4474015b95063433c0a8832e7bb1cc428ed4172a4a90085fb2c9822c3623cdee022fea41a1938076a1002a554d84dce2b2c91fd244a649f412cca40e27f WHIRLPOOL 3df51f3069cb29271c56431f438357f3326e36f8b6ab3c89980fdf6a9e40de6dad1bc812863b5a14341822afddce85bf9da036f6ab1f5c9a20edd0e2c35552ad
+EBUILD portage-2.2.0_alpha134-r1.ebuild 11671 SHA256 f95a4405310cde284f0ed161af543c6fee19efa2373a4b1adfd7e0f0c56966a6 SHA512 89963d267ff262ae2f89b607bc23b04e44f20efeffdf296af6c3a3de5ebc498674b89568ba66043d85ffd7904185118e2237503cbcdd8931ff56b9976e9ff812 WHIRLPOOL 9cdcb9789a169f0a0f80bd5f820e74179ad18b2ef05962d1b3b593b487449825e9181a884edb232bfc1854cc87e0370c813caa089b095f200703af44b2fea936
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha132-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha134-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha132-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha134-r1.ebuild
index 0add007..19a4f82 100644
--- a/sys-apps/portage/portage-2.2.0_alpha132-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha134-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="74b1323c38b955dafbec31b4b1c9543d9c536ab6"
+EGIT_COMMIT="80bfb6e67bb021d8b4cee741666570709ce12446"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     d2a245dc71030c276e1bf12681f662d44e854e5c
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 24 20:39:22 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 20:39:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=d2a245dc

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha132-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 71ab847..9198cad 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha131-r1.ebuild 11671 SHA256 28c03b39a88a9ba7ea5513f75ecf145293c5668a406ab35d12bcfeb4bbf423f1 SHA512 a5149806fcf914cfc08a5370bd1791ef0730010f0b7862c28f48858923cf98008e5363345cbcce7618bbffb1125ba11142d1d015ce27803b13483aeccb7e8634 WHIRLPOOL 16230f5695279af81e32f8cf7a802782f0f1c566f3ec875caa20f28107c6f8e7c1ea5628cfa4681e5520884f93fbc0b515c2e89f69ce3f33a0ea202348bd8fa9
+EBUILD portage-2.2.0_alpha132-r1.ebuild 11671 SHA256 acafccde194ef481359301a61e4d4c09a32636d1cd8a011a64912290441e5635 SHA512 91d619e50a43157c465b0edc2abf45b5f1ac9352967349bbc702c5513a8a868301d89a17c5aae0eae2b5fb0a97e33965299df7f4be8b56adb85611d2cc507bd3 WHIRLPOOL 9183c2d3686082fc3819c3add68d380bd90debcc623874c3f2ef83cb47a779a353b21aa6faf4ed06cc9c1503d12d41da3d77d781b2f5370b996851c961d0da2f
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha131-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha132-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha131-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha132-r1.ebuild
index 760e798..7c91694 100644
--- a/sys-apps/portage/portage-2.2.0_alpha131-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha132-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="185cb4a638b753f01d393f59966e757020960f84"
+EGIT_COMMIT="7e7a5bfec70fa46f9b566486346dee6d6ca1fccd"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     4a124436ba18fca2f0f79dee24709c54120a7972
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 24 20:43:39 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 20:43:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=4a124436

Sync portage

---
 sys-apps/portage/Manifest                         |    2 +-
 sys-apps/portage/portage-2.2.0_alpha132-r1.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 9198cad..5aeef9c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha132-r1.ebuild 11671 SHA256 acafccde194ef481359301a61e4d4c09a32636d1cd8a011a64912290441e5635 SHA512 91d619e50a43157c465b0edc2abf45b5f1ac9352967349bbc702c5513a8a868301d89a17c5aae0eae2b5fb0a97e33965299df7f4be8b56adb85611d2cc507bd3 WHIRLPOOL 9183c2d3686082fc3819c3add68d380bd90debcc623874c3f2ef83cb47a779a353b21aa6faf4ed06cc9c1503d12d41da3d77d781b2f5370b996851c961d0da2f
+EBUILD portage-2.2.0_alpha132-r1.ebuild 11671 SHA256 20335ee1a05e126adfc703efa588d6461da33ee79f6354bd8f435fcaa80e6b54 SHA512 88c5f4474015b95063433c0a8832e7bb1cc428ed4172a4a90085fb2c9822c3623cdee022fea41a1938076a1002a554d84dce2b2c91fd244a649f412cca40e27f WHIRLPOOL 3df51f3069cb29271c56431f438357f3326e36f8b6ab3c89980fdf6a9e40de6dad1bc812863b5a14341822afddce85bf9da036f6ab1f5c9a20edd0e2c35552ad
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha132-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha132-r1.ebuild
index 7c91694..0add007 100644
--- a/sys-apps/portage/portage-2.2.0_alpha132-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha132-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="7e7a5bfec70fa46f9b566486346dee6d6ca1fccd"
+EGIT_COMMIT="74b1323c38b955dafbec31b4b1c9543d9c536ab6"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     52f37d0bbe2180c789cfcee1c0c055feee414a19
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 22 15:56:59 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 15:56:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=52f37d0b

Sync portage

---
 sys-apps/portage/Manifest                         |    2 +-
 sys-apps/portage/portage-2.2.0_alpha131-r1.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 905a9c4..71ab847 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha131-r1.ebuild 11671 SHA256 3556de184d2451c720d59cedb105d28ccec8bfb32989b8d699f2488d1531e31f SHA512 4a1f27b32575977a2280d9efa1634d1e861056b425681cacde3d0c7c9c1fcc691192d7bd26b35890e367dae5c28a5fac8051fb9dc994f90cc5eb55a88a0a42fd WHIRLPOOL df5876b8a41b52fa9fc937dd0ba8460b2f58ae949b0436bcd485245886b55e2a53416780ef94c14f2401e31d2f58dc639214ae9119c17e6320a05f1603bb4a64
+EBUILD portage-2.2.0_alpha131-r1.ebuild 11671 SHA256 28c03b39a88a9ba7ea5513f75ecf145293c5668a406ab35d12bcfeb4bbf423f1 SHA512 a5149806fcf914cfc08a5370bd1791ef0730010f0b7862c28f48858923cf98008e5363345cbcce7618bbffb1125ba11142d1d015ce27803b13483aeccb7e8634 WHIRLPOOL 16230f5695279af81e32f8cf7a802782f0f1c566f3ec875caa20f28107c6f8e7c1ea5628cfa4681e5520884f93fbc0b515c2e89f69ce3f33a0ea202348bd8fa9
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha131-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha131-r1.ebuild
index 2048554..760e798 100644
--- a/sys-apps/portage/portage-2.2.0_alpha131-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha131-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="b07dd3e82b8bc2a50675861cbae59da912a09265"
+EGIT_COMMIT="185cb4a638b753f01d393f59966e757020960f84"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     78edfcefde72ae795ac51a8b1f5a50d914983512
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 22 15:34:09 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 15:34:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=78edfcef

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha131-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a6dfe66..905a9c4 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha130-r1.ebuild 11671 SHA256 62b40b70349585b30e558055d9694e62d0df6514bff544a57f1a6cd501386e58 SHA512 c31589dba08e3f3c406928233e9d257d61c9a8956eea8dd447d2880477a27d29cb74f9eb822810d0ce213614528a16ee4f7643dd9c76389b111f03aff1b0a322 WHIRLPOOL 9955d28e58dff17d1da786b29edf8dfc3016d398febcd6dee8e770391552a85c260f31b0bbb1ded5de790e622d34a3d007fe36aa630be7436dd28cf99b4c370e
+EBUILD portage-2.2.0_alpha131-r1.ebuild 11671 SHA256 3556de184d2451c720d59cedb105d28ccec8bfb32989b8d699f2488d1531e31f SHA512 4a1f27b32575977a2280d9efa1634d1e861056b425681cacde3d0c7c9c1fcc691192d7bd26b35890e367dae5c28a5fac8051fb9dc994f90cc5eb55a88a0a42fd WHIRLPOOL df5876b8a41b52fa9fc937dd0ba8460b2f58ae949b0436bcd485245886b55e2a53416780ef94c14f2401e31d2f58dc639214ae9119c17e6320a05f1603bb4a64
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha130-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha131-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha130-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha131-r1.ebuild
index 298bc7d..2048554 100644
--- a/sys-apps/portage/portage-2.2.0_alpha130-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha131-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="5dac178ab00b74c4af304a748d15b98d969650f6"
+EGIT_COMMIT="b07dd3e82b8bc2a50675861cbae59da912a09265"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     6876626ff3e2c47722432f3cc365041d29920287
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 22 15:30:46 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 15:30:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=6876626f

Sync portage

---
 sys-apps/portage/Manifest                         |    2 +-
 sys-apps/portage/portage-2.2.0_alpha130-r1.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 01d1cd2..a6dfe66 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha130-r1.ebuild 11671 SHA256 dd53304c99778012ccd4db22b924dda591bf18e9af995ed8eac6530f5a1eee6e SHA512 2e40ac34ab6174ba20899a36c4ec7cd7fdfd1796a99e0683bb19d62333488d3b9266d3d9d1ef2202e269ffe2b31d608720993b3ad4c3c01713d5ca4eec53f487 WHIRLPOOL b807fbf78f7b31c62a2495f0d238592e94c388f70c2b76719f31ca9cd787a0d0b006c26462bd5ce7ba52ff79175346fc7dbbc065f6816c5c21c1a54686aa1c54
+EBUILD portage-2.2.0_alpha130-r1.ebuild 11671 SHA256 62b40b70349585b30e558055d9694e62d0df6514bff544a57f1a6cd501386e58 SHA512 c31589dba08e3f3c406928233e9d257d61c9a8956eea8dd447d2880477a27d29cb74f9eb822810d0ce213614528a16ee4f7643dd9c76389b111f03aff1b0a322 WHIRLPOOL 9955d28e58dff17d1da786b29edf8dfc3016d398febcd6dee8e770391552a85c260f31b0bbb1ded5de790e622d34a3d007fe36aa630be7436dd28cf99b4c370e
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha130-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha130-r1.ebuild
index d16b109..298bc7d 100644
--- a/sys-apps/portage/portage-2.2.0_alpha130-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha130-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="baf9799818ebdd09c291c94419cd5a427a21c9f5"
+EGIT_COMMIT="5dac178ab00b74c4af304a748d15b98d969650f6"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     b990f09480a2f494e25b714083e255a562e9ba73
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 22 15:24:29 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 15:24:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=b990f094

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha130-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 79bf51d..01d1cd2 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha128-r1.ebuild 11671 SHA256 428eff16f3ac949f65c34553bb3e07b7a055c380466544093f68e245ed73dfa5 SHA512 98f90e31f0f900ab265bf35803afd34aa1ca2895cdbf38f363d97f993ad98bd691c17b8d9550fa0e52fc2960779a5656472cd9658e7b941721b4871c69e2cfa4 WHIRLPOOL 7c2c8b5bc5e28393ed9dbcb476a52689d37326440948fb52cc97e3d5a913f2bf66de9627156f5c33e062880812eec153eedcfeb934165b602d7bc1f19015d4aa
+EBUILD portage-2.2.0_alpha130-r1.ebuild 11671 SHA256 dd53304c99778012ccd4db22b924dda591bf18e9af995ed8eac6530f5a1eee6e SHA512 2e40ac34ab6174ba20899a36c4ec7cd7fdfd1796a99e0683bb19d62333488d3b9266d3d9d1ef2202e269ffe2b31d608720993b3ad4c3c01713d5ca4eec53f487 WHIRLPOOL b807fbf78f7b31c62a2495f0d238592e94c388f70c2b76719f31ca9cd787a0d0b006c26462bd5ce7ba52ff79175346fc7dbbc065f6816c5c21c1a54686aa1c54
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha128-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha130-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha128-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha130-r1.ebuild
index d8d414c..d16b109 100644
--- a/sys-apps/portage/portage-2.2.0_alpha128-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha130-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="fd72996029dacbcc7e42b6d395a412f070297fd8"
+EGIT_COMMIT="baf9799818ebdd09c291c94419cd5a427a21c9f5"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     73d0472918854f5c7d593a1f7b0c5ecc0e0615f2
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 17 17:24:21 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Sep 17 17:24:21 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=73d04729

Sync portage

---
 sys-apps/portage/Manifest                         |    2 +-
 sys-apps/portage/portage-2.2.0_alpha128-r1.ebuild |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 50dc7eb..8a2e20a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha128-r1.ebuild 11610 SHA256 90bb169cf869c2eadeffe5efd4f521015d5dc95c2fa5084bbb8f3f40745819cb SHA512 df8e30807549c0d8f045b064f10de685e79b37c164f733104ea7469f7e7612ce3945d18720004d1e264ab6fbad510c64ad3398f8fcadf75eac046e0938a0236a WHIRLPOOL f0518e94f0b8f09bc8b69e32e8067295cec29fab1fb809ae3bc3ac298925e9dc26645b04503630fe1d2ae164b343b1bd1b09efb463e973219bec838425fcdee4
+EBUILD portage-2.2.0_alpha128-r1.ebuild 11671 SHA256 a4df6dee6b485e03e11d80abba2b8d9cfae66c97d45615c76414989df22731e8 SHA512 10711fced56ea91236cb08044535a1adc3759559e64fc5c9dd8c203ac626f0ae747dbcf887d342f9115f40de649def6ce5f3c68d0de05e41f64ccf01cb88e137 WHIRLPOOL 21c4a57305328575bbe128abd08003326440765d5f7810f6a228e330c50a52006e807ed78d201cb1a5d7e2191ebc7ece79a68bfa337d8955b1128dfea11db31d
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha128-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha128-r1.ebuild
index 573ee49..7e03d89 100644
--- a/sys-apps/portage/portage-2.2.0_alpha128-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha128-r1.ebuild
@@ -117,6 +117,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+       touch ChangeLog #Makefile requires this file to exist
 	if [ -n "${PATCHVER}" ] ; then
 		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
 			rm "$S/bin/ebuild-helpers/portageq" \

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

[Thomas Sachau]

commit:     e6f94959eb2c407d7516a108687d6bc68440e25b
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 17 20:16:06 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Sep 17 20:16:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=e6f94959

Sync portage

---
 sys-apps/portage/Manifest                         |    2 +-
 sys-apps/portage/portage-2.2.0_alpha128-r1.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8a2e20a..79bf51d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha128-r1.ebuild 11671 SHA256 a4df6dee6b485e03e11d80abba2b8d9cfae66c97d45615c76414989df22731e8 SHA512 10711fced56ea91236cb08044535a1adc3759559e64fc5c9dd8c203ac626f0ae747dbcf887d342f9115f40de649def6ce5f3c68d0de05e41f64ccf01cb88e137 WHIRLPOOL 21c4a57305328575bbe128abd08003326440765d5f7810f6a228e330c50a52006e807ed78d201cb1a5d7e2191ebc7ece79a68bfa337d8955b1128dfea11db31d
+EBUILD portage-2.2.0_alpha128-r1.ebuild 11671 SHA256 428eff16f3ac949f65c34553bb3e07b7a055c380466544093f68e245ed73dfa5 SHA512 98f90e31f0f900ab265bf35803afd34aa1ca2895cdbf38f363d97f993ad98bd691c17b8d9550fa0e52fc2960779a5656472cd9658e7b941721b4871c69e2cfa4 WHIRLPOOL 7c2c8b5bc5e28393ed9dbcb476a52689d37326440948fb52cc97e3d5a913f2bf66de9627156f5c33e062880812eec153eedcfeb934165b602d7bc1f19015d4aa
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha128-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha128-r1.ebuild
index 7e03d89..d8d414c 100644
--- a/sys-apps/portage/portage-2.2.0_alpha128-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha128-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="ba7e40ba4ec4974a5469d707853dd41fcad13a55"
+EGIT_COMMIT="fd72996029dacbcc7e42b6d395a412f070297fd8"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     546ce6037a89d41627a8e6c9a9d3d7ffd86c0dd6
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 17 17:22:41 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Sep 17 17:22:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=546ce603

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha128-r1.ebuild} |  108 +++++++-------------
 2 files changed, 40 insertions(+), 70 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 528f79f..50dc7eb 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha124-r1.ebuild 12532 SHA256 37c81e29597fb946c412b5e2b3440c54efd9df78964d98c149b8d17d1f60150e SHA512 227fe1c8e9f179a91870a011afb05672dd0b775a5510aa7181d613061192e16ad28041846533769f1b213d4c9b604264e513e661f9b9914b5f5fa921a8945df6 WHIRLPOOL 1acd3166f2dd5118662994f6c842f734fefcabc6103203d3890f6e0d1b899c595aa41d7e26926647ff397da18079de8e4d5f2572e6b3ded152ea124e2d8fe98e
+EBUILD portage-2.2.0_alpha128-r1.ebuild 11610 SHA256 90bb169cf869c2eadeffe5efd4f521015d5dc95c2fa5084bbb8f3f40745819cb SHA512 df8e30807549c0d8f045b064f10de685e79b37c164f733104ea7469f7e7612ce3945d18720004d1e264ab6fbad510c64ad3398f8fcadf75eac046e0938a0236a WHIRLPOOL f0518e94f0b8f09bc8b69e32e8067295cec29fab1fb809ae3bc3ac298925e9dc26645b04503630fe1d2ae164b343b1bd1b09efb463e973219bec838425fcdee4
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha124-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha128-r1.ebuild
similarity index 78%
rename from sys-apps/portage/portage-2.2.0_alpha124-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha128-r1.ebuild
index b4bed4e..573ee49 100644
--- a/sys-apps/portage/portage-2.2.0_alpha124-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha128-r1.ebuild
@@ -1,34 +1,37 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha91.ebuild,v 1.1 2012/03/18 00:16:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha128.ebuild,v 1.1 2012/09/14 02:54:07 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
 EAPI=3
-inherit eutils git-2 multilib python
+inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="b156a9884fd820a39841ee183ba696e7b174d5c7"
+EGIT_COMMIT="ba7e40ba4ec4974a5469d707853dd41fcad13a55"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl pypy1_8 python2 python3 selinux xattr"
+IUSE="build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr"
 
 # Import of the io module in python-2.6 raises ImportError for the
 # thread module if threading is disabled.
-python_dep="python3? ( =dev-lang/python-3* )
-	!pypy1_8? ( !python2? ( !python3? (
-		|| ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] )
+python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
+	!pypy1_9? ( !python2? ( !python3? (
+		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
 	) ) )
-	pypy1_8? ( !python2? ( !python3? ( dev-python/pypy:1.8[bzip2] ) ) )
-	python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
+	pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[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,}"
 
 # The pysqlite blocker is for bug #282760.
 DEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5 )
+	>=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 !<=dev-python/pysqlite-2.4.1 )
 	>=sys-apps/abi-wrapper-1.0-r6"
@@ -37,10 +40,13 @@ DEPEND="${python_dep}
 # 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] or python-mhash (bug #425046).
 RDEPEND="${python_dep}
 	!build? ( >=sys-apps/sed-4.0.5
 		>=app-shells/bash-3.2_p17
-		>=app-admin/eselect-1.2 )
+		>=app-admin/eselect-1.2
+		|| ( ${python_dep_ssl} dev-python/python-mhash )
+	)
 	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
 	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
@@ -68,23 +74,19 @@ current_python_has_xattr() {
 }
 
 pkg_setup() {
-	# Bug #359731 - Die early if get_libdir fails.
-	[[ -z $(get_libdir) ]] && \
-		die "get_libdir returned an empty string"
-
 	if use python2 && use python3 ; then
 		ewarn "Both python2 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if use pypy1_8 && use python3 ; then
-		ewarn "Both pypy1_8 and python3 USE flags are enabled, but only one"
+	if use pypy1_9 && use python3 ; then
+		ewarn "Both pypy1_9 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if use pypy1_8 && use python2 ; then
-		ewarn "Both pypy1_8 and python2 USE flags are enabled, but only one"
+	if use pypy1_9 && use python2 ; then
+		ewarn "Both pypy1_9 and python2 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python2"
 	fi
-	if ! use pypy1_8 && ! use python2 && ! use python3 && \
+	if ! use pypy1_9 && ! use python2 && ! use python3 && \
 		! compatible_python_is_selected ; then
 		ewarn "Attempting to select a compatible default python interpreter"
 		local x success=0
@@ -109,13 +111,12 @@ pkg_setup() {
 		python_set_active_version 3
 	elif use python2; then
 		python_set_active_version 2
-	elif use pypy1_8; then
-		python_set_active_version 2.7-pypy-1.8
+	elif use pypy1_9; then
+		python_set_active_version 2.7-pypy-1.9
 	fi
 }
 
 src_prepare() {
-	touch ChangeLog #Makefile requires this file to exist
 	if [ -n "${PATCHVER}" ] ; then
 		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
 			rm "$S/bin/ebuild-helpers/portageq" \
@@ -150,9 +151,9 @@ src_prepare() {
 	elif use python2; then
 		einfo "Converting shebangs for python2..."
 		python_convert_shebangs -r 2 .
-	elif use pypy1_8; then
-		einfo "Converting shebangs for pypy-c1.8..."
-		python_convert_shebangs -r 2.7-pypy-1.8 .
+	elif use pypy1_9; then
+		einfo "Converting shebangs for pypy-c1.9..."
+		python_convert_shebangs -r 2.7-pypy-1.9 .
 	fi
 
 	if [[ -n ${EPREFIX} ]] ; then
@@ -197,12 +198,6 @@ src_prepare() {
 		eerror "Please notify the arch maintainer about this issue. Using generic."
 		eerror ""
 	fi
-
-	# BSD and OSX need a sed wrapper so that find/xargs work properly
-	if use userland_GNU; then
-		rm -f "${S}"/bin/ebuild-helpers/sed || \
-			die "Failed to remove sed wrapper"
-	fi
 }
 
 src_compile() {
@@ -226,17 +221,22 @@ src_install() {
 	emake DESTDIR="${D}" \
 		sysconfdir="${EPREFIX}/etc" \
 		prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" \
 		install || die
 
 	# Use dodoc for compression, since the Makefile doesn't do that.
-	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES}
+	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
 
 	if use linguas_pl; then
 		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die
 		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die
 	fi
-	rm "${D}"usr/share/doc/${PF}/ChangeLog || die
+
+	# Set PYTHONPATH for portage API consumers. This way we don't have
+	# to rely on patched python having the correct path, since it has
+	# been known to incorrectly add /usr/libx32/portage/pym to sys.path.
+	echo "PYTHONPATH=${EPREFIX}/usr/lib/portage/pym" > \
+		"${T}/05portage" || die
+	doenvd "${T}/05portage" || die
 }
 
 pkg_preinst() {
@@ -263,12 +263,6 @@ pkg_preinst() {
 		ewarn "to enable RMD160 hash support."
 		ewarn "See bug #198398 for more information."
 	fi
-	if [ -f "${EROOT}/etc/make.globals" ]; then
-		rm "${EROOT}/etc/make.globals"
-	fi
-
-	has_version "<${CATEGORY}/${PN}-2.2_alpha" \
-		&& MINOR_UPGRADE=true || MINOR_UPGRADE=false
 
 	has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
 		&& WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
@@ -279,17 +273,15 @@ pkg_preinst() {
 		! ( [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
 		has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) \
 		&& NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
-
-	[[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" \
-		&& REPO_LAYOUT_CONF_WARN=true || REPO_LAYOUT_CONF_WARN=false
 }
 
 pkg_postinst() {
 	# Compile all source files recursively. Any orphans
 	# will be identified and removed in postrm.
-	python_mod_optimize /usr/$(get_libdir)/portage/pym
+	python_mod_optimize /usr/lib/portage/pym
 
-	if $WORLD_MIGRATION_UPGRADE ; then
+	if $WORLD_MIGRATION_UPGRADE && \
+		grep -q "^@" "${EROOT}/var/lib/portage/world"; then
 		einfo "moving set references from the worldfile into world_sets"
 		cd "${EROOT}/var/lib/portage/"
 		grep "^@" world >> world_sets
@@ -315,36 +307,14 @@ pkg_postinst() {
 		done
 	fi
 
-	if $REPO_LAYOUT_CONF_WARN ; then
-		ewarn
-		echo "If you want overlay eclasses to override eclasses from" \
-			"other repos then see the portage(5) man page" \
-			"for information about the new layout.conf and repos.conf" \
-			"configuration files." \
-			| fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
-		ewarn
-	fi
-
-	einfo
-	einfo "For help with using portage please consult the Gentoo Handbook"
-	einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
 	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"
-
-
-	if $MINOR_UPGRADE ; then
-		elog "If you're upgrading from a pre-2.2 version of portage you might"
-		elog "want to remerge world (emerge -e world) to take full advantage"
-		elog "of some of the new features in 2.2."
-		elog "This is not required however for portage to function properly."
-		elog
-	fi
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/portage/pym
+	python_mod_cleanup /usr/lib/portage/pym
 }

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

[Thomas Sachau]

commit:     d3e828cbf68421a592349efee06393f3c9101585
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  8 12:58:22 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Sep  8 12:58:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=d3e828cb

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha124-r1.ebuild} |    0
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 1469863..528f79f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha116-r1.ebuild 12532 SHA256 37c81e29597fb946c412b5e2b3440c54efd9df78964d98c149b8d17d1f60150e SHA512 227fe1c8e9f179a91870a011afb05672dd0b775a5510aa7181d613061192e16ad28041846533769f1b213d4c9b604264e513e661f9b9914b5f5fa921a8945df6 WHIRLPOOL 1acd3166f2dd5118662994f6c842f734fefcabc6103203d3890f6e0d1b899c595aa41d7e26926647ff397da18079de8e4d5f2572e6b3ded152ea124e2d8fe98e
+EBUILD portage-2.2.0_alpha124-r1.ebuild 12532 SHA256 37c81e29597fb946c412b5e2b3440c54efd9df78964d98c149b8d17d1f60150e SHA512 227fe1c8e9f179a91870a011afb05672dd0b775a5510aa7181d613061192e16ad28041846533769f1b213d4c9b604264e513e661f9b9914b5f5fa921a8945df6 WHIRLPOOL 1acd3166f2dd5118662994f6c842f734fefcabc6103203d3890f6e0d1b899c595aa41d7e26926647ff397da18079de8e4d5f2572e6b3ded152ea124e2d8fe98e
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

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

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

[Thomas Sachau]

commit:     9d862c2cba3970eabac81a40f4842833af525284
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  8 10:05:19 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 10:31:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=9d862c2c

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha116-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b922e98..a831b7c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha114-r1.ebuild 12532 RMD160 05d1dee49e256d4ad854ec541d9174cf572e3946 SHA1 63b3891029d3b7a1d5d5fcc241c5cf9b76395b98 SHA256 e0ecf8b37efe7a17dd8982000164d1aec5c5445b579cf4c802300f6e53e0a42e
+EBUILD portage-2.2.0_alpha116-r1.ebuild 12532 RMD160 509114b0e740db0e101cc7cf830d8574f2dd53f3 SHA1 4546d203195bceca52aae79ac27ff9c0a56d1226 SHA256 9821bb6edd91e954c2a98f3d7cb491adb6131084eef53096ce2d30d426d89da4
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha114-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha116-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha114-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha116-r1.ebuild
index 8892262..427c187 100644
--- a/sys-apps/portage/portage-2.2.0_alpha114-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha116-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="57847abbfcf4049abf5789493673a50ae798867c"
+EGIT_COMMIT="5c128c674867e13b4627a5ac873f87a9419ed288"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     538324c4fe521852313d2b8ac77db7dabd0b04ac
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  8 10:26:07 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 10:31:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=538324c4

Sync portage

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

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a831b7c..1469863 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha116-r1.ebuild 12532 RMD160 509114b0e740db0e101cc7cf830d8574f2dd53f3 SHA1 4546d203195bceca52aae79ac27ff9c0a56d1226 SHA256 9821bb6edd91e954c2a98f3d7cb491adb6131084eef53096ce2d30d426d89da4
-MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a
+EBUILD portage-2.2.0_alpha116-r1.ebuild 12532 SHA256 37c81e29597fb946c412b5e2b3440c54efd9df78964d98c149b8d17d1f60150e SHA512 227fe1c8e9f179a91870a011afb05672dd0b775a5510aa7181d613061192e16ad28041846533769f1b213d4c9b604264e513e661f9b9914b5f5fa921a8945df6 WHIRLPOOL 1acd3166f2dd5118662994f6c842f734fefcabc6103203d3890f6e0d1b899c595aa41d7e26926647ff397da18079de8e4d5f2572e6b3ded152ea124e2d8fe98e
+MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha116-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha116-r1.ebuild
index 427c187..b4bed4e 100644
--- a/sys-apps/portage/portage-2.2.0_alpha116-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha116-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="5c128c674867e13b4627a5ac873f87a9419ed288"
+EGIT_COMMIT="b156a9884fd820a39841ee183ba696e7b174d5c7"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     2b750f862231b57344f6e920b1ec2de439e0124e
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  1 12:05:38 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  1 12:05:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=2b750f86

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha114-r1.ebuild} |    0
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e4da1dd..f55ee7f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha110-r1.ebuild 12532 RMD160 540327e3a636c31d3b90147f062ddb595d0477e6 SHA1 88bc4b1ef7b125395f83c4f703081b300c50cd8d SHA256 384d81109cfcf0be76dfc0262d6519d5a1e5926fce88492967a99abd2173a317
+EBUILD portage-2.2.0_alpha114-r1.ebuild 12532 RMD160 540327e3a636c31d3b90147f062ddb595d0477e6 SHA1 88bc4b1ef7b125395f83c4f703081b300c50cd8d SHA256 384d81109cfcf0be76dfc0262d6519d5a1e5926fce88492967a99abd2173a317
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

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

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

[Thomas Sachau]

commit:     668c8a0cbdf6d492a20bbaac290aea48df9600f0
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  1 12:28:33 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  1 12:28:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=668c8a0c

Sync portage

---
 sys-apps/portage/Manifest                         |    2 +-
 sys-apps/portage/portage-2.2.0_alpha114-r1.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f55ee7f..b922e98 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha114-r1.ebuild 12532 RMD160 540327e3a636c31d3b90147f062ddb595d0477e6 SHA1 88bc4b1ef7b125395f83c4f703081b300c50cd8d SHA256 384d81109cfcf0be76dfc0262d6519d5a1e5926fce88492967a99abd2173a317
+EBUILD portage-2.2.0_alpha114-r1.ebuild 12532 RMD160 05d1dee49e256d4ad854ec541d9174cf572e3946 SHA1 63b3891029d3b7a1d5d5fcc241c5cf9b76395b98 SHA256 e0ecf8b37efe7a17dd8982000164d1aec5c5445b579cf4c802300f6e53e0a42e
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha114-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha114-r1.ebuild
index 7e1f88e..8892262 100644
--- a/sys-apps/portage/portage-2.2.0_alpha114-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha114-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="db01717b3f5efb9fd9e26348b659d423b66bcac0"
+EGIT_COMMIT="57847abbfcf4049abf5789493673a50ae798867c"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     654880f0d10e97ab0b2623c82fcd9864bef0e152
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 10 12:43:29 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 12:43:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=654880f0

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha110-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ab16cd8..e4da1dd 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha109-r1.ebuild 12532 RMD160 22795cb474706d3b0796b5bc21c037718fb809b0 SHA1 82e44620468818c64c9dd8714dda41a13e67ffaa SHA256 1e6932ca9a06ea12562ab06eca8fee084be8ac5980c917b48ba8ba528f064a2f
+EBUILD portage-2.2.0_alpha110-r1.ebuild 12532 RMD160 540327e3a636c31d3b90147f062ddb595d0477e6 SHA1 88bc4b1ef7b125395f83c4f703081b300c50cd8d SHA256 384d81109cfcf0be76dfc0262d6519d5a1e5926fce88492967a99abd2173a317
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha109-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha110-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha109-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha110-r1.ebuild
index 292a958..7e1f88e 100644
--- a/sys-apps/portage/portage-2.2.0_alpha109-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha110-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="e66210264938ba53c5f7e6697e9fa3b72c3d8862"
+EGIT_COMMIT="db01717b3f5efb9fd9e26348b659d423b66bcac0"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     86d3828e65dbc608322d5c40fec737446c76c05a
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  3 12:34:59 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jun  3 12:34:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=86d3828e

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha109-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b896ee8..ab16cd8 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha108-r1.ebuild 12532 RMD160 a09fe8429e8fcba1efa6f73e75c77e66346f369d SHA1 d65bb96eb6cbb7b8edc4f593066c6ddd40b62dd9 SHA256 f6fc74a2479b3df9c2707eb86ff3a754e71ce64cd5432af1eb254edfa6f7d642
+EBUILD portage-2.2.0_alpha109-r1.ebuild 12532 RMD160 22795cb474706d3b0796b5bc21c037718fb809b0 SHA1 82e44620468818c64c9dd8714dda41a13e67ffaa SHA256 1e6932ca9a06ea12562ab06eca8fee084be8ac5980c917b48ba8ba528f064a2f
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha108-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha109-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha108-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha109-r1.ebuild
index ab2b7ea..292a958 100644
--- a/sys-apps/portage/portage-2.2.0_alpha108-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha109-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="f3ef275a3908942468246ebf55dd4a393fbf6eb0"
+EGIT_COMMIT="e66210264938ba53c5f7e6697e9fa3b72c3d8862"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     12269d316b72191aa4da431c04809b4eba061db4
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon May 28 10:20:44 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon May 28 10:20:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=12269d31

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha108-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 0607ef1..b896ee8 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha107-r1.ebuild 12532 RMD160 0fc78e38f1364cb8f44f441a95ac6912fde24eb5 SHA1 10b211d9c055d9fbfc6945b1e2b85ec6a1ba259f SHA256 93ff6bc43b15c6b03170b8498ebbe9014373ffc801c465185195dba6945d56ae
+EBUILD portage-2.2.0_alpha108-r1.ebuild 12532 RMD160 a09fe8429e8fcba1efa6f73e75c77e66346f369d SHA1 d65bb96eb6cbb7b8edc4f593066c6ddd40b62dd9 SHA256 f6fc74a2479b3df9c2707eb86ff3a754e71ce64cd5432af1eb254edfa6f7d642
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha107-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha108-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha107-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha108-r1.ebuild
index 6a135aa..ab2b7ea 100644
--- a/sys-apps/portage/portage-2.2.0_alpha107-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha108-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="a284b20d0e63ea585d491fcc2b8ec14badc2bad0"
+EGIT_COMMIT="f3ef275a3908942468246ebf55dd4a393fbf6eb0"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     2a554a99d8cd58b66e987729968e3b501914756e
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Thu May 17 10:04:24 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Thu May 17 10:04:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=2a554a99

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha107-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b3b20b6..0607ef1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha104-r1.ebuild 12532 RMD160 ab9bf60b9a726d7419bf8766f64c04e6e4f42ae9 SHA1 aee93932768b5ef56021468db428aa41765e7228 SHA256 d3da4af6764745825b940cd97cd4e9024a8da3c460d86290d7edb01b3010eaae
+EBUILD portage-2.2.0_alpha107-r1.ebuild 12532 RMD160 0fc78e38f1364cb8f44f441a95ac6912fde24eb5 SHA1 10b211d9c055d9fbfc6945b1e2b85ec6a1ba259f SHA256 93ff6bc43b15c6b03170b8498ebbe9014373ffc801c465185195dba6945d56ae
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha104-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha107-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha104-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha107-r1.ebuild
index 04fe368..6a135aa 100644
--- a/sys-apps/portage/portage-2.2.0_alpha104-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha107-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="13505ce8523bd7b0f8879a12a7216589f05733d9"
+EGIT_COMMIT="a284b20d0e63ea585d491fcc2b8ec14badc2bad0"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     3e5ea2d5ee6bdf6bfa1b7f16b18fa2cc8b9fabdf
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat May 12 07:58:38 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat May 12 07:58:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=3e5ea2d5

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha104-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f0abf38..b3b20b6 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha103-r1.ebuild 12532 RMD160 b4625b439ddacbbbeb93f996b619a5e8fc3e9aa2 SHA1 b205e253ae72af9f763422bc87a6f618227e209f SHA256 9a856f9d72eaa5bac2f324f5e6aab177d5441795d02f47eb0bdf5cfb14469942
+EBUILD portage-2.2.0_alpha104-r1.ebuild 12532 RMD160 ab9bf60b9a726d7419bf8766f64c04e6e4f42ae9 SHA1 aee93932768b5ef56021468db428aa41765e7228 SHA256 d3da4af6764745825b940cd97cd4e9024a8da3c460d86290d7edb01b3010eaae
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha103-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha104-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha103-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha104-r1.ebuild
index e03e2ae..04fe368 100644
--- a/sys-apps/portage/portage-2.2.0_alpha103-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha104-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="e3d837d79df8136334699020a16b1c39baa255b7"
+EGIT_COMMIT="13505ce8523bd7b0f8879a12a7216589f05733d9"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     646f0b69934d19ef070572a6cbf53bcbf95207ef
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri May 11 20:39:43 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri May 11 20:39:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=646f0b69

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r2.ebuild => portage-2.2.0_alpha103-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8067efb..f0abf38 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha101-r2.ebuild 12532 RMD160 ae19eb8caa2bc6d05d44370eff06be2597bda953 SHA1 5a6d43af55447419a7273a752374cf8e34d4e8be SHA256 4d5b31fc75e0de056ac4ee930b0ba082cb09c10d5338512a8de9b9846d80fa9b
+EBUILD portage-2.2.0_alpha103-r1.ebuild 12532 RMD160 b4625b439ddacbbbeb93f996b619a5e8fc3e9aa2 SHA1 b205e253ae72af9f763422bc87a6f618227e209f SHA256 9a856f9d72eaa5bac2f324f5e6aab177d5441795d02f47eb0bdf5cfb14469942
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha101-r2.ebuild b/sys-apps/portage/portage-2.2.0_alpha103-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha101-r2.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha103-r1.ebuild
index a24fbe4..e03e2ae 100644
--- a/sys-apps/portage/portage-2.2.0_alpha101-r2.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha103-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="e4127765b5b4cc90d1c459c984860e2f5d4acc96"
+EGIT_COMMIT="e3d837d79df8136334699020a16b1c39baa255b7"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     f8b6ff059cf45a4211d202d0346c8554aa397a3e
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Tue May  1 14:18:12 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Tue May  1 14:18:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=f8b6ff05

Sync portage

---
 ...-r1.ebuild => portage-2.2.0_alpha101-r2.ebuild} |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-apps/portage/portage-2.2.0_alpha101-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha101-r2.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha101-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha101-r2.ebuild
index 972c385..a24fbe4 100644
--- a/sys-apps/portage/portage-2.2.0_alpha101-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha101-r2.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="16f70cad3248d7dc91aa8143eb62d256591c13a3"
+EGIT_COMMIT="e4127765b5b4cc90d1c459c984860e2f5d4acc96"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     02a6c650c56dd7bd683d0511342af673e80c586e
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Tue May  1 14:22:40 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Tue May  1 14:22:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=02a6c650

Fix Manifest

---
 sys-apps/portage/Manifest |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c8f521f..8067efb 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha101-r1.ebuild 12532 RMD160 3e40fcaaf4e2bd734c79012f4df62ce8a47fd0b0 SHA1 39d57546d5d2693186e704c1a058f86f73fdcf41 SHA256 e3dca9fc466536019c4054d6c5c66a9423543451d09ca11d15390c0ada1fac68
+EBUILD portage-2.2.0_alpha101-r2.ebuild 12532 RMD160 ae19eb8caa2bc6d05d44370eff06be2597bda953 SHA1 5a6d43af55447419a7273a752374cf8e34d4e8be SHA256 4d5b31fc75e0de056ac4ee930b0ba082cb09c10d5338512a8de9b9846d80fa9b
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

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

[Thomas Sachau]

commit:     21cc1ce95d15bf8df34fd940e4f57763dae7f9ef
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 24 21:27:43 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Tue Apr 24 21:27:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=21cc1ce9

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha101-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3fcd5c7..c8f521f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha100-r1.ebuild 12532 RMD160 173c2b31366242c22a219f444f18e054ce5f5165 SHA1 d7a82c4f2e42c6c65d0ff56d1b5f117171e09cf7 SHA256 8803d34c831ce1dfc9c5429d4191c1a6a838899f059ebf251a83e418f14b9380
+EBUILD portage-2.2.0_alpha101-r1.ebuild 12532 RMD160 3e40fcaaf4e2bd734c79012f4df62ce8a47fd0b0 SHA1 39d57546d5d2693186e704c1a058f86f73fdcf41 SHA256 e3dca9fc466536019c4054d6c5c66a9423543451d09ca11d15390c0ada1fac68
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha100-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha101-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha100-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha101-r1.ebuild
index 9a490f3..972c385 100644
--- a/sys-apps/portage/portage-2.2.0_alpha100-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha101-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="2aee99c23f5917605b86ff28b0c395916fe99ea1"
+EGIT_COMMIT="16f70cad3248d7dc91aa8143eb62d256591c13a3"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     fa8be6029c278fd00f1a3bcd7b5733beb334345e
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  6 11:50:50 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Apr  6 11:50:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=fa8be602

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha100-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 70d77ce..3fcd5c7 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha99-r1.ebuild 12532 RMD160 1640ddc3fb5a17c9ef12e0da20fc733f8b3c8731 SHA1 89a08ac77839dbdc0397d1ff576621fcaaaabad0 SHA256 c48d4a6feb0428b952c2188f4bbd1d95d5145ae2eb5e0a1277090d7a9dddd2ff
+EBUILD portage-2.2.0_alpha100-r1.ebuild 12532 RMD160 173c2b31366242c22a219f444f18e054ce5f5165 SHA1 d7a82c4f2e42c6c65d0ff56d1b5f117171e09cf7 SHA256 8803d34c831ce1dfc9c5429d4191c1a6a838899f059ebf251a83e418f14b9380
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha99-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha100-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha99-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha100-r1.ebuild
index 5cf80f1..9a490f3 100644
--- a/sys-apps/portage/portage-2.2.0_alpha99-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha100-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="3f0a9e438e41d40ad89bf752a5fd77c2fba3988a"
+EGIT_COMMIT="2aee99c23f5917605b86ff28b0c395916fe99ea1"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     3dda135df8074215bfb498acc095bc4f90f5de7e
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  4 12:43:00 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Wed Apr  4 12:43:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=3dda135d

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...8-r1.ebuild => portage-2.2.0_alpha99-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ece8b21..70d77ce 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha98-r1.ebuild 12532 RMD160 7c312f3735d6ff2d501aa173171799a722c65ff5 SHA1 9f17f6e07b2e739264fd5ede63b43b87dc4e78fd SHA256 2cc37150144a44074df0b55cf1952a44df76ae75ada9f38f9661b503c809ba64
+EBUILD portage-2.2.0_alpha99-r1.ebuild 12532 RMD160 1640ddc3fb5a17c9ef12e0da20fc733f8b3c8731 SHA1 89a08ac77839dbdc0397d1ff576621fcaaaabad0 SHA256 c48d4a6feb0428b952c2188f4bbd1d95d5145ae2eb5e0a1277090d7a9dddd2ff
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha98-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha99-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha98-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha99-r1.ebuild
index 3afb2be..5cf80f1 100644
--- a/sys-apps/portage/portage-2.2.0_alpha98-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha99-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="0f71144b7d76f7ac11a168d821b490808ecccf64"
+EGIT_COMMIT="3f0a9e438e41d40ad89bf752a5fd77c2fba3988a"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     268fe5637ef9b46c63bd02d75e09a6f49c4d7dfc
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  1 22:01:35 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Apr  1 22:01:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=268fe563

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...6-r1.ebuild => portage-2.2.0_alpha98-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e4e6102..ece8b21 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha96-r1.ebuild 12532 RMD160 4b2d0e7633f27b8638a7e1ce47248d193cb4d624 SHA1 7776411b822eb22cd319f65711e977ada07291d5 SHA256 7bf078f4443257404e3b1781732ae6d3bf14afd33c2e21241641327264aeeca7
+EBUILD portage-2.2.0_alpha98-r1.ebuild 12532 RMD160 7c312f3735d6ff2d501aa173171799a722c65ff5 SHA1 9f17f6e07b2e739264fd5ede63b43b87dc4e78fd SHA256 2cc37150144a44074df0b55cf1952a44df76ae75ada9f38f9661b503c809ba64
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha96-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha98-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha96-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha98-r1.ebuild
index 054a1bf..3afb2be 100644
--- a/sys-apps/portage/portage-2.2.0_alpha96-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha98-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="269ac6cf72f48bcf4f8042a3b4d0448e72a1d3c3"
+EGIT_COMMIT="0f71144b7d76f7ac11a168d821b490808ecccf64"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     3542a73be7e744b20fa40a9c3273d117fa173213
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 30 18:56:28 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 18:56:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=3542a73b

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...5-r1.ebuild => portage-2.2.0_alpha96-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 63cf8c1..e4e6102 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha95-r1.ebuild 12532 RMD160 370163264cc6bd671cb95100d649c0aec60ff848 SHA1 3d1b877b277bbcabf285aec64efe0b8ec6024000 SHA256 15df820a0adaa854c18c2148093ad0ca5e3e57c86abbae37fbaf2138efb302be
+EBUILD portage-2.2.0_alpha96-r1.ebuild 12532 RMD160 4b2d0e7633f27b8638a7e1ce47248d193cb4d624 SHA1 7776411b822eb22cd319f65711e977ada07291d5 SHA256 7bf078f4443257404e3b1781732ae6d3bf14afd33c2e21241641327264aeeca7
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha95-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha96-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha95-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha96-r1.ebuild
index 44712f0..054a1bf 100644
--- a/sys-apps/portage/portage-2.2.0_alpha95-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha96-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="85d5c94e4f9e3b938befa9b4a77dfafc31cb49ef"
+EGIT_COMMIT="269ac6cf72f48bcf4f8042a3b4d0448e72a1d3c3"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     0c5340ead9cb9e1bea26b0000590e98a1e69e2e6
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 25 17:39:36 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Mar 25 20:32:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=0c5340ea

Sync portage

---
 sys-apps/portage/Manifest                        |    2 +-
 sys-apps/portage/portage-2.2.0_alpha95-r1.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 859198a..63cf8c1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha95-r1.ebuild 12532 RMD160 03c9da024bfc4a85311e5e158a3d354a990a4180 SHA1 004a8840dd546b801b576b492f3e7361ac9a6384 SHA256 60cd7278dba279a2894432b0019f9dd00cae067d83479f8189cf9a78ea64211d
+EBUILD portage-2.2.0_alpha95-r1.ebuild 12532 RMD160 370163264cc6bd671cb95100d649c0aec60ff848 SHA1 3d1b877b277bbcabf285aec64efe0b8ec6024000 SHA256 15df820a0adaa854c18c2148093ad0ca5e3e57c86abbae37fbaf2138efb302be
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha95-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha95-r1.ebuild
index be46c11..44712f0 100644
--- a/sys-apps/portage/portage-2.2.0_alpha95-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha95-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="dbd8a00d8b9e58d67935c3f9c5b05c20cd5301bb"
+EGIT_COMMIT="85d5c94e4f9e3b938befa9b4a77dfafc31cb49ef"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     2075d862bacd08c4cca4aaa06714625b48537a4e
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 23 14:43:22 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 16:34:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=2075d862

Sync portage

---
 sys-apps/portage/Manifest                        |    2 +-
 sys-apps/portage/portage-2.2.0_alpha94-r1.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 370ea68..474e598 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha94-r1.ebuild 12532 RMD160 eebfefc76316b4f122ffc072f59ecc82e8ffc717 SHA1 5340e609cc4e5e000397a7586541288a1009e512 SHA256 8822fef3f22875ca570d9d612b9e043c569eb6ecdd2f09d2945f89270b2b82fb
+EBUILD portage-2.2.0_alpha94-r1.ebuild 12532 RMD160 082fc71dfe91a4bb345c7f542f33e55491173a59 SHA1 8494d013438aac51a6c9602a3c2f77e82eaae2c1 SHA256 b7fb913e6f67d10272c26256a2b5fa7a7b0f02e0dde85569a1751fa50e4e63a2
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha94-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha94-r1.ebuild
index a669a5c..3d1a95d 100644
--- a/sys-apps/portage/portage-2.2.0_alpha94-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha94-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="8c2261e66098f9070972ef42369b71cc01bb6dbb"
+EGIT_COMMIT="0262156749b0fb2050499ffbc888ac7913a63caf"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     e4e210a789f4faec6847e6487b448cc870fb67bc
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 24 10:52:19 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 16:34:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=e4e210a7

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...4-r1.ebuild => portage-2.2.0_alpha95-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 474e598..859198a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha94-r1.ebuild 12532 RMD160 082fc71dfe91a4bb345c7f542f33e55491173a59 SHA1 8494d013438aac51a6c9602a3c2f77e82eaae2c1 SHA256 b7fb913e6f67d10272c26256a2b5fa7a7b0f02e0dde85569a1751fa50e4e63a2
+EBUILD portage-2.2.0_alpha95-r1.ebuild 12532 RMD160 03c9da024bfc4a85311e5e158a3d354a990a4180 SHA1 004a8840dd546b801b576b492f3e7361ac9a6384 SHA256 60cd7278dba279a2894432b0019f9dd00cae067d83479f8189cf9a78ea64211d
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha94-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha95-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha94-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha95-r1.ebuild
index 3d1a95d..be46c11 100644
--- a/sys-apps/portage/portage-2.2.0_alpha94-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha95-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="0262156749b0fb2050499ffbc888ac7913a63caf"
+EGIT_COMMIT="dbd8a00d8b9e58d67935c3f9c5b05c20cd5301bb"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     6352aa39da5b10596d8ba6e25eb9b3485c7f381f
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 23 14:42:50 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 16:34:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=6352aa39

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...3-r1.ebuild => portage-2.2.0_alpha94-r1.ebuild} |    0
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8b50209..370ea68 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha93-r1.ebuild 12532 RMD160 eebfefc76316b4f122ffc072f59ecc82e8ffc717 SHA1 5340e609cc4e5e000397a7586541288a1009e512 SHA256 8822fef3f22875ca570d9d612b9e043c569eb6ecdd2f09d2945f89270b2b82fb
+EBUILD portage-2.2.0_alpha94-r1.ebuild 12532 RMD160 eebfefc76316b4f122ffc072f59ecc82e8ffc717 SHA1 5340e609cc4e5e000397a7586541288a1009e512 SHA256 8822fef3f22875ca570d9d612b9e043c569eb6ecdd2f09d2945f89270b2b82fb
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

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

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

[Thomas Sachau]

commit:     6295ac78cc3d2acac95a7b458219ec47e8ec7fb1
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 00:08:36 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 16:34:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=6295ac78

Sync portage

---
 sys-apps/portage/Manifest                        |    2 +-
 sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 09bcb40..58a2179 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha91-r1.ebuild 12532 RMD160 167379a6f913d5bd7af217811020c115e3b36b17 SHA1 871006a4cf908dd2f2def8ffe34546276456facd SHA256 be6eb3ecc8bc155a34abf57d55bb00c7df142423dadafcc71656d9eaa8c1739f
+EBUILD portage-2.2.0_alpha91-r1.ebuild 12532 RMD160 57405fb28cc3e39420399b852b80c1b214d0c83d SHA1 20ec03b243c0ed6efa8efbe998ddf83437cc1c12 SHA256 9da2bb2ace46162c37156d12d682d68c5bfd78901215b5d4d90074a0ec05ed62
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
index efdc29e..b3c9625 100644
--- a/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="eedca77080c03ef7f08dba388ce4ccac768e4bbc"
+EGIT_COMMIT="dcf5750e791f12502ecc6640523f07b9650cd5b2"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     13d9a8e89dd2de6cdacfef98f44fa22b818002cf
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 21 18:51:05 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 16:34:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=13d9a8e8

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...1-r1.ebuild => portage-2.2.0_alpha92-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 58a2179..821cbad 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha91-r1.ebuild 12532 RMD160 57405fb28cc3e39420399b852b80c1b214d0c83d SHA1 20ec03b243c0ed6efa8efbe998ddf83437cc1c12 SHA256 9da2bb2ace46162c37156d12d682d68c5bfd78901215b5d4d90074a0ec05ed62
+EBUILD portage-2.2.0_alpha92-r1.ebuild 12532 RMD160 eebfefc76316b4f122ffc072f59ecc82e8ffc717 SHA1 5340e609cc4e5e000397a7586541288a1009e512 SHA256 8822fef3f22875ca570d9d612b9e043c569eb6ecdd2f09d2945f89270b2b82fb
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha92-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha92-r1.ebuild
index b3c9625..a669a5c 100644
--- a/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha92-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="dcf5750e791f12502ecc6640523f07b9650cd5b2"
+EGIT_COMMIT="8c2261e66098f9070972ef42369b71cc01bb6dbb"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     fa1063afc17afc2be455474e7de923c84b4be957
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 21 18:51:54 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 16:34:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=fa1063af

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...2-r1.ebuild => portage-2.2.0_alpha93-r1.ebuild} |    0
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 821cbad..8b50209 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha92-r1.ebuild 12532 RMD160 eebfefc76316b4f122ffc072f59ecc82e8ffc717 SHA1 5340e609cc4e5e000397a7586541288a1009e512 SHA256 8822fef3f22875ca570d9d612b9e043c569eb6ecdd2f09d2945f89270b2b82fb
+EBUILD portage-2.2.0_alpha93-r1.ebuild 12532 RMD160 eebfefc76316b4f122ffc072f59ecc82e8ffc717 SHA1 5340e609cc4e5e000397a7586541288a1009e512 SHA256 8822fef3f22875ca570d9d612b9e043c569eb6ecdd2f09d2945f89270b2b82fb
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

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

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

[Thomas Sachau]

commit:     a9909dfbdbbbafb8b0524a95a0e3eaa50ae7a828
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 15:30:38 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 16:34:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=a9909dfb

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...0-r2.ebuild => portage-2.2.0_alpha91-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7cc3730..388a710 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha90-r2.ebuild 12684 RMD160 fe6914fc64877afdd0f0bd1738de10b547be8fdc SHA1 268ea4bac7ca6a254c6f23763045e07bd2563160 SHA256 3acff63541dc20f12949f3ffd35581396b55598410182f0b589f0b3d8b4b60e0
+EBUILD portage-2.2.0_alpha91-r1.ebuild 12684 RMD160 f7b430fc222f8c69a2e2fe434a3b0db36cb558e7 SHA1 faddf5109677c4578ff934e07b2ca93cb5640a90 SHA256 432a24e3642ede17e4f54f766e24c20161958d77125bee7943e3c94c192b5931
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild b/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
index ccb6cf6..9973f29 100644
--- a/sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="07b9015118fc15a01036ec43a10b412f64a50860"
+EGIT_COMMIT="eedca77080c03ef7f08dba388ce4ccac768e4bbc"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     81a1ed5f80dd38675c460865322589c9166e5af5
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 15:26:16 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 16:34:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=81a1ed5f

Sync portage

---
 sys-apps/portage/Manifest                        |    2 +-
 sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c0c530e..7cc3730 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha90-r2.ebuild 12684 RMD160 5e1d32139fcfbf806ab93d7c0b6945892bf6b127 SHA1 6e706b98e5f97d0c494116f0663f8584dae342af SHA256 ab16665e6afa9a59bef085af857587aa4b62a2eb68f6eda0c7c86a180aafb8a7
+EBUILD portage-2.2.0_alpha90-r2.ebuild 12684 RMD160 fe6914fc64877afdd0f0bd1738de10b547be8fdc SHA1 268ea4bac7ca6a254c6f23763045e07bd2563160 SHA256 3acff63541dc20f12949f3ffd35581396b55598410182f0b589f0b3d8b4b60e0
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild b/sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild
index 6a61785..ccb6cf6 100644
--- a/sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="6ef770a5381b085931fbc18e5022fb08c81a366f"
+EGIT_COMMIT="07b9015118fc15a01036ec43a10b412f64a50860"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     16d2ce07e04e5c0cb942b283a37e1eef1dcab2c5
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 16:47:41 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 16:34:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=16d2ce07

Sync portage ebuild

---
 sys-apps/portage/Manifest                        |    2 +-
 sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild |  257 ++++++++++------------
 2 files changed, 114 insertions(+), 145 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 388a710..532161e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha91-r1.ebuild 12684 RMD160 f7b430fc222f8c69a2e2fe434a3b0db36cb558e7 SHA1 faddf5109677c4578ff934e07b2ca93cb5640a90 SHA256 432a24e3642ede17e4f54f766e24c20161958d77125bee7943e3c94c192b5931
+EBUILD portage-2.2.0_alpha91-r1.ebuild 12430 RMD160 c297c6765a203fa341010e468f59ad904be7a463 SHA1 9fa8b94179a5ef543da817d2fed00ee0a8ccff98 SHA256 bf12e7cc2d658b0a12867669bf8c032fe5839aaef369ca75b973b3b1d47f1058
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
index 9973f29..04b90e2 100644
--- a/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha74.ebuild,v 1.1 2011/11/11 19:06:30 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha91.ebuild,v 1.1 2012/03/18 00:16:11 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
-EAPI=2
+EAPI=3
 inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
@@ -15,15 +15,15 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
+IUSE="build doc epydoc +ipc linguas_pl pypy1_8 python2 python3 selinux xattr"
 
 # Import of the io module in python-2.6 raises ImportError for the
 # thread module if threading is disabled.
 python_dep="python3? ( =dev-lang/python-3* )
-	!python2? ( !python3? (
-		build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) )
-		!build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) )
-	) )
+	!pypy1_8? ( !python2? ( !python3? (
+		|| ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] )
+	) ) )
+	pypy1_8? ( !python2? ( !python3? ( dev-python/pypy:1.8[bzip2] ) ) )
 	python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
 
 # The pysqlite blocker is for bug #282760.
@@ -31,8 +31,12 @@ DEPEND="${python_dep}
 	!build? ( >=sys-apps/sed-4.0.5 )
 	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
 	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
-	>=sys-apps/abi-wrapper-1.0-r5"
+	>=sys-apps/abi-wrapper-1.0-r6"
 # 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.
 RDEPEND="${python_dep}
 	!build? ( >=sys-apps/sed-4.0.5
 		>=app-shells/bash-3.2_p17
@@ -41,10 +45,11 @@ RDEPEND="${python_dep}
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
 	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
 	>=app-misc/pax-utils-0.1.17
+	xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
 	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
 	!<app-shells/bash-3.2_p17
 	!<app-admin/logrotate-3.8.0
-	>=sys-apps/abi-wrapper-1.0-r5"
+	>=sys-apps/abi-wrapper-1.0-r6"
 PDEPEND="
 	!build? (
 		>=net-misc/rsync-2.6.4
@@ -54,7 +59,12 @@ PDEPEND="
 # NOTE: FEATURES=install-sources requires debugedit and rsync
 
 compatible_python_is_selected() {
-	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
+	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
+}
+
+current_python_has_xattr() {
+	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
+	"${EPREFIX}/usr/bin/python" -c 'import xattr' 2>/dev/null
 }
 
 pkg_setup() {
@@ -66,7 +76,16 @@ pkg_setup() {
 		ewarn "Both python2 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then
+	if use pypy1_8 && use python3 ; then
+		ewarn "Both pypy1_8 and python3 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python3."
+	fi
+	if use pypy1_8 && use python2 ; then
+		ewarn "Both pypy1_8 and python2 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python2"
+	fi
+	if ! use pypy1_8 && ! use python2 && ! use python3 && \
+		! compatible_python_is_selected ; then
 		ewarn "Attempting to select a compatible default python interpreter"
 		local x success=0
 		for x in /usr/bin/python2.* ; do
@@ -90,6 +109,8 @@ pkg_setup() {
 		python_set_active_version 3
 	elif use python2; then
 		python_set_active_version 2
+	elif use pypy1_8; then
+		python_set_active_version 2.7-pypy-1.8
 	fi
 }
 
@@ -116,174 +137,122 @@ src_prepare() {
 			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 python3; then
 		einfo "Converting shebangs for python3..."
 		python_convert_shebangs -r 3 .
 	elif use python2; then
 		einfo "Converting shebangs for python2..."
 		python_convert_shebangs -r 2 .
+	elif use pypy1_8; then
+		einfo "Converting shebangs for pypy-c1.8..."
+		python_convert_shebangs -r 2.7-pypy-1.8 .
 	fi
-}
 
-src_compile() {
-	if use doc; then
-		cd "${S}"/doc
-		touch fragment/date
-		make xhtml xhtml-nochunks || die "failed to make docs"
-	fi
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		find . -type f -print0 | \
+		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
 
-	if use epydoc; then
-		einfo "Generating api docs"
-		mkdir "${WORKDIR}"/api
-		local my_modules epydoc_opts=""
-		my_modules="$(find "${S}/pym" -name "*.py" \
-			| sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
-			 -e 's:/:.:g' | sort)" || die "error listing modules"
-		# workaround for bug 282760
-		> "$S/pym/pysqlite2.py"
-		PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
-			epydoc -o "${WORKDIR}"/api \
-			-qqqqq --no-frames --show-imports $epydoc_opts \
-			--name "${PN}" --url "${HOMEPAGE}" \
-			${my_modules} || die "epydoc failed"
-		rm "$S/pym/pysqlite2.py"
-	fi
-}
+		einfo "Adjusting make.globals ..."
+		sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \
+			-e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \
+			-e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \
+			-i cnf/make.globals || die "sed failed"
 
-src_test() {
-	# make files executable, in case they were created by patch
-	find bin -type f | xargs chmod +x
-	./pym/portage/tests/runTests || die "test(s) failed"
-}
+		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
 
-src_install() {
-	local libdir=$(get_libdir)
-	local portage_base="/usr/${libdir}/portage"
-	local portage_share_config=/usr/share/portage/config
-
-	cd "${S}"/cnf
-	insinto /etc
-	doins etc-update.conf dispatch-conf.conf || die
-
-	insinto "$portage_share_config/sets"
-	doins "$S"/cnf/sets/*.conf || die
-	insinto "$portage_share_config"
-	doins "$S/cnf/make.globals" || die
+	cd "${S}/cnf" || die
 	if [ -f "make.conf.${ARCH}".diff ]; then
 		patch make.conf "make.conf.${ARCH}".diff || \
 			die "Failed to patch make.conf.example"
-		newins make.conf make.conf.example || die
 	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 ""
-		newins make.conf make.conf.example || die
 	fi
 
-	dosym ..${portage_share_config}/make.globals /etc/make.globals
-
-	insinto /etc/logrotate.d
-	doins "${S}"/cnf/logrotate.d/elog-save-summary || die
-
 	# BSD and OSX need a sed wrapper so that find/xargs work properly
 	if use userland_GNU; then
-		rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper"
+		rm -f "${S}"/bin/ebuild-helpers/sed || \
+			die "Failed to remove sed wrapper"
 	fi
+}
 
-	local x symlinks files
+src_compile() {
+	if use doc; then
+		emake docbook || die
+	fi
+
+	if use epydoc; then
+		einfo "Generating api docs"
+		emake epydoc || die
+	fi
+}
+
+src_test() {
+	# make files executable, in case they were created by patch
+	find bin -type f | xargs chmod +x
+	emake test || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		sysconfdir="${EPREFIX}/etc" \
+		prefix="${EPREFIX}/usr" \
+		libdir="${EPREFIX}/usr/$(get_libdir)" \
+		install || die
+
+	# Use dodoc for compression, since the Makefile doesn't do that.
+	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES}
 
-	cd "$S" || die "cd failed"
-	for x in $(find bin -type d) ; do
-		exeinto $portage_base/$x || die "exeinto failed"
-		cd "$S"/$x || die "cd failed"
-		files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
-		if [ -n "$files" ] ; then
-			doexe $files || die "doexe failed"
-		fi
-		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-		if [ -n "$symlinks" ] ; then
-			cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
-		fi
-	done
-
-	cd "$S" || die "cd failed"
-	for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; do
-		insinto $portage_base/$x || die "insinto failed"
-		cd "$S"/$x || die "cd failed"
-		# __pycache__ directories contain no py files
-		[[ "*.py" != $(echo *.py) ]] || continue
-		doins *.py || die "doins failed"
-		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-		if [ -n "$symlinks" ] ; then
-			cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
-		fi
-	done
-
-	# We install some minimal tests for use as a preinst sanity check.
-	# These tests must be able to run without a full source tree and
-	# without relying on a previous portage instance being installed.
-	cd "$S" || die "cd failed"
-	exeinto $portage_base/pym/portage/tests || die
-	doexe pym/portage/tests/runTests || die
-	insinto $portage_base/pym/portage/tests || die
-	doins pym/portage/tests/*.py || die
-	insinto $portage_base/pym/portage/tests/lint || die
-	doins pym/portage/tests/lint/*.py || die
-	doins pym/portage/tests/lint/__test__ || die
-
-	# Symlinks to directories cause up/downgrade issues and the use of these
-	# modules outside of portage is probably negligible.
-	for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do
-		[ ! -L "${x}" ] && continue
-		die "symlink to directory will cause upgrade/downgrade issues: '${x}'"
-	done
-
-	doman "${S}"/man/*.[0-9]
 	if use linguas_pl; then
 		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die
 		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die
 	fi
-
-	dodoc "${S}"/{NEWS,RELEASE-NOTES}
-	use doc && dohtml -r "${S}"/doc/*
-	use epydoc && dohtml -r "${WORKDIR}"/api
-
-	dodir /usr/bin
-	for x in ebuild egencache emerge portageq quickpkg repoman ; do
-		dosym ../${libdir}/portage/bin/${x} /usr/bin/${x}
-	done
-
-	dodir /usr/sbin
-	local my_syms="archive-conf
-		dispatch-conf
-		emaint
-		emerge-webrsync
-		env-update
-		etc-update
-		fixpackages
-		regenworld"
-	local x
-	for x in ${my_syms}; do
-		dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x}
-	done
-	dosym env-update /usr/sbin/update-env
-	dosym etc-update /usr/sbin/update-etc
-
-	dodir /etc/portage
-	keepdir /etc/portage
 }
 
 pkg_preinst() {
 	if [[ $ROOT == / ]] ; then
 		# Run some minimal tests as a sanity check.
-		local test_runner=$(find "$D" -name runTests)
+		local test_runner=$(find "$ED" -name runTests)
 		if [[ -n $test_runner && -x $test_runner ]] ; then
 			einfo "Running preinst sanity tests..."
 			"$test_runner" || die "preinst sanity tests failed"
 		fi
 	fi
 
+	if use xattr && ! current_python_has_xattr ; then
+		ewarn "For optimal performance in xattr handling, install"
+		ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
+		ewarn "enable USE=python3 for $CATEGORY/$PN."
+	fi
+
 	if ! use build && ! has_version dev-python/pycrypto && \
 		! has_version '>=dev-lang/python-2.6[ssl]' ; then
 		ewarn "If you are an ebuild developer and you plan to commit ebuilds"
@@ -292,8 +261,8 @@ pkg_preinst() {
 		ewarn "to enable RMD160 hash support."
 		ewarn "See bug #198398 for more information."
 	fi
-	if [ -f "${ROOT}/etc/make.globals" ]; then
-		rm "${ROOT}/etc/make.globals"
+	if [ -f "${EROOT}/etc/make.globals" ]; then
+		rm "${EROOT}/etc/make.globals"
 	fi
 
 	has_version "<${CATEGORY}/${PN}-2.2_alpha" \
@@ -320,14 +289,14 @@ pkg_postinst() {
 
 	if $WORLD_MIGRATION_UPGRADE ; then
 		einfo "moving set references from the worldfile into world_sets"
-		cd "${ROOT}/var/lib/portage/"
+		cd "${EROOT}/var/lib/portage/"
 		grep "^@" world >> world_sets
 		sed -i -e '/^@/d' world
 	fi
 
 	if $NEEDED_REBUILD_UPGRADE ; then
 		einfo "rebuilding NEEDED.ELF.2 files"
-		for cpv in "${ROOT}/var/db/pkg"/*/*; do
+		for cpv in "${EROOT}/var/db/pkg"/*/*; do
 			if [ -f "${cpv}/NEEDED" ]; then
 				rm -f "${cpv}/NEEDED.ELF.2"
 				while read line; do
@@ -365,7 +334,7 @@ pkg_postinst() {
 	elog "to MULTILIB_ABI or to add the default MULTILIB_ABI flags"
 
 
-	if [ $MINOR_UPGRADE = 0 ] ; then
+	if $MINOR_UPGRADE ; then
 		elog "If you're upgrading from a pre-2.2 version of portage you might"
 		elog "want to remerge world (emerge -e world) to take full advantage"
 		elog "of some of the new features in 2.2."

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

[Thomas Sachau]

commit:     565692127f9431ab385944f75cf9e3260a342db0
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 16:56:08 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 16:34:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=56569212

Add workaround for required ChangeLog

---
 sys-apps/portage/Manifest                        |    2 +-
 sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 532161e..09bcb40 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha91-r1.ebuild 12430 RMD160 c297c6765a203fa341010e468f59ad904be7a463 SHA1 9fa8b94179a5ef543da817d2fed00ee0a8ccff98 SHA256 bf12e7cc2d658b0a12867669bf8c032fe5839aaef369ca75b973b3b1d47f1058
+EBUILD portage-2.2.0_alpha91-r1.ebuild 12532 RMD160 167379a6f913d5bd7af217811020c115e3b36b17 SHA1 871006a4cf908dd2f2def8ffe34546276456facd SHA256 be6eb3ecc8bc155a34abf57d55bb00c7df142423dadafcc71656d9eaa8c1739f
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
index 04b90e2..efdc29e 100644
--- a/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
@@ -115,6 +115,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	touch ChangeLog #Makefile requires this file to exist
 	if [ -n "${PATCHVER}" ] ; then
 		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
 			rm "$S/bin/ebuild-helpers/portageq" \
@@ -235,6 +236,7 @@ src_install() {
 		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die
 		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die
 	fi
+	rm "${D}"usr/share/doc/${PF}/ChangeLog || die
 }
 
 pkg_preinst() {

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

[Thomas Sachau]

commit:     fb4004367f1319fd9e32d96e614041a264952feb
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 19:27:18 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 16:34:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=fb400436

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...0-r1.ebuild => portage-2.2.0_alpha90-r2.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 19a2746..218f72b 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha90-r1.ebuild 12684 RMD160 86aa73adc6a5e4dfbd60a5d6fb32d493329c38b2 SHA1 b56bb0791764a9cbe7a4d6917451886a60dc36a6 SHA256 8bca54c591e83e3294d9408a4092df4609e62a133d30172ed07554f1aaec209f
+EBUILD portage-2.2.0_alpha90-r2.ebuild 12684 RMD160 585cb94b615dd842c6302cdfdbc1682e98444941 SHA1 ad40352949eb76d930c781c9734d1864da55f48e SHA256 630aa9db601ee3b1df1065041ae4fdcbd9dd72b2a40fc95e9544a780dd3b6e31
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha90-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha90-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild
index 71c9140..212a899 100644
--- a/sys-apps/portage/portage-2.2.0_alpha90-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="b3875c1248e3a076326096be74a26536245aac36"
+EGIT_COMMIT="fe663a299b1c896493c3b8929b9e571af57f57fb"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     efee406caa83bb53d4ed1583ce2e960b893a052a
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 21:23:51 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 16:34:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=efee406c

Sync portage

---
 sys-apps/portage/Manifest                        |    2 +-
 sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 010ed29..c0c530e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha90-r2.ebuild 12684 RMD160 e092a68ced1e12dc1b3e0ff8587a0f0ad896caa3 SHA1 11e008d82c26b80bdc9ecf05d2cc9cda4ca5edb9 SHA256 567721b936fc68bf03695055c7cf3fb77380def4d2d3d35f4296790c37b3c10f
+EBUILD portage-2.2.0_alpha90-r2.ebuild 12684 RMD160 5e1d32139fcfbf806ab93d7c0b6945892bf6b127 SHA1 6e706b98e5f97d0c494116f0663f8584dae342af SHA256 ab16665e6afa9a59bef085af857587aa4b62a2eb68f6eda0c7c86a180aafb8a7
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild b/sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild
index a4b284a..6a61785 100644
--- a/sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="85913fb6054117bc0def49e2f52b14ecda9407c8"
+EGIT_COMMIT="6ef770a5381b085931fbc18e5022fb08c81a366f"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     5a3aeeb952269038325ba73dccaba447c16bcc73
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 19:51:51 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 16:34:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=5a3aeeb9

Sync portage

---
 sys-apps/portage/Manifest                        |    2 +-
 sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 218f72b..010ed29 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha90-r2.ebuild 12684 RMD160 585cb94b615dd842c6302cdfdbc1682e98444941 SHA1 ad40352949eb76d930c781c9734d1864da55f48e SHA256 630aa9db601ee3b1df1065041ae4fdcbd9dd72b2a40fc95e9544a780dd3b6e31
+EBUILD portage-2.2.0_alpha90-r2.ebuild 12684 RMD160 e092a68ced1e12dc1b3e0ff8587a0f0ad896caa3 SHA1 11e008d82c26b80bdc9ecf05d2cc9cda4ca5edb9 SHA256 567721b936fc68bf03695055c7cf3fb77380def4d2d3d35f4296790c37b3c10f
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild b/sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild
index 212a899..a4b284a 100644
--- a/sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha90-r2.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="fe663a299b1c896493c3b8929b9e571af57f57fb"
+EGIT_COMMIT="85913fb6054117bc0def49e2f52b14ecda9407c8"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     b49b7550fd2baf26c66d2b8e9c5575402a057f86
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  6 18:22:15 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Tue Mar  6 18:22:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=b49b7550

Sync portage

---
 ...9-r1.ebuild => portage-2.2.0_alpha90-r1.ebuild} |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-apps/portage/portage-2.2.0_alpha89-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha90-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha89-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha90-r1.ebuild
index 71bbdc1..71c9140 100644
--- a/sys-apps/portage/portage-2.2.0_alpha89-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha90-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="909addf96cca3fe5de77e96f47f7d8b9233bac57"
+EGIT_COMMIT="b3875c1248e3a076326096be74a26536245aac36"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     bce96c48368a73c2dd16e133a4bc3b774e0aff6a
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  6 18:22:34 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Tue Mar  6 18:22:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=bce96c48

Fix Manifest

---
 sys-apps/portage/Manifest |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index de233d3..19a2746 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha89-r1.ebuild 12684 RMD160 7e93887de8c6382b114d599f1b2e2d471a950cc5 SHA1 09332e6d1207bb9ccac5be062e4f738a66d0955a SHA256 a61eaccbcce25d7981e1ba10f13d2654fd8a332a8ff918942b73c5b0683cbffa
+EBUILD portage-2.2.0_alpha90-r1.ebuild 12684 RMD160 86aa73adc6a5e4dfbd60a5d6fb32d493329c38b2 SHA1 b56bb0791764a9cbe7a4d6917451886a60dc36a6 SHA256 8bca54c591e83e3294d9408a4092df4609e62a133d30172ed07554f1aaec209f
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

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

[Thomas Sachau]

commit:     95d0719e8393e06f7dd51e41767de426c9326700
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 16:46:15 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 16:46:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=95d0719e

Sync portage

---
 sys-apps/portage/Manifest                        |    2 +-
 sys-apps/portage/portage-2.2.0_alpha89-r1.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 61eaa44..de233d3 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha89-r1.ebuild 12684 RMD160 fe58ef44e4b9056a00fab7160f668bbd543dbc75 SHA1 dfa06c19b68d909e47ef4beadb2b61f39c35bfd5 SHA256 268855bb237e69db66f5e3665904b9b318a9d31af97d8ac426f581f0260b16ef
+EBUILD portage-2.2.0_alpha89-r1.ebuild 12684 RMD160 7e93887de8c6382b114d599f1b2e2d471a950cc5 SHA1 09332e6d1207bb9ccac5be062e4f738a66d0955a SHA256 a61eaccbcce25d7981e1ba10f13d2654fd8a332a8ff918942b73c5b0683cbffa
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha89-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha89-r1.ebuild
index a118865..71bbdc1 100644
--- a/sys-apps/portage/portage-2.2.0_alpha89-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha89-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="b58cc3bd0dd249d2c90c44589efce187b22fe82d"
+EGIT_COMMIT="909addf96cca3fe5de77e96f47f7d8b9233bac57"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     675237dc2be34070e544dc02b1f279b64913eef3
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 19:08:55 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 19:11:52 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=675237dc

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...7-r1.ebuild => portage-2.2.0_alpha89-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index cdc4217..61eaa44 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha87-r1.ebuild 12684 RMD160 fc5dbd124660b25f5d7191145012884db2fe5ce4 SHA1 4637dd2128cd7595f1df32e977515500b0dc6fb2 SHA256 8ac182a52dcc2903eeb0d85542d5657e9423f57ab80b5fbed12f9b0303c86b04
+EBUILD portage-2.2.0_alpha89-r1.ebuild 12684 RMD160 fe58ef44e4b9056a00fab7160f668bbd543dbc75 SHA1 dfa06c19b68d909e47ef4beadb2b61f39c35bfd5 SHA256 268855bb237e69db66f5e3665904b9b318a9d31af97d8ac426f581f0260b16ef
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha87-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha89-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha87-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha89-r1.ebuild
index ac041b8..a118865 100644
--- a/sys-apps/portage/portage-2.2.0_alpha87-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha89-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="b3b15821591c75268c0d4ade3fdee14795fdb059"
+EGIT_COMMIT="b58cc3bd0dd249d2c90c44589efce187b22fe82d"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     5fea6450efc49fc1270c68bf1ab3f96a91641703
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 16:14:55 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 16:14:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=5fea6450

Sync portage

---
 sys-apps/portage/Manifest                        |    2 +-
 sys-apps/portage/portage-2.2.0_alpha87-r1.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index dfc5c12..cdc4217 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha87-r1.ebuild 12684 RMD160 c69114cd466b281f0ac252929049f77719f947bd SHA1 631e297ca8402bc38b86195ca0014005e2f29680 SHA256 2c9d9ba662a9e770dc9ce44cfe8db569fe66c4cd189d2c07bbecf75faf527cff
+EBUILD portage-2.2.0_alpha87-r1.ebuild 12684 RMD160 fc5dbd124660b25f5d7191145012884db2fe5ce4 SHA1 4637dd2128cd7595f1df32e977515500b0dc6fb2 SHA256 8ac182a52dcc2903eeb0d85542d5657e9423f57ab80b5fbed12f9b0303c86b04
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha87-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha87-r1.ebuild
index e997c8c..ac041b8 100644
--- a/sys-apps/portage/portage-2.2.0_alpha87-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha87-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="5da82edbe654f78a6c7865ca87ac6d5b72c984ff"
+EGIT_COMMIT="b3b15821591c75268c0d4ade3fdee14795fdb059"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     f5295a27d97682ab5d2650ff7b62928cde3e2496
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 16:11:35 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 16:11:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=f5295a27

Sync portage

---
 sys-apps/portage/Manifest                        |    2 +-
 sys-apps/portage/portage-2.2.0_alpha87-r1.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8766ca8..dfc5c12 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha87-r1.ebuild 12684 RMD160 6626b546dbca7d8f6572d8eea645471d4c4ad769 SHA1 733b9f8dc64cead8e47598e8c7a955152290d44d SHA256 7993845f51272348dacf67c70bd118b895e1a53728b4dd1ed7115708912577d6
+EBUILD portage-2.2.0_alpha87-r1.ebuild 12684 RMD160 c69114cd466b281f0ac252929049f77719f947bd SHA1 631e297ca8402bc38b86195ca0014005e2f29680 SHA256 2c9d9ba662a9e770dc9ce44cfe8db569fe66c4cd189d2c07bbecf75faf527cff
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha87-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha87-r1.ebuild
index 46b8bf6..e997c8c 100644
--- a/sys-apps/portage/portage-2.2.0_alpha87-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha87-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="e44e308eb68a1a7b5574450006e87e976fb23b98"
+EGIT_COMMIT="5da82edbe654f78a6c7865ca87ac6d5b72c984ff"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     6a80fa14c21ebc797c6d0fd8a30ecfdaf6c749b2
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 15:53:42 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 15:53:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=6a80fa14

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...5-r1.ebuild => portage-2.2.0_alpha87-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e58783e..8766ca8 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha85-r1.ebuild 12684 RMD160 b4936ba8618c9f9ef23ce39f47272d8239ee0cc4 SHA1 3253ced3a94490e412ee3165004211b836bf7bfb SHA256 d24ffff8be2bd4426908d5b878ec8b81fea7417e42e6c7ba6dc3638173be928c
+EBUILD portage-2.2.0_alpha87-r1.ebuild 12684 RMD160 6626b546dbca7d8f6572d8eea645471d4c4ad769 SHA1 733b9f8dc64cead8e47598e8c7a955152290d44d SHA256 7993845f51272348dacf67c70bd118b895e1a53728b4dd1ed7115708912577d6
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha85-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha87-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha85-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha87-r1.ebuild
index c8f404a..46b8bf6 100644
--- a/sys-apps/portage/portage-2.2.0_alpha85-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha87-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="135714d23121ab2a39f54a9cc46e0445c7ee39e5"
+EGIT_COMMIT="e44e308eb68a1a7b5574450006e87e976fb23b98"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     4aafe3b93cf48e40f0eb0d1c4922f21a41204e93
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  6 19:47:27 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Feb  6 19:47:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=4aafe3b9

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...4-r1.ebuild => portage-2.2.0_alpha85-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 31d194c..e58783e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha84-r1.ebuild 12684 RMD160 223bccfa1c66b56a44d1373554af4326bbf4328a SHA1 4290e5675372aa2a097618c5c3a089add4aefdc5 SHA256 699429e4219b6d06cdca7dbc83fabee3cbaa55f63cf629983f619f51332bffc1
+EBUILD portage-2.2.0_alpha85-r1.ebuild 12684 RMD160 b4936ba8618c9f9ef23ce39f47272d8239ee0cc4 SHA1 3253ced3a94490e412ee3165004211b836bf7bfb SHA256 d24ffff8be2bd4426908d5b878ec8b81fea7417e42e6c7ba6dc3638173be928c
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha84-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha85-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha84-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha85-r1.ebuild
index f408f86..c8f404a 100644
--- a/sys-apps/portage/portage-2.2.0_alpha84-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha85-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="ea7b8a670b20397448d53bf971a66bcc9896714c"
+EGIT_COMMIT="135714d23121ab2a39f54a9cc46e0445c7ee39e5"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     5d2b4a6fd56fcf6f319b102cb829e27935009ffc
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 28 13:34:32 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 13:34:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=5d2b4a6f

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...2-r1.ebuild => portage-2.2.0_alpha84-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 03804bc..31d194c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha82-r1.ebuild 12684 RMD160 0423c74737989be09534014518f18eb97367d0e6 SHA1 1851bc9eee0e03178f3ee29710d87e59052cc768 SHA256 f95f6452edb21c736b38e931fb554b9dda79f1f65a74bdbac6c57abd11e2a20a
+EBUILD portage-2.2.0_alpha84-r1.ebuild 12684 RMD160 223bccfa1c66b56a44d1373554af4326bbf4328a SHA1 4290e5675372aa2a097618c5c3a089add4aefdc5 SHA256 699429e4219b6d06cdca7dbc83fabee3cbaa55f63cf629983f619f51332bffc1
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha82-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha84-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha82-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha84-r1.ebuild
index 627c257..f408f86 100644
--- a/sys-apps/portage/portage-2.2.0_alpha82-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha84-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="06259074cf1c75044715bad9229e2aa2a090fc82"
+EGIT_COMMIT="ea7b8a670b20397448d53bf971a66bcc9896714c"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     fbaa69e44440662f4335c9d7e7c95f98ea0caaf5
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 14:20:56 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 14:20:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=fbaa69e4

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...1-r1.ebuild => portage-2.2.0_alpha82-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 98c1608..03804bc 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha81-r1.ebuild 12684 RMD160 1407c42fe1371502facf2779570b1fe11cde0eb2 SHA1 358682146021562ead3e349a94b6f4fb93a9eaa3 SHA256 63478c65eeb4fbedfb531ef20c8e2e5a32b6cb33641dfcb5e0324fcaa02b9f1a
+EBUILD portage-2.2.0_alpha82-r1.ebuild 12684 RMD160 0423c74737989be09534014518f18eb97367d0e6 SHA1 1851bc9eee0e03178f3ee29710d87e59052cc768 SHA256 f95f6452edb21c736b38e931fb554b9dda79f1f65a74bdbac6c57abd11e2a20a
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha81-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha82-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha81-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha82-r1.ebuild
index 596231d..627c257 100644
--- a/sys-apps/portage/portage-2.2.0_alpha81-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha82-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="93e622fba8e61722fe5fbdab0f9c29eef7c73e6f"
+EGIT_COMMIT="06259074cf1c75044715bad9229e2aa2a090fc82"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     00c2908d85da5d0c0cf119638b6b9c2aeeddd8b7
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 16:50:47 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 16:50:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=00c2908d

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...9-r1.ebuild => portage-2.2.0_alpha81-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f47459f..98c1608 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha79-r1.ebuild 12684 RMD160 e11af1347f2111643abee4829a57f1274f4e9404 SHA1 f1279c60f858127fd9a6ec510e56b1b81d8e0f88 SHA256 464de393172b8a8d9472a627e1a555a1144a6142627867df8cb53c6bd974d56e
+EBUILD portage-2.2.0_alpha81-r1.ebuild 12684 RMD160 1407c42fe1371502facf2779570b1fe11cde0eb2 SHA1 358682146021562ead3e349a94b6f4fb93a9eaa3 SHA256 63478c65eeb4fbedfb531ef20c8e2e5a32b6cb33641dfcb5e0324fcaa02b9f1a
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha79-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha81-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha79-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha81-r1.ebuild
index cb648ba..596231d 100644
--- a/sys-apps/portage/portage-2.2.0_alpha79-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha81-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="4f06140c585394bc9850eb424af135447e66731d"
+EGIT_COMMIT="93e622fba8e61722fe5fbdab0f9c29eef7c73e6f"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     1823531e93450022d6a43a4c981be2238f463959
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  7 21:32:42 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Wed Dec  7 21:32:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=1823531e

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...8-r1.ebuild => portage-2.2.0_alpha79-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index aac264b..f47459f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha78-r1.ebuild 12684 RMD160 86c34d2ac69decc873cf2a79985cd21faa2b0e67 SHA1 e451fbe856a13749cd39d43fb6ba365abdfbeb60 SHA256 d1f092716a8944de64f489809824112efc4d8dc0d9ba157eca6093017c7236d9
+EBUILD portage-2.2.0_alpha79-r1.ebuild 12684 RMD160 e11af1347f2111643abee4829a57f1274f4e9404 SHA1 f1279c60f858127fd9a6ec510e56b1b81d8e0f88 SHA256 464de393172b8a8d9472a627e1a555a1144a6142627867df8cb53c6bd974d56e
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha78-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha79-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha78-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha79-r1.ebuild
index eff06a1..cb648ba 100644
--- a/sys-apps/portage/portage-2.2.0_alpha78-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha79-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="82eef59c7b5770ae8a147e55a2f5d282ea6b0c26"
+EGIT_COMMIT="4f06140c585394bc9850eb424af135447e66731d"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     ef376550681eb0cbd708948c5f544bd51da795f8
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 14:04:18 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 14:04:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=ef376550

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...6-r1.ebuild => portage-2.2.0_alpha78-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 2c2c38f..aac264b 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha76-r1.ebuild 12684 RMD160 c17cba6e56a8d6a891a5482c3322053103c49026 SHA1 1e13f64fd4731aa33446e13fc37f740214612d12 SHA256 c1e70e40d73caf635cd76512ae928adc21e7d156ca0e68f801086ccd630edea0
+EBUILD portage-2.2.0_alpha78-r1.ebuild 12684 RMD160 86c34d2ac69decc873cf2a79985cd21faa2b0e67 SHA1 e451fbe856a13749cd39d43fb6ba365abdfbeb60 SHA256 d1f092716a8944de64f489809824112efc4d8dc0d9ba157eca6093017c7236d9
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha76-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha78-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha76-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha78-r1.ebuild
index 96a617a..eff06a1 100644
--- a/sys-apps/portage/portage-2.2.0_alpha76-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha78-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="f4a14182fed2fc42054755296ee434c81e8baca6"
+EGIT_COMMIT="82eef59c7b5770ae8a147e55a2f5d282ea6b0c26"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     91fe50d6eb539021ca7819966c8719c9880503d2
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 14:26:23 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 14:26:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=91fe50d6

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...5-r1.ebuild => portage-2.2.0_alpha76-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 6d4599d..2c2c38f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha75-r1.ebuild 12684 RMD160 ab28c83bb9d669659857f9dd2afaa65bab9639ad SHA1 9f06dfcff445cbc20458bcb6f2d80a5727294ddb SHA256 9b91d4f8b707489762df78aa172e96fbb17b0e8cd65fec9a40964a4aa09be93d
+EBUILD portage-2.2.0_alpha76-r1.ebuild 12684 RMD160 c17cba6e56a8d6a891a5482c3322053103c49026 SHA1 1e13f64fd4731aa33446e13fc37f740214612d12 SHA256 c1e70e40d73caf635cd76512ae928adc21e7d156ca0e68f801086ccd630edea0
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha75-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha76-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha75-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha76-r1.ebuild
index 3cff18d..96a617a 100644
--- a/sys-apps/portage/portage-2.2.0_alpha75-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha76-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="73e829f92b1d85874fa62ee39d0aeee092521d07"
+EGIT_COMMIT="f4a14182fed2fc42054755296ee434c81e8baca6"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     28f2dce5dcaa39cbb6773c18d8e05e5eb3f2f977
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 18 23:28:21 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 23:28:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=28f2dce5

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...4-r2.ebuild => portage-2.2.0_alpha75-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 01cd246..6d4599d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha74-r2.ebuild 12684 RMD160 bdab8be3514ccf8616f7a978a6a95be4ff43fbe3 SHA1 a7a44350bd26978de5482950ffc0901840b9ac08 SHA256 82bb5dfd6ac3641cf7844041b886cafe707580cce9491d10ec362c2b7a1943d1
+EBUILD portage-2.2.0_alpha75-r1.ebuild 12684 RMD160 ab28c83bb9d669659857f9dd2afaa65bab9639ad SHA1 9f06dfcff445cbc20458bcb6f2d80a5727294ddb SHA256 9b91d4f8b707489762df78aa172e96fbb17b0e8cd65fec9a40964a4aa09be93d
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild b/sys-apps/portage/portage-2.2.0_alpha75-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha75-r1.ebuild
index c6c356d..3cff18d 100644
--- a/sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha75-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="8e91d97b307d275a0a90ecfccc7ad68894a1a54f"
+EGIT_COMMIT="73e829f92b1d85874fa62ee39d0aeee092521d07"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     a59d157474dfdd6a4aa9a250e97f7ba90cfb7b2b
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 21:08:39 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 21:08:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=a59d1574

Sync portage

---
 sys-apps/portage/Manifest                        |    2 +-
 sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c72c1ee..e3c362e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha74-r2.ebuild 12684 RMD160 23b0678074afab4c4739d02df8296950547391ee SHA1 7590eec1183d74006e14d2727ee3e06f7c6a9711 SHA256 a1c2db7d0f30c7a5127a3488be22417d29f5232cd3034d3adfdd617425c0b786
+EBUILD portage-2.2.0_alpha74-r2.ebuild 12684 RMD160 f72866edb3c308adc799b35796803c3819f3ac56 SHA1 85524908befab4e3e014f0249319bbd760a5b2e1 SHA256 e45b46aed72aa9d178514dcac5519c440f1560aacd936ee2ea2a4ee5adf29a2b
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild b/sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild
index d1351dc..e832262 100644
--- a/sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="48827a5ed95b2c02af32690ec3c9d193c0a76d53"
+EGIT_COMMIT="9d5c593045f8a18bc3f4dcfc05895165bf15394f"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     8d9181d68669920829c1da3cd7e0e275dd6b5e85
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 21:06:00 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 21:06:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=8d9181d6

Sync portage

---
 sys-apps/portage/Manifest                        |    2 +-
 sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 6bd3961..c72c1ee 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha74-r2.ebuild 12684 RMD160 a3c1b6df454ada969856b901c5b1d3e63e3be61f SHA1 4ede0d87578877e4e7ad576f16d9fb97355ec56e SHA256 d2e60e405d741eb81c9673303becf620e15ede252ffe69ba44effbb05c515317
+EBUILD portage-2.2.0_alpha74-r2.ebuild 12684 RMD160 23b0678074afab4c4739d02df8296950547391ee SHA1 7590eec1183d74006e14d2727ee3e06f7c6a9711 SHA256 a1c2db7d0f30c7a5127a3488be22417d29f5232cd3034d3adfdd617425c0b786
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild b/sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild
index 147df2e..d1351dc 100644
--- a/sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="12cc1427abc4fc14f5a3087e447fa641f34b1a55"
+EGIT_COMMIT="48827a5ed95b2c02af32690ec3c9d193c0a76d53"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     0566f8c05ea77a717f5a74222b7bfb48dd02e96d
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 21:12:00 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 21:12:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=0566f8c0

Sync portage

---
 sys-apps/portage/Manifest                        |    2 +-
 sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e3c362e..01cd246 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha74-r2.ebuild 12684 RMD160 f72866edb3c308adc799b35796803c3819f3ac56 SHA1 85524908befab4e3e014f0249319bbd760a5b2e1 SHA256 e45b46aed72aa9d178514dcac5519c440f1560aacd936ee2ea2a4ee5adf29a2b
+EBUILD portage-2.2.0_alpha74-r2.ebuild 12684 RMD160 bdab8be3514ccf8616f7a978a6a95be4ff43fbe3 SHA1 a7a44350bd26978de5482950ffc0901840b9ac08 SHA256 82bb5dfd6ac3641cf7844041b886cafe707580cce9491d10ec362c2b7a1943d1
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild b/sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild
index e832262..c6c356d 100644
--- a/sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="9d5c593045f8a18bc3f4dcfc05895165bf15394f"
+EGIT_COMMIT="8e91d97b307d275a0a90ecfccc7ad68894a1a54f"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     9b575e7bae02ee392b5b89da964451ee414bdcec
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 20:59:42 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 20:59:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=9b575e7b

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...4-r1.ebuild => portage-2.2.0_alpha74-r2.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c46cf7d..6bd3961 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha74-r1.ebuild 12644 RMD160 654f745ceb5e67a2cb58dfbd92b5998adf665509 SHA1 5495ebe574cb203d019b39f8a3ba4853b261793c SHA256 a387b903f4a34315121c418ca63bc52c3aec093cbc41fc2801b725ac27a99504
+EBUILD portage-2.2.0_alpha74-r2.ebuild 12684 RMD160 a3c1b6df454ada969856b901c5b1d3e63e3be61f SHA1 4ede0d87578877e4e7ad576f16d9fb97355ec56e SHA256 d2e60e405d741eb81c9673303becf620e15ede252ffe69ba44effbb05c515317
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha74-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha74-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild
index 1bd6f6c..147df2e 100644
--- a/sys-apps/portage/portage-2.2.0_alpha74-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha74-r2.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT=""
+EGIT_COMMIT="12cc1427abc4fc14f5a3087e447fa641f34b1a55"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     24e48d981d04764ee215683d2cb06c907418a0f6
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 19:57:12 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 19:57:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=24e48d98

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...1-r1.ebuild => portage-2.2.0_alpha72-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f6b9b38..bd43a53 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha71-r1.ebuild 12546 RMD160 22d1aaeea214efa92ff0f55d25d386085d4faad4 SHA1 f467e85369a1a20b5116f607d07cb7828b6e4b23 SHA256 f04da34463732cfd5e8c78017653f541642941346cb4e4e849ca25096326ad30
+EBUILD portage-2.2.0_alpha72-r1.ebuild 12546 RMD160 63484b8a24edabcffc4d2fd5984ff013ed4c82df SHA1 0a302da91136cb59ed70029efe70e13c68bb8884 SHA256 6a784da3ec0b620679da8fe7e1ffabd1146dc4de88b1b3b08c8a0515221242c6
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha71-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha72-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha71-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha72-r1.ebuild
index df2632b..8eadf85 100644
--- a/sys-apps/portage/portage-2.2.0_alpha71-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha72-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="830a6dd2b58e88c7d0c782900067918c08270bc7"
+EGIT_COMMIT="0fe2340f8bb892447768b64dfe2970a7be760107"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     0643d0b8ac4630cd9fda08885e04af1843cac39e
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 24 18:57:16 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Oct 24 18:57:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=0643d0b8

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...0-r1.ebuild => portage-2.2.0_alpha71-r1.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 6cef843..f6b9b38 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha70-r1.ebuild 12546 RMD160 147411d24bb667be2f4874f0697d4076e5d28a15 SHA1 07947059ff905687abc8a9af53ccd567444ea586 SHA256 0e5161db67fa707b528c43991fe11f0726797bc56d39cae62667a3417bc6e501
+EBUILD portage-2.2.0_alpha71-r1.ebuild 12546 RMD160 22d1aaeea214efa92ff0f55d25d386085d4faad4 SHA1 f467e85369a1a20b5116f607d07cb7828b6e4b23 SHA256 f04da34463732cfd5e8c78017653f541642941346cb4e4e849ca25096326ad30
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha70-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha71-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha70-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha71-r1.ebuild
index 67eea0e..df2632b 100644
--- a/sys-apps/portage/portage-2.2.0_alpha70-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha71-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="0d7597d0b8634e66851ed8a521109bb8ceb7bb55"
+EGIT_COMMIT="830a6dd2b58e88c7d0c782900067918c08270bc7"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"

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

[Thomas Sachau]

commit:     b67aa6d8702a1f7974daed9927e4d8ddd047d5c2
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 23 11:42:58 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Oct 23 11:42:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=b67aa6d8

Sync portage

---
 sys-apps/portage/Manifest                        |    2 +-
 sys-apps/portage/portage-2.2.0_alpha70-r1.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index dba11c1..6cef843 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha70-r1.ebuild 12546 RMD160 fce52c84d1ccc9517a300bc6754e0cf2f7271235 SHA1 1d2f95c970b0db4357c30c6d499b44a267530dab SHA256 b6a8ddf7ad2c3b14d97cb70330e9a0be87c781f8b8e5f786da800d8cf408908f
+EBUILD portage-2.2.0_alpha70-r1.ebuild 12546 RMD160 147411d24bb667be2f4874f0697d4076e5d28a15 SHA1 07947059ff905687abc8a9af53ccd567444ea586 SHA256 0e5161db67fa707b528c43991fe11f0726797bc56d39cae62667a3417bc6e501
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha70-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha70-r1.ebuild
index 96665b8..67eea0e 100644
--- a/sys-apps/portage/portage-2.2.0_alpha70-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha70-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="d03a7327d9c6951c2a36461fefe2dde71709d5cf"
+EGIT_COMMIT="0d7597d0b8634e66851ed8a521109bb8ceb7bb55"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"