From 8c60c70ca8891b2b3871ed1b8745813af3be239e Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Thu, 12 Jul 2018 23:48:14 +0200
Subject: [PATCH 1/7] Purge the ganglia-web package, it's contained in the main
 portage tree.

---
 sys-cluster/ganglia-web/ChangeLog             |  5 --
 sys-cluster/ganglia-web/Manifest              |  4 --
 .../ganglia-web/ganglia-web-3.7.3.ebuild      | 62 -------------------
 sys-cluster/ganglia-web/metadata.xml          | 11 ----
 4 files changed, 82 deletions(-)
 delete mode 100644 sys-cluster/ganglia-web/ChangeLog
 delete mode 100644 sys-cluster/ganglia-web/Manifest
 delete mode 100644 sys-cluster/ganglia-web/ganglia-web-3.7.3.ebuild
 delete mode 100644 sys-cluster/ganglia-web/metadata.xml

diff --git a/sys-cluster/ganglia-web/ChangeLog b/sys-cluster/ganglia-web/ChangeLog
deleted file mode 100644
index 00b00f3..0000000
--- a/sys-cluster/ganglia-web/ChangeLog
+++ /dev/null
@@ -1,5 +0,0 @@
-  08 Mar 2018; Manuel Friedli <manuel@fritteli.ch> -ganglia-web-3.7.2.ebuild:
-  sys-cluster/ganglia-web:  Purge old version of ganglia-web
-
-  08 Mar 2018; Manuel Friedli <manuel@fritteli.ch> ganglia-web-3.7.3.ebuild:
-  sys-cluster/ganglia-web:  Add ebuild for version 3.7.3
diff --git a/sys-cluster/ganglia-web/Manifest b/sys-cluster/ganglia-web/Manifest
deleted file mode 100644
index 2138782..0000000
--- a/sys-cluster/ganglia-web/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ganglia-web-3.7.3.tar.gz 709356 SHA256 77f49198d11f61e94d5b7833c8b1a7b4b1548fe3633404f462b6f5671db369ee SHA512 884b1ba168b8fe01aa865ae77df6995bb5a09a8b2d441189264283fc1c95b8a6fd0800488ad75e9c1cdd3694b9d6c1c33218ddad804ade2d6be948791b797a95 WHIRLPOOL 44d1614643925d6459e58cd925b7bf3724b05012e178ddc65d435f74b0566ac5072de0c03b483babd02e8920ed6a48721f4a18afc59c72f849ce7323ca8501cd
-EBUILD ganglia-web-3.7.3.ebuild 1193 SHA256 6f4883dae1d458eb77659bd66ff9e51ea2621392cff56b01064087087f6d8c61 SHA512 c21d0a341aea9787d1a50c81fe32b3f663d586018e43736ee8bb04ffebe40b81e5cfcedf2eac9699a20aaab1cda77f8eceddcff0c0d019301e9c2dbb2c437baa WHIRLPOOL 7497c4fac5e6880d016ab7ccb2bc25acfb032fd957b59a2ad3aea009d333b8938846768e08f2d34aa1c0f705283cf12e8ba2c048662029d28f0d8c98efe891d2
-MISC ChangeLog 274 SHA256 7fc41bb9e5925b529887e4b2f7feec98fce2aa96eca32b86e462eed8b7c1470e SHA512 8364f04972443c3b790849057b056679ccfba716e7dc5431f903012a86eae5de3f67a9488306a64e8ce44b9269559fb3a4b45079fc64bb8fd26a3a630384d727 WHIRLPOOL 4528f93808ea001321e56cec30f1160257a4abde7b4156d34fab316595428cf39079a1738c0114a89af2f5c045f6eceb0646fbc28383ae4945d4ad900215deb2
-MISC metadata.xml 334 SHA256 a0156eea226535177cb784d92cec49e67ab431b69a129bd5f792d2b11804ccde SHA512 9b58ae22b5ef2ebe1d7b247b179273a68033ccbc01c78969a2ec10a2a3932432ea4328b91e192b30dcef84381313fff1d26fc0e4d7e4cf70f0a36aa9c3cd8a63 WHIRLPOOL 7a92b4c49c9d0a34865d7e5ff49dccc327e2b8f12e58c9ae494757c6d40ace8819027d23dc382f9ab53cbefbe74f0e046d51fbec63e8d6ad705a400a21ebb224
diff --git a/sys-cluster/ganglia-web/ganglia-web-3.7.3.ebuild b/sys-cluster/ganglia-web/ganglia-web-3.7.3.ebuild
deleted file mode 100644
index cbdaeda..0000000
--- a/sys-cluster/ganglia-web/ganglia-web-3.7.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WEBAPP_MANUAL_SLOT="yes"
-inherit webapp eutils
-
-DESCRIPTION="Web frontend for sys-cluster/ganglia"
-HOMEPAGE="http://ganglia.sourceforge.net"
-SRC_URI="https://github.com/ganglia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="vhosts"
-RESTRICT="mirror"
-
-DEPEND="net-misc/rsync"
-RDEPEND="
-	${DEPEND}
-	${WEBAPP_DEPEND}
-	>=sys-cluster/ganglia-3.7.0[-minimal]
-	dev-lang/php[gd,xml,ctype,cgi]
-	media-fonts/dejavu"
-
-src_configure() {
-	return 0
-}
-
-src_compile() {
-	return 0
-}
-
-src_prepare() {
-	eapply_user
-	return 0
-}
-
-src_install() {
-	webapp_src_preinst
-	cd "${S}"
-	emake \
-		GDESTDIR="${MY_HTDOCSDIR}" \
-		DESTDIR="${D}" \
-		APACHE_USER=nobody \
-		install || die
-	webapp_configfile "${MY_HTDOCSDIR}"/conf_default.php
-	webapp_src_install
-
-	fowners -R nobody:nobody /var/lib/ganglia-web/dwoo
-	fperms -R 777 /var/lib/ganglia-web/dwoo
-
-	dodoc AUTHORS README TODO || die
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	# upgrade from < 3.5.6
-	if [ -d "${ROOT}"/var/lib/ganglia/dwoo ]; then
-		rm -rf "${ROOT}"/var/lib/ganglia/dwoo || die
-	fi
-}
diff --git a/sys-cluster/ganglia-web/metadata.xml b/sys-cluster/ganglia-web/metadata.xml
deleted file mode 100644
index 89825de..0000000
--- a/sys-cluster/ganglia-web/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cluster@gentoo.org</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">ganglia</remote-id>
-	</upstream>
-</pkgmetadata>
-- 
2.45.2


From f5a9aaa6422f567a252b3c5af9a3ec6b61bf6ddb Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Thu, 12 Jul 2018 23:58:23 +0200
Subject: [PATCH 2/7] Add ebuild for ganglia-3.7.2, the latest release.

---
 sys-cluster/ganglia/Manifest               |   8 ++
 sys-cluster/ganglia/files/gmetad-python.rc |  30 +++++
 sys-cluster/ganglia/files/gmetad.rc        |  18 +++
 sys-cluster/ganglia/files/gmetad.rc-2      |  28 +++++
 sys-cluster/ganglia/files/gmond.rc         |  18 +++
 sys-cluster/ganglia/files/gmond.rc-2       |  28 +++++
 sys-cluster/ganglia/ganglia-3.7.2.ebuild   | 127 +++++++++++++++++++++
 sys-cluster/ganglia/metadata.xml           |  11 ++
 8 files changed, 268 insertions(+)
 create mode 100644 sys-cluster/ganglia/Manifest
 create mode 100644 sys-cluster/ganglia/files/gmetad-python.rc
 create mode 100644 sys-cluster/ganglia/files/gmetad.rc
 create mode 100644 sys-cluster/ganglia/files/gmetad.rc-2
 create mode 100644 sys-cluster/ganglia/files/gmond.rc
 create mode 100644 sys-cluster/ganglia/files/gmond.rc-2
 create mode 100644 sys-cluster/ganglia/ganglia-3.7.2.ebuild
 create mode 100644 sys-cluster/ganglia/metadata.xml

diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest
new file mode 100644
index 0000000..92e54bb
--- /dev/null
+++ b/sys-cluster/ganglia/Manifest
@@ -0,0 +1,8 @@
+AUX gmetad-python.rc 618 BLAKE2B 476915bff06395d3451d256f4fef3d4a2aa96c866b9cae5227d19f60ecbffce0dc2e7f4513726564bff808ea3b2bd109ee8daff10975e9b1043f97733accc608 SHA512 1b23e84c453b0cd0aca8b340c9764adb79bccbc0b4a9574a1e5c7299bc8d497d30a2a56e9b855d3cda2664a856b404f4f6941b3feddbec889e45a59c92c05389
+AUX gmetad.rc 352 BLAKE2B 68629711870d52a198ae474b77ab7828987c2ac19551243063272ec50c61c3e0b2d32a08633ff878e3319a80f9bbc111ac5e7507c88164ea4ddb8244a0b9e41f SHA512 865e1f8622ebcf1103f0cb72ebc2d675af01e9ea0861fd43107ac2bca10d9e86f875741ae4cc1dabf0eb231fd3f907066974d82b245f2746acbad0f7eafb46af
+AUX gmetad.rc-2 480 BLAKE2B 9ebf71eca6c80aa5f5c776e292cc0ceee58103a30a7aad29e7430f766a58e6c58222113bc12bc7ddc74c4c3f6f5aaccc95ff7470321bbd3ccb87af1e704be7ae SHA512 37678fe9b52ce7c6ef38bcc764189ed26e10410567ac9a8608460ac3eab380c70ac91453ed425ffef8d6e86ff6ef609e0167f5bb04a2aa9318725527d31391fa
+AUX gmond.rc 346 BLAKE2B 8930fe96692c100de0feed00fbe1d5f39c3d6f9679f88ef0326b1c6b7cf6408ddba2d909027577299f5d063f765f9c9ddb26c96b0582b79b50f528ac2bffaba2 SHA512 0d1d4da1bfc2c20ae741fb9a7ee2e649780254029c50fee866f1fffdb55fddbd61ea3ead6670d7a65489d780990e24c6743c14bc1a4a7040b84972f4884629ca
+AUX gmond.rc-2 473 BLAKE2B 461d0b481f2138dcab8f7202a880354740b71f91e41ad2152a3465daf8072e6243fcc5f27ee215aa079dad30546e06146c01be71e85f518974cd9c479549ff34 SHA512 bbb5e3c525137aa2072bd46d28473523498895eba70c8dad1209230ea5e7f44ddc09875b5b6065fd5351d89ed0ad574a94fe0debcbe1d3a51e2541715adb4240
+DIST ganglia-3.7.2.tar.gz 1302320 BLAKE2B aee647d6ec4b2852536769773dd54d7a7e9ca33c05de4316172d530aee549207bdfa59f25e8fe456ae4c01a1af9eca3846f30242c64e7d9fe393687a7203eb12 SHA512 a88955e59421a447e5752a9bfe5f599d989a7a5a0141141ab3601d1ab250be4eebbede8bcef8baa151b2f9deaf3f56e30aef8ea709f3cc820a79fa3d3961e0df
+EBUILD ganglia-3.7.2.ebuild 2933 BLAKE2B ce04bee04d324b3633017cc4d05973ed66118fd82f9f2c9b874acbc35ce3c02d0a8eee80f1e09fdfdc2be03876b2433c7885f4550b88e229fe940a49d28835c7 SHA512 d632e9527a8d356f7515a9dc5fd68f616f21dd611c4629bc6463179c754a4e25b24abfdd591441138a70f45d18c17ecd3c7e3a562879374185b52bbf86546ab1
+MISC metadata.xml 325 BLAKE2B 71ac60956aa877d76ec897fa1c07082c2b0d8d18db7e9d17248e3c730def736b5a70ffdf371d0d4d38aba338efc0689d5cb24dd08c084934e4d23914da48fc4f SHA512 c3cc85ba47cd58ccba2a511b1bcdac2de4cd40b69bc005935291c9394bde3ed55ce14d57d0c3ab0bc188b5116192f0851cb1be3e4eaeb190555e50920fcdb4fb
diff --git a/sys-cluster/ganglia/files/gmetad-python.rc b/sys-cluster/ganglia/files/gmetad-python.rc
new file mode 100644
index 0000000..a01e42e
--- /dev/null
+++ b/sys-cluster/ganglia/files/gmetad-python.rc
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE=/var/run/gmetad-python.pid
+
+depend() {
+	need net
+	after ntp-client ntpd
+}
+
+start() {
+	ebegin "Starting GANGLIA gmetad-python: "
+	start-stop-daemon \
+		--start --quiet \
+		--exec /usr/bin/gmetad.py \
+		--pidfile ${PIDFILE} \
+		-- \
+		-p ${PIDFILE}
+	eend $? "Failed to start gmetad-python"
+}
+
+stop() {
+	ebegin "Shutting down GANGLIA gmetad-python: "
+	start-stop-daemon \
+		--stop --quiet \
+		--pidfile ${PIDFILE} \
+		--exec /usr/bin/gmetad.py
+	eend $? "Failed to stop gmetad-python"
+}
diff --git a/sys-cluster/ganglia/files/gmetad.rc b/sys-cluster/ganglia/files/gmetad.rc
new file mode 100644
index 0000000..bb57487
--- /dev/null
+++ b/sys-cluster/ganglia/files/gmetad.rc
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+
+depend() {
+	need net
+	after ntp-client ntpd
+}
+
+start() {
+	ebegin "Starting GANGLIA gmetad: "
+	start-stop-daemon --start --quiet --exec /usr/sbin/gmetad
+	eend $? "Failed to start gmetad"
+}
+
+stop() {
+	ebegin "Shutting down GANGLIA gmetad: "
+	start-stop-daemon --stop --quiet --exec /usr/sbin/gmetad
+	eend $? "Failed to stop gmetad"
+}
diff --git a/sys-cluster/ganglia/files/gmetad.rc-2 b/sys-cluster/ganglia/files/gmetad.rc-2
new file mode 100644
index 0000000..6b1306b
--- /dev/null
+++ b/sys-cluster/ganglia/files/gmetad.rc-2
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+
+PIDFILE=/var/run/gmetad.pid
+
+depend() {
+	need net
+	after ntp-client ntpd
+}
+
+start() {
+	ebegin "Starting GANGLIA gmetad: "
+	start-stop-daemon \
+		--start --quiet \
+		--exec /usr/sbin/gmetad \
+		--pidfile ${PIDFILE} \
+		-- \
+		--pid-file=${PIDFILE}
+	eend $? "Failed to start gmetad"
+}
+
+stop() {
+	ebegin "Shutting down GANGLIA gmetad: "
+	start-stop-daemon \
+		--stop --quiet \
+		--pidfile ${PIDFILE} \
+		--exec /usr/sbin/gmetad
+	eend $? "Failed to stop gmetad"
+}
diff --git a/sys-cluster/ganglia/files/gmond.rc b/sys-cluster/ganglia/files/gmond.rc
new file mode 100644
index 0000000..621be8d
--- /dev/null
+++ b/sys-cluster/ganglia/files/gmond.rc
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+
+depend() {
+	need net
+	after ntp-client ntpd
+}
+
+start() {
+	ebegin "Starting GANGLIA gmond: "
+	start-stop-daemon --start --quiet --exec /usr/sbin/gmond
+	eend $? "Failed to start gmond"
+}
+
+stop() {
+	ebegin "Shutting down GANGLIA gmond: "
+	start-stop-daemon --stop --quiet --exec /usr/sbin/gmond
+	eend $? "Failed to stop gmond"
+}
diff --git a/sys-cluster/ganglia/files/gmond.rc-2 b/sys-cluster/ganglia/files/gmond.rc-2
new file mode 100644
index 0000000..fb07e19
--- /dev/null
+++ b/sys-cluster/ganglia/files/gmond.rc-2
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+
+PIDFILE=/var/run/gmond.pid
+
+depend() {
+	need net
+	after ntp-client ntpd
+}
+
+start() {
+	ebegin "Starting GANGLIA gmond: "
+	start-stop-daemon \
+		--start --quiet \
+		--exec /usr/sbin/gmond \
+		--pidfile ${PIDFILE} \
+		-- \
+		--pid-file=${PIDFILE}
+	eend $? "Failed to start gmond"
+}
+
+stop() {
+	ebegin "Shutting down GANGLIA gmond: "
+	start-stop-daemon \
+		--stop --quiet \
+		--pidfile ${PIDFILE} \
+		--exec /usr/sbin/gmond
+	eend $? "Failed to stop gmond"
+}
diff --git a/sys-cluster/ganglia/ganglia-3.7.2.ebuild b/sys-cluster/ganglia/ganglia-3.7.2.ebuild
new file mode 100644
index 0000000..35687f4
--- /dev/null
+++ b/sys-cluster/ganglia/ganglia-3.7.2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 eutils multilib systemd
+
+DESCRIPTION="A scalable distributed monitoring system for clusters and grids"
+HOMEPAGE="http://ganglia.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ganglia/${P}.tar.gz"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="minimal pcre python examples"
+
+DEPEND="dev-libs/confuse
+	dev-libs/expat
+	>=dev-libs/apr-1.0
+	net-libs/libnsl:0=
+	!dev-db/firebird
+	pcre? ( dev-libs/libpcre )
+	python? ( ${PYTHON_DEPS} )"
+
+RDEPEND="
+	${DEPEND}
+	!minimal? ( net-analyzer/rrdtool )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+	if use python && ! use minimal; then
+		pushd gmetad-python >/dev/null || die
+		distutils-r1_src_prepare
+		popd >/dev/null || die
+	fi
+}
+
+src_configure() {
+	if use python; then
+		python_setup
+	fi
+
+	econf \
+		--with-systemdsystemunitdir=$(systemd_get_unitdir) \
+		--enable-gexec \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--enable-static=no \
+		$(use_enable 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}
+
+	emake DESTDIR="${D}" install || die
+
+	newinitd "${FILESDIR}"/gmond.rc-2 gmond
+	doman {mans/*.1,gmond/*.5} || die "Failed to install manpages"
+	dodoc AUTHORS INSTALL NEWS README || die
+
+	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
+		insinto /etc/ganglia
+		doins gmetad/gmetad.conf
+		doman mans/gmetad.1
+
+		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
+}
+
+pkg_postinst() {
+	elog "A default configuration file for gmond has been generated"
+	elog "for you as a template by running:"
+	elog "    /usr/sbin/gmond -t > /etc/ganglia/gmond.conf"
+
+	elog "The web frontend for Ganglia has been split off.  Emerge"
+	elog "sys-cluster/ganglia-web if you need it."
+}
diff --git a/sys-cluster/ganglia/metadata.xml b/sys-cluster/ganglia/metadata.xml
new file mode 100644
index 0000000..7698f3c
--- /dev/null
+++ b/sys-cluster/ganglia/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>manuel@fritteli.ch</email>
+		<name>Manuel Friedli</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ganglia</remote-id>
+	</upstream>
+</pkgmetadata>
-- 
2.45.2


From da80bcfd6a8f4f6a3f6f8fb2d4d7864545253990 Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Fri, 13 Jul 2018 01:35:01 +0200
Subject: [PATCH 3/7] Intermediate commit: Compilation works, but it errors out
 at link time.

---
 sys-cluster/ganglia/Manifest                  |   3 +-
 ...01-3.7.2-use-tirpc-instead-of-sunrpc.patch | 196 ++++++++++++++++++
 sys-cluster/ganglia/ganglia-3.7.2.ebuild      |   6 +-
 3 files changed, 203 insertions(+), 2 deletions(-)
 create mode 100644 sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch

diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest
index 92e54bb..2a36f12 100644
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@@ -1,8 +1,9 @@
+AUX 01-3.7.2-use-tirpc-instead-of-sunrpc.patch 6745 BLAKE2B 3099441ac39935c2bff5640999f98c0aa58d00d376c9901e77b1a13259a622149ff5d3c6656fa274eeea3727afe301c101df1f2fac0a30c6c8ec40c64c8df776 SHA512 e25ec9717f5d4614ceb54bff75235be7cf2c9c6667880a08a72e771385579479eae00c7a4ffc34f9eb8c2e9db6d9059ddcff09f5e9e9553fc3f6adfda3d34687
 AUX gmetad-python.rc 618 BLAKE2B 476915bff06395d3451d256f4fef3d4a2aa96c866b9cae5227d19f60ecbffce0dc2e7f4513726564bff808ea3b2bd109ee8daff10975e9b1043f97733accc608 SHA512 1b23e84c453b0cd0aca8b340c9764adb79bccbc0b4a9574a1e5c7299bc8d497d30a2a56e9b855d3cda2664a856b404f4f6941b3feddbec889e45a59c92c05389
 AUX gmetad.rc 352 BLAKE2B 68629711870d52a198ae474b77ab7828987c2ac19551243063272ec50c61c3e0b2d32a08633ff878e3319a80f9bbc111ac5e7507c88164ea4ddb8244a0b9e41f SHA512 865e1f8622ebcf1103f0cb72ebc2d675af01e9ea0861fd43107ac2bca10d9e86f875741ae4cc1dabf0eb231fd3f907066974d82b245f2746acbad0f7eafb46af
 AUX gmetad.rc-2 480 BLAKE2B 9ebf71eca6c80aa5f5c776e292cc0ceee58103a30a7aad29e7430f766a58e6c58222113bc12bc7ddc74c4c3f6f5aaccc95ff7470321bbd3ccb87af1e704be7ae SHA512 37678fe9b52ce7c6ef38bcc764189ed26e10410567ac9a8608460ac3eab380c70ac91453ed425ffef8d6e86ff6ef609e0167f5bb04a2aa9318725527d31391fa
 AUX gmond.rc 346 BLAKE2B 8930fe96692c100de0feed00fbe1d5f39c3d6f9679f88ef0326b1c6b7cf6408ddba2d909027577299f5d063f765f9c9ddb26c96b0582b79b50f528ac2bffaba2 SHA512 0d1d4da1bfc2c20ae741fb9a7ee2e649780254029c50fee866f1fffdb55fddbd61ea3ead6670d7a65489d780990e24c6743c14bc1a4a7040b84972f4884629ca
 AUX gmond.rc-2 473 BLAKE2B 461d0b481f2138dcab8f7202a880354740b71f91e41ad2152a3465daf8072e6243fcc5f27ee215aa079dad30546e06146c01be71e85f518974cd9c479549ff34 SHA512 bbb5e3c525137aa2072bd46d28473523498895eba70c8dad1209230ea5e7f44ddc09875b5b6065fd5351d89ed0ad574a94fe0debcbe1d3a51e2541715adb4240
 DIST ganglia-3.7.2.tar.gz 1302320 BLAKE2B aee647d6ec4b2852536769773dd54d7a7e9ca33c05de4316172d530aee549207bdfa59f25e8fe456ae4c01a1af9eca3846f30242c64e7d9fe393687a7203eb12 SHA512 a88955e59421a447e5752a9bfe5f599d989a7a5a0141141ab3601d1ab250be4eebbede8bcef8baa151b2f9deaf3f56e30aef8ea709f3cc820a79fa3d3961e0df
-EBUILD ganglia-3.7.2.ebuild 2933 BLAKE2B ce04bee04d324b3633017cc4d05973ed66118fd82f9f2c9b874acbc35ce3c02d0a8eee80f1e09fdfdc2be03876b2433c7885f4550b88e229fe940a49d28835c7 SHA512 d632e9527a8d356f7515a9dc5fd68f616f21dd611c4629bc6463179c754a4e25b24abfdd591441138a70f45d18c17ecd3c7e3a562879374185b52bbf86546ab1
+EBUILD ganglia-3.7.2.ebuild 3041 BLAKE2B 0aa4dd49dcb9e10120717302ff4f9e09b2e8e9c0fd17021294ed5fcd163b9c69f4df99dd7d542819013d156c23dd40375f040acb6f71e9138f093731b73907ca SHA512 3717a4c024f1dfbb570a81a583c8dba91388abbffc5af82738739fcfeccc499b3448e335e1a313ca142cf8e9d02424fe8b8665454ea1d2b18bae8cbe6672bc85
 MISC metadata.xml 325 BLAKE2B 71ac60956aa877d76ec897fa1c07082c2b0d8d18db7e9d17248e3c730def736b5a70ffdf371d0d4d38aba338efc0689d5cb24dd08c084934e4d23914da48fc4f SHA512 c3cc85ba47cd58ccba2a511b1bcdac2de4cd40b69bc005935291c9394bde3ed55ce14d57d0c3ab0bc188b5116192f0851cb1be3e4eaeb190555e50920fcdb4fb
diff --git a/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch b/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch
new file mode 100644
index 0000000..6e0bcda
--- /dev/null
+++ b/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch
@@ -0,0 +1,196 @@
+diff --git a/Makefile.am b/Makefile.am
+index 95d0807..105222b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -9,7 +9,7 @@ GMETAD_SUBDIR =
+ endif
+ 
+ EXTRA_SUBDIRS = "gmetad-python contrib solaris"
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ 
+ AUTOMAKE_OPTIONS = dist-bzip2 dist-tarZ dist-zip
+ ACLOCAL_AMFLAGS = -I m4
+diff --git a/configure.ac b/configure.ac
+index fe7983b..984c70b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -606,13 +606,13 @@ AC_CHECK_HEADER([sys/mount.h], [], [],
+ #endif
+ ])
+ 
+-AC_CHECK_HEADERS(rpc/types.h)
+-AC_CHECK_HEADER([rpc/xdr.h], [],
+-   [AC_MSG_ERROR([your system is missing the Sun RPC (ONC/RPC) libraries])],
+-[#ifdef HAVE_RPC_TYPES_H
+-# include <rpc/types.h>
+-#endif
+-])
++PKG_CHECK_MODULES([TIRPC],
++                  [libtirpc],
++                  [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
++                  [AC_MSG_ERROR([libtirpc requested, but library not found.])]
++)
++AC_SUBST(RPC_CFLAGS)
++AC_SUBST(RPC_LIBS)
+ 
+ dnl ##################################################################
+ dnl Checks for typedefs.
+diff --git a/gmetad/Makefile.am b/gmetad/Makefile.am
+index 0a4e360..874d448 100644
+--- a/gmetad/Makefile.am
++++ b/gmetad/Makefile.am
+@@ -11,7 +11,7 @@ GLDADD =
+ GLDFLAGS = 
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ AM_CFLAGS = -I$(top_builddir)/lib -I$(top_builddir)/gmond -I$(top_builddir)/libmetrics -I$(top_builddir)/include $(GCFLAGS) @PROTOBUF_C_CFLAGS@
+ 
+ sbin_PROGRAMS = gmetad
+diff --git a/gmetric/Makefile.am b/gmetric/Makefile.am
+index bc7807c..d9bf585 100644
+--- a/gmetric/Makefile.am
++++ b/gmetric/Makefile.am
+@@ -10,7 +10,7 @@ GLDADD =
+ GLDFLAGS = 
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ 
+ AM_CFLAGS = -I../lib -I../include $(GCFLAGS)
+ 
+diff --git a/gmond/Makefile.am b/gmond/Makefile.am
+index 256fee3..d6f5f07 100644
+--- a/gmond/Makefile.am
++++ b/gmond/Makefile.am
+@@ -44,7 +44,7 @@ if BUILD_SFLOW
+ GCFLAGS += -DSFLOW
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ AM_CFLAGS = -I$(top_builddir)/lib -I$(top_builddir)/include/ -I$(top_builddir)/libmetrics $(GCFLAGS)
+ 
+ sbin_PROGRAMS = gmond
+diff --git a/gmond/modules/cpu/Makefile.am b/gmond/modules/cpu/Makefile.am
+index fd7457e..99ddb83 100644
+--- a/gmond/modules/cpu/Makefile.am
++++ b/gmond/modules/cpu/Makefile.am
+@@ -25,4 +25,4 @@ modload_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ 
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/disk/Makefile.am b/gmond/modules/disk/Makefile.am
+index 0c78689..2f5a2f0 100644
+--- a/gmond/modules/disk/Makefile.am
++++ b/gmond/modules/disk/Makefile.am
+@@ -11,4 +11,4 @@ moddisk_la_LDFLAGS = -module -avoid-version
+ moddisk_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/example/Makefile.am b/gmond/modules/example/Makefile.am
+index e3bff6a..18b4e3b 100644
+--- a/gmond/modules/example/Makefile.am
++++ b/gmond/modules/example/Makefile.am
+@@ -11,7 +11,7 @@ modexample_la_LDFLAGS = -module -avoid-version
+ EXTRA_DIST = ../conf.d/example.conf
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ 
+ install:
+ 	@echo
+diff --git a/gmond/modules/memory/Makefile.am b/gmond/modules/memory/Makefile.am
+index 82336db..06ad430 100644
+--- a/gmond/modules/memory/Makefile.am
++++ b/gmond/modules/memory/Makefile.am
+@@ -12,4 +12,4 @@ modmem_la_LDFLAGS = -module -avoid-version
+ modmem_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/network/Makefile.am b/gmond/modules/network/Makefile.am
+index 72a4faf..c370d88 100644
+--- a/gmond/modules/network/Makefile.am
++++ b/gmond/modules/network/Makefile.am
+@@ -12,4 +12,4 @@ modnet_la_LDFLAGS = -module -avoid-version
+ modnet_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/perl/Makefile.am b/gmond/modules/perl/Makefile.am
+index b7b095c..f1d0fb9 100644
+--- a/gmond/modules/perl/Makefile.am
++++ b/gmond/modules/perl/Makefile.am
+@@ -28,4 +28,4 @@ install-exec-hook:	../conf.d/modperl.conf README
+ 	mkdir -p $(DESTDIR)$(sysconfdir)/conf.d && \
+ 	  $(INSTALL_DATA) ../conf.d/modperl.conf $(DESTDIR)$(sysconfdir)/conf.d/modperl.conf
+ 
+-INCLUDES = @APR_INCLUDES@ @PERL_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @PERL_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/python/Makefile.am b/gmond/modules/python/Makefile.am
+index f535b07..c8fcac0 100644
+--- a/gmond/modules/python/Makefile.am
++++ b/gmond/modules/python/Makefile.am
+@@ -27,4 +27,4 @@ install-exec-hook:	../conf.d/modpython.conf README
+ 	mkdir -p $(DESTDIR)$(sysconfdir)/conf.d && \
+ 	  $(INSTALL_DATA) ../conf.d/modpython.conf $(DESTDIR)$(sysconfdir)/conf.d/modpython.conf
+ 
+-INCLUDES = @APR_INCLUDES@ @PYTHON_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @PYTHON_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/status/Makefile.am b/gmond/modules/status/Makefile.am
+index cd84069..53968fd 100644
+--- a/gmond/modules/status/Makefile.am
++++ b/gmond/modules/status/Makefile.am
+@@ -11,4 +11,4 @@ modgstatus_la_LDFLAGS = -module -avoid-version
+ EXTRA_DIST = ../conf.d/modgstatus.conf
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/system/Makefile.am b/gmond/modules/system/Makefile.am
+index 5fc7fb3..566469e 100644
+--- a/gmond/modules/system/Makefile.am
++++ b/gmond/modules/system/Makefile.am
+@@ -16,4 +16,4 @@ modsys_la_LDFLAGS = -module -avoid-version
+ modsys_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 935c514..6e0499f 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -14,7 +14,7 @@ if BUILD_SFLOW
+ GCFLAGS += -DSFLOW
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ AM_CFLAGS = -I.. -I. -I$(top_builddir)/include/ $(GCFLAGS) -DSYSCONFDIR='"$(sysconfdir)"'
+ 
+ include_HEADERS = gm_protocol.h
+diff --git a/scripts/fixconfig b/scripts/fixconfig
+index 5be7982..6e3d710 100755
+--- a/scripts/fixconfig
++++ b/scripts/fixconfig
+@@ -36,7 +36,7 @@ fi
+ # Additional variables set by configure
+ CFLAGS="`echo '-g -O2 -fno-strict-aliasing -Wall -D_REENTRANT' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
+ LDFLAGS="`echo ' -lpthread  -lapr-1  ' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
+-LIBS="-ldl -lnsl -lnsl -lz -lpcre -lexpat -lconfuse -lpthread "
++LIBS="-ldl -lnsl -lnsl -lz -lpcre -lexpat -lconfuse -lpthread -ltirpc "
+ VERSION="3.7.2"
+ host_cpu="x86_64"
+ 
diff --git a/sys-cluster/ganglia/ganglia-3.7.2.ebuild b/sys-cluster/ganglia/ganglia-3.7.2.ebuild
index 35687f4..1901946 100644
--- a/sys-cluster/ganglia/ganglia-3.7.2.ebuild
+++ b/sys-cluster/ganglia/ganglia-3.7.2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
 
-inherit distutils-r1 eutils multilib systemd
+inherit autotools distutils-r1 eutils multilib systemd
 
 DESCRIPTION="A scalable distributed monitoring system for clusters and grids"
 HOMEPAGE="http://ganglia.sourceforge.net/"
@@ -21,6 +21,7 @@ DEPEND="dev-libs/confuse
 	dev-libs/expat
 	>=dev-libs/apr-1.0
 	net-libs/libnsl:0=
+	net-libs/libtirpc
 	!dev-db/firebird
 	pcre? ( dev-libs/libpcre )
 	python? ( ${PYTHON_DEPS} )"
@@ -32,11 +33,14 @@ RDEPEND="
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 src_prepare() {
+	epatch "${FILESDIR}/01-${PV}-use-tirpc-instead-of-sunrpc.patch"
+
 	if use python && ! use minimal; then
 		pushd gmetad-python >/dev/null || die
 		distutils-r1_src_prepare
 		popd >/dev/null || die
 	fi
+	eautoreconf
 }
 
 src_configure() {
-- 
2.45.2


From 6a80cc5ce699285dab39ab603ba12c512b0cb8f3 Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Fri, 13 Jul 2018 02:01:15 +0200
Subject: [PATCH 4/7] Compilation works now. TODO: Cleanup.

---
 sys-cluster/ganglia/Manifest                  |   6 +-
 ...01-3.7.2-use-tirpc-instead-of-sunrpc.patch |   8 +-
 ...02-3.7.2-use-tirpc-instead-of-sunrpc.patch | 203 ++++++++++++++++++
 sys-cluster/ganglia/files/patch.bak           | 196 +++++++++++++++++
 sys-cluster/ganglia/ganglia-3.7.2.ebuild      |   2 +-
 5 files changed, 408 insertions(+), 7 deletions(-)
 create mode 100644 sys-cluster/ganglia/files/02-3.7.2-use-tirpc-instead-of-sunrpc.patch
 create mode 100644 sys-cluster/ganglia/files/patch.bak

diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest
index 2a36f12..b776266 100644
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@@ -1,9 +1,11 @@
-AUX 01-3.7.2-use-tirpc-instead-of-sunrpc.patch 6745 BLAKE2B 3099441ac39935c2bff5640999f98c0aa58d00d376c9901e77b1a13259a622149ff5d3c6656fa274eeea3727afe301c101df1f2fac0a30c6c8ec40c64c8df776 SHA512 e25ec9717f5d4614ceb54bff75235be7cf2c9c6667880a08a72e771385579479eae00c7a4ffc34f9eb8c2e9db6d9059ddcff09f5e9e9553fc3f6adfda3d34687
+AUX 01-3.7.2-use-tirpc-instead-of-sunrpc.patch 6761 BLAKE2B a0303c94ba07f0c150648fa26c1f68cb5ffe01ee80714f528b828321de2db4f5e6b40ea29b9781bc497f9111d14149565cbdb01746e69b2f204d1beb9731f4a5 SHA512 9b2217da27754e155bb5efcc922731df184822eaf0a70213fb3e6d0a46a711c11af23a759c222b94a70f69ec4175d8463e5a42b7d8d2448b5c6ccdcf37865b2e
+AUX 02-3.7.2-use-tirpc-instead-of-sunrpc.patch 7023 BLAKE2B 387e16825ca1cacbf2ff12c9169b0b57ef50257aaa450d37a5a2478de24b84aef71f276f07566e19b555ad2b0fc00d2915f9534c1c97c33ccc6e35fb27fec511 SHA512 c13c48b1e6c637b2bebd1982d32bee9c89d132df4ddc33d248a77ea3fa0aaf905e82c8dc4638669d24d43cec08b5ac5e509ff182c7753c9c89cd29cee0df55f7
 AUX gmetad-python.rc 618 BLAKE2B 476915bff06395d3451d256f4fef3d4a2aa96c866b9cae5227d19f60ecbffce0dc2e7f4513726564bff808ea3b2bd109ee8daff10975e9b1043f97733accc608 SHA512 1b23e84c453b0cd0aca8b340c9764adb79bccbc0b4a9574a1e5c7299bc8d497d30a2a56e9b855d3cda2664a856b404f4f6941b3feddbec889e45a59c92c05389
 AUX gmetad.rc 352 BLAKE2B 68629711870d52a198ae474b77ab7828987c2ac19551243063272ec50c61c3e0b2d32a08633ff878e3319a80f9bbc111ac5e7507c88164ea4ddb8244a0b9e41f SHA512 865e1f8622ebcf1103f0cb72ebc2d675af01e9ea0861fd43107ac2bca10d9e86f875741ae4cc1dabf0eb231fd3f907066974d82b245f2746acbad0f7eafb46af
 AUX gmetad.rc-2 480 BLAKE2B 9ebf71eca6c80aa5f5c776e292cc0ceee58103a30a7aad29e7430f766a58e6c58222113bc12bc7ddc74c4c3f6f5aaccc95ff7470321bbd3ccb87af1e704be7ae SHA512 37678fe9b52ce7c6ef38bcc764189ed26e10410567ac9a8608460ac3eab380c70ac91453ed425ffef8d6e86ff6ef609e0167f5bb04a2aa9318725527d31391fa
 AUX gmond.rc 346 BLAKE2B 8930fe96692c100de0feed00fbe1d5f39c3d6f9679f88ef0326b1c6b7cf6408ddba2d909027577299f5d063f765f9c9ddb26c96b0582b79b50f528ac2bffaba2 SHA512 0d1d4da1bfc2c20ae741fb9a7ee2e649780254029c50fee866f1fffdb55fddbd61ea3ead6670d7a65489d780990e24c6743c14bc1a4a7040b84972f4884629ca
 AUX gmond.rc-2 473 BLAKE2B 461d0b481f2138dcab8f7202a880354740b71f91e41ad2152a3465daf8072e6243fcc5f27ee215aa079dad30546e06146c01be71e85f518974cd9c479549ff34 SHA512 bbb5e3c525137aa2072bd46d28473523498895eba70c8dad1209230ea5e7f44ddc09875b5b6065fd5351d89ed0ad574a94fe0debcbe1d3a51e2541715adb4240
+AUX patch.bak 6745 BLAKE2B 3099441ac39935c2bff5640999f98c0aa58d00d376c9901e77b1a13259a622149ff5d3c6656fa274eeea3727afe301c101df1f2fac0a30c6c8ec40c64c8df776 SHA512 e25ec9717f5d4614ceb54bff75235be7cf2c9c6667880a08a72e771385579479eae00c7a4ffc34f9eb8c2e9db6d9059ddcff09f5e9e9553fc3f6adfda3d34687
 DIST ganglia-3.7.2.tar.gz 1302320 BLAKE2B aee647d6ec4b2852536769773dd54d7a7e9ca33c05de4316172d530aee549207bdfa59f25e8fe456ae4c01a1af9eca3846f30242c64e7d9fe393687a7203eb12 SHA512 a88955e59421a447e5752a9bfe5f599d989a7a5a0141141ab3601d1ab250be4eebbede8bcef8baa151b2f9deaf3f56e30aef8ea709f3cc820a79fa3d3961e0df
-EBUILD ganglia-3.7.2.ebuild 3041 BLAKE2B 0aa4dd49dcb9e10120717302ff4f9e09b2e8e9c0fd17021294ed5fcd163b9c69f4df99dd7d542819013d156c23dd40375f040acb6f71e9138f093731b73907ca SHA512 3717a4c024f1dfbb570a81a583c8dba91388abbffc5af82738739fcfeccc499b3448e335e1a313ca142cf8e9d02424fe8b8665454ea1d2b18bae8cbe6672bc85
+EBUILD ganglia-3.7.2.ebuild 3041 BLAKE2B 8ec6e527d3c93d77592e4b26ce2d2f65c30201263ea136a2c13e2ae25478dce1d6bb90c242b01d88de72a3cff9591fc618c7d1d1d6fc5f16f2a59f9fb69ffd31 SHA512 9fd65d67a9381a92e2bb4b7af49e26c8076d170b88f9fbf21db9dd98c30a643b283ee8ed29ef94cf7ca471a5df1bb8118a7bb78fb9b99e6477aed7d5e284e62b
 MISC metadata.xml 325 BLAKE2B 71ac60956aa877d76ec897fa1c07082c2b0d8d18db7e9d17248e3c730def736b5a70ffdf371d0d4d38aba338efc0689d5cb24dd08c084934e4d23914da48fc4f SHA512 c3cc85ba47cd58ccba2a511b1bcdac2de4cd40b69bc005935291c9394bde3ed55ce14d57d0c3ab0bc188b5116192f0851cb1be3e4eaeb190555e50920fcdb4fb
diff --git a/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch b/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch
index 6e0bcda..21e5eba 100644
--- a/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch
+++ b/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch
@@ -186,11 +186,11 @@ index 5be7982..6e3d710 100755
 --- a/scripts/fixconfig
 +++ b/scripts/fixconfig
 @@ -36,7 +36,7 @@ fi
+ 
  # Additional variables set by configure
  CFLAGS="`echo '-g -O2 -fno-strict-aliasing -Wall -D_REENTRANT' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
- LDFLAGS="`echo ' -lpthread  -lapr-1  ' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
--LIBS="-ldl -lnsl -lnsl -lz -lpcre -lexpat -lconfuse -lpthread "
-+LIBS="-ldl -lnsl -lnsl -lz -lpcre -lexpat -lconfuse -lpthread -ltirpc "
+-LDFLAGS="`echo ' -lpthread  -lapr-1  ' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
++LDFLAGS="`echo ' -lpthread  -lapr-1 -ltirpc  ' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
+ LIBS="-ldl -lnsl -lnsl -lz -lpcre -lexpat -lconfuse -lpthread "
  VERSION="3.7.2"
  host_cpu="x86_64"
- 
diff --git a/sys-cluster/ganglia/files/02-3.7.2-use-tirpc-instead-of-sunrpc.patch b/sys-cluster/ganglia/files/02-3.7.2-use-tirpc-instead-of-sunrpc.patch
new file mode 100644
index 0000000..10f8fef
--- /dev/null
+++ b/sys-cluster/ganglia/files/02-3.7.2-use-tirpc-instead-of-sunrpc.patch
@@ -0,0 +1,203 @@
+diff --git a/Makefile.am b/Makefile.am
+index 95d0807..105222b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -9,7 +9,7 @@ GMETAD_SUBDIR =
+ endif
+ 
+ EXTRA_SUBDIRS = "gmetad-python contrib solaris"
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ 
+ AUTOMAKE_OPTIONS = dist-bzip2 dist-tarZ dist-zip
+ ACLOCAL_AMFLAGS = -I m4
+diff --git a/configure.ac b/configure.ac
+index fe7983b..597f0ca 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -606,13 +606,20 @@ AC_CHECK_HEADER([sys/mount.h], [], [],
+ #endif
+ ])
+ 
+-AC_CHECK_HEADERS(rpc/types.h)
+-AC_CHECK_HEADER([rpc/xdr.h], [],
+-   [AC_MSG_ERROR([your system is missing the Sun RPC (ONC/RPC) libraries])],
+-[#ifdef HAVE_RPC_TYPES_H
+-# include <rpc/types.h>
+-#endif
+-])
++dnl ##################################################################
++dnl Checks for TIRPC
++PKG_CHECK_MODULES([TIRPC],[libtirpc])
++dnl LDFLAGS="$LDFLAGS $LIBS $APR_LIBS"
++LDFLAGS="$LDFLAGS $TIRPC_LIBS"
++RPC_CFLAGS="$TIRPC_CFLAGS"
++
++dnl PKG_CHECK_MODULES([TIRPC],
++dnl                   [libtirpc],
++dnl                   [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
++dnl                   [AC_MSG_ERROR([libtirpc requested, but library not found.])]
++dnl )
++nl AC_SUBST(RPC_CFLAGS)
++dnl AC_SUBST(RPC_LIBS)
+ 
+ dnl ##################################################################
+ dnl Checks for typedefs.
+diff --git a/gmetad/Makefile.am b/gmetad/Makefile.am
+index 0a4e360..874d448 100644
+--- a/gmetad/Makefile.am
++++ b/gmetad/Makefile.am
+@@ -11,7 +11,7 @@ GLDADD =
+ GLDFLAGS = 
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ AM_CFLAGS = -I$(top_builddir)/lib -I$(top_builddir)/gmond -I$(top_builddir)/libmetrics -I$(top_builddir)/include $(GCFLAGS) @PROTOBUF_C_CFLAGS@
+ 
+ sbin_PROGRAMS = gmetad
+diff --git a/gmetric/Makefile.am b/gmetric/Makefile.am
+index bc7807c..d9bf585 100644
+--- a/gmetric/Makefile.am
++++ b/gmetric/Makefile.am
+@@ -10,7 +10,7 @@ GLDADD =
+ GLDFLAGS = 
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ 
+ AM_CFLAGS = -I../lib -I../include $(GCFLAGS)
+ 
+diff --git a/gmond/Makefile.am b/gmond/Makefile.am
+index 256fee3..d6f5f07 100644
+--- a/gmond/Makefile.am
++++ b/gmond/Makefile.am
+@@ -44,7 +44,7 @@ if BUILD_SFLOW
+ GCFLAGS += -DSFLOW
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ AM_CFLAGS = -I$(top_builddir)/lib -I$(top_builddir)/include/ -I$(top_builddir)/libmetrics $(GCFLAGS)
+ 
+ sbin_PROGRAMS = gmond
+diff --git a/gmond/modules/cpu/Makefile.am b/gmond/modules/cpu/Makefile.am
+index fd7457e..99ddb83 100644
+--- a/gmond/modules/cpu/Makefile.am
++++ b/gmond/modules/cpu/Makefile.am
+@@ -25,4 +25,4 @@ modload_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ 
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/disk/Makefile.am b/gmond/modules/disk/Makefile.am
+index 0c78689..2f5a2f0 100644
+--- a/gmond/modules/disk/Makefile.am
++++ b/gmond/modules/disk/Makefile.am
+@@ -11,4 +11,4 @@ moddisk_la_LDFLAGS = -module -avoid-version
+ moddisk_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/example/Makefile.am b/gmond/modules/example/Makefile.am
+index e3bff6a..18b4e3b 100644
+--- a/gmond/modules/example/Makefile.am
++++ b/gmond/modules/example/Makefile.am
+@@ -11,7 +11,7 @@ modexample_la_LDFLAGS = -module -avoid-version
+ EXTRA_DIST = ../conf.d/example.conf
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ 
+ install:
+ 	@echo
+diff --git a/gmond/modules/memory/Makefile.am b/gmond/modules/memory/Makefile.am
+index 82336db..06ad430 100644
+--- a/gmond/modules/memory/Makefile.am
++++ b/gmond/modules/memory/Makefile.am
+@@ -12,4 +12,4 @@ modmem_la_LDFLAGS = -module -avoid-version
+ modmem_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/network/Makefile.am b/gmond/modules/network/Makefile.am
+index 72a4faf..c370d88 100644
+--- a/gmond/modules/network/Makefile.am
++++ b/gmond/modules/network/Makefile.am
+@@ -12,4 +12,4 @@ modnet_la_LDFLAGS = -module -avoid-version
+ modnet_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/perl/Makefile.am b/gmond/modules/perl/Makefile.am
+index b7b095c..f1d0fb9 100644
+--- a/gmond/modules/perl/Makefile.am
++++ b/gmond/modules/perl/Makefile.am
+@@ -28,4 +28,4 @@ install-exec-hook:	../conf.d/modperl.conf README
+ 	mkdir -p $(DESTDIR)$(sysconfdir)/conf.d && \
+ 	  $(INSTALL_DATA) ../conf.d/modperl.conf $(DESTDIR)$(sysconfdir)/conf.d/modperl.conf
+ 
+-INCLUDES = @APR_INCLUDES@ @PERL_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @PERL_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/python/Makefile.am b/gmond/modules/python/Makefile.am
+index f535b07..c8fcac0 100644
+--- a/gmond/modules/python/Makefile.am
++++ b/gmond/modules/python/Makefile.am
+@@ -27,4 +27,4 @@ install-exec-hook:	../conf.d/modpython.conf README
+ 	mkdir -p $(DESTDIR)$(sysconfdir)/conf.d && \
+ 	  $(INSTALL_DATA) ../conf.d/modpython.conf $(DESTDIR)$(sysconfdir)/conf.d/modpython.conf
+ 
+-INCLUDES = @APR_INCLUDES@ @PYTHON_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @PYTHON_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/status/Makefile.am b/gmond/modules/status/Makefile.am
+index cd84069..53968fd 100644
+--- a/gmond/modules/status/Makefile.am
++++ b/gmond/modules/status/Makefile.am
+@@ -11,4 +11,4 @@ modgstatus_la_LDFLAGS = -module -avoid-version
+ EXTRA_DIST = ../conf.d/modgstatus.conf
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/system/Makefile.am b/gmond/modules/system/Makefile.am
+index 5fc7fb3..566469e 100644
+--- a/gmond/modules/system/Makefile.am
++++ b/gmond/modules/system/Makefile.am
+@@ -16,4 +16,4 @@ modsys_la_LDFLAGS = -module -avoid-version
+ modsys_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 935c514..6e0499f 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -14,7 +14,7 @@ if BUILD_SFLOW
+ GCFLAGS += -DSFLOW
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ AM_CFLAGS = -I.. -I. -I$(top_builddir)/include/ $(GCFLAGS) -DSYSCONFDIR='"$(sysconfdir)"'
+ 
+ include_HEADERS = gm_protocol.h
+diff --git a/scripts/fixconfig b/scripts/fixconfig
+index 5be7982..707f62d 100755
+--- a/scripts/fixconfig
++++ b/scripts/fixconfig
+@@ -35,7 +35,7 @@ fi
+ 
+ # Additional variables set by configure
+ CFLAGS="`echo '-g -O2 -fno-strict-aliasing -Wall -D_REENTRANT' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
+-LDFLAGS="`echo ' -lpthread  -lapr-1  ' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
++LDFLAGS="`echo ' -lpthread  -lapr-1 -ltirpc  ' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
+ LIBS="-ldl -lnsl -lnsl -lz -lpcre -lexpat -lconfuse -lpthread "
+ VERSION="3.7.2"
+ host_cpu="x86_64"
diff --git a/sys-cluster/ganglia/files/patch.bak b/sys-cluster/ganglia/files/patch.bak
new file mode 100644
index 0000000..6e0bcda
--- /dev/null
+++ b/sys-cluster/ganglia/files/patch.bak
@@ -0,0 +1,196 @@
+diff --git a/Makefile.am b/Makefile.am
+index 95d0807..105222b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -9,7 +9,7 @@ GMETAD_SUBDIR =
+ endif
+ 
+ EXTRA_SUBDIRS = "gmetad-python contrib solaris"
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ 
+ AUTOMAKE_OPTIONS = dist-bzip2 dist-tarZ dist-zip
+ ACLOCAL_AMFLAGS = -I m4
+diff --git a/configure.ac b/configure.ac
+index fe7983b..984c70b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -606,13 +606,13 @@ AC_CHECK_HEADER([sys/mount.h], [], [],
+ #endif
+ ])
+ 
+-AC_CHECK_HEADERS(rpc/types.h)
+-AC_CHECK_HEADER([rpc/xdr.h], [],
+-   [AC_MSG_ERROR([your system is missing the Sun RPC (ONC/RPC) libraries])],
+-[#ifdef HAVE_RPC_TYPES_H
+-# include <rpc/types.h>
+-#endif
+-])
++PKG_CHECK_MODULES([TIRPC],
++                  [libtirpc],
++                  [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
++                  [AC_MSG_ERROR([libtirpc requested, but library not found.])]
++)
++AC_SUBST(RPC_CFLAGS)
++AC_SUBST(RPC_LIBS)
+ 
+ dnl ##################################################################
+ dnl Checks for typedefs.
+diff --git a/gmetad/Makefile.am b/gmetad/Makefile.am
+index 0a4e360..874d448 100644
+--- a/gmetad/Makefile.am
++++ b/gmetad/Makefile.am
+@@ -11,7 +11,7 @@ GLDADD =
+ GLDFLAGS = 
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ AM_CFLAGS = -I$(top_builddir)/lib -I$(top_builddir)/gmond -I$(top_builddir)/libmetrics -I$(top_builddir)/include $(GCFLAGS) @PROTOBUF_C_CFLAGS@
+ 
+ sbin_PROGRAMS = gmetad
+diff --git a/gmetric/Makefile.am b/gmetric/Makefile.am
+index bc7807c..d9bf585 100644
+--- a/gmetric/Makefile.am
++++ b/gmetric/Makefile.am
+@@ -10,7 +10,7 @@ GLDADD =
+ GLDFLAGS = 
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ 
+ AM_CFLAGS = -I../lib -I../include $(GCFLAGS)
+ 
+diff --git a/gmond/Makefile.am b/gmond/Makefile.am
+index 256fee3..d6f5f07 100644
+--- a/gmond/Makefile.am
++++ b/gmond/Makefile.am
+@@ -44,7 +44,7 @@ if BUILD_SFLOW
+ GCFLAGS += -DSFLOW
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ AM_CFLAGS = -I$(top_builddir)/lib -I$(top_builddir)/include/ -I$(top_builddir)/libmetrics $(GCFLAGS)
+ 
+ sbin_PROGRAMS = gmond
+diff --git a/gmond/modules/cpu/Makefile.am b/gmond/modules/cpu/Makefile.am
+index fd7457e..99ddb83 100644
+--- a/gmond/modules/cpu/Makefile.am
++++ b/gmond/modules/cpu/Makefile.am
+@@ -25,4 +25,4 @@ modload_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ 
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/disk/Makefile.am b/gmond/modules/disk/Makefile.am
+index 0c78689..2f5a2f0 100644
+--- a/gmond/modules/disk/Makefile.am
++++ b/gmond/modules/disk/Makefile.am
+@@ -11,4 +11,4 @@ moddisk_la_LDFLAGS = -module -avoid-version
+ moddisk_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/example/Makefile.am b/gmond/modules/example/Makefile.am
+index e3bff6a..18b4e3b 100644
+--- a/gmond/modules/example/Makefile.am
++++ b/gmond/modules/example/Makefile.am
+@@ -11,7 +11,7 @@ modexample_la_LDFLAGS = -module -avoid-version
+ EXTRA_DIST = ../conf.d/example.conf
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ 
+ install:
+ 	@echo
+diff --git a/gmond/modules/memory/Makefile.am b/gmond/modules/memory/Makefile.am
+index 82336db..06ad430 100644
+--- a/gmond/modules/memory/Makefile.am
++++ b/gmond/modules/memory/Makefile.am
+@@ -12,4 +12,4 @@ modmem_la_LDFLAGS = -module -avoid-version
+ modmem_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/network/Makefile.am b/gmond/modules/network/Makefile.am
+index 72a4faf..c370d88 100644
+--- a/gmond/modules/network/Makefile.am
++++ b/gmond/modules/network/Makefile.am
+@@ -12,4 +12,4 @@ modnet_la_LDFLAGS = -module -avoid-version
+ modnet_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/perl/Makefile.am b/gmond/modules/perl/Makefile.am
+index b7b095c..f1d0fb9 100644
+--- a/gmond/modules/perl/Makefile.am
++++ b/gmond/modules/perl/Makefile.am
+@@ -28,4 +28,4 @@ install-exec-hook:	../conf.d/modperl.conf README
+ 	mkdir -p $(DESTDIR)$(sysconfdir)/conf.d && \
+ 	  $(INSTALL_DATA) ../conf.d/modperl.conf $(DESTDIR)$(sysconfdir)/conf.d/modperl.conf
+ 
+-INCLUDES = @APR_INCLUDES@ @PERL_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @PERL_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/python/Makefile.am b/gmond/modules/python/Makefile.am
+index f535b07..c8fcac0 100644
+--- a/gmond/modules/python/Makefile.am
++++ b/gmond/modules/python/Makefile.am
+@@ -27,4 +27,4 @@ install-exec-hook:	../conf.d/modpython.conf README
+ 	mkdir -p $(DESTDIR)$(sysconfdir)/conf.d && \
+ 	  $(INSTALL_DATA) ../conf.d/modpython.conf $(DESTDIR)$(sysconfdir)/conf.d/modpython.conf
+ 
+-INCLUDES = @APR_INCLUDES@ @PYTHON_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @PYTHON_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/status/Makefile.am b/gmond/modules/status/Makefile.am
+index cd84069..53968fd 100644
+--- a/gmond/modules/status/Makefile.am
++++ b/gmond/modules/status/Makefile.am
+@@ -11,4 +11,4 @@ modgstatus_la_LDFLAGS = -module -avoid-version
+ EXTRA_DIST = ../conf.d/modgstatus.conf
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/system/Makefile.am b/gmond/modules/system/Makefile.am
+index 5fc7fb3..566469e 100644
+--- a/gmond/modules/system/Makefile.am
++++ b/gmond/modules/system/Makefile.am
+@@ -16,4 +16,4 @@ modsys_la_LDFLAGS = -module -avoid-version
+ modsys_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 935c514..6e0499f 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -14,7 +14,7 @@ if BUILD_SFLOW
+ GCFLAGS += -DSFLOW
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
++INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ AM_CFLAGS = -I.. -I. -I$(top_builddir)/include/ $(GCFLAGS) -DSYSCONFDIR='"$(sysconfdir)"'
+ 
+ include_HEADERS = gm_protocol.h
+diff --git a/scripts/fixconfig b/scripts/fixconfig
+index 5be7982..6e3d710 100755
+--- a/scripts/fixconfig
++++ b/scripts/fixconfig
+@@ -36,7 +36,7 @@ fi
+ # Additional variables set by configure
+ CFLAGS="`echo '-g -O2 -fno-strict-aliasing -Wall -D_REENTRANT' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
+ LDFLAGS="`echo ' -lpthread  -lapr-1  ' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
+-LIBS="-ldl -lnsl -lnsl -lz -lpcre -lexpat -lconfuse -lpthread "
++LIBS="-ldl -lnsl -lnsl -lz -lpcre -lexpat -lconfuse -lpthread -ltirpc "
+ VERSION="3.7.2"
+ host_cpu="x86_64"
+ 
diff --git a/sys-cluster/ganglia/ganglia-3.7.2.ebuild b/sys-cluster/ganglia/ganglia-3.7.2.ebuild
index 1901946..f36bc65 100644
--- a/sys-cluster/ganglia/ganglia-3.7.2.ebuild
+++ b/sys-cluster/ganglia/ganglia-3.7.2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 src_prepare() {
-	epatch "${FILESDIR}/01-${PV}-use-tirpc-instead-of-sunrpc.patch"
+	epatch "${FILESDIR}/02-${PV}-use-tirpc-instead-of-sunrpc.patch"
 
 	if use python && ! use minimal; then
 		pushd gmetad-python >/dev/null || die
-- 
2.45.2


From 9cb8711891f027ccb8e62b9b8359a1a864d19e2a Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Fri, 13 Jul 2018 02:02:49 +0200
Subject: [PATCH 5/7] Rename patch file

---
 sys-cluster/ganglia/Manifest                  |   5 +-
 ...01-3.7.2-use-tirpc-instead-of-sunrpc.patch |  29 ++-
 ...02-3.7.2-use-tirpc-instead-of-sunrpc.patch | 203 ------------------
 sys-cluster/ganglia/ganglia-3.7.2.ebuild      |   2 +-
 4 files changed, 21 insertions(+), 218 deletions(-)
 delete mode 100644 sys-cluster/ganglia/files/02-3.7.2-use-tirpc-instead-of-sunrpc.patch

diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest
index b776266..b3f5281 100644
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@@ -1,5 +1,4 @@
-AUX 01-3.7.2-use-tirpc-instead-of-sunrpc.patch 6761 BLAKE2B a0303c94ba07f0c150648fa26c1f68cb5ffe01ee80714f528b828321de2db4f5e6b40ea29b9781bc497f9111d14149565cbdb01746e69b2f204d1beb9731f4a5 SHA512 9b2217da27754e155bb5efcc922731df184822eaf0a70213fb3e6d0a46a711c11af23a759c222b94a70f69ec4175d8463e5a42b7d8d2448b5c6ccdcf37865b2e
-AUX 02-3.7.2-use-tirpc-instead-of-sunrpc.patch 7023 BLAKE2B 387e16825ca1cacbf2ff12c9169b0b57ef50257aaa450d37a5a2478de24b84aef71f276f07566e19b555ad2b0fc00d2915f9534c1c97c33ccc6e35fb27fec511 SHA512 c13c48b1e6c637b2bebd1982d32bee9c89d132df4ddc33d248a77ea3fa0aaf905e82c8dc4638669d24d43cec08b5ac5e509ff182c7753c9c89cd29cee0df55f7
+AUX 01-3.7.2-use-tirpc-instead-of-sunrpc.patch 7023 BLAKE2B 387e16825ca1cacbf2ff12c9169b0b57ef50257aaa450d37a5a2478de24b84aef71f276f07566e19b555ad2b0fc00d2915f9534c1c97c33ccc6e35fb27fec511 SHA512 c13c48b1e6c637b2bebd1982d32bee9c89d132df4ddc33d248a77ea3fa0aaf905e82c8dc4638669d24d43cec08b5ac5e509ff182c7753c9c89cd29cee0df55f7
 AUX gmetad-python.rc 618 BLAKE2B 476915bff06395d3451d256f4fef3d4a2aa96c866b9cae5227d19f60ecbffce0dc2e7f4513726564bff808ea3b2bd109ee8daff10975e9b1043f97733accc608 SHA512 1b23e84c453b0cd0aca8b340c9764adb79bccbc0b4a9574a1e5c7299bc8d497d30a2a56e9b855d3cda2664a856b404f4f6941b3feddbec889e45a59c92c05389
 AUX gmetad.rc 352 BLAKE2B 68629711870d52a198ae474b77ab7828987c2ac19551243063272ec50c61c3e0b2d32a08633ff878e3319a80f9bbc111ac5e7507c88164ea4ddb8244a0b9e41f SHA512 865e1f8622ebcf1103f0cb72ebc2d675af01e9ea0861fd43107ac2bca10d9e86f875741ae4cc1dabf0eb231fd3f907066974d82b245f2746acbad0f7eafb46af
 AUX gmetad.rc-2 480 BLAKE2B 9ebf71eca6c80aa5f5c776e292cc0ceee58103a30a7aad29e7430f766a58e6c58222113bc12bc7ddc74c4c3f6f5aaccc95ff7470321bbd3ccb87af1e704be7ae SHA512 37678fe9b52ce7c6ef38bcc764189ed26e10410567ac9a8608460ac3eab380c70ac91453ed425ffef8d6e86ff6ef609e0167f5bb04a2aa9318725527d31391fa
@@ -7,5 +6,5 @@ AUX gmond.rc 346 BLAKE2B 8930fe96692c100de0feed00fbe1d5f39c3d6f9679f88ef0326b1c6
 AUX gmond.rc-2 473 BLAKE2B 461d0b481f2138dcab8f7202a880354740b71f91e41ad2152a3465daf8072e6243fcc5f27ee215aa079dad30546e06146c01be71e85f518974cd9c479549ff34 SHA512 bbb5e3c525137aa2072bd46d28473523498895eba70c8dad1209230ea5e7f44ddc09875b5b6065fd5351d89ed0ad574a94fe0debcbe1d3a51e2541715adb4240
 AUX patch.bak 6745 BLAKE2B 3099441ac39935c2bff5640999f98c0aa58d00d376c9901e77b1a13259a622149ff5d3c6656fa274eeea3727afe301c101df1f2fac0a30c6c8ec40c64c8df776 SHA512 e25ec9717f5d4614ceb54bff75235be7cf2c9c6667880a08a72e771385579479eae00c7a4ffc34f9eb8c2e9db6d9059ddcff09f5e9e9553fc3f6adfda3d34687
 DIST ganglia-3.7.2.tar.gz 1302320 BLAKE2B aee647d6ec4b2852536769773dd54d7a7e9ca33c05de4316172d530aee549207bdfa59f25e8fe456ae4c01a1af9eca3846f30242c64e7d9fe393687a7203eb12 SHA512 a88955e59421a447e5752a9bfe5f599d989a7a5a0141141ab3601d1ab250be4eebbede8bcef8baa151b2f9deaf3f56e30aef8ea709f3cc820a79fa3d3961e0df
-EBUILD ganglia-3.7.2.ebuild 3041 BLAKE2B 8ec6e527d3c93d77592e4b26ce2d2f65c30201263ea136a2c13e2ae25478dce1d6bb90c242b01d88de72a3cff9591fc618c7d1d1d6fc5f16f2a59f9fb69ffd31 SHA512 9fd65d67a9381a92e2bb4b7af49e26c8076d170b88f9fbf21db9dd98c30a643b283ee8ed29ef94cf7ca471a5df1bb8118a7bb78fb9b99e6477aed7d5e284e62b
+EBUILD ganglia-3.7.2.ebuild 3041 BLAKE2B 0aa4dd49dcb9e10120717302ff4f9e09b2e8e9c0fd17021294ed5fcd163b9c69f4df99dd7d542819013d156c23dd40375f040acb6f71e9138f093731b73907ca SHA512 3717a4c024f1dfbb570a81a583c8dba91388abbffc5af82738739fcfeccc499b3448e335e1a313ca142cf8e9d02424fe8b8665454ea1d2b18bae8cbe6672bc85
 MISC metadata.xml 325 BLAKE2B 71ac60956aa877d76ec897fa1c07082c2b0d8d18db7e9d17248e3c730def736b5a70ffdf371d0d4d38aba338efc0689d5cb24dd08c084934e4d23914da48fc4f SHA512 c3cc85ba47cd58ccba2a511b1bcdac2de4cd40b69bc005935291c9394bde3ed55ce14d57d0c3ab0bc188b5116192f0851cb1be3e4eaeb190555e50920fcdb4fb
diff --git a/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch b/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch
index 21e5eba..10f8fef 100644
--- a/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch
+++ b/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch
@@ -12,10 +12,10 @@ index 95d0807..105222b 100644
  AUTOMAKE_OPTIONS = dist-bzip2 dist-tarZ dist-zip
  ACLOCAL_AMFLAGS = -I m4
 diff --git a/configure.ac b/configure.ac
-index fe7983b..984c70b 100644
+index fe7983b..597f0ca 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -606,13 +606,13 @@ AC_CHECK_HEADER([sys/mount.h], [], [],
+@@ -606,13 +606,20 @@ AC_CHECK_HEADER([sys/mount.h], [], [],
  #endif
  ])
  
@@ -26,13 +26,20 @@ index fe7983b..984c70b 100644
 -# include <rpc/types.h>
 -#endif
 -])
-+PKG_CHECK_MODULES([TIRPC],
-+                  [libtirpc],
-+                  [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
-+                  [AC_MSG_ERROR([libtirpc requested, but library not found.])]
-+)
-+AC_SUBST(RPC_CFLAGS)
-+AC_SUBST(RPC_LIBS)
++dnl ##################################################################
++dnl Checks for TIRPC
++PKG_CHECK_MODULES([TIRPC],[libtirpc])
++dnl LDFLAGS="$LDFLAGS $LIBS $APR_LIBS"
++LDFLAGS="$LDFLAGS $TIRPC_LIBS"
++RPC_CFLAGS="$TIRPC_CFLAGS"
++
++dnl PKG_CHECK_MODULES([TIRPC],
++dnl                   [libtirpc],
++dnl                   [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
++dnl                   [AC_MSG_ERROR([libtirpc requested, but library not found.])]
++dnl )
++nl AC_SUBST(RPC_CFLAGS)
++dnl AC_SUBST(RPC_LIBS)
  
  dnl ##################################################################
  dnl Checks for typedefs.
@@ -182,10 +189,10 @@ index 935c514..6e0499f 100644
  
  include_HEADERS = gm_protocol.h
 diff --git a/scripts/fixconfig b/scripts/fixconfig
-index 5be7982..6e3d710 100755
+index 5be7982..707f62d 100755
 --- a/scripts/fixconfig
 +++ b/scripts/fixconfig
-@@ -36,7 +36,7 @@ fi
+@@ -35,7 +35,7 @@ fi
  
  # Additional variables set by configure
  CFLAGS="`echo '-g -O2 -fno-strict-aliasing -Wall -D_REENTRANT' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
diff --git a/sys-cluster/ganglia/files/02-3.7.2-use-tirpc-instead-of-sunrpc.patch b/sys-cluster/ganglia/files/02-3.7.2-use-tirpc-instead-of-sunrpc.patch
deleted file mode 100644
index 10f8fef..0000000
--- a/sys-cluster/ganglia/files/02-3.7.2-use-tirpc-instead-of-sunrpc.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 95d0807..105222b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -9,7 +9,7 @@ GMETAD_SUBDIR =
- endif
- 
- EXTRA_SUBDIRS = "gmetad-python contrib solaris"
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
- 
- AUTOMAKE_OPTIONS = dist-bzip2 dist-tarZ dist-zip
- ACLOCAL_AMFLAGS = -I m4
-diff --git a/configure.ac b/configure.ac
-index fe7983b..597f0ca 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -606,13 +606,20 @@ AC_CHECK_HEADER([sys/mount.h], [], [],
- #endif
- ])
- 
--AC_CHECK_HEADERS(rpc/types.h)
--AC_CHECK_HEADER([rpc/xdr.h], [],
--   [AC_MSG_ERROR([your system is missing the Sun RPC (ONC/RPC) libraries])],
--[#ifdef HAVE_RPC_TYPES_H
--# include <rpc/types.h>
--#endif
--])
-+dnl ##################################################################
-+dnl Checks for TIRPC
-+PKG_CHECK_MODULES([TIRPC],[libtirpc])
-+dnl LDFLAGS="$LDFLAGS $LIBS $APR_LIBS"
-+LDFLAGS="$LDFLAGS $TIRPC_LIBS"
-+RPC_CFLAGS="$TIRPC_CFLAGS"
-+
-+dnl PKG_CHECK_MODULES([TIRPC],
-+dnl                   [libtirpc],
-+dnl                   [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
-+dnl                   [AC_MSG_ERROR([libtirpc requested, but library not found.])]
-+dnl )
-+nl AC_SUBST(RPC_CFLAGS)
-+dnl AC_SUBST(RPC_LIBS)
- 
- dnl ##################################################################
- dnl Checks for typedefs.
-diff --git a/gmetad/Makefile.am b/gmetad/Makefile.am
-index 0a4e360..874d448 100644
---- a/gmetad/Makefile.am
-+++ b/gmetad/Makefile.am
-@@ -11,7 +11,7 @@ GLDADD =
- GLDFLAGS = 
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
- AM_CFLAGS = -I$(top_builddir)/lib -I$(top_builddir)/gmond -I$(top_builddir)/libmetrics -I$(top_builddir)/include $(GCFLAGS) @PROTOBUF_C_CFLAGS@
- 
- sbin_PROGRAMS = gmetad
-diff --git a/gmetric/Makefile.am b/gmetric/Makefile.am
-index bc7807c..d9bf585 100644
---- a/gmetric/Makefile.am
-+++ b/gmetric/Makefile.am
-@@ -10,7 +10,7 @@ GLDADD =
- GLDFLAGS = 
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
- 
- AM_CFLAGS = -I../lib -I../include $(GCFLAGS)
- 
-diff --git a/gmond/Makefile.am b/gmond/Makefile.am
-index 256fee3..d6f5f07 100644
---- a/gmond/Makefile.am
-+++ b/gmond/Makefile.am
-@@ -44,7 +44,7 @@ if BUILD_SFLOW
- GCFLAGS += -DSFLOW
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
- AM_CFLAGS = -I$(top_builddir)/lib -I$(top_builddir)/include/ -I$(top_builddir)/libmetrics $(GCFLAGS)
- 
- sbin_PROGRAMS = gmond
-diff --git a/gmond/modules/cpu/Makefile.am b/gmond/modules/cpu/Makefile.am
-index fd7457e..99ddb83 100644
---- a/gmond/modules/cpu/Makefile.am
-+++ b/gmond/modules/cpu/Makefile.am
-@@ -25,4 +25,4 @@ modload_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
- 
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
-diff --git a/gmond/modules/disk/Makefile.am b/gmond/modules/disk/Makefile.am
-index 0c78689..2f5a2f0 100644
---- a/gmond/modules/disk/Makefile.am
-+++ b/gmond/modules/disk/Makefile.am
-@@ -11,4 +11,4 @@ moddisk_la_LDFLAGS = -module -avoid-version
- moddisk_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
-diff --git a/gmond/modules/example/Makefile.am b/gmond/modules/example/Makefile.am
-index e3bff6a..18b4e3b 100644
---- a/gmond/modules/example/Makefile.am
-+++ b/gmond/modules/example/Makefile.am
-@@ -11,7 +11,7 @@ modexample_la_LDFLAGS = -module -avoid-version
- EXTRA_DIST = ../conf.d/example.conf
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
- 
- install:
- 	@echo
-diff --git a/gmond/modules/memory/Makefile.am b/gmond/modules/memory/Makefile.am
-index 82336db..06ad430 100644
---- a/gmond/modules/memory/Makefile.am
-+++ b/gmond/modules/memory/Makefile.am
-@@ -12,4 +12,4 @@ modmem_la_LDFLAGS = -module -avoid-version
- modmem_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
-diff --git a/gmond/modules/network/Makefile.am b/gmond/modules/network/Makefile.am
-index 72a4faf..c370d88 100644
---- a/gmond/modules/network/Makefile.am
-+++ b/gmond/modules/network/Makefile.am
-@@ -12,4 +12,4 @@ modnet_la_LDFLAGS = -module -avoid-version
- modnet_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
-diff --git a/gmond/modules/perl/Makefile.am b/gmond/modules/perl/Makefile.am
-index b7b095c..f1d0fb9 100644
---- a/gmond/modules/perl/Makefile.am
-+++ b/gmond/modules/perl/Makefile.am
-@@ -28,4 +28,4 @@ install-exec-hook:	../conf.d/modperl.conf README
- 	mkdir -p $(DESTDIR)$(sysconfdir)/conf.d && \
- 	  $(INSTALL_DATA) ../conf.d/modperl.conf $(DESTDIR)$(sysconfdir)/conf.d/modperl.conf
- 
--INCLUDES = @APR_INCLUDES@ @PERL_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @PERL_INCLUDES@ @RPC_CFLAGS@
-diff --git a/gmond/modules/python/Makefile.am b/gmond/modules/python/Makefile.am
-index f535b07..c8fcac0 100644
---- a/gmond/modules/python/Makefile.am
-+++ b/gmond/modules/python/Makefile.am
-@@ -27,4 +27,4 @@ install-exec-hook:	../conf.d/modpython.conf README
- 	mkdir -p $(DESTDIR)$(sysconfdir)/conf.d && \
- 	  $(INSTALL_DATA) ../conf.d/modpython.conf $(DESTDIR)$(sysconfdir)/conf.d/modpython.conf
- 
--INCLUDES = @APR_INCLUDES@ @PYTHON_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @PYTHON_INCLUDES@ @RPC_CFLAGS@
-diff --git a/gmond/modules/status/Makefile.am b/gmond/modules/status/Makefile.am
-index cd84069..53968fd 100644
---- a/gmond/modules/status/Makefile.am
-+++ b/gmond/modules/status/Makefile.am
-@@ -11,4 +11,4 @@ modgstatus_la_LDFLAGS = -module -avoid-version
- EXTRA_DIST = ../conf.d/modgstatus.conf
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
-diff --git a/gmond/modules/system/Makefile.am b/gmond/modules/system/Makefile.am
-index 5fc7fb3..566469e 100644
---- a/gmond/modules/system/Makefile.am
-+++ b/gmond/modules/system/Makefile.am
-@@ -16,4 +16,4 @@ modsys_la_LDFLAGS = -module -avoid-version
- modsys_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 935c514..6e0499f 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -14,7 +14,7 @@ if BUILD_SFLOW
- GCFLAGS += -DSFLOW
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
- AM_CFLAGS = -I.. -I. -I$(top_builddir)/include/ $(GCFLAGS) -DSYSCONFDIR='"$(sysconfdir)"'
- 
- include_HEADERS = gm_protocol.h
-diff --git a/scripts/fixconfig b/scripts/fixconfig
-index 5be7982..707f62d 100755
---- a/scripts/fixconfig
-+++ b/scripts/fixconfig
-@@ -35,7 +35,7 @@ fi
- 
- # Additional variables set by configure
- CFLAGS="`echo '-g -O2 -fno-strict-aliasing -Wall -D_REENTRANT' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
--LDFLAGS="`echo ' -lpthread  -lapr-1  ' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
-+LDFLAGS="`echo ' -lpthread  -lapr-1 -ltirpc  ' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
- LIBS="-ldl -lnsl -lnsl -lz -lpcre -lexpat -lconfuse -lpthread "
- VERSION="3.7.2"
- host_cpu="x86_64"
diff --git a/sys-cluster/ganglia/ganglia-3.7.2.ebuild b/sys-cluster/ganglia/ganglia-3.7.2.ebuild
index f36bc65..1901946 100644
--- a/sys-cluster/ganglia/ganglia-3.7.2.ebuild
+++ b/sys-cluster/ganglia/ganglia-3.7.2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 src_prepare() {
-	epatch "${FILESDIR}/02-${PV}-use-tirpc-instead-of-sunrpc.patch"
+	epatch "${FILESDIR}/01-${PV}-use-tirpc-instead-of-sunrpc.patch"
 
 	if use python && ! use minimal; then
 		pushd gmetad-python >/dev/null || die
-- 
2.45.2


From 9f479626e5b2f5f97c684eeac8fe051d3b014af1 Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Fri, 13 Jul 2018 02:13:08 +0200
Subject: [PATCH 6/7] Clean patch.

---
 sys-cluster/ganglia/Manifest                  |  2 +-
 ...01-3.7.2-use-tirpc-instead-of-sunrpc.patch | 55 ++++++-------------
 2 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest
index b3f5281..b48219c 100644
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@@ -1,4 +1,4 @@
-AUX 01-3.7.2-use-tirpc-instead-of-sunrpc.patch 7023 BLAKE2B 387e16825ca1cacbf2ff12c9169b0b57ef50257aaa450d37a5a2478de24b84aef71f276f07566e19b555ad2b0fc00d2915f9534c1c97c33ccc6e35fb27fec511 SHA512 c13c48b1e6c637b2bebd1982d32bee9c89d132df4ddc33d248a77ea3fa0aaf905e82c8dc4638669d24d43cec08b5ac5e509ff182c7753c9c89cd29cee0df55f7
+AUX 01-3.7.2-use-tirpc-instead-of-sunrpc.patch 6217 BLAKE2B 76c63d93c077673dc5de60787b39ee7a8326073ba12364d8be7efb206bb93a7d215676745b5ca37165118f739a1ec03fa39654c14545d32e6dc0cf7d387b8d2c SHA512 22bde7bb27322203ad2dbce919fc29a57fc1edfb62ae2babc34900f342af42a5c8ad977ff2bcb404e85f34a96d446765b1487be7407846236d835f39dc95d989
 AUX gmetad-python.rc 618 BLAKE2B 476915bff06395d3451d256f4fef3d4a2aa96c866b9cae5227d19f60ecbffce0dc2e7f4513726564bff808ea3b2bd109ee8daff10975e9b1043f97733accc608 SHA512 1b23e84c453b0cd0aca8b340c9764adb79bccbc0b4a9574a1e5c7299bc8d497d30a2a56e9b855d3cda2664a856b404f4f6941b3feddbec889e45a59c92c05389
 AUX gmetad.rc 352 BLAKE2B 68629711870d52a198ae474b77ab7828987c2ac19551243063272ec50c61c3e0b2d32a08633ff878e3319a80f9bbc111ac5e7507c88164ea4ddb8244a0b9e41f SHA512 865e1f8622ebcf1103f0cb72ebc2d675af01e9ea0861fd43107ac2bca10d9e86f875741ae4cc1dabf0eb231fd3f907066974d82b245f2746acbad0f7eafb46af
 AUX gmetad.rc-2 480 BLAKE2B 9ebf71eca6c80aa5f5c776e292cc0ceee58103a30a7aad29e7430f766a58e6c58222113bc12bc7ddc74c4c3f6f5aaccc95ff7470321bbd3ccb87af1e704be7ae SHA512 37678fe9b52ce7c6ef38bcc764189ed26e10410567ac9a8608460ac3eab380c70ac91453ed425ffef8d6e86ff6ef609e0167f5bb04a2aa9318725527d31391fa
diff --git a/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch b/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch
index 10f8fef..54d2c6a 100644
--- a/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch
+++ b/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch
@@ -7,7 +7,7 @@ index 95d0807..105222b 100644
  
  EXTRA_SUBDIRS = "gmetad-python contrib solaris"
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
  
  AUTOMAKE_OPTIONS = dist-bzip2 dist-tarZ dist-zip
  ACLOCAL_AMFLAGS = -I m4
@@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac
 index fe7983b..597f0ca 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -606,13 +606,20 @@ AC_CHECK_HEADER([sys/mount.h], [], [],
+@@ -606,13 +606,12 @@ AC_CHECK_HEADER([sys/mount.h], [], [],
  #endif
  ])
  
@@ -29,17 +29,9 @@ index fe7983b..597f0ca 100644
 +dnl ##################################################################
 +dnl Checks for TIRPC
 +PKG_CHECK_MODULES([TIRPC],[libtirpc])
-+dnl LDFLAGS="$LDFLAGS $LIBS $APR_LIBS"
 +LDFLAGS="$LDFLAGS $TIRPC_LIBS"
-+RPC_CFLAGS="$TIRPC_CFLAGS"
-+
-+dnl PKG_CHECK_MODULES([TIRPC],
-+dnl                   [libtirpc],
-+dnl                   [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
-+dnl                   [AC_MSG_ERROR([libtirpc requested, but library not found.])]
-+dnl )
-+nl AC_SUBST(RPC_CFLAGS)
-+dnl AC_SUBST(RPC_LIBS)
++TIRPC_INCLUDES="$TIRPC_CFLAGS"
++AC_SUBST(TIRPC_INCLUDES)
  
  dnl ##################################################################
  dnl Checks for typedefs.
@@ -52,7 +44,7 @@ index 0a4e360..874d448 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
  AM_CFLAGS = -I$(top_builddir)/lib -I$(top_builddir)/gmond -I$(top_builddir)/libmetrics -I$(top_builddir)/include $(GCFLAGS) @PROTOBUF_C_CFLAGS@
  
  sbin_PROGRAMS = gmetad
@@ -65,7 +57,7 @@ index bc7807c..d9bf585 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
  
  AM_CFLAGS = -I../lib -I../include $(GCFLAGS)
  
@@ -78,7 +70,7 @@ index 256fee3..d6f5f07 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
  AM_CFLAGS = -I$(top_builddir)/lib -I$(top_builddir)/include/ -I$(top_builddir)/libmetrics $(GCFLAGS)
  
  sbin_PROGRAMS = gmond
@@ -91,7 +83,7 @@ index fd7457e..99ddb83 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
 diff --git a/gmond/modules/disk/Makefile.am b/gmond/modules/disk/Makefile.am
 index 0c78689..2f5a2f0 100644
 --- a/gmond/modules/disk/Makefile.am
@@ -101,7 +93,7 @@ index 0c78689..2f5a2f0 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
 diff --git a/gmond/modules/example/Makefile.am b/gmond/modules/example/Makefile.am
 index e3bff6a..18b4e3b 100644
 --- a/gmond/modules/example/Makefile.am
@@ -111,7 +103,7 @@ index e3bff6a..18b4e3b 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
  
  install:
  	@echo
@@ -124,7 +116,7 @@ index 82336db..06ad430 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
 diff --git a/gmond/modules/network/Makefile.am b/gmond/modules/network/Makefile.am
 index 72a4faf..c370d88 100644
 --- a/gmond/modules/network/Makefile.am
@@ -134,7 +126,7 @@ index 72a4faf..c370d88 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
 diff --git a/gmond/modules/perl/Makefile.am b/gmond/modules/perl/Makefile.am
 index b7b095c..f1d0fb9 100644
 --- a/gmond/modules/perl/Makefile.am
@@ -144,7 +136,7 @@ index b7b095c..f1d0fb9 100644
  	  $(INSTALL_DATA) ../conf.d/modperl.conf $(DESTDIR)$(sysconfdir)/conf.d/modperl.conf
  
 -INCLUDES = @APR_INCLUDES@ @PERL_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @PERL_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @PERL_INCLUDES@ @TIRPC_INCLUDES@
 diff --git a/gmond/modules/python/Makefile.am b/gmond/modules/python/Makefile.am
 index f535b07..c8fcac0 100644
 --- a/gmond/modules/python/Makefile.am
@@ -154,7 +146,7 @@ index f535b07..c8fcac0 100644
  	  $(INSTALL_DATA) ../conf.d/modpython.conf $(DESTDIR)$(sysconfdir)/conf.d/modpython.conf
  
 -INCLUDES = @APR_INCLUDES@ @PYTHON_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @PYTHON_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @PYTHON_INCLUDES@ @TIRPC_INCLUDES@
 diff --git a/gmond/modules/status/Makefile.am b/gmond/modules/status/Makefile.am
 index cd84069..53968fd 100644
 --- a/gmond/modules/status/Makefile.am
@@ -164,7 +156,7 @@ index cd84069..53968fd 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
 diff --git a/gmond/modules/system/Makefile.am b/gmond/modules/system/Makefile.am
 index 5fc7fb3..566469e 100644
 --- a/gmond/modules/system/Makefile.am
@@ -174,7 +166,7 @@ index 5fc7fb3..566469e 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
 diff --git a/lib/Makefile.am b/lib/Makefile.am
 index 935c514..6e0499f 100644
 --- a/lib/Makefile.am
@@ -184,20 +176,7 @@ index 935c514..6e0499f 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
  AM_CFLAGS = -I.. -I. -I$(top_builddir)/include/ $(GCFLAGS) -DSYSCONFDIR='"$(sysconfdir)"'
  
  include_HEADERS = gm_protocol.h
-diff --git a/scripts/fixconfig b/scripts/fixconfig
-index 5be7982..707f62d 100755
---- a/scripts/fixconfig
-+++ b/scripts/fixconfig
-@@ -35,7 +35,7 @@ fi
- 
- # Additional variables set by configure
- CFLAGS="`echo '-g -O2 -fno-strict-aliasing -Wall -D_REENTRANT' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
--LDFLAGS="`echo ' -lpthread  -lapr-1  ' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
-+LDFLAGS="`echo ' -lpthread  -lapr-1 -ltirpc  ' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
- LIBS="-ldl -lnsl -lnsl -lz -lpcre -lexpat -lconfuse -lpthread "
- VERSION="3.7.2"
- host_cpu="x86_64"
-- 
2.45.2


From 497665b166f0213fcdb0b02819487f124bc4eaa9 Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Fri, 13 Jul 2018 21:36:20 +0200
Subject: [PATCH 7/7] sys-cluster/ganglia:

Add ebuild for ganglia-3.7.2 with a patch to use tirpc instead of Sun RPC.

Package-Manager: Portage-2.3.40, Repoman-2.3.9
---
 sys-cluster/ganglia/ChangeLog       |   3 +
 sys-cluster/ganglia/Manifest        |   2 +-
 sys-cluster/ganglia/files/patch.bak | 196 ----------------------------
 3 files changed, 4 insertions(+), 197 deletions(-)
 create mode 100644 sys-cluster/ganglia/ChangeLog
 delete mode 100644 sys-cluster/ganglia/files/patch.bak

diff --git a/sys-cluster/ganglia/ChangeLog b/sys-cluster/ganglia/ChangeLog
new file mode 100644
index 0000000..fa53b1e
--- /dev/null
+++ b/sys-cluster/ganglia/ChangeLog
@@ -0,0 +1,3 @@
+  13 Jul 2018;  <manuel@gentoo.org> ganglia-3.7.2.ebuild:
+  sys-cluster/ganglia:   Add ebuild for ganglia-3.7.2 with a patch to use tirpc
+  instead of Sun RPC.
diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest
index b48219c..bd0d4de 100644
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@@ -4,7 +4,7 @@ AUX gmetad.rc 352 BLAKE2B 68629711870d52a198ae474b77ab7828987c2ac19551243063272e
 AUX gmetad.rc-2 480 BLAKE2B 9ebf71eca6c80aa5f5c776e292cc0ceee58103a30a7aad29e7430f766a58e6c58222113bc12bc7ddc74c4c3f6f5aaccc95ff7470321bbd3ccb87af1e704be7ae SHA512 37678fe9b52ce7c6ef38bcc764189ed26e10410567ac9a8608460ac3eab380c70ac91453ed425ffef8d6e86ff6ef609e0167f5bb04a2aa9318725527d31391fa
 AUX gmond.rc 346 BLAKE2B 8930fe96692c100de0feed00fbe1d5f39c3d6f9679f88ef0326b1c6b7cf6408ddba2d909027577299f5d063f765f9c9ddb26c96b0582b79b50f528ac2bffaba2 SHA512 0d1d4da1bfc2c20ae741fb9a7ee2e649780254029c50fee866f1fffdb55fddbd61ea3ead6670d7a65489d780990e24c6743c14bc1a4a7040b84972f4884629ca
 AUX gmond.rc-2 473 BLAKE2B 461d0b481f2138dcab8f7202a880354740b71f91e41ad2152a3465daf8072e6243fcc5f27ee215aa079dad30546e06146c01be71e85f518974cd9c479549ff34 SHA512 bbb5e3c525137aa2072bd46d28473523498895eba70c8dad1209230ea5e7f44ddc09875b5b6065fd5351d89ed0ad574a94fe0debcbe1d3a51e2541715adb4240
-AUX patch.bak 6745 BLAKE2B 3099441ac39935c2bff5640999f98c0aa58d00d376c9901e77b1a13259a622149ff5d3c6656fa274eeea3727afe301c101df1f2fac0a30c6c8ec40c64c8df776 SHA512 e25ec9717f5d4614ceb54bff75235be7cf2c9c6667880a08a72e771385579479eae00c7a4ffc34f9eb8c2e9db6d9059ddcff09f5e9e9553fc3f6adfda3d34687
 DIST ganglia-3.7.2.tar.gz 1302320 BLAKE2B aee647d6ec4b2852536769773dd54d7a7e9ca33c05de4316172d530aee549207bdfa59f25e8fe456ae4c01a1af9eca3846f30242c64e7d9fe393687a7203eb12 SHA512 a88955e59421a447e5752a9bfe5f599d989a7a5a0141141ab3601d1ab250be4eebbede8bcef8baa151b2f9deaf3f56e30aef8ea709f3cc820a79fa3d3961e0df
 EBUILD ganglia-3.7.2.ebuild 3041 BLAKE2B 0aa4dd49dcb9e10120717302ff4f9e09b2e8e9c0fd17021294ed5fcd163b9c69f4df99dd7d542819013d156c23dd40375f040acb6f71e9138f093731b73907ca SHA512 3717a4c024f1dfbb570a81a583c8dba91388abbffc5af82738739fcfeccc499b3448e335e1a313ca142cf8e9d02424fe8b8665454ea1d2b18bae8cbe6672bc85
+MISC ChangeLog 160 BLAKE2B 02ff265a6eabc64f9d83e5c44245d2bd6bab4213db9dd94e13c4ec5a5ed6e56f5d52a876e68a680236cc23d35e6f232cd67a9d662f72262666965c93eca9f767 SHA512 a5cf7c24754de83ba6852ce6e4a603c137bb390c02118e9afa98305e6e50ab8287e27c1d202cf7da10e2daee01785fa552e83327fbef0d154617d7511bfabb4a
 MISC metadata.xml 325 BLAKE2B 71ac60956aa877d76ec897fa1c07082c2b0d8d18db7e9d17248e3c730def736b5a70ffdf371d0d4d38aba338efc0689d5cb24dd08c084934e4d23914da48fc4f SHA512 c3cc85ba47cd58ccba2a511b1bcdac2de4cd40b69bc005935291c9394bde3ed55ce14d57d0c3ab0bc188b5116192f0851cb1be3e4eaeb190555e50920fcdb4fb
diff --git a/sys-cluster/ganglia/files/patch.bak b/sys-cluster/ganglia/files/patch.bak
deleted file mode 100644
index 6e0bcda..0000000
--- a/sys-cluster/ganglia/files/patch.bak
+++ /dev/null
@@ -1,196 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 95d0807..105222b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -9,7 +9,7 @@ GMETAD_SUBDIR =
- endif
- 
- EXTRA_SUBDIRS = "gmetad-python contrib solaris"
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
- 
- AUTOMAKE_OPTIONS = dist-bzip2 dist-tarZ dist-zip
- ACLOCAL_AMFLAGS = -I m4
-diff --git a/configure.ac b/configure.ac
-index fe7983b..984c70b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -606,13 +606,13 @@ AC_CHECK_HEADER([sys/mount.h], [], [],
- #endif
- ])
- 
--AC_CHECK_HEADERS(rpc/types.h)
--AC_CHECK_HEADER([rpc/xdr.h], [],
--   [AC_MSG_ERROR([your system is missing the Sun RPC (ONC/RPC) libraries])],
--[#ifdef HAVE_RPC_TYPES_H
--# include <rpc/types.h>
--#endif
--])
-+PKG_CHECK_MODULES([TIRPC],
-+                  [libtirpc],
-+                  [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
-+                  [AC_MSG_ERROR([libtirpc requested, but library not found.])]
-+)
-+AC_SUBST(RPC_CFLAGS)
-+AC_SUBST(RPC_LIBS)
- 
- dnl ##################################################################
- dnl Checks for typedefs.
-diff --git a/gmetad/Makefile.am b/gmetad/Makefile.am
-index 0a4e360..874d448 100644
---- a/gmetad/Makefile.am
-+++ b/gmetad/Makefile.am
-@@ -11,7 +11,7 @@ GLDADD =
- GLDFLAGS = 
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
- AM_CFLAGS = -I$(top_builddir)/lib -I$(top_builddir)/gmond -I$(top_builddir)/libmetrics -I$(top_builddir)/include $(GCFLAGS) @PROTOBUF_C_CFLAGS@
- 
- sbin_PROGRAMS = gmetad
-diff --git a/gmetric/Makefile.am b/gmetric/Makefile.am
-index bc7807c..d9bf585 100644
---- a/gmetric/Makefile.am
-+++ b/gmetric/Makefile.am
-@@ -10,7 +10,7 @@ GLDADD =
- GLDFLAGS = 
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
- 
- AM_CFLAGS = -I../lib -I../include $(GCFLAGS)
- 
-diff --git a/gmond/Makefile.am b/gmond/Makefile.am
-index 256fee3..d6f5f07 100644
---- a/gmond/Makefile.am
-+++ b/gmond/Makefile.am
-@@ -44,7 +44,7 @@ if BUILD_SFLOW
- GCFLAGS += -DSFLOW
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
- AM_CFLAGS = -I$(top_builddir)/lib -I$(top_builddir)/include/ -I$(top_builddir)/libmetrics $(GCFLAGS)
- 
- sbin_PROGRAMS = gmond
-diff --git a/gmond/modules/cpu/Makefile.am b/gmond/modules/cpu/Makefile.am
-index fd7457e..99ddb83 100644
---- a/gmond/modules/cpu/Makefile.am
-+++ b/gmond/modules/cpu/Makefile.am
-@@ -25,4 +25,4 @@ modload_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
- 
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
-diff --git a/gmond/modules/disk/Makefile.am b/gmond/modules/disk/Makefile.am
-index 0c78689..2f5a2f0 100644
---- a/gmond/modules/disk/Makefile.am
-+++ b/gmond/modules/disk/Makefile.am
-@@ -11,4 +11,4 @@ moddisk_la_LDFLAGS = -module -avoid-version
- moddisk_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
-diff --git a/gmond/modules/example/Makefile.am b/gmond/modules/example/Makefile.am
-index e3bff6a..18b4e3b 100644
---- a/gmond/modules/example/Makefile.am
-+++ b/gmond/modules/example/Makefile.am
-@@ -11,7 +11,7 @@ modexample_la_LDFLAGS = -module -avoid-version
- EXTRA_DIST = ../conf.d/example.conf
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
- 
- install:
- 	@echo
-diff --git a/gmond/modules/memory/Makefile.am b/gmond/modules/memory/Makefile.am
-index 82336db..06ad430 100644
---- a/gmond/modules/memory/Makefile.am
-+++ b/gmond/modules/memory/Makefile.am
-@@ -12,4 +12,4 @@ modmem_la_LDFLAGS = -module -avoid-version
- modmem_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
-diff --git a/gmond/modules/network/Makefile.am b/gmond/modules/network/Makefile.am
-index 72a4faf..c370d88 100644
---- a/gmond/modules/network/Makefile.am
-+++ b/gmond/modules/network/Makefile.am
-@@ -12,4 +12,4 @@ modnet_la_LDFLAGS = -module -avoid-version
- modnet_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
-diff --git a/gmond/modules/perl/Makefile.am b/gmond/modules/perl/Makefile.am
-index b7b095c..f1d0fb9 100644
---- a/gmond/modules/perl/Makefile.am
-+++ b/gmond/modules/perl/Makefile.am
-@@ -28,4 +28,4 @@ install-exec-hook:	../conf.d/modperl.conf README
- 	mkdir -p $(DESTDIR)$(sysconfdir)/conf.d && \
- 	  $(INSTALL_DATA) ../conf.d/modperl.conf $(DESTDIR)$(sysconfdir)/conf.d/modperl.conf
- 
--INCLUDES = @APR_INCLUDES@ @PERL_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @PERL_INCLUDES@ @RPC_CFLAGS@
-diff --git a/gmond/modules/python/Makefile.am b/gmond/modules/python/Makefile.am
-index f535b07..c8fcac0 100644
---- a/gmond/modules/python/Makefile.am
-+++ b/gmond/modules/python/Makefile.am
-@@ -27,4 +27,4 @@ install-exec-hook:	../conf.d/modpython.conf README
- 	mkdir -p $(DESTDIR)$(sysconfdir)/conf.d && \
- 	  $(INSTALL_DATA) ../conf.d/modpython.conf $(DESTDIR)$(sysconfdir)/conf.d/modpython.conf
- 
--INCLUDES = @APR_INCLUDES@ @PYTHON_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @PYTHON_INCLUDES@ @RPC_CFLAGS@
-diff --git a/gmond/modules/status/Makefile.am b/gmond/modules/status/Makefile.am
-index cd84069..53968fd 100644
---- a/gmond/modules/status/Makefile.am
-+++ b/gmond/modules/status/Makefile.am
-@@ -11,4 +11,4 @@ modgstatus_la_LDFLAGS = -module -avoid-version
- EXTRA_DIST = ../conf.d/modgstatus.conf
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
-diff --git a/gmond/modules/system/Makefile.am b/gmond/modules/system/Makefile.am
-index 5fc7fb3..566469e 100644
---- a/gmond/modules/system/Makefile.am
-+++ b/gmond/modules/system/Makefile.am
-@@ -16,4 +16,4 @@ modsys_la_LDFLAGS = -module -avoid-version
- modsys_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 935c514..6e0499f 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -14,7 +14,7 @@ if BUILD_SFLOW
- GCFLAGS += -DSFLOW
- endif
- 
--INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
- AM_CFLAGS = -I.. -I. -I$(top_builddir)/include/ $(GCFLAGS) -DSYSCONFDIR='"$(sysconfdir)"'
- 
- include_HEADERS = gm_protocol.h
-diff --git a/scripts/fixconfig b/scripts/fixconfig
-index 5be7982..6e3d710 100755
---- a/scripts/fixconfig
-+++ b/scripts/fixconfig
-@@ -36,7 +36,7 @@ fi
- # Additional variables set by configure
- CFLAGS="`echo '-g -O2 -fno-strict-aliasing -Wall -D_REENTRANT' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
- LDFLAGS="`echo ' -lpthread  -lapr-1  ' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
--LIBS="-ldl -lnsl -lnsl -lz -lpcre -lexpat -lconfuse -lpthread "
-+LIBS="-ldl -lnsl -lnsl -lz -lpcre -lexpat -lconfuse -lpthread -ltirpc "
- VERSION="3.7.2"
- host_cpu="x86_64"
- 
-- 
2.45.2