diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2008-07-05 03:22:14 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2008-07-05 03:22:14 +0000 |
| commit | ca69d66edba02b7e80ee52a785e8adedcf3a01ee (patch) | |
| tree | 5cc3637ba459ee41da4c57a6958b7d66953afacb /sys-power | |
| parent | Bug #229443, compile-fix for newer libtool setups. (diff) | |
| download | gentoo-2-ca69d66edba02b7e80ee52a785e8adedcf3a01ee.tar.gz gentoo-2-ca69d66edba02b7e80ee52a785e8adedcf3a01ee.tar.bz2 gentoo-2-ca69d66edba02b7e80ee52a785e8adedcf3a01ee.zip | |
Bug #229345 - do not bother with the CGI files unless USE=cgi.
(Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc4-00103-g1beee8d x86_64)
Diffstat (limited to 'sys-power')
| -rw-r--r-- | sys-power/nut/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-power/nut/nut-2.2.2.ebuild | 18 |
2 files changed, 20 insertions, 3 deletions
diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog index 6d3af9aa9caf..43c5a995d4c7 100644 --- a/sys-power/nut/ChangeLog +++ b/sys-power/nut/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-power/nut # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.57 2008/07/05 03:15:15 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.58 2008/07/05 03:22:14 robbat2 Exp $ + + 05 Jul 2008; Robin H. Johnson <robbat2@gentoo.org> nut-2.2.2.ebuild: + Bug #229345 - do not bother with the CGI files unless USE=cgi. 05 Jul 2008; Robin H. Johnson <robbat2@gentoo.org> +files/nut-2.2.2-no-libdummy.patch, nut-2.2.2.ebuild: diff --git a/sys-power/nut/nut-2.2.2.ebuild b/sys-power/nut/nut-2.2.2.ebuild index efac2ac7c3f7..6a23faaf0439 100644 --- a/sys-power/nut/nut-2.2.2.ebuild +++ b/sys-power/nut/nut-2.2.2.ebuild @@ -1,6 +1,6 @@ # 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.2.ebuild,v 1.3 2008/07/05 03:15:15 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild,v 1.4 2008/07/05 03:22:14 robbat2 Exp $ inherit eutils fixheadtails autotools @@ -30,9 +30,11 @@ DEPEND="$RDEPEND >=sys-devel/autoconf-2.58" # public files should be 644 root:root -NUT_PUBLIC_FILES="/etc/nut/{{hosts,upsset,ups,upssched}.conf,upsstats{,-single}.html}" +NUT_PUBLIC_FILES="/etc/nut/{{ups,upssched}.conf}" # private files should be 640 root:nut - readable by nut, writeable by root, NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}" +# public files should be 644 root:root, only installed if USE=cgi +NUT_CGI_FILES="/etc/nut/{{hosts,upsset}.conf,upsstats{,-single}.html}" pkg_setup() { if use cgi && ! built_with_use media-libs/gd png ; then @@ -151,6 +153,12 @@ src_install() { # Do not remove eval here, because the variables contain shell expansions. eval fperms 0644 ${NUT_PUBLIC_FILES} eval fowners root:root ${NUT_PUBLIC_FILES} + + # Do not remove eval here, because the variables contain shell expansions. + if use cgi; then + eval fperms 0644 ${NUT_CGI_FILES} + eval fowners root:root ${NUT_CGI_FILES} + fi # this is installed for 2.4 and fbsd guys if ! has_version sys-fs/udev; then @@ -183,6 +191,12 @@ pkg_postinst() { # Do not remove eval here, because the variables contain shell expansions. eval chown root:root "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null eval chmod 0644 "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null + + # Do not remove eval here, because the variables contain shell expansions. + if use cgi; then + eval chown root:root "${ROOT}"${NUT_CGI_FILES} 2>/dev/null + eval chmod 0644 "${ROOT}"${NUT_CGI_FILES} 2>/dev/null + fi warningmsg elog } |