Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/zookeeper-bin/
Date: Tue, 01 Sep 2020 09:07:22
Message-Id: 1598951224.ab0af71fdbb6bc77392f29de10381d5a28bd38f0.mgorny@gentoo
1 commit: ab0af71fdbb6bc77392f29de10381d5a28bd38f0
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 1 08:41:46 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 1 09:07:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab0af71f
7
8 sys-cluster/zookeeper-bin: Remove python2
9
10 Closes: https://bugs.gentoo.org/735490
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 ...r-bin-3.4.13.ebuild => zookeeper-bin-3.4.13-r1.ebuild} | 15 +--------------
14 1 file changed, 1 insertion(+), 14 deletions(-)
15
16 diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13-r1.ebuild
17 similarity index 82%
18 rename from sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13.ebuild
19 rename to sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13-r1.ebuild
20 index 23a5a2025ee..940d9e7fa92 100644
21 --- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13.ebuild
22 +++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13-r1.ebuild
23 @@ -2,9 +2,8 @@
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=5
27 -PYTHON_COMPAT=( python2_7 )
28
29 -inherit distutils-r1 eutils java-utils-2 user
30 +inherit eutils java-utils-2 user
31
32 MY_P="zookeeper"
33 MY_PN=${MY_P}-${PV}
34 @@ -33,11 +32,6 @@ pkg_setup() {
35 }
36
37 src_prepare() {
38 - # python
39 - sed -e "s|src/c/zookeeper.c|zookeeper.c|g" \
40 - -e "s|../../../|${S}|g" \
41 - -i contrib/zkpython/src/python/setup.py || die
42 -
43 # whyyyy u -Werror ?! so horribal!
44 sed -e 's/-Werror//g' -i src/c/Makefile.* || die "Failed to rectify the Makefile"
45 }
46 @@ -55,13 +49,6 @@ src_compile() {
47 src_install() {
48 local DATA_DIR=/var/lib/${MY_P}
49
50 - # python
51 - cd "${S}"/contrib/zkpython/ || die
52 - mv src/python/setup.py .
53 - mv src/c/* .
54 - python_foreach_impl distutils-r1_src_install
55 - cd "${S}" || die
56 -
57 # cleanup sources
58 rm -rf src/ || die
59 rm bin/*.cmd || die