commit: 670c8912b8e9889196d5c02e0c119920fc497566 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Oct 9 08:32:35 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Oct 9 08:43:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=670c8912
sys-cluster/ganglia: Eradicate py2 Closes: https://bugs.gentoo.org/735496 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild | 62 ++--------------------------- 1 file changed, 4 insertions(+), 58 deletions(-) diff --git a/sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild b/sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild index a5c08bf4977..ee9127bb930 100644 --- a/sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild +++ b/sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild @@ -3,10 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_OPTIONAL=1 - -inherit distutils-r1 flag-o-matic systemd toolchain-funcs +inherit flag-o-matic systemd toolchain-funcs DESCRIPTION="A scalable distributed monitoring system for clusters and grids" HOMEPAGE="http://ganglia.sourceforge.net/"; @@ -15,8 +12,7 @@ SRC_URI="mirror://sourceforge/ganglia/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="minimal pcre python examples" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +IUSE="minimal pcre examples" DEPEND="dev-libs/confuse dev-libs/expat @@ -24,8 +20,7 @@ DEPEND="dev-libs/confuse net-libs/libnsl:0= net-libs/libtirpc:0= !dev-db/firebird - pcre? ( dev-libs/libpcre ) - python? ( ${PYTHON_DEPS} )" + pcre? ( dev-libs/libpcre )" RDEPEND=" ${DEPEND} @@ -33,21 +28,7 @@ RDEPEND=" BDEPEND="virtual/pkgconfig" -src_prepare() { - if use python && ! use minimal; then - pushd gmetad-python >/dev/null || die - distutils-r1_src_prepare - popd >/dev/null || die - else - default_src_prepare - fi -} - src_configure() { - if use python; then - python_setup - fi - append-flags $("$(tc-getPKG_CONFIG)" --cflags libtirpc) append-libs $("$(tc-getPKG_CONFIG)" --libs libtirpc) @@ -56,21 +37,11 @@ src_configure() { --enable-gexec \ --sysconfdir="${EPREFIX}"/etc/${PN} \ --enable-static=no \ - $(use_enable python) \ + --disable-python \ $(use_with pcre libpcre) \ $(use_with !minimal gmetad) } -src_compile() { - default_src_compile - - if use python && ! use minimal; then - pushd gmetad-python >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi -} - src_install() { local exdir=/usr/share/doc/${P} @@ -81,19 +52,11 @@ src_install() { dodoc AUTHORS INSTALL NEWS README dodir /etc/ganglia/conf.d - use python && dodir /usr/$(get_libdir)/ganglia/python_modules gmond/gmond -t > "${ED}"/etc/ganglia/gmond.conf if use examples; then insinto ${exdir}/cmod-examples doins gmond/modules/example/*.c - if use python; then - # Installing as an examples per upstream. - insinto ${exdir}/pymod-examples - doins gmond/python_modules/*/*.py - insinto ${exdir}/pymod-examples/conf.d - doins gmond/python_modules/conf.d/*.pyconf - fi fi if ! use minimal; then @@ -104,23 +67,6 @@ src_install() { newinitd "${FILESDIR}"/gmetad.rc-2 gmetad keepdir /var/lib/ganglia/rrds fowners nobody:nobody /var/lib/ganglia/rrds - - if use python; then - pushd gmetad-python >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - newinitd "${FILESDIR}"/gmetad-python.rc gmetad-python - fi - fi -} - -src_test() { - default_src_test - - if use python && ! use minimal; then - pushd gmetad-python >/dev/null || die - distutils-r1_src_test - popd >/dev/null || die fi }
