Version bump. Drop old.

(Portage version: 2.1.10.20/cvs/Linux x86_64)

2 files changed, 16 insertions, 16 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/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
 }