public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/cacti-spine/, net-analyzer/cacti-spine/files/
@ 2016-02-24  6:00 Jeroen Roovers
  0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2016-02-24  6:00 UTC (permalink / raw
  To: gentoo-commits

commit:     636198c593fc9532c6a4ac3bbdcc66cb65625988
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 06:00:28 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 06:00:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=636198c5

net-analyzer/cacti-spine: Version bump.

Package-Manager: portage-2.2.27

 net-analyzer/cacti-spine/Manifest                  |  1 +
 net-analyzer/cacti-spine/cacti-spine-0.8.8g.ebuild | 50 ++++++++++++++++++++++
 .../files/cacti-spine-0.8.8g-fix-ac-macro.patch    | 11 +++++
 .../files/cacti-spine-0.8.8g-net-snmp.patch        | 19 ++++++++
 .../files/cacti-spine-0.8.8g-parallel-make.patch   |  9 ++++
 5 files changed, 90 insertions(+)

diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index f93518e..6024bed 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,2 +1,3 @@
 DIST cacti-spine-0.8.8e.tar.gz 757042 SHA256 e014488acffd4dd3a88306c3809e93a89c8538a050c2a58a9666e4c04c004b92 SHA512 165e93d4cce3378e911aec41fcd68fb541d82d849ebf3e2e28e0ddb65027ff2eb77d488acbaa133244091cd02adb58d8f74ea5abc36abed07af9ea72bc104f40 WHIRLPOOL 59442f54fbb8956a945404f374eba848bc21b60d53dacb025132a91dc077115aa65ee30959ba81fb521beb9732c1c5944adb1c555a36ad6ea72898172404970c
 DIST cacti-spine-0.8.8f.tar.gz 757078 SHA256 d0599239187f2f5a29f82b809e6941447f18bb7b170cd42e67455633b195e3c7 SHA512 8c5e1713bb1d41227cef6047e5348ef33b90b5591976cf24390abbf1e5c68de6714f785d9517ca9aed21b42b6b8772512af176b9f62bf18d6d74d949a6359a22 WHIRLPOOL 70545057f80d5cc5940059179bc3b72eabf48ff61c5eed5b0b344e995eb1411e3a89359e8c0b6bc3850b029233597d581ece59a99c6653ac7cfd028ef2e24232
+DIST cacti-spine-0.8.8g.tar.gz 805321 SHA256 f7d60d5663f6fe8f730363763f31d110589c725e482c943f0f8287359a6db533 SHA512 24d208b4779e5d04e0206e950c0d49d0453937b3da4a3e3bdbb1a075bdf22db3c6bb6789bab92f6c22a67c39745a36fc98cb28371423469b87a5936b3afb3ba3 WHIRLPOOL d1106b59748ac166c0b44ffdad285c3efefb03fec98318704e16022bf788168603884ee1b4bd22d9ef5fb962c5a60bfda241c6675b987fe9c02c7c4068213ad2

diff --git a/net-analyzer/cacti-spine/cacti-spine-0.8.8g.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.8g.ebuild
new file mode 100644
index 0000000..75f9d64
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-0.8.8g.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="http://cacti.net/spine_info.php"
+SRC_URI="http://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+CDEPEND="
+	dev-libs/openssl:*
+	net-analyzer/net-snmp
+	virtual/mysql
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/help2man
+"
+RDEPEND="
+	${CDEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.8.8g-fix-ac-macro.patch \
+		"${FILESDIR}"/${PN}-0.8.8d-mysql.patch \
+		"${FILESDIR}"/${PN}-0.8.8d-ping.patch \
+		"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch \
+		"${FILESDIR}"/${PN}-0.8.8g-parallel-make.patch
+
+	sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
+	AT_M4DIR="config" eautoreconf
+}
+
+src_install() {
+	dosbin spine
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+	dodoc ChangeLog README
+}

diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-fix-ac-macro.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-fix-ac-macro.patch
new file mode 100644
index 0000000..fa12f1e
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-fix-ac-macro.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,7 +10,7 @@
+ AC_LANG(C)
+ 
+ AM_INIT_AUTOMAKE(spine, 0.8.8g)
+-AM_CONFIG_HEADER(config/config.h)
++AC_CONFIG_HEADERS(config/config.h)
+ 
+ # static libraries
+ AC_ARG_WITH(static,

diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-net-snmp.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-net-snmp.patch
new file mode 100644
index 0000000..5ee62e2
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-net-snmp.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -251,14 +251,14 @@
+ 
+ # Net-SNMP includes v3 support and insists on crypto unless compiled --without-openssl
+ AC_MSG_CHECKING([if Net-SNMP needs crypto support])
+-AC_TRY_COMPILE([#include <net-snmp-config.h>], [exit(NETSNMP_USE_OPENSSL != 1);],
++AC_TRY_COMPILE([#include <net-snmp/net-snmp-config.h>], [exit(NETSNMP_USE_OPENSSL != 1);],
+   [  AC_MSG_RESULT(yes)
+      SNMP_SSL=yes
+   ],
+   AC_MSG_RESULT(no)
+ )
+ 
+-AC_TRY_COMPILE([ #include <net-snmp-config.h> 
++AC_TRY_COMPILE([ #include <net-snmp/net-snmp-config.h> 
+   #include <net-snmp/utilities.h>
+   #include <net-snmp/net-snmp-includes.h>
+   #include <net-snmp/config_api.h>

diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-parallel-make.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-parallel-make.patch
new file mode 100644
index 0000000..e7983ed
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-parallel-make.patch
@@ -0,0 +1,9 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -9,5 +9,5 @@
+ 
+ man_MANS = spine.1
+ 
+-spine.1: spine.c 
++spine.1: $(sbin_PROGRAMS)
+ 	$(HELP2MAN) --output=$@ --name='Data Collector for Cacti' --no-info --version-option='--version' ./spine


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/cacti-spine/, net-analyzer/cacti-spine/files/
@ 2016-05-14  9:50 Jeroen Roovers
  0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2016-05-14  9:50 UTC (permalink / raw
  To: gentoo-commits

commit:     51f099dea447885715a6647829b77b17b67609c1
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 09:48:23 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat May 14 09:50:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51f099de

net-analyzer/cacti-spine: Version bump (bug #582996).

Package-Manager: portage-2.2.28

 net-analyzer/cacti-spine/Manifest                  |  1 +
 net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild | 49 ++++++++++++++++++++++
 .../files/cacti-spine-0.8.8h-fix-ac-macro.patch    | 11 +++++
 3 files changed, 61 insertions(+)

diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 6024bed..66db427 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,3 +1,4 @@
 DIST cacti-spine-0.8.8e.tar.gz 757042 SHA256 e014488acffd4dd3a88306c3809e93a89c8538a050c2a58a9666e4c04c004b92 SHA512 165e93d4cce3378e911aec41fcd68fb541d82d849ebf3e2e28e0ddb65027ff2eb77d488acbaa133244091cd02adb58d8f74ea5abc36abed07af9ea72bc104f40 WHIRLPOOL 59442f54fbb8956a945404f374eba848bc21b60d53dacb025132a91dc077115aa65ee30959ba81fb521beb9732c1c5944adb1c555a36ad6ea72898172404970c
 DIST cacti-spine-0.8.8f.tar.gz 757078 SHA256 d0599239187f2f5a29f82b809e6941447f18bb7b170cd42e67455633b195e3c7 SHA512 8c5e1713bb1d41227cef6047e5348ef33b90b5591976cf24390abbf1e5c68de6714f785d9517ca9aed21b42b6b8772512af176b9f62bf18d6d74d949a6359a22 WHIRLPOOL 70545057f80d5cc5940059179bc3b72eabf48ff61c5eed5b0b344e995eb1411e3a89359e8c0b6bc3850b029233597d581ece59a99c6653ac7cfd028ef2e24232
 DIST cacti-spine-0.8.8g.tar.gz 805321 SHA256 f7d60d5663f6fe8f730363763f31d110589c725e482c943f0f8287359a6db533 SHA512 24d208b4779e5d04e0206e950c0d49d0453937b3da4a3e3bdbb1a075bdf22db3c6bb6789bab92f6c22a67c39745a36fc98cb28371423469b87a5936b3afb3ba3 WHIRLPOOL d1106b59748ac166c0b44ffdad285c3efefb03fec98318704e16022bf788168603884ee1b4bd22d9ef5fb962c5a60bfda241c6675b987fe9c02c7c4068213ad2
+DIST cacti-spine-0.8.8h.tar.gz 804951 SHA256 a693136839bd7d03cae5b3ff4614a4d21a2153ffb14d09fc061b843ab0b2bb30 SHA512 6a7147ab645be44de0d330c7801e569705817da10bf6cedba82c712e1701ada8aa8924a6b3b063ea680e6af24f815d6767e8773ad7b8da212abfa082b4211bd4 WHIRLPOOL 36daed4986ca84883e51ab6b02ebb2ade00205c30705cfc94e73835bc2fc427a60a2dba9c7ca3665d0c0b2fca21afab77d94cde63b740f3734f9279c929cccaf

diff --git a/net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild
new file mode 100644
index 0000000..9ff9158
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="http://cacti.net/spine_info.php"
+SRC_URI="http://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+CDEPEND="
+	dev-libs/openssl:*
+	net-analyzer/net-snmp
+	virtual/mysql
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/help2man
+"
+RDEPEND="
+	${CDEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.8.8h-fix-ac-macro.patch \
+		"${FILESDIR}"/${PN}-0.8.8d-mysql.patch \
+		"${FILESDIR}"/${PN}-0.8.8d-ping.patch \
+		"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
+
+	sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
+	AT_M4DIR="config" eautoreconf
+}
+
+src_install() {
+	dosbin spine
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+	dodoc ChangeLog README
+}

diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8h-fix-ac-macro.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8h-fix-ac-macro.patch
new file mode 100644
index 0000000..3f497ac
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8h-fix-ac-macro.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,7 +10,7 @@
+ AC_LANG(C)
+ 
+ AM_INIT_AUTOMAKE(spine, 0.8.8h)
+-AM_CONFIG_HEADER(config/config.h)
++AC_CONFIG_HEADERS(config/config.h)
+ 
+ # static libraries
+ AC_ARG_WITH(static,


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/cacti-spine/, net-analyzer/cacti-spine/files/
@ 2016-05-20  8:27 Jeroen Roovers
  0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2016-05-20  8:27 UTC (permalink / raw
  To: gentoo-commits

commit:     06fef0047240e6b5408bca129fe9210553ae5f88
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 08:26:48 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri May 20 08:27:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06fef004

net-analyzer/cacti-spine: Old.

Package-Manager: portage-2.3.0_rc1

 net-analyzer/cacti-spine/Manifest                  |  2 -
 net-analyzer/cacti-spine/cacti-spine-0.8.8f.ebuild | 46 --------------------
 net-analyzer/cacti-spine/cacti-spine-0.8.8g.ebuild | 50 ----------------------
 .../files/cacti-spine-0.8.8f-fix-ac-macro.patch    | 11 -----
 .../files/cacti-spine-0.8.8g-fix-ac-macro.patch    | 11 -----
 .../files/cacti-spine-0.8.8g-parallel-make.patch   |  9 ----
 6 files changed, 129 deletions(-)

diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 66db427..2dcb67b 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,4 +1,2 @@
 DIST cacti-spine-0.8.8e.tar.gz 757042 SHA256 e014488acffd4dd3a88306c3809e93a89c8538a050c2a58a9666e4c04c004b92 SHA512 165e93d4cce3378e911aec41fcd68fb541d82d849ebf3e2e28e0ddb65027ff2eb77d488acbaa133244091cd02adb58d8f74ea5abc36abed07af9ea72bc104f40 WHIRLPOOL 59442f54fbb8956a945404f374eba848bc21b60d53dacb025132a91dc077115aa65ee30959ba81fb521beb9732c1c5944adb1c555a36ad6ea72898172404970c
-DIST cacti-spine-0.8.8f.tar.gz 757078 SHA256 d0599239187f2f5a29f82b809e6941447f18bb7b170cd42e67455633b195e3c7 SHA512 8c5e1713bb1d41227cef6047e5348ef33b90b5591976cf24390abbf1e5c68de6714f785d9517ca9aed21b42b6b8772512af176b9f62bf18d6d74d949a6359a22 WHIRLPOOL 70545057f80d5cc5940059179bc3b72eabf48ff61c5eed5b0b344e995eb1411e3a89359e8c0b6bc3850b029233597d581ece59a99c6653ac7cfd028ef2e24232
-DIST cacti-spine-0.8.8g.tar.gz 805321 SHA256 f7d60d5663f6fe8f730363763f31d110589c725e482c943f0f8287359a6db533 SHA512 24d208b4779e5d04e0206e950c0d49d0453937b3da4a3e3bdbb1a075bdf22db3c6bb6789bab92f6c22a67c39745a36fc98cb28371423469b87a5936b3afb3ba3 WHIRLPOOL d1106b59748ac166c0b44ffdad285c3efefb03fec98318704e16022bf788168603884ee1b4bd22d9ef5fb962c5a60bfda241c6675b987fe9c02c7c4068213ad2
 DIST cacti-spine-0.8.8h.tar.gz 804951 SHA256 a693136839bd7d03cae5b3ff4614a4d21a2153ffb14d09fc061b843ab0b2bb30 SHA512 6a7147ab645be44de0d330c7801e569705817da10bf6cedba82c712e1701ada8aa8924a6b3b063ea680e6af24f815d6767e8773ad7b8da212abfa082b4211bd4 WHIRLPOOL 36daed4986ca84883e51ab6b02ebb2ade00205c30705cfc94e73835bc2fc427a60a2dba9c7ca3665d0c0b2fca21afab77d94cde63b740f3734f9279c929cccaf

diff --git a/net-analyzer/cacti-spine/cacti-spine-0.8.8f.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.8f.ebuild
deleted file mode 100644
index 81e07ff..0000000
--- a/net-analyzer/cacti-spine/cacti-spine-0.8.8f.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-MY_P=${PN}-${PV/_p/-}
-
-DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
-HOMEPAGE="http://cacti.net/spine_info.php"
-SRC_URI="http://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="
-	dev-libs/openssl:*
-	net-analyzer/net-snmp
-	virtual/mysql
-"
-RDEPEND="
-	${DEPEND}
-	>net-analyzer/cacti-0.8.8
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.8.8f-fix-ac-macro.patch \
-		"${FILESDIR}"/${PN}-0.8.8e-net-snmp.patch \
-		"${FILESDIR}"/${PN}-0.8.8d-mysql.patch \
-		"${FILESDIR}"/${PN}-0.8.8d-ping.patch \
-		"${FILESDIR}"/${PN}-0.8.8d-snmp_spine_close.patch
-
-	sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
-	AT_M4DIR="config" eautoreconf
-}
-
-src_install() {
-	dosbin spine
-	insinto /etc/
-	insopts -m0640 -o root
-	newins spine.conf{.dist,}
-	dodoc ChangeLog README
-}

diff --git a/net-analyzer/cacti-spine/cacti-spine-0.8.8g.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.8g.ebuild
deleted file mode 100644
index 75f9d64..0000000
--- a/net-analyzer/cacti-spine/cacti-spine-0.8.8g.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-MY_P=${PN}-${PV/_p/-}
-
-DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
-HOMEPAGE="http://cacti.net/spine_info.php"
-SRC_URI="http://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-CDEPEND="
-	dev-libs/openssl:*
-	net-analyzer/net-snmp
-	virtual/mysql
-"
-DEPEND="
-	${CDEPEND}
-	sys-apps/help2man
-"
-RDEPEND="
-	${CDEPEND}
-	>net-analyzer/cacti-0.8.8
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.8.8g-fix-ac-macro.patch \
-		"${FILESDIR}"/${PN}-0.8.8d-mysql.patch \
-		"${FILESDIR}"/${PN}-0.8.8d-ping.patch \
-		"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch \
-		"${FILESDIR}"/${PN}-0.8.8g-parallel-make.patch
-
-	sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
-	AT_M4DIR="config" eautoreconf
-}
-
-src_install() {
-	dosbin spine
-	insinto /etc/
-	insopts -m0640 -o root
-	newins spine.conf{.dist,}
-	dodoc ChangeLog README
-}

diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8f-fix-ac-macro.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8f-fix-ac-macro.patch
deleted file mode 100644
index a879d5e..0000000
--- a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8f-fix-ac-macro.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -10,7 +10,7 @@
- AC_LANG(C)
- 
- AM_INIT_AUTOMAKE(spine, 0.8.8f)
--AM_CONFIG_HEADER(config/config.h)
-+AC_CONFIG_HEADERS(config/config.h)
- 
- # static libraries
- AC_ARG_WITH(static,

diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-fix-ac-macro.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-fix-ac-macro.patch
deleted file mode 100644
index fa12f1e..0000000
--- a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-fix-ac-macro.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -10,7 +10,7 @@
- AC_LANG(C)
- 
- AM_INIT_AUTOMAKE(spine, 0.8.8g)
--AM_CONFIG_HEADER(config/config.h)
-+AC_CONFIG_HEADERS(config/config.h)
- 
- # static libraries
- AC_ARG_WITH(static,

diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-parallel-make.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-parallel-make.patch
deleted file mode 100644
index e7983ed..0000000
--- a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-parallel-make.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -9,5 +9,5 @@
- 
- man_MANS = spine.1
- 
--spine.1: spine.c 
-+spine.1: $(sbin_PROGRAMS)
- 	$(HELP2MAN) --output=$@ --name='Data Collector for Cacti' --no-info --version-option='--version' ./spine


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/cacti-spine/, net-analyzer/cacti-spine/files/
@ 2017-02-03 19:21 Jeroen Roovers
  0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2017-02-03 19:21 UTC (permalink / raw
  To: gentoo-commits

commit:     1040e3744323f8f0ed2b5001a206271bbfe9c274
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  3 19:21:31 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Feb  3 19:21:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1040e374

net-analyzer/cacti-spine: Version bump.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-analyzer/cacti-spine/Manifest                  |  1 +
 net-analyzer/cacti-spine/cacti-spine-1.0.0.ebuild  | 50 ++++++++++++++++++++++
 .../files/cacti-spine-1.0.0-help2man.patch         |  9 ++++
 3 files changed, 60 insertions(+)

diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index a2f365d..03adbcd 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1 +1,2 @@
 DIST cacti-spine-0.8.8h.tar.gz 804951 SHA256 a693136839bd7d03cae5b3ff4614a4d21a2153ffb14d09fc061b843ab0b2bb30 SHA512 6a7147ab645be44de0d330c7801e569705817da10bf6cedba82c712e1701ada8aa8924a6b3b063ea680e6af24f815d6767e8773ad7b8da212abfa082b4211bd4 WHIRLPOOL 36daed4986ca84883e51ab6b02ebb2ade00205c30705cfc94e73835bc2fc427a60a2dba9c7ca3665d0c0b2fca21afab77d94cde63b740f3734f9279c929cccaf
+DIST cacti-spine-1.0.0.tar.gz 800770 SHA256 074528eec16e8a49d535ce96d2347bd2a891a56722b261d744225d9f90b6382f SHA512 458b0050ceff3a9e2d31c54c177d75f8d36ff521204d5f7b52a5fb9ff6082c25ef98f46d80dc6c79816e5a977f5b61decac03b625728fc9dc654170e3ce3e87f WHIRLPOOL 3c24d028606ab382ea61feeecda141c96d6b2a588247656285bbb832e309d1e6acd086a8464c9083cc19c777fcd0e15bff53aad417d8889e3b08a85aa38b5be1

diff --git a/net-analyzer/cacti-spine/cacti-spine-1.0.0.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.0.0.ebuild
new file mode 100644
index 00000000..a0b1283
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-1.0.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="http://cacti.net/spine_info.php"
+SRC_URI="http://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+CDEPEND="
+	dev-libs/openssl:*
+	net-analyzer/net-snmp
+	virtual/mysql
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/help2man
+"
+RDEPEND="
+	${CDEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
+	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
+	"${FILESDIR}"/${PN}-1.0.0-help2man.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
+	AT_M4DIR="config" eautoreconf
+}
+
+src_install() {
+	dosbin spine
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+	dodoc ChangeLog
+}

diff --git a/net-analyzer/cacti-spine/files/cacti-spine-1.0.0-help2man.patch b/net-analyzer/cacti-spine/files/cacti-spine-1.0.0-help2man.patch
new file mode 100644
index 00000000..7b83fef
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-1.0.0-help2man.patch
@@ -0,0 +1,9 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,5 +11,5 @@
+ 
+ man_MANS = spine.1
+ 
+-spine.1: spine.c 
++spine.1: spine
+ 	$(HELP2MAN) --output=$@ --name='Data Collector for Cacti' --no-info --version-option='--version' ./spine


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/cacti-spine/, net-analyzer/cacti-spine/files/
@ 2017-12-06  9:52 Jeroen Roovers
  0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2017-12-06  9:52 UTC (permalink / raw
  To: gentoo-commits

commit:     3da2743a66714334238d44f2f32532b2c3623a43
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  6 09:51:22 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Dec  6 09:51:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3da2743a

net-analyzer/cacti-spine: Old.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 net-analyzer/cacti-spine/Manifest                  |  2 -
 net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild | 48 ----------------------
 net-analyzer/cacti-spine/cacti-spine-1.1.25.ebuild | 47 ---------------------
 .../files/cacti-spine-0.8.8d-mysql.patch           | 11 -----
 .../files/cacti-spine-0.8.8h-fix-ac-macro.patch    | 11 -----
 5 files changed, 119 deletions(-)

diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 138d0deef29..c09d761e192 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,5 +1,3 @@
-DIST cacti-spine-0.8.8h.tar.gz 804951 BLAKE2B 3318f278a1f6f897e39c75af02c733cba753e524bda1f401b3b9d22dba183499dde392be090debd97747520ebcdd89f5d43768c172784a9acc7c8f29fca68fa2 SHA512 6a7147ab645be44de0d330c7801e569705817da10bf6cedba82c712e1701ada8aa8924a6b3b063ea680e6af24f815d6767e8773ad7b8da212abfa082b4211bd4
 DIST cacti-spine-1.1.20.tar.gz 801877 BLAKE2B 35da513691967e507b9d10c373de571e2ef84aa20021d1bcfb2bc446a99fbbd2c68ebcd99dc47bece4387faa6596a7b109d8a61f02a3b2413cb89bfbcaa22e89 SHA512 df552157e64da04f57493351831a0602dea9ca3219ce3936884aec894e6698559d429ec62936a307b43fd49eff674c670d7e0a047924b5f03c30abeeec91491f
 DIST cacti-spine-1.1.21.tar.gz 801907 BLAKE2B cdcda765d349db12df1c672c4469770297d09a3946f19f1e686c251ef30d5be1e3f772efeeb3f344b21ecdba29275dde1b683025ae7c16b10561486397a484f3 SHA512 0dfdd3444639a471bc5c0d35ea3898532f2ebf16679677fee8ad291221ed607b54acc7fbf25e78da7c5597eeaed6b870ad7af66a95e20f95afce3270c8da5dd0
-DIST cacti-spine-1.1.25.tar.gz 802127 BLAKE2B 02e23ca007ce3bcf3b651c1691ea22e53fcc4113b364d5440bbe2919b1549e36915b9fd927291a0ed84850552a2e97ff4f3c71b713727f3859c43bf123c20c86 SHA512 d9c4a924ce08d363a1ce7327172b6c83d606ccfb2b623b3b5a0f6df534a031caedbe55314cd415a58484c89df49d5e682853e5001849bd8e9767190fdc367809
 DIST cacti-spine-1.1.28.tar.gz 802006 BLAKE2B 79e833b6afb619a1d2361bad38c3a52dc1e29b296864670f830a3bc998e7e456638523da15032751d56c65aefe0480477e70b741b23882a2a38adb2262aef601 SHA512 2255823d29342b49babebbae175c29fc7054b05ec5ae5897609960d808409f46e6d0cfcba2038dfad9598bc23532794f6cf26032a0566d2d2d2c57d622d37ab1

diff --git a/net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild
deleted file mode 100644
index c7738d6dba9..00000000000
--- a/net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-MY_P=${PN}-${PV/_p/-}
-
-DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
-HOMEPAGE="http://cacti.net/spine_info.php"
-SRC_URI="http://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~ppc64 sparc x86"
-
-CDEPEND="
-	dev-libs/openssl:*
-	net-analyzer/net-snmp
-	virtual/mysql
-"
-DEPEND="
-	${CDEPEND}
-	sys-apps/help2man
-"
-RDEPEND="
-	${CDEPEND}
-	>net-analyzer/cacti-0.8.8
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.8.8h-fix-ac-macro.patch \
-		"${FILESDIR}"/${PN}-0.8.8d-mysql.patch \
-		"${FILESDIR}"/${PN}-0.8.8d-ping.patch \
-		"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
-
-	sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
-	AT_M4DIR="config" eautoreconf
-}
-
-src_install() {
-	dosbin spine
-	insinto /etc/
-	insopts -m0640 -o root
-	newins spine.conf{.dist,}
-	dodoc ChangeLog README
-}

diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.25.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.25.ebuild
deleted file mode 100644
index d148f4544d0..00000000000
--- a/net-analyzer/cacti-spine/cacti-spine-1.1.25.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-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"
-
-CDEPEND="
-	dev-libs/openssl:*
-	net-analyzer/net-snmp
-	virtual/mysql
-"
-DEPEND="
-	${CDEPEND}
-	sys-apps/help2man
-"
-RDEPEND="
-	${CDEPEND}
-	>net-analyzer/cacti-0.8.8
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
-	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
-)
-
-src_prepare() {
-	default
-
-	AT_M4DIR="config" eautoreconf
-}
-
-src_install() {
-	dosbin spine
-	insinto /etc/
-	insopts -m0640 -o root
-	newins spine.conf{.dist,}
-	dodoc ChangeLog
-}

diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-mysql.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-mysql.patch
deleted file mode 100644
index d60653678a2..00000000000
--- a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-mysql.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -239,7 +239,7 @@
- fi
- CFLAGS="-I$MYSQL_INC_DIR $CFLAGS"
- 
--AC_CHECK_LIB(mysqlclient_r,mysql_init, LIBS="-lmysqlclient_r",
-+AC_CHECK_LIB(mysqlclient_r,mysql_init, LIBS="$LIBS -lmysqlclient_r",
-   AC_MSG_ERROR([MySQL libraries not found])
- )
- 

diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8h-fix-ac-macro.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8h-fix-ac-macro.patch
deleted file mode 100644
index 3f497ac7bce..00000000000
--- a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8h-fix-ac-macro.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -10,7 +10,7 @@
- AC_LANG(C)
- 
- AM_INIT_AUTOMAKE(spine, 0.8.8h)
--AM_CONFIG_HEADER(config/config.h)
-+AC_CONFIG_HEADERS(config/config.h)
- 
- # static libraries
- AC_ARG_WITH(static,


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/cacti-spine/, net-analyzer/cacti-spine/files/
@ 2019-08-22 10:50 Jeroen Roovers
  0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2019-08-22 10:50 UTC (permalink / raw
  To: gentoo-commits

commit:     cff8321fce2d9cab334c5dffaa9489fded567e99
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 22 10:50:07 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 10:50:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff8321f

net-analyzer/cacti-spine: Fix building against dev-db/mysql-connector-c-8*

Fixes: https://bugs.gentoo.org/692656
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 .../{cacti-spine-1.2.5.ebuild => cacti-spine-1.2.5-r1.ebuild} |  1 +
 .../cacti-spine/files/cacti-spine-1.2.5-my_bool.patch         | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild
similarity index 95%
rename from net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild
rename to net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild
index 9a49a508792..8da328d3acd 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild
@@ -30,6 +30,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
 	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
+	"${FILESDIR}"/${PN}-1.2.5-my_bool.patch
 )
 
 src_prepare() {

diff --git a/net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch b/net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch
new file mode 100644
index 00000000000..d9554bfa38c
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch
@@ -0,0 +1,11 @@
+--- a/sql.c
++++ b/sql.c
+@@ -229,7 +229,7 @@ void db_connect(int type, MYSQL *mysql) {
+ 	timeout = 5;
+ 	rtimeout = 10;
+ 	wtimeout = 20;
+-	my_bool reconnect = 1;
++	_Bool reconnect = 1;
+ 
+ 	mysql_init(mysql);
+ 


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/cacti-spine/, net-analyzer/cacti-spine/files/
@ 2021-12-10  3:49 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-12-10  3:49 UTC (permalink / raw
  To: gentoo-commits

commit:     3ab7ffa686e3e09293631319aedf3def59174d18
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 10 03:40:37 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 10 03:48:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab7ffa6

net-analyzer/cacti-spine: add 1.2.19

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/cacti-spine/Manifest                  |  1 +
 ...pine-99999.ebuild => cacti-spine-1.2.19.ebuild} | 16 +++++------
 ...-spine-99999.ebuild => cacti-spine-9999.ebuild} | 16 ++++-------
 ...ti-spine-1.2.19-configure.ac-fix-bashisms.patch | 33 ++++++++++++++++++++++
 4 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 9d350c261ff8..f0c5a377c342 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/net-analyzer/cacti-spine/cacti-spine-99999.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild
similarity index 70%
copy from net-analyzer/cacti-spine/cacti-spine-99999.ebuild
copy to net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild
index d929a4df7fcb..d70a52735b10 100644
--- a/net-analyzer/cacti-spine/cacti-spine-99999.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild
@@ -1,26 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools git-r3
+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"
-EGIT_REPO_URI="https://github.com/Cacti/spine"
+SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 BDEPEND="sys-apps/help2man"
-DEPEND="
-	dev-libs/openssl:0=
+DEPEND="dev-libs/openssl:=
 	net-analyzer/net-snmp:=
-	dev-db/mysql-connector-c:0=
-"
+	dev-db/mysql-connector-c:0="
 RDEPEND="
 	${DEPEND}
 	>net-analyzer/cacti-0.8.8
@@ -28,10 +26,12 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
+	"${FILESDIR}"/${PN}-1.2.19-configure.ac-fix-bashisms.patch
 )
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 

diff --git a/net-analyzer/cacti-spine/cacti-spine-99999.ebuild b/net-analyzer/cacti-spine/cacti-spine-9999.ebuild
similarity index 82%
rename from net-analyzer/cacti-spine/cacti-spine-99999.ebuild
rename to 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"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/cacti-spine/, net-analyzer/cacti-spine/files/
@ 2023-05-01 12:49 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-05-01 12:49 UTC (permalink / raw
  To: gentoo-commits

commit:     dfdbad3541a49c0b4515cdb6d761361b2ee2f66b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 12:39:35 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  1 12:48:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfdbad35

net-analyzer/cacti-spine: drop 1.2.17, 1.2.19

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/cacti-spine/Manifest                  |  2 -
 net-analyzer/cacti-spine/cacti-spine-1.2.17.ebuild | 47 ----------------------
 net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild | 47 ----------------------
 ...ti-spine-1.2.19-configure.ac-fix-bashisms.patch | 33 ---------------
 4 files changed, 129 deletions(-)

diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 80deba0f5188..8686e9b07669 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,3 +1 @@
-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
 DIST cacti-spine-1.2.20.tar.gz 115258 BLAKE2B 78a9ed8a9e7e69e98bfa9971134dd6f34f540a93b0b1a2aababb66781f3c9787712d57d86b81d7f409487c4cc4447d4f84bd7292890b7eb70ec4137d97248793 SHA512 d7e129f7b42542d7ecc78d55cebc6d9ce481834342d3f3da1fce5538d8e42bc194a825795053d5e3a065b54574e2a3b9413725f1bc0562e55f1db213f9a94d0c

diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.17.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.17.ebuild
deleted file mode 100644
index 6c9200ecdceb..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.17.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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:0=
-	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
-)
-
-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-1.2.19.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild
deleted file mode 100644
index 97df3de4d3d4..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 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/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
deleted file mode 100644
index 53a220fbf0de..000000000000
--- a/net-analyzer/cacti-spine/files/cacti-spine-1.2.19-configure.ac-fix-bashisms.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-05-01 12:49 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-10  3:49 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/cacti-spine/, net-analyzer/cacti-spine/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2023-05-01 12:49 Sam James
2019-08-22 10:50 Jeroen Roovers
2017-12-06  9:52 Jeroen Roovers
2017-02-03 19:21 Jeroen Roovers
2016-05-20  8:27 Jeroen Roovers
2016-05-14  9:50 Jeroen Roovers
2016-02-24  6:00 Jeroen Roovers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox