[gentoo-commits] proj/musl:master commit in: sys-apps/portage/, sys-apps/portage/files/

[gentoo-commits] proj/musl:master commit in: sys-apps/portage/, sys-apps/portage/files/

[Anthony G. Basile]

commit:     a866c0d82835fc956b26f75437ac8175610afad7
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 01:50:16 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 01:50:16 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=a866c0d8

sys-apps/portage: fix check_locale on musl, bug #571444

Package-Manager: portage-2.2.26
RepoMan-Options: --force

 sys-apps/portage/Manifest                          |   5 +
 sys-apps/portage/files/README.RESCUE               |   2 +
 .../files/portage-2.2.26-fix-check_locale.patch    |  29 ++
 sys-apps/portage/metadata.xml                      |  20 ++
 sys-apps/portage/portage-2.2.26-r99.ebuild         | 368 +++++++++++++++++++++
 5 files changed, 424 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
new file mode 100644
index 0000000..14976fe
--- /dev/null
+++ b/sys-apps/portage/Manifest
@@ -0,0 +1,5 @@
+AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
+AUX portage-2.2.26-fix-check_locale.patch 810 SHA256 d055958fe52fbfb4d628b11c3a52226f0ce07895d951efbf285d55b0bac455a1 SHA512 33b4d497788de9146abe9a99e4c788c94e8e5e4e615ae7bf18ed415407d4bf0398fb972d938a78f3fff1edfee425f2d672e9868e58efb15cfcccab65cfb5152b WHIRLPOOL 3477eb51320b13de03038e5cf1987f00cce03d65467148ffc23728540de09fde94128cc25986fc40688206059d2ca84734ba4a7379583f68511a2c5f0f0aff23
+DIST portage-2.2.26.tar.bz2 977277 SHA256 7f57aa704c58ea47f031f177203dc7b335e01e7ec1e809437ea9e46e3f9263e5 SHA512 fd1a5e5d028d52ba82bbeb7f87bf331d0c1d8c7f5a3bd450c668dd742e99185b6d2b21944f5d7788fe941c99736744b08157ca30145f0964ea60a7c2c435d601 WHIRLPOOL 0469f4c5609146c57eae4baeb8488b95c04f336a5511460ee44d15746339fd43a7c2d61b58528845d77a6a0b21e46c2afad19a9f05e94ac8dc6180032d71f298
+EBUILD portage-2.2.26-r99.ebuild 11703 SHA256 32a5b9852ff9620a1b1191baa2b54e0fb6b6abc8bad8944f0a9d6757e249a058 SHA512 b83b69af04617c925c4be8cd9d0a18c7d62c3b9d5b127d4451245bc8f6bcf24c6e3d16228c5e198f3969fc7049178d0f9a9c0cf669c09a4e2c61d4d2d5fc2e14 WHIRLPOOL f598ce0601676f3f0e7b84045e909b1158a33b3da58f3b4e7d3d19febb79f0794aab1ed6804b956b695d48d62462b65c9c18b8602ecd1380d522dfb234d357e7
+MISC metadata.xml 1002 SHA256 fc87597788bb707c98546201df63e6c4ecbbd22f74b0258d447336b80bd06dcc SHA512 db96daddb29c78919b6dccd88549d5f3b567ba834314663a2ac6c571a2e143ba3dd409e81f378d4b0f40c49d8eb42038b521579a88493a0054e94226d233ebe1 WHIRLPOOL 9d872e9fe5e3384d7270f0dd7b648c23e5858d620e9d530ee895570b145c351c265d0852f32a22c73f625ae2cd7de1641ebdca5ea2c293c5c37e5976f62eaa1b

diff --git a/sys-apps/portage/files/README.RESCUE b/sys-apps/portage/files/README.RESCUE
new file mode 100644
index 0000000..70c494e
--- /dev/null
+++ b/sys-apps/portage/files/README.RESCUE
@@ -0,0 +1,2 @@
+Please see http://www.gentoo.org/proj/en/portage/doc/manually-fixing-portage.xml
+for a recovery guide for a broken portage installation.

diff --git a/sys-apps/portage/files/portage-2.2.26-fix-check_locale.patch b/sys-apps/portage/files/portage-2.2.26-fix-check_locale.patch
new file mode 100644
index 0000000..7d137d6
--- /dev/null
+++ b/sys-apps/portage/files/portage-2.2.26-fix-check_locale.patch
@@ -0,0 +1,29 @@
+diff -Naur portage-2.2.26.orig/pym/portage/util/locale.py portage-2.2.26/pym/portage/util/locale.py
+--- portage-2.2.26.orig/pym/portage/util/locale.py	2015-11-24 16:38:22.000000000 -0500
++++ portage-2.2.26/pym/portage/util/locale.py	2016-01-20 20:08:08.731746146 -0500
+@@ -13,10 +13,10 @@
+ import os
+ import textwrap
+ import traceback
++from ctypes import CDLL
+ 
+ import portage
+ from portage.util import writemsg_level
+-from portage.util._ctypes import find_library, LoadLibrary
+ 
+ 
+ locale_categories = (
+@@ -35,12 +35,7 @@
+ 	The inner locale check function.
+ 	"""
+ 
+-	libc_fn = find_library("c")
+-	if libc_fn is None:
+-		return None
+-	libc = LoadLibrary(libc_fn)
+-	if libc is None:
+-		return None
++	libc = CDLL("libc.so.6")
+ 
+ 	lc = list(range(ord('a'), ord('z')+1))
+ 	uc = list(range(ord('A'), ord('Z')+1))

diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
new file mode 100644
index 0000000..68283d8
--- /dev/null
+++ b/sys-apps/portage/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <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>
+    <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="pypy2_0">Use pypy-c2.0 as Python interpreter.</flag>
+    <flag name="python2">Use python2 as Python interpreter.</flag>
+    <flag name="python3">Use python3 as Python interpreter.</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.2.26-r99.ebuild b/sys-apps/portage/portage-2.2.26-r99.ebuild
new file mode 100644
index 0000000..3aa681a
--- /dev/null
+++ b/sys-apps/portage/portage-2.2.26-r99.ebuild
@@ -0,0 +1,368 @@
+# Copyright 1999-2016 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
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1 eutils multilib
+
+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 ~mips ppc x86"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+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_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"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_setup() {
+	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	epatch "${FILESDIR}"/${P}-fix-check_locale.patch
+
+	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
+
+	# 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 "Please report any bugs you may encounter."
+	einfo ""
+}

[gentoo-commits] proj/musl:master commit in: sys-apps/portage/, sys-apps/portage/files/

[Anthony G. Basile]

commit:     0674131adf745882b40cb02ba39747382541c4ab
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 20 19:37:02 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 19:37:02 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=0674131a

sys-apps/portage: backport C module fix

Package-Manager: portage-2.2.28

 sys-apps/portage/Manifest                          |   6 +-
 ...-util-locale.py-fix-decoding-for-python2-.patch |  40 ++++++
 ...d-stub-for-building-custom-modules-in-C-C.patch |  59 ++++++++
 ...-util-locale.py-add-a-C-module-to-help-ch.patch | 151 +++++++++++++++++++++
 ....2.26-r99.ebuild => portage-2.2.28-r999.ebuild} |   8 +-
 5 files changed, 259 insertions(+), 5 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index aa4ce2d..51130a3 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,7 +1,9 @@
+AUX 0001-pym-portage-util-locale.py-fix-decoding-for-python2-.patch 1374 SHA256 1c40030d4ef7c2a56ea81f00281a56432bb7918d294abcda7b9eab7eb05fd1c9 SHA512 f434323783fa4db0bc096f35da93a33311f00fd8b315f95cc5f3d78365ea0d70376609c27f1d64319bd49f83db6d0cc7d88d035c758f1f0de62f1ef9243c0a30 WHIRLPOOL cdecf4a184fea71c0ee93aa5598cc513e676203d8a226da8c90524471d79f2c22b474c2a2edba0ae3495257792dfc7bd3e78c9a9aed3e9e85bb4906161451891
+AUX 0002-setup.py-add-stub-for-building-custom-modules-in-C-C.patch 1867 SHA256 285fd48357a1996a92860a03059656729d5faa05e4d150865abaaf79f93d5acd SHA512 e073c849650822ea01c804605a4c5743957f9c8c45076dcd9a983951f6607716c1891c0a564268af3c1c0680361d0c4605ed30e50c4f0a23909a1f155925622a WHIRLPOOL f0e6bdaa992d2d374a65e96c9a148b6460a42bb1d939f1b60bbb11368553c750318befae3157e236302580f8b682887ebdc08ec40e62e8f1d81cda925cd48e97
+AUX 0003-pym-portage-util-locale.py-add-a-C-module-to-help-ch.patch 4075 SHA256 42e7c7c9eff8ee423f9e23a7f3d9aa2d629b2755cd053c21d53796bfb9f3655f SHA512 090b8905db5af236644e57b3050e80dab0d58ef63abd2c94746a63204de155379ab63ca9536e53e30be6d6e7bf529047675e17ce266c0256f5f1f828222e4a32 WHIRLPOOL 0b9baa422b64072eb95454b8e833fa040a4ea47d609f42ac7da744f58d3ef20d96e06ce4c488b26593c311a0d9451cc684849d04093328abf34d174c90023a7d
 AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
 AUX portage-2.2.26-fix-check_locale.patch 810 SHA256 d055958fe52fbfb4d628b11c3a52226f0ce07895d951efbf285d55b0bac455a1 SHA512 33b4d497788de9146abe9a99e4c788c94e8e5e4e615ae7bf18ed415407d4bf0398fb972d938a78f3fff1edfee425f2d672e9868e58efb15cfcccab65cfb5152b WHIRLPOOL 3477eb51320b13de03038e5cf1987f00cce03d65467148ffc23728540de09fde94128cc25986fc40688206059d2ca84734ba4a7379583f68511a2c5f0f0aff23
-DIST portage-2.2.26.tar.bz2 977277 SHA256 7f57aa704c58ea47f031f177203dc7b335e01e7ec1e809437ea9e46e3f9263e5 SHA512 fd1a5e5d028d52ba82bbeb7f87bf331d0c1d8c7f5a3bd450c668dd742e99185b6d2b21944f5d7788fe941c99736744b08157ca30145f0964ea60a7c2c435d601 WHIRLPOOL 0469f4c5609146c57eae4baeb8488b95c04f336a5511460ee44d15746339fd43a7c2d61b58528845d77a6a0b21e46c2afad19a9f05e94ac8dc6180032d71f298
 DIST portage-2.2.28.tar.bz2 969138 SHA256 da8148a1a9275c87f535679e41b1bb3a1380ba0f903b80510017517e4c5229d0 SHA512 d21bf7e7dcc0a779a13df6a959e5d4291492fce2a5525b67e9a4705888021f9c08b8d78cd32b2eb930ac5428c40383e4e46da5a7b1ed5c9c9c42314c0f1c6a0b WHIRLPOOL 1b9584b0243b46c70d0778aad57df2d3ea99e19f243280e542c29e6fed0634b72de6b203a3c296c2977d1a6e5e5250b910574176c692d2c7c27c0938528bb43d
-EBUILD portage-2.2.26-r99.ebuild 11703 SHA256 32a5b9852ff9620a1b1191baa2b54e0fb6b6abc8bad8944f0a9d6757e249a058 SHA512 b83b69af04617c925c4be8cd9d0a18c7d62c3b9d5b127d4451245bc8f6bcf24c6e3d16228c5e198f3969fc7049178d0f9a9c0cf669c09a4e2c61d4d2d5fc2e14 WHIRLPOOL f598ce0601676f3f0e7b84045e909b1158a33b3da58f3b4e7d3d19febb79f0794aab1ed6804b956b695d48d62462b65c9c18b8602ecd1380d522dfb234d357e7
 EBUILD portage-2.2.28-r99.ebuild 11704 SHA256 b814d8beda3bd2364b13153ef5663d40497684ace1cdc2209bd03a61a5fe8fb7 SHA512 78442e2d479acb0b59cade22060c5bef2740cf3c5ae451b25ca629f547824f4bb04a768e5400623d1508f72318bbc0abcf31b8286886241de6cbe640f0f95eb1 WHIRLPOOL 7f220a0e33e825b123f364dff0d43d57f1823bb01e454f66fea71825ec206d4fb8ce42478e033e98fb6c6ae1f598af57008b64effe6274a53e5655e39834095f
+EBUILD portage-2.2.28-r999.ebuild 11908 SHA256 65003a03410bcfcc49b56746293dcdf8bbcabb6c85e6f4229fe2caf97a27dbe9 SHA512 4e33ae8ee35ecf9bf609e8b603de050903e4b4a1c79fc6eb65cff524b731dd044314ce72a663296cd511451e333351de1ac6374569d85852fd5ab6800bddaa7c WHIRLPOOL 842c97b6cfd98ca4f3b0de666b5bc3ce465cab48cd94cf66b7fe593be4344b8737da780cb8da7c2434880ee0e5df8594061c34914451fd6425cb84cf153cf0c4
 MISC metadata.xml 814 SHA256 e33780a3f1af692a5539738aa243581beb5d6398daf23ac28a252b8481742db1 SHA512 d68c833a70bae0e497f5c0217f6f64161c7cbe3fd01253e8f5657512e5eb62438dec5cc587ca9667c0cd4f791f25cdcb3f7017743f6f66cfdc41fec835b4f3a7 WHIRLPOOL b2c926e03f312e1cdcaedf1f6c5f9b0c25887e93f44fb8aef56212f72369e1916efa863e34cd568d0f50cddcaf8fb9bf33d745d7fc785c62476162465f3298b7

diff --git a/sys-apps/portage/files/0001-pym-portage-util-locale.py-fix-decoding-for-python2-.patch b/sys-apps/portage/files/0001-pym-portage-util-locale.py-fix-decoding-for-python2-.patch
new file mode 100644
index 0000000..258c221
--- /dev/null
+++ b/sys-apps/portage/files/0001-pym-portage-util-locale.py-fix-decoding-for-python2-.patch
@@ -0,0 +1,40 @@
+From f13322877e2778f145308160ccee5d2e27b34235 Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Wed, 25 May 2016 08:48:32 -0400
+Subject: [PATCH 1/3] pym/portage/util/locale.py: fix decoding for python2 plus
+ some locales
+
+When using python2 with some locales, like turkish, chr() is passed values not in
+range(128) which cannot be decoded as ASCII, thus throwing a UnicodeDecodeError
+exception.  We use _unicode_decode() from portage.util to address this.
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+---
+ pym/portage/util/locale.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pym/portage/util/locale.py b/pym/portage/util/locale.py
+index 2a15ea1..093eb86 100644
+--- a/pym/portage/util/locale.py
++++ b/pym/portage/util/locale.py
+@@ -15,7 +15,7 @@ import textwrap
+ import traceback
+ 
+ import portage
+-from portage.util import writemsg_level
++from portage.util import _unicode_decode, writemsg_level
+ from portage.util._ctypes import find_library, LoadLibrary
+ 
+ 
+@@ -62,7 +62,7 @@ def _check_locale(silent):
+ 			"as LC_CTYPE in make.conf.")
+ 		msg = [l for l in textwrap.wrap(msg, 70)]
+ 		msg.append("")
+-		chars = lambda l: ''.join(chr(x) for x in l)
++		chars = lambda l: ''.join(_unicode_decode(chr(x)) for x in l)
+ 		if uc != ruc:
+ 			msg.extend([
+ 				"  %s -> %s" % (chars(lc), chars(ruc)),
+-- 
+2.7.3
+

diff --git a/sys-apps/portage/files/0002-setup.py-add-stub-for-building-custom-modules-in-C-C.patch b/sys-apps/portage/files/0002-setup.py-add-stub-for-building-custom-modules-in-C-C.patch
new file mode 100644
index 0000000..d880e44
--- /dev/null
+++ b/sys-apps/portage/files/0002-setup.py-add-stub-for-building-custom-modules-in-C-C.patch
@@ -0,0 +1,59 @@
+From 0ce1fa04fc6ce32c54efa0e48cd61f577aa585b2 Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Thu, 19 May 2016 06:52:43 -0400
+Subject: [PATCH 2/3] setup.py: add stub for building custom modules in C/C++
+
+Currently portage doesn't include any custom modules written in C/C++.
+This commit introduces stub code for building such modules in setup.py.
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+---
+ setup.py | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 75c4bcb..25429bc 100755
+--- a/setup.py
++++ b/setup.py
+@@ -4,7 +4,7 @@
+ 
+ from __future__ import print_function
+ 
+-from distutils.core import setup, Command
++from distutils.core import setup, Command, Extension
+ from distutils.command.build import build
+ from distutils.command.build_scripts import build_scripts
+ from distutils.command.clean import clean
+@@ -30,6 +30,9 @@ import sys
+ # TODO:
+ # - smarter rebuilds of docs w/ 'install_docbook' and 'install_epydoc'.
+ 
++# Dictionary of scripts.  The structure is
++#   key   = location in filesystem to install the scripts
++#   value = list of scripts, path relative to top source directory
+ x_scripts = {
+ 	'bin': [
+ 		'bin/ebuild', 'bin/egencache', 'bin/emerge', 'bin/emerge-webrsync',
+@@ -41,6 +44,10 @@ x_scripts = {
+ 	],
+ }
+ 
++# Dictionary custom modules written in C/C++ here.  The structure is
++#   key   = module name
++#   value = list of C/C++ source code, path relative to top source directory
++x_c_helpers = {}
+ 
+ class x_build(build):
+ 	""" Build command with extra build_man call. """
+@@ -636,6 +643,8 @@ setup(
+ 		['$sysconfdir/portage/repo.postsync.d', ['cnf/repo.postsync.d/example']],
+ 	],
+ 
++	ext_modules = [Extension(name=n, sources=m) for n, m in x_c_helpers.items()],
++
+ 	cmdclass = {
+ 		'build': x_build,
+ 		'build_man': build_man,
+-- 
+2.7.3
+

diff --git a/sys-apps/portage/files/0003-pym-portage-util-locale.py-add-a-C-module-to-help-ch.patch b/sys-apps/portage/files/0003-pym-portage-util-locale.py-add-a-C-module-to-help-ch.patch
new file mode 100644
index 0000000..8b89030
--- /dev/null
+++ b/sys-apps/portage/files/0003-pym-portage-util-locale.py-add-a-C-module-to-help-ch.patch
@@ -0,0 +1,151 @@
+From aeb46be70eefc2bdcd851b1a7eba2fcc7b4fa575 Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Fri, 27 May 2016 09:47:34 -0400
+Subject: [PATCH 3/3] pym/portage/util/locale.py: add a C module to help check
+ locale
+
+The current method to check for a sane system locale is to use python's
+ctypes.util.find_library() to construct a full library path to the
+system libc.so and pass that path to ctypes.CDLL() so we can call
+toupper() and tolower() directly.  However, this gets bogged down in
+implementation details and fails with musl.
+
+We work around this design flaw in ctypes with a small python module
+written in C which provides thin wrappers to toupper() and tolower(),
+and only fall back on the current ctypes-based check when this module
+is not available.
+
+This has been tested on glibc, uClibc and musl systems.
+
+X-Gentoo-bug: 571444
+X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=571444
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+---
+ pym/portage/util/locale.py | 16 ++++++-----
+ setup.py                   |  6 +++-
+ src/portage_util_libc.c    | 68 ++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 82 insertions(+), 8 deletions(-)
+ create mode 100644 src/portage_util_libc.c
+
+diff --git a/pym/portage/util/locale.py b/pym/portage/util/locale.py
+index 093eb86..5b09945 100644
+--- a/pym/portage/util/locale.py
++++ b/pym/portage/util/locale.py
+@@ -34,13 +34,15 @@ def _check_locale(silent):
+ 	"""
+ 	The inner locale check function.
+ 	"""
+-
+-	libc_fn = find_library("c")
+-	if libc_fn is None:
+-		return None
+-	libc = LoadLibrary(libc_fn)
+-	if libc is None:
+-		return None
++	try:
++		from portage.util import libc
++	except ImportError:
++		libc_fn = find_library("c")
++		if libc_fn is None:
++			return None
++		libc = LoadLibrary(libc_fn)
++		if libc is None:
++			return None
+ 
+ 	lc = list(range(ord('a'), ord('z')+1))
+ 	uc = list(range(ord('A'), ord('Z')+1))
+diff --git a/setup.py b/setup.py
+index 25429bc..5ca8156 100755
+--- a/setup.py
++++ b/setup.py
+@@ -47,7 +47,11 @@ x_scripts = {
+ # Dictionary custom modules written in C/C++ here.  The structure is
+ #   key   = module name
+ #   value = list of C/C++ source code, path relative to top source directory
+-x_c_helpers = {}
++x_c_helpers = {
++	'portage.util.libc' : [
++		'src/portage_util_libc.c',
++	],
++}
+ 
+ class x_build(build):
+ 	""" Build command with extra build_man call. """
+diff --git a/src/portage_util_libc.c b/src/portage_util_libc.c
+new file mode 100644
+index 0000000..977b954
+--- /dev/null
++++ b/src/portage_util_libc.c
+@@ -0,0 +1,68 @@
++/* Copyright 2005-2016 Gentoo Foundation
++ * Distributed under the terms of the GNU General Public License v2
++ */
++
++#include <Python.h>
++#include <stdlib.h>
++#include <ctype.h>
++
++static PyObject * _libc_tolower(PyObject *, PyObject *);
++static PyObject * _libc_toupper(PyObject *, PyObject *);
++
++static PyMethodDef LibcMethods[] = {
++	{"tolower", _libc_tolower, METH_VARARGS, "Convert to lower case using system locale."},
++	{"toupper", _libc_toupper, METH_VARARGS, "Convert to upper case using system locale."},
++	{NULL, NULL, 0, NULL}
++};
++
++#if PY_MAJOR_VERSION >= 3
++static struct PyModuleDef moduledef = {
++	PyModuleDef_HEAD_INIT,
++	"libc",								/* m_name */
++	"Module for converting case using the system locale",		/* m_doc */
++	-1,								/* m_size */
++	LibcMethods,							/* m_methods */
++	NULL,								/* m_reload */
++	NULL,								/* m_traverse */
++	NULL,								/* m_clear */
++	NULL,								/* m_free */
++};
++
++PyMODINIT_FUNC
++PyInit_libc(void)
++{
++	PyObject *m;
++	m = PyModule_Create(&moduledef);
++	return m;
++}
++#else
++PyMODINIT_FUNC
++initlibc(void)
++{
++	Py_InitModule("libc", LibcMethods);
++}
++#endif
++
++
++static PyObject *
++_libc_tolower(PyObject *self, PyObject *args)
++{
++	int c;
++
++	if (!PyArg_ParseTuple(args, "i", &c))
++		return NULL;
++
++	return Py_BuildValue("i", tolower(c));
++}
++
++
++static PyObject *
++_libc_toupper(PyObject *self, PyObject *args)
++{
++	int c;
++
++	if (!PyArg_ParseTuple(args, "i", &c))
++		return NULL;
++
++	return Py_BuildValue("i", toupper(c));
++}
+-- 
+2.7.3
+

diff --git a/sys-apps/portage/portage-2.2.26-r99.ebuild b/sys-apps/portage/portage-2.2.28-r999.ebuild
similarity index 97%
rename from sys-apps/portage/portage-2.2.26-r99.ebuild
rename to sys-apps/portage/portage-2.2.28-r999.ebuild
index 3aa681a..c03d330 100644
--- a/sys-apps/portage/portage-2.2.26-r99.ebuild
+++ b/sys-apps/portage/portage-2.2.28-r999.ebuild
@@ -11,13 +11,13 @@ PYTHON_COMPAT=(
 )
 PYTHON_REQ_USE='bzip2(+)'
 
-inherit distutils-r1 eutils multilib
+inherit distutils-r1 multilib
 
 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 ~mips ppc x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
 
@@ -85,7 +85,9 @@ pkg_setup() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
-	epatch "${FILESDIR}"/${P}-fix-check_locale.patch
+	epatch "${FILESDIR}"/0001-pym-portage-util-locale.py-fix-decoding-for-python2-.patch
+	epatch "${FILESDIR}"/0002-setup.py-add-stub-for-building-custom-modules-in-C-C.patch
+	epatch "${FILESDIR}"/0003-pym-portage-util-locale.py-add-a-C-module-to-help-ch.patch
 
 	if ! use ipc ; then
 		einfo "Disabling ipc..."

[gentoo-commits] proj/musl:master commit in: sys-apps/portage/, sys-apps/portage/files/

[Anthony G. Basile]

commit:     fe65acb50b89ceb40ef5e8087738c43386a71aa6
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue May  9 16:55:24 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue May  9 16:56:02 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=fe65acb5

sys-apps/portage: import upstream patch

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-apps/portage/Manifest                 |  2 +-
 sys-apps/portage/files/2.3.5-loff_t.patch | 79 +++++++++++++++++++++++++++----
 2 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 285f379..e43af65 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,4 @@
-AUX 2.3.5-loff_t.patch 476 SHA256 147dbc5d8265da02019294748de91039d184a6a6b46b7d1414be52bfa75f37c0 SHA512 d64dcc80e4747251c58b2f01eabb020894550ba69d8c3e7d8513ecb6a0f6d7e3ff4d4670532d0fa8ff9d887e3935ba3cb85c60d0bffb2ec016491165cbb31bb1 WHIRLPOOL cd3b2c16afef5d32b3bc5ec170efab5249f35e0da394c7c5b3d591e8ca69d791a8f7e6f3227d87ec31427e10b4de043ae19c59565549fd91cfd0412e063849a6
+AUX 2.3.5-loff_t.patch 2569 SHA256 709f0374f9f88cc89f379356ae8bffc6560e240f2157ccab367d0ebc2e523438 SHA512 e944be00cd7bca618202a5f3084624eb110a02edc5d5cac44603c7a9c16132305b13e916578bfd06f6792c978cc78c60282823fc162df7120032c9239880e21f WHIRLPOOL dd638c53a1ecf36b7501bed36eccb8099f581d6a5b4c061015e40dd34cbd4bb58af3c14c18bfcab76a762813b365d5e80e8d298d230a0d29fe7a741449158cb2
 AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
 DIST portage-2.3.5.tar.bz2 933047 SHA256 9b3282eee8f7f5728a4a71864d6b34315d71d43c52b2b650cf0d8f412c871941 SHA512 c403578caf40d97e8081c203d433b515cb2fdb14cb8b7d2652ed664bd079e65db32b54ce12ff495af6dd5fb468c5a1ef58d335e202ede5355d115049e21a6a35 WHIRLPOOL 25dbb6547d6488cebc1baf093a600e2034e17558306fd55f5502346330a78012e32d3c49dcf0445664c69d4e3e6b2580762417324ccd0bf3aa08575245165a24
 EBUILD portage-2.3.5.ebuild 8633 SHA256 2e353b0fbb3e9e06a84af2f236e85b4e9fe4e204ca22bcb93ff74c367db487f8 SHA512 0fa9d646f5e0e80990b31e9c39fe4b994efdec13530b610da22046eaa6023224dc6f7bec27865d478eb440389632e99a60a8d4f3f9c8eea9d114b2ee1b04f704 WHIRLPOOL 302ad07d96b58b5730ef868079137e184de1428b650182dfb45847a9712023aaa6fa844b77b5cec0c1a8b796c55ffef9e4634a8be57cd1578427427d6b7cc6de

diff --git a/sys-apps/portage/files/2.3.5-loff_t.patch b/sys-apps/portage/files/2.3.5-loff_t.patch
index 448c312..95a3b86 100644
--- a/sys-apps/portage/files/2.3.5-loff_t.patch
+++ b/sys-apps/portage/files/2.3.5-loff_t.patch
@@ -1,11 +1,70 @@
-diff -Naur portage-2.3.5.orig/src/portage_util_file_copy_reflink_linux.c portage-2.3.5/src/portage_util_file_copy_reflink_linux.c
---- portage-2.3.5.orig/src/portage_util_file_copy_reflink_linux.c	2017-03-17 17:34:29.300177738 -0700
-+++ portage-2.3.5/src/portage_util_file_copy_reflink_linux.c	2017-03-17 17:35:26.802723400 -0700
-@@ -4,6 +4,7 @@
+From 1a7aeb58c4e687e4d4012054b56373f27941a067 Mon Sep 17 00:00:00 2001
+From: Zac Medico <zmedico@gentoo.org>
+Date: Sun, 7 May 2017 16:32:19 -0700
+Subject: [PATCH] file_copy: replace loff_t with off_t for portability (bug
+ 617778)
+
+The loff_t type is a GNU extension, so use the portable off_t
+type instead. Also, enable Large File Support macros in setup.py,
+for 64-bit offsets.
+
+Reported-by: Patrick Steinhardt <ps@pks.im>
+X-Gentoo-bug: 617778
+X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=617778
+Acked-by: Anthony G. Basile <blueness@gentoo.org>
+Acked-by: Brian Dolbec <dolsen@gentoo.org>
+---
+ setup.py                                   | 5 ++++-
+ src/portage_util_file_copy_reflink_linux.c | 6 +++---
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index e993177..1ba6f87 100755
+--- a/setup.py
++++ b/setup.py
+@@ -676,7 +676,10 @@ setup(
+ 		['$sysconfdir/portage/repo.postsync.d', ['cnf/repo.postsync.d/example']],
+ 	],
  
- #include <Python.h>
- #include <errno.h>
-+#include <fcntl.h>
- #include <stdlib.h>
- #include <ctype.h>
- #include <sys/sendfile.h>
+-	ext_modules = [Extension(name=n, sources=m) for n, m in x_c_helpers.items()],
++	ext_modules = [Extension(name=n, sources=m,
++		extra_compile_args=['-D_FILE_OFFSET_BITS=64',
++		'-D_LARGEFILE_SOURCE', '-D_LARGEFILE64_SOURCE'])
++		for n, m in x_c_helpers.items()],
+ 
+ 	cmdclass = {
+ 		'build': x_build,
+diff --git a/src/portage_util_file_copy_reflink_linux.c b/src/portage_util_file_copy_reflink_linux.c
+index b031d96..2fb17a0 100644
+--- a/src/portage_util_file_copy_reflink_linux.c
++++ b/src/portage_util_file_copy_reflink_linux.c
+@@ -66,7 +66,7 @@ initreflink_linux(void)
+  * (errno is set appropriately).
+  */
+ static ssize_t
+-cfr_wrapper(int fd_out, int fd_in, loff_t *off_out, size_t len)
++cfr_wrapper(int fd_out, int fd_in, off_t *off_out, size_t len)
+ {
+ #ifdef __NR_copy_file_range
+     return syscall(__NR_copy_file_range, fd_in, NULL, fd_out,
+@@ -96,7 +96,7 @@ cfr_wrapper(int fd_out, int fd_in, loff_t *off_out, size_t len)
+  * reaches EOF.
+  */
+ static off_t
+-do_lseek_data(int fd_out, int fd_in, loff_t *off_out) {
++do_lseek_data(int fd_out, int fd_in, off_t *off_out) {
+ #ifdef SEEK_DATA
+     /* Use lseek SEEK_DATA/SEEK_HOLE for sparse file support,
+      * as suggested in the copy_file_range man page.
+@@ -189,7 +189,7 @@ _reflink_linux_file_copy(PyObject *self, PyObject *args)
+     ssize_t buf_bytes, buf_offset, copyfunc_ret;
+     struct stat stat_in, stat_out;
+     char* buf;
+-    ssize_t (*copyfunc)(int, int, loff_t *, size_t);
++    ssize_t (*copyfunc)(int, int, off_t *, size_t);
+ 
+     if (!PyArg_ParseTuple(args, "ii", &fd_in, &fd_out))
+         return NULL;
+-- 
+2.10.2
+

[gentoo-commits] proj/musl:master commit in: sys-apps/portage/, sys-apps/portage/files/

[Anthony G. Basile]

commit:     a0e1a91d1b191aca42bee226457008e25660ed89
Author:     stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Sun Sep  3 11:35:16 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 20:54:09 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=a0e1a91d

sys-apps/portage: bug #617778 is fixed and stablized for all musl arches in portage-2.3.6

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 sys-apps/portage/Manifest                 |   5 -
 sys-apps/portage/files/2.3.5-loff_t.patch |  70 --------
 sys-apps/portage/files/README.RESCUE      |   2 -
 sys-apps/portage/metadata.xml             |  27 ---
 sys-apps/portage/portage-2.3.5.ebuild     | 279 ------------------------------
 5 files changed, 383 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
deleted file mode 100644
index e43af65..0000000
--- a/sys-apps/portage/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 2.3.5-loff_t.patch 2569 SHA256 709f0374f9f88cc89f379356ae8bffc6560e240f2157ccab367d0ebc2e523438 SHA512 e944be00cd7bca618202a5f3084624eb110a02edc5d5cac44603c7a9c16132305b13e916578bfd06f6792c978cc78c60282823fc162df7120032c9239880e21f WHIRLPOOL dd638c53a1ecf36b7501bed36eccb8099f581d6a5b4c061015e40dd34cbd4bb58af3c14c18bfcab76a762813b365d5e80e8d298d230a0d29fe7a741449158cb2
-AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
-DIST portage-2.3.5.tar.bz2 933047 SHA256 9b3282eee8f7f5728a4a71864d6b34315d71d43c52b2b650cf0d8f412c871941 SHA512 c403578caf40d97e8081c203d433b515cb2fdb14cb8b7d2652ed664bd079e65db32b54ce12ff495af6dd5fb468c5a1ef58d335e202ede5355d115049e21a6a35 WHIRLPOOL 25dbb6547d6488cebc1baf093a600e2034e17558306fd55f5502346330a78012e32d3c49dcf0445664c69d4e3e6b2580762417324ccd0bf3aa08575245165a24
-EBUILD portage-2.3.5.ebuild 8633 SHA256 2e353b0fbb3e9e06a84af2f236e85b4e9fe4e204ca22bcb93ff74c367db487f8 SHA512 0fa9d646f5e0e80990b31e9c39fe4b994efdec13530b610da22046eaa6023224dc6f7bec27865d478eb440389632e99a60a8d4f3f9c8eea9d114b2ee1b04f704 WHIRLPOOL 302ad07d96b58b5730ef868079137e184de1428b650182dfb45847a9712023aaa6fa844b77b5cec0c1a8b796c55ffef9e4634a8be57cd1578427427d6b7cc6de
-MISC metadata.xml 1147 SHA256 c4832ae64ab0915c65eadca15e4540680d109c21d572464f69e218d14fe6bd8b SHA512 733193cbfc96da31252b5e4109d0b76f797e339c41eda2c1230cc1d5b0e75912177570ed0140218a7a7b85d9b8bc53e8e6931e88810269c499be87af40e6b86c WHIRLPOOL bf901ca7474f9b8358c458edad904f9c0c853187c6dc8ea0bc0c327bded60940c6f8b20f0231d78d86aa7dc5235b23d70c69f7153cca9e375fa271c7c93707b9

diff --git a/sys-apps/portage/files/2.3.5-loff_t.patch b/sys-apps/portage/files/2.3.5-loff_t.patch
deleted file mode 100644
index 95a3b86..0000000
--- a/sys-apps/portage/files/2.3.5-loff_t.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 1a7aeb58c4e687e4d4012054b56373f27941a067 Mon Sep 17 00:00:00 2001
-From: Zac Medico <zmedico@gentoo.org>
-Date: Sun, 7 May 2017 16:32:19 -0700
-Subject: [PATCH] file_copy: replace loff_t with off_t for portability (bug
- 617778)
-
-The loff_t type is a GNU extension, so use the portable off_t
-type instead. Also, enable Large File Support macros in setup.py,
-for 64-bit offsets.
-
-Reported-by: Patrick Steinhardt <ps@pks.im>
-X-Gentoo-bug: 617778
-X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=617778
-Acked-by: Anthony G. Basile <blueness@gentoo.org>
-Acked-by: Brian Dolbec <dolsen@gentoo.org>
----
- setup.py                                   | 5 ++++-
- src/portage_util_file_copy_reflink_linux.c | 6 +++---
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index e993177..1ba6f87 100755
---- a/setup.py
-+++ b/setup.py
-@@ -676,7 +676,10 @@ setup(
- 		['$sysconfdir/portage/repo.postsync.d', ['cnf/repo.postsync.d/example']],
- 	],
- 
--	ext_modules = [Extension(name=n, sources=m) for n, m in x_c_helpers.items()],
-+	ext_modules = [Extension(name=n, sources=m,
-+		extra_compile_args=['-D_FILE_OFFSET_BITS=64',
-+		'-D_LARGEFILE_SOURCE', '-D_LARGEFILE64_SOURCE'])
-+		for n, m in x_c_helpers.items()],
- 
- 	cmdclass = {
- 		'build': x_build,
-diff --git a/src/portage_util_file_copy_reflink_linux.c b/src/portage_util_file_copy_reflink_linux.c
-index b031d96..2fb17a0 100644
---- a/src/portage_util_file_copy_reflink_linux.c
-+++ b/src/portage_util_file_copy_reflink_linux.c
-@@ -66,7 +66,7 @@ initreflink_linux(void)
-  * (errno is set appropriately).
-  */
- static ssize_t
--cfr_wrapper(int fd_out, int fd_in, loff_t *off_out, size_t len)
-+cfr_wrapper(int fd_out, int fd_in, off_t *off_out, size_t len)
- {
- #ifdef __NR_copy_file_range
-     return syscall(__NR_copy_file_range, fd_in, NULL, fd_out,
-@@ -96,7 +96,7 @@ cfr_wrapper(int fd_out, int fd_in, loff_t *off_out, size_t len)
-  * reaches EOF.
-  */
- static off_t
--do_lseek_data(int fd_out, int fd_in, loff_t *off_out) {
-+do_lseek_data(int fd_out, int fd_in, off_t *off_out) {
- #ifdef SEEK_DATA
-     /* Use lseek SEEK_DATA/SEEK_HOLE for sparse file support,
-      * as suggested in the copy_file_range man page.
-@@ -189,7 +189,7 @@ _reflink_linux_file_copy(PyObject *self, PyObject *args)
-     ssize_t buf_bytes, buf_offset, copyfunc_ret;
-     struct stat stat_in, stat_out;
-     char* buf;
--    ssize_t (*copyfunc)(int, int, loff_t *, size_t);
-+    ssize_t (*copyfunc)(int, int, off_t *, size_t);
- 
-     if (!PyArg_ParseTuple(args, "ii", &fd_in, &fd_out))
-         return NULL;
--- 
-2.10.2
-

diff --git a/sys-apps/portage/files/README.RESCUE b/sys-apps/portage/files/README.RESCUE
deleted file mode 100644
index 70c494e..0000000
--- a/sys-apps/portage/files/README.RESCUE
+++ /dev/null
@@ -1,2 +0,0 @@
-Please see http://www.gentoo.org/proj/en/portage/doc/manually-fixing-portage.xml
-for a recovery guide for a broken portage installation.

diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
deleted file mode 100644
index c662419..0000000
--- a/sys-apps/portage/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <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.5.ebuild b/sys-apps/portage/portage-2.3.5.ebuild
deleted file mode 100644
index a912c81..0000000
--- a/sys-apps/portage/portage-2.3.5.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_3 python3_4 python3_5 python3_6
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 multilib
-
-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 ~mips ppc x86"
-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*')] )"
-# 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"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
-
-PATCHES=( "${FILESDIR}"/${PV}-loff_t.patch )
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_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 ""
-	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 ""
-}