From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E8C0A13997D for ; Wed, 13 Nov 2019 22:02:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43E25E087A; Wed, 13 Nov 2019 22:02:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2ECABE087A for ; Wed, 13 Nov 2019 22:02:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D771C34CDB3 for ; Wed, 13 Nov 2019 22:02:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 63374773 for ; Wed, 13 Nov 2019 22:02:15 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1573682526.b80d8ef5ee97c9e9400007fca285566a2fc74a16.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/bb/, app-misc/bb/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/bb/bb-1.3.0_rc1-r5.ebuild app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch X-VCS-Directories: app-misc/bb/ app-misc/bb/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: b80d8ef5ee97c9e9400007fca285566a2fc74a16 X-VCS-Branch: master Date: Wed, 13 Nov 2019 22:02:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2cc8e6cb-d3c2-42ae-9183-09032490d248 X-Archives-Hash: 3c2c26fd8b466f76442f6a6ea2e58b3f commit: b80d8ef5ee97c9e9400007fca285566a2fc74a16 Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Nov 13 22:01:57 2019 +0000 Commit: Sergei Trofimovich gentoo 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 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 +#