dev-lang/python:{2.7,3.4,3.5}: Move epatch_user call before sedding libdir. Bug ...

This allows sharing patches between different architectures where libdir differ.

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier@gentoo.org>

diff --git a/dev-lang/python/python-2.7.11-r2.ebuild b/dev-lang/python/python-2.7.11-r2.ebuild
index 6fccccee1e80f54282813bf03625234c6b96abe7..d9fd3d660f7297bbfaa46ca6ed9a3c88e726052d 100644 (file)
--- a/dev-lang/python/python-2.7.11-r2.ebuild
+++ b/dev-lang/python/python-2.7.11-r2.ebuild
@@ -104,6 +104,8 @@ src_prepare() {
        epatch "${FILESDIR}/python-2.7.10-cross-compile-warn-test.patch"
        epatch "${FILESDIR}/python-2.7.10-system-libffi.patch"
 
+       epatch_user
+
        sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
                Lib/distutils/command/install.py \
                Lib/distutils/sysconfig.py \
@@ -115,8 +117,6 @@ src_prepare() {
                Modules/getpath.c \
                setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
 
-       epatch_user
-
        eautoreconf
 }
 

diff --git a/dev-lang/python/python-3.4.3-r7.ebuild b/dev-lang/python/python-3.4.3-r7.ebuild
index f599fd900e5aa9b2222e634c9375b26a78387dec..8272a412760d0b150711bf7528773fe3ad2e5bca 100644 (file)
--- a/dev-lang/python/python-3.4.3-r7.ebuild
+++ b/dev-lang/python/python-3.4.3-r7.ebuild
@@ -75,6 +75,8 @@ src_prepare() {
        epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch"
        epatch "${FILESDIR}/${PN}-3.4-gcc-5.patch" #547626
 
+       epatch_user
+
        sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
                Lib/distutils/command/install.py \
                Lib/distutils/sysconfig.py \
@@ -86,8 +88,6 @@ src_prepare() {
                Modules/getpath.c \
                setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
 
-       epatch_user
-
        eautoreconf
 }
 

diff --git a/dev-lang/python/python-3.5.1-r2.ebuild b/dev-lang/python/python-3.5.1-r2.ebuild
index 7f82e77d001cc0f8be62b0a0f15c2812b4bc8cb4..d73faa1d5e60be889843d63b1033ede5d980d4e3 100644 (file)
--- a/dev-lang/python/python-3.5.1-r2.ebuild
+++ b/dev-lang/python/python-3.5.1-r2.ebuild
@@ -73,6 +73,8 @@ src_prepare() {
        epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch"
        epatch "${FILESDIR}/3.5-secondary-targets.patch"
 
+       epatch_user
+
        sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
                configure.ac \
                Lib/distutils/command/install.py \
@@ -87,8 +89,6 @@ src_prepare() {
 
        #sed -i -e 's/\$(GRAMMAR_H): \$(GRAMMAR_INPUT) \$(PGEN)/$(GRAMMAR_H): \$(GRAMMAR_INPUT)/' Makefile.pre.in || die
 
-       epatch_user
-
        eautoreconf
 }