Proper use of the usb use flag. Closes #54925.

diff --git a/sys-apps/apcupsd/ChangeLog b/sys-apps/apcupsd/ChangeLog
index b7cdfe47f4886d9149dda2ccd6ce26752719f896..03309adfa037b7ff7c6b33b519f6f95852c14262 100644 (file)
--- a/sys-apps/apcupsd/ChangeLog
+++ b/sys-apps/apcupsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/apcupsd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.52 2004/11/24 06:39:20 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.53 2004/12/01 23:28:16 tantive Exp $
+
+*apcupsd-3.10.16-r2 (02 Dec 2004)
+
+  02 Dec 2004; Michael Imhof <tantive@gentoo.org> +apcupsd-3.10.16-r2.ebuild:
+  Proper use of the usb use flag. Closes #54925.
 
   23 Nov 2004; Scott W Taylor <swtaylor@gentoo.org>
   apcupsd-3.10.16-r1.ebuild:

diff --git a/sys-apps/apcupsd/Manifest b/sys-apps/apcupsd/Manifest
index 8571d03935e04d917dcfc3a5eeedb86d4a5ec6dd..cb169531580f2087e11958bde3d0377b5bfbb86e 100644 (file)
--- a/sys-apps/apcupsd/Manifest
+++ b/sys-apps/apcupsd/Manifest
@@ -1,14 +1,26 @@
-MD5 3a2fe70dd5b43789a141ae0ed68495c0 apcupsd-3.10.16-r1.ebuild 2546
-MD5 74e598a06446374ea9bbc4c86d8501a7 apcupsd-3.10.15-r1.ebuild 2486
-MD5 85c7e65cfe79ec2013b13424e166f705 ChangeLog 9579
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 27ae5add10fc42e77804f1ecd768df87 metadata.xml 226
-MD5 ec48a12c6d8b56aeffbeaa629f8835ad files/digest-apcupsd-3.10.15-r1 68
+MD5 74e598a06446374ea9bbc4c86d8501a7 apcupsd-3.10.15-r1.ebuild 2486
+MD5 6d42386815c148e591ab78940f328300 ChangeLog 9741
+MD5 ee8cf49058cbbd4a03a03a3ae2c75179 apcupsd-3.10.16-r2.ebuild 2664
+MD5 3a2fe70dd5b43789a141ae0ed68495c0 apcupsd-3.10.16-r1.ebuild 2546
 MD5 ed12d329ca566b8f2632d425828ea5d7 files/digest-apcupsd-3.10.16-r1 68
-MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.15/apache.conf 157
-MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.15/ucd-snmp.patch 425
-MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.15/apcupsd.in.patch 315
-MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.15/smtp.patch 2663
-MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.16/apache.conf 157
+MD5 ed12d329ca566b8f2632d425828ea5d7 files/digest-apcupsd-3.10.16-r2 68
+MD5 ec48a12c6d8b56aeffbeaa629f8835ad files/digest-apcupsd-3.10.15-r1 68
+MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.16/smtp.patch 2663
 MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.16/ucd-snmp.patch 425
+MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.16/apache.conf 157
 MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.16/apcupsd.in.patch 315
-MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.16/smtp.patch 2663
+MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.15/smtp.patch 2663
+MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.15/ucd-snmp.patch 425
+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.2.6 (GNU/Linux)
+
+iD8DBQFBrmG2KtJO8LeSoosRAtrpAJ9L3giN6nGbR9DDhV9WsTutZepxRwCeKQxp
+D39yNOXokTud+28ftphRSc0=
+=laDL
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/apcupsd/apcupsd-3.10.16-r2.ebuild b/sys-apps/apcupsd/apcupsd-3.10.16-r2.ebuild
new file mode 100644 (file)
index 0000000..42986af
--- /dev/null
+++ b/sys-apps/apcupsd/apcupsd-3.10.16-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.16-r2.ebuild,v 1.1 2004/12/01 23:28:16 tantive Exp $
+
+inherit eutils
+
+DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
+HOMEPAGE="http://www.sibbald.com/apcupsd/"
+SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+IUSE="doc snmp usb apache2 gd"
+
+DEPEND=">=sys-apps/baselayout-1.8.4
+       virtual/libc
+       virtual/mta
+       snmp? ( virtual/snmp )
+       gd? ( >=media-libs/gd-1.8.4 )
+       sys-libs/ncurses"
+RDEPEND="${DEPEND}
+       usb? ( sys-apps/hotplug )"
+
+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}
+       if has_version net-analyzer/ucd-snmp; then
+           epatch ${FILESDIR}/${PV}/ucd-snmp.patch
+           fi
+}
+
+src_compile() {
+       local myconf
+       use snmp && myconf="--enable-net-snmp"
+       use gd && myconf="${myconf} --enable-cgi --with-css-dir=/var/www/apcupsd --with-cgi-bin=/var/www/apcupsd"
+       use usb && myconf="--with-upstype=usb --with-upscable=usb --with-serial-dev=/dev/usb/hiddev[0-9] --enable-usb"
+       use !usb && myconf="--with-upstype=apcsmart --with-upscable=apcsmart --with-serial-dev=/dev/ttyS0 --disable-usb"
+       APCUPSD_MAIL=/usr/sbin/sendmail ./configure \
+               --prefix=/usr \
+               --sbindir=/usr/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 \
+               --enable-powerflute \
+               --enable-pthreads \
+               ${myconf} \
+               || die
+       make || die
+}
+
+src_install () {
+       make DESTDIR=${D} install || die "installed failed"
+
+       if use gd
+       then
+               use apache2 || insinto /etc/apache/conf/addon-modules
+               use apache2 || newins  ${FILESDIR}/${PV}/apache.conf apcupsd.conf
+
+               use apache2 && insinto /etc/apache2/conf/modules.d
+               use apache2 && newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
+       fi
+
+       insinto /etc/apcupsd
+       newins examples/safe.apccontrol safe.apccontrol
+
+       cd ${D}/etc/apcupsd
+       epatch ${FILESDIR}/${PV}/smtp.patch
+
+       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-apps/apcupsd/files/digest-apcupsd-3.10.16-r2 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.16-r2
new file mode 100644 (file)
index 0000000..c76addf
--- /dev/null
+++ b/sys-apps/apcupsd/files/digest-apcupsd-3.10.16-r2
@@ -0,0 +1 @@
+MD5 07de8f7d7488b6ef91f128f51713f4ea apcupsd-3.10.16.tar.gz 5037822