Version bump. Remove old.

(Portage version: 2.1.6.11/cvs/Linux x86_64)

7 files changed, 16 insertions, 321 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index c6bd12458246..8b76280986c2 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,15 @@
 # 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.176 2009/03/08 10:39:21 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.177 2009/04/07 16:51:06 pva Exp $
+
+*rrdtool-1.3.7 (07 Apr 2009)
+
+  07 Apr 2009; Peter Volkov <pva@gentoo.org>
+  -files/rrdtool-1.2.28-fix-empty-font.patch,
+  -files/rrdtool-1.2.28-revert-font-fix.patch, -rrdtool-1.2.28-r1.ebuild,
+  -rrdtool-1.2.28-r2.ebuild, -rrdtool-1.3.4.ebuild, -rrdtool-1.3.5.ebuild,
+  +rrdtool-1.3.7.ebuild:
+  Version bump. Remove old.
 
   08 Mar 2009; Dawid Węgliński <cla@gentoo.org> rrdtool-1.3.6.ebuild:
   Prevent double emake
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
deleted file mode 100644
index 15661557eaa5..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.2.28-fix-empty-font.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://oss.oetiker.ch/rrdtool-trac/changeset/1653
-
-=== 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/files/rrdtool-1.2.28-revert-font-fix.patch b/net-analyzer/rrdtool/files/rrdtool-1.2.28-revert-font-fix.patch
deleted file mode 100644
index 19a0a8072811..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.2.28-revert-font-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-=== modified file 'src/rrd_graph.c'
---- src/rrd_graph.c	2008-11-04 14:50:21 +0000
-+++ src/rrd_graph.c	2008-11-04 14:57:04 +0000
-@@ -3508,17 +3508,15 @@
-                         if (size > 0){
-                               im->text_prop[propidx].size=size;              
-                       }        
--                       if (strlen(optarg) > end){
--                          if (optarg[end] == ':'){
--                             strncpy(im->text_prop[propidx].font,optarg+end+1,255);
-+                       if (strlen(prop) > end){
-+                          if (prop[end] == ':'){
-+                             strncpy(im->text_prop[propidx].font,prop+end+1,255);
-                              im->text_prop[propidx].font[255] = '\0';
-                           } else {
--                             rrd_set_error("expected : after font size in '%s'",optarg);
-+                             rrd_set_error("expected after font size in '%s'",prop);
-                             return;
-                           }
-                       }
--                      /* only run the for loop for DEFAULT (0) for
--                         all others, we break here. woodo programming */
-                       if (propidx==sindex && sindex != 0) break;
-                   }
-                 } else {
-
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.28-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.28-r1.ebuild
deleted file mode 100644
index ee021e0ca381..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.2.28-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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-r1.ebuild,v 1.8 2008/11/26 15:54:46 ranger 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}-revert-font-fix.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
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.28-r2.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.28-r2.ebuild
deleted file mode 100644
index 7d5cb8e126c7..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.2.28-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.3.4.ebuild b/net-analyzer/rrdtool/rrdtool-1.3.4.ebuild
deleted file mode 100644
index d1e186d935f0..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.3.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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.3.4.ebuild,v 1.2 2008/12/07 12:19:45 vapier 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"
-
-# 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
-	>=dev-libs/glib-2.12.12
-	>=x11-libs/pango-1.17
-	tcl? ( dev-lang/tcl )
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	ruby? ( dev-lang/ruby
-			!dev-ruby/ruby-rrd )"
-
-DEPEND="${RDEPEND}
-	sys-apps/gawk"
-
-pkg_setup() {
-	if ! built_with_use x11-libs/cairo svg; then
-		eerror "${PN} requires x11-libs/cairo to be built with svg USE flag."
-		die "Rebuild x11-libs/cairo with svg USE flag enabled."
-	fi
-	use perl && perl-module_pkg_setup
-}
-
-src_compile() {
-	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)
-
-	emake || die "make failed"
-}
-
-src_install() {
-	# -j1 see bug #239101 for details
-	emake -j1 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."
-}
-
-pkg_prerm() {
-	use perl && perl-module_pkg_prerm
-}
-
-pkg_postrm() {
-	use perl && perl-module_pkg_postrm
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.3.5.ebuild b/net-analyzer/rrdtool/rrdtool-1.3.7.ebuild
index 3b40449c4730..ea31e4d225dc 100644
--- a/net-analyzer/rrdtool/rrdtool-1.3.5.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.3.7.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.5.ebuild,v 1.1 2008/12/21 17:53:14 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.3.7.ebuild,v 1.1 2009/04/07 16:51:06 pva Exp $
+
+EAPI="2"
 
 inherit eutils flag-o-matic multilib perl-module
 
@@ -17,7 +19,7 @@ IUSE="doc perl python ruby rrdcgi tcl"
 RDEPEND="
 	>=media-libs/libpng-1.2.10
 	>=dev-libs/libxml2-2.6.31
-	>=x11-libs/cairo-1.4.6
+	>=x11-libs/cairo-1.4.6[svg]
 	>=dev-libs/glib-2.12.12
 	>=x11-libs/pango-1.17
 	tcl? ( dev-lang/tcl )
@@ -30,14 +32,10 @@ DEPEND="${RDEPEND}
 	sys-apps/gawk"
 
 pkg_setup() {
-	if ! built_with_use x11-libs/cairo svg; then
-		eerror "${PN} requires x11-libs/cairo to be built with svg USE flag."
-		die "Rebuild x11-libs/cairo with svg USE flag enabled."
-	fi
 	use perl && perl-module_pkg_setup
 }
 
-src_compile() {
+src_configure() {
 	filter-flags -ffast-math
 
 	export RRDDOCDIR=/usr/share/doc/${PF}
@@ -50,8 +48,6 @@ src_compile() {
 		$(use_enable tcl) \
 		$(use_with tcl tcllib /usr/$(get_libdir)) \
 		$(use_enable python)
-
-	emake || die "make failed"
 }
 
 src_install() {