diff options
-rw-r--r-- | sys-apps/apcupsd/Manifest | 7 | ||||
-rw-r--r-- | sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild | 8 | ||||
-rw-r--r-- | sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild | 8 | ||||
-rw-r--r-- | sys-apps/apcupsd/files/3.10.5/init.patch | 14 | ||||
-rw-r--r-- | sys-apps/apcupsd/files/apcupsd | 11 |
5 files changed, 15 insertions, 33 deletions
diff --git a/sys-apps/apcupsd/Manifest b/sys-apps/apcupsd/Manifest index 294066c1f3f1..7a9606b8bf3b 100644 --- a/sys-apps/apcupsd/Manifest +++ b/sys-apps/apcupsd/Manifest @@ -1,11 +1,10 @@ MD5 ed27f8a872c32b4b8f3ed4e27fcd8754 ChangeLog 2781 -MD5 747cdfb31cb71a8b6f7d1e247c5d0630 apcupsd-3.10.5-r2.ebuild 2028 -MD5 ac18ebae9903e0218b6771f8b50f64af apcupsd-3.10.5-r3.ebuild 2054 +MD5 7181d1b6f558c60fa4954ef0a69fedd5 apcupsd-3.10.5-r2.ebuild 1906 +MD5 417edea9c58a614f0412a3b0c2c1d29a apcupsd-3.10.5-r3.ebuild 1932 MD5 b3e098cb7179d63d6c017deb7c9c6f08 files/apccontrol 4230 -MD5 cf72d7293783a82e1ca6e2f325e046aa files/apcupsd 560 +MD5 63b5c0eda783b2f618e7d008353cc6fe files/apcupsd 705 MD5 f7092406e32869eb0535d85b4c09be0d files/digest-apcupsd-3.10.5-r2 123 MD5 f7092406e32869eb0535d85b4c09be0d files/digest-apcupsd-3.10.5-r3 123 MD5 32ee68a9e4bf0033543a302d00b8cbf4 files/halt 519 MD5 0a6d9da1e13f3a3a37fc77104eb8e2f2 files/3.10.5/apache.conf 163 -MD5 1197443e656c1509d4db7727bff70046 files/3.10.5/init.patch 452 MD5 e0c871b380b2382dcd4b9ab26b5c5bef files/3.10.5/restart.patch 501 diff --git a/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild b/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild index 62c25c721c3f..2d5824f6e0ef 100644 --- a/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild +++ b/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild @@ -1,8 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild,v 1.2 2003/06/21 21:19:38 drobbins Exp $ - -inherit eutils +# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild,v 1.3 2003/06/29 22:38:10 mholzer Exp $ IUSE="doc" @@ -29,9 +27,6 @@ XPWRFAILDIR=${XSYSCONFDIR} src_unpack() { unpack ${A} cp -a ${WORKDIR}/gd1.2 ${S}/src/ -# cp -a ${S} ${S}-orig - epatch "${FILESDIR}/${PV}/init.patch" - epatch "${FILESDIR}/${PV}/restart.patch" } src_compile() { @@ -83,4 +78,3 @@ src_install () { dodoc vim/* fi } - diff --git a/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild b/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild index dcf2f80bb3e6..de7a31f2676e 100644 --- a/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild +++ b/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild @@ -1,8 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild,v 1.2 2003/06/21 21:19:38 drobbins Exp $ - -inherit eutils +# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild,v 1.3 2003/06/29 22:38:10 mholzer Exp $ IUSE="doc" @@ -29,9 +27,6 @@ XPWRFAILDIR=${XSYSCONFDIR} src_unpack() { unpack ${A} cp -a ${WORKDIR}/gd1.2 ${S}/src/ -# cp -a ${S} ${S}-orig - epatch "${FILESDIR}/${PV}/init.patch" - epatch "${FILESDIR}/${PV}/restart.patch" } src_compile() { @@ -84,4 +79,3 @@ src_install () { dodoc vim/* fi } - diff --git a/sys-apps/apcupsd/files/3.10.5/init.patch b/sys-apps/apcupsd/files/3.10.5/init.patch deleted file mode 100644 index a79ff62e0f5b..000000000000 --- a/sys-apps/apcupsd/files/3.10.5/init.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -aur apcupsd-3.10.5-orig/platforms/gentoo/apcupsd.in apcupsd-3.10.5/platforms/gentoo/apcupsd.in ---- apcupsd-3.10.5-orig/platforms/gentoo/apcupsd.in 2002-09-14 05:03:18.000000000 -0700 -+++ apcupsd-3.10.5/platforms/gentoo/apcupsd.in 2003-02-26 13:42:45.000000000 -0800 -@@ -6,6 +6,10 @@ - APCPID=@PIDDIR@/apcupsd.pid - APCUPSD=@sbindir@/apcupsd - -+depend() { -+ need net -+} -+ - start() { - rm -f /etc/apcupsd/powerfail - ebegin "Starting APC UPS daemon" diff --git a/sys-apps/apcupsd/files/apcupsd b/sys-apps/apcupsd/files/apcupsd index ff9de48b2e72..68659917cee6 100644 --- a/sys-apps/apcupsd/files/apcupsd +++ b/sys-apps/apcupsd/files/apcupsd @@ -1,9 +1,10 @@ #!/sbin/runscript # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/files/apcupsd,v 1.6 2003/06/29 22:18:13 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/files/apcupsd,v 1.7 2003/06/29 22:38:10 mholzer Exp $ depend() { + need net use logger dns } @@ -20,3 +21,11 @@ stop() { start-stop-daemon --stop --quiet --exec /usr/sbin/apcupsd -- 1>&2 eend $? } + +restart() { + svc_stop + # need to sleep or new process may choke grabbing + # the dying processes network socket + sleep 1 + svc_start +} |