commit: bf9971eee2a48953679bced3420072cc8a100f01 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Sep 4 17:34:15 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Sep 4 17:34:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf9971ee
sys-block/vblade: drop 24 Signed-off-by: David Seifert <soap <AT> gentoo.org> sys-block/vblade/Manifest | 1 - sys-block/vblade/files/vblade-24-fno-common.patch | 48 ----------------------- sys-block/vblade/files/vblade-24-makefile.patch | 35 ----------------- sys-block/vblade/vblade-24.ebuild | 38 ------------------ 4 files changed, 122 deletions(-) diff --git a/sys-block/vblade/Manifest b/sys-block/vblade/Manifest index 68b547c1620..b71e8970646 100644 --- a/sys-block/vblade/Manifest +++ b/sys-block/vblade/Manifest @@ -1,2 +1 @@ -DIST vblade-24.tar.gz 27638 BLAKE2B 8a99d571b3b97d47ce9c81ef8141e0d6477181e88aa56e3ea7d03c689c747a60922c21969ea009cf978a3cb15bcb969b12df50f2bd8e6bb498a8bc6d483be1d3 SHA512 d5db85581db119b83a129fc00635d37b6d8fccfaf685dc58c68773c7299f7fe4e01735ec7fea6a0494a0cf2bc1400d643a720b55e4d6de37a0b8ec15d00d1f2a DIST vblade-25.tar.gz 32524 BLAKE2B 5bc396e5f47fa293968b58d589a9f8c5c837434abcc93be5f859047b25a5c6d3e3ecce8119f536fda222574b5b1d598a009f4ae393075c597c3f0f1f1f7ea79c SHA512 a70ee7e98a71bc2a649501c92e6c37fc0410837f5f68f9501e75b688743f0bbe2d1f93969b3a9fe068247cd49c209ba72f794dcbb68ee9d955c0f7fad774fd92 diff --git a/sys-block/vblade/files/vblade-24-fno-common.patch b/sys-block/vblade/files/vblade-24-fno-common.patch deleted file mode 100644 index 2a51ddea470..00000000000 --- a/sys-block/vblade/files/vblade-24-fno-common.patch +++ /dev/null @@ -1,48 +0,0 @@ -Taken from: https://github.com/OpenAoE/vblade/pull/15 -Author: Andreas Kölbl <[email protected]> - ---- /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 deleted file mode 100644 index ed5efb2c2e2..00000000000 --- a/sys-block/vblade/files/vblade-24-makefile.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- 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 deleted file mode 100644 index e8ee9b2db33..00000000000 --- a/sys-block/vblade/vblade-24.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="vblade exports a block device using AoE" -HOMEPAGE="https://github.com/OpenAoE/vblade"; -SRC_URI="https://github.com/OpenAoE/${PN}/archive/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" - -RDEPEND="sys-apps/util-linux" - -S="${WORKDIR}/${PN}-${P}" - -PATCHES=( - "${FILESDIR}"/${P}-fno-common.patch - "${FILESDIR}"/${P}-makefile.patch -) - -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 -}
