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/ganglia/
Date: Fri, 09 Oct 2020 08:53:22
Message-Id: 1602232990.670c8912b8e9889196d5c02e0c119920fc497566.mgorny@gentoo
1 commit: 670c8912b8e9889196d5c02e0c119920fc497566
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 9 08:32:35 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 9 08:43:10 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=670c8912
7
8 sys-cluster/ganglia: Eradicate py2
9
10 Closes: https://bugs.gentoo.org/735496
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild | 62 ++---------------------------
14 1 file changed, 4 insertions(+), 58 deletions(-)
15
16 diff --git a/sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild b/sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild
17 index a5c08bf4977..ee9127bb930 100644
18 --- a/sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild
19 +++ b/sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild
20 @@ -3,10 +3,7 @@
21
22 EAPI=7
23
24 -PYTHON_COMPAT=( python2_7 )
25 -DISTUTILS_OPTIONAL=1
26 -
27 -inherit distutils-r1 flag-o-matic systemd toolchain-funcs
28 +inherit flag-o-matic systemd toolchain-funcs
29
30 DESCRIPTION="A scalable distributed monitoring system for clusters and grids"
31 HOMEPAGE="http://ganglia.sourceforge.net/"
32 @@ -15,8 +12,7 @@ SRC_URI="mirror://sourceforge/ganglia/${P}.tar.gz"
33 LICENSE="BSD"
34 SLOT="0"
35 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
36 -IUSE="minimal pcre python examples"
37 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
38 +IUSE="minimal pcre examples"
39
40 DEPEND="dev-libs/confuse
41 dev-libs/expat
42 @@ -24,8 +20,7 @@ DEPEND="dev-libs/confuse
43 net-libs/libnsl:0=
44 net-libs/libtirpc:0=
45 !dev-db/firebird
46 - pcre? ( dev-libs/libpcre )
47 - python? ( ${PYTHON_DEPS} )"
48 + pcre? ( dev-libs/libpcre )"
49
50 RDEPEND="
51 ${DEPEND}
52 @@ -33,21 +28,7 @@ RDEPEND="
53
54 BDEPEND="virtual/pkgconfig"
55
56 -src_prepare() {
57 - if use python && ! use minimal; then
58 - pushd gmetad-python >/dev/null || die
59 - distutils-r1_src_prepare
60 - popd >/dev/null || die
61 - else
62 - default_src_prepare
63 - fi
64 -}
65 -
66 src_configure() {
67 - if use python; then
68 - python_setup
69 - fi
70 -
71 append-flags $("$(tc-getPKG_CONFIG)" --cflags libtirpc)
72 append-libs $("$(tc-getPKG_CONFIG)" --libs libtirpc)
73
74 @@ -56,21 +37,11 @@ src_configure() {
75 --enable-gexec \
76 --sysconfdir="${EPREFIX}"/etc/${PN} \
77 --enable-static=no \
78 - $(use_enable python) \
79 + --disable-python \
80 $(use_with pcre libpcre) \
81 $(use_with !minimal gmetad)
82 }
83
84 -src_compile() {
85 - default_src_compile
86 -
87 - if use python && ! use minimal; then
88 - pushd gmetad-python >/dev/null || die
89 - distutils-r1_src_compile
90 - popd >/dev/null || die
91 - fi
92 -}
93 -
94 src_install() {
95 local exdir=/usr/share/doc/${P}
96
97 @@ -81,19 +52,11 @@ src_install() {
98 dodoc AUTHORS INSTALL NEWS README
99
100 dodir /etc/ganglia/conf.d
101 - use python && dodir /usr/$(get_libdir)/ganglia/python_modules
102 gmond/gmond -t > "${ED}"/etc/ganglia/gmond.conf
103
104 if use examples; then
105 insinto ${exdir}/cmod-examples
106 doins gmond/modules/example/*.c
107 - if use python; then
108 - # Installing as an examples per upstream.
109 - insinto ${exdir}/pymod-examples
110 - doins gmond/python_modules/*/*.py
111 - insinto ${exdir}/pymod-examples/conf.d
112 - doins gmond/python_modules/conf.d/*.pyconf
113 - fi
114 fi
115
116 if ! use minimal; then
117 @@ -104,23 +67,6 @@ src_install() {
118 newinitd "${FILESDIR}"/gmetad.rc-2 gmetad
119 keepdir /var/lib/ganglia/rrds
120 fowners nobody:nobody /var/lib/ganglia/rrds
121 -
122 - if use python; then
123 - pushd gmetad-python >/dev/null || die
124 - distutils-r1_src_install
125 - popd >/dev/null || die
126 - newinitd "${FILESDIR}"/gmetad-python.rc gmetad-python
127 - fi
128 - fi
129 -}
130 -
131 -src_test() {
132 - default_src_test
133 -
134 - if use python && ! use minimal; then
135 - pushd gmetad-python >/dev/null || die
136 - distutils-r1_src_test
137 - popd >/dev/null || die
138 fi
139 }