Old.

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

4 files changed, 10 insertions, 174 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 6211f6e8d5ec..edc974472966 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.277 2014/09/20 21:13:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.278 2014/09/21 00:03:39 jer Exp $
+
+  21 Sep 2014; Jeroen Roovers <jer@gentoo.org> -rrdtool-1.4.8.ebuild,
+  files/rrdtool-1.4.7-configure.ac.patch:
+  Old.
 
   20 Sep 2014; Agostino Sarubbo <ago@gentoo.org> rrdtool-1.4.8-r1.ebuild:
   Stable for ppc, wrt bug #517234
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 3c12a401cb0d..b690fd45dfe8 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -3,28 +3,17 @@ Hash: SHA256
 
 AUX rrdcached.confd 150 SHA256 f544145d142ab85f5efa578c24ab6b813c4a236af2b3ddc51d5fb2cd847cf976 SHA512 93d95057e99c98c943060cfc607285e76ac4580e9955e65ceac69b09577dd6a78b1faa9e6213345a7f011beabebce21c9447b6bd39f4091762d9974cd1a358e0 WHIRLPOOL af0317711dfd276e8047dbf285125104931a9ea696d8b73e54d41bbce7d1d7c08da0d71564346a95b485171d4990005b2f944be227962aed44b332807f300838
 AUX rrdcached.init 449 SHA256 cc1b0d349ebdbaa224d51bd271b2b299b89d10f87e75537e3618d9ea6d4dcbb4 SHA512 770000e8541b0cb2c5e70fe8b105901f5362633bcacb1d75684163ec78dda59e04adacfde3a3cc03b1cff1c44a5933146a4b1beeacd2c9fb6206de47c5af7156 WHIRLPOOL dd1936b9491ca91a1851db8252b750fa14072584b8d71c3f0f316d7a93cd34687c5c7221d1fd09bc28f4d2c0aea3065fd5d93f50668193c08e5f5cd7b0da7e42
-AUX rrdtool-1.4.7-configure.ac.patch 492 SHA256 00ac12cee29a579532cfa82d3bba88588f4cc938667801743c40097dd38f73e5 SHA512 c91bb2ac81de4ca3002eb4526582d24067da71597218afd94c6c198686f70709afbc9d1058bab090a56cb2d8290b52809bcafdffe83aaeb54e7510040851a74c WHIRLPOOL f453a9ae54853a9d2546edc6394e71eae2c28ca77c9751b8d5add5495360c20cd5d70046d5a9a9122ec5979cfba238fe799a965814399f51588758ed5fe37b6b
+AUX rrdtool-1.4.7-configure.ac.patch 451 SHA256 a18b8dba4e80149494e9115db74233b253243b589928ed9955e328bfdb3bfe75 SHA512 15dfd061a2eedb569264ae5e2014961fd29d63d92add282eb54a228e682b0b08fc0ac755256c98fae385796cda32bb497d07f675cff8ab037634cf1bd32df9f2 WHIRLPOOL 5ff2cfb6c7350acc94f3ec459b92eea6f913cc05cd46d576920e89b8bad28330f30592b955ff24395290e3082d8e7d9afbf0bdff46a6095506115eb970f5b693
 AUX rrdtool-1.4.8-disable-rrd_graph.patch 5453 SHA256 c81ac70ac9ce961561df7ebc5a4804848113765e4655e344287449b91d791c57 SHA512 11a483d40bd693629994a80a3e804a6c4eb984a2bba366a358c48b6d76b05d2dff275645591bb5406442280b60b6548ec265f82685be117cc65c80bf962b08a2 WHIRLPOOL 24b16e00b1d989b065a8962a4f444f3fec2cb609368dcdfc960f8da8d8521006bcbc6fb0476507bc04b3c7028f3baa67f97ce4e670147a077eb91a9872baebfd
 DIST rrdtool-1.4.8.tar.gz 1379482 SHA256 de95b9f5aa488b0683600aad5a07c316f8d98cbe8d00aa0a1c87e2b2ef89f3d6 SHA512 c525978829508e1db393092c948d8db910554f42e1221acc4064a8f546ceac5d68943f603c6f0ef0e6510bbe5f606cfe6862672145ea1b630cd2b7fd07fa805b WHIRLPOOL f3926aed715a80c8d8287b057c39bbe614d81ebf9f24d1e285a9a438594d5c4c66b59934cc7c6be0550f0f729f319b01a46efc32ccf0b412563c43cf74a21564
 EBUILD rrdtool-1.4.8-r1.ebuild 4193 SHA256 2bf2c8c57020190184ce6ce45bb374e31cf6a7be808d95df97013e0f7f704f84 SHA512 9dd64261fb3650dc039c2f05f8d2755b7cab8d13c4db1538d86daf85559940c62257357b69964c300c0ca8c6eddd44afea582b5bf1ed091f897288a134407377 WHIRLPOOL 15a53d0665e5c4ce2eb34512e130487458c21b40858edd33e980680e83c486b4fa9ef14b24deec54096d5441f73a3738b6b51ab8e2562dd61a13815e1292e32d
 EBUILD rrdtool-1.4.8-r3.ebuild 4251 SHA256 8afec9a4afda9b511ba39c399d440d00ea16591a50f9fe28008527cb923a053e SHA512 4cfc86741a8998d385c2478448003778cb38126d8103f55594d250a9faa2daeb8629f9b9790a8c5db2eb4086a458f38f406e747241404e8cbe1594de7ea0fc45 WHIRLPOOL e526295646bd1fd6e261a3e8b7547a9d58186d534e73eb04f4ca51cc09ac637783d6b0bacf15d2bc3a2c3beac53c14d63c4c6a9072e32cd1097fb04d81c2db23
-EBUILD rrdtool-1.4.8.ebuild 4172 SHA256 5fac5d8fb9d5dedb53dc1c7f7311fa13b7c4ada26fb3cb1880a3c2a128d0dca5 SHA512 07ca0440306002f8223e6c92e6a5dbd7a7caae3df048f2c077b62f73a408a0361d5d5c8a39493120320f1782fcd4cca76e028b697fc4ac78deb38fcbd8fb0e70 WHIRLPOOL d892e7db2fe6fddac534964c3d4ae6af66e80f74ce588285d328a97e5697ef5c9772b63941137c1a1313f5eae06350bea9543b63302d705935cee28798ac0a3e
-MISC ChangeLog 40947 SHA256 c3e4a5ff94a4f164d11e556ad3fc931c62a420631145cbfe9fa3a075a41bf983 SHA512 316c9e7070c3681b8a036aa6de3d34691453e66a892026b352d1d84e08e241dc2090109bf0ec73f7d5011368f10368af004815c00bc58fde89eb6a271fd3f2f2 WHIRLPOOL 6bd587011a30f12cced5e36f20ea51e50c9007b394ebb3c4e6926186de60693ab976041d9c29e1b5b46d5be15b989c1ef790115fd2ac37b6e9ac6c71bff3c439
+MISC ChangeLog 41067 SHA256 c8b42f8e1f41ebc6dda81e7f8c44631a302bd55690f511f5a72ce2323b197153 SHA512 c4fd35e47f497fb6c4c93db6b9bfd9f61a822d1e529885a367abb419b644247d4dca8028d6bd412073f87aa968179cb906b33862781ab93d0e185278d008497a WHIRLPOOL bf2cc121d4c936c50b8ccd8c0b870c6e70a6cae10fbd92885fdce6e844ff7c97cc06e99a91766645fe60772e4c412b363f13af1c8e63bed0b6a5a6bb1085db4d
 MISC metadata.xml 382 SHA256 61ecf5c79b1a7801d054184a5b79c9ecfbe89d3633b8eb8f29e2297ef4f201ab SHA512 f30109bc3a89232a2b4f55afebaf6322ab70b0bd38b53e2650259192cca547bf69cdbe5640d43576a9ac0fb637eb447053ad8a6cb4f3fc1bf49746eb821bf905 WHIRLPOOL b34ad3e79ae530ac2ef811e561cdb5a0666eb873a575c4aed970daf330be5ab6490aa12cc15dc13c53387c6c3530ccd572e1abb4a7a0cf351c5c77136dc38f8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUHe3zAAoJELp701BxlEWfhVQP/3pLQflYlxIJsurddcLr0f28
-G0gYSZP019LlBnmlECZ0kB/OCGLI7VnSFdhMVJrHgv3bZNYuUkbJplV9pseM8FAU
-t2sgXzCgOap8HQDHavHlznhE07r8xPhfAS7CYbXJNXZsA9xO5VpY2eqIpdWYt8Fb
-CVIyN6sbbx7CbkL3QRfoy1GQG0FyMgGV9JVwclV17rP2WWQcqV+hKjyk7hqZEPrb
-HkbX9ao3qPLjRA92ANwyc9bo3GXdAz1cTenf3xkSwxmUFw1+GYIBmAg8dnCk0Wy1
-I+5fLM2OitqKBnnDfs1wtw952I7AA47pJIblbKba3ug9f7464LSFFU4QY1JhV5vv
-2RfHfTbcOp/GEqwO3AvD4HyuJAvs9BgLs+T3il97aZ5WvqUOULOfej6aAdLGMdcM
-y5itGBJWkWlxTGWRFhSyD5dyTV5MNl5bNGYmLZiTR0iL8o+u+J5I/SoioE3g9WlG
-xx0XPUsxLUlDnBNdAiZ9VAG8KCI+/CXYvqJPiUGdrABn9pPt6kKzFSHk6igxyE6d
-TWamgZhbee6mJCWtBathRkLtld16uBQaEywGwggDz9kECFKoTei3t+P9MGDPUC4U
-jGm6+FFe3kBf3wRVGw8iRV0sreYFOyx0imCc3IXp2OZRsFzWIIeXirgVTxbAyIxT
-N6vOM7hNpXyvO9SFsMx/
-=mW0B
+iEYEAREIAAYFAlQeFd0ACgkQVWmRsqeSphMocgCdFgwFyTLGZo40FD4ny3Dvv5al
+p3UAnRBvLPQ5CLw9itF+34kRZOiwlFa6
+=Klm+
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.7-configure.ac.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.7-configure.ac.patch
index ad97bec2defa..668adeee13ee 100644
--- a/net-analyzer/rrdtool/files/rrdtool-1.4.7-configure.ac.patch
+++ b/net-analyzer/rrdtool/files/rrdtool-1.4.7-configure.ac.patch
@@ -1,4 +1,3 @@
-diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
 @@ -148,7 +148,7 @@
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.8.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.8.ebuild
deleted file mode 100644
index fcc88e8ff571..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.4.8.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2014 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.13 2014/05/19 00:35:42 jer Exp $
-
-EAPI="5"
-
-DISTUTILS_OPTIONAL="true"
-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}
-	sys-apps/groff
-	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 456810
-	# no time to sleep
-	sed -i \
-		-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."
-}