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