From 802cc524bfe2a150815d32e9bfe9c07eecbca93f Mon Sep 17 00:00:00 2001 From: Michael Imhof Date: Mon, 20 Dec 2004 13:42:14 +0000 Subject: Ebuild wasn't handling myconf correct. Fixes #73604. --- sys-apps/apcupsd/ChangeLog | 8 +- sys-apps/apcupsd/Manifest | 14 ++- sys-apps/apcupsd/apcupsd-3.10.16-r1.ebuild | 105 ----------------------- sys-apps/apcupsd/apcupsd-3.10.16-r2.ebuild | 103 ---------------------- sys-apps/apcupsd/apcupsd-3.10.16-r3.ebuild | 103 ++++++++++++++++++++++ sys-apps/apcupsd/files/digest-apcupsd-3.10.16-r1 | 1 - sys-apps/apcupsd/files/digest-apcupsd-3.10.16-r2 | 1 - sys-apps/apcupsd/files/digest-apcupsd-3.10.16-r3 | 1 + 8 files changed, 117 insertions(+), 219 deletions(-) delete mode 100644 sys-apps/apcupsd/apcupsd-3.10.16-r1.ebuild delete mode 100644 sys-apps/apcupsd/apcupsd-3.10.16-r2.ebuild create mode 100644 sys-apps/apcupsd/apcupsd-3.10.16-r3.ebuild delete mode 100644 sys-apps/apcupsd/files/digest-apcupsd-3.10.16-r1 delete mode 100644 sys-apps/apcupsd/files/digest-apcupsd-3.10.16-r2 create mode 100644 sys-apps/apcupsd/files/digest-apcupsd-3.10.16-r3 (limited to 'sys-apps') diff --git a/sys-apps/apcupsd/ChangeLog b/sys-apps/apcupsd/ChangeLog index 03309adfa037..3ae6d4201100 100644 --- a/sys-apps/apcupsd/ChangeLog +++ b/sys-apps/apcupsd/ChangeLog @@ -1,6 +1,12 @@ # 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.53 2004/12/01 23:28:16 tantive Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.54 2004/12/20 13:42:13 tantive Exp $ + +*apcupsd-3.10.16-r3 (20 Dec 2004) + + 20 Dec 2004; Michael Imhof -apcupsd-3.10.16-r1.ebuild, + -apcupsd-3.10.16-r2.ebuild, +apcupsd-3.10.16-r3.ebuild: + Ebuild wasn't handling $myconf correct. Fixes #73604. *apcupsd-3.10.16-r2 (02 Dec 2004) diff --git a/sys-apps/apcupsd/Manifest b/sys-apps/apcupsd/Manifest index cb169531580f..dd7c66cd69ce 100644 --- a/sys-apps/apcupsd/Manifest +++ b/sys-apps/apcupsd/Manifest @@ -3,11 +3,9 @@ Hash: SHA1 MD5 27ae5add10fc42e77804f1ecd768df87 metadata.xml 226 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 ed12d329ca566b8f2632d425828ea5d7 files/digest-apcupsd-3.10.16-r2 68 +MD5 39877c38da580ed1b85baae751b23266 ChangeLog 9969 +MD5 3806c79d53f3731cb4499a20197cec01 apcupsd-3.10.16-r3.ebuild 2694 +MD5 ed12d329ca566b8f2632d425828ea5d7 files/digest-apcupsd-3.10.16-r3 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 @@ -20,7 +18,7 @@ MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.15/apcupsd.in.patch 315 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFBrmG2KtJO8LeSoosRAtrpAJ9L3giN6nGbR9DDhV9WsTutZepxRwCeKQxp -D39yNOXokTud+28ftphRSc0= -=laDL +iD8DBQFBxuUBKtJO8LeSoosRAvyJAKCjtIHEaAlBQeWnt6M+BGOm4uG9pgCgoONj +OgquIqVzxgjDt/fqhXrJ6vQ= +=e61r -----END PGP SIGNATURE----- diff --git a/sys-apps/apcupsd/apcupsd-3.10.16-r1.ebuild b/sys-apps/apcupsd/apcupsd-3.10.16-r1.ebuild deleted file mode 100644 index 7ef020324e59..000000000000 --- a/sys-apps/apcupsd/apcupsd-3.10.16-r1.ebuild +++ /dev/null @@ -1,105 +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.16-r1.ebuild,v 1.2 2004/11/24 06:39:20 swtaylor 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" - 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/hiddev[0-9] \ - --with-net-port=6666 \ - --with-nis-port=3551 \ - --enable-usb \ - --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/apcupsd-3.10.16-r2.ebuild b/sys-apps/apcupsd/apcupsd-3.10.16-r2.ebuild deleted file mode 100644 index 42986af97a72..000000000000 --- a/sys-apps/apcupsd/apcupsd-3.10.16-r2.ebuild +++ /dev/null @@ -1,103 +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.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/apcupsd-3.10.16-r3.ebuild b/sys-apps/apcupsd/apcupsd-3.10.16-r3.ebuild new file mode 100644 index 000000000000..64d8a34b6f02 --- /dev/null +++ b/sys-apps/apcupsd/apcupsd-3.10.16-r3.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-r3.ebuild,v 1.1 2004/12/20 13:42:14 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="${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="${myconf} --with-upstype=usb --with-upscable=usb --with-serial-dev=/dev/usb/hiddev[0-9] --enable-usb" + use !usb && myconf="${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-r1 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.16-r1 deleted file mode 100644 index c76addf36fa3..000000000000 --- a/sys-apps/apcupsd/files/digest-apcupsd-3.10.16-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 07de8f7d7488b6ef91f128f51713f4ea apcupsd-3.10.16.tar.gz 5037822 diff --git a/sys-apps/apcupsd/files/digest-apcupsd-3.10.16-r2 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.16-r2 deleted file mode 100644 index c76addf36fa3..000000000000 --- a/sys-apps/apcupsd/files/digest-apcupsd-3.10.16-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 07de8f7d7488b6ef91f128f51713f4ea apcupsd-3.10.16.tar.gz 5037822 diff --git a/sys-apps/apcupsd/files/digest-apcupsd-3.10.16-r3 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.16-r3 new file mode 100644 index 000000000000..c76addf36fa3 --- /dev/null +++ b/sys-apps/apcupsd/files/digest-apcupsd-3.10.16-r3 @@ -0,0 +1 @@ +MD5 07de8f7d7488b6ef91f128f51713f4ea apcupsd-3.10.16.tar.gz 5037822 -- cgit v1.2.3-65-gdbad