From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Sep 2020 10:22:15 +0100 Subject: gentoo resync : 23.09.2020 --- net-analyzer/rrdtool/Manifest | 9 - .../rrdtool-1.4.9-disable-rrd_graph-cgi.patch | 49 ------ .../rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch | 12 -- ...rdtool-1.5.0_rc1-disable-rrd_graph-python.patch | 38 ----- .../rrdtool/files/rrdtool-1.6.0-configure.ac.patch | 25 --- .../files/rrdtool-1.7.1-rrdcached.socket.patch | 25 --- net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild | 185 -------------------- net-analyzer/rrdtool/rrdtool-1.7.1.ebuild | 188 --------------------- 8 files changed, 531 deletions(-) delete mode 100644 net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-cgi.patch delete mode 100644 net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch delete mode 100644 net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch delete mode 100644 net-analyzer/rrdtool/files/rrdtool-1.6.0-configure.ac.patch delete mode 100644 net-analyzer/rrdtool/files/rrdtool-1.7.1-rrdcached.socket.patch delete mode 100644 net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild delete mode 100644 net-analyzer/rrdtool/rrdtool-1.7.1.ebuild (limited to 'net-analyzer/rrdtool') diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest index bbe2f7acde53..39a41063f5ee 100644 --- a/net-analyzer/rrdtool/Manifest +++ b/net-analyzer/rrdtool/Manifest @@ -1,19 +1,10 @@ AUX rrdcached.confd 150 BLAKE2B 7e3e87c632bde99e2c460828157d281ace8a2f34f5310dc1ca5610625cde80170a8e2d973b1464ff5ee7447e28f4e26386140b80bd0d866acd8445733e1eb4e9 SHA512 93d95057e99c98c943060cfc607285e76ac4580e9955e65ceac69b09577dd6a78b1faa9e6213345a7f011beabebce21c9447b6bd39f4091762d9974cd1a358e0 AUX rrdcached.init 331 BLAKE2B 835f60bd601591667556610f24002dc9cf7cba547d6cff7b5116c742577d97233a704f65dcc55bee26b8717da547a987a1f4b1511433ec559e86932fad9f52b0 SHA512 383cebcc9ad035660def2e465690f52104eac4ac621faeca3f31822f2f2bbd96f23c60fc5bc6382855e971563d7d545cc7abc31fe351c57a8ea716bcd7c95d88 -AUX rrdtool-1.4.9-disable-rrd_graph-cgi.patch 1234 BLAKE2B e393f2af7a2d64c89341a8da1c6c2708e66158e2121340e6c2bb84a9e7eb8bccf6123ccbf13b627f887e8f9c686054291805e77c0bd776cc859b19ef978202b0 SHA512 4ff2a2489abab95f4d2468c7a0e00a069c29d1bd6f69365bb52363ed43179c3c1f7fdbd1684a66c8d5146181e174fe5234e2c6710517cc7cb56bf111e512ff66 AUX rrdtool-1.4.9-disable-rrd_graph-perl.patch 914 BLAKE2B 80b309cf59260a0f137f6550bf867845df25e6be0ac5677517d062aef8240f34db6f721700331d41d73f7aefbbd17f2c13df7ee1f774ff6bf33b6c1790183153 SHA512 6eb8d8a8193ce5bc22a4645e909dc7eb0a911b1f89f6403afc9cffec705929cf64086f415e53b748254a384b83ff8352be82f735ad403795c17a9058bc3e386c -AUX rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch 266 BLAKE2B 54724ef4f5557166b6a1b4e9cab3c6c0270c66347a4e2f1ada4dfcf8501420abfb4febed4645943bc65b6cbe3c6badf15334cb7509e0bff0f1d2c6f552582cfc SHA512 1f981baffdadf8eb11728fba69d2942ef766fd99016d792873acbca44e84950a384396391aa8fc89f1f6f3f3742ae2b25745051c4ae0895e2f6e988a3a5573aa -AUX rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch 1174 BLAKE2B 050342f9f3d6918d6d1247242af531b9cae335410e937bf1af718ac86b1ff9439cd2bb8c7d0a75e20ef8b9e1bc1cda7137d496993d5237b1b92e7cda864c992e SHA512 54a1b35f07260a3b88b2bcb8220ca896b4a45f10a251c4ee492890389384e682c149ce9a31e9b00835dcd5d3e105b90a322c1820108363fc53e15ee0d77267ef AUX rrdtool-1.5.5-rrdrados.pod 1419 BLAKE2B ef1a2438846a60b565c94088d7563480a97e9b77d5ef2173aed3b8f9cd8fba43ff9a553946ca4ee3092512b10dfce6de9a6436cac5aaa62a35c655f7c82520dc SHA512 fd3339862c51c8573dd93079ba70c9b538c4d73d031157fe845bcb59e7233cb5e9fa8cc451e760f8ae30014c975ec9ee04f66d42fc928c621a572b92e9348e4f -AUX rrdtool-1.6.0-configure.ac.patch 537 BLAKE2B c90a5b9e2ef8fcba87947e6091c4de06568e69fb2c990bbf8573ee8902b9782720d9566189bdb3f69346ac5eaa1f0ce8b42c2b7ed57ddb629b2baca981017ab5 SHA512 2cec107823b47646d019182b0c52489d5d00dc287a97aae31844128bd5bf81b91168b56e386d8b59cfefa51f3de3d004ad0b626b8a773d419b9f717b2a723967 AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35362dc31605ab0428be4291afe5bd0a5c9c901bdd85a989cf1dcb33e247a7f79d8b155daf02d512691c38e72b8d2be3691d9733e5dc9 SHA512 5c2d192919e31a91cd600ed0e11346a4cbb1c66f93abbb583f20882d03705972eb4ed3156a9cae9a589aa5d26009037deb280569baf940966887483c6dbefb81 AUX rrdtool-1.7.1-configure.ac.patch 257 BLAKE2B 9aa11b7b0392cb2427d686b888c29b09d8e50b1b0fbedfe0e144eeb27ab6da5a7526633eb8655f1edb129e6a256b102ba095cd9c1aa501aed5e9492073c93b2b SHA512 7c3d175ce94bce24ab244ca899d62d2537392c360ed3ec211b5be2e41fcb6638343f7357db1d3c00fac15104398f83b236ead713e940385b04d61851a3275683 -AUX rrdtool-1.7.1-rrdcached.socket.patch 733 BLAKE2B a9ca7691e1589061e65ed4acd3d404519da6fc984362ae1e37fde523d77ad2d1a1d9c78c5e8d873a40ff701fd9a4b62ce03202ece018f628c98ef59b462c7aef SHA512 7fc84ca7120b4a1e83fefff8c289c6eb78ba5127a80cc6304bec7c7118c6fcd08814fe66ea24267171fa7460effe871b371d2c2d9ae25af1218b73cd761ef6df -DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd -DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3066bb32e981b3254e41c53e29529698da5ef73f8365391180c76d15808d1d727a0834b8025893b01c3b9af8f46 SHA512 ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29 -EBUILD rrdtool-1.6.0-r1.ebuild 4256 BLAKE2B 96efab5cf4cbdd45e5f64bf41bae3de3260dfa2ad0699ae76b2c6f98c3e88369df5173fb465628dceabb4f8bc92216c8bb51955454a8bc25bfadbed8a63e5906 SHA512 08bba445ae1e6a2e91bcdf903647919e645930bf95786d41ae2663acd1b01eb06009a2ba582ac559ccee45686168fcca9c4592e11570e7f17a2ddeb08329523b -EBUILD rrdtool-1.7.1.ebuild 4251 BLAKE2B b422dd13981e28eaecc51396e6726eae4ce205ed2619a9a85035a2afba0729c8dcbb39956d08d5bf2422edeca2e876f05d6ba006d78f3980f10d3d332f3a83f6 SHA512 9c09607dd79f1bf9dd4936a45a1f58e7f2c5d13f0f7ea628ade5180612ed029a036168a05e7d60920e2c324a94d9b6fe283b7a27640c12430876d0ece41497db EBUILD rrdtool-1.7.2-r1.ebuild 4297 BLAKE2B 4dfe4672064347d3eea7f200e9eba19785c10f57c494368cc84dbf61a06a7b1c4248e2c9e839812a72462be2c652baa63da4565afeb67918bd486e7ae6ede58f SHA512 70d1a71a9e47c3dbe68e4a8540b10928a45396d32ac4d862f91633bc4d9951f76022987d82b7f65f7578b5d08b5938e785455841484b5844bc50d81776cd1db5 EBUILD rrdtool-1.7.2.ebuild 4301 BLAKE2B c3f38ec4f106e09339c0c855f7a695f41d22b63e09f92418c0e0f26c8f91d2f29f69ea4ece8fb6bf21c06e3a7f008099329b7a203199db2f08eaa0f2227ab6ac SHA512 e77f816f7b34b8677064f9caa5ccf66041e2ce3d6f665f177ba5389f1c2ef3de1c835054ba5a6630b536cdf9a212a8d6c73286750cf2af78b2a4f8ad2f697658 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23 diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-cgi.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-cgi.patch deleted file mode 100644 index 67f0ce2fb292..000000000000 --- a/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-cgi.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/src/rrd_cgi.c -+++ b/src/rrd_cgi.c -@@ -56,6 +56,7 @@ - const char **); - - /* call rrd_graph and insert appropriate image tag */ -+#ifdef HAVE_RRD_GRAPH - char *drawgraph( - long, - const char **); -@@ -64,6 +65,7 @@ - char *drawprint( - long, - const char **); -+#endif /* HAVE_RRD_GRAPH */ - - /* pretty-print the value for some.rrd via strftime() */ - char *printtimelast( -@@ -542,9 +544,13 @@ - } - parse(&buffer, i, "> 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 - if ! use rados; then - myconf+=( "--disable-librados" ) - 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_test() { - export LC_ALL=C - default -} - -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 -} diff --git a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild deleted file mode 100644 index 748d2b72a576..000000000000 --- a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DISTUTILS_OPTIONAL=true -DISTUTILS_SINGLE_IMPL=true -GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python3_6 ) -inherit autotools perl-module distutils-r1 flag-o-matic multilib - -MY_P=${P/_/-} - -DESCRIPTION="A system to store and display time-series data" -HOMEPAGE="https://oss.oetiker.ch/rrdtool/" -SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/8.0.0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" -IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -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} ) - rados? ( sys-cluster/ceph ) - 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-${PV} ) -" -PATCHES=( - "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch - "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch - "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch - "${FILESDIR}"/${PN}-1.7.1-rrdcached.socket.patch - -) -S=${WORKDIR}/${MY_P} - -python_compile() { - cd bindings/python || die - distutils-r1_python_compile -} - -python_install() { - cd bindings/python || die - distutils-r1_python_install -} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - # At the next version bump, please see if you actually still need this - # before adding versions - if ! [ -f doc/rrdrados.pod ]; then - cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod - else - die "File already exists: doc/rrdrados.pod. Remove this code!" - fi - - # 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 - - if ! use graph; then - sed -i \ - -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \ - -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \ - tests/Makefile.am || die - fi - - 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 - if ! use rados; then - myconf+=( "--disable-librados" ) - 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_test() { - export LC_ALL=C - default -} - -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 -} -- cgit v1.2.3