diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2015-07-08 09:33:47 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2015-07-08 09:33:47 +0000 |
| commit | 87f0ac5107dcec81068a1a08767fbee4d7c09f42 (patch) | |
| tree | 8a40dce00210aef9efb90aaeda0ec1f7aa236427 /eclass | |
| parent | Bump (diff) | |
| download | gentoo-2-87f0ac5107dcec81068a1a08767fbee4d7c09f42.tar.gz gentoo-2-87f0ac5107dcec81068a1a08767fbee4d7c09f42.tar.bz2 gentoo-2-87f0ac5107dcec81068a1a08767fbee4d7c09f42.zip | |
Fix elog in webapp_serverowned and ebeep in newer EAPIs
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/webapp.eclass | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 45f685302a45..8f770e07ef53 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1703 2015/07/07 14:11:37 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1704 2015/07/08 09:33:47 voyageur Exp $ + + 08 Jul 2015; Bernard Cafarelli <voyageur@gentoo.org> webapp.eclass: + Fix elog in webapp_serverowned and ebeep in newer EAPIs 07 Jul 2015; Ian Stakenvicius (_AxS_) <axs@gentoo.org> -mozconfig-v4.31.eclass, -mozconfig-v5.33.eclass, +mozconfig-v6.38.eclass, diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass index 3ce823a481f8..ccaff07a83b6 100644 --- a/eclass/webapp.eclass +++ b/eclass/webapp.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.74 2015/07/02 14:02:34 twitch153 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.75 2015/07/08 09:33:47 voyageur Exp $ # @ECLASS: webapp.eclass # @MAINTAINER: @@ -244,7 +244,6 @@ _webapp_serverowned() { local my_file="$(webapp_strip_appdir "${1}")" my_file="$(webapp_strip_cwd "${my_file}")" - elog "(server owned) ${my_file}" echo "${my_file}" >> "${D}/${WA_SOLIST}" } @@ -413,7 +412,9 @@ webapp_pkg_setup() { ewarn "This ebuild may be overwriting important files." ewarn echo - ebeep 10 + if has "${EAPI:-0}" 0 1 2; then + ebeep 10 + fi elif [[ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]]; then echo eerror "You already have ${my_output} installed in ${my_dir}" |