Bump to 1.4.7, fix bugs 405431, 324093 and 416259. Thanks to Andreis Vinogradovs

Package-Manager: portage-2.1.10.63/cvs/Linux x86_64

4 files changed, 190 insertions, 2 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index df3f760cfb98..376f50b9b082 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.225 2012/05/04 06:08:08 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.226 2012/06/02 14:13:16 maksbotan Exp $
+
+*rrdtool-1.4.7 (02 Jun 2012)
+
+  02 Jun 2012; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/0001_rrdtool-1.4.7-configure.ac.patch, +rrdtool-1.4.7.ebuild:
+  Bump to 1.4.7, fix bugs 405431, 324093 and 416259. Thanks to Andreis
+  Vinogradovs
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> rrdtool-1.4.5-r1.ebuild,
   rrdtool-1.4.5-r2.ebuild:
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index aa303a6c5457..a495548f3bce 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,9 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0001_rrdtool-1.4.7-configure.ac.patch 492 RMD160 646c8ecb4f66ad53da1d378458529ecc30286058 SHA1 dbe6289d85d123eb707c1bb61dbc53714bc38362 SHA256 00ac12cee29a579532cfa82d3bba88588f4cc938667801743c40097dd38f73e5
 AUX rrdtool-1.3.8-configure.ac.patch 410 RMD160 7bc8ae6bf64fbc8602c0e4a4571c74d9afea818b SHA1 b28a7f253ff66d788a29d491ef57f11c6721bb16 SHA256 220d42a1228d015f6bd02124b3f8c878f0b7bda2e277e9e3b15d4f05603328b5
 AUX rrdtool-1.4.3-ruby-ldflags.patch 614 RMD160 dc43e0e459709323ab191005dcfb31b71eabd609 SHA1 ebc5b5140007266ec935b3693e680391ddd58091 SHA256 d51f1e01a5faccc0a83a09a7aca2fa251fdfd662ba19f3670ef6591e46afec09
 AUX rrdtool-1.4.4-dont-link-system-lib.patch 801 RMD160 ae423617f43efbffe00f84e5ad8c9e1c49ee896f SHA1 d4accd6c75027554e729633f296d7c2ddb506132 SHA256 7a726fe8534a9e56d7074af827ef88e96d5176d4f68983ff5514fb137c1f12eb
 AUX rrdtool-1.4.5-automake-1.11.2.patch 857 RMD160 5950a087cf5aafaae7550063b55a776adab9ac9f SHA1 55753d8354f559ee7efa7223aabc7411f218c6c2 SHA256 d72b5b9f7713832fa946f2310938f8df14b980548f789a4e629951cc4040b3ef
 DIST rrdtool-1.4.5.tar.gz 1348713 RMD160 9c45c3be7bcb8e17260055a33e936f307884914f SHA1 56638e8aedd5d5522152e86746e382b75dc48c35 SHA256 1267af420533d846432e55352db89b0f2507c711f80c65e016f7484f3cb0cf1d
+DIST rrdtool-1.4.7.tar.gz 1349040 RMD160 3a8c1c0f3fe0d76fb7da8b712cdd19d59d5171ba SHA1 faab7df7696b69f85d6f89dd9708d7cf0c9a273b SHA256 956aaf431c955ba88dd7d98920ade3a8c4bad04adb1f9431377950a813a7af11
 EBUILD rrdtool-1.4.5-r1.ebuild 3644 RMD160 98852cd8bd2c3ca537fc349f47bba02bc79f30d7 SHA1 08cddc29cc2985f15c7669bdf608f8aa838d7081 SHA256 83af71703bd2b8939a9c5fe32b113407371f486ca5119290b35f664c2caf99cf
 EBUILD rrdtool-1.4.5-r2.ebuild 3716 RMD160 f33cdf6061bea14be5907ba87e79c9de9d208ba3 SHA1 0c870c562811bd2d28cedc0c415dc1d5ae44cade SHA256 e4f5e13d11e09fb02fa7c8753e182ca9eb8c92a27d6f40795e4a6c6da970f4ce
-MISC ChangeLog 34045 RMD160 78eea8e268803d6c9256cbecaa59c79be2ddb491 SHA1 ab2c64ce845bba309d6b5a24f349dc0ade1140b6 SHA256 b1681a5f18a2ddf5aa9032a37e327969593e305e4bcb46d35300fa61c85941e8
+EBUILD rrdtool-1.4.7.ebuild 3868 RMD160 ba85186189a321378c997fd459cb646fdb2779d4 SHA1 20737d9e6a5ab62d5aebfaf6e15f516ebe88a29a SHA256 3218610edb84d19e2b9b961a8e45250a02ce273fe910bd909971ed99fc698af3
+MISC ChangeLog 34287 RMD160 1464986b7790ad19a44d8424bf3a191b68b4316c SHA1 048ec3acd0747e17e99ffaddb1fb47fdaccfe5d3 SHA256 6ca931db25929bc07e976a0c74a67d9bf09a8d47662000ebbd4821eb7b5e4ac6
 MISC metadata.xml 314 RMD160 b16593a65705f85f9dab6a321d2ed90ca940cd64 SHA1 64590951c47c333f38b7a7a6264356c0b40e78ce SHA256 e08a5acfe66fb546b0ea85e9598baca57ff3979094399e1c60507a718a5151c5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPyh+cAAoJEAmJmMX429reiqgH/3IvtY6w9rZaaHPxMEgp8yCb
+oHiY4C/uPaYOKlBtjH42fp0g3Tqg1NyknzC9AhUAeeiIUJzr2ajaVMbj1CvoeIv5
+JQ56eWq9kFylC19GdOXRP8Dge2dOL+KAbe6I0U6stJsybxXjuyqCbOnlmmXKd3Bu
+CcXLFf3d0ZsXxaKyB09v78I5cnCfsfjax68NwepDD9YTnBEfbXPeMqn83DCiQR4m
+HDfSDTqehyk691MWWLpraEJhdF75KdM7sKUWt8REhN4UVmtzawpUuwmj9bdk4qi6
+DKYDy/HqgrCqDYPayYEOuVKblt1PWErpp6V/ALU29oTDv8jXLSr546tWvKK90pg=
+=qQMH
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/rrdtool/files/0001_rrdtool-1.4.7-configure.ac.patch b/net-analyzer/rrdtool/files/0001_rrdtool-1.4.7-configure.ac.patch
new file mode 100644
index 000000000000..ad97bec2defa
--- /dev/null
+++ b/net-analyzer/rrdtool/files/0001_rrdtool-1.4.7-configure.ac.patch
@@ -0,0 +1,22 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -148,7 +148,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"
+@@ -204,9 +204,6 @@
+ AC_CHECK_FUNC(acos, , AC_CHECK_LIB(m, acos))
+ 
+ 
+-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.
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.7.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.7.ebuild
new file mode 100644
index 000000000000..8d123e15faa5
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.4.7.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.7.ebuild,v 1.1 2012/06/02 14:13:16 maksbotan Exp $
+
+EAPI="4"
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_DEPEND="python? 2"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit eutils distutils flag-o-matic multilib perl-module autotools
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="dbi doc lua perl python ruby rrdcgi tcl tcpd"
+
+# This versions are minimal versions upstream tested with.
+RDEPEND="
+	>=media-libs/libpng-1.5.10
+	>=dev-libs/libxml2-2.7.8
+	>=x11-libs/cairo-1.10.2[svg]
+	>=dev-libs/glib-2.28.7
+	>=x11-libs/pango-1.28
+	lua? ( dev-lang/lua[deprecated] )
+	perl? ( dev-lang/perl )
+	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 )
+	tcl? ( dev-lang/tcl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	dbi? ( dev-db/libdbi )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-apps/gawk"
+
+DISTUTILS_SETUP_FILES=("bindings/python|setup.py")
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch	"${FILESDIR}"/0001_"${P}"-configure.ac.patch
+	epatch	"${FILESDIR}/${PN}"-1.4.5-automake-1.11.2.patch
+	sed -i '/PERLLD/s:same as PERLCC:same-as-PERLCC:' configure.ac #281694
+
+	# Python bindings are built/installed manually
+	sed -e "/^all-local:/s/ @COMP_PYTHON@//" -i bindings/Makefile.am
+
+	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
+
+	econf \
+		--disable-static \
+		$(use_enable rrdcgi) \
+		$(use_enable lua) \
+		$(use_enable lua lua-site-install) \
+		$(use_enable ruby) \
+		$(use_enable ruby ruby-site-install) \
+		$(use_enable perl) \
+		$(use_enable perl perl-site-install) \
+		--with-perl-options=INSTALLDIRS=vendor \
+		$(use_enable tcl) \
+		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
+		$(use_enable python) \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	use python && distutils_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	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
+
+	use python && distutils_src_install
+
+	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
+
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+}
+
+pkg_postinst() {
+	use python && distutils_pkg_postinst
+
+	ewarn "Since version 1.3, rrdtool dump emits completely legal xml.  Basically this"
+	ewarn "means that it contains an xml header and a DOCTYPE definition.  Unfortunately"
+	ewarn "this causes older versions of rrdtool restore to be unhappy."
+	ewarn
+	ewarn "To restore a new dump with an old rrdtool restore version, either remove"
+	ewarn "the xml header and the doctype by hand (both on the first line of the dump)"
+	ewarn "or use rrdtool dump --no-header."
+	ewarn
+	ewarn ">=net-analyzer/rrdtool-1.3 does not have any default font bundled. Thus if"
+	ewarn ">you've upgraded from rrdtool-1.2.x and don't have any font installed to make"
+	ewarn ">lables visible, please, install some font, e.g.  media-fonts/dejavu."
+}
+
+pkg_postrm() {
+	use python && distutils_pkg_postrm
+}