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

Package-Manager: portage-2.0.51.21

5 files changed, 27 insertions, 31 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/Manifest b/sys-power/apcupsd/Manifest
index 28d6ea9a6004..47f614b90255 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -1,27 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c4ff22b128a02944998399998e8bfe37 apcupsd-3.10.17.ebuild 2574
+MD5 ce58378336c8c030fdd761f3ce384ca3 ChangeLog 11189
+MD5 90addc3e3ec4f77230cd7f491e1da84a apcupsd-3.10.15-r1.ebuild 2421
+MD5 4080a872f94b93a8e92d1b446c9c6d64 apcupsd-3.10.16-r3.ebuild 2627
 MD5 27ae5add10fc42e77804f1ecd768df87 metadata.xml 226
-MD5 35e63883c8d2d78acee1bdffdaf68fb4 apcupsd-3.10.15-r1.ebuild 2392
-MD5 7c0185e34e97fe5ff3b0c95e77e00947 ChangeLog 10985
-MD5 0509bd921593dc1b57efc30501492fb0 apcupsd-3.10.16-r3.ebuild 2598
+MD5 fa8c4988501225d5763b770d88f81102 apcupsd-3.10.17.ebuild 2588
+MD5 ec48a12c6d8b56aeffbeaa629f8835ad files/digest-apcupsd-3.10.15-r1 68
 MD5 ed12d329ca566b8f2632d425828ea5d7 files/digest-apcupsd-3.10.16-r3 68
 MD5 659d5670233b274842418c62ef15aafb files/digest-apcupsd-3.10.17 68
-MD5 ec48a12c6d8b56aeffbeaa629f8835ad files/digest-apcupsd-3.10.15-r1 68
-MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.17/smtp.patch 2663
-MD5 27ad4b6b56ea3aef2a89dded4c19b656 files/3.10.17/apache.conf 163
-MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.17/apcupsd.in.patch 315
-MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.16/smtp.patch 2663
-MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.16/apache.conf 157
-MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.16/apcupsd.in.patch 315
-MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.15/smtp.patch 2663
 MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.15/apache.conf 157
 MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.15/apcupsd.in.patch 315
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCSE9sKtJO8LeSoosRAgWIAJ4q1yT9h/XmvVWTIaygF4aaDYth8ACdGo7C
-zT6X8fDzNkObfWDG4l+CJSo=
-=5xBK
------END PGP SIGNATURE-----
+MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.15/smtp.patch 2663
+MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.16/apache.conf 157
+MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.16/apcupsd.in.patch 315
+MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.16/smtp.patch 2663
+MD5 27ad4b6b56ea3aef2a89dded4c19b656 files/3.10.17/apache.conf 163
+MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.17/apcupsd.in.patch 315
+MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.17/smtp.patch 2663
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}