gentoo resync : 29.03.2018

6 files changed, 2 insertions, 100 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index d80e168eaece..252a6be831a5 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 5dca004afd2a..6bc6d56f19ce 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -29,5 +29,5 @@ EBUILD nfs-utils-2.2.1-r1.ebuild 5399 BLAKE2B a44119f006ec1123ea235478ad0425a5dd
 EBUILD nfs-utils-2.2.2_rc1-r1.ebuild 5378 BLAKE2B 8e5cd7e2de1546fd148a7c295c4ab9830e7c250dee1ee5862ae8501075bdf0abf894362cca6954b05d69e2149f781420e0084b9bfe90e2c8c8662810546cb0c8 SHA512 85326df8b59fd0bfe1d0b862fe9270704fc69e05183ce4f9662e8af12b9033681ad70593336b29e5050e2d0bf14f6721787b59c1927064a1c53bed88d2d8679c
 EBUILD nfs-utils-2.2.2_rc1_p20171107-r1.ebuild 5263 BLAKE2B 9edaccda54726385d778c22cf70c13e7532ba1c49ef7593dc0aec5e17376ca3bca0732a1a8182e753791313426c1c838d8e47baeba2bd904a0439c4154660a07 SHA512 043e4a3d76bf7e51d4199c566ac2dde2567715f24af27354672263d68572b500a8a1adaf34dfd6572fe833181761d8e9b84db0edf15e9b7a7bc1995961eb2d10
 EBUILD nfs-utils-2.3.1-r1.ebuild 5440 BLAKE2B aba69b2b931c7414d6ec266b6bc6bb38d105e0006c85c3ca66289d6e0dd10a5a229ca2516a75186fc1b82f3c8fc4b457010f34da42be90cfffa067efbaa785e1 SHA512 0774440f9e4d862122dd80d90d0d8b03d75e4cc2b898bf426c35fb5a80e19a237c682c040ffeda716c6335b4b7e57376d14f89825eca3410b591ec7112d1ca2f
-EBUILD nfs-utils-2.3.1-r3.ebuild 5257 BLAKE2B d8f2b932076e1b8b47a6b8c416b7394986bfce167adf3952b7ea55e0b66f189d3cde06332e980065bb36c0b82a669f9a2f73b6dbdb5357a6da7b38408ea5e572 SHA512 917948e8d03597a39c3acad5e3e5cc7ca55b97d0a5e5c37b0bb04101465be9e207210e020a6320697f7fae8128b0c86443c7c1a5bffe47fe759c9c7d09c317b0
+EBUILD nfs-utils-2.3.1-r3.ebuild 5256 BLAKE2B 5f6c45757d2bdbe7e3c38b330c230bc13821bec3637998d288a192a0804810f6447f1bf7e60184d72faa9e8e02064365e5e6e20af601f5bdfec036e782a9e3ae SHA512 0531f8e5054038f0e8e1dacdb44c17a2c317c3f321ce526fdfd297b86ec4bb18eaa161b879b82e97db70913e05784b863ded043dcd991bfbbeabee74ec5793fa
 MISC metadata.xml 861 BLAKE2B 14c4f9e530e9c3a695f615d698f7a96d1252c14936849a846536790059c79f992c79246028b1945f496fda813891e1079ef0a6ad3411d18e0ee8ad9b6e0315c3 SHA512 21e7e63ddddda196f114b98b6ae2c67abe9cbabf91d60ab7877b34ed96e749c0ea167169c6ffa0502c80f993bbd2243db7bf544b304900a07d2b6c84141d1cf5
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild
index 9e7f359734ea..ed34d6a9f2ff 100644
--- a/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = *_rc* ]] ; then
 	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
 	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-fs/torus/Manifest b/net-fs/torus/Manifest
deleted file mode 100644
index 65fe4fa77be1..000000000000
--- a/net-fs/torus/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST glide-0.10.2.tar.gz 204775 BLAKE2B 018325db34f92844cae7e763c87d3351deba2d54a0caf0f9f31bd1421e358fbadc7ce68c8ef972d1d18bde66fc64962d2ab5bb5bc22b631339b1f0dc05ce9456 SHA512 5e8ecf20de7ce53236d16e52e98acf46f4611d84b742665009d4aea44efe9ba09344f9fe5a6d3f6d6b67ba168ac0f825f620ea419a24ddd826a3ecd83aeea320
-DIST gogo-protobuf-0.3.tar.gz 2116795 BLAKE2B 6b90ad97648e75724c69bb9b8d3cfb17b919a1121813c09ec463df99c290c117b0e0b87f43b285eb5147a205f2f926c223cc4b4d58205a286af2afa87dbd7f5b SHA512 57e1b1715d4811800da8cf9f2c72d202deae622d89715d7eff2ff0c406a0ea3778c187443abb17b072ae6fe57382844807f103837032759dab5420c860b99fb8
-DIST torus-0.1.2.tar.gz 8319943 BLAKE2B 19b146b91769fe9481dd775b95fd7d2c68da87b1f46af58938e4a4eb87a4f661164986eb64ae607b9b368390418586b9baa736fc0a4803fa267ce922c2938c5a SHA512 46d56f560d92cf0b0c357d57d5249584f9a8444dc6bb0c3e00db3a288eea496fbc19c73be87ac9d534a4707ed74769e91354c95bac4b354fc62104a006239912
-EBUILD torus-0.1.2.ebuild 1888 BLAKE2B f4ace076faf0dd5501fb94b8bf3df410895c91d17b2c596d99f449c53345404c978c4cfc1e0d47be901e1d390a84907d4c86d6a7ddd2c331dec6e2d6cb01dff4 SHA512 71b436bcd39ecae80ac03713b92bcb29bce90f66f059dc8aca5bd35a29d1ef01caccaab165cd71f73f9382d51c322825e029ab51a17e0deec86b8d24259110b9
-MISC metadata.xml 321 BLAKE2B 8f009dfdaddbc303d4c2b18cb24796866126617e1507f9f99a78b64934d29f3ccdf1c0fc4e4388bc0d94d8440158a564552bc14d6a02a074eee64a360d009e9c SHA512 680b29d5bde635b912df18de8f34e021bcd37907d9f7990166b3d787a7466f20737f7190391baf4d322e6f928dba22b5dc036655b5e61466d5bf39c1728b5d94
diff --git a/net-fs/torus/metadata.xml b/net-fs/torus/metadata.xml
deleted file mode 100644
index d39e23bd6dca..000000000000
--- a/net-fs/torus/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">coreos/torus</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-fs/torus/torus-0.1.2.ebuild b/net-fs/torus/torus-0.1.2.ebuild
deleted file mode 100644
index 0c209a63b960..000000000000
--- a/net-fs/torus/torus-0.1.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/coreos/${PN}/..."
-SRC_URI="https://${EGO_PN%/*}/releases/download/v${PV}/${PN}_v${PV}_src.tar.gz -> ${P}.tar.gz
-	https://github.com/Masterminds/glide/archive/0.10.2.tar.gz -> glide-0.10.2.tar.gz
-	test? ( https://github.com/gogo/protobuf/archive/v0.3.tar.gz -> gogo-protobuf-0.3.tar.gz )"
-
-DESCRIPTION="A distributed storage system coordinated through etcd"
-HOMEPAGE="https://${EGO_PN%/*}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-DEPEND=">=dev-lang/go-1.6:="
-RDEPEND=""
-
-get_archive_go_package() {
-	local archive=${1} uri x
-	for x in ${SRC_URI}; do
-		if [[ ${x} == http* ]]; then
-			uri=${x}
-		elif [[ ${x} == ${archive} ]]; then
-			break
-		fi
-	done
-	uri=${uri#https://}
-	uri=${uri%/archive/*}
-	case ${uri} in
-		${EGO_PN%/*}*)
-			echo "${EGO_PN%/*}|${PN}_*"
-			;;
-		*)
-			echo "${uri}|${uri##*/}-*"
-			;;
-	esac
-}
-
-unpack_go_packages() {
-	local go_package x
-	# Unpack packages to appropriate locations for GOPATH
-	for x in ${A}; do
-		unpack ${x}
-		if [[ ${x} == *.tar.gz ]]; then
-			go_package=$(get_archive_go_package ${x})
-			x=${go_package#*|}
-			go_package=${go_package%|*}
-			mkdir -p src/${go_package%/*}
-			mv ${x} src/${go_package} || die
-		fi
-	done
-}
-
-src_unpack() {
-	mkdir "${S}" || die
-	cd "${S}" || die
-	unpack_go_packages
-}
-
-src_compile() {
-	GOPATH="${S}" go install -v -work -x github.com/Masterminds/glide/... || die
-	mkdir -p "${S}/src/${EGO_PN%/*}/tools" || die
-	mv "${S}/bin/glide" "${S}/src/${EGO_PN%/*}/tools/glide" || die
-	GOPATH="${S}" \
-		emake -C "${S}/src/${EGO_PN%/*}" VERSION=v${PV} build
-}
-
-src_test() {
-	GOPATH="${S}" \
-		emake -C "${S}/src/${EGO_PN%/*}" VERSION=v${PV} test
-}
-
-src_install() {
-	cd "${S}/src/${EGO_PN%/*}"|| die
-	dobin bin/${PN}*
-	dodoc README.md
-	use doc && dodoc -r Documentation
-}