gentoo resync : 16.09.2020

4 files changed, 16 insertions, 11 deletions

diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 2917d9dd9c42..6e6d88947be9 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/dynamite/Manifest b/app-pda/dynamite/Manifest
index 8fb2ad61b482..8c58d0ea20cd 100644
--- a/app-pda/dynamite/Manifest
+++ b/app-pda/dynamite/Manifest
@@ -1,4 +1,4 @@
-AUX dynamite-bootstrap.patch 311 BLAKE2B e750eeaaa0439df4c583929fdfb1c265456f1b7d9553c392320429a4db55444e40d531aa538bc26676dcfd1ffb07ece5134e386e21fb87f87d2b8368b1450f06 SHA512 2e8fd97c60ba5af32a477df33ab9caf574d0235a34d177669ba5d2f9d3c27659e77f1ff4362e46d58799a29b5d3cbb24c2c295d7b21319c4556172bba0d50e89
+AUX dynamite-0.1.1_p20120512-dynamite-bootstrap.patch 315 BLAKE2B 324a01bb4d5f57b682e204557935f03c688c79d29a5808fb55262537e16faefecc3ed03fdb211b9f453238e8dc7a61ae5a19f887da8bc69268c319a27259f180 SHA512 0cc6ea789a18ddedeb0ca385b15ca250bc389e7330206b88ea3240b3b2973f1c9fad003816b20311cd2c023679736b1c6e7923a297beb5573987066cd12e660a
 DIST dynamite-0.1.1_p20120512.tar.xz 48964 BLAKE2B 48eea5a040e8acbbae87aa8779c034b0d9e34cd68997d6fdb79a4b0846e0778a2934d67ea59176a3e0b15d815100ff372bf6f5175345aaaedd37d4889ab6f02c SHA512 ba7a4c773d460e0e644cb1da3ae7fe3e48fc6fbe94dafc3ccab61659ade6363544a5d1d458574d365623b7eeaa1c1c7d10c05324a344d0e8ef7422276540daaa
-EBUILD dynamite-0.1.1_p20120512.ebuild 715 BLAKE2B 2dee9c64265f90395480f29284fbb5083b92414e3e997e7cec3663c800678cf142e7f726155fc8ab1f88f20352a65fac78576a04d2c984582daab750002a5167 SHA512 adadbe90da95d3389849b39bb3240c275686099abf9cc66a3fa85cf81acc554fed72684cc348f13654b54a0467a933b320d36891b83a6408f31603330cc97619
+EBUILD dynamite-0.1.1_p20120512.ebuild 752 BLAKE2B 696810dc7c4086e8c710e973539326e684c3116db2aaee79ae7e73d1c4b043f03c39dca14331986ca0bf8b1eae21178045ee8c57819ebd8088b00a1633dc07e2 SHA512 100bdf45f99e645bb977d2a548287651d69b3b6b73e9826d9f4b44369ce88ba898c80df275db2bbe1c68ea82a8c5df0db9acc3f603b8a4cd5b6aa98efde1f53e
 MISC metadata.xml 303 BLAKE2B 17a439213c5ee40a77847e747c8b1e23ffe077b40cc9e272691c29ccdd16a7a90cb878e4c0609351614130dcbd51a89d1cd5d4d6daff5119975215d74cf72622 SHA512 62b41c98f512e85768c7e6405dbcc680520522015d589540823a00ee09b6796425eb7418866524c4f593d4ccac8ba0f7c6a065c54f4e3d590d9bad0006151e4b
diff --git a/app-pda/dynamite/dynamite-0.1.1_p20120512.ebuild b/app-pda/dynamite/dynamite-0.1.1_p20120512.ebuild
index 2586a3d99648..2a392c90c3c1 100644
--- a/app-pda/dynamite/dynamite-0.1.1_p20120512.ebuild
+++ b/app-pda/dynamite/dynamite-0.1.1_p20120512.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A tool for decompressing data compressed with PKWARE Data Compression Library"
 HOMEPAGE="https://github.com/twogood/dynamite https://sourceforge.net/projects/synce/"
@@ -13,9 +14,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="static-libs"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.1_p20120512-dynamite-bootstrap.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-bootstrap.patch
-	./bootstrap
+	default
+	./bootstrap || die
 	eautoreconf
 }
 
@@ -24,8 +29,8 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${ED}" install
 	dodoc ChangeLog README
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-pda/dynamite/files/dynamite-bootstrap.patch b/app-pda/dynamite/files/dynamite-0.1.1_p20120512-dynamite-bootstrap.patch
index 3ac2695f89b4..e8f571da7d92 100644
--- a/app-pda/dynamite/files/dynamite-bootstrap.patch
+++ b/app-pda/dynamite/files/dynamite-0.1.1_p20120512-dynamite-bootstrap.patch
@@ -1,5 +1,5 @@
---- bootstrap
-+++ bootstrap
+--- a/bootstrap
++++ b/bootstrap
 @@ -26,8 +26,8 @@
  	INCLUDES="-I m4"
  fi