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

Package-Manager: portage-2.1.4_rc14

5 files changed, 132 insertions, 30 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/Manifest b/net-analyzer/rrdtool/Manifest
index d3c1c6cc6868..81f8a88c1c6c 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rrdtool-1.2.15-mem-usage.patch 4039 RMD160 674ac6fd1ec441776d3b364c919411a991baf162 SHA1 8b8f330627021b6de61dd77ee62e4a9e291b2b19 SHA256 a3363e8ac158eaa4179489735f2cfb2b1a7d2f0614bbeefb21a89141ba1f775e
 MD5 78384e6b77d8f0d4816a7137db475315 files/rrdtool-1.2.15-mem-usage.patch 4039
 RMD160 674ac6fd1ec441776d3b364c919411a991baf162 files/rrdtool-1.2.15-mem-usage.patch 4039
@@ -28,10 +25,11 @@ SHA256 83647ef379faa22bd6119f6687d49c74b18ac58baa2ef704aefab8664013dbd5 files/rr
 DIST rrdtool-1.0.49.tar.gz 1466897 RMD160 965cf352b4d3da64fdf44e0af5d1cf95072a283e SHA1 259a8445e429f0f04b59b0a959d965cd5a17eafb SHA256 20acb0aa347f1629c4d5529ab8afbe4986fe820555049af3f905653300e5ea74
 DIST rrdtool-1.2.15.tar.gz 1043064 RMD160 493e5b108ac363484eb4015c0962945c5fb9fb9e SHA1 4ac695aff26ab193a083c65513aad06ff36bad82 SHA256 b33d68da8a39bb0fc745c0202f3a58e73bfc6a9fd35d71fbd8979d40a5ef7397
 DIST rrdtool-1.2.23.tar.gz 1061530 RMD160 0c1147242adf476f5e93f4d59b553ee3ea378b23 SHA1 5da610e1c8bc01b80abc21ab9e98e004363b429c SHA256 4b1df00b23a74a1c81734dd274e72e00d8bb29b11e1f3d2938ff87691ece1f0f
-EBUILD rrdtool-1.0.49.ebuild 2685 RMD160 e2fe39a6a40fe5ca486ba96a3bb435aef2c7b099 SHA1 074feb451cd6643b61a7f867546d6014be15cb6b SHA256 53c4c1c8d95ce8751ee9a1d5cf0bc28ab80d0df86e5264a9e9a62caa7a1ed04f
-MD5 34acff446867526f2e193012ec094615 rrdtool-1.0.49.ebuild 2685
-RMD160 e2fe39a6a40fe5ca486ba96a3bb435aef2c7b099 rrdtool-1.0.49.ebuild 2685
-SHA256 53c4c1c8d95ce8751ee9a1d5cf0bc28ab80d0df86e5264a9e9a62caa7a1ed04f rrdtool-1.0.49.ebuild 2685
+DIST rrdtool-1.2.26.tar.gz 1080151 RMD160 bd54677c70ec64cbdb2865109f4338243c160f82 SHA1 1896f8060b6ff15d16c3ca4a6d21ea59b202d999 SHA256 685088c51e63fd9d41387cd39615036baed4460beb87c1ab7127f9325b348b24
+EBUILD rrdtool-1.0.49.ebuild 2699 RMD160 9e28d6bce9a50251d30c45a029606f5e776cce70 SHA1 18fcab872a2ff44938d1cde325fdbd88324492bc SHA256 e79d1b689611f217367159439f8b4702f2e9e128526845d04c910fa9070ebfed
+MD5 b9738100db52d653b1f2f75752022d16 rrdtool-1.0.49.ebuild 2699
+RMD160 9e28d6bce9a50251d30c45a029606f5e776cce70 rrdtool-1.0.49.ebuild 2699
+SHA256 e79d1b689611f217367159439f8b4702f2e9e128526845d04c910fa9070ebfed rrdtool-1.0.49.ebuild 2699
 EBUILD rrdtool-1.2.15-r3.ebuild 2914 RMD160 fc0ea4b58a6413d5749eaa838db9ade120317930 SHA1 bf63c6de1bedcd2a03865a9cf8f9eec828885feb SHA256 b1f532af6b49a723823deefc8600e02c8040e7b16c2795a37f25f2735c044193
 MD5 9b97aed012e28da3807b9a25d6e4cfeb rrdtool-1.2.15-r3.ebuild 2914
 RMD160 fc0ea4b58a6413d5749eaa838db9ade120317930 rrdtool-1.2.15-r3.ebuild 2914
@@ -40,10 +38,14 @@ EBUILD rrdtool-1.2.23-r1.ebuild 2209 RMD160 ce765af1c3c56ed55a35484892038e5e277e
 MD5 bce21622a2d9b1f0032d2ffd18607427 rrdtool-1.2.23-r1.ebuild 2209
 RMD160 ce765af1c3c56ed55a35484892038e5e277eaf88 rrdtool-1.2.23-r1.ebuild 2209
 SHA256 7f61007dd2d25ae00204c6761ca797bbe4582a72afd1c17768ea0c935a9fe6b7 rrdtool-1.2.23-r1.ebuild 2209
-MISC ChangeLog 20273 RMD160 7bfbc7a4f9a0e33240a5e54910b235540a244f71 SHA1 ca87ad8fbbfbe26950a6152bd465145d029850dc SHA256 a9e58a4a67fb191989b8ec40a8c0bebbc11d8262a48d6c9b60c1359672077776
-MD5 52e2ec8698fc9ae673eb69c42e1797ff ChangeLog 20273
-RMD160 7bfbc7a4f9a0e33240a5e54910b235540a244f71 ChangeLog 20273
-SHA256 a9e58a4a67fb191989b8ec40a8c0bebbc11d8262a48d6c9b60c1359672077776 ChangeLog 20273
+EBUILD rrdtool-1.2.26.ebuild 2164 RMD160 f0aaddb6f71d41f7122bf6fb7c9db90f6570a1a3 SHA1 3ff249f12b265c724978a8bbbede19e0a62eaa04 SHA256 baef152e78f0af096c9aff50d9c992d1c89a7568df80043ee4079b44ecf9a4ef
+MD5 2e391cc9017da7f7ca68fd8ef3396fc9 rrdtool-1.2.26.ebuild 2164
+RMD160 f0aaddb6f71d41f7122bf6fb7c9db90f6570a1a3 rrdtool-1.2.26.ebuild 2164
+SHA256 baef152e78f0af096c9aff50d9c992d1c89a7568df80043ee4079b44ecf9a4ef rrdtool-1.2.26.ebuild 2164
+MISC ChangeLog 20529 RMD160 b003970e132afd0e65c3399f0fd6e2a81a8db5c2 SHA1 5e3dc7f835f6ca95b1be7c0ae59baef6b6cee0d9 SHA256 77e639aed3cb69f4fdcbd1e1aa5883ba155313e7babdf84e35fb018b0ccfa389
+MD5 a4dfd3d0f34935b9735dd7b88a47041d ChangeLog 20529
+RMD160 b003970e132afd0e65c3399f0fd6e2a81a8db5c2 ChangeLog 20529
+SHA256 77e639aed3cb69f4fdcbd1e1aa5883ba155313e7babdf84e35fb018b0ccfa389 ChangeLog 20529
 MISC metadata.xml 241 RMD160 b010229ed860b6dadc3faa19006512f195e3ee55 SHA1 01721f8bf6f699f3647589a173ef1941fbd6dd1c SHA256 de63c7fc765937d32e93bda47d365a2e044ad3c6a70caff4ff5916dde97e6a3c
 MD5 1a739170238a1fae241a8a0df21462e9 metadata.xml 241
 RMD160 b010229ed860b6dadc3faa19006512f195e3ee55 metadata.xml 241
@@ -57,10 +59,6 @@ SHA256 62ab296ac4fc6e30708d669ec3df2e44b159d3b5075b047d2f551d4e1dea6f5b files/di
 MD5 b0dbc89a76964c0f0f2b6137a4cd36c6 files/digest-rrdtool-1.2.23-r1 247
 RMD160 f7ddadb4521810a6c3f528b8c903df46abebdd3e files/digest-rrdtool-1.2.23-r1 247
 SHA256 bf726e4417452a4bd9b102c420e5e04b481a21ab7b55bd2ff7a39d3f57946bf8 files/digest-rrdtool-1.2.23-r1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFG6qlsz974XjDVpbkRAiXqAJ4mtDwR3aSL0SykZBIYdzcqZTr2uwCgjO87
-0hLhCfgiwwUWdjqjFtNLQWM=
-=xYNM
------END PGP SIGNATURE-----
+MD5 9adbd5b66e6b50350f59c4959a98b426 files/digest-rrdtool-1.2.26 247
+RMD160 90f3cad860065e530dac97575516ae0a63540ab0 files/digest-rrdtool-1.2.26 247
+SHA256 ce0485792f410a4f9c77947bb13743ba045bb11aac56d248f4d68bb86f217c7a files/digest-rrdtool-1.2.26 247
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
+}