1 |
commit: b2400384b49e4d2f3d6cc53dca3fa37b9f202fd8 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 22 22:42:47 2015 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 31 14:52:03 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2400384 |
7 |
|
8 |
sys-apps/portage: Make use of the new python_gen_impl_dep function |
9 |
|
10 |
sys-apps/portage/portage-2.2.20.1.ebuild | 3 +-- |
11 |
sys-apps/portage/portage-2.2.23.ebuild | 3 +-- |
12 |
sys-apps/portage/portage-2.2.24.ebuild | 3 +-- |
13 |
sys-apps/portage/portage-2.2.25.ebuild | 3 +-- |
14 |
sys-apps/portage/portage-2.2.26.ebuild | 3 +-- |
15 |
sys-apps/portage/portage-9999.ebuild | 3 +-- |
16 |
6 files changed, 6 insertions(+), 12 deletions(-) |
17 |
|
18 |
diff --git a/sys-apps/portage/portage-2.2.20.1.ebuild b/sys-apps/portage/portage-2.2.20.1.ebuild |
19 |
index 9b1a310..2fc8e95 100644 |
20 |
--- a/sys-apps/portage/portage-2.2.20.1.ebuild |
21 |
+++ b/sys-apps/portage/portage-2.2.20.1.ebuild |
22 |
@@ -9,7 +9,6 @@ PYTHON_COMPAT=( |
23 |
python3_3 python3_4 |
24 |
python2_7 |
25 |
) |
26 |
-# Note: substituted below |
27 |
PYTHON_REQ_USE='bzip2(+)' |
28 |
|
29 |
inherit distutils-r1 multilib |
30 |
@@ -22,7 +21,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 |
31 |
SLOT="0" |
32 |
IUSE="build doc epydoc +ipc linguas_ru selinux xattr" |
33 |
|
34 |
-DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) |
35 |
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
36 |
>=app-arch/tar-1.27 |
37 |
dev-lang/python-exec:2 |
38 |
>=sys-apps/sed-4.0.5 sys-devel/patch |
39 |
|
40 |
diff --git a/sys-apps/portage/portage-2.2.23.ebuild b/sys-apps/portage/portage-2.2.23.ebuild |
41 |
index 43cb079..c310cb5 100644 |
42 |
--- a/sys-apps/portage/portage-2.2.23.ebuild |
43 |
+++ b/sys-apps/portage/portage-2.2.23.ebuild |
44 |
@@ -9,7 +9,6 @@ PYTHON_COMPAT=( |
45 |
python3_3 python3_4 python3_5 |
46 |
python2_7 |
47 |
) |
48 |
-# Note: substituted below |
49 |
PYTHON_REQ_USE='bzip2(+)' |
50 |
|
51 |
inherit distutils-r1 multilib |
52 |
@@ -22,7 +21,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s |
53 |
SLOT="0" |
54 |
IUSE="build doc epydoc +ipc linguas_ru selinux xattr" |
55 |
|
56 |
-DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) |
57 |
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
58 |
>=app-arch/tar-1.27 |
59 |
dev-lang/python-exec:2 |
60 |
>=sys-apps/sed-4.0.5 sys-devel/patch |
61 |
|
62 |
diff --git a/sys-apps/portage/portage-2.2.24.ebuild b/sys-apps/portage/portage-2.2.24.ebuild |
63 |
index c22c8f2..9878152 100644 |
64 |
--- a/sys-apps/portage/portage-2.2.24.ebuild |
65 |
+++ b/sys-apps/portage/portage-2.2.24.ebuild |
66 |
@@ -9,7 +9,6 @@ PYTHON_COMPAT=( |
67 |
python3_3 python3_4 python3_5 |
68 |
python2_7 |
69 |
) |
70 |
-# Note: substituted below |
71 |
PYTHON_REQ_USE='bzip2(+)' |
72 |
|
73 |
inherit distutils-r1 multilib |
74 |
@@ -22,7 +21,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh spar |
75 |
SLOT="0" |
76 |
IUSE="build doc epydoc +ipc linguas_ru selinux xattr" |
77 |
|
78 |
-DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) |
79 |
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
80 |
>=app-arch/tar-1.27 |
81 |
dev-lang/python-exec:2 |
82 |
>=sys-apps/sed-4.0.5 sys-devel/patch |
83 |
|
84 |
diff --git a/sys-apps/portage/portage-2.2.25.ebuild b/sys-apps/portage/portage-2.2.25.ebuild |
85 |
index 43cb079..c310cb5 100644 |
86 |
--- a/sys-apps/portage/portage-2.2.25.ebuild |
87 |
+++ b/sys-apps/portage/portage-2.2.25.ebuild |
88 |
@@ -9,7 +9,6 @@ PYTHON_COMPAT=( |
89 |
python3_3 python3_4 python3_5 |
90 |
python2_7 |
91 |
) |
92 |
-# Note: substituted below |
93 |
PYTHON_REQ_USE='bzip2(+)' |
94 |
|
95 |
inherit distutils-r1 multilib |
96 |
@@ -22,7 +21,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s |
97 |
SLOT="0" |
98 |
IUSE="build doc epydoc +ipc linguas_ru selinux xattr" |
99 |
|
100 |
-DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) |
101 |
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
102 |
>=app-arch/tar-1.27 |
103 |
dev-lang/python-exec:2 |
104 |
>=sys-apps/sed-4.0.5 sys-devel/patch |
105 |
|
106 |
diff --git a/sys-apps/portage/portage-2.2.26.ebuild b/sys-apps/portage/portage-2.2.26.ebuild |
107 |
index 9473c2c..0b2f97d 100644 |
108 |
--- a/sys-apps/portage/portage-2.2.26.ebuild |
109 |
+++ b/sys-apps/portage/portage-2.2.26.ebuild |
110 |
@@ -9,7 +9,6 @@ PYTHON_COMPAT=( |
111 |
python3_3 python3_4 python3_5 |
112 |
python2_7 |
113 |
) |
114 |
-# Note: substituted below |
115 |
PYTHON_REQ_USE='bzip2(+)' |
116 |
|
117 |
inherit distutils-r1 multilib |
118 |
@@ -22,7 +21,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s |
119 |
SLOT="0" |
120 |
IUSE="build doc epydoc +ipc linguas_ru selinux xattr" |
121 |
|
122 |
-DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) |
123 |
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
124 |
>=app-arch/tar-1.27 |
125 |
dev-lang/python-exec:2 |
126 |
>=sys-apps/sed-4.0.5 sys-devel/patch |
127 |
|
128 |
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild |
129 |
index f69e62f..7ef56c9 100644 |
130 |
--- a/sys-apps/portage/portage-9999.ebuild |
131 |
+++ b/sys-apps/portage/portage-9999.ebuild |
132 |
@@ -9,7 +9,6 @@ PYTHON_COMPAT=( |
133 |
python3_3 python3_4 python3_5 |
134 |
python2_7 |
135 |
) |
136 |
-# Note: substituted below |
137 |
PYTHON_REQ_USE='bzip2(+)' |
138 |
|
139 |
inherit distutils-r1 git-r3 multilib |
140 |
@@ -22,7 +21,7 @@ KEYWORDS="" |
141 |
SLOT="0" |
142 |
IUSE="build doc epydoc +ipc linguas_ru selinux xattr" |
143 |
|
144 |
-DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) |
145 |
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
146 |
>=app-arch/tar-1.27 |
147 |
dev-lang/python-exec:2 |
148 |
>=sys-apps/sed-4.0.5 sys-devel/patch |