From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D94BD138359 for ; Tue, 1 Sep 2020 09:07:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62F48E089C; Tue, 1 Sep 2020 09:07:19 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4A37EE089C for ; Tue, 1 Sep 2020 09:07:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1C8B1340ED2 for ; Tue, 1 Sep 2020 09:07:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 288A333F for ; Tue, 1 Sep 2020 09:07:15 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1598951224.ab0af71fdbb6bc77392f29de10381d5a28bd38f0.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/zookeeper-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13-r1.ebuild sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13.ebuild X-VCS-Directories: sys-cluster/zookeeper-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: ab0af71fdbb6bc77392f29de10381d5a28bd38f0 X-VCS-Branch: master Date: Tue, 1 Sep 2020 09:07:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7e7158ff-0145-404e-9088-7ba57b2a7a2d X-Archives-Hash: 3e8e6b4ce8ea53c4b4bfdc8fb9c4f507 commit: ab0af71fdbb6bc77392f29de10381d5a28bd38f0 Author: Michał Górny gentoo org> AuthorDate: Tue Sep 1 08:41:46 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Sep 1 09:07:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab0af71f sys-cluster/zookeeper-bin: Remove python2 Closes: https://bugs.gentoo.org/735490 Signed-off-by: Michał Górny gentoo.org> ...r-bin-3.4.13.ebuild => zookeeper-bin-3.4.13-r1.ebuild} | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) 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 similarity index 82% rename from sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13.ebuild rename to sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13-r1.ebuild index 23a5a2025ee..940d9e7fa92 100644 --- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13.ebuild +++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13-r1.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit distutils-r1 eutils java-utils-2 user +inherit eutils java-utils-2 user MY_P="zookeeper" MY_PN=${MY_P}-${PV} @@ -33,11 +32,6 @@ pkg_setup() { } src_prepare() { - # python - sed -e "s|src/c/zookeeper.c|zookeeper.c|g" \ - -e "s|../../../|${S}|g" \ - -i contrib/zkpython/src/python/setup.py || die - # whyyyy u -Werror ?! so horribal! sed -e 's/-Werror//g' -i src/c/Makefile.* || die "Failed to rectify the Makefile" } @@ -55,13 +49,6 @@ src_compile() { src_install() { local DATA_DIR=/var/lib/${MY_P} - # python - cd "${S}"/contrib/zkpython/ || die - mv src/python/setup.py . - mv src/c/* . - python_foreach_impl distutils-r1_src_install - cd "${S}" || die - # cleanup sources rm -rf src/ || die rm bin/*.cmd || die