Version bumped.

Package-Manager: portage-2.1.1_rc1

6 files changed, 340 insertions, 9 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index 915b5d1c2103..be3aceb7b906 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.19 2006/06/21 18:28:36 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.20 2006/08/27 09:19:49 tantive Exp $
+
+*apcupsd-3.12.4 (27 Aug 2006)
+
+  27 Aug 2006; Michael Imhof <tantive@gentoo.org>
+  +files/3.12.4/apcupsd.in.patch, +files/3.12.4/etc.patch,
+  +apcupsd-3.12.4.ebuild:
+  Version bumped.
 
 *apcupsd-3.12.3 (21 Jun 2006)
 
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index bf2e22d8acbd..a5c91b302995 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -77,12 +77,21 @@ AUX 3.12.3/etc.patch 3710 RMD160 c20497fd4f137cfecb3962610bfcc2c57f62c890 SHA1 e
 MD5 ceb8a56c8234598dad868dcf3b366e9f files/3.12.3/etc.patch 3710
 RMD160 c20497fd4f137cfecb3962610bfcc2c57f62c890 files/3.12.3/etc.patch 3710
 SHA256 046cca492d0ff932c9c5b5cf2e36d48d5cdb8a0a6cbac19791d3be72ba92813f files/3.12.3/etc.patch 3710
+AUX 3.12.4/apcupsd.in.patch 315 RMD160 65ad8ff91d1280cdfc817aa15428dc3f3ecff250 SHA1 f62f104f790a60ae84e6570b9f181b838a4868ca SHA256 230e8e436fffef7c2bac52dfe522a160fdf6c27f1a15215ba8acdc2c73665e78
+MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.12.4/apcupsd.in.patch 315
+RMD160 65ad8ff91d1280cdfc817aa15428dc3f3ecff250 files/3.12.4/apcupsd.in.patch 315
+SHA256 230e8e436fffef7c2bac52dfe522a160fdf6c27f1a15215ba8acdc2c73665e78 files/3.12.4/apcupsd.in.patch 315
+AUX 3.12.4/etc.patch 3710 RMD160 c20497fd4f137cfecb3962610bfcc2c57f62c890 SHA1 ed4127a156151296be54e92fe328cdc4744daea9 SHA256 046cca492d0ff932c9c5b5cf2e36d48d5cdb8a0a6cbac19791d3be72ba92813f
+MD5 ceb8a56c8234598dad868dcf3b366e9f files/3.12.4/etc.patch 3710
+RMD160 c20497fd4f137cfecb3962610bfcc2c57f62c890 files/3.12.4/etc.patch 3710
+SHA256 046cca492d0ff932c9c5b5cf2e36d48d5cdb8a0a6cbac19791d3be72ba92813f files/3.12.4/etc.patch 3710
 DIST apcupsd-3.10.15.tar.gz 3858266 RMD160 a8f0b69a5622057ccf8ff97c1f1f56ef1305d9c1 SHA256 04179f7369a3a24816e94605b973ba739a2b22e80e2765159f457515a6c96e5a
 DIST apcupsd-3.10.16.tar.gz 5037822 RMD160 e0db09c40c9ae103ac7fce66280050d0fa328688 SHA256 2d9f280fde4b9e64cc8bba8e79d1f0e153a35dfe4aaec02cfc00cf7bc0bec31e
 DIST apcupsd-3.10.17.tar.gz 5662277 RMD160 6d1766a8f957d0a08811371d0473e8bf6bd854ef SHA256 8eb6d0dd5fb8973356dd4e335de4e5df3fc559bff4713a87fd29798a46d5e78c
 DIST apcupsd-3.10.18.tar.gz 5698299 RMD160 ebaf99e097d836ff8858cf653a825928058f54dd SHA1 a4e0f968be13c833ec25869f686e44c5a34e7964 SHA256 ae42d64e5cb29c8ce291f634139b5c81e888c95686f5c70ac9c250a1d8c02a38
 DIST apcupsd-3.12.2.tar.gz 4219660 RMD160 0076affa09d1dcd5efda36d30a22161c797b9bde SHA1 fc15bf94be00dfaf255a2f4a0bced717525670e9 SHA256 755cd2bffc4090c58979a87ed3f9135afd1846153feb8a39fad95f745adbd347
 DIST apcupsd-3.12.3.tar.gz 4222539 RMD160 0f801e9405f79af6d70e56868d222f80f8bb1583 SHA1 cd5b342ad7766af72999bb6f97447e9144ee3544 SHA256 871dc9957998f9f23a92d3e2bfd38a28aad0a7972a9bd6652c1d045f3db45132
+DIST apcupsd-3.12.4.tar.gz 4223158 RMD160 a54c2f6d71c902d7963a1c65a3850f657aabaa88 SHA1 a36212d9634d36beda2318d85b882209763f2473 SHA256 e2c789089a71f8bafc2812a5e20b73f5420e4c234961afb53a30f6ff891640ba
 EBUILD apcupsd-3.10.15-r1.ebuild 2421 RMD160 9d05503d24274a114ad4e213b11db8363cff0d0f SHA1 3cbf1739c3dcbebb9f44096c3dc8449db9e40f65 SHA256 3292605ea68c9fff0174dff15d8a11b8cca49b817e8e689a1949233ee5d74b7b
 MD5 90addc3e3ec4f77230cd7f491e1da84a apcupsd-3.10.15-r1.ebuild 2421
 RMD160 9d05503d24274a114ad4e213b11db8363cff0d0f apcupsd-3.10.15-r1.ebuild 2421
@@ -115,10 +124,14 @@ EBUILD apcupsd-3.12.3.ebuild 3015 RMD160 8ef52d0ec7ea8ddd07350d8a0b7b616601b5ceb
 MD5 78412aa20eae16446f02b8cb1d9738e4 apcupsd-3.12.3.ebuild 3015
 RMD160 8ef52d0ec7ea8ddd07350d8a0b7b616601b5ceb7 apcupsd-3.12.3.ebuild 3015
 SHA256 8043a6a1ab76e5259cffb5ce8e7ff7f5163502c9f7cd850d5a8da9309396b612 apcupsd-3.12.3.ebuild 3015
-MISC ChangeLog 13714 RMD160 08162478ba160aed5dd2732b22439441623485c0 SHA1 3c45f3775a3d189b395710f359704283a9b3ab07 SHA256 0f755ef9108aa28df5cdd38d02c778b00fd457d97466bef246b5fdf06030575b
-MD5 f2c6cb25c48a442200d6892d16b46abd ChangeLog 13714
-RMD160 08162478ba160aed5dd2732b22439441623485c0 ChangeLog 13714
-SHA256 0f755ef9108aa28df5cdd38d02c778b00fd457d97466bef246b5fdf06030575b ChangeLog 13714
+EBUILD apcupsd-3.12.4.ebuild 3015 RMD160 84946e92168dc7f7585c7084fd4fe41593e947d1 SHA1 8278eb38df2669c9228201883b8350c315a3fbcd SHA256 5560e32ae8fcee02066fb1ba5af76d0422166abbdbf0e085e1ef7a421b9f16bd
+MD5 7122d127a3f46fc30fa0cd1b45d7133d apcupsd-3.12.4.ebuild 3015
+RMD160 84946e92168dc7f7585c7084fd4fe41593e947d1 apcupsd-3.12.4.ebuild 3015
+SHA256 5560e32ae8fcee02066fb1ba5af76d0422166abbdbf0e085e1ef7a421b9f16bd apcupsd-3.12.4.ebuild 3015
+MISC ChangeLog 13899 RMD160 9ca95aaf80d311cdf803a43f75131262e98d5c4d SHA1 39e20571ff5f854eff473fc7cdfc2f37441f3cef SHA256 f058b752a4a92e8e1a7e6188297885ab9e1337819832f1aa0a11df683cd3ffd2
+MD5 ee69595aa16728047efc854e52f2d576 ChangeLog 13899
+RMD160 9ca95aaf80d311cdf803a43f75131262e98d5c4d ChangeLog 13899
+SHA256 f058b752a4a92e8e1a7e6188297885ab9e1337819832f1aa0a11df683cd3ffd2 ChangeLog 13899
 MISC metadata.xml 226 RMD160 e0ca1098a8ced8b212c797e8d3343fed766ba485 SHA1 360c056f345a7b50026e93de38b0167f4193904f SHA256 ab1d24920d852e21a852c10c1ec15d5d0cfe91752a67e9eca902177081d6e1c2
 MD5 27ae5add10fc42e77804f1ecd768df87 metadata.xml 226
 RMD160 e0ca1098a8ced8b212c797e8d3343fed766ba485 metadata.xml 226
@@ -147,10 +160,13 @@ SHA256 a0e6d8c7c66b0000c363f7983fb3dc6f6de72bc0235c105cbe4acb2fe283733e files/di
 MD5 4119bf960ffbbef251d36f93c2d749cd files/digest-apcupsd-3.12.3 247
 RMD160 67070772e72bd1b4ad1b02d909d30a37a3ea0eb1 files/digest-apcupsd-3.12.3 247
 SHA256 d58799a245c99f70317f119d8a5efa2743aec4dc47d4b4299bed0e75e8b3a9f4 files/digest-apcupsd-3.12.3 247
+MD5 c3ff7448e5d220ac620e4b47c6f07152 files/digest-apcupsd-3.12.4 247
+RMD160 7d8135db6d69f367b6f756836b61d75921c3bb00 files/digest-apcupsd-3.12.4 247
+SHA256 d5ada22441893d49204b66ed425a7b2b9081e985824ebb9a55b67b3001e98a42 files/digest-apcupsd-3.12.4 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEmZAQKtJO8LeSoosRAiLjAKCncdxJ28zVYwaBjqDo9t8huEOo9wCfRgcG
-E3bSSQMX8sk3UE9UqLLeJH4=
-=tboj
+iD8DBQFE8WPeKtJO8LeSoosRAl0BAJ4rfTT8hL6USbNq+74jqVwcpL391wCbBGPB
+Ag6W+4+cqKZlv2lmtDrwIB0=
+=r40n
 -----END PGP SIGNATURE-----
diff --git a/sys-power/apcupsd/apcupsd-3.12.4.ebuild b/sys-power/apcupsd/apcupsd-3.12.4.ebuild
new file mode 100644
index 000000000000..d8238f920c28
--- /dev/null
+++ b/sys-power/apcupsd/apcupsd-3.12.4.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.12.4.ebuild,v 1.1 2006/08/27 09:19:49 tantive Exp $
+
+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"
+WEBAPP_MANUAL_SLOT="yes"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="doc snmp usb cgi threads ncurses nls"
+
+DEPEND="doc? ( virtual/tetex
+		dev-tex/latex2html )
+	cgi? ( >=media-libs/gd-1.8.4 )
+	ncurses? ( sys-libs/ncurses )
+	nls? ( sys-devel/gettext )
+	snmp? ( net-analyzer/net-snmp )"
+RDEPEND="${DEPEND}
+	virtual/mta"
+
+pkg_setup() {
+	use cgi && webapp_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/platforms/gentoo
+	epatch ${FILESDIR}/${PV}/apcupsd.in.patch
+
+	cd ${S}/platforms
+	epatch ${FILESDIR}/${PV}/etc.patch
+
+	# Avoid usage of install -s, leave to portage stripping binaries
+	sed -i -e 's:(INSTALL_PROGRAM) -s:(INSTALL_PROGRAM):g' \
+		${S}/src/Makefile.in ${S}/src/cgi/Makefile.in
+}
+
+src_compile() {
+	local myconf
+	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=${MY_CGIBINDIR}"
+	use usb && myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb"
+	use !usb && myconf="${myconf} --with-upstype=apcsmart --with-upscable=apcsmart --disable-usb"
+
+	# We force the DISTNAME to gentoo so it will use gentoo's layout also
+	# when installed on non-linux systems.
+	DISTNAME=gentoo APCUPSD_MAIL=/usr/sbin/sendmail ./configure \
+		--prefix=/usr \
+		--sbindir=/sbin \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/apcupsd \
+		--with-pwrfail-dir=/etc/apcupsd \
+		--with-lock-dir=/var/lock \
+		--with-pid-dir=/var/run \
+		--with-log-dir=/var/log \
+		--with-net-port=6666 \
+		--with-nis-port=3551 \
+		--enable-net \
+		--enable-oldnet \
+		--enable-master-slave \
+		$(use_enable ncurses powerflute) \
+		$(use_enable threads pthreads) \
+		$(use_enable snmp net-snmp) \
+		$(use_enable nls) \
+		${myconf} \
+		|| die
+	make || die
+
+	if use doc; then
+		einfo "Building full documentation..."
+		cd ${S}/doc/latex
+		make texcheck tex web pdf
+	fi
+}
+
+src_install() {
+	use cgi && webapp_src_preinst
+
+	make 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
+	mv doc/apctest.man doc/apctest.8; doman doc/apctest.8
+
+	if use doc; then
+		einfo "Installing full documentation..."
+		newdoc doc/latex/apcupsd.pdf manual.pdf
+		dohtml -r doc/latex/apcupsd/*
+	fi
+
+	if use cgi; then
+		mv ${D}/etc/apcupsd/apcupsd.css ${D}${MY_CGIBINDIR}
+		webapp_src_install
+	fi
+}
+
+pkg_postinst() {
+	if use cgi; then
+		einfo If you are upgrading from a previous version, please note
+		einfo that the CGI interface is now installed using webapp-config.
+		einfo /var/www/apcupsd is no longer present.
+		webapp_pkg_postinst
+	fi
+}
+
+pkg_prerm() {
+	use cgi && webapp_pkg_prerm
+}
diff --git a/sys-power/apcupsd/files/3.12.4/apcupsd.in.patch b/sys-power/apcupsd/files/3.12.4/apcupsd.in.patch
new file mode 100644
index 000000000000..7bcb0f41c086
--- /dev/null
+++ b/sys-power/apcupsd/files/3.12.4/apcupsd.in.patch
@@ -0,0 +1,15 @@
+--- apcupsd.in	2002-09-14 14:03:18.000000000 +0200
++++ apcupsd.in.new	2003-11-06 16:34:28.000000000 +0100
+@@ -6,6 +6,12 @@
+ APCPID=@PIDDIR@/apcupsd.pid
+ APCUPSD=@sbindir@/apcupsd
+ 
++depend() {
++	after hotplug
++	after usb
++	after net
++}
++
+ start() {
+ 	rm -f /etc/apcupsd/powerfail
+ 	ebegin "Starting APC UPS daemon"
diff --git a/sys-power/apcupsd/files/3.12.4/etc.patch b/sys-power/apcupsd/files/3.12.4/etc.patch
new file mode 100644
index 000000000000..a3acfdbd6fe4
--- /dev/null
+++ b/sys-power/apcupsd/files/3.12.4/etc.patch
@@ -0,0 +1,175 @@
+diff -cwb etc.bak/changeme.in etc/changeme.in
+*** etc.bak/changeme.in	Sun Mar 19 01:39:52 2006
+--- etc/changeme.in	Sun Mar 19 01:41:31 2006
+***************
+*** 13,21 ****
+  #
+  (
+     echo "Subject: $MSG"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+  exit 0
+--- 13,22 ----
+  #
+  (
+     echo "Subject: $MSG"
++    echo "To: $SYSADMIN"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL $SYSADMIN
+  exit 0
+diff -cwb etc.bak/commfailure.in etc/commfailure.in
+*** etc.bak/commfailure.in	Sun Mar 19 01:39:52 2006
+--- etc/commfailure.in	Sun Mar 19 01:41:51 2006
+***************
+*** 13,21 ****
+  #
+  (
+     echo "Subject: $MSG"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+  exit 0
+--- 13,22 ----
+  #
+  (
+     echo "Subject: $MSG"
++    echo "To: $SYSADMIN"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL $SYSADMIN
+  exit 0
+diff -cwb etc.bak/commok.in etc/commok.in
+*** etc.bak/commok.in	Sun Mar 19 01:39:52 2006
+--- etc/commok.in	Sun Mar 19 01:42:05 2006
+***************
+*** 13,21 ****
+  #
+  (
+     echo "Subject: $MSG"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+  exit 0
+--- 13,22 ----
+  #
+  (
+     echo "Subject: $MSG"
++    echo "To: $SYSADMIN"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL $SYSADMIN
+  exit 0
+diff -cwb etc.bak/masterconnect.in etc/masterconnect.in
+*** etc.bak/masterconnect.in	Sun Mar 19 01:39:52 2006
+--- etc/masterconnect.in	Sun Mar 19 01:42:22 2006
+***************
+*** 13,21 ****
+  #
+  (
+     echo "Subject: $MSG"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+  exit 0
+--- 13,22 ----
+  #
+  (
+     echo "Subject: $MSG"
++    echo "To: $SYSADMIN"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL $SYSADMIN
+  exit 0
+diff -cwb etc.bak/mastertimeout.in etc/mastertimeout.in
+*** etc.bak/mastertimeout.in	Sun Mar 19 01:39:52 2006
+--- etc/mastertimeout.in	Sun Mar 19 01:42:35 2006
+***************
+*** 13,21 ****
+  #
+  (
+     echo "Subject: $MSG"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+  exit 0
+--- 13,22 ----
+  #
+  (
+     echo "Subject: $MSG"
++    echo "To: $SYSADMIN"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL $SYSADMIN
+  exit 0
+diff -cwb etc.bak/offbattery.in etc/offbattery.in
+*** etc.bak/offbattery.in	Sun Mar 19 01:39:52 2006
+--- etc/offbattery.in	Sun Mar 19 01:42:53 2006
+***************
+*** 13,21 ****
+  #
+  (
+     echo "Subject: $MSG"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+  exit 0
+--- 13,22 ----
+  #
+  (
+     echo "Subject: $MSG"
++    echo "To: $SYSADMIN"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL $SYSADMIN
+  exit 0
+diff -cwb etc.bak/onbattery.in etc/onbattery.in
+*** etc.bak/onbattery.in	Sun Mar 19 01:39:52 2006
+--- etc/onbattery.in	Sun Mar 19 01:43:10 2006
+***************
+*** 13,21 ****
+  #
+  (
+     echo "Subject: $MSG"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+  exit 0
+--- 13,22 ----
+  #
+  (
+     echo "Subject: $MSG"
++    echo "To: $SYSADMIN"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL $SYSADMIN
+  exit 0
diff --git a/sys-power/apcupsd/files/digest-apcupsd-3.12.4 b/sys-power/apcupsd/files/digest-apcupsd-3.12.4
new file mode 100644
index 000000000000..a2fc4f98671d
--- /dev/null
+++ b/sys-power/apcupsd/files/digest-apcupsd-3.12.4
@@ -0,0 +1,3 @@
+MD5 669c833ec02a2bc29fa98f845e5f5de5 apcupsd-3.12.4.tar.gz 4223158
+RMD160 a54c2f6d71c902d7963a1c65a3850f657aabaa88 apcupsd-3.12.4.tar.gz 4223158
+SHA256 e2c789089a71f8bafc2812a5e20b73f5420e4c234961afb53a30f6ff891640ba apcupsd-3.12.4.tar.gz 4223158