voyageur 15/07/08 09:33:48 Modified: ChangeLog webapp.eclass Log: Fix elog in webapp_serverowned and ebeep in newer EAPIs
Revision Changes Path 1.1704 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1704&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1704&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1703&r2=1.1704 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1703 retrieving revision 1.1704 diff -u -r1.1703 -r1.1704 --- ChangeLog 7 Jul 2015 14:11:37 -0000 1.1703 +++ ChangeLog 8 Jul 2015 09:33:47 -0000 1.1704 @@ -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 <voyag...@gentoo.org> webapp.eclass: + Fix elog in webapp_serverowned and ebeep in newer EAPIs 07 Jul 2015; Ian Stakenvicius (_AxS_) <a...@gentoo.org> -mozconfig-v4.31.eclass, -mozconfig-v5.33.eclass, +mozconfig-v6.38.eclass, 1.75 eclass/webapp.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/webapp.eclass?rev=1.75&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/webapp.eclass?rev=1.75&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/webapp.eclass?r1=1.74&r2=1.75 Index: webapp.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- webapp.eclass 2 Jul 2015 14:02:34 -0000 1.74 +++ webapp.eclass 8 Jul 2015 09:33:47 -0000 1.75 @@ -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 @@ 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 @@ 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}"
