jer 14/04/02 12:59:38 Modified: ChangeLog smokeping-2.6.9.ebuild Log: Whitespace. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.55 net-analyzer/smokeping/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/smokeping/ChangeLog?rev=1.55&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/smokeping/ChangeLog?rev=1.55&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/smokeping/ChangeLog?r1=1.54&r2=1.55 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- ChangeLog 2 Apr 2014 00:37:56 -0000 1.54 +++ ChangeLog 2 Apr 2014 12:59:38 -0000 1.55 @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/smokeping # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.54 2014/04/02 00:37:56 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.55 2014/04/02 12:59:38 jer Exp $ + + 02 Apr 2014; Jeroen Roovers <[email protected]> smokeping-2.6.9.ebuild: + Whitespace. 02 Apr 2014; Jeroen Roovers <[email protected]> smokeping-2.6.9.ebuild, +files/smokeping-2.6.9-pod.patch: 1.8 net-analyzer/smokeping/smokeping-2.6.9.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/smokeping/smokeping-2.6.9.ebuild?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/smokeping/smokeping-2.6.9.ebuild?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/smokeping/smokeping-2.6.9.ebuild?r1=1.7&r2=1.8 Index: smokeping-2.6.9.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.6.9.ebuild,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- smokeping-2.6.9.ebuild 2 Apr 2014 00:37:56 -0000 1.7 +++ smokeping-2.6.9.ebuild 2 Apr 2014 12:59:38 -0000 1.8 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.6.9.ebuild,v 1.7 2014/04/02 00:37:56 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.6.9.ebuild,v 1.8 2014/04/02 12:59:38 jer Exp $ EAPI=5 inherit eutils user systemd @@ -18,29 +18,33 @@ # 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" +DEPEND=" + !apache2? ( virtual/httpd-cgi ) + apache2? ( + >=www-apache/mod_perl-2.0.1 + www-apache/mod_fcgid + ) + curl? ( >=net-misc/curl-7.21.4 ) + 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 ) + >=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] + 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 + virtual/perl-libnet +" RDEPEND="${DEPEND}" @@ -57,8 +61,8 @@ src_configure() { econf \ - --sysconfdir=/etc/smokeping \ - --with-htdocs-dir=/var/www/localhost/smokeping + --sysconfdir=/etc/smokeping \ + --with-htdocs-dir=/var/www/localhost/smokeping } src_compile() { @@ -78,7 +82,8 @@ 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:}' \ + sed -i \ + -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 /run/smokeping:}' \ @@ -87,17 +92,23 @@ -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 + "${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" + sed -i \ + -e '/^<script/{s:cropper/:/cropper/:}' \ + "${D}/etc/${PN}/basepage.html" || die + + sed -i \ + -e 's/$FindBin::Bin\/..\/etc\/config/\/etc\/smokeping\/config/g' \ + "${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die + + sed -i \ + -e 's:etc/config.dist:/etc/smokeping/config:' \ + "${D}/usr/bin/tSmoke" || die + + sed -i \ + -e 's:/usr/etc/config:/etc/smokeping/config:' \ + "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die dodir /var/www/localhost/cgi-bin mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
