gentoo resync : 23.09.2020

3 files changed, 50 insertions, 6 deletions

diff --git a/dev-embedded/avarice/Manifest b/dev-embedded/avarice/Manifest
index 0988cad57ae3..45a06c8bf339 100644
--- a/dev-embedded/avarice/Manifest
+++ b/dev-embedded/avarice/Manifest
@@ -1,3 +1,4 @@
-DIST avarice-2.13.tar.bz2 196063 BLAKE2B 4380478684d360708310b46cf46b3eca359dc4145a33f6330d5cb18e13c57c18229eeee6fe72b8740baf585d19c4efb21b685afb0317c830d89bb550d245192d SHA512 fa67e46061e32ec9db10bed961484ee050b219e92c2e9900ad35861b3c45161cc6ea6f2a9e63b0303242ef9992193cd963ac5871583db434409c10995b420b5f
-EBUILD avarice-2.13.ebuild 375 BLAKE2B 44b7fe42e0768212b43c2bbb59b95a1d64e39d0de061e319c6747149229f05be1b66aa5c72dded5ad7140d379a905bf92e821547c2c12207a2ed96be24c7f830 SHA512 1d34610b0a0c489b23e5e6d7cceffa00ddde86d923a9ec0260032e3e677c156c7027441aee920d987e8b2c62f5cb3ab4633cd75fddd3e1099997738377d67f3f
+AUX avarice-2.14-broken-__unused-macro.patch 962 BLAKE2B 46012b3d49df83fd83397d8c8a0fd225b571dd8d1f568c1c065a6a21afe63053d426c952647bbbee709a4baaa5cc3b983390277c444ab818f506f402097254ea SHA512 5908a26c9cdc4175f14a7b46c413420517b93ebbf0474031bda9d6e07fd799c2e1effb1006de3831b0e5f3bf5aed7d48abd8201b68e0c6c00cf1c8180e1e4b6f
+DIST avarice-2.14.tar.bz2 253668 BLAKE2B 673c95d8f7f296ffdd5c225e82bd8ef348f0c222201acb826798451fa195ec9c2fd8e8d1ecd3f847f9e0ac069ee2f6a4358f660ff45343817b14d804e79a8c90 SHA512 e0b23bd02bfa7d4dc05027f0f59ec7da868d8d0c0cd4f66595f6aaa5c335fa4eb64fc47399e51c0ed5112803ee99a3f041812bf4072dc096cc933cd17f9348a0
+EBUILD avarice-2.14.ebuild 433 BLAKE2B 202e366fdcb608012b9d40f1fadcb8c6f771c684502dbf69e1a27dfa4e301cc9647154d334eb6a38bcb0b86d4849476be65aeb9a6d1e0dc4d257bd6bd05481e5 SHA512 65dea038232a578d681a6f39ea7dc5b6a4bedfd1dc7812b12ebb5e79bdfcf9a270597f45f62384013154690cc2842c8850cfb5ef0639f9870ebda8c2874bcb92
 MISC metadata.xml 328 BLAKE2B 62af0d18423f51f57fa27f945bb08d9db6d230fcb0f07210f3ee1fdc5bc0e21c4c59e152643f106db54e94087bba1b647e49e58abafef02e41963d8083da868b SHA512 1ee78acf39c10cd871e5ce41abd17adc3e3d5f8ee2443ad5f6798079ea7233010d65be08ed9e80df13b4d0326828702989a5b983ada32bf8029052bd996e2616
diff --git a/dev-embedded/avarice/avarice-2.13.ebuild b/dev-embedded/avarice/avarice-2.14.ebuild
index 84ac54bd2051..99ecdf5b2e24 100644
--- a/dev-embedded/avarice/avarice-2.13.ebuild
+++ b/dev-embedded/avarice/avarice-2.14.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="Interface for GDB to Atmel AVR JTAGICE in circuit emulator"
 HOMEPAGE="http://avarice.sourceforge.net/"
@@ -10,6 +10,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DOCS="AUTHORS ChangeLog doc/*.txt"
+PATCHES=( "${FILESDIR}"/${P}-broken-__unused-macro.patch )
+
+src_install() {
+	default
+	dodoc doc/*.txt
+}
diff --git a/dev-embedded/avarice/files/avarice-2.14-broken-__unused-macro.patch b/dev-embedded/avarice/files/avarice-2.14-broken-__unused-macro.patch
new file mode 100644
index 000000000000..9c3ba3da2f4b
--- /dev/null
+++ b/dev-embedded/avarice/files/avarice-2.14-broken-__unused-macro.patch
@@ -0,0 +1,39 @@
+--- a/src/jtag2usb.cc
++++ b/src/jtag2usb.cc
+@@ -739,7 +739,7 @@
+ 
+ #ifdef HAVE_LIBUSB_2_0
+ /* USB thread */
+-static void *usb_thread(void * data __unused)
++static void *usb_thread(void * data)
+ {
+   struct pollfd fds[2];
+ 
+--- a/src/jtag3io.cc
++++ b/src/jtag3io.cc
+@@ -350,12 +350,12 @@
+     throw jtag_exception("doSimpleJtagCommand(): too many failures");
+ }
+ 
+-void jtag3::changeBitRate(int newBitRate __unused)
++void jtag3::changeBitRate(int newBitRate)
+ {
+   throw;
+ }
+ 
+-bool jtag3::synchroniseAt(int bitrate __unused)
++bool jtag3::synchroniseAt(int bitrate)
+ {
+   throw;
+ }
+--- a/src/jtag3prog.cc
++++ b/src/jtag3prog.cc
+@@ -106,7 +106,7 @@
+ }
+ 
+ 
+-void jtag3::downloadToTarget(const char* filename __unused, bool program __unused, bool verify __unused)
++void jtag3::downloadToTarget(const char* filename, bool program, bool verify)
+ {
+     statusOut("\nDownload not done.\n");
+     throw jtag_exception("Target programming not implemented for JTAGICE3");