Rename initd/confd scripts. Remove -flto from CFLAGS.

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

6 files changed, 16 insertions, 67 deletions

diff --git a/net-analyzer/darkstat/ChangeLog b/net-analyzer/darkstat/ChangeLog
index c87fb7c0c803..e07900bd5d78 100644
--- a/net-analyzer/darkstat/ChangeLog
+++ b/net-analyzer/darkstat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/darkstat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/ChangeLog,v 1.60 2014/06/24 12:50:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/ChangeLog,v 1.61 2014/06/24 12:59:53 jer Exp $
+
+  24 Jun 2014; Jeroen Roovers <jer@gentoo.org> -darkstat-3.0.715.ebuild,
+  darkstat-3.0.717.ebuild, darkstat-3.0.718.ebuild, +files/darkstat-confd,
+  -files/darkstat-confd.new, -files/darkstat-init.new, +files/darkstat-initd:
+  Rename initd/confd scripts. Remove -flto from CFLAGS.
 
   24 Jun 2014; Jeroen Roovers <jer@gentoo.org> files/darkstat-init.new:
   Use /run not /var/run.
diff --git a/net-analyzer/darkstat/darkstat-3.0.715.ebuild b/net-analyzer/darkstat/darkstat-3.0.715.ebuild
deleted file mode 100644
index 36d3781ad109..000000000000
--- a/net-analyzer/darkstat/darkstat-3.0.715.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/darkstat-3.0.715.ebuild,v 1.6 2014/01/16 09:13:10 pinkbyte Exp $
-
-EAPI=4
-inherit user
-
-DESCRIPTION="Network traffic analyzer with cute web interface"
-HOMEPAGE="http://unix4lyfe.org/darkstat/"
-SRC_URI="http://unix4lyfe.org/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat}
-DOCS=( AUTHORS ChangeLog README NEWS )
-
-src_configure() {
-	econf \
-		--with-privdrop-user=darkstat \
-		--with-chroot-dir="${DARKSTAT_CHROOT_DIR}"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/darkstat-init.new darkstat
-	newconfd "${FILESDIR}"/darkstat-confd.new darkstat
-
-	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat
-	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat
-
-	keepdir "${DARKSTAT_CHROOT_DIR}"
-	chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
-}
-
-pkg_preinst() {
-	enewuser darkstat
-}
-
-pkg_postinst() {
-	# Workaround bug #141619
-	DARKSTAT_CHROOT_DIR=`sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"etc/conf.d/darkstat`
-	chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}"
-
-	elog "To start different darkstat instances which will listen on a different"
-	elog "interfaces create in /etc/init.d directory the 'darkstat.if' symlink to"
-	elog "darkstat script where 'if' is the name of the interface."
-	elog "Also in /etc/conf.d directory copy darkstat to darkstat.if"
-	elog "and edit it to change default values."
-	elog
-	elog "darkstat's default chroot directory is: \"${ROOT}${DARKSTAT_CHROOT_DIR}\""
-}
diff --git a/net-analyzer/darkstat/darkstat-3.0.717.ebuild b/net-analyzer/darkstat/darkstat-3.0.717.ebuild
index c52a9abf7aed..c65457cb1f8d 100644
--- a/net-analyzer/darkstat/darkstat-3.0.717.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.717.ebuild
@@ -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/darkstat/darkstat-3.0.717.ebuild,v 1.4 2014/01/20 15:53:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/darkstat-3.0.717.ebuild,v 1.5 2014/06/24 12:59:53 jer Exp $
 
 EAPI=5
 
@@ -33,8 +33,8 @@ src_configure() {
 src_install() {
 	default
 
-	newinitd "${FILESDIR}"/darkstat-init.new darkstat
-	newconfd "${FILESDIR}"/darkstat-confd.new darkstat
+	newinitd "${FILESDIR}"/darkstat-initd darkstat
+	newconfd "${FILESDIR}"/darkstat-confd darkstat
 
 	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat
 	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat
diff --git a/net-analyzer/darkstat/darkstat-3.0.718.ebuild b/net-analyzer/darkstat/darkstat-3.0.718.ebuild
index 1638efdf2ebd..1b7a7f21b281 100644
--- a/net-analyzer/darkstat/darkstat-3.0.718.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.718.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/darkstat-3.0.718.ebuild,v 1.1 2014/05/04 14:10:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/darkstat-3.0.718.ebuild,v 1.2 2014/06/24 12:59:53 jer Exp $
 
 EAPI=5
-
-inherit eutils user
+inherit autotools eutils user
 
 DESCRIPTION="Network traffic analyzer with cute web interface"
 HOMEPAGE="http://unix4lyfe.org/darkstat/"
@@ -22,7 +21,9 @@ DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat}
 DOCS=( AUTHORS ChangeLog README NEWS )
 
 src_prepare() {
+	sed -i -e 's|-flto||g' configure.ac || die
 	epatch_user
+	eautoreconf
 }
 
 src_configure() {
@@ -32,8 +33,8 @@ src_configure() {
 src_install() {
 	default
 
-	newinitd "${FILESDIR}"/darkstat-init.new darkstat
-	newconfd "${FILESDIR}"/darkstat-confd.new darkstat
+	newinitd "${FILESDIR}"/darkstat-initd darkstat
+	newconfd "${FILESDIR}"/darkstat-confd darkstat
 
 	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat
 	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat
diff --git a/net-analyzer/darkstat/files/darkstat-confd.new b/net-analyzer/darkstat/files/darkstat-confd
index 3d95a0461a06..3d95a0461a06 100644
--- a/net-analyzer/darkstat/files/darkstat-confd.new
+++ b/net-analyzer/darkstat/files/darkstat-confd
diff --git a/net-analyzer/darkstat/files/darkstat-init.new b/net-analyzer/darkstat/files/darkstat-initd
index 8cccc128f19e..3f91dac61d3d 100644
--- a/net-analyzer/darkstat/files/darkstat-init.new
+++ b/net-analyzer/darkstat/files/darkstat-initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/files/darkstat-init.new,v 1.2 2014/06/24 12:50:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/files/darkstat-initd,v 1.1 2014/06/24 12:59:53 jer Exp $
 
 IF=${SVCNAME##*.}