From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 738821384B4 for ; Sat, 28 Nov 2015 19:10:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E449921C129; Sat, 28 Nov 2015 19:09:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11D6621C11A for ; Sat, 28 Nov 2015 19:09:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3476B33BEBE for ; Sat, 28 Nov 2015 19:09:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 86C6DFE4 for ; Sat, 28 Nov 2015 19:09:48 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1448737746.35486c204403152df48ee25c05b35764952efe40.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/distutils-r1.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 35486c204403152df48ee25c05b35764952efe40 X-VCS-Branch: master Date: Sat, 28 Nov 2015 19:09:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d4f5464d-1910-4a23-9df9-40a8fa769f84 X-Archives-Hash: 599cb3adbc1ed0724a4ea9158320f189 commit: 35486c204403152df48ee25c05b35764952efe40 Author: Michał Górny gentoo org> AuthorDate: Wed Nov 18 21:57:04 2015 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Nov 28 19:09:06 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35486c20 distutils-r1.eclass: Ban EXAMPLES in EAPI 6 eclass/distutils-r1.eclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index e632202..1cf2a49 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -150,6 +150,8 @@ fi # @ECLASS-VARIABLE: EXAMPLES # @DEFAULT_UNSET # @DESCRIPTION: +# OBSOLETE: this variable is deprecated and banned in EAPI 6 +# # An array containing examples installed into 'examples' doc # subdirectory. The files and directories listed there must exist # in the directory from which distutils-r1_python_install_all() is run @@ -583,6 +585,8 @@ distutils-r1_python_install_all() { einstalldocs if declare -p EXAMPLES &>/dev/null; then + [[ ${EAPI} != [45] ]] && die "EXAMPLES are banned in EAPI ${EAPI}" + local INSDESTTREE=/usr/share/doc/${PF}/examples doins -r "${EXAMPLES[@]}" docompress -x "${INSDESTTREE}"