From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/
Date: Mon, 1 Sep 2014 21:08:22 +0000 (UTC) [thread overview]
Message-ID: <1409605695.389225101d732d556639ed9bde776b1b88892afb.mgorny@gentoo> (raw)
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:" \
next reply other threads:[~2014-09-01 21:08 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-01 21:08 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-09-11 22:47 [gentoo-commits] dev/mgorny:master commit in: sys-apps/portage/ Michał Górny
2014-09-06 9:02 Michał Górny
2014-09-06 8:55 Michał Górny
2014-09-01 21:08 Michał Górny
2014-09-01 6:56 Michał Górny
2014-08-28 6:19 Michał Górny
2014-08-22 9:12 Michał Górny
2014-08-21 20:23 Michał Górny
2014-08-21 20:23 Michał Górny
2014-08-21 12:26 Michał Górny
2014-08-20 22:12 Michał Górny
2014-08-19 7:02 Michał Górny
2014-08-11 18:45 ` Michał Górny
2014-08-11 12:21 Michał Górny
2014-08-19 7:02 ` Michał Górny
2014-08-10 10:25 Michał Górny
2014-08-19 7:02 ` Michał Górny
2014-08-10 10:08 Michał Górny
2014-08-19 7:02 ` Michał Górny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1409605695.389225101d732d556639ed9bde776b1b88892afb.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox