1 |
commit: 1e95dea43fc4a826ccb0a20e5d4040eae46180f2 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 28 21:20:33 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 28 21:24:53 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e95dea4 |
7 |
|
8 |
dev-python/pyyaml: Remove redundant versions |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/pyyaml/Manifest | 2 -- |
13 |
dev-python/pyyaml/pyyaml-5.1.2.ebuild | 47 ----------------------------------- |
14 |
dev-python/pyyaml/pyyaml-5.1.ebuild | 46 ---------------------------------- |
15 |
3 files changed, 95 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest |
18 |
index a15eb5fdb25..88af6db8c83 100644 |
19 |
--- a/dev-python/pyyaml/Manifest |
20 |
+++ b/dev-python/pyyaml/Manifest |
21 |
@@ -1,5 +1,3 @@ |
22 |
DIST PyYAML-3.13.tar.gz 270607 BLAKE2B f365f63587b911234497426c9796f98b85f5de052abd88ea434137a4eb8a4c1e08f9ee1982a30df1934dadb615145f4af8fcff577d3d4e52058e7a8843aa8604 SHA512 93642286d0317e2fe970632c36d38ce6030f7cabcf971f28e3a1054f07390fcee5baaf7f167e7c9690dbd7b2adc61f5b7d75a218ace0abca34ff8815486cfdd7 |
23 |
-DIST PyYAML-5.1.2.tar.gz 265034 BLAKE2B a3f6fe4a0c0a24f8934b94545e7727fad26b397755416a8127bd52fd9ea5e8fea3c6452ddfbd91edfa2e8ca88522b1ae9061c9221f394c8fa4cbd1c2dc256f72 SHA512 b5ee201c612486a95c87b7e41d474313160284359b8b30ababc80b51325aef9dd7dc27eb3b8a03a4749cb8c7e3789c5684d5c285fe35d4b20be1f189641531e0 |
24 |
-DIST PyYAML-5.1.tar.gz 274244 BLAKE2B ea8cc4b56b9fc70bc7b01f8c654ceb8b73c82dcc936c939cba3c3654df04fe32fc46c7df322a38869d28ad5a58f6134b35cbe43924df3b4d5f3e54e33700dc73 SHA512 8f27f92bdfa310a99dd6d83947332cc033fa18f0011998bb585ad5c4340a2da20d8c20bfdb53beaae15651198d1240c986818379b0a05b230f74d1f30f53e7fd |
25 |
DIST PyYAML-5.3.tar.gz 268214 BLAKE2B 2017ec6d64744323c7e6f3bdcea77b249943ba93844de363ba5d2b14cf70cc5c06e8427d12515e1e60f8432a87a115df1033d959fc42851f61818d0bdc8cd7a2 SHA512 9124bf4d58ebe925f430fd6ed749e5a3311a54d536a035d39794c485843ddb80692fd7f7bac05797507128b933297ff730d967f49e7237c7c567086a83ee9e1f |
26 |
DIST pyyaml-5.3.1.gh.tar.gz 168044 BLAKE2B 2acc62ecc7448925eb340c2555001c8a74bd883d720b992d6deaea890b4eac435e4ae02eb129db3a6778c0be21a231fa9d96ee8ae59a4a39bc49961e5fb0d6ab SHA512 27d97e8493c7660c7c0c471e20a8aa46c85431e4559a98bcbdafc2bd89a67fd04c6f2090e54ff6b206c868b33635ef8be68070a4c25d17a25c97fd5ad3549556 |
27 |
|
28 |
diff --git a/dev-python/pyyaml/pyyaml-5.1.2.ebuild b/dev-python/pyyaml/pyyaml-5.1.2.ebuild |
29 |
deleted file mode 100644 |
30 |
index 5b7d9e55871..00000000000 |
31 |
--- a/dev-python/pyyaml/pyyaml-5.1.2.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,47 +0,0 @@ |
34 |
-# Copyright 1999-2020 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
- |
39 |
-DISTUTILS_USE_SETUPTOOLS=no |
40 |
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 ) |
41 |
- |
42 |
-inherit distutils-r1 |
43 |
- |
44 |
-MY_P="PyYAML-${PV}" |
45 |
- |
46 |
-DESCRIPTION="YAML parser and emitter for Python" |
47 |
-HOMEPAGE="https://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/" |
48 |
-SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz" |
49 |
- |
50 |
-LICENSE="MIT" |
51 |
-SLOT="0" |
52 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
53 |
-IUSE="examples libyaml" |
54 |
- |
55 |
-RDEPEND="libyaml? ( dev-libs/libyaml )" |
56 |
-DEPEND="${RDEPEND} |
57 |
- libyaml? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*') )" |
58 |
- |
59 |
-S="${WORKDIR}/${MY_P}" |
60 |
- |
61 |
-PATCHES=( |
62 |
- # bug #659348 |
63 |
- "${FILESDIR}/pyyaml-5.1-cve-2017-18342.patch" |
64 |
-) |
65 |
- |
66 |
-python_configure_all() { |
67 |
- mydistutilsargs=( $(use_with libyaml) ) |
68 |
-} |
69 |
- |
70 |
-python_test() { |
71 |
- YAML_TEST_VERBOSE=1 esetup.py test |
72 |
-} |
73 |
- |
74 |
-python_install_all() { |
75 |
- distutils-r1_python_install_all |
76 |
- if use examples; then |
77 |
- dodoc -r examples |
78 |
- docompress -x /usr/share/doc/${PF} |
79 |
- fi |
80 |
-} |
81 |
|
82 |
diff --git a/dev-python/pyyaml/pyyaml-5.1.ebuild b/dev-python/pyyaml/pyyaml-5.1.ebuild |
83 |
deleted file mode 100644 |
84 |
index d0af6c67fe6..00000000000 |
85 |
--- a/dev-python/pyyaml/pyyaml-5.1.ebuild |
86 |
+++ /dev/null |
87 |
@@ -1,46 +0,0 @@ |
88 |
-# Copyright 1999-2020 Gentoo Authors |
89 |
-# Distributed under the terms of the GNU General Public License v2 |
90 |
- |
91 |
-EAPI=7 |
92 |
- |
93 |
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 ) |
94 |
- |
95 |
-inherit distutils-r1 |
96 |
- |
97 |
-MY_P="PyYAML-${PV}" |
98 |
- |
99 |
-DESCRIPTION="YAML parser and emitter for Python" |
100 |
-HOMEPAGE="https://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/" |
101 |
-SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz" |
102 |
- |
103 |
-LICENSE="MIT" |
104 |
-SLOT="0" |
105 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
106 |
-IUSE="examples libyaml" |
107 |
- |
108 |
-RDEPEND="libyaml? ( dev-libs/libyaml )" |
109 |
-DEPEND="${RDEPEND} |
110 |
- libyaml? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*') )" |
111 |
- |
112 |
-S="${WORKDIR}/${MY_P}" |
113 |
- |
114 |
-PATCHES=( |
115 |
- # bug #659348 |
116 |
- "${FILESDIR}/${PN}-5.1-cve-2017-18342.patch" |
117 |
-) |
118 |
- |
119 |
-python_configure_all() { |
120 |
- mydistutilsargs=( $(use_with libyaml) ) |
121 |
-} |
122 |
- |
123 |
-python_test() { |
124 |
- esetup.py test |
125 |
-} |
126 |
- |
127 |
-python_install_all() { |
128 |
- distutils-r1_python_install_all |
129 |
- if use examples; then |
130 |
- dodoc -r examples |
131 |
- docompress -x /usr/share/doc/${PF} |
132 |
- fi |
133 |
-} |