Don't set apache group on cactid.conf as this is broken when user doesn't use apache webserver and apache group does not exist (bug #168362 reported by David Maus <maus.david AT gmx.de>. Cleaning old broken with mysql-5 ebuilds.

(Portage version: 2.1.2-r9)

7 files changed, 20 insertions, 115 deletions

diff --git a/net-analyzer/cacti-cactid/ChangeLog b/net-analyzer/cacti-cactid/ChangeLog
index 6018db8c3e72..196ca237acf1 100644
--- a/net-analyzer/cacti-cactid/ChangeLog
+++ b/net-analyzer/cacti-cactid/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/cacti-cactid
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/ChangeLog,v 1.26 2007/01/30 18:44:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/ChangeLog,v 1.27 2007/02/26 07:12:50 pva Exp $
+
+*cacti-cactid-0.8.6i-r1 (26 Feb 2007)
+
+  26 Feb 2007; <pva@gentoo.org> -cacti-cactid-0.8.6e.ebuild,
+  -cacti-cactid-0.8.6f_p1.ebuild, -cacti-cactid-0.8.6i.ebuild,
+  +cacti-cactid-0.8.6i-r1.ebuild:
+  Don't set apache group on cactid.conf as this is broken when user doesn't use
+  apache webserver and apache group does not exist (bug #168362 reported by
+  David Maus <maus.david AT gmx.de>. Cleaning old broken with mysql-5 ebuilds.
 
   30 Jan 2007; Raúl Porcel <armin76@gentoo.org> cacti-cactid-0.8.6g.ebuild:
   x86 stable wrt bug 155147
diff --git a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.ebuild b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.ebuild
deleted file mode 100644
index 9eb10288584a..000000000000
--- a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.ebuild,v 1.6 2006/11/23 19:46:52 vivo Exp $
-
-WANT_AUTOCONF="latest"
-inherit autotools
-
-DESCRIPTION="Cactid is a poller for Cacti that primarily strives to be as fast
-as possible"
-HOMEPAGE="http://cacti.net/cactid_info.php"
-SRC_URI="http://www.cacti.net/downloads/cactid/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~sparc x86"
-IUSE=""
-
-DEPEND="net-analyzer/net-snmp
-		net-analyzer/rrdtool
-		!>=virtual/mysql-5.0
-		virtual/mysql
-		>=sys-devel/autoconf-2.53"
-RDEPEND="net-analyzer/cacti"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
-	sed -i -e 's/mysqlclient/mysqlclient_r/g' configure.ac
-	sed -i -e 's/wwwroot\/cacti\/log/var\/log/g' cactid.h
-}
-
-src_compile() {
-	eaclocal
-	eautoconf
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	exeinto usr/sbin ; doexe ${S}/cactid
-	insinto etc/ ; insopts -m0640 -o root -g apache ; doins ${S}/cactid.conf
-	dodoc CHANGELOG INSTALL README
-}
-
-pkg_postinst() {
-	einfo "Please see cacti's site for installation instructions."
-	einfo "Theres no need to change the crontab for this, just"
-	einfo "read the instructions on how to implement it"
-	einfo
-	einfo "http://cacti.net/cactid_install.php"
-}
diff --git a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.ebuild b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.ebuild
deleted file mode 100644
index ab4a790dd6c0..000000000000
--- a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.ebuild,v 1.11 2006/11/23 19:46:52 vivo Exp $
-
-WANT_AUTOCONF="latest"
-inherit autotools
-
-MY_PV=${PV/_p/-}
-DESCRIPTION="Cactid is a poller for Cacti that primarily strives to be as fast
-as possible"
-HOMEPAGE="http://cacti.net/cactid_info.php"
-SRC_URI="http://www.cacti.net/downloads/cactid/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="net-analyzer/net-snmp
-		!>=virtual/mysql-5.0
-		virtual/mysql
-		>=sys-devel/autoconf-2.59"
-RDEPEND="net-analyzer/cacti
-		net-analyzer/net-snmp
-		!>=virtual/mysql-5.0
-		virtual/mysql"
-
-src_unpack() {
-	unpack ${A} ; mv ${WORKDIR}/${PN}-${MY_PV} ${S} ; cd ${S}
-	sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
-	sed -i -e 's/mysqlclient/mysqlclient_r/g' configure.ac
-	sed -i -e 's/wwwroot\/cacti\/log/var\/log/g' cactid.h
-}
-
-src_compile() {
-	eaclocal
-	eautoconf
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	exeinto usr/sbin ; doexe ${S}/cactid
-	insinto etc/ ; insopts -m0640 -o root -g apache ; doins ${S}/cactid.conf
-	dodoc CHANGELOG INSTALL README
-}
-
-pkg_postinst() {
-	einfo "Please see cacti's site for installation instructions."
-	einfo "Theres no need to change the crontab for this, just"
-	einfo "read the instructions on how to implement it"
-	einfo
-	einfo "http://cacti.net/cactid_install.php"
-}
diff --git a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6i.ebuild b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6i-r1.ebuild
index e4834c59db36..b4d25cdadfa8 100644
--- a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6i.ebuild
+++ b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6i-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/cacti-cactid-0.8.6i.ebuild,v 1.1 2007/01/28 15:26:30 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/cacti-cactid-0.8.6i-r1.ebuild,v 1.1 2007/02/26 07:12:50 pva Exp $
 
 WANT_AUTOCONF="latest"
 inherit autotools
@@ -37,8 +37,8 @@ src_compile() {
 
 src_install() {
 	exeinto usr/sbin ; doexe "${S}"/cactid
-	insinto etc/ ; insopts -m0640 -o root -g apache ; doins "${S}"/cactid.conf
-	dodoc CHANGELOG INSTALL README
+	insinto etc/ ; insopts -m0640 -o root ; doins "${S}"/cactid.conf
+	dodoc ChangeLog INSTALL README
 }
 
 pkg_postinst() {
@@ -47,4 +47,11 @@ pkg_postinst() {
 	einfo "read the instructions on how to implement it"
 	einfo
 	einfo "http://cacti.net/cactid_install.php"
+	echo
+	ewarn "/etc/cactid.conf should be readable by webserver, thus after you"
+	ewarn "decide on webserver/webserver group do not forgive to change it's"
+	ewarn "group with the following command:"
+	ewarn
+	ewarn " # chown root:wwwgroup /etc/cactid.conf"
+	echo
 }
diff --git a/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6e b/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6e
deleted file mode 100644
index c020c6b474d1..000000000000
--- a/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6e
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c63baf6be89ea3591e8aac0e44792cd2 cacti-cactid-0.8.6e.tar.gz 132059
-RMD160 af2c6131d41a0b609158ed1de184ea2fed0cfe00 cacti-cactid-0.8.6e.tar.gz 132059
-SHA256 7a9f0fb50adc0d6cf2a4d219d4497e796071592477767b60f654ffb3d6b2e507 cacti-cactid-0.8.6e.tar.gz 132059
diff --git a/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6f_p1 b/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6f_p1
deleted file mode 100644
index 4972af4d0650..000000000000
--- a/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6f_p1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 95fe2d67c630dca9fe64a27c6ab2aff1 cacti-cactid-0.8.6f-1.tar.gz 136217
-RMD160 1ff88042395b3d0d5bb58765cbc6ca5c54c26084 cacti-cactid-0.8.6f-1.tar.gz 136217
-SHA256 5ecc9c5d605b7daa18380fdc3ff951e42dd0652db4c5f1718c7607dfd0310e61 cacti-cactid-0.8.6f-1.tar.gz 136217
diff --git a/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6i b/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6i-r1
index 587f6566ebfd..587f6566ebfd 100644
--- a/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6i
+++ b/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6i-r1