gentoo resync : 22.12.2021

4 files changed, 90 insertions, 11 deletions

diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 8314bb4ca72f..f590cbf33c6c 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,7 +1,10 @@
 AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb07ae371a25b4951728f129df617096f9c62203643cf2c42008e534c7ce0d51fa0a14e8e24a595d2e5dabbfc2badf5dda97 SHA512 4eadde6b71eb20df4baf42241e7ec9b4e99af6d5f2023ea044ec27c379a8e7c4d3accced97091764ce1c946e30eebafb18c7f598be280e9b6b0b255c27f4ef57
+AUX cacti-spine-1.2.19-configure.ac-fix-bashisms.patch 1136 BLAKE2B 46b16d88fcc1114cba48481eebbb435b5f9073ff016601ee6ed4924ace282bad023d92083245df63aa770b9b3dab9475b7fd3ebb1afde5f32f4c060d766304b5 SHA512 a0c1e09a933f97dedc6c02e07433a9f28b2c407548e340e0c3cc65943df2ab6dffbb6a0258ba22977033b0b79bf9747f938da76b2b87c8e70cce635270d4135a
 DIST cacti-spine-1.2.16.tar.gz 108252 BLAKE2B ba0349cff7f4e82a5dc1d90c216cf7a4e0f939e28ab20d008b1725c948a85a00e2594f8997c8bbd69c305e3e58d944858c8439210956f45220b67229bc6df13d SHA512 0259084d70f9c8d20a8b19daf61e525228f99fba3eac4e2e5c9865114a5f1231b18389ca955fc4644c71c6c48cc45dda9b17e969a02c80552b84f98ad8945951
 DIST cacti-spine-1.2.17.tar.gz 110371 BLAKE2B 1f9605d34fcff0e4e7921ccbb5a22eeb9e2f2e2f22cf56189790dcdec798db5bff681df11cd82006254cc270174248c07ce3d94dca8d3367add6b220f1599adf SHA512 4c616af041d2f08e18fd274409c98d3efce84b7cca2d6e23db3d6c2a0d4c9a77a2c52c0ef8e0ed0c6ad409f28b56fdf3160e27654522d8aeb1b88e3cb4128d4a
+DIST cacti-spine-1.2.19.tar.gz 113974 BLAKE2B 6ec71e1480e9dfd2636c61bcea10c6581009908334fddbaab5cf4bf6948bc6f8ffb27b0325ab1f325b9ad0b0f2ba7e018373c34534ca5d4967f66100fba76934 SHA512 407a4e83aabaa62693c2f7c3d3952da9178bb28e2b8b914a5649e3eaccb9ea77d0c7db8e251a113a308bfaaa0674be941abfb2fc4f8e50d43fb73c8cd9deec63
 EBUILD cacti-spine-1.2.16.ebuild 812 BLAKE2B 9d463bf6b62d3c1e0af474a29a13b64704b4216b282ea9b0c20136d42222d25d70dd35b193e6c29943f3037fdf22b9a64ca924de9f42854df58d73e171b8750f SHA512 1acbe3686e387bbeebadbc804fcbb75d1a9e05db5e51dfdcc46a46b30707e1adcf9eb0be67e169dc9666404abe38bf32d244b6be9135208f7947c1623454761b
 EBUILD cacti-spine-1.2.17.ebuild 812 BLAKE2B 9d463bf6b62d3c1e0af474a29a13b64704b4216b282ea9b0c20136d42222d25d70dd35b193e6c29943f3037fdf22b9a64ca924de9f42854df58d73e171b8750f SHA512 1acbe3686e387bbeebadbc804fcbb75d1a9e05db5e51dfdcc46a46b30707e1adcf9eb0be67e169dc9666404abe38bf32d244b6be9135208f7947c1623454761b
-EBUILD cacti-spine-99999.ebuild 763 BLAKE2B 5fa057bba01f62088350268e440768f9275c50606a3948dd00c5189a8aa801c0abc3bff41785dc829e3b1fa1313c53f1c42173595ee7bd33a01620fff6cd9e34 SHA512 1068671693e9aba8adb9d9264557985f914a6c557e2f6a5aa5412d02cfc11a1464a21efc6aa6dd35b6bbfca4a20612daa91e51f03dc69bbdb3c550f564a36683
+EBUILD cacti-spine-1.2.19.ebuild 872 BLAKE2B c9f52dec0abd1d85cc49bcb8d02622fc06e335755016cfb8ad1b4bead3215192618cd6240e520cb63c27b0451b60ce11954ace1e6f31395222a219766e53ffc7 SHA512 afab552e38810e6bdb5dfab30c6361edd11a872094fc3a81b31b63482ed95e6c5ac757da4886cad2c61c15e1a25f788550cfb0a85ffaccc829a1e5b8471d0215
+EBUILD cacti-spine-9999.ebuild 745 BLAKE2B b125a5cf26b9b1d4aef143f8ed5a43caec47bd2ab81bd043c1ee297840020ee5016bdbad16a8e7c32615d0a82edfeccf441d89e727f6f6e2d86a8bf1c0036849 SHA512 af8e206e1d5cb0036c6b6d9d7e02b4003dd19c5a322e40e6728b43fd7a0ddd5e67202c9946abeadc06e0bf1174faf66795a9162b4412290dc7dae2ce7a6dcd46
 MISC metadata.xml 805 BLAKE2B b841b3ffc9585c51e7ebbcebc0847dbc0aa7f38e4005f34d7aab206501925c96e0d3797c678928503f69f30e82f6f3f9e5f7b100b206af9eb1d116da2133c97b SHA512 1d03529f32f001e726654c60c4199d33b01e943359e6bc9bbb71ff3429d620f5c07bb028816a103ca65575276293bbd56d2dd4c0867af702bf9d391a82ea3d0f
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild
new file mode 100644
index 000000000000..d70a52735b10
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="https://cacti.net/spine_info.php"
+SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+BDEPEND="sys-apps/help2man"
+DEPEND="dev-libs/openssl:=
+	net-analyzer/net-snmp:=
+	dev-db/mysql-connector-c:0="
+RDEPEND="
+	${DEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
+	"${FILESDIR}"/${PN}-1.2.19-configure.ac-fix-bashisms.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	dosbin spine
+
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+
+	doman spine.1
+	dodoc CHANGELOG
+}
diff --git a/net-analyzer/cacti-spine/cacti-spine-99999.ebuild b/net-analyzer/cacti-spine/cacti-spine-9999.ebuild
index d929a4df7fcb..cfc27aa3907f 100644
--- a/net-analyzer/cacti-spine/cacti-spine-99999.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools git-r3
 
@@ -13,18 +13,13 @@ EGIT_REPO_URI="https://github.com/Cacti/spine"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
 
 BDEPEND="sys-apps/help2man"
-DEPEND="
-	dev-libs/openssl:0=
+DEPEND="dev-libs/openssl:=
 	net-analyzer/net-snmp:=
-	dev-db/mysql-connector-c:0=
-"
-RDEPEND="
-	${DEPEND}
-	>net-analyzer/cacti-0.8.8
-"
+	dev-db/mysql-connector-c:0="
+RDEPEND="${DEPEND}
+	>net-analyzer/cacti-0.8.8"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
@@ -32,6 +27,7 @@ PATCHES=(
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-1.2.19-configure.ac-fix-bashisms.patch b/net-analyzer/cacti-spine/files/cacti-spine-1.2.19-configure.ac-fix-bashisms.patch
new file mode 100644
index 000000000000..53a220fbf0de
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-1.2.19-configure.ac-fix-bashisms.patch
@@ -0,0 +1,33 @@
+https://github.com/Cacti/spine/pull/245
+
+From: Sam James <sam@gentoo.org>
+Date: Fri, 10 Dec 2021 03:42:21 +0000
+Subject: [PATCH] configure.ac: fix bashisms
+
+configure needs to work with a POSIX-compliant shell so we need
+to avoid bashisms like '=='. This fixes configure with e.g. /bin/sh
+provided by dash.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -260,7 +260,7 @@ fi
+   CFLAGS="-I$MYSQL_INC_DIR $CFLAGS"
+ 
+ unamestr=$(uname)
+-if test $unamestr == 'OpenBSD'; then
++if test $unamestr = 'OpenBSD'; then
+   AC_CHECK_LIB(mysqlclient, mysql_init,
+     [ LIBS="-lmysqlclient -lm $LIBS"
+       AC_DEFINE(HAVE_MYSQL, 1, MySQL Client API)
+@@ -285,8 +285,8 @@ else
+     if test -f $MYSQL_LIB_DIR/libmysqlclient_r.a -o -f $MYSQL_LIB_DIR/libmysqlclient_r.$ShLib ; then
+       LIBS="-lmysqlclient_r -lm -ldl $LIBS"
+     else
+-      if test "$HAVE_MYSQL" == "yes"; then
+-        if test $unamestr == 'OpenBSD'; then
++      if test "$HAVE_MYSQL" = "yes"; then
++        if test $unamestr = 'OpenBSD'; then
+           LIBS="-lmysqlclient -lm $LIBS"
+         else
+           LIBS="-lmysqlclient -lm -ldl $LIBS"