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 78E4858973 for ; Wed, 27 Jan 2016 14:12:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6DDB321C007; Wed, 27 Jan 2016 14:12:02 +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 10AF921C007 for ; Wed, 27 Jan 2016 14:12:01 +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 02E07340BB0 for ; Wed, 27 Jan 2016 14:12:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E51A3E5F for ; Wed, 27 Jan 2016 14:11:57 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1453903904.caab06d4a89e612d7d7deef236d5fba61a98e576.floppym@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 dev-python/six/six-1.9.0-r1.ebuild X-VCS-Directories: dev-python/six/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: caab06d4a89e612d7d7deef236d5fba61a98e576 X-VCS-Branch: master Date: Wed, 27 Jan 2016 14:11:57 +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: 5d01ca77-da08-4158-91b1-8d31eeecb914 X-Archives-Hash: 5fcdaf47519ce61ad94934e6bb5db5da commit: caab06d4a89e612d7d7deef236d5fba61a98e576 Author: Mike Gilbert gentoo org> AuthorDate: Wed Jan 27 14:11:44 2016 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Wed Jan 27 14:11:44 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caab06d4 dev-python/six: Remove any existing egg-info directory Bug: https://bugs.gentoo.org/573114 Package-Manager: portage-2.2.27_p49 dev-python/six/six-1.10.0.ebuild | 13 +++++++++++++ dev-python/six/six-1.9.0-r1.ebuild | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild index baf5f47..f0d2eef 100644 --- a/dev-python/six/six-1.10.0.ebuild +++ b/dev-python/six/six-1.10.0.ebuild @@ -48,3 +48,16 @@ python_install_all() { use doc && local HTML_DOCS=( documentation/_build/html/ ) distutils-r1_python_install_all } + +pkg_preinst() { + # Remove this in the next version bump + _cleanup() { + local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())") + local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info" + if [[ -d ${egginfo} ]]; then + echo rm -r "${egginfo}" + rm -r "${egginfo}" || die "Failed to remove egg-info directory" + fi + } + python_foreach_impl _cleanup +} diff --git a/dev-python/six/six-1.9.0-r1.ebuild b/dev-python/six/six-1.9.0-r1.ebuild index 7553b1d..de1f0c9 100644 --- a/dev-python/six/six-1.9.0-r1.ebuild +++ b/dev-python/six/six-1.9.0-r1.ebuild @@ -39,3 +39,16 @@ python_install_all() { use doc && local HTML_DOCS=( documentation/_build/html/ ) distutils-r1_python_install_all } + +pkg_preinst() { + # Remove this in the next version bump + _cleanup() { + local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())") + local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info" + if [[ -d ${egginfo} ]]; then + echo rm -r "${egginfo}" + rm -r "${egginfo}" || die "Failed to remove egg-info directory" + fi + } + python_foreach_impl _cleanup +}