[gentoo-commits] repo/gentoo:master commit in: net-analyzer/rrdtool/, net-analyzer/rrdtool/files/

["Jeroen Roovers" <jer@gentoo.org>]

commit:     1929c03310815fde1ec2fbe50cf9f3667a54844b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 11:35:48 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 11:37:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1929c033

net-analyzer/rrdtool: Version bump.

Package-Manager: portage-2.2.28

 net-analyzer/rrdtool/Manifest                      |   1 +
 .../rrdtool/files/rrdtool-1.6.0-configure.ac.patch |  25 +++
 net-analyzer/rrdtool/rrdtool-1.6.0.ebuild          | 185 +++++++++++++++++++++
 3 files changed, 211 insertions(+)

diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 5e3651b..0367047 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -3,3 +3,4 @@ DIST rrdtool-1.4.9.tar.gz 1385640 SHA256 3e2826e0d60aaf85313da35b3c0d3a926748fe4
 DIST rrdtool-1.5.3.tar.gz 2158011 SHA256 79e7b2f5cf74843e89fe4d08925f955268fd21736cbea03e54ae83320fc6129f SHA512 51e0dbca582acde1a0e77a8fcc4ffa2389b5467b5eb2443a6c9e38851459b7aa9bc08a8d5fd44f69c72e3cdb46be64a2baa66c69ca86a4cda8a061120fa14afb WHIRLPOOL 8738a499699423bd7c2536ca8d8b57db386b190fdeea47328c126aa70fae8d604ab1ab18253567a8426fe73e3fb9ab17ba8c40563841015da96451dcb4435dd7
 DIST rrdtool-1.5.4.tar.gz 2181438 SHA256 3feea3da87c02128a27083f1c7b2cb797ef673e946564c0ce008c1c25a5c3f99 SHA512 1b28db23d138677210e396c2eea48f88839847d0e08a7048b6ffa83384de612c1e71cfd10da0ef59ebc87a2707a72b226153f0d73c78c74f68bb9f721b7ad665 WHIRLPOOL 00346df3e9c5e07d4a23347f486a32c697f25bebc257e780dedebd28ef4a60b8d8d447bd431629eaf8f19d3155d03a5cbabf3df1565089a6eefde79a502f8e0e
 DIST rrdtool-1.5.5.tar.gz 2187685 SHA256 3a286d449c05d657e3fc3adcaa5cb4f0cfac8f465324b14f364a45d4ff8ca6f6 SHA512 07fb0edb5fbc0b491f8a40844d4a914f26c6269b2d07ab91f4d54fdcfeb7899348362044ac632223341f30fc10e6748a59863977496801530f5cdd2d61f0e88c WHIRLPOOL 527093b99044826b5faf5ab0a47d8a141defef3589173fb3b8bf72ed6f52032184e50f6054e0b82bf84cb73aa962ee50f8f1b319fbee519c8916c0d3a1852c26
+DIST rrdtool-1.6.0.tar.gz 2186538 SHA256 cd948e89cd2d8825fab4a6fb0323f810948d934af7d92c9ee8b5e9e1350e52d7 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd WHIRLPOOL ae831bfd6b397ca77d2a7b2e393d2dc542e740f1bfb9b45eada44781a7c9dd93b80279683cca1590477191bc3972f859097802387a12c8e3b40c97f1524428d6

diff --git a/net-analyzer/rrdtool/files/rrdtool-1.6.0-configure.ac.patch b/net-analyzer/rrdtool/files/rrdtool-1.6.0-configure.ac.patch
new file mode 100644
index 0000000..a0bee69
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.6.0-configure.ac.patch
@@ -0,0 +1,25 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -177,7 +177,7 @@
+ AC_PROG_CPP
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+-AC_PROG_LIBTOOL
++LT_INIT
+ 
+ dnl Try to detect/use GNU features
+ CFLAGS="$CFLAGS -D_GNU_SOURCE"
+@@ -239,13 +239,6 @@
+ AC_CHECK_FUNC(acos,  , AC_CHECK_LIB(m, acos))
+ AC_CHECK_FUNC(round, , AC_CHECK_LIB(m, round))
+ 
+-
+-
+-dnl add pic flag in any case this makes sure all our code is relocatable
+-eval `./libtool --config | grep pic_flag=`
+-CFLAGS="$CFLAGS $pic_flag"
+-
+-
+ dnl Checks for library functions.
+ AC_FUNC_STRFTIME
+ AC_FUNC_VPRINTF

diff --git a/net-analyzer/rrdtool/rrdtool-1.6.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.6.0.ebuild
new file mode 100644
index 0000000..5f8a447
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.6.0.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DISTUTILS_OPTIONAL=true
+DISTUTILS_SINGLE_IMPL=true
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils perl-module distutils-r1 flag-o-matic multilib
+
+DESCRIPTION="A system to store and display time-series data"
+HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
+SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
+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:*[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
+"
+RDEPEND="
+	${CDEPEND}
+"
+PDEPEND="
+	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
+"
+
+S=${WORKDIR}/${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() {
+	# At the next version bump, please see if you actually still need this
+	# before adding versions
+	cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-cgi.patch \
+		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch \
+		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-lua.patch \
+		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-python.patch \
+		"${FILESDIR}"/${PN}-1.6.0-configure.ac.patch
+
+	# 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::' \
+			tests/Makefile.am || die
+	fi
+
+	echo ${PV/_rc*/} >> VERSION || die
+
+	export rd_cv_gcc_flag__Werror=no
+
+	eautoreconf
+}
+
+src_configure() {
+	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
+}