net-analyzer/rrdtool: Sync with upstream

Package-Manager: portage-2.2.20.1
RepoMan-Options: --force

5 files changed, 48 insertions, 35 deletions

diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.4.8 b/metadata/md5-cache/net-analyzer/rrdtool-1.4.8
deleted file mode 100644
index 208d938e..00000000
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.4.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=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_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 ) tcl? ( dev-lang/tcl ) tcpd? ( sys-apps/tcp-wrappers ) virtual/pkgconfig virtual/awk !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A system to store and display time-series data
-EAPI=5
-HOMEPAGE=http://oss.oetiker.ch/rrdtool/
-IUSE=dbi doc +graph lua perl python ruby rrdcgi static-libs tcl tcpd python_targets_python2_7
-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
-LICENSE=GPL-2
-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_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 ) tcl? ( dev-lang/tcl ) tcpd? ( sys-apps/tcp-wrappers )
-SLOT=0
-SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.8.tar.gz
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	distutils-r1	1375d7df3597739c70e997d7508c6f79	eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	02090c5a622458303e6bf68837ac6b96	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	perl-module	1cfb38bf68a24c8394e41d2f53003146	python-r1	fca51bba23ab2e206194470b2e56c92c	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	unpacker	1ca344bd9b922a7f8084a3fa02933b79
-_md5_=e6fce9d7ec6a342c26e65a876c076362
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r1 b/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r1
new file mode 100644
index 00000000..d12e03f5
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[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_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers ) sys-apps/groff virtual/pkgconfig virtual/awk !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A system to store and display time-series data
+EAPI=5
+HOMEPAGE=http://oss.oetiker.ch/rrdtool/
+IUSE=dbi doc +graph lua perl python rrdcgi ruby static-libs tcl tcpd python_targets_python2_7
+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
+LICENSE=GPL-2
+PDEPEND=ruby? ( dev-ruby/rrdtool-bindings )
+RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[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_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
+SLOT=0
+SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.8.tar.gz
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	distutils-r1	1375d7df3597739c70e997d7508c6f79	eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	02090c5a622458303e6bf68837ac6b96	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	perl-module	1cfb38bf68a24c8394e41d2f53003146	python-r1	fca51bba23ab2e206194470b2e56c92c	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	unpacker	1ca344bd9b922a7f8084a3fa02933b79
+_md5_=42190a77664e17472b4a6b1c07ded9d4
diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index bb545f6f..57a6e778 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,3 +1,9 @@
+*rrdtool-1.4.8-r1 (15 Aug 2015)
+
+  15 Aug 2015; Bertrand Jacquin <bertrand@jacquin.bzh> +rrdtool-1.4.8-r1.ebuild,
+  -rrdtool-1.4.8.ebuild:
+  net-analyzer/rrdtool: Sync with upstream
+
   17 Apr 2014; Bertrand Jacquin <bertrand@jacquin.bzh>
   +files/1.4.8-Add-support-for-MINNAN-and-MAXNAN-operators.patch,
   rrdtool-1.4.8.ebuild:
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 83cd4ca5..34633ff8 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -10,6 +10,6 @@ AUX rrdcached.init 449 SHA256 063798427765d08d2c3592480a7a4a480a3efc0d04459f8544
 AUX rrdtool-1.4.5-automake-1.11.2.patch 857 SHA256 d72b5b9f7713832fa946f2310938f8df14b980548f789a4e629951cc4040b3ef WHIRLPOOL 46a707e5aba8f7577a8d9cd40fa96886209a5f55ce3919aae9f0fd9b5209ffefb6ef103ce54155b8de2cf7fdca92a86c1bddf13f6574941aabab90e917ed1bc9
 AUX rrdtool-1.4.7-configure.ac.patch 492 SHA256 00ac12cee29a579532cfa82d3bba88588f4cc938667801743c40097dd38f73e5 WHIRLPOOL f453a9ae54853a9d2546edc6394e71eae2c28ca77c9751b8d5add5495360c20cd5d70046d5a9a9122ec5979cfba238fe799a965814399f51588758ed5fe37b6b
 DIST rrdtool-1.4.8.tar.gz 1379482 SHA256 de95b9f5aa488b0683600aad5a07c316f8d98cbe8d00aa0a1c87e2b2ef89f3d6 WHIRLPOOL f3926aed715a80c8d8287b057c39bbe614d81ebf9f24d1e285a9a438594d5c4c66b59934cc7c6be0550f0f729f319b01a46efc32ccf0b412563c43cf74a21564
-EBUILD rrdtool-1.4.8.ebuild 4735 SHA256 4a55b3cc4e072e6f5279c4183a0bed16c21481685be29191aa6f63bfd9bd039d WHIRLPOOL 656af757d72bfbc981962610307babbab8d28c6dad7f09f5f391f115d57c788defebdf4d102606eb78feec67aca552089e4ac4cfe21a3b8da59db2398d0135ed
-MISC ChangeLog 985 SHA256 04b22dd2d76aa0f19066762dc5f703efb4535d3fa1f61c84841ea89c4523c501 WHIRLPOOL 6404258db28a52c433b81914218455608ea9664579cfa5c3778c3a034176ed796fb42b204d7d89a46bdeb0abc76741dc274114d845e7c552fc3c1cbc44b42a04
+EBUILD rrdtool-1.4.8-r1.ebuild 4537 SHA256 6e528036bb35ce8173b54dc1846b756f2b82f73e8dba167e15087e420d769e16 WHIRLPOOL 91b8a9ac6bc9a4b52cd281e110d843ba5d102a93f8dc53af4bc1c11b0b464079e41e92b0e527c831b9498412d6fc9f56f6925c07c1a2c7fdab168509c19717af
+MISC ChangeLog 1168 SHA256 e7bd884220269c4aaae6403100336f630255ec313a71d2b8fb46b3bb115186a1 WHIRLPOOL 498f248c08651dff0865ffd453b8e8d927392b1c74829e454f1ff77caeb73635b51b5d2be4e33caa6b137f5a6ed2fbbeb0766f674cfe824217af313f2094b9d0
 MISC metadata.xml 382 SHA256 61ecf5c79b1a7801d054184a5b79c9ecfbe89d3633b8eb8f29e2297ef4f201ab WHIRLPOOL b34ad3e79ae530ac2ef811e561cdb5a0666eb873a575c4aed970daf330be5ab6490aa12cc15dc13c53387c6c3530ccd572e1abb4a7a0cf351c5c77136dc38f8d
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.8.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
index e6e38f54..f2d50301 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.8.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.10 2014/03/24 14:29:15 ago Exp $
+# $Id$
 
 EAPI="5"
 
@@ -15,38 +15,45 @@ 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"
+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 rrdcgi ruby static-libs tcl tcpd"
 
-RDEPEND="
-	>=dev-libs/glib-2.28.7[static-libs(+)?]
-	>=dev-libs/libxml2-2.7.8[static-libs(+)?]
+CDEPEND="
+	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
+	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
 	dbi? ( dev-db/libdbi[static-libs(+)?] )
 	graph? (
-		>=media-libs/libpng-1.5.10[static-libs(+)?]
+		>=media-libs/libpng-1.5.10:0=[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 )
+	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 )
+	tcl? ( dev-lang/tcl:0= )
 	tcpd? ( sys-apps/tcp-wrappers )
 "
 
-DEPEND="${RDEPEND}
+DEPEND="
+	${CDEPEND}
+	sys-apps/groff
 	virtual/pkgconfig
 	virtual/awk
 "
+RDEPEND="
+	${CDEPEND}
+"
+PDEPEND="
+	ruby? ( dev-ruby/rrdtool-bindings )
+"
 
 python_compile() {
-	cd bindings/python || die 'can not enter to python bindings directory'
+	cd bindings/python || die
 	distutils-r1_python_compile
 }
 
 python_install() {
-	cd bindings/python || die 'can not enter to python bindings directory'
+	cd bindings/python || die
 	distutils-r1_python_install
 }
 
@@ -65,7 +72,6 @@ src_prepare() {
 	# 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
@@ -103,12 +109,12 @@ src_configure() {
 		$(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 \
+		--disable-ruby-site-install \
+		--disable-ruby \
 		${myconf[@]}
 }
 
@@ -136,8 +142,6 @@ src_install() {
 		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 {} +
@@ -147,6 +151,8 @@ src_install() {
 
 	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
 	newinitd "${FILESDIR}"/rrdcached.init rrdcached
+
+	use python && distutils-r1_src_install
 }
 
 pkg_postinst() {