commit:     5e101aa053b245bf7f4833e1a10fb57b73a4d236
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Wed Sep 16 11:52:45 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 06:06:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e101aa0

dev-util/cgdb: call default at the beginning of src_prepare

`default` should be called before `cp` in src_prepare as not doing that results 
in copying unpatched configure.init file, leading to
the ebuild again calling ar directly

Closes: https://bugs.gentoo.org/742731
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Closes: https://github.com/gentoo/gentoo/pull/17563
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/cgdb/cgdb-0.6.8.ebuild    | 2 +-
 dev-util/cgdb/cgdb-0.7.0-r2.ebuild | 2 +-
 dev-util/cgdb/cgdb-0.7.1.ebuild    | 2 +-
 dev-util/cgdb/cgdb-9999.ebuild     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-util/cgdb/cgdb-0.6.8.ebuild b/dev-util/cgdb/cgdb-0.6.8.ebuild
index a9898610f2c..357b17b658a 100644
--- a/dev-util/cgdb/cgdb-0.6.8.ebuild
+++ b/dev-util/cgdb/cgdb-0.6.8.ebuild
@@ -41,8 +41,8 @@ PATCHES=(
 )
 
 src_prepare() {
-       cp configure.{init,ac} || die "cp failed"
        default
+       cp configure.{init,ac} || die "cp failed"
        AT_M4DIR="config" eautoreconf
 }
 

diff --git a/dev-util/cgdb/cgdb-0.7.0-r2.ebuild 
b/dev-util/cgdb/cgdb-0.7.0-r2.ebuild
index 8d910b72d84..ba5293f966b 100644
--- a/dev-util/cgdb/cgdb-0.7.0-r2.ebuild
+++ b/dev-util/cgdb/cgdb-0.7.0-r2.ebuild
@@ -46,8 +46,8 @@ PATCHES=(
 )
 
 src_prepare() {
-       cp configure.{init,ac} || die "cp failed"
        default
+       cp configure.{init,ac} || die "cp failed"
        AT_M4DIR="config" eautoreconf
 }
 

diff --git a/dev-util/cgdb/cgdb-0.7.1.ebuild b/dev-util/cgdb/cgdb-0.7.1.ebuild
index c3a44fb28ef..79f79a24916 100644
--- a/dev-util/cgdb/cgdb-0.7.1.ebuild
+++ b/dev-util/cgdb/cgdb-0.7.1.ebuild
@@ -46,8 +46,8 @@ PATCHES=(
 )
 
 src_prepare() {
-       cp configure.{init,ac} || die "cp failed"
        default
+       cp configure.{init,ac} || die "cp failed"
        AT_M4DIR="config" eautoreconf
 }
 

diff --git a/dev-util/cgdb/cgdb-9999.ebuild b/dev-util/cgdb/cgdb-9999.ebuild
index d791301bd98..191687d3b09 100644
--- a/dev-util/cgdb/cgdb-9999.ebuild
+++ b/dev-util/cgdb/cgdb-9999.ebuild
@@ -44,8 +44,8 @@ PATCHES=(
 )
 
 src_prepare() {
-       cp configure.{init,ac} || die "cp failed"
        default
+       cp configure.{init,ac} || die "cp failed"
        AT_M4DIR="config" eautoreconf
 }
 

Reply via email to