3 files changed, 16 insertions, 119 deletions
diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index 2cc1cd219437..049e33dead81 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.61 2009/12/29 18:45:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.62 2009/12/29 18:47:52 flameeyes Exp $
+
+  29 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -apcupsd-3.14.6.ebuild:
+  Cleanup old version.
 
   29 Dec 2009; Raúl Porcel <armin76@gentoo.org> apcupsd-3.14.7.ebuild:
   sparc stable wrt #295424
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 1b4b50f39c92..38faa7a51677 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -1,8 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX apcupsd.init.2 838 RMD160 fdca4e15d5f475c43147ce65624a4355e6ed9279 SHA1 b34596c601f368ed5028d661f7dd79630bfef4a9 SHA256 9c60e920d5946ff581b38c33087ec6a1ed7d8885bc2c9c5621932f5e7c8571d3
 AUX apcupsd.powerfail.init 520 RMD160 24f766871652220523a18885f41f6608f29ab670 SHA1 0c5f97e556504904ffd6d72ff27ef792ac70e18c SHA256 eee773aa07175674085cb0ab7ed2c071fcc04fc05383d368f38d056e7327ff35
-DIST apcupsd-3.14.6.tar.gz 4269348 RMD160 67ff929e10373661545c588a7fba630ffdfe3ab9 SHA1 19d33626a7002f86ede5d1784697b08dacb3fc6c SHA256 ddfeb4dd90a5c6d4cc8a487492efeb75f8c3ce1c955948bde97cebad51e8d1a3
 DIST apcupsd-3.14.7.tar.gz 4272089 RMD160 cb3db3e6e123f39666eef3c5ccfdec65c57a1571 SHA1 9561eb5cf8e0c627215b987dbb97d026a2b2e9b8 SHA256 7e3df3b5552394206f4b8aaac2bd85ac69df540495557676a3df63f84972823c
-EBUILD apcupsd-3.14.6.ebuild 3285 RMD160 831d05288b625921d37dde9f4b79c7593beb00f4 SHA1 b52b60e2d6cc6f5ce15c88f10b9f823673d9c8d9 SHA256 eacb556467960577b377cf58156b9fa3f84929dae18d32b83c53f84853e1910a
 EBUILD apcupsd-3.14.7.ebuild 4069 RMD160 10b51601cd82cb40f45e2a109e721d2d62f21288 SHA1 ade2461ea230b0e103f93e3bc123f95f3546b7b1 SHA256 d9c7823f9f355b95885be3892fd1d687737627451e766eb84afa76a09812c4c7
-MISC ChangeLog 23029 RMD160 d6cde8b3ef4f20f052381b6ed93d0fc139168ced SHA1 88a342c2d3da8bc12e499b5c18de6aa9ef065524 SHA256 fe03f8f4263ab9a4acc8fa834299aeeb0fb210aa668ab1f5135ad642e540f3f7
+MISC ChangeLog 23137 RMD160 22e46f5bfda0f79c81cd1613fe6e23bc9c96f432 SHA1 7493c556e8fc75ec8ade7c6279c45e90063d0c48 SHA256 4518e23a8cfbf5297bd451c414cd5d08f791528b2fa0e9d369eb8f745234e200
 MISC metadata.xml 237 RMD160 2a4fab832a64fbdafe2cd6f59b141b2aa80797ac SHA1 75878fb1a17b8617882c9e02331a6643d647882b SHA256 368acc29aa9214adaa137c17b114b16c6a021c4dfc9efa5f3440e968db04a9b3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAks6TuMACgkQAiZjviIA2XgVSgCgvopSj/7rIgsR63+CKKW4VoHY
+ehoAn1LMBxq2+paWZtJXnBMOr1EMgrCD
+=1/eb
+-----END PGP SIGNATURE-----
diff --git a/sys-power/apcupsd/apcupsd-3.14.6.ebuild b/sys-power/apcupsd/apcupsd-3.14.6.ebuild
deleted file mode 100644
index 9184255b311c..000000000000
--- a/sys-power/apcupsd/apcupsd-3.14.6.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.6.ebuild,v 1.6 2009/11/18 18:36:15 armin76 Exp $
-
-WEBAPP_MANUAL_SLOT="yes"
-WEBAPP_OPTIONAL="yes"
-inherit eutils webapp
-
-DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
-HOMEPAGE="http://www.apcupsd.org/"
-SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86 ~x86-fbsd"
-IUSE="snmp usb cgi nls gnome"
-
-DEPEND="
-	cgi? ( >=media-libs/gd-1.8.4
-		${WEBAPP_DEPEND} )
-	nls? ( sys-devel/gettext )
-	snmp? ( net-analyzer/net-snmp )
-	gnome? ( >=x11-libs/gtk+-2.4.0
-		>=dev-libs/glib-2.0
-		>=gnome-base/gconf-2.0 )"
-RDEPEND="${DEPEND}
-	virtual/mailx"
-
-pkg_setup() {
-	use cgi && webapp_pkg_setup
-}
-
-src_compile() {
-	local myconf
-	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=${MY_CGIBINDIR}"
-	if use usb; then
-		myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev= "
-	else
-		myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb"
-	fi
-
-	# We force the DISTNAME to gentoo so it will use gentoo's layout also
-	# when installed on non-linux systems.
-	econf \
-		--sbindir=/sbin \
-		--sysconfdir=/etc/apcupsd \
-		--with-pwrfail-dir=/etc/apcupsd \
-		--with-lock-dir=/var/lock \
-		--with-pid-dir=/var/run \
-		--with-log-dir=/var/log \
-		--with-nis-port=3551 \
-		--enable-net --enable-pcnet \
-		--with-distname=gentoo \
-		$(use_enable snmp net-snmp) \
-		$(use_enable gnome gapcmon) \
-		${myconf} \
-		APCUPSD_MAIL=/bin/mail \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	use cgi && webapp_src_preinst
-
-	emake DESTDIR="${D}" install || die "installed failed"
-	rm -f "${D}"/etc/init.d/halt
-
-	insinto /etc/apcupsd
-	newins examples/safe.apccontrol safe.apccontrol
-
-	dodoc ChangeLog* ReleaseNotes
-	doman doc/*.8 doc/*.5 || die "doman failed"
-
-	dohtml -r doc/manual/* || die "dodoc failed"
-
-	use cgi && webapp_src_install
-
-	rm "${D}"/etc/init.d/apcupsd
-	newinitd "${FILESDIR}/${PN}.init.2" "${PN}" || die "newinitd failed"
-
-	if has_version sys-apps/openrc; then
-		newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail || die "newinitd failed"
-	fi
-}
-
-pkg_postinst() {
-	if use cgi; then
-		elog "If you are upgrading from a previous version, please note"
-		elog "that the CGI interface is now installed using webapp-config."
-		elog "/var/www/apcupsd is no longer present."
-		webapp_pkg_postinst
-	fi
-
-	elog ""
-	elog "Since version 3.14.0 you can use multiple apcupsd instances to"
-	elog "control more than one UPS in a single box."
-	elog "To do this, create a link between /etc/init.d/apcupsd to a new"
-	elog "/etc/init.d/apcupsd.something, and it will then load the"
-	elog "configuration file at /etc/apcupsd/something.conf."
-	elog ""
-
-	if [ -d "${ROOT}"/etc/runlevels/shutdown -a \
-			! -e "${ROOT}"/etc/runlevels/shutdown/"${PN}".powerfail ] ; then
-		elog 'If you want apcupsd to power off your UPS when it'
-		elog 'shuts down your system in a power failure, you must'
-		elog 'add apcupsd.powerfail to your shutdown runlevel:'
-		elog ''
-		elog ' \e[01m rc-update add apcupsd.powerfail shutdown \e[0m'
-		elog ''
-	fi
-}
-
-pkg_prerm() {
-	use cgi && webapp_pkg_prerm
-}