added check for gd with png support as per patch bug RB in bug #208872

Package-Manager: portage-2.1.4.4

diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog
index 8dfc4c4c9e0a19cedc8a37386790885e457e3002..0d07c644f509bd7c4194890d7ae7f7c4845fa3b0 100644 (file)
--- a/sys-power/nut/ChangeLog
+++ b/sys-power/nut/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-power/nut
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.49 2007/10/09 00:54:54 robbat2 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.50 2008/02/17 05:23:45 dragonheart Exp $
+
+  17 Feb 2008; Daniel Black <dragonheart@gentoo.org> nut-2.2.0.ebuild:
+  added check for gd with png support as per patch bug RB in bug #208872
 
   09 Oct 2007; Robin H. Johnson <robbat2@gentoo.org>
   -files/upsstats-upsset-link-2.0.4.patch, -files/upsdrv.rc6,

diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 511293bf24db527e362db5b6d8c650611c0c65b0..d4a4aec2ab09bdf68cb63a8a8ea91751bc02d1e0 100644 (file)
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -8,6 +8,6 @@ AUX upsstats-upsset-link-2.0.5.patch 625 RMD160 69253155db06c10ea4f8c5b0dd4c6638
 DIST nut-2.0.5.tar.gz 809006 RMD160 e5f90a73932e038d3dfee8cb32faf097d99a7e0b SHA1 d2c07adeac524b8463677c756a90f2f22084f35e SHA256 5e1bfecfca528104db7025050c81258ee20620df7497ab5988ad461d951c8203
 DIST nut-2.2.0.tar.gz 1173801 RMD160 d4e0e50239ba2b020060445869b6d364a56092f4 SHA1 b8017300d41c0a7a946034cf0bdb92ad8b7367a9 SHA256 e670ff7b51a652fd61472aa5fa5a1ed4730b5411671068be456551ea46094120
 EBUILD nut-2.0.5-r2.ebuild 5256 RMD160 e2cbd3290c9d0e1ce08632571e5bf0ea2e22c24f SHA1 990e4f2cbe79933edc40108740fc38bdccff377b SHA256 2e4c21ea14b154d96fa8a864e1c958e8baa5d4a7f0da6357c9a697865f916ba9
-EBUILD nut-2.2.0.ebuild 5383 RMD160 14dd6c83959ec35e6f15eee66d88035731864c44 SHA1 b93b591de291a6107748495b9703e06571ca1def SHA256 c8c139e84b2bea371da968d2f0749867db1aaba1cdde77ffc75889261d186157
-MISC ChangeLog 14412 RMD160 dde1255cc26ca578ea3cf251eb69b2246662f2ad SHA1 10a1513afbe53d4ccde4e0ff23f6fd504f5f1e8b SHA256 808621ca5ac481d89b17ce75cce6658e4815bec9c1535a62807c4e0897dbac76
+EBUILD nut-2.2.0.ebuild 5575 RMD160 65e10f9d397c59c6059e3b8e79d6d1c48f6280e2 SHA1 b992c4623cbe1d1ddc2001d8e172bdeec90fa226 SHA256 888494f13934a33f854a1a64da2a076af45e722105163a92859c5b7abbeaa9c7
+MISC ChangeLog 14561 RMD160 ed71dce52b8d9f9dbcd48941497b954311b59b6d SHA1 9a016e66f15fdc0facbc762a905666ad83cc5dab SHA256 5a311652164839001123431c21bb2af8296042464311a3816233bf2b669ca1c5
 MISC metadata.xml 219 RMD160 7737543ce33cd412792e332121aa1c6ed452adfc SHA1 6c360930b80d6f4168ba1a486a25ad176505ea63 SHA256 8b2ef93d0d6f03a1ad115651dc46a7752e7775a62a32a7046c3294e50b14725b

diff --git a/sys-power/nut/nut-2.2.0.ebuild b/sys-power/nut/nut-2.2.0.ebuild
index 7ac625c84300f9460d0df32445d2b88e0987a3d2..71c9ac1e370a432e21dee4b075ed844d7063a9c2 100644 (file)
--- a/sys-power/nut/nut-2.2.0.ebuild
+++ b/sys-power/nut/nut-2.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.0.ebuild,v 1.2 2007/10/12 16:30:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.0.ebuild,v 1.3 2008/02/17 05:23:45 dragonheart Exp $
 
-inherit eutils fixheadtails
+inherit eutils fixheadtails autotools
 
 MY_P="${P/_/-}"
 
@@ -34,6 +34,11 @@ NUT_PUBLIC_FILES="/etc/nut/{{hosts,upsset,ups,upssched}.conf,upsstats{,-single}.
 NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}"
 
 pkg_setup() {
+       if use cgi && ! built_with_use media-libs/gd png ; then
+               eerror "CGI support requested, bug GD not built with PNG support"
+               eerror "Please rebuild gd with 'USE=png'"
+               die
+       fi
        enewgroup nut 84
        enewuser nut 84 -1 /var/lib/nut nut,uucp
        # As of udev-104, NUT must be in uucp and NOT in tty.
@@ -59,7 +64,7 @@ src_unpack() {
                -i configure.in || die "sed failed"
 
        ebegin "Recreating configure"
-       WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
+       WANT_AUTOCONF=2.5 eautoconf || die "autoconf failed"
        eend $?
 
        sed -e "s:52_nut-usbups.rules:70-nut-usbups.rules:" \