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 50BEB1384B4 for ; Thu, 26 Nov 2015 22:35:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1EBD21C0AE; Thu, 26 Nov 2015 22:35:54 +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 02F9521C0AE for ; Thu, 26 Nov 2015 22:35:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE35E34070A for ; Thu, 26 Nov 2015 22:35:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C2243FF9 for ; Thu, 26 Nov 2015 22:35:28 +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: <1448577221.04ce6c7ae413ea528c2366464d83c53ca238edb8.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:python-eapi6 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: 04ce6c7ae413ea528c2366464d83c53ca238edb8 X-VCS-Branch: python-eapi6 Date: Thu, 26 Nov 2015 22:35:28 +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: 0c25aed3-1c22-4326-a271-7ffea4ead960 X-Archives-Hash: e54d848c6ab3ab88080da21f8aa10c96 commit: 04ce6c7ae413ea528c2366464d83c53ca238edb8 Author: Michał Górny gentoo org> AuthorDate: Wed Nov 18 21:57:04 2015 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Nov 26 22:33:41 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04ce6c7a 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}"