1 |
commit: 389225101d732d556639ed9bde776b1b88892afb |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 1 21:08:15 2014 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 1 21:08:15 2014 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=38922510 |
7 |
|
8 |
sys-apps/portage: Update the ebuild. Do not require python[ssl] in stage1. Properly depend on python-exec:2. Remove ChangeLog and version substitution. |
9 |
|
10 |
Package-Manager: portage-2.2.11_p178 |
11 |
|
12 |
--- |
13 |
sys-apps/portage/portage-9999.ebuild | 26 ++++++++------------------ |
14 |
1 file changed, 8 insertions(+), 18 deletions(-) |
15 |
|
16 |
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild |
17 |
index c949ece..8e95e2c 100644 |
18 |
--- a/sys-apps/portage/portage-9999.ebuild |
19 |
+++ b/sys-apps/portage/portage-9999.ebuild |
20 |
@@ -9,7 +9,8 @@ PYTHON_COMPAT=( |
21 |
python3_2 python3_3 python3_4 |
22 |
python2_7 |
23 |
) |
24 |
-PYTHON_REQ_USE='ssl(+),bzip2(+)' |
25 |
+# Note: substituted below |
26 |
+PYTHON_REQ_USE='bzip2(+)' |
27 |
|
28 |
inherit distutils-r1 git-r3 multilib |
29 |
|
30 |
@@ -21,7 +22,8 @@ KEYWORDS="" |
31 |
SLOT="0" |
32 |
IUSE="build doc epydoc +ipc linguas_ru selinux xattr" |
33 |
|
34 |
-DEPEND="${python_dep} |
35 |
+DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) |
36 |
+ dev-python/python-exec:2 |
37 |
>=sys-apps/sed-4.0.5 sys-devel/patch |
38 |
doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) |
39 |
epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" |
40 |
@@ -32,8 +34,10 @@ DEPEND="${python_dep} |
41 |
# for now, don't pull in xattr deps for other kernels. |
42 |
# For whirlpool hash, require python[ssl] or python-mhash (bug #425046). |
43 |
# For compgen, require bash[readline] (bug #445576). |
44 |
-RDEPEND="${python_dep} |
45 |
- !build? ( >=sys-apps/sed-4.0.5 |
46 |
+RDEPEND=" |
47 |
+ dev-python/python-exec:2 |
48 |
+ !build? ( |
49 |
+ >=sys-apps/sed-4.0.5 |
50 |
|| ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) |
51 |
>=app-admin/eselect-1.2 |
52 |
) |
53 |
@@ -77,20 +81,6 @@ EGIT_MIN_CLONE_TYPE=single |
54 |
python_prepare_all() { |
55 |
distutils-r1_python_prepare_all |
56 |
|
57 |
- einfo "Producing ChangeLog from Git history..." |
58 |
- git log ebcf8975b37a8aae9735eb491a9b4cb63549bd5d^.. \ |
59 |
- > "${S}"/ChangeLog || die |
60 |
- |
61 |
- local _version=$(git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|') |
62 |
- _version=${_version:1} |
63 |
- einfo "Setting portage.VERSION to ${_version} ..." |
64 |
- sed -e "s/^VERSION =.*/VERSION = '${_version}'/" -i pym/portage/__init__.py || \ |
65 |
- die "Failed to patch portage.VERSION" |
66 |
- sed -e "1s/VERSION/${_version}/" -i doc/fragment/version || \ |
67 |
- die "Failed to patch VERSION in doc/fragment/version" |
68 |
- sed -e "1s/VERSION/${_version}/" -i $(find man -type f) || \ |
69 |
- die "Failed to patch VERSION in man page headers" |
70 |
- |
71 |
if ! use ipc ; then |
72 |
einfo "Disabling ipc..." |
73 |
sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |