gentoo resync 08.09.2018

6 files changed, 172 insertions, 5 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index d4eb7c124fc5..61318f25a036 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/arcconf/Manifest b/sys-block/arcconf/Manifest
index 5d8a46847089..a583aa87ca39 100644
--- a/sys-block/arcconf/Manifest
+++ b/sys-block/arcconf/Manifest
@@ -1,5 +1,5 @@
 DIST arcconf_v2_01_22270.zip 47168976 BLAKE2B 95693a1408e5a4d0d638bbf265f2e1e64247dfec2b1078b56860c5fcd4b13ffa5967bfb9967abfd4b79c788aaeb20759b3a9070a84b083c1653e4868a96ac4cf SHA512 0f91a697c44ea0c0561bec9e432e7d4eba8eb8a2b0255a9867bdb183f81e745aee1dcc2b0017847803dbb27f55cad3e985f4bcd3a202c52f5b557fb724e94d9e
-DIST arcconf_v2_06_23164.zip 57020904 BLAKE2B 27d7afddffeb7ccc1eab518655ea45249d9b74a1cce047fdaef5211564a7cb267981a9c92714c5ccbbc175a052089fbd2b35a531555b2b79a5870b2e9b4298ea SHA512 bb897b557d6fd7bbba4002ae4f12d510df5da42450a652ac267f643f2f9bb193e8b3947a4e5edfb9be7a9e2e840344946ddf7c6795c0c81866d22bd1d2e743c4
+DIST arcconf_v2_06_23167.zip 76911677 BLAKE2B a254121cf2358970beb6f8357d45859c5993daf709e270c0dba0225a6a3ba8f60cb6db215bd20282a1df6d6c76cf2fe5fa8edbc3907073445c50be454c8bc2a5 SHA512 0f9773f4e312e2ede53adf14bf013ae656337e1a13dc81e3409e4cb852d9651f1b6dff4cadad0c7bbae32b67ed8c5a3738e69f1f1870a39756d9a5716b9589ab
 EBUILD arcconf-2.01.22270.ebuild 1044 BLAKE2B 18c61adafd2758743f5c0f0d6767240e3decc7efb028de9a4363f4ad811ff1d8143e17e24cfa9809d4cb96cc8e1305f06fe445dcefa01cbcc89a81a8a8ce4cad SHA512 7324970ee512dedc7f2a668ef833155f7ad558de15fdd6a56ffddd0f894b061b0c2a752862c9258a9857830d6895be7b422d16f254cfe11314a36aaeb69b4d45
-EBUILD arcconf-2.06.23164.ebuild 970 BLAKE2B abf59ac3535920b3a5656ac28cd13c01afa9ee6ccb32b8319d0e9f899dfc3f16c56d2169639672b4aafca41bffe259c63fa5520c2a62fefd38d57a3ff2e38387 SHA512 6f2a835720efbc85be638684d83cd5fe3c86f923e058bbd9273b7f0be7959555148cd90c449187aef47dbb812cf572744a1baf07edc599183e662345ffc7cba7
+EBUILD arcconf-2.06.23167.ebuild 978 BLAKE2B 8e6694e7ee5d3cc3df057b80c37caf2ec092bedd4ee7c3a0d7c82a672e2fe81ca03da18722333abc7317088cf67f0bed3fc744c873cd67ca9fc1912d785bc384 SHA512 fe68da992d76cfdf26e4101b50db1d98f97dc00566b42fe8dc42f041c18aac75950826d9490f3d2e2999d5d7fbf1e7fe45e2dd623c7261ac2d864fa09f596ea7
 MISC metadata.xml 1049 BLAKE2B 7d5cfcc6f805558c64091fd0e4335694f721aed1f9a89945d1bf8b7cf8e0201bb5c75ea7928d6305e3f89be84f001dbd434a8daaf346b37bd7be626a5ec5c69f SHA512 a7e33c5b1923cfdb3516bdd34cc6fa832aaea3b98494db3e4da984b78600b398136f68f27ced287536748c5b812c61c73eda1851d4be548a0f18b4abda9aff73
diff --git a/sys-block/arcconf/arcconf-2.06.23164.ebuild b/sys-block/arcconf/arcconf-2.06.23167.ebuild
index 663cf87d68ec..c928fa4f4135 100644
--- a/sys-block/arcconf/arcconf-2.06.23164.ebuild
+++ b/sys-block/arcconf/arcconf-2.06.23167.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PV="v${PV//./_}"
 
@@ -20,7 +20,7 @@ RDEPEND="${RDEPEND}"
 
 RESTRICT="fetch mirror bindist"
 
-S="${WORKDIR}"
+S="${WORKDIR}/linux_x64"
 
 QA_PREBUILT="usr/bin/arcconf"
 
@@ -39,5 +39,5 @@ pkg_setup() {
 }
 
 src_install() {
-	dobin linux_x64/arcconf
+	dobin cmdline/arcconf
 }
diff --git a/sys-block/vblade/Manifest b/sys-block/vblade/Manifest
index cc84692d06c8..0505f58ed6eb 100644
--- a/sys-block/vblade/Manifest
+++ b/sys-block/vblade/Manifest
@@ -1,9 +1,12 @@
 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
 MISC metadata.xml 328 BLAKE2B b04b8d9c3016fc84883de505bb4b5fa0dd0f97d8a07c1e84995b7b2931f6b356cfb0f59b7665f7a9c63955a3ee7bae5d37379a326eafe20d58840bd236562718 SHA512 5f04425d524c4535b0b3b42a2c310afa42f09649929f08e12bb491ae808f2fb8dbd08e3c153426bdcef328291b9b19feea2c557ef0a2c6e3a98fc69824c11ca5
diff --git a/sys-block/vblade/files/init.d-vblade.vblade0-r2 b/sys-block/vblade/files/init.d-vblade.vblade0-r2
new file mode 100644
index 000000000000..879c07d4e538
--- /dev/null
+++ b/sys-block/vblade/files/init.d-vblade.vblade0-r2
@@ -0,0 +1,125 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 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}" ] && . "${conf}"
+	vblade_name="${myservice#*.}"
+else
+	conf="/etc/conf.d/vblade"
+	[ -e "${conf}" ] && . "${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-24.ebuild b/sys-block/vblade/vblade-24.ebuild
new file mode 100644
index 000000000000..b14ea838c8c9
--- /dev/null
+++ b/sys-block/vblade/vblade-24.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 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-r2 vblade.vblade0
+}