Version bump. Drop old.

Package-Manager: portage-2.1.10.20/cvs/Linux x86_64

3 files changed, 19 insertions, 34 deletions

diff --git a/net-analyzer/cacti-spine/ChangeLog b/net-analyzer/cacti-spine/ChangeLog
index 50a04cd7107e..4082d872f1ab 100644
--- a/net-analyzer/cacti-spine/ChangeLog
+++ b/net-analyzer/cacti-spine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/cacti-spine
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/ChangeLog,v 1.26 2011/04/01 17:24:06 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/ChangeLog,v 1.27 2011/10/02 11:54:03 pva Exp $
+
+*cacti-spine-0.8.7h (02 Oct 2011)
+
+  02 Oct 2011; Peter Volkov <pva@gentoo.org> -cacti-spine-0.8.7e-r1.ebuild,
+  +cacti-spine-0.8.7h.ebuild:
+  Version bump. Drop old.
 
   01 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org>
   cacti-spine-0.8.7g.ebuild:
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index e96c2425556e..eef5142b67c6 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,22 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST cacti-spine-0.8.7e.tar.gz 782735 RMD160 fb711786631d1630e0f2dbdce5bee44b7c645976 SHA1 cfa468e37495746ac5cd8ad9aa8a7354ecb9650b SHA256 6f0b19deea0ab29a553d53f1d356ff68f19144205e4e5649596d95c6174d2150
 DIST cacti-spine-0.8.7g.tar.gz 592801 RMD160 5945f909f4a01d106ec06edce82efde704588c8d SHA1 6f08f2f7734527a08afa5fc071dfaa5b1dbb0a57 SHA256 2735fbc1fc38d31651009d0a8d6ea121b29403d6020b13ba245ab4f3e0f6d561
-DIST mysql_client_reconnect.patch 436 RMD160 55bd62f9fb1d1d73a36cccc12326c4f3ca509504 SHA1 527daeed3842cfe5bffa540a196c6c2e31ec23db SHA256 b60c7679362a4e110e36bfc7cf569b292fa2e8ca7b130d8e5e48fdd29826a936
-DIST ping_reliability.patch 1642 RMD160 cbfdac7bcad16063d3a23dd827b71791e73585cd SHA1 a0295066259283eb3df5dc2ecb06482c6b8dca41 SHA256 9516c701f0174bf75af83cb8a1e3ef24d2bd4222c6a337093efec13136d3293d
-DIST snmp_v3_fix.patch 4300 RMD160 ace13023874080d85f683e6ce47f08891438a598 SHA1 c7dd4377c59b7a5f9ca6435bc8db793128071a07 SHA256 7e74a5f58f2fd1448360d84bd3be551f5ca791e5ea012ff395ad3461e0eab0d8
+DIST cacti-spine-0.8.7h.tar.gz 623334 RMD160 8dc1708029cb778c9f7765ce4186dfe4091df03e SHA1 9970f6abe6799dd64d20988e1b9bd3cb8955e440 SHA256 62f6451445cafc591c78c6bb530f96a8382183e9f5ee4e6bf7f5f3d770030a7c
 DIST unified_issues.patch 11583 RMD160 53e035a878974a956280b09c25e9744ed09d3a7a SHA1 40400fee9bed6db1b40327019694d244010f3d0a SHA256 5bfc4fe3eeedbab4d32620b6e141b0b6cfe674e76a938c19e13fb1b70e80fa0b
-EBUILD cacti-spine-0.8.7e-r1.ebuild 1774 RMD160 0cb08a60b8898cff60546d663cf008d6099b26a1 SHA1 1808c0f283b8a2a90fbaad47343e9d6b108f8a37 SHA256 c7eb14d7adcd11ad9c1bea52b98f31bc946b5f3fb5d7fddb98bbd937d29b3407
 EBUILD cacti-spine-0.8.7g.ebuild 1727 RMD160 f2686c9f8314bbc34ba03aa55df83ebfa68f4296 SHA1 8d41466653ceab9028e4d556773fa8d37ae47d3c SHA256 e36a29ab97e001620a6930758d864df0ac987be2a094c1512e4109f9153f0f0d
-MISC ChangeLog 3650 RMD160 82db66294d68eccbc8f11b3601480b74a57dd3cf SHA1 de0cae7c150ea8b3cae9bd593887daf1f198f61a SHA256 51bafb5bf310b8ed306bb1c3e03e6d2b066c7f95b5bfd7d5b23ee031fe6fbbb5
+EBUILD cacti-spine-0.8.7h.ebuild 1582 RMD160 1f5d8d85b68ad1c1c1033e1480a1cc8e0fdc25d1 SHA1 eab56286600a5fe31bb0fbbff776233014638e23 SHA256 0a5cf2f955262ed3c9aa675d2b45e2e5b5c7d032cd6f00509ecd2c5f5812dbb0
+MISC ChangeLog 3811 RMD160 e245a96de963e7c2b5e9fd75b6e2f181edf7ef96 SHA1 36edc7c45e9393c91500d02f56c5d5220a0a8463 SHA256 1a91a49b48d0167dc593506662e847c4f7f35eab329f04e096a914f24a69903a
 MISC metadata.xml 795 RMD160 6496692432dfda95180e8d7506af90ebd79b2172 SHA1 2e929eeb09763b10b746c6b0384acd4197051c85 SHA256 a1ee2fa5779e21ff428e18a563360a7d81e383345d867cfa27046614fc18e466
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk2WCj8ACgkQIiMqcbOVdxTMuQP7BUBvrPmF7AfuyTXCmpwY/qeg
-DJGC9vz+wlom8JftFZUXlCSSgYlpQy/0g5hdheEDf9m3PiJGdvrEkaeYL0S/S8wr
-qcaaD7A+1JYDcYT3UfZ/dcyiXnChC5KNSBamSSh1HzulltpvpLzszoqjwCOPO2EG
-CSYGekU4GpzSEExxg9o=
-=GhFI
------END PGP SIGNATURE-----
diff --git a/net-analyzer/cacti-spine/cacti-spine-0.8.7e-r1.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.7h.ebuild
index cc147e34c776..fa8c22cb1e7f 100644
--- a/net-analyzer/cacti-spine/cacti-spine-0.8.7e-r1.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-0.8.7h.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/cacti-spine-0.8.7e-r1.ebuild,v 1.5 2010/01/06 20:21:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/cacti-spine-0.8.7h.ebuild,v 1.1 2011/10/02 11:54:03 pva Exp $
 
+EAPI="4"
 inherit autotools
 
-UPSTREAM_PATCHES="snmp_v3_fix
-	mysql_client_reconnect
-	ping_reliability"
+UPSTREAM_PATCHES=""
 
 MY_P=${PN}-${PV/_p/-}
 
@@ -16,7 +15,7 @@ SRC_URI="http://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="net-analyzer/net-snmp
@@ -27,13 +26,11 @@ RDEPEND="${DEPEND}
 
 if [[ -n ${UPSTREAM_PATCHES} ]]; then
 	for i in ${UPSTREAM_PATCHES}; do
-		SRC_URI="${SRC_URI} http://www.cacti.net/downloads/spine/patches/${i}.patch"
+		SRC_URI="${SRC_URI} http://www.cacti.net/downloads/spine/patches/${PV}/${i}.patch"
 	done
 fi
 
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	cd "${S}"
+src_prepare() {
 	if [[ -n ${UPSTREAM_PATCHES} ]]; then
 		for i in ${UPSTREAM_PATCHES} ; do
 			EPATCH_OPTS="-p1 -N" epatch "${DISTDIR}"/${i}.patch
@@ -48,14 +45,11 @@ src_install() {
 	dosbin spine || die
 	insinto /etc/
 	insopts -m0640 -o root
-	doins spine.conf || die
+	newins spine.conf{.dist,} || die
 	dodoc ChangeLog README || die
 }
 
 pkg_postinst() {
-	ewarn "NOTE: If you upgraded from cactid, do not forgive to setup spine"
-	ewarn "instead of cactid through web interface."
-	ewarn
 	elog "Please see the cacti's site for installation instructions:"
 	elog
 	elog "http://cacti.net/spine_install.php"
@@ -63,6 +57,6 @@ pkg_postinst() {
 	ewarn "/etc/spine.conf should be readable by webserver, thus after you"
 	ewarn "decide on webserver do not forget to run the following command:"
 	ewarn
-	ewarn " # chown root:wwwgroup /etc/spine.conf"
+	ewarn " # chown root:<wwwgroup> /etc/spine.conf"
 	echo
 }