Add smokeping 2.3.5, fixes bug #203945.

(Portage version: 2.1.5_rc5)

5 files changed, 28 insertions, 123 deletions

diff --git a/net-analyzer/smokeping/ChangeLog b/net-analyzer/smokeping/ChangeLog
index 9ec1acd5a19a..504e441214df 100644
--- a/net-analyzer/smokeping/ChangeLog
+++ b/net-analyzer/smokeping/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/smokeping
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.20 2008/02/05 10:43:50 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.21 2008/04/21 09:40:47 chtekk Exp $
+
+*smokeping-2.3.5 (21 Apr 2008)
+
+  21 Apr 2008; Luca Longinotti <chtekk@gentoo.org> files/smokeping.init,
+  -smokeping-2.0.9.ebuild, -smokeping-2.2.3-r1.ebuild,
+  smokeping-2.2.4.ebuild, +smokeping-2.3.5.ebuild:
+  Add smokeping 2.3.5, fixes bug #203945. Mark smokeping 2.2.4 amd64 stable.
+  Cleanup old ebuilds.
 
   05 Feb 2008; Benedikt Böhm <hollow@gentoo.org> smokeping-2.0.9.ebuild,
   smokeping-2.2.3-r1.ebuild, smokeping-2.2.4.ebuild:
diff --git a/net-analyzer/smokeping/files/smokeping.init b/net-analyzer/smokeping/files/smokeping.init
index a297a5911698..6ccb34a8c3f5 100644
--- a/net-analyzer/smokeping/files/smokeping.init
+++ b/net-analyzer/smokeping/files/smokeping.init
@@ -1,12 +1,12 @@
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-opts="start stop dump restore"
+opts="${opts} dump restore"
 
 depend() {
-	use dns
 	need net
+	use dns
 }
 
 checkconfig() {
diff --git a/net-analyzer/smokeping/smokeping-2.0.9.ebuild b/net-analyzer/smokeping/smokeping-2.0.9.ebuild
deleted file mode 100644
index 32cc5fa61ab1..000000000000
--- a/net-analyzer/smokeping/smokeping-2.0.9.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.0.9.ebuild,v 1.13 2008/02/05 10:43:50 hollow Exp $
-
-inherit perl-module eutils
-
-KEYWORDS="amd64 sparc x86"
-
-DESCRIPTION="A powerful latency measurement tool."
-SRC_URI="http://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
-HOMEPAGE="http://oss.oetiker.ch/smokeping/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2"
-
-DEPEND="dev-lang/perl
-		virtual/perl-libnet
-		>=net-analyzer/rrdtool-1.2
-		net-analyzer/fping
-		apache2? ( >=www-apache/mod_perl-2.0.1 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! built_with_use '>=net-analyzer/rrdtool-1.2' perl ; then
-		eerror "You must build net-analyzer/rrdtool with the"
-		eerror "'perl' USE flag turned on!"
-		die "net-analyzer/rrdtool installed with 'perl' USE flag disabled"
-	fi
-
-	enewgroup smokeping
-	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
-}
-
-src_compile() {
-	# There is a makefile we don't want to run so leave this here
-	einfo "Skip compile."
-}
-
-src_install() {
-	# First move all the perl modules into the vendor lib area of Perl
-	perlinfo
-	insinto ${VENDOR_LIB}
-	doins lib/*.pm
-	### This one kind of concerns me, possible conflict with other software
-	insinto ${VENDOR_LIB}/Config
-	doins lib/Config/*.pm
-	insinto ${VENDOR_LIB}/Smokeping
-	doins lib/Smokeping/*.pm
-	insinto ${VENDOR_LIB}/Smokeping/matchers
-	doins lib/Smokeping/matchers/*.pm
-	insinto ${VENDOR_LIB}/Smokeping/probes
-	doins lib/Smokeping/probes/*.pm
-
-	# Create the files in var for rrd file storage and the cgi webserver script
-	keepdir /var/lib/${PN}/.simg
-	fowners smokeping:smokeping /var/lib/${PN}
-	if use apache2 ; then
-		fowners apache:apache /var/lib/${PN}/.simg
-	else
-		fowners smokeping:smokeping /var/lib/${PN}/.simg
-	fi
-	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
-	exeinto /var/www/localhost/perl
-	newexe htdocs/${PN}.cgi.dist ${PN}.pl
-	dosed 's:^use lib:#use lib:g' /var/www/localhost/perl/${PN}.pl
-	dosed 's:sepp/bin/speedy:bin/perl:' /var/www/localhost/perl/${PN}.pl
-	dosed 's:/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config:/etc/smokeping:' \
-		/var/www/localhost/perl/${PN}.pl
-
-	# Create the binary
-	newbin bin/${PN}.dist ${PN}
-	dosed 's:/usr/sepp/bin/perl-5.8.4:/usr/bin/perl:g' /usr/bin/${PN}
-	dosed 's:^use lib:#use lib:g' /usr/bin/${PN}
-	# dosed 's:/sepp::' /usr/bin/${PN}
-	dosed 's:etc/config.dist:/etc/smokeping:' /usr/bin/${PN}
-
-	# Create the config files
-	insinto /etc
-	newins "${FILESDIR}/config.dist" ${PN}
-	newins etc/basepage.html.dist ${PN}.template
-	doins etc/smokemail.dist
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-	if use apache2 ; then
-		insinto /etc/apache2/modules.d
-		doins "${FILESDIR}/78_${PN}.conf"
-	fi
-}
-
-pkg_postinst() {
-	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
-	chmod 755 "${ROOT}/var/lib/${PN}"
-	elog
-	elog "Four more steps are needed to get ${PN} up and running:"
-	elog "1) You need to edit /etc/${PN}"
-	elog "2) You need to edit the template at /etc/${PN}.template"
-	elog "3) You need to make the fping binary setuid root:"
-	elog "    # chmod 4755 /usr/sbin/fping"
-	if use apache2 ; then
-		elog "4) Make sure to add -D PERL to APACHE2_OPTS in /etc/conf.d/apache2"
-		elog "   and to restart apache2."
-	fi
-	elog "You can now start ${PN} with '/etc/init.d/${PN} start'."
-	elog
-}
diff --git a/net-analyzer/smokeping/smokeping-2.2.4.ebuild b/net-analyzer/smokeping/smokeping-2.2.4.ebuild
index c5c67b97b935..7f16697ab4a9 100644
--- a/net-analyzer/smokeping/smokeping-2.2.4.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.2.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.2.4.ebuild,v 1.3 2008/02/05 10:43:50 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.2.4.ebuild,v 1.4 2008/04/21 09:40:47 chtekk Exp $
 
 inherit perl-module eutils
 
-KEYWORDS="~amd64 sparc x86"
+KEYWORDS="amd64 sparc x86"
 
 DESCRIPTION="A powerful latency measurement tool."
 SRC_URI="http://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
@@ -43,7 +43,6 @@ src_install() {
 	perlinfo
 	insinto ${VENDOR_LIB}
 	doins lib/*.pm
-	### This one kind of concerns me, possible conflict with other software
 	insinto ${VENDOR_LIB}/Config
 	doins lib/Config/*.pm
 	insinto ${VENDOR_LIB}/Smokeping
@@ -55,7 +54,7 @@ src_install() {
 	insinto ${VENDOR_LIB}/Smokeping/sorters
 	doins lib/Smokeping/sorters/*.pm
 
-	# Create the files in var for rrd file storage and the cgi webserver script
+	# Create the files in /var for rrd file storage
 	keepdir /var/lib/${PN}/.simg
 	fowners smokeping:smokeping /var/lib/${PN}
 	if use apache2 ; then
@@ -64,10 +63,12 @@ src_install() {
 		fowners smokeping:smokeping /var/lib/${PN}/.simg
 	fi
 	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
+
+	# Install the CGI webserver script
 	exeinto /var/www/localhost/perl
 	newexe htdocs/${PN}.cgi.dist ${PN}.pl
 	dosed 's:^use lib:#use lib:g' /var/www/localhost/perl/${PN}.pl
-	dosed 's:sepp/bin/speedy:bin/perl:' /var/www/localhost/perl/${PN}.pl
+	dosed 's:/usr/sepp/bin/speedy:/usr/bin/perl:' /var/www/localhost/perl/${PN}.pl
 	dosed 's:/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config:/etc/smokeping:' \
 		/var/www/localhost/perl/${PN}.pl
 
@@ -77,9 +78,8 @@ src_install() {
 
 	# Create the binary
 	newbin bin/${PN}.dist ${PN}
-	dosed 's:/usr/sepp/bin/perl-5.8.4:/usr/bin/perl:g' /usr/bin/${PN}
 	dosed 's:^use lib:#use lib:g' /usr/bin/${PN}
-	# dosed 's:/sepp::' /usr/bin/${PN}
+	dosed 's:/usr/sepp/bin/perl-5.8.4:/usr/bin/perl:' /usr/bin/${PN}
 	dosed 's:etc/config.dist:/etc/smokeping:' /usr/bin/${PN}
 
 	# Create the config files
@@ -98,7 +98,7 @@ pkg_postinst() {
 	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
 	chmod 755 "${ROOT}/var/lib/${PN}"
 	elog
-	elog "Four more steps are needed to get ${PN} un&running:"
+	elog "Four more steps are needed to get ${PN} up&running:"
 	elog "1) You need to edit /etc/${PN}"
 	elog "2) You need to edit the template at /etc/${PN}.template"
 	elog "3) You need to make the fping binary setuid root:"
diff --git a/net-analyzer/smokeping/smokeping-2.2.3-r1.ebuild b/net-analyzer/smokeping/smokeping-2.3.5.ebuild
index 73b1d1fdc18e..3ac8e29ed6d1 100644
--- a/net-analyzer/smokeping/smokeping-2.2.3-r1.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.2.3-r1.ebuild,v 1.2 2008/02/05 10:43:50 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.3.5.ebuild,v 1.1 2008/04/21 09:40:47 chtekk Exp $
 
 inherit perl-module eutils
 
@@ -18,6 +18,7 @@ DEPEND="dev-lang/perl
 		>=net-analyzer/rrdtool-1.2
 		net-analyzer/fping
 		dev-perl/libwww-perl
+		dev-perl/Socket6
 		dev-perl/Net-DNS
 		apache2? ( >=www-apache/mod_perl-2.0.1 )"
 RDEPEND="${DEPEND}"
@@ -43,7 +44,6 @@ src_install() {
 	perlinfo
 	insinto ${VENDOR_LIB}
 	doins lib/*.pm
-	### This one kind of concerns me, possible conflict with other software
 	insinto ${VENDOR_LIB}/Config
 	doins lib/Config/*.pm
 	insinto ${VENDOR_LIB}/Smokeping
@@ -55,7 +55,7 @@ src_install() {
 	insinto ${VENDOR_LIB}/Smokeping/sorters
 	doins lib/Smokeping/sorters/*.pm
 
-	# Create the files in var for rrd file storage and the cgi webserver script
+	# Create the files in /var for rrd file storage
 	keepdir /var/lib/${PN}/.simg
 	fowners smokeping:smokeping /var/lib/${PN}
 	if use apache2 ; then
@@ -64,10 +64,12 @@ src_install() {
 		fowners smokeping:smokeping /var/lib/${PN}/.simg
 	fi
 	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
+
+	# Install the CGI webserver script
 	exeinto /var/www/localhost/perl
 	newexe htdocs/${PN}.cgi.dist ${PN}.pl
 	dosed 's:^use lib:#use lib:g' /var/www/localhost/perl/${PN}.pl
-	dosed 's:sepp/bin/speedy:bin/perl:' /var/www/localhost/perl/${PN}.pl
+	dosed 's:/usr/sepp/bin/speedy:/usr/bin/perl:' /var/www/localhost/perl/${PN}.pl
 	dosed 's:/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config:/etc/smokeping:' \
 		/var/www/localhost/perl/${PN}.pl
 
@@ -77,9 +79,8 @@ src_install() {
 
 	# Create the binary
 	newbin bin/${PN}.dist ${PN}
-	dosed 's:/usr/sepp/bin/perl-5.8.4:/usr/bin/perl:g' /usr/bin/${PN}
 	dosed 's:^use lib:#use lib:g' /usr/bin/${PN}
-	# dosed 's:/sepp::' /usr/bin/${PN}
+	dosed 's:/usr/sepp/bin/perl-5.8.4:/usr/bin/perl:' /usr/bin/${PN}
 	dosed 's:etc/config.dist:/etc/smokeping:' /usr/bin/${PN}
 
 	# Create the config files
@@ -98,7 +99,7 @@ pkg_postinst() {
 	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
 	chmod 755 "${ROOT}/var/lib/${PN}"
 	elog
-	elog "Four more steps are needed to get ${PN} un&running:"
+	elog "Four more steps are needed to get ${PN} up&running:"
 	elog "1) You need to edit /etc/${PN}"
 	elog "2) You need to edit the template at /etc/${PN}.template"
 	elog "3) You need to make the fping binary setuid root:"