[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     cfc3aac4723d7861b1d68180a0905fece98d9b33
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 10 10:09:26 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 10 10:09:26 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=cfc3aac4

sys-apps/portage: Introduce ebuild for new-install branch of portage.

Package-Manager: portage-2.2.11_p29

---
 sys-apps/portage/metadata.xml        |  12 ++
 sys-apps/portage/portage-9999.ebuild | 214 +++++++++++++++++++++++++++++++++++
 2 files changed, 226 insertions(+)

diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
new file mode 100644
index 0000000..37c0ecb
--- /dev/null
+++ b/sys-apps/portage/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<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="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-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
new file mode 100644
index 0000000..a4b3ccd
--- /dev/null
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -0,0 +1,214 @@
+# 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-9999.ebuild,v 1.99 2014/08/05 14:19:02 dolsen Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_2 python3_3 python3_4
+	python2_7
+)
+PYTHON_REQ_USE='ssl(+),bzip2(+)'
+
+inherit distutils-r1 git-r3 multilib
+
+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=""
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
+
+DEPEND="${python_dep}
+	>=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] 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
+	)
+	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-shells/bash-3.2_p17
+	!<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="http://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
+}
+
+EGIT_REPO_URI="https://github.com/mgorny/portage.git"
+EGIT_BRANCH=new-install
+EGIT_MIN_CLONE_TYPE=single
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	einfo "Producing ChangeLog from Git history..."
+	git log ebcf8975b37a8aae9735eb491a9b4cb63549bd5d^.. \
+		> "${S}"/ChangeLog || die
+
+	local _version=$(git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|')
+	_version=${_version:1}
+	einfo "Setting portage.VERSION to ${_version} ..."
+	sed -e "s/^VERSION =.*/VERSION = '${_version}'/" -i pym/portage/__init__.py || \
+		die "Failed to patch portage.VERSION"
+	sed -e "1s/VERSION/${_version}/" -i doc/fragment/version || \
+		die "Failed to patch VERSION in doc/fragment/version"
+	sed -e "1s/VERSION/${_version}/" -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
+
+	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() {
+	distutils-r1_python_install \
+		--bindir="${EPREFIX}/usr/bin" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--portage-base="${EPREFIX}/usr/lib/portage" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/bin" \
+		--portage-datadir="${EPREFIX}/usr/share/portage" \
+		--sbindir="${EPREFIX}/usr/sbin" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=( install_docbook )
+	use epydoc && targets+=( install_epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		python_install "${targets[@]}"
+	fi
+}
+
+pkg_preinst() {
+	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
+}

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     60e0e0b4c629a90434931dd08a1b629fe1e2a1fa
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 10 10:26:18 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 10 10:26:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=60e0e0b4

sys-apps/portage: Install preferred impl shebangs rather than random ones.

Package-Manager: portage-2.2.11_p29

---
 sys-apps/portage/portage-9999.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index a4b3ccd..a7780ad 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -188,9 +188,8 @@ python_install_all() {
 	use doc && targets+=( install_docbook )
 	use epydoc && targets+=( install_epydoc )
 
-	if [[ ${targets[@]} ]]; then
-		python_install "${targets[@]}"
-	fi
+	# install docs + replace scripts with preferred impl
+	python_install "${targets[@]}"
 }
 
 pkg_preinst() {

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     ba806bafbfcd2a5441cf6396fdde4639aba73f32
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 11 12:21:39 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 11 12:21:39 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=ba806baf

sys-apps/portage: Reduce the number of path options since new-install branch supports proper path substitution now.

Package-Manager: portage-2.2.11_p33

---
 sys-apps/portage/portage-9999.ebuild | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index a7780ad..769f319 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -169,15 +169,11 @@ python_test() {
 
 python_install() {
 	distutils-r1_python_install \
-		--bindir="${EPREFIX}/usr/bin" \
+		--prefix="${EPREFIX}/usr" \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--portage-base="${EPREFIX}/usr/lib/portage" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/bin" \
-		--portage-datadir="${EPREFIX}/usr/share/portage" \
-		--sbindir="${EPREFIX}/usr/sbin" \
 		--sysconfdir="${EPREFIX}/etc" \
+		--install-lib="$(python_get_sitedir)" \
 		"${@}"
 }
 

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     b7e7baaa34dfd2f17d99a5d005b8e58d9f706da2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 11 18:45:38 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 11 18:45:38 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=b7e7baaa

sys-apps/portage: Use newly-invented --system-prefix option that does not collide with Python-intended --prefix.

Package-Manager: portage-2.2.11_p33

---
 sys-apps/portage/portage-9999.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 769f319..792fbe7 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -169,11 +169,10 @@ python_test() {
 
 python_install() {
 	distutils-r1_python_install \
-		--prefix="${EPREFIX}/usr" \
+		--system-prefix="${EPREFIX}/usr" \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
 		--sysconfdir="${EPREFIX}/etc" \
-		--install-lib="$(python_get_sitedir)" \
 		"${@}"
 }
 

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     cfc3aac4723d7861b1d68180a0905fece98d9b33
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 10 10:09:26 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 10 10:09:26 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=cfc3aac4

sys-apps/portage: Introduce ebuild for new-install branch of portage.

Package-Manager: portage-2.2.11_p29

---
 sys-apps/portage/metadata.xml        |  12 ++
 sys-apps/portage/portage-9999.ebuild | 214 +++++++++++++++++++++++++++++++++++
 2 files changed, 226 insertions(+)

diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
new file mode 100644
index 0000000..37c0ecb
--- /dev/null
+++ b/sys-apps/portage/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<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="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-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
new file mode 100644
index 0000000..a4b3ccd
--- /dev/null
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -0,0 +1,214 @@
+# 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-9999.ebuild,v 1.99 2014/08/05 14:19:02 dolsen Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_2 python3_3 python3_4
+	python2_7
+)
+PYTHON_REQ_USE='ssl(+),bzip2(+)'
+
+inherit distutils-r1 git-r3 multilib
+
+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=""
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
+
+DEPEND="${python_dep}
+	>=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] 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
+	)
+	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-shells/bash-3.2_p17
+	!<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="http://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
+}
+
+EGIT_REPO_URI="https://github.com/mgorny/portage.git"
+EGIT_BRANCH=new-install
+EGIT_MIN_CLONE_TYPE=single
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	einfo "Producing ChangeLog from Git history..."
+	git log ebcf8975b37a8aae9735eb491a9b4cb63549bd5d^.. \
+		> "${S}"/ChangeLog || die
+
+	local _version=$(git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|')
+	_version=${_version:1}
+	einfo "Setting portage.VERSION to ${_version} ..."
+	sed -e "s/^VERSION =.*/VERSION = '${_version}'/" -i pym/portage/__init__.py || \
+		die "Failed to patch portage.VERSION"
+	sed -e "1s/VERSION/${_version}/" -i doc/fragment/version || \
+		die "Failed to patch VERSION in doc/fragment/version"
+	sed -e "1s/VERSION/${_version}/" -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
+
+	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() {
+	distutils-r1_python_install \
+		--bindir="${EPREFIX}/usr/bin" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--portage-base="${EPREFIX}/usr/lib/portage" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/bin" \
+		--portage-datadir="${EPREFIX}/usr/share/portage" \
+		--sbindir="${EPREFIX}/usr/sbin" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=( install_docbook )
+	use epydoc && targets+=( install_epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		python_install "${targets[@]}"
+	fi
+}
+
+pkg_preinst() {
+	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
+}

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     60e0e0b4c629a90434931dd08a1b629fe1e2a1fa
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 10 10:26:18 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 10 10:26:18 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=60e0e0b4

sys-apps/portage: Install preferred impl shebangs rather than random ones.

Package-Manager: portage-2.2.11_p29

---
 sys-apps/portage/portage-9999.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index a4b3ccd..a7780ad 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -188,9 +188,8 @@ python_install_all() {
 	use doc && targets+=( install_docbook )
 	use epydoc && targets+=( install_epydoc )
 
-	if [[ ${targets[@]} ]]; then
-		python_install "${targets[@]}"
-	fi
+	# install docs + replace scripts with preferred impl
+	python_install "${targets[@]}"
 }
 
 pkg_preinst() {

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     b7e7baaa34dfd2f17d99a5d005b8e58d9f706da2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 11 18:45:38 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 11 18:45:38 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=b7e7baaa

sys-apps/portage: Use newly-invented --system-prefix option that does not collide with Python-intended --prefix.

Package-Manager: portage-2.2.11_p33

---
 sys-apps/portage/portage-9999.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 769f319..792fbe7 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -169,11 +169,10 @@ python_test() {
 
 python_install() {
 	distutils-r1_python_install \
-		--prefix="${EPREFIX}/usr" \
+		--system-prefix="${EPREFIX}/usr" \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
 		--sysconfdir="${EPREFIX}/etc" \
-		--install-lib="$(python_get_sitedir)" \
 		"${@}"
 }
 

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     ba806bafbfcd2a5441cf6396fdde4639aba73f32
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 11 12:21:39 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 11 12:21:39 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=ba806baf

sys-apps/portage: Reduce the number of path options since new-install branch supports proper path substitution now.

Package-Manager: portage-2.2.11_p33

---
 sys-apps/portage/portage-9999.ebuild | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index a7780ad..769f319 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -169,15 +169,11 @@ python_test() {
 
 python_install() {
 	distutils-r1_python_install \
-		--bindir="${EPREFIX}/usr/bin" \
+		--prefix="${EPREFIX}/usr" \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--portage-base="${EPREFIX}/usr/lib/portage" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/bin" \
-		--portage-datadir="${EPREFIX}/usr/share/portage" \
-		--sbindir="${EPREFIX}/usr/sbin" \
 		--sysconfdir="${EPREFIX}/etc" \
+		--install-lib="$(python_get_sitedir)" \
 		"${@}"
 }
 

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     2e04ba14534fdddcf10b0d62820bc89f3242c877
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 20 22:12:43 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 20 22:12:43 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=2e04ba14

Fix Python script wrapping and splitting.

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

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 792fbe7..b4e63e7 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -170,8 +170,11 @@ python_test() {
 python_install() {
 	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" \
 		"${@}"
 }

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     58bad8e2dda4bedf1d5949a54eb9efca474a77dd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 21 12:25:58 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 21 12:25:58 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=58bad8e2

Install /usr/lib/portage/bin compatibility symlink.

---
 sys-apps/portage/portage-9999.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index b4e63e7..10bbb32 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -186,8 +186,11 @@ python_install_all() {
 	use doc && targets+=( install_docbook )
 	use epydoc && targets+=( install_epydoc )
 
-	# install docs + replace scripts with preferred impl
+	# install docs
 	python_install "${targets[@]}"
+
+	# symlink compatibility /usr/lib/portage/bin
+	dosym "${EPYTHON}" /usr/lib/portage/bin
 }
 
 pkg_preinst() {

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     29ccb44f30dda0d3be961dcc01d420b182e56a9c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 21 20:23:50 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 21 20:23:50 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=29ccb44f

Revert "sys-apps/portage: Install /var/empty for rogue import prevention."

This reverts commit 6be095dec171cda37f04586c1ba265251019987f.

---
 sys-apps/portage/portage-9999.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 3fee385..10bbb32 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -191,9 +191,6 @@ python_install_all() {
 
 	# symlink compatibility /usr/lib/portage/bin
 	dosym "${EPYTHON}" /usr/lib/portage/bin
-
-	# used as safe location with no files
-	keepdir /var/empty
 }
 
 pkg_preinst() {

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     6be095dec171cda37f04586c1ba265251019987f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 21 13:53:14 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 21 13:53:14 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=6be095de

sys-apps/portage: Install /var/empty for rogue import prevention.

Package-Manager: portage-2.2.11_p126

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

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 10bbb32..3fee385 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -191,6 +191,9 @@ python_install_all() {
 
 	# symlink compatibility /usr/lib/portage/bin
 	dosym "${EPYTHON}" /usr/lib/portage/bin
+
+	# used as safe location with no files
+	keepdir /var/empty
 }
 
 pkg_preinst() {

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     dfe7ae2d1fca7232d61c5f483aafe99236031c60
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 22 09:11:41 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Aug 22 09:11:41 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=dfe7ae2d

Revert "Install /usr/lib/portage/bin compatibility symlink."

This reverts commit 58bad8e2dda4bedf1d5949a54eb9efca474a77dd. Portage
does not handle replacing directory by symlink well.

---
 sys-apps/portage/portage-9999.ebuild | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 10bbb32..b4e63e7 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -186,11 +186,8 @@ python_install_all() {
 	use doc && targets+=( install_docbook )
 	use epydoc && targets+=( install_epydoc )
 
-	# install docs
+	# install docs + replace scripts with preferred impl
 	python_install "${targets[@]}"
-
-	# symlink compatibility /usr/lib/portage/bin
-	dosym "${EPYTHON}" /usr/lib/portage/bin
 }
 
 pkg_preinst() {

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     9907fe41a2bc6fc8dbe825d226bccf714dd17b24
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 26 11:29:17 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Aug 26 11:29:17 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=9907fe41

sys-apps/portage: Use new distutils-r1 features to install docs without reinstalling whole Portage.

Package-Manager: portage-2.2.11_p165

---
 sys-apps/portage/portage-9999.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index b4e63e7..c949ece 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -186,8 +186,10 @@ python_install_all() {
 	use doc && targets+=( install_docbook )
 	use epydoc && targets+=( install_epydoc )
 
-	# install docs + replace scripts with preferred impl
-	python_install "${targets[@]}"
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
 }
 
 pkg_preinst() {

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     f1f09e7839be27fb8ea1fd90959e7b6ee9805e7d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  1 06:56:41 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep  1 06:56:41 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=f1f09e78

sys-apps/portage: Force python-exec:2.

Package-Manager: portage-2.2.11_p178

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

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index c949ece..52e8ac0 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -11,6 +11,8 @@ PYTHON_COMPAT=(
 )
 PYTHON_REQ_USE='ssl(+),bzip2(+)'
 
+_PYTHON_WANT_PYTHON_EXEC2=1
+
 inherit distutils-r1 git-r3 multilib
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     171890638f41dc943f48665b057b312a9eeb17b2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  1 21:02:02 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep  1 21:02:02 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=17189063

Revert "sys-apps/portage: Force python-exec:2."

This was not really the correct way of doing this.

---
 sys-apps/portage/portage-9999.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 52e8ac0..c949ece 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -11,8 +11,6 @@ PYTHON_COMPAT=(
 )
 PYTHON_REQ_USE='ssl(+),bzip2(+)'
 
-_PYTHON_WANT_PYTHON_EXEC2=1
-
 inherit distutils-r1 git-r3 multilib
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     389225101d732d556639ed9bde776b1b88892afb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  1 21:08:15 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep  1 21:08:15 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=38922510

sys-apps/portage: Update the ebuild. Do not require python[ssl] in stage1. Properly depend on python-exec:2. Remove ChangeLog and version substitution.

Package-Manager: portage-2.2.11_p178

---
 sys-apps/portage/portage-9999.ebuild | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index c949ece..8e95e2c 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -9,7 +9,8 @@ PYTHON_COMPAT=(
 	python3_2 python3_3 python3_4
 	python2_7
 )
-PYTHON_REQ_USE='ssl(+),bzip2(+)'
+# Note: substituted below
+PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1 git-r3 multilib
 
@@ -21,7 +22,8 @@ KEYWORDS=""
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
 
-DEPEND="${python_dep}
+DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
+	dev-python/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*')] )"
@@ -32,8 +34,10 @@ DEPEND="${python_dep}
 # 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
+RDEPEND="
+	dev-python/python-exec:2
+	!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
 	)
@@ -77,20 +81,6 @@ EGIT_MIN_CLONE_TYPE=single
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
-	einfo "Producing ChangeLog from Git history..."
-	git log ebcf8975b37a8aae9735eb491a9b4cb63549bd5d^.. \
-		> "${S}"/ChangeLog || die
-
-	local _version=$(git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|')
-	_version=${_version:1}
-	einfo "Setting portage.VERSION to ${_version} ..."
-	sed -e "s/^VERSION =.*/VERSION = '${_version}'/" -i pym/portage/__init__.py || \
-		die "Failed to patch portage.VERSION"
-	sed -e "1s/VERSION/${_version}/" -i doc/fragment/version || \
-		die "Failed to patch VERSION in doc/fragment/version"
-	sed -e "1s/VERSION/${_version}/" -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:" \

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     dd3b7f39772c3be0e47f3232e4c339e6e409ce34
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  6 08:55:10 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep  6 08:55:10 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=dd3b7f39

sys-apps/portage: Oh my, fix python-exec dep.

Package-Manager: portage-2.2.12

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

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 8e95e2c..c7b61a8 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -23,7 +23,7 @@ SLOT="0"
 IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
 
 DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
-	dev-python/python-exec:2
+	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*')] )"

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     b8ace033be5d3519e7a5c0fbeb6580456dc3b313
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  6 09:02:45 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep  6 09:02:45 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=b8ace033

sys-apps/portage: and the other dep too.

Package-Manager: portage-2.2.12

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

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index c7b61a8..d679077 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -35,7 +35,7 @@ DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
 # For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
 # For compgen, require bash[readline] (bug #445576).
 RDEPEND="
-	dev-python/python-exec:2
+	dev-lang/python-exec:2
 	!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 ) )

[gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/

[Michał Górny]

commit:     a9743b8e7b43ef0363420d79f7043561f10ab194
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 11 22:47:39 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 11 22:47:39 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=a9743b8e

sys-apps/portage: Moved to gx86.

---
 sys-apps/portage/metadata.xml        |  12 ---
 sys-apps/portage/portage-9999.ebuild | 203 -----------------------------------
 2 files changed, 215 deletions(-)

diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
deleted file mode 100644
index 37c0ecb..0000000
--- a/sys-apps/portage/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<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="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-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
deleted file mode 100644
index d679077..0000000
--- a/sys-apps/portage/portage-9999.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# 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-9999.ebuild,v 1.99 2014/08/05 14:19:02 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-r3 multilib
-
-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=""
-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*')] )"
-# 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-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) )
-		>=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-shells/bash-3.2_p17
-	!<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="http://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
-}
-
-EGIT_REPO_URI="https://github.com/mgorny/portage.git"
-EGIT_BRANCH=new-install
-EGIT_MIN_CLONE_TYPE=single
-
-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() {
-	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
-}
-
-pkg_preinst() {
-	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
-}