Bumped ebuilds, removed old ones. Should close #100614.

(Portage version: 2.0.51.22-r2)

6 files changed, 18 insertions, 20 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index dae841efa9ee..07f404280451 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.7 2005/08/01 17:25:04 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.8 2005/08/02 16:51:28 tantive Exp $
+
+*apcupsd-3.10.18-r1 (02 Aug 2005)
+*apcupsd-3.10.17-r1 (02 Aug 2005)
+
+  02 Aug 2005; Michael Imhof <tantive@gentoo.org> -apcupsd-3.10.17.ebuild,
+  +apcupsd-3.10.17-r1.ebuild, -apcupsd-3.10.18.ebuild,
+  +apcupsd-3.10.18-r1.ebuild:
+  Bumped ebuilds, removed old ones. Should close #100614.
 
   01 Aug 2005; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.18.ebuild:
   Fixed a typo. Closes #100956.
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index eaea4123868f..e8fe0ce3b975 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -1,15 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fa8c4988501225d5763b770d88f81102 apcupsd-3.10.17.ebuild 2588
 MD5 27ae5add10fc42e77804f1ecd768df87 metadata.xml 226
 MD5 90addc3e3ec4f77230cd7f491e1da84a apcupsd-3.10.15-r1.ebuild 2421
 MD5 27bfaa0d7a4c43f80b865521073b3b14 ChangeLog 11537
+MD5 cc2a2e41cf03239b0e644354e114b6c8 apcupsd-3.10.17-r1.ebuild 2597
 MD5 4080a872f94b93a8e92d1b446c9c6d64 apcupsd-3.10.16-r3.ebuild 2627
-MD5 85eb86b15dc283ec168b160aba1669b1 apcupsd-3.10.18.ebuild 2590
-MD5 0477fe3f08b01a504eb26e6763f3982e files/digest-apcupsd-3.10.18 68
+MD5 cc2a2e41cf03239b0e644354e114b6c8 apcupsd-3.10.18-r1.ebuild 2597
+MD5 0477fe3f08b01a504eb26e6763f3982e files/digest-apcupsd-3.10.18-r1 68
+MD5 659d5670233b274842418c62ef15aafb files/digest-apcupsd-3.10.17-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
@@ -23,10 +20,3 @@ 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)
-
-iD8DBQFC7ls1KtJO8LeSoosRAqE1AKCXV1xDcC5M1ITpdBAORyLg7DandwCcDx1Y
-d/tYHOCoFOLXbKura6t+1AQ=
-=RP2a
------END PGP SIGNATURE-----
diff --git a/sys-power/apcupsd/apcupsd-3.10.18.ebuild b/sys-power/apcupsd/apcupsd-3.10.17-r1.ebuild
index 6ff91ae2dc78..f4e561e299d7 100644
--- a/sys-power/apcupsd/apcupsd-3.10.18.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.10.17-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.18.ebuild,v 1.2 2005/08/01 17:25:04 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.10.17-r1.ebuild,v 1.1 2005/08/02 16:51:28 tantive Exp $
 
 inherit eutils depend.apache
 
@@ -70,7 +70,7 @@ src_install() {
 	rm -f "${D}"/etc/init.d/halt
 
 	if use cgi; then
-		insinto ${APACHE_MODULEDIR}
+		insinto ${APACHE2_MODULES_CONFDIR}
 		newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
 	fi
 
diff --git a/sys-power/apcupsd/apcupsd-3.10.17.ebuild b/sys-power/apcupsd/apcupsd-3.10.18-r1.ebuild
index b2787265f78d..8f6364aa3311 100644
--- a/sys-power/apcupsd/apcupsd-3.10.17.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.10.18-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.17.ebuild,v 1.3 2005/05/05 02:31:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.10.18-r1.ebuild,v 1.1 2005/08/02 16:51:28 tantive Exp $
 
 inherit eutils depend.apache
 
@@ -70,8 +70,8 @@ src_install() {
 	rm -f "${D}"/etc/init.d/halt
 
 	if use cgi; then
-		insinto ${APACHE_MODULEDIR}
-		newins ${FILEDIR}/${PV}/apache.conf 60_apcupsd.conf
+		insinto ${APACHE2_MODULES_CONFDIR}
+		newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
 	fi
 
 	insinto /etc/apcupsd
diff --git a/sys-power/apcupsd/files/digest-apcupsd-3.10.17 b/sys-power/apcupsd/files/digest-apcupsd-3.10.17-r1
index 8b197365bdc5..8b197365bdc5 100644
--- a/sys-power/apcupsd/files/digest-apcupsd-3.10.17
+++ b/sys-power/apcupsd/files/digest-apcupsd-3.10.17-r1
diff --git a/sys-power/apcupsd/files/digest-apcupsd-3.10.18 b/sys-power/apcupsd/files/digest-apcupsd-3.10.18-r1
index 34355c479450..34355c479450 100644
--- a/sys-power/apcupsd/files/digest-apcupsd-3.10.18
+++ b/sys-power/apcupsd/files/digest-apcupsd-3.10.18-r1