Fixed bug #272767, thank Martin Mokrejš for report and Rafał for investigation. A bit improved nls handling.

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

4 files changed, 126 insertions, 2 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 64169c01b000..a4abfa024003 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.182 2009/06/01 19:58:42 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.183 2009/07/08 10:32:21 pva Exp $
+
+*rrdtool-1.3.8-r1 (08 Jul 2009)
+
+  08 Jul 2009; Peter Volkov <pva@gentoo.org>
+  +files/rrdtool-1.3.8-configure.ac.patch, +rrdtool-1.3.8-r1.ebuild:
+  Fixed bug #272767, thank Martin Mokrejš for report and Rafał for
+  investigation. A bit improved nls handling.
 
   01 Jun 2009; Peter Volkov <pva@gentoo.org> rrdtool-1.3.8.ebuild,
   metadata.xml:
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 130f15357a3a..3ad4dbc7c636 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,4 +1,5 @@
 AUX rrdtool-1.2.15-newstyle-resize.patch 5231 RMD160 acdd68b7a7f422c615cfac824516beaeb782eb5e SHA1 973b40a3954942dd3306d5781f31faf4f88c257d SHA256 e55f1e7f0c4d3649b6790cb56247eaf5518a359ef662a959848805e416239fd1
+AUX rrdtool-1.3.8-configure.ac.patch 410 RMD160 7bc8ae6bf64fbc8602c0e4a4571c74d9afea818b SHA1 b28a7f253ff66d788a29d491ef57f11c6721bb16 SHA256 220d42a1228d015f6bd02124b3f8c878f0b7bda2e277e9e3b15d4f05603328b5
 DIST rrdtool-1.0.50.tar.gz 1474200 RMD160 96af2ec2831881e167687f65f5fc9bc64c67358b SHA1 399e2bf807e3fbc987eec4c5364dc4cb416ba287 SHA256 42aa7c213dedbd95d33ca84d92f4187880f7e96062c6a3fb05bfb16f77ba2a91
 DIST rrdtool-1.2.29.tar.gz 1092333 RMD160 a54f80cf3eec6d1484e062311a96e5691656288e SHA1 bd6c201eb12ff9007081fda81aa6bd1410a30bf2 SHA256 0e3b2febfc36276fc8e5c4ec98c73830aa2313ba77663e979d4c4859928f64b9
 DIST rrdtool-1.2.30.tar.gz 1092483 RMD160 ee4d492fee4e109da89ca85bd9dd561cb9ddfcec SHA1 c850dc6008bd6580eefa4257e339f78bd3f78fa3 SHA256 3190efea410a6dd035799717948b2df09910f608d72d23ee81adad4cd0184ae9
@@ -8,6 +9,7 @@ EBUILD rrdtool-1.0.50.ebuild 2693 RMD160 b541b709ee70a0e28023aad30666254cf8007ec
 EBUILD rrdtool-1.2.29.ebuild 1941 RMD160 9edd22ded6a83dded4ae8f92d33e31ae8e3b5b24 SHA1 9df27ffab759f26db64097fb7e31d71589eb5643 SHA256 34b93cf0e2dd63da5da2fe45760c85211e9439d03cea36bae17357a097805148
 EBUILD rrdtool-1.2.30.ebuild 1949 RMD160 ada861d94692a75424d2b53b376652942cc57e8b SHA1 06e455b9ebe951b389d70744c2bb70da638fd6e0 SHA256 9151ddb7ed3d36d46d4617d69f727ed87c227122e950d2f436d461935ccbda13
 EBUILD rrdtool-1.3.7.ebuild 2499 RMD160 3358b06dc3ab6dc49a5b73e8107b741a4a78e4eb SHA1 79b9f41011260996b2046e5f75893fb3a60823c0 SHA256 d6e45e33313fcc18e7450fa73d65d6b5651f924d42d4da3762246e10efb089fb
+EBUILD rrdtool-1.3.8-r1.ebuild 2700 RMD160 7fb424f185b1134b4666b42bbe05be0e00d49d66 SHA1 2e1f70df6fa36763d5457dc2d761c73c186a5778 SHA256 a86b904f8cd0cf0abc5773f398a8c3d0872bd3bf31c18920af4a7bde3334f632
 EBUILD rrdtool-1.3.8.ebuild 2616 RMD160 7f8bdf47cdb2257176668650de75be317374cb58 SHA1 2f4f29f9cb25b0673d68fb41e6ee377ccbb612ec SHA256 af2239aabe8969098a4d2fdd4ce518cbce8740b1b093757f2ee6baefb64dea38
-MISC ChangeLog 27564 RMD160 170aa360375bab473fbc3db7fa7d6ec9ed9979f6 SHA1 d8e1b3d6e9c03e23abab2aba3736bf7549d948dd SHA256 6b14ccf7d389750bcec0777a31cb06ee635c995d43694d5f20e23561293c1423
+MISC ChangeLog 27827 RMD160 ee59e9af73640fef771272a7339ec88e11f3f63c SHA1 e5035eeed8835f3f6a210f92c708fd9d424e5f00 SHA256 00ec5677ed02d16a86ea2d3b280082cd1b2da901fc56ef58d6f5b23b01881134
 MISC metadata.xml 376 RMD160 78da9054230eb8ed5474d75d1a0f7419eb1e45f9 SHA1 b7645e63557b4d5049032390ee07d86c5411fc96 SHA256 ccdb09cfa58f274722a7b61fb666c96c5d1c55d828fff44abc9415e56c056bb7
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.3.8-configure.ac.patch b/net-analyzer/rrdtool/files/rrdtool-1.3.8-configure.ac.patch
new file mode 100644
index 000000000000..d1c719bd1893
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.3.8-configure.ac.patch
@@ -0,0 +1,16 @@
+=== modified file 'configure.ac'
+--- configure.ac	2009-07-08 09:47:54 +0000
++++ configure.ac	2009-07-08 09:51:00 +0000
+@@ -174,11 +174,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.
+ AC_FUNC_STRFTIME
+ AC_FUNC_VPRINTF
+
diff --git a/net-analyzer/rrdtool/rrdtool-1.3.8-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.3.8-r1.ebuild
new file mode 100644
index 000000000000..9b2d9a3e2e26
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.3.8-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.3.8-r1.ebuild,v 1.1 2009/07/08 10:32:21 pva Exp $
+
+EAPI="2"
+
+inherit eutils 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"
+IUSE="doc nls perl python ruby rrdcgi tcl"
+
+# This versions are minimal versions upstream tested with.
+RDEPEND="
+	>=media-libs/libpng-1.2.10
+	>=dev-libs/libxml2-2.6.31
+	>=x11-libs/cairo-1.4.6[svg]
+	>=dev-libs/glib-2.12.12
+	>=x11-libs/pango-1.17
+	nls? ( >=dev-util/intltool-0.35 )
+	tcl? ( dev-lang/tcl )
+	perl? ( dev-lang/perl )
+	python? ( dev-lang/python )
+	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13
+			!dev-ruby/ruby-rrd )"
+
+DEPEND="${RDEPEND}
+	sys-apps/gawk"
+
+pkg_setup() {
+	use perl && perl-module_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/rrdtool-1.3.8-configure.ac.patch"
+	mkdir m4
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -ffast-math
+
+	export RRDDOCDIR=/usr/share/doc/${PF}
+
+	econf $(use_enable rrdcgi) \
+		$(use_enable nls) \
+		$(use_enable nls libintl) \
+		$(use_enable ruby) \
+		$(use_enable ruby ruby-site-install) \
+		$(use_enable perl) \
+		$(use_enable perl perl-site-install) \
+		$(use_enable tcl) \
+		$(use_with tcl tcllib /usr/$(get_libdir)) \
+		$(use_enable python)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	if ! use doc ; then
+		rm -rf "${D}"/usr/share/doc/${PF}/{html,txt}
+	fi
+
+	use perl && fixlocalpod
+
+	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
+}
+
+pkg_preinst() {
+	use perl && perl-module_pkg_preinst
+}
+
+pkg_postinst() {
+	use perl && perl-module_pkg_postinst
+	ewarn "rrdtool dump 1.3 does emit completely legal xml. Basically this means that"
+	ewarn "it contains an xml header and a DOCTYPE definition. Unfortunately this"
+	ewarn "causes older versions of rrdtool restore to be unhappy."
+	ewarn
+	ewarn "To restore a new dump with ann 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 "Note: rrdtool-1.3.x doesn't have any default font bundled. Thus if you've"
+	ewarn "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_prerm() {
+	use perl && perl-module_pkg_prerm
+}
+
+pkg_postrm() {
+	use perl && perl-module_pkg_postrm
+}