gentoo resync : 25.08.2020

6 files changed, 3 insertions, 329 deletions

diff --git a/sys-block/vblade/Manifest b/sys-block/vblade/Manifest
index 0505f58ed6eb..3b0721611680 100644
--- a/sys-block/vblade/Manifest
+++ b/sys-block/vblade/Manifest
@@ -1,12 +1,6 @@
 AUX conf.d-vblade 817 BLAKE2B befac1b206fa3442c5e820baff8efdf4cff443b449ae23679d6bf5f491e530573acb59a1dba4d299d3f0020cdbf1b57a18bf756a38cd847ee5842549a683ce55 SHA512 b65275d01a367888d16a3d51b189f01ceb7634d7b5a1dc02860ecae9a5030d18e99fd47a842748b5ccf48204242fb6d7613698fc3e21f6a1790d91a7600c172f
-AUX init.d-vblade.vblade0 2785 BLAKE2B eb2055b8969494e7383291f69689fd8ab44838a0f6371666271594b98f7ead698d94ee44b6e0fd4ba931f5821c8d37d330e9403c8a235b1f954ea03e18dd4463 SHA512 d2665414e5e3fb209e90a7a7bd63edf5dce61735a4bdd1bf347d8b55b9ad57e88eaa2c9c995294ffffa89da7727f5facdfe9468ed212ed6d0497304b54bf92df
-AUX init.d-vblade.vblade0-r1 2927 BLAKE2B e1846a4c2f1ad8c49734512ead6386d39005c23ffdf51ba9212df4cc87665b49115746fe77e1874bd89fcc04a9baa3bac5aea14d62485bc51545aa4a44627065 SHA512 97a72cbf49e363ab1bc62b43c84c04ece79e777c3c427ce59850f257203124bfb662e6e7959e3d77d06bc9e85de3fb030e42d325e1ba258dbd184ac6ab46e438
 AUX init.d-vblade.vblade0-r2 2909 BLAKE2B cf70ce62776c6e79c75110d4622c2913090221d336cea7674a9ba87bd4fb3ea3d7bf5e374d1b9b00693bf864573fef04de11a1b13acc8eb2087811d7fafe9a39 SHA512 1250bdefad4a6abe107d9ceb296b26204c0c9731a963a5a595e799cf2ac3eb10a2d2f48335baf55fa54d220da476e0013b4cd641d35686250794b48e81912403
 AUX vbladed 544 BLAKE2B 88badea5aad70934eb16731ea2ce93762d282193b43efd25f71b3fc2a69eb3825bcf3db9cc243fb58f38874d2c6c13ab8368817c489bd27581101ad6c1a7c908 SHA512 447dbec563f41848727fe72ff391c07136509acbb707cf427485ef9ad190ec4247d809a2d71136e8f5456cf4f1798b89c9ca4ddcc4407f71d63ad220dab37c30
-DIST vblade-20.tgz 26689 BLAKE2B 854b42535c884b670ae94ff3b27272664f6470dd1cb1993665fd64604a556700b05785de6bf5d2dd3c79f6bbf867248c77e4aa6218240e0a3c43535fdc556568 SHA512 b6c10ff9d75a2fc99c93af6b6de8f23c8b17ab70e2d5ed7049389ee8752ad001b3940764af16ff06f7f38c7bc528065edb0f285663af6fdd00fe58f022c26f02
-DIST vblade-23.tar.gz 27432 BLAKE2B 2151656f593771e44fe17a60216dceb4286a3a8d20cb88112c745213fb9c480542330dc67b0936e02cafd8c8de2f43e5ce942575f8508ba80ffde9676c75d264 SHA512 a27379933b5c0fc84966f47e0ee0089fe978fe77ea38d91c21fb6bb6bc4fa7f393b8b4c57f84c6840b549908eb8666847f121b836e3a076895e038e8096c0cfa
 DIST vblade-24.tar.gz 27638 BLAKE2B 8a99d571b3b97d47ce9c81ef8141e0d6477181e88aa56e3ea7d03c689c747a60922c21969ea009cf978a3cb15bcb969b12df50f2bd8e6bb498a8bc6d483be1d3 SHA512 d5db85581db119b83a129fc00635d37b6d8fccfaf685dc58c68773c7299f7fe4e01735ec7fea6a0494a0cf2bc1400d643a720b55e4d6de37a0b8ec15d00d1f2a
-EBUILD vblade-20.ebuild 757 BLAKE2B 6e3311210e11eafc4c00f1a8fda523972989ae43c90294ef50534e1dd92c9d390a9c422939ea05bf0b98fd24c8b47f8d96fb1365b8488ab909d1c87ab335559a SHA512 9c884688885859be759c23f1dd1418b28915ed2c059a2aa060af9a82b57919197366b1c1b89025074c0c309ff57e9142f001c2cf8f80aacac7f1492452bea07c
-EBUILD vblade-23.ebuild 808 BLAKE2B c48d1bd1e52382f15e3141b869ec4efc50196746dabf749c7d5fe46997604dfe44a5adfc35b1a9b6aa3192603cb56e422b2f8ae9bd6a390e3830c21102d82721 SHA512 1d6cfabebd2ba3fc13128db1a438967418fdd16c3136b6019b9094c152a85d37d3ffda0cea6abf557937c603400338d5cabac6693594c791c477f8ac8ee8b30f
-EBUILD vblade-24.ebuild 810 BLAKE2B 223974bc414c0e8f3a13c0f9f8f73393b63264a82032fa62abf054165d480361304200977770b90fd2e60fb8ab03b222eacdada0d1a6a10d19597ced16261ff8 SHA512 8817725f1e5515921cd58b23281289b3cf8323e1c5d69a393c91b543bbe5c29ee6b8291f9aab4db05a17deedaf89ca72215527778bec7962def8e807b972625c
+EBUILD vblade-24.ebuild 803 BLAKE2B 155f55c789f5df59ad6fe7a1edb4228ce12716f1c01ea8e76e4dc7bd5a235f80fd066c29e374b350240001a7c0cab2fbc0a49e2f4fe986dad3c6e206d0751799 SHA512 8071f8d23354e06ab5ad771d350f05c77f25f55d123efd9c9bae5b49ee091157ba0a27aa8b064ce1557062ce96336a9c87bc8fab3dfbc1987c4da306e56f321c
 MISC metadata.xml 328 BLAKE2B b04b8d9c3016fc84883de505bb4b5fa0dd0f97d8a07c1e84995b7b2931f6b356cfb0f59b7665f7a9c63955a3ee7bae5d37379a326eafe20d58840bd236562718 SHA512 5f04425d524c4535b0b3b42a2c310afa42f09649929f08e12bb491ae808f2fb8dbd08e3c153426bdcef328291b9b19feea2c557ef0a2c6e3a98fc69824c11ca5
diff --git a/sys-block/vblade/files/init.d-vblade.vblade0 b/sys-block/vblade/files/init.d-vblade.vblade0
deleted file mode 100644
index 253304dc187a..000000000000
--- a/sys-block/vblade/files/init.d-vblade.vblade0
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_commands="checkconfig"
-
-depend() {
-	need net
-}
-
-# bug #218043
-if [ ! -f /etc/init.d/sysfs ]; then
-	conf="$(add_suffix /etc/conf.d/vblade)"
-	[[ -e "${conf}" ]] && source "${conf}"
-	vblade_name="${myservice#*.}"
-else
-	conf="/etc/conf.d/vblade"
-	[[ -e "${conf}" ]] && source "${conf}"
-	vblade_name="${RC_SVCNAME#*.}"
-fi
-
-vblade_conf_variable="config_${vblade_name}"
-vblade_conf="${!vblade_conf_variable}"
-pidfile="/var/run/vblade-${vblade_name}.pid"
-srvname="vblade.${vblade_name}"
-
-getconfig() {
-	tmp="${vblade_conf}"
-	shelf="${tmp/ *}"
-	tmp="${tmp#* }"
-	slot="${tmp/ *}"
-	tmp="${tmp#* }"
-	netif="${tmp/ *}"
-	tmp="${tmp#* }"
-	src="${tmp}"
-	export shelf slot netif src
-}
-
-checkconfig() {
-	if [ -z "${vblade_conf}" ]; then
-		eerror "vblade configuration not specified for ${vblade_name}"
-		return 1
-	fi
-	getconfig
-	
-	is_valid_numeric "${shelf}" 0
-	if [[ $? -ne 0 ]]; then
-		eerror "Shelf '${shelf}' is non-numeric or less than zero."
-		return 1
-	fi
-	is_valid_numeric "${slot}" 0 15
-	if [[ $? -ne 0 ]]; then
-		eerror "Slot '${slot}' is outside the valid range [0..15]."
-		return 1
-	fi
-
-	sysfs_base="/sys/class/net/"
-	procfs_base="/proc/sys/net/ipv4/conf/"
-	if test ! \( -e "${sysfs_base}${netif}" -o -e "${procfs_base}${netif}" \); then
-		eerror "Network interface '${netif}' does not exist"
-		return 1
-	fi
-	
-	if test ! \( -f "${src}" -o -b "${src}" \) ; then
-		eerror "Source '${src}' must be a file or block device"
-		return 1
-	fi
-	
-	if test ! \( -e "${src}" -a -r "${src}" \) ; then
-		eerror "Source '${src}' is not readable."
-		return 1
-	fi
-
-	return 0
-}
-
-is_valid_numeric() {
-	num="${1}"
-	min="${2}"
-	max="${3}"
-	# non-numeric
-	test "$num" -ge "0" 2>/dev/null
-	rc=$?
-	test "$rc" -eq 2 && return 2
-	# check for min
-	test -z "$min" && return 0
-	test "$num" -lt "$min" && return 1
-	# check for max
-	test -z "$max" && return 0
-	test "$num" -gt "$max" && return 1
-	# done
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-	getconfig
-	ebegin "Starting ${srvname}: e${shelf}.${slot} on ${netif} using '${src}'"
-	export LOGTAG="${srvname}"
-	start-stop-daemon --start --quiet \
-	--pidfile ${pidfile} --background \
-	--make-pidfile --exec /usr/sbin/vbladed -- \
-	${shelf} ${slot} ${netif} "${src}" 
-	eend $?
-	
-	#${shelf} ${slot} ${netif} "${src}" 2>&1 | logger -t ${srvname} &
-}
-
-stop() {
-	ebegin "Stopping ${srvname}"
-	#start-stop-daemon --stop --quiet --pidfile ${pidfile}
-	getconfig
-	ps -Ao pid,args | egrep "^[[:space:]]*[[:digit:]]+ /usr/sbin/vbladed? ${shelf} ${slot}" | awk '{print $1}' | xargs kill
-	eend $?
-	
-	#start-stop-daemon --stop --quiet --exec /usr/sbin/vblade
-}
-
-# vim: ft=gentoo-init-d syntax=gentoo-init-d :
-# vim: ai sw=4 sts=4 ts=4 :
diff --git a/sys-block/vblade/files/init.d-vblade.vblade0-r1 b/sys-block/vblade/files/init.d-vblade.vblade0-r1
deleted file mode 100644
index 174e473ffc17..000000000000
--- a/sys-block/vblade/files/init.d-vblade.vblade0-r1
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_commands="checkconfig"
-
-depend() {
-	need net
-}
-
-# bug #218043
-if [ ! -f /etc/init.d/sysfs ]; then
-	conf="$(add_suffix /etc/conf.d/vblade)"
-	[[ -e "${conf}" ]] && source "${conf}"
-	vblade_name="${myservice#*.}"
-else
-	conf="/etc/conf.d/vblade"
-	[[ -e "${conf}" ]] && source "${conf}"
-	vblade_name="${RC_SVCNAME#*.}"
-fi
-
-vblade_conf_variable="config_${vblade_name}"
-vblade_conf="${!vblade_conf_variable}"
-pidfile="/var/run/vblade-${vblade_name}.pid"
-srvname="vblade.${vblade_name}"
-
-getconfig() {
-	args=""
-	while getopts b:dsrm: FLAG; do
-		case "${FLAG}" in 
-		b)	is_valid_numeric "${OPTARG}" && args="${args} -b ${OPTARG}" || ewarn "vblade block size argument is non-numeric IGNORING";;
-
-		d|s|r)	args="${args} -${FLAG}";;
-
-		# FIXME: there is no sanity checking on the MAC address...we'll leave that up to vblade
-		m)	args="${args} -m ${OPTARG}";;
-		esac
-	done
-
-	shift $(( OPTIND - 1 ))
-
-	shelf=${1}
-	slot=${2}
-	netif=${3}
-	src=${4}
-
-	export args shelf slot netif src
-}
-
-checkconfig() {
-	if [ -z "${vblade_conf}" ]; then
-		eerror "vblade configuration not specified for ${vblade_name}"
-		return 1
-	fi
-	getconfig ${vblade_conf}
-	
-	is_valid_numeric "${shelf}" 0
-	if [[ $? -ne 0 ]]; then
-		eerror "Shelf '${shelf}' is non-numeric or less than zero."
-		return 1
-	fi
-	is_valid_numeric "${slot}" 0 15
-	if [[ $? -ne 0 ]]; then
-		eerror "Slot '${slot}' is outside the valid range [0..15]."
-		return 1
-	fi
-
-	sysfs_base="/sys/class/net/"
-	procfs_base="/proc/sys/net/ipv4/conf/"
-	if test ! \( -e "${sysfs_base}${netif}" -o -e "${procfs_base}${netif}" \); then
-		eerror "Network interface '${netif}' does not exist"
-		return 1
-	fi
-	
-	if test ! \( -f "${src}" -o -b "${src}" \) ; then
-		eerror "Source '${src}' must be a file or block device"
-		return 1
-	fi
-	
-	if test ! \( -e "${src}" -a -r "${src}" \) ; then
-		eerror "Source '${src}' is not readable."
-		return 1
-	fi
-
-	return 0
-}
-
-is_valid_numeric() {
-	num="${1}"
-	min="${2}"
-	max="${3}"
-	# non-numeric
-	test "$num" -ge "0" 2>/dev/null
-	rc=$?
-	test "$rc" -eq 2 && return 2
-	# check for min
-	test -z "$min" && return 0
-	test "$num" -lt "$min" && return 1
-	# check for max
-	test -z "$max" && return 0
-	test "$num" -gt "$max" && return 1
-	# done
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ${srvname}: e${shelf}.${slot} on ${netif} using '${src}'"
-	export LOGTAG="${srvname}"
-	start-stop-daemon --start --quiet \
-	--pidfile ${pidfile} --background \
-	--make-pidfile --exec /usr/sbin/vbladed -- \
-	${args} ${shelf} ${slot} ${netif} "${src}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${srvname}"
-	getconfig ${vblade_conf}
-	ps -Ao pid,args | egrep "^[[:space:]]*[[:digit:]]+ /usr/sbin/vblade.* ${shelf} ${slot} " | awk '{print $1}' | xargs kill
-	eend $?
-}
-
-# vim: ft=gentoo-init-d syntax=gentoo-init-d :
-# vim: ai sw=4 sts=4 ts=4 :
diff --git a/sys-block/vblade/vblade-20.ebuild b/sys-block/vblade/vblade-20.ebuild
deleted file mode 100644
index 7d5ed1198e8e..000000000000
--- a/sys-block/vblade/vblade-20.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="vblade exports a block device using AoE"
-HOMEPAGE="http://sf.net/projects/aoetools/"
-SRC_URI="mirror://sourceforge/aoetools/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="sys-apps/util-linux"
-
-src_prepare() {
-	sed -i -e 's,^CFLAGS.*,CFLAGS += -Wall,' \
-		-e 's:-o vblade:${LDFLAGS} \0:' \
-		makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-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 vblade.vblade0
-}
diff --git a/sys-block/vblade/vblade-23.ebuild b/sys-block/vblade/vblade-23.ebuild
deleted file mode 100644
index bf2ac0290947..000000000000
--- a/sys-block/vblade/vblade-23.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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}"
-
-src_prepare() {
-	default
-
-	sed -i -e 's,^CFLAGS.*,CFLAGS += -Wall,' \
-		-e 's:-o vblade:${LDFLAGS} \0:' \
-		makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-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-r1 vblade.vblade0
-}
diff --git a/sys-block/vblade/vblade-24.ebuild b/sys-block/vblade/vblade-24.ebuild
index b14ea838c8c9..418e75559d0c 100644
--- a/sys-block/vblade/vblade-24.ebuild
+++ b/sys-block/vblade/vblade-24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenAoE/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="sys-apps/util-linux"