commit:     5f92e68f84de5ab7081731758d40c58f7effce9a
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 13 22:44:18 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 22:44:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f92e68f

dev-python/subunit: call eautoreconf before multilib_copy_sources

Also clean up the werror patch.

Bug: https://bugs.gentoo.org/744313
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 dev-python/subunit/files/subunit-1.4.0-werror.patch | 6 +++---
 dev-python/subunit/subunit-1.4.0.ebuild             | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dev-python/subunit/files/subunit-1.4.0-werror.patch 
b/dev-python/subunit/files/subunit-1.4.0-werror.patch
index 99b8b8d2045..e64f74a655e 100644
--- a/dev-python/subunit/files/subunit-1.4.0-werror.patch
+++ b/dev-python/subunit/files/subunit-1.4.0-werror.patch
@@ -1,7 +1,7 @@
 # https://bugs.gentoo.org/744313
-diff -NrU5 subunit-1.4.0.orig/configure.ac subunit-1.4.0/configure.ac
---- subunit-1.4.0.orig/configure.ac    2020-12-13 22:03:01.225671695 +0100
-+++ subunit-1.4.0/configure.ac 2020-12-13 22:03:26.899752669 +0100
+
+--- a/configure.ac
++++ b/configure.ac
 @@ -4,11 +4,11 @@
  m4_define([SUBUNIT_VERSION],
  
m4_defn([SUBUNIT_MAJOR_VERSION]).m4_defn([SUBUNIT_MINOR_VERSION]).m4_defn([SUBUNIT_MICRO_VERSION]))

diff --git a/dev-python/subunit/subunit-1.4.0.ebuild 
b/dev-python/subunit/subunit-1.4.0.ebuild
index 39cfb5fff59..9962579f395 100644
--- a/dev-python/subunit/subunit-1.4.0.ebuild
+++ b/dev-python/subunit/subunit-1.4.0.ebuild
@@ -34,7 +34,9 @@ DEPEND="
                dev-python/testscenarios[${PYTHON_USEDEP}]
        )"
 
-PATCHES=( "${FILESDIR}/${P}-werror.patch" )
+PATCHES=(
+       "${FILESDIR}/subunit-1.4.0-werror.patch"
+)
 
 src_prepare() {
        sed -i -e 's/os.chdir(os.path.dirname(__file__))//' setup.py || die
@@ -47,8 +49,8 @@ src_prepare() {
                python/subunit/tests/test_subunit_tags.py || die
 
        distutils-r1_src_prepare
-       multilib_copy_sources
        eautoreconf
+       multilib_copy_sources
 }
 
 multilib_src_configure() {

Reply via email to