gentoo resync : 23.09.2020

4 files changed, 199 insertions, 18 deletions

diff --git a/dev-embedded/picp/Manifest b/dev-embedded/picp/Manifest
index 3acc59ad9ba5..d31030e2cf4d 100644
--- a/dev-embedded/picp/Manifest
+++ b/dev-embedded/picp/Manifest
@@ -1,4 +1,6 @@
+AUX picp-0.6.8-C99-stdbool.patch 1455 BLAKE2B 29f7fd036ea0424959e063ff69e175d66fa64bd1fb7be33cd5c91d99d8cb3b357e38a7f5cf3292fd55302dd3095c20c4b5687588e506db86c39a5856bce5dcef SHA512 e67c6a5c10d694a1bb18bcebb95c6a9b5ab343a59e68f9cbefdfbc3ce41f00dbe83ca7dc4273e4897d8b9d716a90e4458186eb98d789b6444f3ca356a15fe393
 AUX picp-0.6.8-errno.patch 212 BLAKE2B 9c72090aeb3d774dbc70925d7f2e18dfa8ed633cc878bc1ea9e8313ba214bddf808688938ace0325d19471a8fe7b26cee172390b71160fa2747c9d827e92fd8b SHA512 b45e714ef750f2bab2feebfedbe9e07be2b53b5400e25d4af5d4cf415055cef54639689555a85e21e38c6c28feab2042574b1fc702075632aae3c3cccad94a28
+AUX picp-0.6.8-makefile.patch 1621 BLAKE2B b58e7570b80ba7001ebca1067c55f483ec9db432d7638d44eed6fbd8692c04d8c23a4bd51c0cc116ad1303b3d9560eb2dfd066b9da3c780b143eb38e9135720c SHA512 c4b70e5275bbf4112b8203bd9f4df6b769c77b9beddb7e90b1e242ebff53daf6f2965db99705fd4bd5c13e8408210750319ceda1a4ed329360563249a85a7632
 DIST picp-0.6.8.tar.gz 125303 BLAKE2B f445499fa86bc683ba253a5f9a218da6fdc72a3851557225fc91d1542c26a87ddc1926c10500c382288d71fc41beccc88a3c7c863ac7bba7251d3245c7a784ea SHA512 03b8f55f3ae69d87dc02a2df6cad718c3d9fec725eae469b9e28e411620c95e7c1f2d241110cb6a5561e8d9727da3319e2b7caaeefa7a68239009317c8df9471
-EBUILD picp-0.6.8.ebuild 1043 BLAKE2B 011e46d9df776c51b8b3f0b0c0569547afff0794265c4903a61e6818b2bacedf4da12085aefa6a99a3f20f4e635a7ac7841def34d997d84e31f374b4662536ec SHA512 224dc3cf194a3be86579663e662a0dc5c7d89fd21ea19f1fdf0e0877d99c7a02cbd3fcbbce48adee44155dd79ab5bc912a9715add2e1bdd75174e181c622074c
+EBUILD picp-0.6.8.ebuild 951 BLAKE2B c76fb1ac99bfa9c42e5c9ec37608da2cdcf720318ef3886bbe82d1eabd5c833838499da6caa760f01b6fa4400688fedcb956ce91a32033eb93b03420111ac424 SHA512 ce021bac85b4abf176d92a0152611ac2252f9cd551730941e0f992b5ab86ff193baa764bb85ef307d2250037ee7c24ad4ce29fbaa64999a80048c9ab537dca2c
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/picp/files/picp-0.6.8-C99-stdbool.patch b/dev-embedded/picp/files/picp-0.6.8-C99-stdbool.patch
new file mode 100644
index 000000000000..f458a5674621
--- /dev/null
+++ b/dev-embedded/picp/files/picp-0.6.8-C99-stdbool.patch
@@ -0,0 +1,83 @@
+--- a/atoi_base.h
++++ b/atoi_base.h
+@@ -17,6 +17,8 @@
+ #ifndef __ATOI_BASE_H_
+ #define __ATOI_BASE_H_
+ 
++#include <stdbool.h>
++
+ #ifdef WIN32
+ #define	bool	int
+ #endif
+--- a/parse.h
++++ b/parse.h
+@@ -17,6 +17,8 @@
+ #ifndef __PARSE_H_
+ #define __PARSE_H_
+ 
++#include <stdbool.h>
++
+ bool	GetNextByte(FILE *theFile, unsigned int *address, unsigned char *data);
+ void	InitParse();
+ 
+--- a/picsnoop/dos/serial.h
++++ b/picsnoop/dos/serial.h
+@@ -2,7 +2,7 @@
+ #ifndef __SERIAL_H_

+ #define __SERIAL_H_

+ 

+-#define	bool	int

++#include <stdbool.h>

+ 

+ #define	KEYINT		int86(0x16, &regs, &regs)

+ #define	KBHEAD		0x41a

+@@ -10,15 +10,12 @@
+ 

+ 

+ #ifndef	FALSE

+-#define	FALSE	0

++#define	FALSE	false

+ #endif

+ #ifndef	TRUE

+-#define	TRUE	1

++#define	TRUE	true

+ #endif

+ 

+-#define	false	FALSE

+-#define	true	TRUE

+-

+ #define	INUM1		12			// interrupt vector for com1

+ #define	INUM2		11			// interrupt vector for com2

+ 

+--- a/picsnoop/serial.h
++++ b/picsnoop/serial.h
+@@ -2,6 +2,8 @@
+ #ifndef __SERIAL_H_
+ #define __SERIAL_H_
+ 
++#include <stdbool.h>
++
+ #ifdef WIN32
+ #define	bool	int
+ #endif
+--- a/record.c
++++ b/record.c
+@@ -49,6 +49,7 @@
+ //-----------------------------------------------------------------------------
+ 
+ #include <stdio.h>
++#include <stdbool.h>
+ 
+ #ifdef WIN32
+ #include	<windows.h>
+--- a/serial.h
++++ b/serial.h
+@@ -17,6 +17,8 @@
+ #ifndef __SERIAL_H_
+ #define __SERIAL_H_
+ 
++#include <stdbool.h>
++
+ #ifdef WIN32
+ #define	bool	int
+ #endif
diff --git a/dev-embedded/picp/files/picp-0.6.8-makefile.patch b/dev-embedded/picp/files/picp-0.6.8-makefile.patch
new file mode 100644
index 000000000000..7bad31af4d88
--- /dev/null
+++ b/dev-embedded/picp/files/picp-0.6.8-makefile.patch
@@ -0,0 +1,87 @@
+--- a/fixchksum/Makefile
++++ b/fixchksum/Makefile
+@@ -2,11 +2,9 @@
+ # Makefile for fixchksum
+ #
+ 
+-CC=gcc
+ APP=fixchksum
+-INCLUDES=-I.
+-OPTIONS=-O2 -Wall
+-CFLAGS=$(INCLUDES) $(OPTIONS)
++CPPFLAGS+=-I.
++CFLAGS+=-Wall -std=gnu99
+ SRCS=fixchksum.c
+ OBJECTS = fixchksum.o
+ 
+@@ -17,10 +15,6 @@
+ 
+ all: $(APP)
+ 
+-$(APP): $(OBJECTS)
+-	$(CC) $(OBJECTS) -o $(APP)
+-	strip $(APP)
+-
+ clean:
+ 	rm -f $(APP).o
+ 	rm -f $(APP)
+--- a/Makefile
++++ b/Makefile
+@@ -3,11 +3,9 @@
+ # PIC programmer interface
+ #
+ 
+-CC=gcc
+ APP=picp
+-INCLUDES=-I.
+-OPTIONS=-O2 -Wall -x c++
+-CFLAGS=$(INCLUDES) $(OPTIONS)
++CPPFLAGS+=-I.
++CFLAGS+=-Wall -std=gnu99
+ SRCS=main.c serial.c record.c parse.c atoi_base.c
+ OBJECTS = main.o serial.o record.o parse.o atoi_base.o
+ 
+@@ -19,16 +17,7 @@
+ all: $(APP) convert convertshort
+ 
+ $(APP): $(OBJECTS)
+-	$(CC) $(OBJECTS) -lstdc++ -o $(APP)
+-	strip $(APP)
+-
+-convert: convert.c
+-	$(CC) -O2 -Wall -o convert convert.c
+-	strip convert
+-
+-convertshort: convertshort.c
+-	$(CC) -O2 -Wall -o convertshort convertshort.c
+-	strip convertshort
++	$(CC) $(LDFLAGS) $(OBJECTS) -o $(APP)
+ 
+ clean:
+ 	rm -f *.o
+--- a/picsnoop/Makefile
++++ b/picsnoop/Makefile
+@@ -3,12 +3,9 @@
+ #
+ 
+ APP=picsnoop
+-CC=gcc
+ 
+-INCLUDES=
+-OPTIONS=-O2 -Wall -x c++
+-CFLAGS=$(INCLUDES) $(OPTIONS)
+-OBJECTS = picsnoop.o serial.o
++CFLAGS+=-Wall -std=gnu99
++OBJECTS = serial.o
+ 
+ WINCC=/usr/local/cross-tools/bin/i386-mingw32msvc-gcc
+ WINCFLAGS=-Wall -O2 -fomit-frame-pointer -s -I/usr/local/cross-tools/include -D_WIN32 -DWIN32
+@@ -18,8 +15,6 @@
+ all : $(APP)
+ 
+ $(APP) : $(OBJECTS)
+-	$(CC) $(OBJECTS) -lstdc++ -o $(APP)
+-	strip $(APP)
+ 
+ clean :
+ 	rm -f *.o
diff --git a/dev-embedded/picp/picp-0.6.8.ebuild b/dev-embedded/picp/picp-0.6.8.ebuild
index 9957ee011e31..491f48e79828 100644
--- a/dev-embedded/picp/picp-0.6.8.ebuild
+++ b/dev-embedded/picp/picp-0.6.8.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="A commandline interface to Microchip's PICSTART+ programmer"
 HOMEPAGE="http://home.pacbell.net/theposts/picmicro/"
@@ -12,30 +12,39 @@ SRC_URI="http://home.pacbell.net/theposts/picmicro/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-errno.patch
+	"${FILESDIR}"/${P}-C99-stdbool.patch
+)
 
 src_prepare() {
-	sed -i -e '/strip/d' \
-		-e 's:$(CC):\0 $(LDFLAGS):' \
-		{.,fixchksum,picsnoop}/Makefile || die "sed failed"
+	default
 
-	rm -f picsnoop/{picsnoop,*.o}
+	# remove stale binaries
+	rm picsnoop/{picsnoop,*.o} || die
+}
 
-	epatch "${FILESDIR}"/${P}-errno.patch
+src_configure() {
+	tc-export CC
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) OPTIONS="${CFLAGS} -x c++"
-	emake -C picsnoop CC=$(tc-getCC) OPTIONS="${CFLAGS} -x c++"
-	emake -C fixchksum CC=$(tc-getCC) OPTIONS="${CFLAGS}"
+	emake
+	emake -C picsnoop
+	emake -C fixchksum
 }
 
 src_install() {
-	dobin picp
-	dobin picsnoop/picsnoop
-	dobin fixchksum/fixchksum
-	dodoc README HISTORY LICENSE.TXT NOTES PSCOMMANDS.TXT BugReports.txt TODO
+	dobin picp picsnoop/picsnoop fixchksum/fixchksum
+
+	einstalldocs
+	dodoc BugReports.txt HISTORY LICENSE.TXT NOTES PSCOMMANDS.TXT
+
 	newdoc picsnoop/README.TXT PICSNOOP.txt
 	newdoc fixchksum/README fixchksum.txt
-	dohtml PICPmanual.html
+
+	docinto html
+	dodoc PICPmanual.html
 }