gentoo new year resync : 01.01.2021

4 files changed, 95 insertions, 11 deletions

diff --git a/sys-block/vblade/Manifest b/sys-block/vblade/Manifest
index 3b0721611680..275187f7ed1a 100644
--- a/sys-block/vblade/Manifest
+++ b/sys-block/vblade/Manifest
@@ -1,6 +1,8 @@
 AUX conf.d-vblade 817 BLAKE2B befac1b206fa3442c5e820baff8efdf4cff443b449ae23679d6bf5f491e530573acb59a1dba4d299d3f0020cdbf1b57a18bf756a38cd847ee5842549a683ce55 SHA512 b65275d01a367888d16a3d51b189f01ceb7634d7b5a1dc02860ecae9a5030d18e99fd47a842748b5ccf48204242fb6d7613698fc3e21f6a1790d91a7600c172f
 AUX init.d-vblade.vblade0-r2 2909 BLAKE2B cf70ce62776c6e79c75110d4622c2913090221d336cea7674a9ba87bd4fb3ea3d7bf5e374d1b9b00693bf864573fef04de11a1b13acc8eb2087811d7fafe9a39 SHA512 1250bdefad4a6abe107d9ceb296b26204c0c9731a963a5a595e799cf2ac3eb10a2d2f48335baf55fa54d220da476e0013b4cd641d35686250794b48e81912403
+AUX vblade-24-fno-common.patch 1105 BLAKE2B 1b6391626e8ca092705f3fdc35072b925d6ea0b10538fedee93e19d6f3ec6347c23b9e63a208c84fed0a09da5a3b3a36eec9ccf933772cd1fb29708c54273249 SHA512 867e31d46ce3f9633262436fca673be485045766f745ebd0607d5632213dafe17259d9f38a55a094c6dc5139d625be1855d01830c755a14c33abe34b57698db9
+AUX vblade-24-makefile.patch 885 BLAKE2B 875811dfa1a75dc1f0fd809d3fc7a72ec1908b4e4d610f1e0a7d4e5813ac4c33d44a19277867c149b3103d267391a6451be98199170cd900e7fb91036d847d66 SHA512 0e7a37fe76be875dbb28337fae91aff31e6d652b112fc255cf6f8e2c22070ad6bb5dc486719af753224ea6c6a72a647e198ab8d2a0930c38ccba46a19ffa6155
 AUX vbladed 544 BLAKE2B 88badea5aad70934eb16731ea2ce93762d282193b43efd25f71b3fc2a69eb3825bcf3db9cc243fb58f38874d2c6c13ab8368817c489bd27581101ad6c1a7c908 SHA512 447dbec563f41848727fe72ff391c07136509acbb707cf427485ef9ad190ec4247d809a2d71136e8f5456cf4f1798b89c9ca4ddcc4407f71d63ad220dab37c30
 DIST vblade-24.tar.gz 27638 BLAKE2B 8a99d571b3b97d47ce9c81ef8141e0d6477181e88aa56e3ea7d03c689c747a60922c21969ea009cf978a3cb15bcb969b12df50f2bd8e6bb498a8bc6d483be1d3 SHA512 d5db85581db119b83a129fc00635d37b6d8fccfaf685dc58c68773c7299f7fe4e01735ec7fea6a0494a0cf2bc1400d643a720b55e4d6de37a0b8ec15d00d1f2a
-EBUILD vblade-24.ebuild 803 BLAKE2B 155f55c789f5df59ad6fe7a1edb4228ce12716f1c01ea8e76e4dc7bd5a235f80fd066c29e374b350240001a7c0cab2fbc0a49e2f4fe986dad3c6e206d0751799 SHA512 8071f8d23354e06ab5ad771d350f05c77f25f55d123efd9c9bae5b49ee091157ba0a27aa8b064ce1557062ce96336a9c87bc8fab3dfbc1987c4da306e56f321c
+EBUILD vblade-24.ebuild 753 BLAKE2B c0fe8a2e3502fc9bbe6a02cca82628a9fe45f4117e0600e4c9bf32b3e1d32da5aeaeb188f8dc26976c617b11736b0be715c852898974c55c48755c82385ef789 SHA512 15723fc9dd17495dc7d1d7fc999f745d075e9aff25a15767f0a8219ca7d66b34ed574a25ac2b939e0221e1c6c5b05b17f584c5d260f0e1dc520601001957fcc2
 MISC metadata.xml 328 BLAKE2B b04b8d9c3016fc84883de505bb4b5fa0dd0f97d8a07c1e84995b7b2931f6b356cfb0f59b7665f7a9c63955a3ee7bae5d37379a326eafe20d58840bd236562718 SHA512 5f04425d524c4535b0b3b42a2c310afa42f09649929f08e12bb491ae808f2fb8dbd08e3c153426bdcef328291b9b19feea2c557ef0a2c6e3a98fc69824c11ca5
diff --git a/sys-block/vblade/files/vblade-24-fno-common.patch b/sys-block/vblade/files/vblade-24-fno-common.patch
new file mode 100644
index 000000000000..2a51ddea4708
--- /dev/null
+++ b/sys-block/vblade/files/vblade-24-fno-common.patch
@@ -0,0 +1,48 @@
+Taken from: https://github.com/OpenAoE/vblade/pull/15
+Author: Andreas Kölbl <koelblandreas@freenet.de>
+
+--- /dev/null
++++ b/dat.c
+@@ -0,0 +1,12 @@
++/* dat.c: Global memory for vblade AoE target */
++#include "dat.h"
++
++int	shelf, slot;
++ulong	aoetag;
++uchar	mac[6];
++int	bfd;		// block file descriptor
++int	sfd;		// socket file descriptor
++vlong	size;		// size of vblade
++vlong	offset;
++char	*progname;
++char	serial[Nserial+1];
+--- a/dat.h
++++ b/dat.h
+@@ -1,4 +1,5 @@
+ /* dat.h: include file for vblade AoE target */
++#include <sys/types.h>
+ 
+ #define	nil	((void *)0)
+ /*
+@@ -163,12 +164,12 @@ enum {
+ 	Nserial= 20,
+ };
+ 
+-int	shelf, slot;
+-ulong	aoetag;
+-uchar	mac[6];
+-int	bfd;		// block file descriptor
+-int	sfd;		// socket file descriptor
+-vlong	size;		// size of vblade
+-vlong	offset;
+-char	*progname;
+-char	serial[Nserial+1];
++extern int	shelf, slot;
++extern ulong	aoetag;
++extern uchar	mac[6];
++extern int	bfd;		// block file descriptor
++extern int	sfd;		// socket file descriptor
++extern vlong	size;		// size of vblade
++extern vlong	offset;
++extern char	*progname;
++extern char	serial[Nserial+1];
diff --git a/sys-block/vblade/files/vblade-24-makefile.patch b/sys-block/vblade/files/vblade-24-makefile.patch
new file mode 100644
index 000000000000..ed5efb2c2e23
--- /dev/null
+++ b/sys-block/vblade/files/vblade-24-makefile.patch
@@ -0,0 +1,35 @@
+--- a/makefile
++++ b/makefile
+@@ -8,27 +8,22 @@
+ sharedir = ${prefix}/share
+ mandir = ${sharedir}/man
+ 
+-O=aoe.o bpf.o ${PLATFORM}.o ata.o
+-CFLAGS += -Wall -g -O2
+-CC = gcc
++O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o
++CFLAGS += -Wall
+ 
+ vblade: $O
+-	${CC} -o vblade $O
++	${CC} ${LDFLAGS} -o vblade $O ${LIBS}
+ 
+ aoe.o : aoe.c config.h dat.h fns.h makefile
+-	${CC} ${CFLAGS} -c $<
+ 
+ ${PLATFORM}.o : ${PLATFORM}.c config.h dat.h fns.h makefile
+-	${CC} ${CFLAGS} -c $<
+ 
+ ata.o : ata.c config.h dat.h fns.h makefile
+-	${CC} ${CFLAGS} -c $<
+ 
+-bpf.o : bpf.c
+-	${CC} ${CFLAGS} -c $<
++dat.o : dat.c
+ 
+ config.h : config/config.h.in makefile
+-	@if ${CC} ${CFLAGS} config/u64.c > /dev/null 2>&1; then \
++	@if ${CC} ${CFLAGS} ${CPPFLAGS} config/u64.c > /dev/null 2>&1; then \
+ 	  sh -xc "cp config/config.h.in config.h"; \
+ 	else \
+ 	  sh -xc "sed 's!^//u64 !!' config/config.h.in > config.h"; \
diff --git a/sys-block/vblade/vblade-24.ebuild b/sys-block/vblade/vblade-24.ebuild
index 418e75559d0c..e8ee9b2db33c 100644
--- a/sys-block/vblade/vblade-24.ebuild
+++ b/sys-block/vblade/vblade-24.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -17,23 +17,22 @@ RDEPEND="sys-apps/util-linux"
 
 S="${WORKDIR}/${PN}-${P}"
 
-src_prepare() {
-	default
+PATCHES=(
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-makefile.patch
+)
 
-	sed -i -e 's,^CFLAGS.*,CFLAGS += -Wall,' \
-		-e 's:-o vblade:${LDFLAGS} \0:' \
-		makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
 	dosbin vblade
 	dosbin "${FILESDIR}"/vbladed
+
 	doman vblade.8
 	dodoc HACKING NEWS README
+
 	newconfd "${FILESDIR}"/conf.d-vblade vblade
 	newinitd "${FILESDIR}"/init.d-vblade.vblade0-r2 vblade.vblade0
 }