commit: b80d8ef5ee97c9e9400007fca285566a2fc74a16 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Wed Nov 13 22:01:57 2019 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Wed Nov 13 22:02:06 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b80d8ef5
app-misc/bb: unbreak m4 handling Fix 'm4-stuff.patch' to restore m4/ directory. Was broken by upgrade to EAPI=7. Instead of failing patch dumped files into root directory instead of m4/. Reported-by: Gabriele Pelissetto Closes: https://bugs.gentoo.org/699826 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> app-misc/bb/bb-1.3.0_rc1-r5.ebuild | 3 ++- app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app-misc/bb/bb-1.3.0_rc1-r5.ebuild b/app-misc/bb/bb-1.3.0_rc1-r5.ebuild index 793a64d7de5..23d546b2831 100644 --- a/app-misc/bb/bb-1.3.0_rc1-r5.ebuild +++ b/app-misc/bb/bb-1.3.0_rc1-r5.ebuild @@ -63,7 +63,8 @@ src_prepare() { -i Makefile.am || die mv -v configure.{in,ac} || die - eautoreconf + # m4/ dir is added with 'm4-stuff.patch' patch + AT_M4DIR="m4" eautoreconf } pkg_postinst() { diff --git a/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch b/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch index 843d839908f..12d9276aeb6 100644 --- a/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch +++ b/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch @@ -7,7 +7,7 @@ Date: Tue Feb 7 10:59:09 2012 +0300 bb-1.3.0_rc1: bundle m4 source --- /dev/null -+++ m4/aalib.m4 ++++ a/m4/aalib.m4 @@ -0,0 +1,169 @@ +# Configure paths for AALIB +# Jan Hubicka 4/22/2001 @@ -179,7 +179,7 @@ Date: Tue Feb 7 10:59:09 2012 +0300 + rm -f conf.aalibtest +]) --- /dev/null -+++ m4/libmikmod.m4 ++++ a/m4/libmikmod.m4 @@ -0,0 +1,207 @@ +# Configure paths for libmikmod +#
