From 8098b968088110d71ddd51013561bad0a45d9596 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Mon, 19 Jan 2015 15:13:51 +0000 Subject: [PATCH] Version bump. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613 --- net-analyzer/rrdtool/ChangeLog | 11 +- net-analyzer/rrdtool/Manifest | 12 +- ...tool-1.5.0_rc1-disable-rrd_graph-lua.patch | 12 ++ ...l-1.5.0_rc1-disable-rrd_graph-python.patch | 38 ++++ net-analyzer/rrdtool/rrdtool-1.5.0_rc1.ebuild | 174 ++++++++++++++++++ 5 files changed, 241 insertions(+), 6 deletions(-) create mode 100644 net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch create mode 100644 net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch create mode 100644 net-analyzer/rrdtool/rrdtool-1.5.0_rc1.ebuild diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog index f7c25014c4f2..5cf9758a1bbd 100644 --- a/net-analyzer/rrdtool/ChangeLog +++ b/net-analyzer/rrdtool/ChangeLog @@ -1,6 +1,13 @@ # 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.282 2014/11/28 21:28:24 jer Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.283 2015/01/19 15:13:49 jer Exp $ + +*rrdtool-1.5.0_rc1 (19 Jan 2015) + + 19 Jan 2015; Jeroen Roovers +rrdtool-1.5.0_rc1.ebuild, + +files/rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch, + +files/rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch: + Version bump. 28 Nov 2014; Jeroen Roovers rrdtool-1.4.8-r1.ebuild, rrdtool-1.4.8-r3.ebuild, rrdtool-1.4.9.ebuild: diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest index f1077a2085f2..2346e3177535 100644 --- a/net-analyzer/rrdtool/Manifest +++ b/net-analyzer/rrdtool/Manifest @@ -9,17 +9,21 @@ AUX rrdtool-1.4.9-disable-rrd_graph-cgi.patch 1234 SHA256 7d398572fff4b5aacfbc9e AUX rrdtool-1.4.9-disable-rrd_graph-lua.patch 1067 SHA256 944cbd916fb59c2736d9a2580a59d0d30f794c9dcc5d62f0812cbd40df9f2f7e SHA512 440bccc4c704005a72c0876bba45e625be6afbc715a2d207f9e2b7b50021ebacecb809f26b3f909be6a1ff60ce241187fde960ebede9d8e78dd26c3715174f89 WHIRLPOOL b71211f71567a8d1105c76cda71c4b220307190a38bb63fa0227a16150ce1fc67eaa3792bf029178b2f2e4b3289546e789c29e8fad7affe25aa7c00a6e80960e AUX rrdtool-1.4.9-disable-rrd_graph-perl.patch 914 SHA256 a8d5f4816fbfc760b52dc70de92ca97888f920c0192776cae819453e157f71cd SHA512 6eb8d8a8193ce5bc22a4645e909dc7eb0a911b1f89f6403afc9cffec705929cf64086f415e53b748254a384b83ff8352be82f735ad403795c17a9058bc3e386c WHIRLPOOL f06401a803325236244d4ae84825312ddce7c9409bf1e6064dda0abb470a3d69b7bf300d2e1607bbd4a4fa234d872664bc9fe500909665d6a960ac232bc0fb86 AUX rrdtool-1.4.9-disable-rrd_graph-python.patch 1895 SHA256 437affd44326fa95b0c6417d063dff7a5af86aed1c0a614db72ffc754b52aa34 SHA512 694bbb456252149d10edb7e5706cc35f9d7ee1e8659f7446e191e2c2a10f1dc597db681b3a1a8d0a8a487c08dccf0dc2c2326bcde786c8ef9c7a222682fb241a WHIRLPOOL 6aa7192c0814019524d6f5e756693850e9c906a5e4c9312127cec4504ef9f63018ef97f688fccdb4003c6f0f7116a492c56fd5966bde3a8db669e60421a66096 +AUX rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch 266 SHA256 e7e616c2e16e5774c06cec32730ced04b381014ce9461839a7217a1d3ce2eebc SHA512 1f981baffdadf8eb11728fba69d2942ef766fd99016d792873acbca44e84950a384396391aa8fc89f1f6f3f3742ae2b25745051c4ae0895e2f6e988a3a5573aa WHIRLPOOL 209bb27a7a7e269be3d808a01bd9006d72146fede816712ebf30204f29f70b701b85d8de91732fdaf6c923bf13a94c0e3095d5cda6ad7c38c750b505bacd326a +AUX rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch 1174 SHA256 2f422c7fc89dd11b06c56b09893795b22e47a6e1a0b50eb9c2ebadf4bcf47ba4 SHA512 54a1b35f07260a3b88b2bcb8220ca896b4a45f10a251c4ee492890389384e682c149ce9a31e9b00835dcd5d3e105b90a322c1820108363fc53e15ee0d77267ef WHIRLPOOL dc13cb34989b6548a7eddf60fa04732bfcfafea5dc324d72428bf7d8cf27a2c3ee005eac7f46e4ada1cd4da1430843519d72ef8a754d6b946f1e65b97557d888 DIST rrdtool-1.4.8.tar.gz 1379482 SHA256 de95b9f5aa488b0683600aad5a07c316f8d98cbe8d00aa0a1c87e2b2ef89f3d6 SHA512 c525978829508e1db393092c948d8db910554f42e1221acc4064a8f546ceac5d68943f603c6f0ef0e6510bbe5f606cfe6862672145ea1b630cd2b7fd07fa805b WHIRLPOOL f3926aed715a80c8d8287b057c39bbe614d81ebf9f24d1e285a9a438594d5c4c66b59934cc7c6be0550f0f729f319b01a46efc32ccf0b412563c43cf74a21564 DIST rrdtool-1.4.9.tar.gz 1385640 SHA256 3e2826e0d60aaf85313da35b3c0d3a926748fe482b4ada766a325a83b60125cc SHA512 938d6a10c750cbc1e368020fc2408644bc10f6e1d9316f3117df406beef16d7d5fca2fc6fa2bdb6b1ed3e49aa872d58f1f66d1ccee9fe73483c6a5e483c33d4a WHIRLPOOL bc5fb01aef18feb89bb801a2f7fa8c2002b8f8a40e8038355e7edda8a729f354a639c864c01a1ddc7a66d19c8911d75f4f202008bec994d521a209dc6579fe10 +DIST rrdtool-1.5.0-rc1.tar.gz 2007685 SHA256 c20cdf1e0d61d5852e3b18cb21f329c9943a8b7a479af0bafb64cf9a88a5e04b SHA512 6b831988afce3ba8a8833513eea92864370c422730283fa2820e81c51d42b98c0c5c78229cfa1108511e31e76a0955a7a70b9d7324e453ed989e9956cbc3bb1b WHIRLPOOL bb27baedd84976e2f0637af3b36b1e7e5945dcb483eeeeb7989a5d8b31d59b00eb961cfa5b149d0ee48dae22aff87cfb71e3fed9b433d545742f47eef4bdae63 EBUILD rrdtool-1.4.8-r1.ebuild 4195 SHA256 3872a32410188740eb0271ac439f51069ffffe369de62c24ef30f9b97c348cdb SHA512 f0e82a17ce6e1c2aac846d5acf0aefd061666e802129627593eb0a46df91e9a6df95038a0de9a92ac416613b77f3c71f3f82837bb55aca1e85ecc1221486db7b WHIRLPOOL 85636d1eb1f51e179293da2488646d7c88406ac5cbedd8b002663944fef7a29af51e5836fc2598a50fa26243c9d0862e7e76f622014165b93ba4f26e77dbd99e EBUILD rrdtool-1.4.8-r3.ebuild 4253 SHA256 fa7eac496db4e4a710f04c2cdaf1db3ce923e5abbcda33033c8318b6384726e8 SHA512 36d89f1b779b06e3baa41f813354bad27a3ffcf0a1ab71126a00fa12e55f77a57b1c41bef73be43a8d3cebdd96352db086744a6e1ecf17ab37aa413d6f393c3a WHIRLPOOL 506abe54831e2dce1c6bc6a68b4cad0a992335eaccf84433e43995ec1a5960ed3884fa8a0604dc7d1a08ff0ce2a22affc0635ffd8d75755920de2b046cae3189 EBUILD rrdtool-1.4.9.ebuild 4446 SHA256 f5a032e364a99bf58d4ef0617ff3c860a756ac6e38586d6ee36d33382dce18c8 SHA512 00c0596f04da3705bb7a2953e5a720f6bb720ba822abdeddfe16cea86b3863f91007a63630f913935684499eb1ce8f315758efe96db60b0d0c9eff73c14c0815 WHIRLPOOL c59e15fc8ee8e5859b4ab3010b4bfe1320e3fb1d5f9c468de9b31957fbd6372baf8e1caef903ec2550aec6a0ce221b2dc4281d5fe5ad53c5c386ceaff6e8ba3d -MISC ChangeLog 41929 SHA256 6c57e2d16262f5cf4d0aa9a677bef0245930190f632a6974fbabe713a19974f5 SHA512 c472f8473183ae7845a964e354db63e703041a067ff0d24d1b0e7e9a2da5520298be757f50ce3ae85a30b4d596c2670744ab7c8f32bc6d29f242c3c1aee59e76 WHIRLPOOL 94263354e9ce9021bdbb81d8327b397b286b08936b568d592ae212548054c7f7ae27a0ca67e82f132e3dbd79b90fe210e993371d5eb2a27d90863da667409f66 +EBUILD rrdtool-1.5.0_rc1.ebuild 4597 SHA256 0c39b0366a6857dd59760933d5421afc0371fc9c016fe648d3e84de33e2cc80d SHA512 08cc98e7a589b274967ba7db0113eeac64c02c01441238d72634b9d98509be8b6b7d9bba95c92d3fa60465403ca5f7dfdbe934e53f24ddf0c976fc478f92795e WHIRLPOOL 42d64ad431d73a4d0be77425a17966121a8093d87f721195d8b45a8b7166dc26fa3918dc6622862533c9ad75db96a6e7fdf5e4b29b735064e9f559dd27c0d06f +MISC ChangeLog 42169 SHA256 59b78eccad99cea1a4d1d2a0a4bd91f31e24a71f00b3dcebf762145818b59e51 SHA512 b47191efcdf535728de631d739b9895df7010f348a179166789078fca9be73e198e47d5bad0166ff8f030b6466555d7c9e12384caf8bac888d3cc29a5c4ac753 WHIRLPOOL 8c0f4b543945d236aec582745c22203d650522f866d9f10c5fe21657239f284a0ad9f3902f4de7dd38482c1ffcde1ea126a6cc0d117fede39db9a49370175509 MISC metadata.xml 382 SHA256 61ecf5c79b1a7801d054184a5b79c9ecfbe89d3633b8eb8f29e2297ef4f201ab SHA512 f30109bc3a89232a2b4f55afebaf6322ab70b0bd38b53e2650259192cca547bf69cdbe5640d43576a9ac0fb637eb447053ad8a6cb4f3fc1bf49746eb821bf905 WHIRLPOOL b34ad3e79ae530ac2ef811e561cdb5a0666eb873a575c4aed970daf330be5ab6490aa12cc15dc13c53387c6c3530ccd572e1abb4a7a0cf351c5c77136dc38f8d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlR46PsACgkQVWmRsqeSphOgZgCdF1FfGZgK0KUejRhE4HIsxYKq -RTsAn261CRGqGnMLtdIpq0LqAJB65IHT -=g50D +iEYEAREIAAYFAlS9Hy8ACgkQVWmRsqeSphN5JACeMxF5L1qnY6WL1mkdKtJe7nw5 +I9AAn02/QAPyyOoj4sxAlBhbTIK27jrt +=fVSg -----END PGP SIGNATURE----- diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch b/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch new file mode 100644 index 000000000000..6b3a3abf26bb --- /dev/null +++ b/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch @@ -0,0 +1,12 @@ +--- a/bindings/lua/rrdlua.c ++++ b/bindings/lua/rrdlua.c +@@ -367,7 +367,9 @@ + #if defined(DINF) + {"info", lua_rrd_info}, + {"updatev", lua_rrd_updatev}, ++#ifdef HAVE_RRD_GRAPH + {"graphv", lua_rrd_graphv}, ++#endif /* HAVE_RRD_GRAPH */ + #endif + {NULL, NULL} + }; diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch b/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch new file mode 100644 index 000000000000..db3daaf47345 --- /dev/null +++ b/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch @@ -0,0 +1,38 @@ +--- a/bindings/python/rrdtoolmodule.c ++++ b/bindings/python/rrdtoolmodule.c +@@ -675,8 +676,6 @@ + return r; + } + +-#endif +- + static char PyRRD_dump__doc__[] = + "dump - dump an RRD to XML\n" + "[--header|-h {none,xsd,dtd}] [--no-header]file.rrd [file.xml]"; +@@ -704,6 +703,7 @@ + destroy_args(&argv); + return r; + } ++#endif /* HAVE_RRD_GRAPH */ + + /* List of methods defined in the module */ + #define meth(name, func, doc) {name, (PyCFunction)func, METH_VARARGS, doc} +@@ -717,14 +717,16 @@ + meth("last", PyRRD_last, PyRRD_last__doc__), + meth("resize", PyRRD_resize, PyRRD_resize__doc__), + meth("info", PyRRD_info, PyRRD_info__doc__), +-#ifdef HAVE_RRD_GRAPH ++#ifdef HAVE_RRD_GRAPH + meth("graph", PyRRD_graph, PyRRD_graph__doc__), + meth("graphv", PyRRD_graphv, PyRRD_graphv__doc__), + meth("xport", PyRRD_xport, PyRRD_xport__doc__), +-#endif ++#endif /* HAVE_RRD_GRAPH */ + meth("updatev", PyRRD_updatev, PyRRD_updatev__doc__), + meth("flushcached", PyRRD_flushcached, PyRRD_flushcached__doc__), ++#ifdef HAVE_RRD_GRAPH + meth("dump", PyRRD_dump, PyRRD_dump__doc__), ++#endif /* HAVE_RRD_GRAPH */ + {NULL, NULL, 0, NULL} + }; + diff --git a/net-analyzer/rrdtool/rrdtool-1.5.0_rc1.ebuild b/net-analyzer/rrdtool/rrdtool-1.5.0_rc1.ebuild new file mode 100644 index 000000000000..c39ad073975c --- /dev/null +++ b/net-analyzer/rrdtool/rrdtool-1.5.0_rc1.ebuild @@ -0,0 +1,174 @@ +# 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.5.0_rc1.ebuild,v 1.1 2015/01/19 15:13:49 jer Exp $ + +EAPI="5" + +DISTUTILS_OPTIONAL=true +DISTUTILS_SINGLE_IMPL=true +GENTOO_DEPEND_ON_PERL=no +PYTHON_COMPAT=( python2_7 ) +inherit autotools eutils perl-module distutils-r1 flag-o-matic multilib + +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 rrdcgi ruby static-libs tcl tcpd" + +CDEPEND=" + >=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} ) + tcl? ( dev-lang/tcl ) + tcpd? ( sys-apps/tcp-wrappers ) +" + +DEPEND=" + ${CDEPEND} + sys-apps/groff + virtual/pkgconfig + virtual/awk +" +RDEPEND=" + ${CDEPEND} +" +PDEPEND=" + ruby? ( ~dev-ruby/rrdtool-bindings-${PV} ) +" + +S=${WORKDIR}/${P/_/-} + +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 \ + "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-cgi.patch \ + "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch \ + "${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-lua.patch \ + "${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-python.patch + + # bug 456810 + # no time to sleep + sed -i \ + -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \ + -e 's|^sleep 1$||g' \ + -e '/^dnl.*png/s|^dnl||g' \ + configure.ac || die + + # Python bindings are built/installed manually + sed -i \ + -e '/^all-local:/s| @COMP_PYTHON@||' \ + bindings/Makefile.am || die + + echo ${PV} >> VERSION || die + + export rd_cv_gcc_flag__Werror=no + + 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 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[@]} +} + +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 + + dodoc CHANGES CONTRIBUTORS NEWS 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 + + use python && distutils-r1_src_install +} + +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." +} -- 2.26.2