gentoo resync : 20.03.2021

5 files changed, 57 insertions, 433 deletions

diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 67d7f77af1af..e5078056c521 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -5,7 +5,5 @@ AUX rrdtool-1.5.5-rrdrados.pod 1419 BLAKE2B ef1a2438846a60b565c94088d7563480a97e
 AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35362dc31605ab0428be4291afe5bd0a5c9c901bdd85a989cf1dcb33e247a7f79d8b155daf02d512691c38e72b8d2be3691d9733e5dc9 SHA512 5c2d192919e31a91cd600ed0e11346a4cbb1c66f93abbb583f20882d03705972eb4ed3156a9cae9a589aa5d26009037deb280569baf940966887483c6dbefb81
 AUX rrdtool-1.7.1-configure.ac.patch 257 BLAKE2B 9aa11b7b0392cb2427d686b888c29b09d8e50b1b0fbedfe0e144eeb27ab6da5a7526633eb8655f1edb129e6a256b102ba095cd9c1aa501aed5e9492073c93b2b SHA512 7c3d175ce94bce24ab244ca899d62d2537392c360ed3ec211b5be2e41fcb6638343f7357db1d3c00fac15104398f83b236ead713e940385b04d61851a3275683
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
-EBUILD rrdtool-1.7.2-r1.ebuild 4285 BLAKE2B fa7988df0a282ca8744f67c594eca3e6946d33009aa51b9230a59bce11c73e3b50434a09f831f7ed0445b4b48062934237492276a7a3f217045a321f20ae9384 SHA512 331b0993d3f352187b3e65fe841502fc4cb00f3353b6535d5fdf4c13aed808196c7f3ec6e5b86949c356f2911d4f26e9a2a75761586e585234f20531b4b70b28
-EBUILD rrdtool-1.7.2-r100.ebuild 5670 BLAKE2B fd95afabbd2bb214eac8e8030deace0b142fefdc3b8c021e9e573cc3245637b163e037a482c07dd30f4c4e5a6cebe32e1858d8c06fbb0fa404b442836845290b SHA512 bb07a06155cf801c3dfce92587f736522805efeac21a1f9775f85840f169857537209ecbca97cea7dfb067145988cdd0546f913a4dd8cbf3cba01c5098ed52a5
-EBUILD rrdtool-1.7.2.ebuild 4290 BLAKE2B eb6142d4ab03c640e557639252d8db5818a30944cfc06b19fc7e7b0132cb25b5f22564684fa836750bc0a6695f8cdcd9aa97dcda3a15cd5edbe8b8ab1c34fe7b SHA512 52b56a2512525888b7eb6d40c3ad7f890d5e16a8e19840d099707965915281201f8e9a6db3d501eaa4e850de5963295ae49043a63803393ac98f23ecfd5aeb76
-MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
+EBUILD rrdtool-1.7.2-r100.ebuild 5760 BLAKE2B 3a5cd702f9f5407c4b57d434a875a7afa3fe8a63cfe07eb8375f95897934519593dfeab7c7f3fbd541c35a90aabaee687be9b27f14467ce30cb3f8a39b3ba98e SHA512 028d78b9ffe6cd5698cb5f136f8be19b3b5e293ecdc3294ca4c58a5a6810e2a3c590de106811f7c278dc73c667d4073e44a0083103403e673e450fe1eebafe2a
+MISC metadata.xml 584 BLAKE2B fc6bd75c58c7803f1ab26c41cc2b58dc4e8555dcac7a48428967854a1b8063eb0e745bc7c07672b805ea8adc55df0b7c8acd51576bd7b89ab37b45d9d04b4d11 SHA512 69ba81252477dfd6efc01cfe886d3ca28eec3214348d5bc6bc7f73eb3ff50080977b5c74058a00cf62e504026aa5fa096b0ed1389da121c403bb27bd6d4c2068
diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml
index a6a291c9723d..d2dbe95efd3c 100644
--- a/net-analyzer/rrdtool/metadata.xml
+++ b/net-analyzer/rrdtool/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<use>
-<flag name="graph">Enable support for graphing functions</flag>
-<flag name="rados">Enable support for librados from <pkg>sys-cluster/ceph</pkg></flag>
-<flag name="rrdcgi">Build rrdcgi support</flag>
-</use>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="graph">Enable support for graphing functions</flag>
+		<flag name="rados">Enable support for librados from <pkg>sys-cluster/ceph</pkg></flag>
+		<flag name="rrdcgi">Build rrdcgi support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">oetiker/rrdtool-1.x</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
deleted file mode 100644
index ba8b9c45ce93..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DISTUTILS_OPTIONAL=true
-DISTUTILS_SINGLE_IMPL=true
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7,8} )
-inherit autotools perl-module distutils-r1 flag-o-matic multilib
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
-SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/8.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
-	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
-	dbi? ( dev-db/libdbi[static-libs(+)?] )
-	graph? (
-		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
-		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
-		>=x11-libs/pango-1.28
-	)
-	lua? ( dev-lang/lua:0= )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	rados? ( sys-cluster/ceph )
-	tcl? ( dev-lang/tcl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-
-DEPEND="
-	${CDEPEND}
-	sys-apps/groff
-	virtual/pkgconfig
-	virtual/awk
-	test? ( sys-devel/bc )
-"
-RDEPEND="
-	${CDEPEND}
-"
-PDEPEND="
-	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
-	"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
-	"${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
-)
-S=${WORKDIR}/${MY_P}
-
-python_compile() {
-	cd bindings/python || die
-	distutils-r1_python_compile
-}
-
-python_install() {
-	cd bindings/python || die
-	distutils-r1_python_install
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# At the next version bump, please see if you actually still need this
-	# before adding versions
-	if ! [ -f doc/rrdrados.pod ]; then
-		cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
-	else
-		die "File already exists: doc/rrdrados.pod. Remove this code!"
-	fi
-
-	# bug 456810
-	# no time to sleep
-	sed -i \
-		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
-		-e 's|^sleep 1$||g' \
-		-e '/^dnl.*png/s|^dnl||g' \
-		configure.ac || die
-
-	# Python bindings are built/installed manually
-	sed -i \
-		-e '/^all-local:/s| @COMP_PYTHON@||' \
-		bindings/Makefile.am || die
-
-	if ! use graph; then
-		sed -i \
-			-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
-			-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
-			-e 's|graph1||g' \
-			tests/Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	export rd_cv_gcc_flag__Werror=no
-	export rd_cv_ms_async=ok
-
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
-
-	# to solve bug #260380
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
-	# Stub configure.ac
-	local myconf=()
-	if ! use tcpd; then
-		myconf+=( "--disable-libwrap" )
-	fi
-	if ! use dbi; then
-		myconf+=( "--disable-libdbi" )
-	fi
-	if ! use rados; then
-		myconf+=( "--disable-librados" )
-	fi
-
-	econf \
-		$(use_enable graph rrd_graph) \
-		$(use_enable lua lua-site-install) \
-		$(use_enable lua) \
-		$(use_enable perl perl-site-install) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable rrdcgi) \
-		$(use_enable static-libs static) \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
-		--with-perl-options=INSTALLDIRS=vendor \
-		--disable-ruby-site-install \
-		--disable-ruby \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	use python && distutils-r1_src_compile
-}
-
-src_test() {
-	export LC_ALL=C
-	default
-}
-
-src_install() {
-	default
-
-	if ! use doc ; then
-		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
-	fi
-
-	if use !rrdcgi ; then
-		# uses rrdcgi, causes invalid shebang error in Prefix, useless
-		# without rrdcgi installed
-		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
-	fi
-
-	if use perl ; then
-		perl_delete_localpod
-		perl_delete_packlist
-	fi
-
-	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
-
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
-
-	keepdir /var/lib/rrdcached/journal/
-	keepdir /var/lib/rrdcached/db/
-
-	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
-	newinitd "${FILESDIR}"/rrdcached.init rrdcached
-
-	use python && distutils-r1_src_install
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
index 8e87060d737d..6dbe3765730f 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
@@ -9,26 +9,30 @@ GENTOO_DEPEND_ON_PERL=no
 LUA_COMPAT=( lua5-{1..4} luajit )
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit autotools lua perl-module distutils-r1 flag-o-matic multilib
+inherit autotools lua perl-module distutils-r1 flag-o-matic
 
 MY_P=${P/_/-}
 
 DESCRIPTION="A system to store and display time-series data"
 HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
 SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
+
 RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
 	lua? (
 		${LUA_REQUIRED_USE}
 		test? ( graph )
-	)"
+	)
+"
 
-CDEPEND="
+RDEPEND="
 	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
 	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
 	dbi? ( dev-db/libdbi[static-libs(+)?] )
@@ -44,39 +48,25 @@ CDEPEND="
 	tcl? ( dev-lang/tcl:0= )
 	tcpd? ( sys-apps/tcp-wrappers )
 "
-
-DEPEND="
-	${CDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-apps/groff
 	virtual/pkgconfig
 	virtual/awk
-	test? ( sys-devel/bc )
-"
-RDEPEND="
-	${CDEPEND}
-"
-BDEPEND="test? (
-	lua? ( ${LUA_DEPS} )
-)"
-PDEPEND="
-	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
+	python? ( $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') )
+	test? (
+		sys-devel/bc
+		lua? ( ${LUA_DEPS} )
+	)
 "
+
+PDEPEND="ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
 	"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
 	"${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
 )
-S=${WORKDIR}/${MY_P}
-
-python_compile() {
-	cd bindings/python || die
-	distutils-r1_python_compile
-}
-
-python_install() {
-	cd bindings/python || die
-	distutils-r1_python_install
-}
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -86,7 +76,7 @@ src_prepare() {
 	default
 	# At the next version bump, please see if you actually still need this
 	# before adding versions
-	if ! [ -f doc/rrdrados.pod ]; then
+	if ! [[ -f doc/rrdrados.pod ]] ; then
 		cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
 	else
 		die "File already exists: doc/rrdrados.pod. Remove this code!"
@@ -105,7 +95,7 @@ src_prepare() {
 		-e '/^all-local:/s| @COMP_PYTHON@||' \
 		bindings/Makefile.am || die
 
-	if ! use graph; then
+	if ! use graph ; then
 		sed -i \
 			-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
 			-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
@@ -122,20 +112,20 @@ src_configure() {
 
 	filter-flags -ffast-math
 
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+	export RRDDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
 
 	# to solve bug #260380
 	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
 
 	# Stub configure.ac
 	local myconf=()
-	if ! use tcpd; then
+	if ! use tcpd ; then
 		myconf+=( "--disable-libwrap" )
 	fi
-	if ! use dbi; then
+	if ! use dbi ; then
 		myconf+=( "--disable-libdbi" )
 	fi
-	if ! use rados; then
+	if ! use rados ; then
 		myconf+=( "--disable-librados" )
 	fi
 
@@ -158,6 +148,11 @@ src_configure() {
 		${myconf[@]}
 }
 
+python_compile() {
+	cd bindings/python || die
+	distutils-r1_python_compile
+}
+
 lua_src_compile() {
 	pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
 
@@ -189,17 +184,23 @@ lua_src_test() {
 
 	LUA_CPATH="${PWD}/.libs/?.so" emake LUA="${LUA}" test
 
-	popd
+	popd || die
 }
 
 src_test() {
 	export LC_ALL=C
+
 	default
-	if use lua; then
+	if use lua ; then
 		lua_foreach_impl lua_src_test
 	fi
 }
 
+python_install() {
+	cd bindings/python || die
+	distutils-r1_python_install
+}
+
 lua_src_install() {
 	pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
 
@@ -209,24 +210,24 @@ lua_src_install() {
 		LUA_INSTALL_CMOD="${ED}/$(lua_get_cmod_dir)" \
 		install
 
-	popd
+	popd || die
 }
 
 src_install() {
 	default
 
 	if ! use doc ; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/{html,txt}
+		rm -rf "${ED}"/usr/share/doc/${PF}/{html,txt} || die
 	fi
 
-	if use lua; then
+	if use lua ; then
 		lua_foreach_impl lua_src_install
 	fi
 
-	if use !rrdcgi ; then
+	if ! use rrdcgi ; then
 		# uses rrdcgi, causes invalid shebang error in Prefix, useless
 		# without rrdcgi installed
-		rm -f "${ED}"/usr/share/${PN}/examples/cgi-demo.cgi
+		rm -f "${ED}"/usr/share/${PN}/examples/cgi-demo.cgi || die
 	fi
 
 	if use perl ; then
@@ -236,7 +237,7 @@ src_install() {
 
 	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
 
-	find "${ED}"/usr -name '*.la' -exec rm -f {} +
+	find "${ED}"/usr -name '*.la' -exec rm -f {} + || die
 
 	keepdir /var/lib/rrdcached/journal/
 	keepdir /var/lib/rrdcached/db/
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
deleted file mode 100644
index fb33d065e265..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DISTUTILS_OPTIONAL=true
-DISTUTILS_SINGLE_IMPL=true
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7,8} )
-inherit autotools perl-module distutils-r1 flag-o-matic multilib
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
-SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/8.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
-	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
-	dbi? ( dev-db/libdbi[static-libs(+)?] )
-	graph? (
-		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
-		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
-		>=x11-libs/pango-1.28
-	)
-	lua? ( dev-lang/lua:0=[deprecated] )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	rados? ( sys-cluster/ceph )
-	tcl? ( dev-lang/tcl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-
-DEPEND="
-	${CDEPEND}
-	sys-apps/groff
-	virtual/pkgconfig
-	virtual/awk
-	test? ( sys-devel/bc )
-"
-RDEPEND="
-	${CDEPEND}
-"
-PDEPEND="
-	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
-	"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
-	"${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
-)
-S=${WORKDIR}/${MY_P}
-
-python_compile() {
-	cd bindings/python || die
-	distutils-r1_python_compile
-}
-
-python_install() {
-	cd bindings/python || die
-	distutils-r1_python_install
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# At the next version bump, please see if you actually still need this
-	# before adding versions
-	if ! [ -f doc/rrdrados.pod ]; then
-		cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
-	else
-		die "File already exists: doc/rrdrados.pod. Remove this code!"
-	fi
-
-	# bug 456810
-	# no time to sleep
-	sed -i \
-		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
-		-e 's|^sleep 1$||g' \
-		-e '/^dnl.*png/s|^dnl||g' \
-		configure.ac || die
-
-	# Python bindings are built/installed manually
-	sed -i \
-		-e '/^all-local:/s| @COMP_PYTHON@||' \
-		bindings/Makefile.am || die
-
-	if ! use graph; then
-		sed -i \
-			-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
-			-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
-			-e 's|graph1||g' \
-			tests/Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	export rd_cv_gcc_flag__Werror=no
-	export rd_cv_ms_async=ok
-
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
-
-	# to solve bug #260380
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
-	# Stub configure.ac
-	local myconf=()
-	if ! use tcpd; then
-		myconf+=( "--disable-libwrap" )
-	fi
-	if ! use dbi; then
-		myconf+=( "--disable-libdbi" )
-	fi
-	if ! use rados; then
-		myconf+=( "--disable-librados" )
-	fi
-
-	econf \
-		$(use_enable graph rrd_graph) \
-		$(use_enable lua lua-site-install) \
-		$(use_enable lua) \
-		$(use_enable perl perl-site-install) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable rrdcgi) \
-		$(use_enable static-libs static) \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
-		--with-perl-options=INSTALLDIRS=vendor \
-		--disable-ruby-site-install \
-		--disable-ruby \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	use python && distutils-r1_src_compile
-}
-
-src_test() {
-	export LC_ALL=C
-	default
-}
-
-src_install() {
-	default
-
-	if ! use doc ; then
-		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
-	fi
-
-	if use !rrdcgi ; then
-		# uses rrdcgi, causes invalid shebang error in Prefix, useless
-		# without rrdcgi installed
-		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
-	fi
-
-	if use perl ; then
-		perl_delete_localpod
-		perl_delete_packlist
-	fi
-
-	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
-
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
-
-	keepdir /var/lib/rrdcached/journal/
-	keepdir /var/lib/rrdcached/db/
-
-	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
-	newinitd "${FILESDIR}"/rrdcached.init rrdcached
-
-	use python && distutils-r1_src_install
-}