Version bump, bug 343017. Fix build with USE=ruby, bug 321749. Discussed with rej on IRC.

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

4 files changed, 128 insertions, 5 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 451ed9f9bdc8..1878755ad13c 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.206 2010/10/16 13:52:19 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.207 2010/12/16 07:12:54 graaff Exp $
+
+*rrdtool-1.4.4 (16 Dec 2010)
+
+  16 Dec 2010; Hans de Graaff <graaff@gentoo.org> +rrdtool-1.4.4.ebuild,
+  +files/rrdtool-1.4.4-dont-link-system-lib.patch:
+  Version bump, bug 343017. Fix build with USE=ruby, bug 321749. Discussed
+  with rej on IRC.
 
   16 Oct 2010; Hans de Graaff <graaff@gentoo.org> rrdtool-1.3.8.ebuild:
   Also apply the patch for bug 321749 to the stable version to fix USE=ruby
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index bef246845c4e..4570ad2e7d20 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX rrdtool-1.2.15-newstyle-resize.patch 5231 RMD160 acdd68b7a7f422c615cfac824516beaeb782eb5e SHA1 973b40a3954942dd3306d5781f31faf4f88c257d SHA256 e55f1e7f0c4d3649b6790cb56247eaf5518a359ef662a959848805e416239fd1
 AUX rrdtool-1.3.8-configure.ac.patch 410 RMD160 7bc8ae6bf64fbc8602c0e4a4571c74d9afea818b SHA1 b28a7f253ff66d788a29d491ef57f11c6721bb16 SHA256 220d42a1228d015f6bd02124b3f8c878f0b7bda2e277e9e3b15d4f05603328b5
 AUX rrdtool-1.4.3-ruby-ldflags.patch 614 RMD160 dc43e0e459709323ab191005dcfb31b71eabd609 SHA1 ebc5b5140007266ec935b3693e680391ddd58091 SHA256 d51f1e01a5faccc0a83a09a7aca2fa251fdfd662ba19f3670ef6591e46afec09
+AUX rrdtool-1.4.4-dont-link-system-lib.patch 801 RMD160 ae423617f43efbffe00f84e5ad8c9e1c49ee896f SHA1 d4accd6c75027554e729633f296d7c2ddb506132 SHA256 7a726fe8534a9e56d7074af827ef88e96d5176d4f68983ff5514fb137c1f12eb
 DIST rrdtool-1.0.50.tar.gz 1474200 RMD160 96af2ec2831881e167687f65f5fc9bc64c67358b SHA1 399e2bf807e3fbc987eec4c5364dc4cb416ba287 SHA256 42aa7c213dedbd95d33ca84d92f4187880f7e96062c6a3fb05bfb16f77ba2a91
 DIST rrdtool-1.2.29.tar.gz 1092333 RMD160 a54f80cf3eec6d1484e062311a96e5691656288e SHA1 bd6c201eb12ff9007081fda81aa6bd1410a30bf2 SHA256 0e3b2febfc36276fc8e5c4ec98c73830aa2313ba77663e979d4c4859928f64b9
 DIST rrdtool-1.2.30.tar.gz 1092483 RMD160 ee4d492fee4e109da89ca85bd9dd561cb9ddfcec SHA1 c850dc6008bd6580eefa4257e339f78bd3f78fa3 SHA256 3190efea410a6dd035799717948b2df09910f608d72d23ee81adad4cd0184ae9
@@ -12,6 +13,7 @@ DIST rrdtool-1.3.8.tar.gz 1021427 RMD160 e05cada9d1df11ed474536c1f6e11d7cc4c0807
 DIST rrdtool-1.3.9.tar.gz 1189442 RMD160 2b05c37a713cca3d15d92d1d9c5292c3cc4e0781 SHA1 5c202810bdf5e5dda3f06079c7739993622c7e86 SHA256 9e8757192a56e006d7c593970aca4850a05fa34807a5092d1d132da8f48e0108
 DIST rrdtool-1.4.2.tar.gz 1355269 RMD160 18d28dc0c22f28b6303898cb4555c7ed8df59937 SHA1 d77fbeac37837e64cbe2a377acbf3e7b95b6e86e SHA256 e55ebe13b16515a275185229a93ee1fc266010a9e3c6b05b229a1530695311cb
 DIST rrdtool-1.4.3.tar.gz 1381821 RMD160 fb888d16b8310d5366e65872735c0e41813eae96 SHA1 1e65de0192c149a30ee0d277e758a31ff7d6d6f0 SHA256 1aecfba0cb255aef6ae27534825022b83996abec0b7b94576e3b9d061ddf6d73
+DIST rrdtool-1.4.4.tar.gz 1345477 RMD160 7636c67af3e3b9ce2361cc2c3cab5a90a662a29a SHA1 e4715c13f2a6fd077c54911d396eb573788377b0 SHA256 0778d2f5cb0807b825b11a153eb0c365a847631dba69faca5c887f30797c6c33
 EBUILD rrdtool-1.0.50.ebuild 2693 RMD160 b541b709ee70a0e28023aad30666254cf8007ec1 SHA1 3ff735acf09aea437c131cfc308b8f66bb2271b5 SHA256 ad422d3c48106ffa12c16b0146d6f465cf6d956889a8afae8e143fe2757ff331
 EBUILD rrdtool-1.2.29.ebuild 1941 RMD160 9edd22ded6a83dded4ae8f92d33e31ae8e3b5b24 SHA1 9df27ffab759f26db64097fb7e31d71589eb5643 SHA256 34b93cf0e2dd63da5da2fe45760c85211e9439d03cea36bae17357a097805148
 EBUILD rrdtool-1.2.30.ebuild 1941 RMD160 8849c247f9a83d73715d2a840f7e4e2b6e0db357 SHA1 084192bf23b447f8fb663e20a70be521f3f616e4 SHA256 68ab0689ddd49f9c635678576516fb6b9a28590ad6a7282cf02bb8f9a88bf1ca
@@ -21,12 +23,13 @@ EBUILD rrdtool-1.3.8.ebuild 2674 RMD160 32ab770c5cb9f8caabf7129765527e5c03851fd2
 EBUILD rrdtool-1.3.9.ebuild 2776 RMD160 bb5a72c574c337bfebdadf2f11bb3da594b0ebf3 SHA1 18a3a7b9f8877c9747e4c9cc73d482c5280d7da8 SHA256 58bb63b2b6903945414c85015306561e6be685c9b7b307dc2e88f76d66af7141
 EBUILD rrdtool-1.4.2.ebuild 2773 RMD160 1925709cb77ef0b782dd9af09b21e3ab1f0ac8ed SHA1 a2eb17dcfea2b211e41a64e1fe745a10ddc94676 SHA256 2fc595a30197c34ad3a8f19e300223d1ea9dd503a5fe7582a6e7b97be16af37d
 EBUILD rrdtool-1.4.3.ebuild 2995 RMD160 db6f8d3041175e39fbc1452590090cf8fb0a19ef SHA1 e6beb54c20f9368982ebd30a52494d20f4d74b8d SHA256 742837bcf2d4f13390dbf635b7d0fb36b0fbbdbc2623562379127e421390870f
-MISC ChangeLog 31148 RMD160 724f24568a953ebbaa2bb706d3efc6ee627fce26 SHA1 372d9bcafe653eb55fb4839a275248a0c6541398 SHA256 6d01e3565637b732161821203ed0b49169d41580dbccd83e6a46f5ec1418b0bf
+EBUILD rrdtool-1.4.4.ebuild 3057 RMD160 e127762b445d44fffab6fb4c129bbb30c577a919 SHA1 6b590fcb877aafd3ff80f01f839aed328bd1d9ea SHA256 fc0eea112cd15ac4ab039518361884fae1e706cd4b4d24655e08253d0c2b420b
+MISC ChangeLog 31397 RMD160 c4d6dee60542f359f381affa45a1ef7744bac2c7 SHA1 5e80713320594a27b506663782b6ace57f54ea0e SHA256 e465e02733a24220ef99b55614417fa03ac0eec7734da2f8620da77d18b0294c
 MISC metadata.xml 376 RMD160 78da9054230eb8ed5474d75d1a0f7419eb1e45f9 SHA1 b7645e63557b4d5049032390ee07d86c5411fc96 SHA256 ccdb09cfa58f274722a7b61fb666c96c5d1c55d828fff44abc9415e56c056bb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAky5rh8ACgkQZihJkut28Ssi4wEAwuRgCdNcizBek24QjPvn3nLZ
-WyGm3Ae1TK1xKGkXDn0A/1aDuRe7j+lrn5tpTsrTSvdFkftLbjkpKtokiqowbULm
-=SyeQ
+iF4EAREIAAYFAk0JvAMACgkQppaJjIURYXIa9AD+O1TpHrmF3yUyS9kPVrso+7v0
+ZkYQ7nxsqZsINpLNAkMA/1ifGrxYresIDyrHURjcdiHCPeeSInr0q2cLbipsUyvM
+=lmhW
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.4-dont-link-system-lib.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.4-dont-link-system-lib.patch
new file mode 100644
index 000000000000..5d8f8498f264
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.4.4-dont-link-system-lib.patch
@@ -0,0 +1,16 @@
+Make sure the Makefile for the ruby binding does not look in the
+normal library path first by setting it to something else that will
+not contain a rrd.so library. This is the least invasive method to fix
+the linking order.
+
+--- bindings/Makefile.am.~1~	2010-03-02 17:54:04.000000000 +0100
++++ bindings/Makefile.am	2010-11-27 14:19:07.080938486 +0100
+@@ -29,7 +29,7 @@
+ # RUBYARCHDIR= is to work around in a makefile quirk not sure 
+ # it is is the right thing todo, but it makes rrdtool build on freebsd as well
+ ruby:   Makefile
+-	cd ruby && $(RUBY) extconf.rb && $(MAKE) EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS) RUBYARCHDIR=
++	cd ruby && $(RUBY) extconf.rb && $(MAKE) libdir=/lib EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS) RUBYARCHDIR=
+ 
+ # rules for building the pyton module
+ python: Makefile
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.4.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.4.ebuild
new file mode 100644
index 000000000000..1259104eaf56
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.4.4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.4.ebuild,v 1.1 2010/12/16 07:12:54 graaff Exp $
+
+EAPI="3"
+
+GENTOO_DEPEND_ON_PERL="no"
+inherit eutils flag-o-matic multilib perl-module autotools
+
+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 ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+IUSE="doc lua 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[svg]
+	>=dev-libs/glib-2.12.12
+	>=x11-libs/pango-1.17
+	lua? ( dev-lang/lua )
+	perl? ( dev-lang/perl )
+	python? ( dev-lang/python )
+	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 !dev-ruby/ruby-rrd )
+	tcl? ( dev-lang/tcl )"
+
+DEPEND="${RDEPEND}
+	sys-apps/gawk"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.3.8-configure.ac.patch"
+	epatch "${FILESDIR}/${PN}-1.4.3-ruby-ldflags.patch"
+	epatch "${FILESDIR}/${P}-dont-link-system-lib.patch"
+	sed -i '/PERLLD/s:same as PERLCC:same-as-PERLCC:' configure.ac #281694
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -ffast-math
+
+	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+
+	# to solve bug #260380
+	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
+
+	econf $(use_enable rrdcgi) \
+		$(use_enable lua) \
+		$(use_enable lua lua-site-install) \
+		$(use_enable ruby) \
+		$(use_enable ruby ruby-site-install) \
+		$(use_enable perl) \
+		$(use_enable perl perl-site-install) \
+		--with-perl-options=INSTALLDIRS=vendor \
+		$(use_enable tcl) \
+		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
+		$(use_enable python)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	if ! use doc ; then
+		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
+	fi
+
+	if use !rrdcgi ; then
+		# uses rrdcgi, causes invalid shebang error in Prefix, useless
+		# without rrdcgi installed
+		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
+	fi
+
+	if use perl ; then
+		perl_delete_localpod
+		perl_delete_packlist
+	fi
+
+	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
+}
+
+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 an 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."
+	ewarn
+	ewarn "Note: rrdtool-1.3.x doesn't have any default font bundled. Thus if you've"
+	ewarn "upgraded from rrdtool-1.2.x and don't have any font installed to make"
+	ewarn "lables visible, please, install some font, e.g. media-fonts/dejavu."
+}