From 64b2b1f902ed3dcb5819581973b269efec5b2285 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 23 Apr 2016 07:47:28 +0200 Subject: [PATCH] dev-lang/python: Remove obsolete process_data patch from 3.3, #580242 Remove the obsolete process_data patch from both 3.3 versions. The patch was only needed for some packages using python.eclass, it is no longer carried by any other Python version (including stable ebuilds) and breaks the build on musl. Bug: https://bugs.gentoo.org/show_bug.cgi?id=580242 --- .../{python-3.3.5-r2.ebuild => python-3.3.5-r3.ebuild} | 5 +++-- .../{python-3.3.5-r7.ebuild => python-3.3.5-r8.ebuild} | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) rename dev-lang/python/{python-3.3.5-r2.ebuild => python-3.3.5-r3.ebuild} (98%) rename dev-lang/python/{python-3.3.5-r7.ebuild => python-3.3.5-r8.ebuild} (98%) diff --git a/dev-lang/python/python-3.3.5-r2.ebuild b/dev-lang/python/python-3.3.5-r3.ebuild similarity index 98% rename from dev-lang/python/python-3.3.5-r2.ebuild rename to dev-lang/python/python-3.3.5-r3.ebuild index 79a844f6022c..6ff606d7d48d 100644 --- a/dev-lang/python/python-3.3.5-r2.ebuild +++ b/dev-lang/python/python-3.3.5-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -70,7 +70,8 @@ src_prepare() { local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch" fi - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" + EPATCH_SUFFIX="patch" EPATCH_EXCLUDE="61_all_process_data.patch" \ + epatch "${WORKDIR}/patches" epatch "${FILESDIR}/${PN}-3.3.5-ncurses-pkg-config.patch" sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ diff --git a/dev-lang/python/python-3.3.5-r7.ebuild b/dev-lang/python/python-3.3.5-r8.ebuild similarity index 98% rename from dev-lang/python/python-3.3.5-r7.ebuild rename to dev-lang/python/python-3.3.5-r8.ebuild index ad7a0cd4cd35..3964d8a4c977 100644 --- a/dev-lang/python/python-3.3.5-r7.ebuild +++ b/dev-lang/python/python-3.3.5-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -76,7 +76,8 @@ src_prepare() { local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch" fi - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" + EPATCH_SUFFIX="patch" EPATCH_EXCLUDE="61_all_process_data.patch" \ + epatch "${WORKDIR}/patches" epatch "${FILESDIR}/${PN}-3.3.5-ncurses-pkg-config.patch" epatch "${FILESDIR}/${PN}-3.4-gcc-5.patch" #547626 -- 2.26.2