From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5DC4C138359 for ; Sat, 19 Sep 2020 11:28:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 253DCE07C5; Sat, 19 Sep 2020 11:28:24 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EEE1BE07C5 for ; Sat, 19 Sep 2020 11:28:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD4123410CC for ; Sat, 19 Sep 2020 11:28:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB7FF36F for ; Sat, 19 Sep 2020 11:28:19 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1600514879.3ebd2c514e2817611c6c55daf195feb27fb28ecf.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/rrdtool/files/, net-analyzer/rrdtool/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/rrdtool/Manifest net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-cgi.patch net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch net-analyzer/rrdtool/files/rrdtool-1.6.0-configure.ac.patch net-analyzer/rrdtool/files/rrdtool-1.7.1-rrdcached.socket.patch net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild net-analyzer/rrdtool/rrdtool-1.7.1.ebuild X-VCS-Directories: net-analyzer/rrdtool/files/ net-analyzer/rrdtool/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3ebd2c514e2817611c6c55daf195feb27fb28ecf X-VCS-Branch: master Date: Sat, 19 Sep 2020 11:28:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 67cf899e-3b43-47c7-9037-1179245cbf23 X-Archives-Hash: 3b5e3b8e9b606f55fd3292fd933afbcc commit: 3ebd2c514e2817611c6c55daf195feb27fb28ecf Author: Michał Górny gentoo org> AuthorDate: Sat Sep 19 10:44:26 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Sep 19 11:27:59 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ebd2c51 net-analyzer/rrdtool: Remove old Signed-off-by: Michał Górny gentoo.org> net-analyzer/rrdtool/Manifest | 2 - .../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, 524 deletions(-) diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest index 2dca88add42..d0902d1b33b 100644 --- a/net-analyzer/rrdtool/Manifest +++ b/net-analyzer/rrdtool/Manifest @@ -1,3 +1 @@ -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 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 67f0ce2fb29..00000000000 --- 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 748d2b72a57..00000000000 --- 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 -}