Version bump. Added workaround for parallel build failure in ruby, bug #239101, thank MATSUU Takuto for report.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64

3 files changed, 101 insertions, 2 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 638b397ed8f4..7514900171b8 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,12 @@
 # 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.149 2008/09/18 11:10:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.150 2008/10/13 15:56:53 pva Exp $
+
+*rrdtool-1.3.4 (13 Oct 2008)
+
+  13 Oct 2008; Peter Volkov <pva@gentoo.org> +rrdtool-1.3.4.ebuild:
+  Version bump. Added workaround for parallel build failure in ruby, bug
+  #239101, thank MATSUU Takuto for report.
 
   18 Sep 2008; Peter Volkov <pva@gentoo.org> +rrdtool-1.0.50.ebuild:
   Revert rrdtool-1.0.* another time. It's still required for FlowScan.
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index a1ebeeeff5ec..3208a2e4dbcf 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -7,11 +7,13 @@ DIST rrdtool-1.2.23.tar.gz 1061530 RMD160 0c1147242adf476f5e93f4d59b553ee3ea378b
 DIST rrdtool-1.2.27.tar.gz 1081450 RMD160 ee01b9cd52a9dbf42c6ac8d9259bdcfcd036b112 SHA1 15028b65be68da83602f7479405dffb1eef819ec SHA256 61fc7871a9c3ff8a2853bf8b5d006eda1573d6de768f38252918b2d6d719afee
 DIST rrdtool-1.2.28.tar.gz 1089006 RMD160 11a4c6414037b3ce0e49d49b458f9fc13f3ef7ba SHA1 a8ca75fcf7b32ca94b057fa663e5f989522e2df9 SHA256 a008fec98bb36d09a7be8810afbdd1bf51d7365200d03a0e966a29bf871b3041
 DIST rrdtool-1.3.3.tar.gz 1064805 RMD160 e1f6410eef0524548525708fd4ea2b97c3571010 SHA1 1a1b028f14931c9fb4a2b62af40f506fe8e65cc2 SHA256 f21a5dc4db3d6884588d25d88a940a70991f9562ddaff8e117ab0c86ed038d2c
+DIST rrdtool-1.3.4.tar.gz 1067603 RMD160 143eb06288d4db3214499943ef97743a819a4b99 SHA1 d6bfb7015d81db72bc880c6a75d82ca0c23cdc9c SHA256 33e68d8a6d8906a5d3b6d7624fc918a0ca49637b120482a1118d94de54d8116e
 EBUILD rrdtool-1.0.50.ebuild 2693 RMD160 b541b709ee70a0e28023aad30666254cf8007ec1 SHA1 3ff735acf09aea437c131cfc308b8f66bb2271b5 SHA256 ad422d3c48106ffa12c16b0146d6f465cf6d956889a8afae8e143fe2757ff331
 EBUILD rrdtool-1.2.23-r1.ebuild 2209 RMD160 ce765af1c3c56ed55a35484892038e5e277eaf88 SHA1 3bfd6368cd94f8eecceb22c539f873e09de1cf91 SHA256 7f61007dd2d25ae00204c6761ca797bbe4582a72afd1c17768ea0c935a9fe6b7
 EBUILD rrdtool-1.2.27-r1.ebuild 1950 RMD160 78a148ae293a207dc5c59342edbbb03e5cbfa4f5 SHA1 22e5c45103977e6919ad3815ddd5e9577a0c7681 SHA256 dc8163c85162f9d95f30779cee03dffd17b56f6df4b149d8792f735e529f7a91
 EBUILD rrdtool-1.2.27.ebuild 2104 RMD160 18655c89ea9d9e78c44b695e8006119930dd256f SHA1 250ac7676641f07d523128a2ba3dec143c1100fc SHA256 239731054ddb561466a49e127a341518fb88186fa28b4c907f6079c559884ece
 EBUILD rrdtool-1.2.28.ebuild 1949 RMD160 6275cab9659481270245710db072bfd786507df0 SHA1 e9d0f17ac9aa6666793e8a22ecb86a64c49ac544 SHA256 aa4917a0553414f8b5db34c5003699b67eab0b8030941817e32258653837d67b
 EBUILD rrdtool-1.3.3.ebuild 2422 RMD160 09d2bb0f40a23f4a60292ae414fb2ae89790ad36 SHA1 dd9eb00f8db116fbf27fdbab60d3d6829cd60480 SHA256 e3e26a83fe665ebb5ffc5aa7a5fdd492c9ba76292784b9e268ce524e9674c7f2
-MISC ChangeLog 22677 RMD160 fc9e6a4ed49a057b5c1232982b9e03ab61be402f SHA1 0f7d45dbfe7cc52e0e352d18c37ed7b50e73e850 SHA256 caaf0089192da42fbf9e011a9c34bb88b23848b64d0c9d93fd5359ff4dcc01a7
+EBUILD rrdtool-1.3.4.ebuild 2461 RMD160 e68e710b61ff14f7f6c3d6b7a2a917428521b864 SHA1 8d7f9bffaa683269a280b3fcd2095bf81198fb8f SHA256 a3c74b98aa8192295ffd462bd1acbd305eab39204127c2083085c50febc3e02e
+MISC ChangeLog 22892 RMD160 acdc41e5839788011fd646828ee38cb80c41896b SHA1 c76b56658c804813fc28a0a5633be66817e3f186 SHA256 8cf256f9a8f05595a5a4fcd056e2d7c55c281241e920b172cb05f682baaa913f
 MISC metadata.xml 300 RMD160 9d38b7169a91e0be57ae6ab449296e56527a0d0b SHA1 c67d156899a9058bf4cf1b620299b7e18779fb37 SHA256 f7ced9a7b2949623b183802c55cef4e37d6e9e4d072a7243a5eb934c9ef5ac62
diff --git a/net-analyzer/rrdtool/rrdtool-1.3.4.ebuild b/net-analyzer/rrdtool/rrdtool-1.3.4.ebuild
new file mode 100644
index 000000000000..d944c27fd1be
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.3.4.ebuild
@@ -0,0 +1,91 @@
+# 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.1 2008/10/13 15:56:53 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 ~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
+}