From fdfe6e92b69934bead4d02e1739181915b807f50 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 21 Feb 2015 08:07:30 +0000 Subject: [PATCH] Remove duplicating "using" in EAPI=4 warning message. Spotted by Arfrever. --- eclass/ChangeLog | 5 ++++- eclass/python-utils-r1.eclass | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eclass/ChangeLog b/eclass/ChangeLog index baecc707e283..b0fd42397cb8 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.1546 2015/02/21 07:20:22 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1547 2015/02/21 08:07:30 mgorny Exp $ + + 21 Feb 2015; Michał Górny python-utils-r1.eclass: + Remove duplicating "using" in EAPI=4 warning message. Spotted by Arfrever. 21 Feb 2015; Ben de Groot font.eclass: Apply patch from Ryan Hill to font.eclass to support multiple FONT_S diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 59e745e3166a..a3534a7e5ca8 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.80 2015/02/20 17:57:22 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.81 2015/02/21 08:07:30 mgorny Exp $ # @ECLASS: python-utils-r1 # @MAINTAINER: @@ -1134,7 +1134,7 @@ python_export_utf8_locale() { # a QA warning if it does. _python_check_EAPI() { if [[ ${EAPI} == 4 && ! ${_PYTHON_WARNED_EAPI} ]]; then - eqawarn "This package is using still using EAPI=4. This results in package" + eqawarn "This package is still using EAPI=4. This results in package" eqawarn "dependencies violating PMS and causing issues for package managers." eqawarn "For this reason, using EAPI=4 in new Python packages will be banned" eqawarn "on 2015-03-20 (2 years and 6 months after approving EAPI 5)." -- 2.26.2