gentoo resync : 23.09.2020

5 files changed, 135 insertions, 12 deletions

diff --git a/dev-embedded/uisp/Manifest b/dev-embedded/uisp/Manifest
index 1b710b42dad9..890d8f0090a0 100644
--- a/dev-embedded/uisp/Manifest
+++ b/dev-embedded/uisp/Manifest
@@ -1,4 +1,6 @@
-AUX mega-48-88-168.patch 1723 BLAKE2B 7b52560d9a516b9d04efc5b3bc6b59759437217bf1632b3d3de952e3975f58762af3733f63ff35dde687e1c3591ef5805f25c00d164ac48b8aee1b12cacfa087 SHA512 5c850c08320bc5888b8d6556e05c06f5e201a6cc311a89c394d6ad76a9a1332bfe2296731d952cf0b911c8ab94ea34520535fa8011976829abc9cd4b48303fa5
+AUX uisp-20050207-autotools.patch 1109 BLAKE2B 689fb3d07318922f8cc542fad583fa3965e8c97301d9cc08d62e2f730dc3ef5ee1848131f425019f004e66b3217c8b2129ba34ff6010ef4796d42fbb731fffa8 SHA512 c82dc37ab1e99eeaf1fb559498077430ec290b305452d7cb63146e1c3ee27840a12a45951eb13f6cbc6e3f4c2e6e51ff45288d6cc4aa91eb4e3b52274272f39c
+AUX uisp-20050207-clang.patch 2558 BLAKE2B 50832b8a6a61d6c2d1daf46dc469ea8ab6a61024271a31099c38e2729b14853897556a99492db80020314c976e7a7ac3f62d61160b99bde38144a8612fbfec36 SHA512 518e0e50fbbcc62486470b3d61c8a44d2f0f31fbfadf2ad23aea2acb8cdd6acb4ce17d3fc8d34d5e612bf763948c0f8bcc0c3156ec6bb76ba65e59fdad0c6b49
+AUX uisp-20050207-mega-48-88-168.patch 1723 BLAKE2B 7b52560d9a516b9d04efc5b3bc6b59759437217bf1632b3d3de952e3975f58762af3733f63ff35dde687e1c3591ef5805f25c00d164ac48b8aee1b12cacfa087 SHA512 5c850c08320bc5888b8d6556e05c06f5e201a6cc311a89c394d6ad76a9a1332bfe2296731d952cf0b911c8ab94ea34520535fa8011976829abc9cd4b48303fa5
 DIST uisp-20050207.tar.gz 166745 BLAKE2B a99bd0d39a053797d3dee0a4390d0ffcca014bed465ba2aea3e99022fff8c3f5f4dbe96a0e33422ffcfa33621d94f42d37dac17862fd25e7902b3bf79aa90692 SHA512 1dd62d97c2a459abaed4ce60302e7153564d0fd87689c40d175757549fe8e797749fd2f76c6c02bcb85e56600d7e4c790c396dc2b56e152ead486df8e1bc2fe7
-EBUILD uisp-20050207-r1.ebuild 661 BLAKE2B a33ead36606bba4dbaf31dd0ac88fe50b4aba3c2847a7c0901ed747eca65c8ada004c8df4d88272b0621d17bb4f29a1e4cef0993d449b3b220d12161dde2ccca SHA512 1906e79c1bcd096ea85c7de8c7d52e002bdc386aa5fd1531f0327ec89c8f4ec1514bb55078d00cd333fd47f97623885ef6bbccb1c03af6b65db35f858e74ed3b
+EBUILD uisp-20050207-r1.ebuild 589 BLAKE2B effc7bb35521f4b8c367923aa8f975f33b882bfb0f219b055f109243ce70ca3cae88d1a0dcb66df76295f9517fa817e3a118f16f38ea17d1d50e294ac2e4edaa SHA512 54b75a808c928fe7e808978b141546c1bfe2d4cdc0d66ccea7b15f3d14907306452e70583b57489f8b4c6c6c4da7a073b1c6e3a1a612253597035483fcaa065d
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/uisp/files/uisp-20050207-autotools.patch b/dev-embedded/uisp/files/uisp-20050207-autotools.patch
new file mode 100644
index 000000000000..824ccf3b2b57
--- /dev/null
+++ b/dev-embedded/uisp/files/uisp-20050207-autotools.patch
@@ -0,0 +1,35 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -44,20 +44,8 @@
+ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure src/config-h.in \
+                        src/stamp-h.in $(AUX_DIST)
+ 
+-install_aux_files    = AUTHORS COPYING INSTALL CHANGES CHANGES.old TODO \
++dist_doc_DATA    = AUTHORS CHANGES CHANGES.old TODO \
+                        ChangeLog ChangeLog-2003 ChangeLog-2002
+ 
+-DOC_INST_DIR         = $(DESTDIR)$(datadir)/doc/uisp-$(VERSION)
+-
+-install-data-local:
+-	$(mkinstalldirs) $(DOC_INST_DIR)
+-	for file in $(install_aux_files) ; do \
+-	  echo " $(INSTALL_DATA) $$file $(DOC_INST_DIR)/$$file"; \
+-	  $(INSTALL_DATA) $(srcdir)/$$file $(DOC_INST_DIR)/$$file; \
+-	done
+-
+-uninstall-local:
+-	rm -rf $(DOC_INST_DIR)
+-
+ dist-hook: uisp.spec
+ 	cp uisp.spec $(distdir)/uisp.spec
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -31,7 +31,7 @@
+ # Turn on all warnings and consider them errors. This kinda forces you to have
+ # to use gcc, but I'd rather have all warnings eliminated.
+ 
+-AM_CXXFLAGS          = -Wall -Werror
++AM_CXXFLAGS          = -Wall
+ 
+ bin_PROGRAMS         = uisp
+ uisp_SOURCES         = \
diff --git a/dev-embedded/uisp/files/uisp-20050207-clang.patch b/dev-embedded/uisp/files/uisp-20050207-clang.patch
new file mode 100644
index 000000000000..c08943b9d9b1
--- /dev/null
+++ b/dev-embedded/uisp/files/uisp-20050207-clang.patch
@@ -0,0 +1,84 @@
+--- a/src/AvrAtmel.C
++++ b/src/AvrAtmel.C
+@@ -185,7 +185,7 @@
+ 
+ void TAvrAtmel::SetAddress(TAddr addr){
+   apc_address = addr;
+-  TByte setAddr [3] = { 'A', (addr>>8)&0xff, addr&0xff};
++  TByte setAddr [3] = { 'A', static_cast<TByte>((addr>>8)&0xff), static_cast<TByte>(addr&0xff)};
+   Send(setAddr, 3, 1);
+   CheckResponse(setAddr [0]);
+ }
+@@ -294,7 +294,7 @@
+       if (flush_buffer){WriteProgramMemoryPage();}
+     }
+     
+-    TByte wrF [2] = { (addr&1)?'C':'c', byte };
++    TByte wrF [2] = { static_cast<TByte>((addr&1)?'C':'c'), byte };
+     
+     if (apc_address!=(addr>>1) || apc_autoinc==false) SetAddress (addr>>1);
+     if (wrF[0]=='C') apc_address++;
+@@ -346,7 +346,7 @@
+  */
+ void TAvrAtmel::WriteOldFuseBits (TByte val)
+ {
+-  TByte buf[5] = {'.', 0xac, (val & 0x1f) | 0xa0, 0x00, 0xd2 };
++  TByte buf[5] = {'.', 0xac, static_cast<TByte>((val & 0x1f) | 0xa0), 0x00, 0xd2 };
+   Info (2, "Write fuse high bits: %02x\n", (int)val);
+   Send (buf, 5, 2);
+   CheckResponse (buf[1]);
+@@ -423,7 +423,7 @@
+ }
+ 
+ void TAvrAtmel::WriteLockBits(TByte bits){
+-  TByte lockTarget [2] = { 'l', 0xF9 | ((bits << 1) & 0x06) };
++  TByte lockTarget [2] = { 'l', static_cast<TByte>(0xF9 | ((bits << 1) & 0x06)) };
+   Send (lockTarget, 2, 1);
+   CheckResponse(lockTarget [0]);
+   Info(1, "Writing lock bits ...\nReinitializing device\n");
+--- a/src/AvrDummy.C
++++ b/src/AvrDummy.C
+@@ -81,12 +81,12 @@
+ TAvrDummy::GetPartInfo(TAddr addr)
+ {
+   if (at89) {
+-    TByte info [4] = { 0x28, addr & 0x1f, 0, 0 };
++    TByte info [4] = { 0x28, static_cast<TByte>(addr & 0x1f), 0, 0 };
+     Send(info, 4);
+     return info[3];
+   }
+ 
+-  TByte info [4] = { 0x30, 0, addr, 0 };
++  TByte info [4] = { 0x30, 0, static_cast<TByte>(addr), 0 };
+   Send(info, 4);
+   return info[3];
+ }
+@@ -289,7 +289,7 @@
+ void
+ TAvrDummy::WriteOldFuseBits(TByte val)
+ {
+-  TByte oldfuse[4] = { 0xAC, (val & 0x1F) | 0xA0, 0, 0xD2 };
++  TByte oldfuse[4] = { 0xAC, static_cast<TByte>((val & 0x1F) | 0xA0), 0, 0xD2 };
+   Send(oldfuse, 4);
+ }
+ 
+@@ -533,7 +533,7 @@
+ {
+   /* This handles both old (byte 2, bits 1-2)
+      and new (byte 4, bits 0-5) devices.  */
+-  TByte lock[4] = { 0xAC, 0xF9 | ((bits << 1) & 0x06), 0xFF, bits };
++  TByte lock[4] = { 0xAC, static_cast<TByte>(0xF9 | ((bits << 1) & 0x06)), 0xFF, bits };
+   TByte rbits;
+ 
+   if (at89)
+--- a/src/Stk500.C
++++ b/src/Stk500.C
+@@ -518,7 +518,7 @@
+ 
+ TByte TStk500::ReadCalFuseBits(int addr)
+ {
+-  TByte cmd[] = { 0x38, 0x00, addr, 0x00 };
++  TByte cmd[] = { 0x38, 0x00, static_cast<TByte>(addr), 0x00 };
+ 
+   return UniversalCmd(cmd);
+ }
diff --git a/dev-embedded/uisp/files/mega-48-88-168.patch b/dev-embedded/uisp/files/uisp-20050207-mega-48-88-168.patch
index dad337b740a7..dad337b740a7 100644
--- a/dev-embedded/uisp/files/mega-48-88-168.patch
+++ b/dev-embedded/uisp/files/uisp-20050207-mega-48-88-168.patch
diff --git a/dev-embedded/uisp/uisp-20050207-r1.ebuild b/dev-embedded/uisp/uisp-20050207-r1.ebuild
index 2a92a428cdd4..3db55410303d 100644
--- a/dev-embedded/uisp/uisp-20050207-r1.ebuild
+++ b/dev-embedded/uisp/uisp-20050207-r1.ebuild
@@ -1,9 +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"
+EAPI=7
 
-inherit eutils
+inherit autotools
 
 DESCRIPTION="Tool for programming AVR microcontroller through the parallel port"
 HOMEPAGE="https://savannah.nongnu.org/projects/uisp"
@@ -12,17 +12,19 @@ SRC_URI="https://savannah.nongnu.org/download/uisp/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-mega-48-88-168.patch
+	"${FILESDIR}"/${P}-clang.patch
+)
 
 src_prepare() {
-	sed -i -e "/^DOC_INST_DIR/s:/[^/]*$:/${PF}:" Makefile.in || die
-	cd src
-	epatch "${FILESDIR}"/mega-48-88-168.patch
-	sed -i -e 's: -Werror::' Makefile.in || die
+	default
+	eautoreconf
 }
 
 src_install() {
 	default
-	dodoc doc/*
-	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+	dodoc -r doc/.
 }