Dont install /etc/init.d/halt since baselayout takes care of it #87265.

(Portage version: 2.0.51.21)

4 files changed, 15 insertions, 9 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index 9f8926eaa1c6..ebee5715322b 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/apcupsd
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.4 2005/03/28 18:39:11 tantive Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.5 2005/05/05 02:31:30 vapier Exp $
+
+  05 May 2005; Mike Frysinger <vapier@gentoo.org> apcupsd-3.10.15-r1.ebuild,
+  apcupsd-3.10.16-r3.ebuild, apcupsd-3.10.17.ebuild:
+  Dont install /etc/init.d/halt since baselayout takes care of it #87265.
 
   28 Mar 2005; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.17.ebuild:
   More fixes. Closes #83629.
diff --git a/sys-power/apcupsd/apcupsd-3.10.15-r1.ebuild b/sys-power/apcupsd/apcupsd-3.10.15-r1.ebuild
index c7ddaa039ee3..31a8fa8bdfb9 100644
--- a/sys-power/apcupsd/apcupsd-3.10.15-r1.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.10.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.10.15-r1.ebuild,v 1.1 2005/03/14 23:27:27 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.10.15-r1.ebuild,v 1.2 2005/05/05 02:31:30 vapier Exp $
 
 inherit eutils
 
@@ -66,6 +66,7 @@ src_compile() {
 
 src_install () {
 	make DESTDIR=${D} install || die "installed failed"
+	rm -f "${D}"/etc/init.d/halt
 
 	use apache2 || insinto /etc/apache/conf/addon-modules
 	use apache2 || newins  ${FILESDIR}/${PV}/apache.conf apcupsd.conf
diff --git a/sys-power/apcupsd/apcupsd-3.10.16-r3.ebuild b/sys-power/apcupsd/apcupsd-3.10.16-r3.ebuild
index fb132c1c0b2b..74f98857f14c 100644
--- a/sys-power/apcupsd/apcupsd-3.10.16-r3.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.10.16-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.10.16-r3.ebuild,v 1.1 2005/03/14 23:27:27 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.10.16-r3.ebuild,v 1.2 2005/05/05 02:31:30 vapier Exp $
 
 inherit eutils
 
@@ -62,6 +62,7 @@ src_compile() {
 
 src_install () {
 	make DESTDIR=${D} install || die "installed failed"
+	rm -f "${D}"/etc/init.d/halt
 
 	if use gd
 	then
diff --git a/sys-power/apcupsd/apcupsd-3.10.17.ebuild b/sys-power/apcupsd/apcupsd-3.10.17.ebuild
index a18c8cb46f23..b2787265f78d 100644
--- a/sys-power/apcupsd/apcupsd-3.10.17.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.10.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.10.17.ebuild,v 1.2 2005/03/28 18:39:11 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.10.17.ebuild,v 1.3 2005/05/05 02:31:30 vapier Exp $
 
 inherit eutils depend.apache
 
@@ -12,11 +12,10 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="doc snmp usb apache2 cgi threads ncurses nls"
 
-DEPEND="virtual/libc
-	snmp? ( net-analyzer/net-snmp )
+DEPEND="snmp? ( net-analyzer/net-snmp )
 	cgi? ( >=media-libs/gd-1.8.4
 		net-www/apache )
 	ncurses? ( sys-libs/ncurses )
@@ -66,8 +65,9 @@ src_compile() {
 	make || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die "installed failed"
+	rm -f "${D}"/etc/init.d/halt
 
 	if use cgi; then
 		insinto ${APACHE_MODULEDIR}