From f8f1015596a3c157be653544e94636e73113e6dd Mon Sep 17 00:00:00 2001 From: Michael Imhof Date: Mon, 30 Aug 2004 23:51:05 +0000 Subject: Now depends on virtual/snmp and applies the ucd patch only if has_version ucd-snmp. --- sys-apps/apcupsd/ChangeLog | 9 +- sys-apps/apcupsd/Manifest | 12 +-- sys-apps/apcupsd/apcupsd-3.10.15-r1.ebuild | 104 +++++++++++++++++++++++ sys-apps/apcupsd/apcupsd-3.10.15.ebuild | 102 ---------------------- sys-apps/apcupsd/files/digest-apcupsd-3.10.15 | 2 - sys-apps/apcupsd/files/digest-apcupsd-3.10.15-r1 | 1 + 6 files changed, 119 insertions(+), 111 deletions(-) create mode 100644 sys-apps/apcupsd/apcupsd-3.10.15-r1.ebuild delete mode 100644 sys-apps/apcupsd/apcupsd-3.10.15.ebuild delete mode 100644 sys-apps/apcupsd/files/digest-apcupsd-3.10.15 create mode 100644 sys-apps/apcupsd/files/digest-apcupsd-3.10.15-r1 (limited to 'sys-apps/apcupsd') diff --git a/sys-apps/apcupsd/ChangeLog b/sys-apps/apcupsd/ChangeLog index a07413e9b0e7..f274da4a7808 100644 --- a/sys-apps/apcupsd/ChangeLog +++ b/sys-apps/apcupsd/ChangeLog @@ -1,6 +1,13 @@ # 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.40 2004/08/26 09:28:02 tantive Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.41 2004/08/30 23:51:05 tantive Exp $ + +*apcupsd-3.10.15-r1 (31 Aug 2004) + + 31 Aug 2004; Michael Imhof +apcupsd-3.10.15-r1.ebuild, + -apcupsd-3.10.15.ebuild: + Now depends on virtual/snmp and applies the ucd patch only if has_version + ucd-snmp. Closes #53210. 26 Aug 2004; Michael Imhof +files/3.10.15/apache.conf, +files/3.10.15/apcupsd.in.patch, +files/3.10.15/smtp.patch, diff --git a/sys-apps/apcupsd/Manifest b/sys-apps/apcupsd/Manifest index 413aef9f8020..e9eaa722ece9 100644 --- a/sys-apps/apcupsd/Manifest +++ b/sys-apps/apcupsd/Manifest @@ -3,19 +3,19 @@ Hash: SHA1 MD5 4c382beba0178ba9c918681ec1c57299 apcupsd-3.10.13.ebuild 2510 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 1435915e8d7f22af585b23335b45ced0 apcupsd-3.10.15.ebuild 2445 +MD5 68500225e95d93503a07f3c261dc4936 apcupsd-3.10.15-r1.ebuild 2485 MD5 c7e7009608d846b75ae57616e5063db0 apcupsd-3.10.10.ebuild 2506 MD5 79fbd20420f039a3ade2d1772723939b apcupsd-3.10.10-r1.ebuild 2551 -MD5 9bcf61ddcbad56e7f94529ca79be85d1 ChangeLog 7258 +MD5 e5bcfc1c116df944cdc096d9ea8750ad ChangeLog 7502 MD5 1edda758e443285ff65aaebcaf893f26 apcupsd-3.10.9.ebuild 2505 MD5 3fe72118440066f4063e3040f7073726 apcupsd-3.10.8.ebuild 2505 MD5 350594bbff4af6f9d84642680267a533 apcupsd-3.10.10-r2.ebuild 2683 -MD5 282949a8063bdbf22c87aa8872713815 files/digest-apcupsd-3.10.15 124 MD5 41859fb08df1a1b50385b2e4a187a5cc files/digest-apcupsd-3.10.10-r2 124 MD5 c5a0f1d4de26b7e7e76641d5c722cd9f files/digest-apcupsd-3.10.8 123 MD5 41859fb08df1a1b50385b2e4a187a5cc files/digest-apcupsd-3.10.10-r1 124 MD5 41859fb08df1a1b50385b2e4a187a5cc files/digest-apcupsd-3.10.10 124 MD5 ab17d3fa671f63d263570aebe6f611b1 files/digest-apcupsd-3.10.9 123 +MD5 ec48a12c6d8b56aeffbeaa629f8835ad files/digest-apcupsd-3.10.15-r1 68 MD5 706952fc576fc75365b88542aada9702 files/digest-apcupsd-3.10.13 124 MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.13/smtp.patch 2663 MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.13/ucd-snmp.patch 425 @@ -41,7 +41,7 @@ MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.10/apcupsd.in.patch 315 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) -iD8DBQFBLa15KtJO8LeSoosRAgkqAJsEbNrka12XbP/6aRSJN49ZslUxkwCfaor1 -fOehokg8vJasEhA0Kpf3C40= -=M6kT +iD8DBQFBM73KKtJO8LeSoosRAiaUAKCQ+U1SdG5TkszqsZ242Ksrz5O7UgCghHc6 +ch3FHkE/CVAnP5XTJxwHlH8= +=B/39 -----END PGP SIGNATURE----- diff --git a/sys-apps/apcupsd/apcupsd-3.10.15-r1.ebuild b/sys-apps/apcupsd/apcupsd-3.10.15-r1.ebuild new file mode 100644 index 000000000000..07d11a38f429 --- /dev/null +++ b/sys-apps/apcupsd/apcupsd-3.10.15-r1.ebuild @@ -0,0 +1,104 @@ +# 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.15-r1.ebuild,v 1.1 2004/08/30 23:51:05 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" + +DEPEND=">=sys-apps/baselayout-1.8.4 + virtual/libc + virtual/mta + virtual/snmp + >=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" + 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-upstype=usb \ + --with-upscable=usb \ + --with-serial-dev=/dev/usb/hid/hiddev[0-9] \ + --with-net-port=6666 \ + --with-nis-port=3551 \ + --enable-usb \ + --enable-net \ + --enable-oldnet \ + --enable-master-slave \ + --enable-powerflute \ + --enable-pthreads \ + --with-css-dir=/var/www/apcupsd \ + --with-cgi-bin=/var/www/apcupsd \ + --enable-cgi \ + ${myconf} \ + || die + make || die +} + +src_install () { + make DESTDIR=${D} install || die "installed failed" + + 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 + + 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/apcupsd-3.10.15.ebuild b/sys-apps/apcupsd/apcupsd-3.10.15.ebuild deleted file mode 100644 index 42436cb9fd49..000000000000 --- a/sys-apps/apcupsd/apcupsd-3.10.15.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# 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.15.ebuild,v 1.1 2004/08/25 21:28:33 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" - -DEPEND=">=sys-apps/baselayout-1.8.4 - virtual/libc - virtual/mta - snmp? ( net-analyzer/ucd-snmp ) - >=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} - epatch ${FILESDIR}/${PV}/ucd-snmp.patch -} - -src_compile() { - local myconf - use snmp && myconf="--enable-net-snmp" - 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-upstype=usb \ - --with-upscable=usb \ - --with-serial-dev=/dev/usb/hid/hiddev[0-9] \ - --with-net-port=6666 \ - --with-nis-port=3551 \ - --enable-usb \ - --enable-net \ - --enable-oldnet \ - --enable-master-slave \ - --enable-powerflute \ - --enable-pthreads \ - --with-css-dir=/var/www/apcupsd \ - --with-cgi-bin=/var/www/apcupsd \ - --enable-cgi \ - ${myconf} \ - || die - make || die -} - -src_install () { - make DESTDIR=${D} install || die "installed failed" - - 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 - - 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.15 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.15 deleted file mode 100644 index 231f48cba399..000000000000 --- a/sys-apps/apcupsd/files/digest-apcupsd-3.10.15 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 21b2b744ebcaa0010367a403a9c5e66c apcupsd-3.10.15.tar.gz 3858266 -MD5 d9a0ddf7918c93ca28fa5832a4af54d8 gd1.2.tar.gz 64595 diff --git a/sys-apps/apcupsd/files/digest-apcupsd-3.10.15-r1 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.15-r1 new file mode 100644 index 000000000000..453c30357b37 --- /dev/null +++ b/sys-apps/apcupsd/files/digest-apcupsd-3.10.15-r1 @@ -0,0 +1 @@ +MD5 21b2b744ebcaa0010367a403a9c5e66c apcupsd-3.10.15.tar.gz 3858266 -- cgit v1.2.3-65-gdbad