Patch from upstream to fix empty font files, thank Tobias Oetiker for this patch.

(Portage version: 2.2_rc13/cvs/Linux 2.6.25-gentoo-r7 x86_64)

3 files changed, 110 insertions, 1 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index b74a87bde925..5c2902b80dbf 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.159 2008/11/07 06:45:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.160 2008/11/08 07:57:13 pva Exp $
+
+*rrdtool-1.2.28-r2 (08 Nov 2008)
+
+  08 Nov 2008; Peter Volkov <pva@gentoo.org>
+  +files/rrdtool-1.2.28-fix-empty-font.patch, +rrdtool-1.2.28-r2.ebuild:
+  Patch from upstream to fix empty font files, thank Tobias Oetiker for this
+  patch.
 
   07 Nov 2008; Jeroen Roovers <jer@gentoo.org> rrdtool-1.2.28-r1.ebuild:
   Stable for HPPA (bug #245331).
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.2.28-fix-empty-font.patch b/net-analyzer/rrdtool/files/rrdtool-1.2.28-fix-empty-font.patch
new file mode 100644
index 000000000000..f516950c864c
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.2.28-fix-empty-font.patch
@@ -0,0 +1,13 @@
+=== modified file 'src/rrd_graph.c'
+--- src/rrd_graph.c	2008-11-08 07:45:41 +0000
++++ src/rrd_graph.c	2008-11-08 07:47:06 +0000
+@@ -3508,7 +3508,7 @@
+                         if (size > 0){
+                               im->text_prop[propidx].size=size;              
+                       }        
+-                       if (strlen(optarg) > end){
++                       if (strlen(optarg) > end+2){
+                           if (optarg[end] == ':'){
+                              strncpy(im->text_prop[propidx].font,optarg+end+1,255);
+                              im->text_prop[propidx].font[255] = '\0';
+
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.28-r2.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.28-r2.ebuild
new file mode 100644
index 000000000000..7d5cb8e126c7
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.2.28-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.28-r2.ebuild,v 1.1 2008/11/08 07:57:13 pva Exp $
+
+inherit eutils flag-o-matic multilib perl-module
+
+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 perl python ruby rrdcgi tcl"
+
+RDEPEND="tcl? ( dev-lang/tcl )
+	>=sys-libs/zlib-1.2.1
+	>=media-libs/freetype-2.1.5
+	>=media-libs/libart_lgpl-2.3.16
+	>=media-libs/libpng-1.2.5
+	rrdcgi? ( >=dev-libs/cgilib-0.5 )
+	ruby? ( !dev-ruby/ruby-rrd )"
+
+DEPEND="${RDEPEND}
+	perl? ( dev-lang/perl )
+	python? ( dev-lang/python )
+	ruby? ( dev-lang/ruby )
+	sys-apps/gawk"
+
+TCLVER=""
+
+HTMLDOC_DIR="${PF}/html"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.2.15-newstyle-resize.patch"
+	epatch "${FILESDIR}/${P}-fix-empty-font.patch"
+}
+
+pkg_setup() {
+	use perl && perl-module_pkg_setup
+}
+
+src_compile() {
+	filter-mfpmath sse
+	filter-flags -ffast-math
+
+	export RRDDOCDIR=/usr/share/doc/${PF}
+
+	econf $(use_enable rrdcgi) \
+		$(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) || die "econf failed."
+
+	emake || die "make failed"
+}
+
+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
+}
+
+pkg_prerm() {
+	use perl && perl-module_pkg_prerm
+}
+
+pkg_postrm() {
+	use perl && perl-module_pkg_postrm
+}