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

1 files 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:" \