gentoo resync : 25.09.2019

5 files changed, 4 insertions, 279 deletions

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index faf288445100..799a051c4dc8 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -83,11 +83,8 @@ DIST github.com-syndtr-goleveldb-c3a204f8e965.tar.gz 147696 BLAKE2B 22156bca1e20
 DIST github.com-thejerf-suture-v3.0.2.tar.gz 18047 BLAKE2B 6b6915ca6db2a8b8e8ae5f34150b862d16b2b82227c25022e7b5f258849c340d57d345a1b8cb87fc14ea7eb36b72025a55b2844270c01830e68bb2177b5dd82f SHA512 08780cdcd8d2a86fe1c42f80a0b7c05ab1aee2a1aef4caef462111bad65a28dbfac2c05f7339de80b698f7b22609f19b52588ecf4d4ea0e971e0d57c55da78e4
 DIST github.com-urfave-cli-v1.20.0.tar.gz 58397 BLAKE2B 0f623bff26139e57f29a2939c70ad8ba0c8daaf3721cc6f4d061fc88209102b1ece790dc0772f5fad66649f1129836482feee20def3dc0d63e728020664016ec SHA512 0a47a47121e25bceb6ebdf10a55ab3bc7531214284b1669fe20237c3ac938c7cd154ebc408759202d936688350e27e47d14f6a6b0793271c10534f2e90bd1fb5
 DIST github.com-vitrun-qart-bf64b92db6b05651d6c25a3dabf2d543b360c0aa.tar.gz 23973 BLAKE2B e272dc6a3f433d0b1479438a251561071e32a25f83784350f25cbbc0022ee1b23da4cac21e2eba76326ffd2838e93edbba816e593ab2bb3b703fd2c1ae65f15d SHA512 cc7ae47017191bd71136796334dd77b9f90e2564d348fa2c03086b593fb73f07cbd5ffe48f3d43ea2f7f32b64ed10f3a095013b27ee6afc25d08eb60f99d72a1
-DIST syncthing-0.14.52.tar.gz 10583112 BLAKE2B cceaf0aba9dff96df0551d7aab855cb716be3d252fd677b82e20560f0a2e9eabf513ca7c7acdf4f1a3b4d3d8f6409692df7d2e92b86b1be1753bdd8913e06952 SHA512 cff48ea1d1286c8b1fe971b00423ad64ef10c9b0555f0cae6e008efc07a21698d54d402fe1a0ac3161c0b5180e5ca0099a0a302fd7e7c5da0f227bdb7e2853ce
 DIST syncthing-1.1.4.tar.gz 4700261 BLAKE2B bf766d7d3701ac66d0d4ac266d9b4a9f02b2f97a6fa320b192f3e46fbe9055091ea5ae71bf405ccce4a9665efdf41477098af3b98562ea06bf0c4f828653bd51 SHA512 cb57cdf6bbab0147a700f72e800cddff0855835280a176883089e5e1dc06352e0dacf615569a35b16f98a857651f534c915f369c46bb592d416d7a01efe5b5ba
 DIST syncthing-1.2.1.tar.gz 4740427 BLAKE2B 2f102100030f646f069a51c5af7c5ab448ea59fa0629d78b14432e32cbfbe90f1b95c49cc3d5812b8cd228ef0454ba5d95f9ddf5910492370018234bc1c66438 SHA512 226386af38c3e99434496f24aa571bd1edd3d1e0528dac06c08b4148b2c63b898b67261728cc6c92dbd0496c24b32f0b1189571d03f6ab5dd592e78f2a5beb3b
-EBUILD syncthing-0.14.52.ebuild 3519 BLAKE2B 16e32b0870241dda338ae5d189f417794d1c0d631c20e8a5898fafe362020ed0bb478e19eb2c46bdef9cced55da00ad5e272fc316ef775699ec1cf195c8d3e54 SHA512 66218c53a968625f6350de72d225c2a5a1a5b6fe707599c207bda1a05a3d03fd11c901d8c5433da3f59913bbd67d014d3c7277db2f236d54f437a4dbee59fa7c
-EBUILD syncthing-1.1.4-r1.ebuild 5543 BLAKE2B cc566ab5070c34c8f482ff0e2f98beb244b5d5145e0c435531a0986d712881dcb74958212a6abe90c883cfd5f0893e709e138df755a72f11febce27d71d88f3d SHA512 d97b097f8bca1451918944941179e9e8e073608f48cbbe28a564ac86beffed4f8768e3ab884e955ad5c3ac6f103398be8d4951ce5bfd62f0fd0bf05da406b86f
-EBUILD syncthing-1.1.4.ebuild 5936 BLAKE2B 9f0c2c9d31f96f2f752af8c43c8c2b4d66e935e9f17eed24ffc5ceb3dc993c49d10872ec64efd82117bd4ba431f7bf48f0d8fb03a5ecf42086483a31d2377e92 SHA512 095f5f5b693bd920ce7b21d17364c7b0c10c5bef57587c23b65c71a7a555f954eba42f79f72bfb64b9c71a0f9f306ea52e3d173a343b3654abc2344fc5aabcdc
-EBUILD syncthing-1.2.1.ebuild 5536 BLAKE2B 4d3af6055087d4b3db98fd139924f3b9052aa7cb30d69e06b89fb6558aaa03f90af8309ca0d6aaed3d85e68d96120838d6ab8076567b3bdfa0d40e9cf2163bfc SHA512 8194f74ed1b6b04f55f9ec501fd19116766204afc92ad8586cb5c2c59942d054f26d7fd64d0f5783b9e3c7a5cb9a866c7402ce877f4b4970fef4634afb56772b
+EBUILD syncthing-1.1.4.ebuild 5935 BLAKE2B 795f102a3a51c2a39850f1475459d82918cd5bc770c2ab5c0cc8080b299315dac1f19e306f596cc3698f7c5919217c279bd11f7c0fbc9ee2c4046ed69b4be600 SHA512 21fc8e3c367ab3751a54940f700ce13fa44e106ae4d6a160d9d5a12c1d1ec391af382ea0536a45b788ab01848726bcefa6794e7fabde693b9de05c7e28493166
+EBUILD syncthing-1.2.1.ebuild 5535 BLAKE2B 6ddcb51678fd4d04e1b9186edeb5afc9d40aa4e199690ba809073a0786a54ba0b3843348a3dd5af22646839993be76f5df945d5dc6dd9ae337b019089ebe3f87 SHA512 9cab546773a1fe6f7562434a46ea3dc6af95df8bbb96c439f20a1c76ee78e77c8e5af24a609e121f2981707b3be6976132f2d4e316c6c7a0ec059cee0a879202
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/syncthing-0.14.52.ebuild b/net-p2p/syncthing/syncthing-0.14.52.ebuild
deleted file mode 100644
index 03e82c266f25..000000000000
--- a/net-p2p/syncthing/syncthing-0.14.52.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/${PN}/${PN}"
-
-inherit golang-vcs-snapshot systemd user eapi7-ver
-
-DESCRIPTION="Open Source Continuous File Synchronization"
-HOMEPAGE="https://syncthing.net"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="selinux tools"
-
-RDEPEND="selinux? ( sec-policy/selinux-syncthing )"
-
-DOCS=( README.md AUTHORS CONTRIBUTING.md )
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-
-	if use tools ; then
-		# separate user for the relay server
-		enewgroup strelaysrv
-		enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv
-		# and his home folder
-		keepdir /var/lib/strelaysrv
-		fowners strelaysrv:strelaysrv /var/lib/strelaysrv
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i \
-		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
-		src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
-		|| die
-}
-
-src_compile() {
-	export GOPATH="${S}:$(get_golibdir_gopath)"
-	cd src/${EGO_PN} || die
-	go run build.go -version "v${PV}" -no-upgrade install \
-		$(usex tools "all" "") || die "build failed"
-}
-
-src_test() {
-	cd src/${EGO_PN} || die
-	go run build.go test || die "test failed"
-}
-
-src_install() {
-	pushd src/${EGO_PN} >& /dev/null || die
-	doman man/*.[157]
-	einstalldocs
-
-	dobin bin/syncthing
-	if use tools ; then
-		exeinto /usr/libexec/syncthing
-		local exe
-		for exe in bin/* ; do
-			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
-		done
-	fi
-	popd >& /dev/null || die
-
-	# openrc and systemd service files
-	systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
-	systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use tools ; then
-		# openrc and systemd service files
-		systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
-		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
-		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
-	fi
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ $(ver_cut 2) -gt \
-				$(ver_cut 2 ${v}) ]]; then
-			ewarn "Version ${PV} is not protocol-compatible with version" \
-				"0.$(($(ver_cut 2) - 1)).x or lower."
-			ewarn "Make sure all your devices are running at least version" \
-				"0.$(ver_cut 2).0."
-		fi
-		ewarn "Syncthing OpenRC init script now uses the upstream default of"
-		ewarn ""
-		ewarn "  /var/lib/${PN}/.config/${PN}"
-		ewarn ""
-		ewarn "as its configuration directory. Please set SYNCTHING_HOMEDIR"
-		ewarn "to /var/lib/${PN} in /etc/conf.d/${PN} if you wish to continue"
-		ewarn "using the old Gentoo default. Systemd users are not affected."
-	done
-
-	# check if user syncthing-relaysrv exists
-	# if yes, warn that it has been moved to strelaysrv
-	if [[ -n "$(egetent passwd syncthing-relaysrv 2>/dev/null)" ]]; then
-		ewarn
-		ewarn "The user and group for the relay server have been changed"
-		ewarn "from syncthing-relaysrv to strelaysrv"
-		ewarn "The old user and group are not deleted automatically. Delete them by running:"
-		ewarn "    userdel -r syncthing-relaysrv"
-		ewarn "    groupdel syncthing-relaysrv"
-	fi
-}
diff --git a/net-p2p/syncthing/syncthing-1.1.4-r1.ebuild b/net-p2p/syncthing/syncthing-1.1.4-r1.ebuild
deleted file mode 100644
index c0734439f112..000000000000
--- a/net-p2p/syncthing/syncthing-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/${PN}/${PN}"
-
-EGO_VENDOR=(
-	"github.com/AudriusButkevicius/go-nat-pmp 452c97607362b2ab5a7839b8d1704f0396b640ca"
-	"github.com/AudriusButkevicius/recli v0.0.5"
-	"github.com/bkaradzic/go-lz4 7224d8d8f27ef618c0a95f1ae69dbb0488abc33a"
-	"github.com/calmh/du v1.0.1"
-	"github.com/calmh/xdr v1.1.0"
-	"github.com/chmduquesne/rollinghash a60f8e7142b536ea61bb5d84014171189eeaaa81"
-	"github.com/d4l3k/messagediff v1.2.1"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff"
-	"github.com/gobwas/glob 51eb1ee00b6d931c66d229ceeb7c31b985563420"
-	"github.com/gogo/protobuf v1.2.1"
-	"github.com/golang/groupcache 84a468cf14b4376def5d68c722b139b881c450a4"
-	"github.com/golang/snappy 553a641470496b2327abcac10b36396bd98e45c9"
-	"github.com/jackpal/gateway 5795ac81146e01d3fab7bcf21c043c3d6a32b006"
-	"github.com/kballard/go-shellquote cd60e84ee657ff3dc51de0b4f55dd299a3e136f2"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/lib/pq v1.1.1"
-	"github.com/mattn/go-isatty v0.0.7"
-	"github.com/minio/sha256-simd cc1980cb03383b1d46f518232672584432d7532d"
-	"github.com/onsi/ginkgo 6c46eb8334b30dc55b42f1a1c725d5ce97375390"
-	"github.com/onsi/gomega ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64"
-	"github.com/oschwald/geoip2-golang v1.3.0"
-	"github.com/oschwald/maxminddb-golang 26fe5ace1c706491c2936119e1dc69c1a9c04d7f"
-	"github.com/petermattis/goid 3db12ebb2a599ba4a96bea1c17b61c2f78a40e02"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/prometheus/client_golang v0.9.2"
-	"github.com/rcrowley/go-metrics e181e095bae94582363434144c61a9653aff6e50"
-	"github.com/sasha-s/go-deadlock v0.2.0"
-	"github.com/stretchr/testify v1.2.2"
-	"github.com/syncthing/notify 4e389ea6c0d84e6195eb585ffaf62c8c143306ae"
-	"github.com/syndtr/goleveldb 34011bf325bce385408353a30b101fe5e923eb6e"
-	"github.com/thejerf/suture v3.0.2"
-	"github.com/urfave/cli v1.20.0"
-	"github.com/vitrun/qart bf64b92db6b05651d6c25a3dabf2d543b360c0aa"
-	"golang.org/x/crypto 0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8 github.com/golang/crypto"
-	"golang.org/x/net 351d144fa1fc0bd934e2408202be0c29f25e35a0 github.com/golang/net"
-	"golang.org/x/sys 4d1cda033e0619309c606fc686de3adcf599539e github.com/golang/sys"
-	"golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
-	"golang.org/x/time 6dc17368e09b0e8634d71cac8168d853e869a0c7 github.com/golang/time"
-	"gopkg.in/asn1-ber.v1 v1.2 github.com/go-asn1-ber/asn1-ber"
-	"gopkg.in/check.v1 788fd78401277ebd861206a03c884797c6ec5541 github.com/go-check/check"
-	"gopkg.in/ldap.v2 v2.5.1 github.com/go-ldap/ldap"
-	"gopkg.in/yaml.v2 v2.0.0 github.com/go-yaml/yaml"
-	# These are only used by the test suite but conditional vendoring is messy
-	"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
-	"github.com/golang/protobuf v1.2.0"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/prometheus/client_model 5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"
-	"github.com/prometheus/common v0.1.0"
-	"github.com/prometheus/procfs 1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4"
-)
-
-inherit golang-vcs-snapshot systemd xdg-utils
-
-DESCRIPTION="Open Source Continuous File Synchronization"
-HOMEPAGE="https://syncthing.net"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="selinux tools"
-
-BDEPEND=">=dev-lang/go-1.12"
-RDEPEND="acct-group/syncthing
-	acct-user/syncthing
-	tools? ( acct-group/stdiscosrv
-		acct-group/strelaysrv
-		acct-user/stdiscosrv
-		acct-user/strelaysrv )
-	selinux? ( sec-policy/selinux-syncthing )"
-
-DOCS=( README.md AUTHORS CONTRIBUTING.md )
-
-src_prepare() {
-	# Bug #679280
-	xdg_environment_reset
-
-	default
-	sed -i \
-		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
-		src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
-		|| die
-}
-
-src_compile() {
-	export GOPATH="${S}:$(get_golibdir_gopath)"
-	cd src/${EGO_PN} || die
-	go run build.go -version "v${PV}" -no-upgrade install \
-		$(usex tools "all" "") || die "build failed"
-}
-
-src_test() {
-	cd src/${EGO_PN} || die
-	go run build.go test || die "test failed"
-}
-
-src_install() {
-	pushd src/${EGO_PN} >& /dev/null || die
-	doman man/*.[157]
-	einstalldocs
-
-	dobin bin/syncthing
-	if use tools ; then
-		exeinto /usr/libexec/syncthing
-		local exe
-		for exe in bin/* ; do
-			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
-		done
-	fi
-	popd >& /dev/null || die
-
-	# openrc and systemd service files
-	systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
-	systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use tools ; then
-		# openrc and systemd service files
-
-		systemd_dounit "${FILESDIR}/stdiscosrv.service"
-		newconfd "${FILESDIR}/stdiscosrv.confd" stdiscosrv
-		newinitd "${FILESDIR}/stdiscosrv.initd" stdiscosrv
-
-		systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
-		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
-		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/stdiscosrv.logrotate" strelaysrv
-		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
-	fi
-}
diff --git a/net-p2p/syncthing/syncthing-1.1.4.ebuild b/net-p2p/syncthing/syncthing-1.1.4.ebuild
index bd005ed29a16..f26f972cbdae 100644
--- a/net-p2p/syncthing/syncthing-1.1.4.ebuild
+++ b/net-p2p/syncthing/syncthing-1.1.4.ebuild
@@ -71,7 +71,7 @@ SLOT="0"
 KEYWORDS="amd64 arm x86"
 IUSE="selinux tools"
 
-BDEPEND=">=dev-lang/go-1.12"
+BDEPEND="<dev-lang/go-1.13"
 RDEPEND="selinux? ( sec-policy/selinux-syncthing )"
 
 DOCS=( README.md AUTHORS CONTRIBUTING.md )
diff --git a/net-p2p/syncthing/syncthing-1.2.1.ebuild b/net-p2p/syncthing/syncthing-1.2.1.ebuild
index f64fbf20c51b..8528e3366039 100644
--- a/net-p2p/syncthing/syncthing-1.2.1.ebuild
+++ b/net-p2p/syncthing/syncthing-1.2.1.ebuild
@@ -79,7 +79,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="selinux tools"
 
-BDEPEND=">=dev-lang/go-1.12"
+BDEPEND="<dev-lang/go-1.13"
 RDEPEND="acct-group/syncthing
 	acct-user/syncthing
 	tools? ( acct-group/stdiscosrv