Remove old version.

Package-Manager: portage-2.2.0_alpha105/cvs/Linux x86_64

4 files changed, 15 insertions, 184 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index 6f1780156e7f..78a6d887ff09 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/apcupsd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.77 2011/10/21 22:06:43 flameeyes Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.78 2012/05/16 02:06:45 flameeyes Exp $
+
+  16 May 2012; Diego E. Pettenò <flameeyes@gentoo.org> -apcupsd-3.14.10.ebuild,
+  -files/apcupsd.init.2:
+  Remove old version.
 
 *apcupsd-3.14.10-r1 (21 Oct 2011)
 
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 278740b9ef1f..caa1c9541f07 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -3,21 +3,23 @@ Hash: SHA1
 
 AUX apcupsd-3.14.9-aliasing.patch 2108 RMD160 c906bdab1976ca3bda05ea55e0f3135dfbc8da9f SHA1 c03d48a0c3a7beb884143fda01d48e526fd634fb SHA256 21343f4798121a828a89eee49ca9fe7574b2fb45a5aad35fbfd5aabec7740761
 AUX apcupsd-udev.rules 328 RMD160 359a2b9e275cdf16b9177224599791c786f93c98 SHA1 c681daa68f6b84ba96522ef4ecff583d1acdc82a SHA256 0865097a99b321301ec5b0bb51d0560a01df0a21cca0ee0df61f8d33f888b86a
-AUX apcupsd.init.2 859 RMD160 81cd9edda39ec6f9cf048811df80d4f9dcd7055d SHA1 25c8134f09c362d6e82c5aa32e77a5f89c5eea1a SHA256 7007a2484547e46da2264d9f817a96387885e91a38407ec30e122ba4b637a030
 AUX apcupsd.init.2a 844 RMD160 13d0f7862c2a1d93a2349e7099f90216f8fe1056 SHA1 70e90bb3e3c1c3dd599a457efc0549627388322d SHA256 86be1bafb0cf72db61def444361c659e5c36d0e44b1a007772b3f49aa0e95bcb
 AUX apcupsd.init.3 659 RMD160 9b3a2b7a172e7a8216992cf3e5dbf3aecc884276 SHA1 6cd1ab596b3c221403101633abc9e87c10446f80 SHA256 c3186646f06666ebd1ef265f5f6d56aeff27587face610d5f73c625b5c6053cc
 AUX apcupsd.powerfail.init 520 RMD160 24f766871652220523a18885f41f6608f29ab670 SHA1 0c5f97e556504904ffd6d72ff27ef792ac70e18c SHA256 eee773aa07175674085cb0ab7ed2c071fcc04fc05383d368f38d056e7327ff35
 DIST apcupsd-3.14.10.tar.gz 1336852 RMD160 bb01535232ee96045ee058ade70ddd39c04b5457 SHA1 4a3d5591672121f5d761d33307b56f10d33f5b67 SHA256 0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032
 DIST apcupsd-3.14.8.tar.gz 1317601 RMD160 f642582e01506ebb986c16df01429e6bb08c7e8b SHA1 cb7a7b401797e129c92a6b8dc2bf7b193b1d6c72 SHA256 8e7f2574d3abaf6637da3e790860c3f9ba64fab1ec7e50bb080de4439441c5a7
 EBUILD apcupsd-3.14.10-r1.ebuild 4073 RMD160 2976b4acfa2d135a4d034ce2c06d87d88ea7142f SHA1 09aafc3953b319644ca5556cf405e8b97fc98f84 SHA256 f634575503a6d2e8a784d15a50515c66979ee367c9a69b664750de4a8dae9cf9
-EBUILD apcupsd-3.14.10.ebuild 4070 RMD160 e50e826c9b4ac56f7e44f1787c9006b5e9c24cb6 SHA1 82634fa6ecc8bc892c52e6b995ae7efbcf68b1aa SHA256 fff8d4bb5152fdfc2d5ffb3efff8fd258fa4f177cf29974ff45bc09d2c9bec5b
 EBUILD apcupsd-3.14.8-r1.ebuild 3863 RMD160 e99024d6a2ad475ed1203f27356e314b1c5cb8f6 SHA1 5bf1e4bfd41d3fa83824bacb740c1b2b9bbb9e33 SHA256 f5d984daecd4a0af67bdd5c44abeea7a4f47ed6ee94623e64e89116ff77e83b5
-MISC ChangeLog 26047 RMD160 191053148d479f100aa20d7fe766e6f2791b08d2 SHA1 636ebcbaa2d573ef6d28e92b76af18eb267fc94d SHA256 51ffe936b13eb579980afce5b07f6e1d7cd6bd406d41b9c4ca53ea860f11e4c7
+MISC ChangeLog 26176 RMD160 2415cb7448489da613918eec3bbe474cce90bce5 SHA1 fdf23264367dad929ad1efb8f7aa390448bc75d4 SHA256 01f9713a765f9af231ac5db5772d31df8d811002fd7957cb198b25c1c0f72284
 MISC metadata.xml 237 RMD160 2a4fab832a64fbdafe2cd6f59b141b2aa80797ac SHA1 75878fb1a17b8617882c9e02331a6643d647882b SHA256 368acc29aa9214adaa137c17b114b16c6a021c4dfc9efa5f3440e968db04a9b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk6h7O8ACgkQAiZjviIA2XiypwCgjOI/guRfqTWPUVoSjN7qX7az
-lu4An0do7BG7U4FB/zq1bndtfk9c2sRj
-=zgTX
+iQEcBAEBAgAGBQJPswvTAAoJEBzRPIrUMBNCTC4H/j7LkNZhABWvRKJVLNmunNSg
+aEIvCc5Z4m1q3+9MUPu/IZi/RhOZcf3pPFFbmMz6c2xeWL9dzmclMu5fQA8W+FlW
+DRRy+zm7+NHctmrDsPov4i2Yu1uAtFVOhJIUYF4RT9LZB4NnF14/N2nrC5c4qIQH
+S1EYcSo9JvEnM098U5ji/oTL6MAeV3s9y/3MfO8MwO3FzgyFPclHWTha8QsnUlvS
+UclcH84COt6GYgO3kSzCgO8zRuLt4CR8lMMq3g5jj+pO+s2+lLhibqiEbkV9/N+r
+XVvoCp8r7tW/PJ/lrmHBtqagSE1wpFLsw8Q/2X1Lw/BnCC1TKKbROc+xRkVK78w=
+=ZjdO
 -----END PGP SIGNATURE-----
diff --git a/sys-power/apcupsd/apcupsd-3.14.10.ebuild b/sys-power/apcupsd/apcupsd-3.14.10.ebuild
deleted file mode 100644
index e984905745ec..000000000000
--- a/sys-power/apcupsd/apcupsd-3.14.10.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.10.ebuild,v 1.1 2011/09/29 13:45:58 flameeyes Exp $
-
-EAPI=4
-
-inherit eutils linux-info flag-o-matic
-
-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="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="snmp +usb cgi nls gnome kernel_linux"
-
-DEPEND="
-	cgi? ( >=media-libs/gd-1.8.4 )
-	nls? ( sys-devel/gettext )
-	snmp? ( net-analyzer/net-snmp )
-	gnome? ( >=x11-libs/gtk+-2.4.0:2
-		dev-libs/glib:2
-		>=gnome-base/gconf-2.0 )"
-RDEPEND="${DEPEND}
-	sys-apps/openrc
-	virtual/mailx"
-
-CONFIG_CHECK="~USB_HIDDEV ~HIDRAW"
-ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV:	needed to access USB-attached UPSes"
-ERROR_HIDRAW="CONFIG_HIDRAW:		needed to access USB-attached UPSes"
-
-pkg_setup() {
-	if use kernel_linux && use usb && linux_config_exists; then
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.14.9-aliasing.patch"
-}
-
-src_configure() {
-	local myconf
-	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=/usr/libexec/${PN}/cgi-bin"
-	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
-}
-
-src_compile() {
-	# Workaround for bug #280674; upstream should really just provide
-	# the text files in the distribution, but I wouldn't count on them
-	# doing that anytime soon.
-	MANPAGER=$(type -p cat) \
-		emake || die "emake failed"
-}
-
-src_install() {
-	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
-
-	dohtml -r doc/manual/*
-
-	rm "${D}"/etc/init.d/apcupsd
-	newinitd "${FILESDIR}/${PN}.init.2" "${PN}"
-	newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail
-
-	# remove hal settings, we don't really want to have it around still.
-	rm -r "${D}"/usr/share/hal
-
-	# replace it with our udev rules if we're in Linux
-	if use kernel_linux; then
-		insinto /lib/udev/rules.d
-		newins "${FILESDIR}"/apcupsd-udev.rules 60-${PN}.rules
-	fi
-
-	# Without this it'll crash at startup. When merging in ROOT= this
-	# won't be created by default, so we want to make sure we got it!
-	keepdir /var/lock
-	fowners root:uucp /var/lock
-	fperms 0775 /var/lock
-}
-
-pkg_postinst() {
-	if use cgi; then
-		elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin."
-		elog "Set up your ScriptAlias or symbolic links accordingly."
-	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 ""
-
-	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 ''
-
-	if use kernel_linux; then
-		elog "Starting from version 3.14.9-r1, ${PN} installs udev rules"
-		elog "for persistent device naming. If you have multiple UPS"
-		elog "connected to the machine, you can point them to the devices"
-		elog "in /dev/apcups/by-id directory."
-	fi
-}
diff --git a/sys-power/apcupsd/files/apcupsd.init.2 b/sys-power/apcupsd/files/apcupsd.init.2
deleted file mode 100644
index 6764e335f40a..000000000000
--- a/sys-power/apcupsd/files/apcupsd.init.2
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/files/apcupsd.init.2,v 1.3 2011/08/22 14:27:25 flameeyes Exp $
-
-INSTANCE="${SVCNAME#*.}"
-if [ -z "${INSTANCE}" ] || [ "${SVCNAME}" = "apcupsd" ]; then
-	INSTANCE="apcupsd"
-fi
-
-depend() {
-	use net
-}
-
-start() {
-	rm -f /etc/apcupsd/powerfail
-
-	export SERVICE="${SVCNAME}"
-
-	ebegin "Starting APC UPS daemon"
-	start-stop-daemon \
-		--start --pidfile "/var/run/${SVCNAME}.pid" \
-		--wait 3000 \
-		--exec /sbin/apcupsd -- \
-		-f "/etc/apcupsd/${INSTANCE}.conf" \
-		-P "/var/run/${SVCNAME}.pid"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping APC UPS daemon"
-	start-stop-daemon \
-		--stop --pidfile "/var/run/${SVCNAME}.pid" \
-            	--retry TERM/5/TERM/5 \
-		--exec /sbin/apcupsd
-	eend $?
-}
-