gentoo resync : 11.07.2019

2 files changed, 150 insertions, 0 deletions

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index cfd1dad5b81a..dfbe57303a48 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -72,5 +72,6 @@ EBUILD syncthing-1.0.1.ebuild 2405 BLAKE2B b86f9fd630a2b4c3dbd41cb8176ec040c27e9
 EBUILD syncthing-1.1.0-r1.ebuild 5939 BLAKE2B ac39d2404143e578aaea91a0ae24272aca65016b02b92d066cb0a3aebc56e9aba3fcd7929e186ac10b8a94bee338fe41fd84506f74ffa92db10bd52e3b506622 SHA512 a5c8e3a31ffd008c59cea2bc1cf6281abc9474a686c9aad26ce8af469db7dfcbe9912d33db785fcc7fc10fec424c778591952ffe1abdcd3ac51e22e965c02efa
 EBUILD syncthing-1.1.0.ebuild 5518 BLAKE2B f317a927182f47e49263bef2b42dc4ab0241d18f1dab59b5a851a5745c242aee751ae134e85915a18a83febf990513f865e7081f208123f8917a51157b4d2fdb SHA512 22501deac7b557c74e2167d9233e445f19f6c6b40bafdb7f21d679cf6720346b6ba73fcd84d09411af916a849b0d9869c1244f86161bf3448ae1b2810dceeac9
 EBUILD syncthing-1.1.3.ebuild 5939 BLAKE2B ac39d2404143e578aaea91a0ae24272aca65016b02b92d066cb0a3aebc56e9aba3fcd7929e186ac10b8a94bee338fe41fd84506f74ffa92db10bd52e3b506622 SHA512 a5c8e3a31ffd008c59cea2bc1cf6281abc9474a686c9aad26ce8af469db7dfcbe9912d33db785fcc7fc10fec424c778591952ffe1abdcd3ac51e22e965c02efa
+EBUILD syncthing-1.1.4-r1.ebuild 5543 BLAKE2B cc566ab5070c34c8f482ff0e2f98beb244b5d5145e0c435531a0986d712881dcb74958212a6abe90c883cfd5f0893e709e138df755a72f11febce27d71d88f3d SHA512 d97b097f8bca1451918944941179e9e8e073608f48cbbe28a564ac86beffed4f8768e3ab884e955ad5c3ac6f103398be8d4951ce5bfd62f0fd0bf05da406b86f
 EBUILD syncthing-1.1.4.ebuild 5939 BLAKE2B d31bf7fbcfee5abd63779446fb0064a1d81493e9c92519838180440e8ff6dbfc9e253747e6074fe88ea7db7349c28eee673ed5ec0170ca62887354f0cc2935e7 SHA512 53004f85485b856897386782fbfe11322b22bc590f2b0be6c380857745f999e15f76186f261246bdae308c0eaec4281dc990249265ec26eeab334629405d54e8
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/syncthing-1.1.4-r1.ebuild b/net-p2p/syncthing/syncthing-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..c0734439f112
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.1.4-r1.ebuild
@@ -0,0 +1,149 @@
+# 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
+}