Version bump.

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 167 insertions, 5 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index bb6de9003621..2b3ab98e9905 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.248 2013/08/01 13:24:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.249 2013/08/01 15:14:59 jer Exp $
+
+*rrdtool-1.4.8 (01 Aug 2013)
+
+  01 Aug 2013; Jeroen Roovers <jer@gentoo.org> +rrdtool-1.4.8.ebuild:
+  Version bump.
 
   01 Aug 2013; Jeroen Roovers <jer@gentoo.org> -rrdtool-1.4.5-r1.ebuild,
   -rrdtool-1.4.5-r2.ebuild, -files/rrdtool-1.4.3-ruby-ldflags.patch:
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index a8b9c2a007ca..d45fdbfedfdd 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -6,14 +6,16 @@ AUX rrdcached.init 449 SHA256 cc1b0d349ebdbaa224d51bd271b2b299b89d10f87e75537e36
 AUX rrdtool-1.4.5-automake-1.11.2.patch 857 SHA256 d72b5b9f7713832fa946f2310938f8df14b980548f789a4e629951cc4040b3ef SHA512 a2e75b2c44c61be7405ada0decae6eea8bca907ffc47794339016106927b449163b5acdc9d5c78c92b98a74deac9713798ca5ac2f5c5d6941fa19effe8bc2554 WHIRLPOOL 46a707e5aba8f7577a8d9cd40fa96886209a5f55ce3919aae9f0fd9b5209ffefb6ef103ce54155b8de2cf7fdca92a86c1bddf13f6574941aabab90e917ed1bc9
 AUX rrdtool-1.4.7-configure.ac.patch 492 SHA256 00ac12cee29a579532cfa82d3bba88588f4cc938667801743c40097dd38f73e5 SHA512 c91bb2ac81de4ca3002eb4526582d24067da71597218afd94c6c198686f70709afbc9d1058bab090a56cb2d8290b52809bcafdffe83aaeb54e7510040851a74c WHIRLPOOL f453a9ae54853a9d2546edc6394e71eae2c28ca77c9751b8d5add5495360c20cd5d70046d5a9a9122ec5979cfba238fe799a965814399f51588758ed5fe37b6b
 DIST rrdtool-1.4.7.tar.gz 1349040 SHA256 956aaf431c955ba88dd7d98920ade3a8c4bad04adb1f9431377950a813a7af11 SHA512 5be26ba4d54700553e3d25fe416aa5e752de4b035c91ccda98cdefb0df09321528abef188cfd2049ba40f8a71edb253ff75ada4a5305fdbc6acade64cdf45d32 WHIRLPOOL 236c33d514e3e826bf2047cb20ca7bea29ef9bdabc1b2a4ebf7f14278698bddd6ad927f97a427f35044cdaaa91bd743ac8985ef7201678cae1830b29d9040b74
+DIST rrdtool-1.4.8.tar.gz 1379482 SHA256 de95b9f5aa488b0683600aad5a07c316f8d98cbe8d00aa0a1c87e2b2ef89f3d6 SHA512 c525978829508e1db393092c948d8db910554f42e1221acc4064a8f546ceac5d68943f603c6f0ef0e6510bbe5f606cfe6862672145ea1b630cd2b7fd07fa805b WHIRLPOOL f3926aed715a80c8d8287b057c39bbe614d81ebf9f24d1e285a9a438594d5c4c66b59934cc7c6be0550f0f729f319b01a46efc32ccf0b412563c43cf74a21564
 EBUILD rrdtool-1.4.7-r1.ebuild 4092 SHA256 ba5f8bced37de7aaaf0bed97e960a8a5dfad9ae5a5345f68cf9d647a5311e7ee SHA512 70a7cbbb85c725dbb882fb2a891ea1706be58230c6b3b09be1d3c4717d28772077a4407f797104042df0953a070a3a3258471f60555b1f4041a1589f98e73067 WHIRLPOOL 765a33228c1f98cd5d51a7337483bede7118eb0ad1389fad4ee371bda3ef9709793bfde7919b8ad524a513a668e5725ca925207573ff49a6fdf211aa07133527
 EBUILD rrdtool-1.4.7-r2.ebuild 4244 SHA256 4e38c9dfe54e56b4787bb69a10069f3f29283bc2c11b84c0895893d98a581cbd SHA512 9a62a7b56414c7886b37ca825fb62a9ca43f0706f39f69eefd09fe785fae2a8639f9ff16cb1c5734ca07389c9c340ceba5ee042870397bc17519cbe9ad0f70e3 WHIRLPOOL f96c56210705b9ed45985605ffddb1965c4070d72397e90364b586ba4b2501e8296ea281ad70a6924bbb5d3f436c5c94fc05d8b3725b1247937b38eea5a55a24
-MISC ChangeLog 37285 SHA256 a9e17217f40165661056413c2b0a1876dd54de6a06787244131e62145b888de8 SHA512 0cc5231b648586dda12be993ed6415fd10780fb437c6c29a310177389e5b509e52a880394a82734e78d6e67585a3b964cb93cf5e5da15254e31d741fe3c0742b WHIRLPOOL 435a70eac1540a820270284f1011c3c614964a8f790e3dceac474fe97895d4663429bfdab7ad42d37c2f1a36c128961bf9855de4d59ffca7cbe28b23c1565736
+EBUILD rrdtool-1.4.8.ebuild 4200 SHA256 e42ce62ca78b3bcc0f1aa42d4147400934b2d4580953c0b9db2440be036a9a00 SHA512 f5587c2590c6f27fa2a5803dc618ac4299dbcaea7bdef0ddff2a83140a47ab7470b9db5b6f9e629929ddc430fe57cfdaa71217565ed5fbaf2e74be12078a268f WHIRLPOOL a9233b16f02c2ee6fe3d70cb6d771b5580e766db85903f92bc23cca7c3943786b6db92486ae208a96a9b3c7b0171b3bf5ee352525e545cbd1b57221336a43ec0
+MISC ChangeLog 37402 SHA256 1cecfece7c7ef682f394be58944b1644bd09f7b30b76bd6a80e8b4395b8783c7 SHA512 589e13db777eb2cdacf325c723d7a41ac2ba5b4b27b784c8e7913272e719eaadf1a28c4efefd471ec5d043bae10cd50848411cd1d33654c29ec76ec56e81f524 WHIRLPOOL a56466cba6111ebcce7b107c40dbef9a1ef59209e1fcce67b63c972e915ab25df40a9d443b54b0f53e0b0ae9ae0cedc1d9bf6f99039ea485929d2fe82765290b
 MISC metadata.xml 382 SHA256 61ecf5c79b1a7801d054184a5b79c9ecfbe89d3633b8eb8f29e2297ef4f201ab SHA512 f30109bc3a89232a2b4f55afebaf6322ab70b0bd38b53e2650259192cca547bf69cdbe5640d43576a9ac0fb637eb447053ad8a6cb4f3fc1bf49746eb821bf905 WHIRLPOOL b34ad3e79ae530ac2ef811e561cdb5a0666eb873a575c4aed970daf330be5ab6490aa12cc15dc13c53387c6c3530ccd572e1abb4a7a0cf351c5c77136dc38f8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH6YYIACgkQVWmRsqeSphMUZQCfdbCe5Tzj1oZ0fu4R2m7IbUWl
-vXAAniuEf8fV7gm6xoWgoCF7RyKw+Uol
-=Dw+c
+iEYEAREIAAYFAlH6e3QACgkQVWmRsqeSphN5jACfYD8EzryYkX7g4cRg7l9NzLQ0
+OqcAnR7pWas2D4+FQm2B23r5u/iL8xzM
+=oJ29
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.8.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.8.ebuild
new file mode 100644
index 000000000000..844720912255
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.4.8.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.8.ebuild,v 1.1 2013/08/01 15:14:59 jer Exp $
+
+EAPI="5"
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python2_7 )
+inherit eutils distutils-r1 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 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="dbi doc +graph lua perl python ruby rrdcgi static-libs tcl tcpd"
+
+RDEPEND="
+	>=dev-libs/glib-2.28.7[static-libs(+)?]
+	>=dev-libs/libxml2-2.7.8[static-libs(+)?]
+	dbi? ( dev-db/libdbi[static-libs(+)?] )
+	graph? (
+		>=media-libs/libpng-1.5.10[static-libs(+)?]
+		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
+		>=x11-libs/pango-1.28
+	)
+	lua? ( dev-lang/lua[deprecated] )
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 )
+	tcl? ( dev-lang/tcl )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	virtual/awk
+"
+
+python_compile() {
+	cd bindings/python || die 'can not enter to python bindings directory'
+	distutils-r1_python_compile
+}
+
+python_install() {
+	cd bindings/python || die 'can not enter to python bindings directory'
+	distutils-r1_python_install
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4.7-configure.ac.patch
+
+	# bug 281694
+	# bug 456810
+	# no time to sleep
+	sed -i \
+		-e '/PERLLD/s:same as PERLCC:same-as-PERLCC:' \
+		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
+		-e 's|^sleep 1$||g' \
+		configure.ac || die
+
+	# Python bindings are built/installed manually
+	sed -i \
+		-e '/^all-local:/s| @COMP_PYTHON@||' \
+		bindings/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -ffast-math
+
+	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+
+	# to solve bug #260380
+	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
+
+	# Stub configure.ac
+	local myconf=()
+	if ! use tcpd; then
+		myconf+=( "--disable-libwrap" )
+	fi
+	if ! use dbi; then
+		myconf+=( "--disable-libdbi" )
+	fi
+
+	econf \
+		$(use_enable graph rrd_graph) \
+		$(use_enable lua lua-site-install) \
+		$(use_enable lua) \
+		$(use_enable perl perl-site-install) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable rrdcgi) \
+		$(use_enable ruby ruby-site-install) \
+		$(use_enable ruby) \
+		$(use_enable static-libs static) \
+		$(use_enable tcl) \
+		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
+		--with-perl-options=INSTALLDIRS=vendor \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	default
+
+	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
+
+	use python && distutils-r1_src_install
+
+	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
+
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+
+	keepdir /var/lib/rrdcached/journal/
+	keepdir /var/lib/rrdcached/db/
+
+	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
+	newinitd "${FILESDIR}"/rrdcached.init rrdcached
+}
+
+pkg_postinst() {
+	ewarn "Since version 1.3, rrdtool dump emits completely legal xml.  Basically this"
+	ewarn "means that it contains an xml header and a DOCTYPE definition.  Unfortunately"
+	ewarn "this 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 ">=net-analyzer/rrdtool-1.3 does not have any default font bundled. Thus if"
+	ewarn ">you've 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."
+}