diff options
| -rw-r--r-- | sys-power/apcupsd/ChangeLog | 13 | ||||
| -rw-r--r-- | sys-power/apcupsd/Manifest | 16 | ||||
| -rw-r--r-- | sys-power/apcupsd/apcupsd-3.14.7.ebuild | 8 | ||||
| -rw-r--r-- | sys-power/apcupsd/apcupsd-3.14.8-r1.ebuild (renamed from sys-power/apcupsd/apcupsd-3.14.8.ebuild) | 58 |
4 files changed, 53 insertions, 42 deletions
diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog index 1cf90c3bb2c3..ba2fb810501c 100644 --- a/sys-power/apcupsd/ChangeLog +++ b/sys-power/apcupsd/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-power/apcupsd -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.64 2010/03/06 19:59:54 armin76 Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.65 2011/03/14 20:37:14 flameeyes Exp $ + +*apcupsd-3.14.8-r1 (14 Mar 2011) + + 14 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org> apcupsd-3.14.7.ebuild, + -apcupsd-3.14.8.ebuild, +apcupsd-3.14.8-r1.ebuild: + Old version: depend on gtk2/glib2 only. Revision bump: implement the kernel + configuration checks as per bug #296476; don't use webapp-config as the CGIs + can only be configured with the system configuration files in /etc; drop the + HAL configuration file; disable strict aliasing. 06 Mar 2010; Raúl Porcel <armin76@gentoo.org> apcupsd-3.14.7.ebuild: alpha stable diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest index 92d7e3a223fa..f05c3d9c079b 100644 --- a/sys-power/apcupsd/Manifest +++ b/sys-power/apcupsd/Manifest @@ -1,8 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX apcupsd.init.2 838 RMD160 fdca4e15d5f475c43147ce65624a4355e6ed9279 SHA1 b34596c601f368ed5028d661f7dd79630bfef4a9 SHA256 9c60e920d5946ff581b38c33087ec6a1ed7d8885bc2c9c5621932f5e7c8571d3 AUX apcupsd.powerfail.init 520 RMD160 24f766871652220523a18885f41f6608f29ab670 SHA1 0c5f97e556504904ffd6d72ff27ef792ac70e18c SHA256 eee773aa07175674085cb0ab7ed2c071fcc04fc05383d368f38d056e7327ff35 DIST apcupsd-3.14.7.tar.gz 4272089 RMD160 cb3db3e6e123f39666eef3c5ccfdec65c57a1571 SHA1 9561eb5cf8e0c627215b987dbb97d026a2b2e9b8 SHA256 7e3df3b5552394206f4b8aaac2bd85ac69df540495557676a3df63f84972823c DIST apcupsd-3.14.8.tar.gz 1317601 RMD160 f642582e01506ebb986c16df01429e6bb08c7e8b SHA1 cb7a7b401797e129c92a6b8dc2bf7b193b1d6c72 SHA256 8e7f2574d3abaf6637da3e790860c3f9ba64fab1ec7e50bb080de4439441c5a7 -EBUILD apcupsd-3.14.7.ebuild 4068 RMD160 bee5ba1732e18dd8c03e88b34e9e4578c51e925a SHA1 4024b7f260aa3edb2271f6f22f4a0aff69f7c02a SHA256 e56477fe09859fe1a34332945c16567264b8c1ce8c4a70bc71e9635105c24749 -EBUILD apcupsd-3.14.8.ebuild 4075 RMD160 4db4d3e7bf2e9883cf969614e35d3747a33f7cdd SHA1 abe975929de8ce7aa05eb837f400032622dd0d8b SHA256 d3bf0f7f303860e00a805f3697103833a43ca62f0fb84164c60997374c94e173 -MISC ChangeLog 23353 RMD160 bfdd6bd0501c6c527f2566bd203e0513d2c479ec SHA1 6491353e3b2d33c6cc877a863fda19c669be42f8 SHA256 670d70ab06c596068c6af11432e0de312f948dc809c9395aa635c3b21440a0f6 +EBUILD apcupsd-3.14.7.ebuild 4064 RMD160 5a425754c8cc4e686743de3fa5bad83320f33b66 SHA1 58e58aa8ba4af0d15588a226db19f054e4ee2325 SHA256 5eeb67413174f56cca3f961b41a792a7e64e0ad33b8e53d05b407df71f6621ed +EBUILD apcupsd-3.14.8-r1.ebuild 3881 RMD160 fe7625ff9ceb8601f7b5a2ca0bf840544f8649f5 SHA1 5432bc98e54ecf81073af7641bf0147090881cdc SHA256 55be9df14e250691ad117906de3457676d2a37ed4f6bac35725839d93fed838d +MISC ChangeLog 23809 RMD160 46b6bc9e7191c8e82bdfc11f23d682c08ab96fcf SHA1 94a882d13435bfba752d130e3722f80e731901eb SHA256 f1e328bf81c9ed571f07145e1dfcd8eddd56b0042a585d05cf8e4873d5578a25 MISC metadata.xml 237 RMD160 2a4fab832a64fbdafe2cd6f59b141b2aa80797ac SHA1 75878fb1a17b8617882c9e02331a6643d647882b SHA256 368acc29aa9214adaa137c17b114b16c6a021c4dfc9efa5f3440e968db04a9b3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk1+fI4ACgkQAiZjviIA2XjyLQCeOduIFgm3bixSQO02T2Clc/Uq +xeMAoJwtnSsouqWaN/hHjlx+rrw2mVK1 +=5OhK +-----END PGP SIGNATURE----- diff --git a/sys-power/apcupsd/apcupsd-3.14.7.ebuild b/sys-power/apcupsd/apcupsd-3.14.7.ebuild index cfa3c7b5f4e7..e2f983853229 100644 --- a/sys-power/apcupsd/apcupsd-3.14.7.ebuild +++ b/sys-power/apcupsd/apcupsd-3.14.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.7.ebuild,v 1.7 2010/03/06 19:59:54 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.7.ebuild,v 1.8 2011/03/14 20:37:14 flameeyes Exp $ WEBAPP_MANUAL_SLOT="yes" WEBAPP_OPTIONAL="yes" @@ -20,8 +20,8 @@ DEPEND=" ${WEBAPP_DEPEND} ) nls? ( sys-devel/gettext ) snmp? ( net-analyzer/net-snmp ) - gnome? ( >=x11-libs/gtk+-2.4.0 - >=dev-libs/glib-2.0 + gnome? ( =x11-libs/gtk+-2* + =dev-libs/glib-2* >=gnome-base/gconf-2.0 )" RDEPEND="${DEPEND} virtual/mailx" diff --git a/sys-power/apcupsd/apcupsd-3.14.8.ebuild b/sys-power/apcupsd/apcupsd-3.14.8-r1.ebuild index 2a3ce99fa824..262c14156be0 100644 --- a/sys-power/apcupsd/apcupsd-3.14.8.ebuild +++ b/sys-power/apcupsd/apcupsd-3.14.8-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.8.ebuild,v 1.1 2010/01/17 23:35:10 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.8-r1.ebuild,v 1.1 2011/03/14 20:37:15 flameeyes Exp $ -WEBAPP_MANUAL_SLOT="yes" -WEBAPP_OPTIONAL="yes" -inherit eutils webapp linux-info +EAPI=3 + +inherit eutils linux-info flag-o-matic DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown" HOMEPAGE="http://www.apcupsd.org/" @@ -16,39 +16,36 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" IUSE="snmp usb cgi nls gnome kernel_linux" DEPEND=" - cgi? ( >=media-libs/gd-1.8.4 - ${WEBAPP_DEPEND} ) + cgi? ( >=media-libs/gd-1.8.4 ) nls? ( sys-devel/gettext ) snmp? ( net-analyzer/net-snmp ) - gnome? ( >=x11-libs/gtk+-2.4.0 - >=dev-libs/glib-2.0 + gnome? ( >=x11-libs/gtk+-2.4.0:2 + dev-libs/glib:2 >=gnome-base/gconf-2.0 )" RDEPEND="${DEPEND} virtual/mailx" +CONFIG_CHECK="~USB_HIDDEV ~HIDRAW" +ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV: needed to access USB-attached UPSes" +ERROR_HIDRAW="CONFIG_HIDRAW: needed to access USB-attached UPSes" + pkg_setup() { - use cgi && webapp_pkg_setup - - if use kernel_linux && - use usb && - linux_config_exists && - !linux_chkconfig_present USB_HIDDEV; then - ewarn "Note: to be able to use the USB support for ${PN} you're going to need" - ewarn "the CONFIG_USB_HIDDEV option enabled in your kernel." - ewarn "The option hasn't been found enabled, do so before trying to use" - ewarn "${PN} with USB UPSes." + if use kernel_linux && use usb && linux_config_exists; then + check_extra_config fi } -src_compile() { +src_configure() { local myconf - use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=${MY_CGIBINDIR}" + use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=/usr/libexec/${PN}/cgi-bin" if use usb; then myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev= " else myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb" fi + append-flags -fno-strict-aliasing + # We force the DISTNAME to gentoo so it will use gentoo's layout also # when installed on non-linux systems. econf \ @@ -66,7 +63,9 @@ src_compile() { ${myconf} \ APCUPSD_MAIL=/bin/mail \ || die "econf failed" +} +src_compile() { # Workaround for bug #280674; upstream should really just provide # the text files in the distribution, but I wouldn't count on them # doing that anytime soon. @@ -75,8 +74,6 @@ src_compile() { } src_install() { - use cgi && webapp_src_preinst - emake DESTDIR="${D}" install || die "installed failed" rm -f "${D}"/etc/init.d/halt @@ -88,8 +85,6 @@ src_install() { dohtml -r doc/manual/* || die "dodoc failed" - use cgi && webapp_src_install - rm "${D}"/etc/init.d/apcupsd newinitd "${FILESDIR}/${PN}.init.2" "${PN}" || die "newinitd failed" @@ -97,6 +92,9 @@ src_install() { newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail || die "newinitd failed" fi + # remove hal settings, we don't really want to have it around still. + rm -r "${D}"/usr/share/hal + # Without this it'll crash at startup. When merging in ROOT= this # won't be created by default, so we want to make sure we got it! keepdir /var/lock @@ -106,10 +104,8 @@ src_install() { pkg_postinst() { if use cgi; then - elog "If you are upgrading from a previous version, please note" - elog "that the CGI interface is now installed using webapp-config." - elog "/var/www/apcupsd is no longer present." - webapp_pkg_postinst + elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin." + elog "Set up your ScriptAlias or symbolic links accordingly." fi elog "" @@ -130,7 +126,3 @@ pkg_postinst() { elog '' fi } - -pkg_prerm() { - use cgi && webapp_pkg_prerm -} |