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 0F5A51384B4 for ; Fri, 20 Nov 2015 11:29:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22F3621C016; Fri, 20 Nov 2015 11:29:37 +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 2D94D21C012 for ; Fri, 20 Nov 2015 11:29:36 +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 10B2A340AE2 for ; Fri, 20 Nov 2015 11:29:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87066106A for ; Fri, 20 Nov 2015 11:29:31 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1448018961.24f3b61dbd6db8a41c01dc5ea8bd5bf4b87704b2.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/six/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/six/six-1.10.0.ebuild X-VCS-Directories: dev-python/six/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 24f3b61dbd6db8a41c01dc5ea8bd5bf4b87704b2 X-VCS-Branch: master Date: Fri, 20 Nov 2015 11:29:31 +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: 118d659c-4ec8-41b1-b2d7-15db299121e9 X-Archives-Hash: 480597947171438b7fa6b74f5c0e1479 commit: 24f3b61dbd6db8a41c01dc5ea8bd5bf4b87704b2 Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 11:00:44 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:29:21 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24f3b61d dev-python/six: Break if SITEDIR/six is a dir Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=546730 Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> dev-python/six/six-1.10.0.ebuild | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild index 9faef64..ed0c5b8 100644 --- a/dev-python/six/six-1.10.0.ebuild +++ b/dev-python/six/six-1.10.0.ebuild @@ -26,6 +26,15 @@ PATCHES=( "${FILESDIR}"/1.9.0-mapping.patch ) +pkg_pretend() { + six_dir_check() { + local dir="${ROOT}"/$(python_get_sitedir)/six + [[ -d "${dir}" ]] \ + && die "${PN} doesn't work if ${dir} is a directory #546730" + } + python_foreach_impl six_dir_check +} + python_prepare_all() { # https://bitbucket.org/gutworth/six/issues/139/ sed \