Version bump, thank Raúl Porcel <armin76 AT gentoo.org> for report, bug 206795. Also in this version bug #191060 is fixed. Quotation fixes.

(Portage version: 2.1.4_rc14)

4 files changed, 116 insertions, 12 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index da57abe1329a..be2460e4c9eb 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/rrdtool
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.132 2007/09/14 15:31:50 jokey Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.133 2008/01/27 19:58:17 pva Exp $
+
+*rrdtool-1.2.26 (27 Jan 2008)
+
+  27 Jan 2008; <pva@gentoo.org> rrdtool-1.0.49.ebuild,
+  +rrdtool-1.2.26.ebuild:
+  Version bump, thank Raúl Porcel <armin76 AT gentoo.org> for report, bug
+  206795. Also in this version bug #191060 is fixed. Quotation fixes.
 
   14 Sep 2007; Markus Ullmann <jokey@gentoo.org> rrdtool-1.0.49.ebuild:
   And re-add keywords
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.26 b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.26
new file mode 100644
index 000000000000..9d479dcbeee5
--- /dev/null
+++ b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.26
@@ -0,0 +1,3 @@
+MD5 b2c179e2d2ec2a92969648c4ebd382dc rrdtool-1.2.26.tar.gz 1080151
+RMD160 bd54677c70ec64cbdb2865109f4338243c160f82 rrdtool-1.2.26.tar.gz 1080151
+SHA256 685088c51e63fd9d41387cd39615036baed4460beb87c1ab7127f9325b348b24 rrdtool-1.2.26.tar.gz 1080151
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild
index 6c8a4efe53a5..b2cf6e544f4c 100644
--- a/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.0.49.ebuild,v 1.13 2007/09/14 15:31:50 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild,v 1.14 2008/01/27 19:58:17 pva Exp $
 
 inherit perl-module flag-o-matic eutils
 
@@ -28,7 +28,7 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -e 's/^LTCOMPILE = $(LIBTOOL) --mode=compile $(CC)/& -prefer-pic/' -i src/Makefile.in
 
 	if [[ ! $(grep '^LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) -prefer-pic' src/Makefile.in) ]]; then
@@ -73,11 +73,11 @@ src_install() {
 	dodoc doc/*.pod
 	dodoc doc/*.txt
 
-	rm -rf ${D}/usr/doc
-	rm -rf ${D}/usr/html
-	rm -rf ${D}/usr/man
-	rm -rf ${D}/usr/contrib
-	rm -rf ${D}/usr/examples
+	rm -rf "${D}"/usr/doc
+	rm -rf "${D}"/usr/html
+	rm -rf "${D}"/usr/man
+	rm -rf "${D}"/usr/contrib
+	rm -rf "${D}"/usr/examples
 
 	insinto /usr/share/doc/${PF}/examples
 	doins examples/*
@@ -90,7 +90,7 @@ src_install() {
 		perl-module_src_install || die
 
 		# remove duplicate installation into /usr/lib/perl
-		rm -Rf ${D}/usr/lib/perl
+		rm -Rf "${D}"/usr/lib/perl
 	fi
 
 	if use tcl ; then
@@ -98,7 +98,7 @@ src_install() {
 #		insinto /usr/lib/tcl${TCL_VER}/tclrrd${PV}
 #		doins ${S}/tcl/tclrrd${PV}.so
 		echo "package ifneeded Rrd ${PV} [list load [file join \$$dir .. tclrrd${PV}.so]]" \
-			>> ${D}/usr/lib/tcl${TCL_VER}/tclrrd${PV}/pkgIndex.tcl
+			>> "${D}"/usr/lib/tcl${TCL_VER}/tclrrd${PV}/pkgIndex.tcl
 	fi
 
 	dodoc COPY* CONTR* README TODO
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.26.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.26.ebuild
new file mode 100644
index 000000000000..57a5682777dd
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.2.26.ebuild
@@ -0,0 +1,94 @@
+# 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.26.ebuild,v 1.1 2008/01/27 19:58:17 pva Exp $
+
+inherit autotools 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}"/${PN}-1.2.23-tclbindings.patch
+	use ruby && epatch "${FILESDIR}"/${PN}-1.2.23-ruby-binding-configure.patch
+	eautoreconf
+}
+
+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 perl) \
+		--with-perl-options='PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}' \
+		$(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
+
+	if use perl ; then
+		perlinfo
+		mytargets="site-perl-install"
+		perl-module_src_install || die
+	fi
+
+	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
+}