Version bump (bug #399553). /var/run => /run.

(Portage version: 2.2.0_alpha187/cvs/Linux x86_64, signed Manifest commit with key A792A613)

6 files changed, 23 insertions, 336 deletions

diff --git a/net-analyzer/smokeping/ChangeLog b/net-analyzer/smokeping/ChangeLog
index 0fc4ff84532e..0c0080f66a70 100644
--- a/net-analyzer/smokeping/ChangeLog
+++ b/net-analyzer/smokeping/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/smokeping
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.46 2013/07/06 11:52:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.47 2013/07/09 12:41:49 jer Exp $
+
+*smokeping-2.6.9 (09 Jul 2013)
+
+  09 Jul 2013; Jeroen Roovers <jer@gentoo.org> -smokeping-2.4.2-r4.ebuild,
+  -smokeping-2.6.8.ebuild, -smokeping-2.6.8-r1.ebuild, +smokeping-2.6.9.ebuild,
+  files/smokeping.init.2, files/smokeping.init.3:
+  Version bump (bug #399553). /var/run => /run.
 
   06 Jul 2013; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Add netmon as maintainer.
diff --git a/net-analyzer/smokeping/files/smokeping.init.2 b/net-analyzer/smokeping/files/smokeping.init.2
index b174cfbe50f4..9eac6a361938 100644
--- a/net-analyzer/smokeping/files/smokeping.init.2
+++ b/net-analyzer/smokeping/files/smokeping.init.2
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 extra_started_commands="reload"
@@ -20,15 +20,15 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 
-	if [ ! -d /var/run/smokeping/ ]; then
-		mkdir /var/run/smokeping/
+	if [ ! -d /run/smokeping/ ]; then
+		mkdir /run/smokeping/
 	fi
-	chown smokeping:smokeping /var/run/smokeping/
+	chown smokeping:smokeping /run/smokeping/
 
 	ebegin "Starting smokeping"
 	LC_ALL=C \
 	start-stop-daemon --start --name smokeping \
-		--pidfile /var/run/smokeping/smokeping.pid \
+		--pidfile /run/smokeping/smokeping.pid \
 		--exec /usr/bin/smokeping \
 		--chuid smokeping:smokeping
 	eend $?
@@ -37,7 +37,7 @@ start() {
 stop() {
 	ebegin "Stopping smokeping"
 	start-stop-daemon --stop \
-		--pidfile /var/run/smokeping/smokeping.pid
+		--pidfile /run/smokeping/smokeping.pid
 	eend $?
 }
 
diff --git a/net-analyzer/smokeping/files/smokeping.init.3 b/net-analyzer/smokeping/files/smokeping.init.3
index 8d0109fa8f8b..4a477ac4947f 100755
--- a/net-analyzer/smokeping/files/smokeping.init.3
+++ b/net-analyzer/smokeping/files/smokeping.init.3
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="${opts} dump reload restore"
@@ -19,15 +19,15 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 
-	if [ ! -d /var/run/smokeping/ ]; then
-		mkdir /var/run/smokeping/
+	if [ ! -d /run/smokeping/ ]; then
+		mkdir /run/smokeping/
 	fi
-	chown smokeping:smokeping /var/run/smokeping/
+	chown smokeping:smokeping /run/smokeping/
 
 	ebegin "Starting smokeping"
 	LC_ALL=C \
 	start-stop-daemon --start --name smokeping \
-		--pidfile /var/run/smokeping/smokeping.pid \
+		--pidfile /run/smokeping/smokeping.pid \
 		--exec /usr/bin/smokeping \
 		--user smokeping:smokeping
 	eend $?
@@ -36,7 +36,7 @@ start() {
 stop() {
 	ebegin "Stopping smokeping"
 	start-stop-daemon --stop \
-		--pidfile /var/run/smokeping/smokeping.pid
+		--pidfile /run/smokeping/smokeping.pid
 	eend $?
 }
 
diff --git a/net-analyzer/smokeping/smokeping-2.4.2-r4.ebuild b/net-analyzer/smokeping/smokeping-2.4.2-r4.ebuild
deleted file mode 100644
index 423773e2cc4c..000000000000
--- a/net-analyzer/smokeping/smokeping-2.4.2-r4.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.4.2-r4.ebuild,v 1.5 2012/06/12 03:14:47 zmedico Exp $
-
-EAPI="2"
-
-inherit perl-module user
-
-DESCRIPTION="A powerful latency measurement tool."
-HOMEPAGE="http://oss.oetiker.ch/smokeping/"
-SRC_URI="http://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="apache2 speedy"
-
-# dev-perl/JSON-1.x is bundled and is incompatible with version 2.x wich is in
-# the tree. See http://bugs.gentoo.org/show_bug.cgi?id=260170#c2
-DEPEND="dev-lang/perl
-		virtual/perl-libnet
-		>=net-analyzer/rrdtool-1.2[perl]
-		>=net-analyzer/fping-2.4_beta2-r2
-		dev-perl/Config-Grammar
-		dev-perl/Digest-HMAC
-		dev-perl/libwww-perl
-		dev-perl/CGI-Session
-		>=dev-perl/SNMP_Session-1.13
-		>=dev-perl/Socket6-0.20
-		dev-perl/Net-DNS
-		speedy? ( dev-perl/SpeedyCGI )
-		!apache2? ( virtual/httpd-cgi )
-		apache2? ( >=www-apache/mod_perl-2.0.1 )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup smokeping
-	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
-}
-
-src_prepare() {
-	rm -rf lib/Digest # provided by dev-perl/Digest-HMAC
-	rm -rf lib/CGI # provided by dev-perl/CGI-Session
-	rm -rf lib/Config # provided by dev-perl/Config-Grammar
-	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} # dev-perl/SNMP_Session
-	rm qooxdoo/qooxdoolink
-
-	PERL5SMOKEPING="/usr/share/${PN}/perl5"
-	sed -i "/^use strict;/a\use lib '${PERL5SMOKEPING}';" \
-		"${S}"/lib/Qooxdoo/JSONRPC.pm || die
-}
-
-src_compile() {
-	# There is a makefile we don't want to run so leave this here
-	einfo "Skip compile."
-}
-
-src_install() {
-	# Install JSON-1 outside of perl's @INC path
-	insinto ${PERL5SMOKEPING}
-	doins lib/JSON.pm
-	insinto ${PERL5SMOKEPING}/JSON
-	doins -r lib/JSON/*
-	rm -r lib/JSON lib/JSON.pm
-	# Install the remaining perl modules into the vendor lib area of Perl
-	perlinfo
-	insinto ${VENDOR_LIB}/
-	doins -r lib/*
-
-	# Install the CGI webserver scripts
-	sed 's:^use lib:#use lib:g' -i htdocs/*.cgi.dist
-	if use speedy; then
-		sed '1{s:/usr/[^ ]*:/usr/bin/speedy:}' -i htdocs/*.cgi.dist
-	else
-		sed '1{s:/usr/[^ ]*:/usr/bin/perl:}' -i htdocs/*.cgi.dist
-	fi
-	sed 's:/home/oetiker.*/config.dist:/etc/smokeping/config:' \
-			-i htdocs/*.cgi.dist
-	exeinto /var/www/localhost/perl/
-	newexe htdocs/smokeping.cgi.dist smokeping.pl || die
-	exeinto /var/www/localhost/smokeping
-	newexe htdocs/tr.cgi.dist tr.cgi || die
-	rm htdocs/{tr,smokeping}.cgi.dist
-
-	# Install AJAX scripts
-	insinto /var/www/localhost/smokeping
-	doins -r htdocs/* || die
-
-	# Create the smokeping binaries
-	for bin in ${PN} tSmoke; do
-		newbin bin/${bin}.dist ${bin}
-		dosed 's:^use lib:#use lib:g' /usr/bin/${bin}
-		dosed 's:etc/config.dist:/etc/smokeping/config:' /usr/bin/${bin}
-	done
-
-	# Create the config files
-	insinto /etc/${PN}
-	for file in etc/*; do
-		config=${file/.dist}
-		newins ${file} ${config#*/}
-	done
-	sed -e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
-		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
-		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
-		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /var/run/smokeping:}' \
-		-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
-		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
-		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
-		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
-		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
-			-i "${D}/etc/${PN}/config" || die
-	sed -e '/^<script/{s:cropper/:/cropper/:}' -i "${D}/etc/${PN}/basepage.html"
-	fperms 700 /etc/${PN}/smokeping_secrets
-
-	newinitd "${FILESDIR}/${PN}.init.2" ${PN} || die
-
-	if use apache2 ; then
-		insinto /etc/apache2/modules.d
-		doins "${FILESDIR}/79_${PN}.conf" || die
-	fi
-
-	# Create the files in /var for rrd file storage
-	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
-
-	# Install documentation.
-	insinto "/usr/share/doc/${PF}"
-	doins -r doc/examples
-	dodoc CHANGES CONTRIBUTORS README TODO || die
-	doman doc/{smokeping{.1,.cgi.1,_config.5},Smokeping.3,smokeping_examples.7} \
-		doc/{smokeping_{extend,install,master_slave,upgrade}.7,smoketrace.7} \
-			doc/{tSmoke.1,Smokeping/Smokeping::{Examples,RRDtools}.3} || die
-}
-
-pkg_postinst() {
-	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
-	chmod 755 "${ROOT}/var/lib/${PN}"
-	elog
-	elog "Additional steps are needed to get ${PN} up & running:"
-	elog
-	elog "First you need to edit /etc/${PN}/config. After that"
-	elog "you can start ${PN} with '/etc/init.d/${PN} start'."
-	elog
-	if use apache2 ; then
-		elog "For web interface make sure to add -D PERL to APACHE2_OPTS in"
-		elog "/etc/conf.d/apache2 and to restart apache2. To access site from"
-		elog "other places check permissions at /etc/apache2/modules.d/79_${PN}.conf"
-		elog
-	else
-		elog "For web interface configure your web server to serve perl cgi"
-		elog "script at /var/www/localhost/perl/"
-	fi
-	elog "To make cropper working you just need to copy /var/www/localhost/smokeping/cropper"
-	elog "into you htdocs (or create symlink and allow webserver to follow symlinks)."
-	elog
-	elog "We install all files required for smoketrace, but you have to"
-	elog "configure it manually. Just read 'man smoketrace'. Also you need to"
-	elog "'emerge traceroute'."
-	elog
-}
diff --git a/net-analyzer/smokeping/smokeping-2.6.8.ebuild b/net-analyzer/smokeping/smokeping-2.6.8.ebuild
deleted file mode 100644
index 7e6e48b9e84e..000000000000
--- a/net-analyzer/smokeping/smokeping-2.6.8.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.6.8.ebuild,v 1.2 2012/10/29 08:08:19 patrick Exp $
-
-EAPI="4"
-
-inherit eutils user
-
-DESCRIPTION="A powerful latency measurement tool."
-HOMEPAGE="http://oss.oetiker.ch/smokeping/"
-SRC_URI="http://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# dropping hppa and sparc because of way too may dependencies not having
-# keywords in those architectures.
-KEYWORDS="~amd64 ~x86"
-
-# removing fcgi useflag as the configure script can't avoid it without patching
-IUSE="apache2 curl dig echoping ipv6 ldap radius ssh telnet"
-
-DEPEND="!apache2? ( virtual/httpd-cgi )
-		>=dev-lang/perl-5.8.8-r8
-		>=dev-perl/SNMP_Session-1.13
-		>=net-analyzer/fping-2.4_beta2-r2
-		>=net-analyzer/rrdtool-1.2[perl]
-		apache2? ( >=www-apache/mod_perl-2.0.1
-		www-apache/mod_fcgid )
-		curl? ( >=net-misc/curl-7.21.4 )
-		dev-perl/CGI-Session
-		dev-perl/Config-Grammar
-		dev-perl/Digest-HMAC
-		dev-perl/FCGI
-		dev-perl/IO-Socket-SSL
-		dev-perl/Net-DNS
-		dev-perl/libwww-perl
-		dig? ( net-dns/bind-tools )
-		echoping? ( >=net-analyzer/echoping-6.0.2 )
-		ipv6? ( >=dev-perl/Socket6-0.20 )
-		ldap? ( dev-perl/perl-ldap )
-		radius? ( dev-perl/RadiusPerl )
-		ssh? ( dev-perl/Net-OpenSSH )
-		telnet? ( dev-perl/Net-Telnet )
-		virtual/perl-libnet"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup smokeping
-	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
-}
-
-src_prepare() {
-	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} # dev-perl/SNMP_Session
-
-}
-
-src_configure() {
-	econf \
-	--sysconfdir=/etc/smokeping \
-	--with-htdocs-dir=/var/www/localhost/smokeping
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}/${PN}.init.3" ${PN} || die
-
-	mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html"
-	mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config"
-	mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail"
-	mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets"
-	mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail"
-
-	sed -e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
-		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
-		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
-		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /var/run/smokeping:}' \
-	    -e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
-		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
-		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
-		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
-		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
-		-i "${D}/etc/${PN}/config" || die
-
-	sed -e '/^<script/{s:cropper/:/cropper/:}' -i "${D}/etc/${PN}/basepage.html"
-
-	sed -e 's/$FindBin::Bin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
-		-i "${D}/usr/bin/smokeping" -i "${D}/usr/bin/smokeping_cgi"
-
-	sed -e 's:etc/config.dist:/etc/smokeping/config:' -i "${D}/usr/bin/tSmoke"
-
-	sed -e 's:/usr/etc/config:/etc/smokeping/config:' -i \
-		"${D}/var/www/localhost/smokeping/smokeping.fcgi.dist"
-
-	dodir /var/www/localhost/cgi-bin
-		mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
-		"${D}/var/www/localhost/cgi-bin/smokeping.fcgi"
-
-	fperms 700 /etc/${PN}/smokeping_secrets
-
-	if use apache2 ; then
-		insinto /etc/apache2/modules.d
-		doins "${FILESDIR}/79_${PN}.conf" || die
-	fi
-
-	dodir /var/cache/smokeping
-	keepdir /var/cache/smokeping
-
-	# Create the files in /var for rrd file storage
-	keepdir /var/lib/${PN}/.simg
-	fowners smokeping:smokeping /var/lib/${PN}
-
-	if use apache2 ; then
-		fowners apache:apache /var/lib/${PN}/.simg
-		fowners -R apache:apache /var/www
-	else
-		fowners smokeping:smokeping /var/lib/${PN}/.simg
-	fi
-
-	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
-}
-
-pkg_postinst() {
-	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
-	chmod 755 "${ROOT}/var/lib/${PN}"
-	elog
-	elog "Additional steps are needed to get ${PN} up & running:"
-	elog
-	elog "First you need to edit /etc/${PN}/config. After that"
-	elog "you can start ${PN} with '/etc/init.d/${PN} start'."
-	elog
-	if use apache2 ; then
-		elog "For web interface make sure to add -D PERL to APACHE2_OPTS in"
-		elog "/etc/conf.d/apache2 and to restart apache2. To access site from"
-		elog "other places check permissions at /etc/apache2/modules.d/79_${PN}.conf"
-		elog
-	else
-		elog "For web interface configure your web server to serve perl cgi"
-		elog "script at /var/www/localhost/perl/"
-	fi
-	elog "To make cropper working you just need to copy /var/www/localhost/smokeping/cropper"
-	elog "into your htdocs (or create symlink and allow webserver to follow symlinks)."
-	elog
-	elog "We install all files required for smoketrace, but you have to"
-	elog "configure it manually. Just read 'man smoketrace'. Also you need to"
-	elog "'emerge traceroute'."
-	elog
-}
diff --git a/net-analyzer/smokeping/smokeping-2.6.8-r1.ebuild b/net-analyzer/smokeping/smokeping-2.6.9.ebuild
index 3f9ff3743440..5448f0fd86ca 100644
--- a/net-analyzer/smokeping/smokeping-2.6.8-r1.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.6.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.6.8-r1.ebuild,v 1.1 2013/07/06 06:44:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.6.9.ebuild,v 1.1 2013/07/09 12:41:50 jer Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # dropping hppa and sparc because of way too may dependencies not having
 # keywords in those architectures.
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 
 # removing fcgi useflag as the configure script can't avoid it without patching
 IUSE="apache2 curl dig echoping ipv6 ldap radius ssh telnet"
@@ -62,7 +62,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake
+	LC_ALL=C emake
 }
 
 src_install() {