Moved binaries to /sbin.

Package-Manager: portage-2.1_pre6-r5

4 files changed, 137 insertions, 7 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index d5507ba4022e..f0b06a8810ac 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.14 2006/03/19 22:49:08 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.15 2006/03/22 23:00:35 tantive Exp $
+
+*apcupsd-3.12.2-r1 (22 Mar 2006)
+
+  22 Mar 2006; Michael Imhof <tantive@gentoo.org> +apcupsd-3.12.2-r1.ebuild:
+  Moved binaries to /sbin.
 
 *apcupsd-3.12.2 (19 Mar 2006)
 
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 4f23e77e01c9..352c12d3c118 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 80ea698f906abe22b0d4c96691dfa18a ChangeLog 12901
-RMD160 98b07029d7a534f232921145be7dfed8f0079105 ChangeLog 12901
-SHA256 8f7e21359e92d036f41e0075e0385a34b6036e1f48975c43fd9c7ad3d2a0080f ChangeLog 12901
+MD5 35694377f24d21ea40a0a378b4134e08 ChangeLog 13040
+RMD160 e1f1f52ce5e922222b56f4c8f6d66a2144b4c79d ChangeLog 13040
+SHA256 eeecd7cf1345e83e2fe1d140ba5f5d29d249874b84780bcb1b2b7e75678e76da ChangeLog 13040
 MD5 90addc3e3ec4f77230cd7f491e1da84a apcupsd-3.10.15-r1.ebuild 2421
 RMD160 9d05503d24274a114ad4e213b11db8363cff0d0f apcupsd-3.10.15-r1.ebuild 2421
 SHA256 3292605ea68c9fff0174dff15d8a11b8cca49b817e8e689a1949233ee5d74b7b apcupsd-3.10.15-r1.ebuild 2421
@@ -19,6 +19,9 @@ SHA256 552711e51eddebe17358abe62e6939bc785eb54bd27a0d28910d4b17d25b84f8 apcupsd-
 MD5 379cc7a11341db7b6186cb42376596c7 apcupsd-3.10.18-r2.ebuild 3172
 RMD160 7aa3bb8eedeb783fe7112c9099743c170c088ebf apcupsd-3.10.18-r2.ebuild 3172
 SHA256 42c944661a74a7fe566c0e9c3d24f0e7dc10d562f5eea60faa7046b01092cead apcupsd-3.10.18-r2.ebuild 3172
+MD5 b6faff38418ff185dd7e911ab747b507 apcupsd-3.12.2-r1.ebuild 3176
+RMD160 aaa8b5ed7431614e464ea4299c06730f69ba9364 apcupsd-3.12.2-r1.ebuild 3176
+SHA256 97a117e9c5c2157158ba269a851086cede279ea1ab591e65caa9c217b1b51903 apcupsd-3.12.2-r1.ebuild 3176
 MD5 1d5065e3f38789c2b8bb156a3035b95e apcupsd-3.12.2.ebuild 3177
 RMD160 c6755d4cf1c95119af4fcaebb2c22e8fad6add2b apcupsd-3.12.2.ebuild 3177
 SHA256 66be1a01eaea96c497d9b77201f6df1869acd8b1aa0052f491b7a7fb60b645c3 apcupsd-3.12.2.ebuild 3177
@@ -91,13 +94,16 @@ SHA256 45730367d24563d1f23754b2c2ec072644958cef6b6f388ac846a33f92ad8542 files/di
 MD5 06d14a07f56b8e37942a35aca6775fb7 files/digest-apcupsd-3.12.2 247
 RMD160 a7659388f720f0d6baf34de057fcc2046e8b1ea9 files/digest-apcupsd-3.12.2 247
 SHA256 d5a28f7712874ee6af744bead8a58cbf5a74d9816070a924905badaf2a4a6649 files/digest-apcupsd-3.12.2 247
+MD5 06d14a07f56b8e37942a35aca6775fb7 files/digest-apcupsd-3.12.2-r1 247
+RMD160 a7659388f720f0d6baf34de057fcc2046e8b1ea9 files/digest-apcupsd-3.12.2-r1 247
+SHA256 d5a28f7712874ee6af744bead8a58cbf5a74d9816070a924905badaf2a4a6649 files/digest-apcupsd-3.12.2-r1 247
 MD5 27ae5add10fc42e77804f1ecd768df87 metadata.xml 226
 RMD160 e0ca1098a8ced8b212c797e8d3343fed766ba485 metadata.xml 226
 SHA256 ab1d24920d852e21a852c10c1ec15d5d0cfe91752a67e9eca902177081d6e1c2 metadata.xml 226
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFEHeANKtJO8LeSoosRApBcAJ9INlhR6/Mgd5S4OX+oSDXPf25UMwCgoFPS
-Dm/9RBzJHRNaqrLATxm/7+Y=
-=ncD6
+iD8DBQFEIdc7KtJO8LeSoosRAo65AJ9rpR7l3W9iiQKa46fia2aZxzeUDwCfZAQM
+2CzEjh24GDCme65ORcBvkXw=
+=5D/D
 -----END PGP SIGNATURE-----
diff --git a/sys-power/apcupsd/apcupsd-3.12.2-r1.ebuild b/sys-power/apcupsd/apcupsd-3.12.2-r1.ebuild
new file mode 100644
index 000000000000..02511f743c53
--- /dev/null
+++ b/sys-power/apcupsd/apcupsd-3.12.2-r1.ebuild
@@ -0,0 +1,116 @@
+# 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.2-r1.ebuild,v 1.1 2006/03/22 23:00:35 tantive Exp $
+
+inherit eutils depend.apache
+
+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 ~sparc ~x86"
+IUSE="doc snmp usb apache2 cgi threads ncurses nls lighttpd"
+
+DEPEND="snmp? ( net-analyzer/net-snmp )
+	cgi? ( >=media-libs/gd-1.8.4
+		apache2? ( >=net-www/apache-2.0.54-r30 )
+		lighttpd? ( www-servers/lighttpd )
+		)
+	ncurses? ( sys-libs/ncurses )
+	nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}
+	virtual/mta"
+
+XPIDDIR=/var/run
+XLOGDIR=/var/log
+XLOCKDIR=/var/lock
+XSYSCONFDIR=/etc/apcupsd
+XPWRFAILDIR=${XSYSCONFDIR}
+
+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-css-dir=/var/www/apcupsd --with-cgi-bin=/var/www/apcupsd"
+	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 \
+		--sysconfdir=${XSYSCONFDIR} \
+		--with-pwrfail-dir=${XPWRFAILDIR} \
+		--with-lock-dir=${XLOCKDIR} \
+		--with-pid-dir=${XPIDDIR} \
+		--with-log-dir=${XLOGDIR} \
+		--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
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "installed failed"
+	rm -f "${D}"/etc/init.d/halt
+
+	if use cgi; then
+		if use apache2; then
+			insinto ${APACHE2_MODULES_CONFDIR}
+			newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
+		fi
+
+		if use lighttpd; then
+			insinto /etc/lighttpd
+			newins ${FILESDIR}/${PV}/apcupsd-lighttpd.conf apcupsd.conf
+			einfo "The configuration file ${ROOT}/etc/lighttpd/apcupsd.conf should"
+			einfo "be included in lighttpd.conf configuration file to enable apcupsd"
+			einfo "alias and cgi execution."
+		fi
+	fi
+
+	insinto /etc/apcupsd
+	newins examples/safe.apccontrol safe.apccontrol
+
+	cd ${D}/etc/apcupsd
+
+	ln -s onbattery powerout
+
+	if use doc; then
+		einfo "Installing full documentation into /usr/share/doc/${P}..."
+		cd ${S}/doc
+		dodoc README.*
+		docinto developers_manual
+		dodoc developers_manual/*
+		docinto logo
+		dodoc logo/*
+		docinto manual
+		dodoc manual/*
+		docinto old_documents
+		dodoc old_documents/*
+		docinto vim
+		dodoc vim/*
+	fi
+}
diff --git a/sys-power/apcupsd/files/digest-apcupsd-3.12.2-r1 b/sys-power/apcupsd/files/digest-apcupsd-3.12.2-r1
new file mode 100644
index 000000000000..ba41a20289a5
--- /dev/null
+++ b/sys-power/apcupsd/files/digest-apcupsd-3.12.2-r1
@@ -0,0 +1,3 @@
+MD5 f771fafbc06551e7820bd3d277b5cce3 apcupsd-3.12.2.tar.gz 4219660
+RMD160 0076affa09d1dcd5efda36d30a22161c797b9bde apcupsd-3.12.2.tar.gz 4219660
+SHA256 755cd2bffc4090c58979a87ed3f9135afd1846153feb8a39fad95f745adbd347 apcupsd-3.12.2.tar.gz 4219660