From 40a541508c5fae231add35fd8d7038f5cf495f89 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Sat, 15 Aug 2015 22:18:18 +0100 Subject: net-analyzer/rrdtool: Sync with upstream Package-Manager: portage-2.2.20.1 RepoMan-Options: --force --- net-analyzer/rrdtool/ChangeLog | 6 + net-analyzer/rrdtool/Manifest | 4 +- net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild | 170 +++++++++++++++++++++++++++ net-analyzer/rrdtool/rrdtool-1.4.8.ebuild | 164 -------------------------- 4 files changed, 178 insertions(+), 166 deletions(-) create mode 100644 net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild delete mode 100644 net-analyzer/rrdtool/rrdtool-1.4.8.ebuild (limited to 'net-analyzer/rrdtool') 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 +rrdtool-1.4.8-r1.ebuild, + -rrdtool-1.4.8.ebuild: + net-analyzer/rrdtool: Sync with upstream + 17 Apr 2014; Bertrand Jacquin +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-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild new file mode 100644 index 00000000..f2d50301 --- /dev/null +++ b/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 rrdcgi ruby static-libs tcl tcpd" + +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: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_DEPS} ) + tcl? ( dev-lang/tcl:0= ) + tcpd? ( sys-apps/tcp-wrappers ) +" + +DEPEND=" + ${CDEPEND} + sys-apps/groff + virtual/pkgconfig + virtual/awk +" +RDEPEND=" + ${CDEPEND} +" +PDEPEND=" + ruby? ( dev-ruby/rrdtool-bindings ) +" + +python_compile() { + cd bindings/python || die + distutils-r1_python_compile +} + +python_install() { + cd bindings/python || die + distutils-r1_python_install +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.4.7-configure.ac.patch + + epatch "${FILESDIR}/${PV}-Added-imginfo-format-check.patch" + epatch "${FILESDIR}/${PV}-fix-a-bunch-of-json-syntax-issues-issue-380.patch" + epatch "${FILESDIR}/${PV}-Fix-json-output-when-printing-legend-entries.patch" + epatch "${FILESDIR}/${PV}-Fix-json-output-when-printing-infinity-values.patch" + epatch "${FILESDIR}/${PV}-Add-prototype-for-bad_format_imginfo.patch" + epatch "${FILESDIR}/${PV}-Allow-empty-imginfo-string-format.patch" + epatch "${FILESDIR}/${PV}-Add-support-for-MINNAN-and-MAXNAN-operators.patch" + + # bug 281694 + # 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 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 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 + + 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." +} 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 e6e38f54..00000000 --- a/net-analyzer/rrdtool/rrdtool-1.4.8.ebuild +++ /dev/null @@ -1,164 +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.10 2014/03/24 14:29:15 ago 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} - 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 - - epatch "${FILESDIR}/${PV}-Added-imginfo-format-check.patch" - epatch "${FILESDIR}/${PV}-fix-a-bunch-of-json-syntax-issues-issue-380.patch" - epatch "${FILESDIR}/${PV}-Fix-json-output-when-printing-legend-entries.patch" - epatch "${FILESDIR}/${PV}-Fix-json-output-when-printing-infinity-values.patch" - epatch "${FILESDIR}/${PV}-Add-prototype-for-bad_format_imginfo.patch" - epatch "${FILESDIR}/${PV}-Allow-empty-imginfo-string-format.patch" - epatch "${FILESDIR}/${PV}-Add-support-for-MINNAN-and-MAXNAN-operators.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." -} -- cgit v1.2.3