commit:     98ef629ba44e42abf5dd75e2e2c44994d85bc409
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 05:50:33 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 06:32:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98ef629b

dev-util/bsdiff: use edo

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/bsdiff/bsdiff-4.3-r4.ebuild | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/dev-util/bsdiff/bsdiff-4.3-r4.ebuild 
b/dev-util/bsdiff/bsdiff-4.3-r4.ebuild
index 08e45256bd2b..6083dac804a6 100644
--- a/dev-util/bsdiff/bsdiff-4.3-r4.ebuild
+++ b/dev-util/bsdiff/bsdiff-4.3-r4.ebuild
@@ -1,32 +1,30 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit edo flag-o-matic toolchain-funcs
 
 DESCRIPTION="bsdiff: Binary Differencer using a suffix alg"
 HOMEPAGE="https://www.daemonology.net/bsdiff/";
 SRC_URI="https://www.daemonology.net/bsdiff/${P}.tar.gz";
 
-SLOT="0"
 LICENSE="BSD-2"
+SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos"
 
 RDEPEND="app-arch/bzip2"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
        "${FILESDIR}/${P}-CVE-2014-9862.patch"
 )
 
 src_compile() {
-       doecho() {
-               echo "$@"
-               "$@"
-       }
        append-lfs-flags
-       doecho $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bsdiff bsdiff.c 
-lbz2 || die "failed compiling bsdiff"
-       doecho $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bspatch 
bspatch.c -lbz2 || die "failed compiling bspatch"
+
+       edo $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bsdiff bsdiff.c 
-lbz2
+       edo $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bspatch bspatch.c 
-lbz2
 }
 
 src_install() {

Reply via email to