gentoo resync : 02.06.2019

15 files changed, 547 insertions, 69 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 9017393d1f77..4fe86f4dd083 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index 6b33504743e4..df114bcc5688 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -1,9 +1,7 @@
 AUX airdcppd.confd 198 BLAKE2B 7d3fbce6527a7f1971f544a37215fa73ed1f19bc5f6c4c3ef90c28b170b84ecd3a82da77b582b69ef442a9a455752192ba4b6b33aeb9a43587c0209fdf380342 SHA512 025ec93c208173771fe697574c9161b9af8d740eab0b1290c8d3857961dc3635339bdb9c18b97fdde6fa7dc8924f4453b9c609ca57e61f1cad9ff47683fb613e
 AUX airdcppd.initd 584 BLAKE2B 6e19d6088b26153527fa51e3789c3968647af3f7a2b1fbe2b355587b14eef94b8800a78565ce3bd54f0474542496bfd9f80566c36fcf6f1e51f55c48aa0654ee SHA512 f6de7a576eaef662e73dd488acd956371891278a6fa6c912be864c630a22435541deaca9055c6d7912bf483de228db2cd0bd9c9666a1a436de55112561783721
-DIST airdcpp-webclient-2.5.0.tar.gz 900078 BLAKE2B 53f5e096a3a6cc7c77c92bef32a7aaf0fb7b5e49740718252c7b4e233b80c52ca27029ba24fef4f1ab9c4c360da182accffb8ba7de27ef9b0b4aaa011005b689 SHA512 cf0220e3f2096304e393a4bd833e81c1427dbd144a56498712c9e18f2ec14f35d9112ad0ff05f54aad5a57126d68fc46c2bf20806dd7464a5bdb301543b08809
-DIST airdcpp-webclient-2.5.1.tar.gz 898980 BLAKE2B a930a13d34068977d0184ea56163cb9ae0f47bd92cfb724145f287742fb034ebc89f0a55fc5b07a8761de0749d3725912d4f4682542ac60c93b003a08ed24c9f SHA512 297aa780ecc35f48000eba1cc3b6f284a64954fbcc257ed58c84f2c88901b1c01c17228883c6569fa1333f0e41067f9fe7623ef24e458844544f6d6cc2b45c4c
 DIST airdcpp-webclient-2.6.0.tar.gz 903873 BLAKE2B 7a82891efef14e8d3c2da9a15165698084daf9c044d420c271dd1401710f030fc3c6fd83d7f58cee746767624b1292e7fcb7a48387e03b0eca2cf779753686d8 SHA512 d6d029638e69d19743d2e49185b08a808d95d725c3f40bd98ab42c384d3eae6d07e4528ac28ac9db50011f8a68592ae60f49cedbbccb45a78e82a5e424bb731c
-EBUILD airdcpp-webclient-2.5.0.ebuild 1437 BLAKE2B e0450bcb8ad7cac245fb7a38f9bf124321b57ed4185558e7b0e1c9232dd5e94d36c6b937be183ddfde043e902f7eb93a107bec65b2833f8cc0b3c29aba3e9542 SHA512 9fba8e23a2266b16f4b88437669b8efce51f741998cdd184ba9ed4d64876ba1f7f0ade9dcc5c5803e2760e4ffea86383891a4a5c43ae4bba9d8b135d7e209c43
-EBUILD airdcpp-webclient-2.5.1.ebuild 1437 BLAKE2B 82d3e693e68b9c85e4b3c7864d3448b19a76f59060934a23c0a0cd99cf2dee2b5242ad3c45e91b016f5fb46d98e708dd0e28b4ff5a8c01acdbc991b99794cca3 SHA512 5bdce912f57bde5f91368102a41d5527369c65ba3a47c953dbe9471998b45036893c1f2ab68435e29d21921f9e4d16e6939b2d578a6643382d6506da528170e7
+DIST airdcpp-webclient-2.6.1.tar.gz 908393 BLAKE2B 8734cdfc1b0e380d231cf6e571d215b7cec196fe012bf842fd2257496f252dd803eee0a308e97033f959652dbd4d21bd2b96559c4a4262a8f7ddd2c491c7d263 SHA512 bad35d09475ef9a95f358bce99d1143586e3eedb58b3c5c74570c707f099ed1b1214714c093f74c6e2bbfa733077dcaf3e590ae3d821330938f9ec32c75a7152
 EBUILD airdcpp-webclient-2.6.0.ebuild 1437 BLAKE2B 82d3e693e68b9c85e4b3c7864d3448b19a76f59060934a23c0a0cd99cf2dee2b5242ad3c45e91b016f5fb46d98e708dd0e28b4ff5a8c01acdbc991b99794cca3 SHA512 5bdce912f57bde5f91368102a41d5527369c65ba3a47c953dbe9471998b45036893c1f2ab68435e29d21921f9e4d16e6939b2d578a6643382d6506da528170e7
+EBUILD airdcpp-webclient-2.6.1.ebuild 1437 BLAKE2B 82d3e693e68b9c85e4b3c7864d3448b19a76f59060934a23c0a0cd99cf2dee2b5242ad3c45e91b016f5fb46d98e708dd0e28b4ff5a8c01acdbc991b99794cca3 SHA512 5bdce912f57bde5f91368102a41d5527369c65ba3a47c953dbe9471998b45036893c1f2ab68435e29d21921f9e4d16e6939b2d578a6643382d6506da528170e7
 MISC metadata.xml 804 BLAKE2B 4d7003fed4a4fcf24fcf30ecf7d5e2c8970f4c76e6b37444721d09da8413a1d1aeb3a2d4c22174f02bfb7fff7b38e35f23c85a9070625a3eaf63bf0f68fc20e7 SHA512 1408ae27ba8cce6f6f6d53a5fade6d4bf2ce0587cd0b829c3426d88257e83dcd6c69ba5e3cb143d7ac7a31ad7a59e7324a6faf489162f88b62932b4bf8129268
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.0.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.0.ebuild
deleted file mode 100644
index 8d45254e2be0..000000000000
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils python-any-r1 user
-
-DESCRIPTION="Cross-platform Direct Connect client"
-HOMEPAGE="https://airdcpp-web.github.io/"
-SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="nat-pmp +tbb +webui"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-cpp/websocketpp
-	dev-libs/boost:=
-	dev-libs/leveldb:=
-	dev-libs/libmaxminddb:=
-	dev-libs/openssl:0=[-bindist]
-	net-libs/miniupnpc:=
-	sys-libs/zlib:=
-	virtual/libiconv
-	nat-pmp? ( net-libs/libnatpmp:= )
-	tbb? ( dev-cpp/tbb:= )
-"
-DEPEND="
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-PDEPEND="webui? ( www-apps/airdcpp-webui )"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	enewgroup airdcppd
-	enewuser airdcppd -1 -1 /var/lib/airdcppd airdcppd
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_WEB_UI=OFF
-		-DENABLE_NATPMP=$(usex nat-pmp)
-		-DENABLE_TBB=$(usex tbb)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newconfd "${FILESDIR}/airdcppd.confd" airdcppd
-	newinitd "${FILESDIR}/airdcppd.initd" airdcppd
-	keepdir /var/lib/airdcppd
-	fowners airdcppd:airdcppd /var/lib/airdcppd
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Run 'airdcppd --configure' to set up ports and authentication"
-	fi
-}
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.1.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.1.ebuild
index 647a9600c515..647a9600c515 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.1.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.1.ebuild
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index ccbb070db985..442ef15b1621 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,7 +1,13 @@
 AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e0f2b87f94a901a8e15ea5c81e6704fe5e81681383a3d82c41516174c4cae3a6dc59c9d2af618197f32189 SHA512 d175754246d61d08d615af52c3499d67e4d8c6a5166f07ea4fd646f3000ca7afed99f9b436785c50141a86b5faf017be4b2d1d5d2f9e3921a6171e4223be9b4c
 DIST cpuminer-opt-3.8.8.1.tar.gz 1709515 BLAKE2B cecf9f57093fd89cef459cdc0d591a5de4bb12126a931dd9bfee0fc9b08a7ec4b5bb087ad383f14492b3da3066bac695f0022e1dfc595c7e331c9517b4b44db6 SHA512 5dd254237231abb84312c31be97952d1e1f1cd6c4fa0efc409581afb1a28d9783816b9efdb07501d67b99b831bce0a290e5cc2b3ce6c915a3e76b00edd582560
+DIST cpuminer-opt-3.9.0.1.tar.gz 1744675 BLAKE2B e1dff3bafd1c60bd67dbeca6acad4ee48a00bf0d77512686ac5b2bd9f375eee4a6e9b32c891f195bb98c4a48ac0f52a6da91bc51e28017dd811bf975d8c0550f SHA512 f807f9f7416983363116a07b12a191227907e26a658f6cd00f5556292785c27f6b56df9998a06bc1e44769bd549a5be75acd6986d446dd885b8b49763fde1731
 DIST cpuminer-opt-3.9.0.tar.gz 1744113 BLAKE2B 0fef9ead2218284032d70df4d823f43896a72a06c91612b3a9981a89bb51c890d3fe54707af80d2ebe3ceb513ef98c3e7b036b9ec0a9767ff5b969bed2a26318 SHA512 beb3faf8f2b765f7f995274e247b59590c3cebf2f6d46ce39abac8ecec322cabfc4b2acc087686f9c701c2c32d96b5d1f95d34413ec70c727b58f67054fc2603
+DIST cpuminer-opt-3.9.1.1.tar.gz 1771289 BLAKE2B c3a0cdb6793d1590bca11fac736d2d9e0bc200a391f2f440f7e005e6d61c90c331bc856055a1cf207a5abed934caa421e6d291372e293467ad2738039f491f96 SHA512 fdbbc60f433ae810522ca22b1709ee2052de90631cd68d5581fa2297ad549093bc64b0f4ec6900986ec56e16b84ead111f8d8a796b7e654c675b0585990e266d
+DIST cpuminer-opt-3.9.1.tar.gz 1770345 BLAKE2B c2ef3111f1c1f034d2e4d4148031cf4fa099484e4bc54e8266323bdff26cbd90a390bb4bc0e77b095227bb3c0026a1b6d791bebb5345e74462650fe4be0e688d SHA512 ca83b2b325947591e77b8edd7f920043d3422259e9e60a7549066d1290c60b7b108dd91c4f8731e8ffb3932d2d430a0b0f02e6b384b03a939e32c6dd4329732b
 EBUILD cpuminer-opt-3.8.8.1-r1.ebuild 1029 BLAKE2B 3b78792a9c3e6eeceef1b01e8ffb3541c169c44b9d21c294856a2e9624f6b6106a5f7ba2e9f743f3e3bb97e14986d352fdda69dea944906aa87e4e843a5bf1fd SHA512 2927d9dfd2ea681153c77cb592bba5d447ea8954d9a99a0743cd86bc695349529105ef5f06e0219814bbfead0ede171c4bbb7352edfbfa2bb32d8b144b2e727d
+EBUILD cpuminer-opt-3.9.0.1.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
 EBUILD cpuminer-opt-3.9.0.ebuild 1029 BLAKE2B 03505cb48293bd884d6ff25944aad5d5aed6d2fe8888d07f16529900d5589f3550ac02f3f2e6e24ec70e65a7059d1f0e05e8377fbaff98385c8d23b2005f5670 SHA512 1ca7351712bb25fa0245e281bf23a18bc7d2b778cd8e16969c25cde8702f65519855b30a7c3d171e0ee7b58dc61b8e4c66d91643d8aaf5c68a6829d209735663
+EBUILD cpuminer-opt-3.9.1.1.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
+EBUILD cpuminer-opt-3.9.1.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
 EBUILD cpuminer-opt-9999.ebuild 1029 BLAKE2B 03505cb48293bd884d6ff25944aad5d5aed6d2fe8888d07f16529900d5589f3550ac02f3f2e6e24ec70e65a7059d1f0e05e8377fbaff98385c8d23b2005f5670 SHA512 1ca7351712bb25fa0245e281bf23a18bc7d2b778cd8e16969c25cde8702f65519855b30a7c3d171e0ee7b58dc61b8e4c66d91643d8aaf5c68a6829d209735663
 MISC metadata.xml 333 BLAKE2B f7851fe0d55d729c75e3934fa32ab578c57d3dfc4a1634cc8dcca655f0d4ab1a6bb56d0b9c347dedb6cedf3d5a5a7a1bb9662856733970b1cc8db288c26be4a2 SHA512 770d39605bb1afa7d7643b4fc8f295e449f90175ae0d31c8a5023bfc9ba233c9e80ebf1dfbf81c4b86af8dc1d66bc336a4464748f162119b35fcb695cd54e656
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.0.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.0.1.ebuild
new file mode 100644
index 000000000000..666d27ee1c02
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.0.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Optimized multi algo CPU miner"
+HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
+IUSE="cpu_flags_x86_sse2 curl libressl"
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="cpu_flags_x86_sse2"
+DEPEND="
+	dev-libs/gmp:0
+	dev-libs/jansson
+	>=net-misc/curl-7.15[ssl]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	econf --with-crypto --with-curl
+}
+
+src_install() {
+	default
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto "/etc/${PN}"
+	doins cpuminer-conf.json
+}
+
+src_test() {
+	./cpuminer --cputest || die
+}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.1.ebuild
new file mode 100644
index 000000000000..666d27ee1c02
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Optimized multi algo CPU miner"
+HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
+IUSE="cpu_flags_x86_sse2 curl libressl"
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="cpu_flags_x86_sse2"
+DEPEND="
+	dev-libs/gmp:0
+	dev-libs/jansson
+	>=net-misc/curl-7.15[ssl]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	econf --with-crypto --with-curl
+}
+
+src_install() {
+	default
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto "/etc/${PN}"
+	doins cpuminer-conf.json
+}
+
+src_test() {
+	./cpuminer --cputest || die
+}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.ebuild
new file mode 100644
index 000000000000..666d27ee1c02
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Optimized multi algo CPU miner"
+HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
+IUSE="cpu_flags_x86_sse2 curl libressl"
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="cpu_flags_x86_sse2"
+DEPEND="
+	dev-libs/gmp:0
+	dev-libs/jansson
+	>=net-misc/curl-7.15[ssl]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	econf --with-crypto --with-curl
+}
+
+src_install() {
+	default
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto "/etc/${PN}"
+	doins cpuminer-conf.json
+}
+
+src_test() {
+	./cpuminer --cputest || die
+}
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 585d5961c494..a5852ef797a7 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,3 +1,7 @@
+AUX stdiscosrv.confd 107 BLAKE2B 8bf3beb78bac5a50cf4b036dcbc9e43106e9a6d52193dab63f80d1c0575f376061b72eb331199c4be14037b572a06aeddcfca6fc9c0e3e13a4ef26ae967b0095 SHA512 1bdbc7a4d86c6286b6859916e13de8fb196874ca5f27829bce586481a9bda535758f627890ab78b0a1e7eebf30ef209b9433a75ea60a4a69c3f18e2afbd0feed
+AUX stdiscosrv.initd 730 BLAKE2B 55d60be02d28b8c995105d0f68ece809b0fc1c5314ed6eb1c3a926f2d2a7a5b3edff7d096fcb6dc3d79224ffa888f0c23834872427c26bb162ce3609037abc5a SHA512 a854aa0655803b7f15571d774514125fe3e97dea8da8d449ac4768edb86a4e57840e2c83bbf4d6fc0c0a9a26b8eeb6dd3e2648dd415e33c3ef1f4f1438e98517
+AUX stdiscosrv.logrotate 102 BLAKE2B c4670214a411fdc0ccfabcc0b1f7692e910cb0b2f465006b61d9f67f3ab1a41bc72fb831d2a261efeedfb585a774c1659bc3c8b2183582ce6a329390a2cc70a0 SHA512 cef815a68906851a594214a9bc8a437591b4928c02fdb2fa982898d51b2cc2cd083f2a6093830a5319f1b4d7ab446f3f31a6831fa1ae946c6bdf149afb1dd539
+AUX stdiscosrv.service 304 BLAKE2B 2caaeb4ca9e3cf2cd202b4d3542d7069697cfa057759ef12e387c08e3e3c72d349dffe52ffe1fa6b369045d829c3688c8f2ecfe866379a49f00bf0391c2f8ff3 SHA512 2d12e4de4675d0ef3bb5f55d5c393b223531bec5d0b4d6f752be3f90b82e93a31db899dea5ee954d727d8a535e46047be6547ae30528052c371993d264c22582
 AUX strelaysrv.confd 107 BLAKE2B d7a8bf341826c8e3f343d8e39a1e527e8284695fb51324546452c2f5ce8d78034d5e7145a28fc08fff9443af37e263b243f2fe4c580b01a979a6409f0c0c93ee SHA512 67ca4b8a1c9197e0d5876073ccc89d34866e493c66f7691716f1f2b81defd74a79e7aeae9ce42d852e9cb32d7f0df4ffb43b53ae61ec1b4944e63cc0b470e9c5
 AUX strelaysrv.initd 729 BLAKE2B 5a9d55a604604ff1d8ade89ece5a1ff29d75f882a431e06f7f926cd457d1e3db0eebd90c336a848d254de9571385d0ba577a97687809b36fdd0ece301e857c26 SHA512 364ff18453da1a3a76a5bec26403728872ea5f8c551762ac7c091293cd76e01bf9e2fa100dcedf12004e84b5a023e556b713b0e9db0f540062cb4a44562b02e0
 AUX strelaysrv.logrotate 102 BLAKE2B 3d19a7dcade5878e7b7f275572ab2d5232ea3d043b720fa17c208dca456c3e82b5d5158df6633c6fd15d16aa0680bb2a642ba0daf440754fab281e94e69f327d SHA512 2f94be8af78b1beb567a7e6b7177aaa6451cd1ae63ef2842369879cc2e8e0cc2c615f68ce26d7031fbb7268788f7c210c03c33de52ff064b48ca42231613be85
@@ -57,7 +61,10 @@ DIST github.com-vitrun-qart-bf64b92db6b05651d6c25a3dabf2d543b360c0aa.tar.gz 2397
 DIST syncthing-0.14.52.tar.gz 10583112 BLAKE2B cceaf0aba9dff96df0551d7aab855cb716be3d252fd677b82e20560f0a2e9eabf513ca7c7acdf4f1a3b4d3d8f6409692df7d2e92b86b1be1753bdd8913e06952 SHA512 cff48ea1d1286c8b1fe971b00423ad64ef10c9b0555f0cae6e008efc07a21698d54d402fe1a0ac3161c0b5180e5ca0099a0a302fd7e7c5da0f227bdb7e2853ce
 DIST syncthing-1.0.1.tar.gz 7114455 BLAKE2B 71c80afaab5a546551e8e72e63272ab277df33645d4de19005376de599d8fe0bad9d4a1e7758321d116f8c46cd73067a770f641a0c736ad678a09579716f44a8 SHA512 7f9fd48e00fae2f0913eb9eeddadaad1d5d7559164a24020706e70411f8ec43420192c4c9422699be6faa1641a382d5b8627038ca9a5dad38ee0e189970efbb7
 DIST syncthing-1.1.0.tar.gz 4658059 BLAKE2B 7b145d0299eada05662f500269d15bee078d00a16ea1cd621fcae0179e6ffc0180741867be33b3736392bb850bf82770a245002d735ba518a48574a11c5c2c07 SHA512 9fd3b7b29fc5842ec0764a274d8695772c1dc23d9c971c4741ea4fba93f93afbdc0df6e743345ebe83a26556e2a693b808a409190d6cc6c61d8d6b9850e5e998
+DIST syncthing-1.1.3.tar.gz 4686497 BLAKE2B d80718bc084212657cb7f1c3a4b5c41f22e43ddbba6923d1daf20328789135fcfca8a0f40adaedd68c1a3c29b891eaed39b0fac2099777999a1e2ed3f980c676 SHA512 43dff52336c19a9a8ce39413a9288d0f500d633589e0f3ff3989ad38d9c6fe6af5b01b27b3143e6beb0841e1e6bc6c590f4859530720e2730cdf214130c99a3a
 EBUILD syncthing-0.14.52.ebuild 3519 BLAKE2B 16e32b0870241dda338ae5d189f417794d1c0d631c20e8a5898fafe362020ed0bb478e19eb2c46bdef9cced55da00ad5e272fc316ef775699ec1cf195c8d3e54 SHA512 66218c53a968625f6350de72d225c2a5a1a5b6fe707599c207bda1a05a3d03fd11c901d8c5433da3f59913bbd67d014d3c7277db2f236d54f437a4dbee59fa7c
 EBUILD syncthing-1.0.1.ebuild 2405 BLAKE2B b86f9fd630a2b4c3dbd41cb8176ec040c27e956b46fefdf252f81e69b5f6448136830ccaad91d5a02e3c41c3583d9f2e0e1a6eafb09f2ce6d952f2917476c615 SHA512 58bfa070682a0037376da86054c456657f2ee9c7723a0d6198972516b0c8077a86acbe715c633c52556fe9cfc1bbb0f36b0e016baa113720e090258184f40e96
+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
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/files/stdiscosrv.confd b/net-p2p/syncthing/files/stdiscosrv.confd
new file mode 100644
index 000000000000..e40a4b931db7
--- /dev/null
+++ b/net-p2p/syncthing/files/stdiscosrv.confd
@@ -0,0 +1,3 @@
+# Options to pass to discosrv
+# see /usr/libexec/syncthing/stdiscosrv --help for more information
+SD_OPTS=
diff --git a/net-p2p/syncthing/files/stdiscosrv.initd b/net-p2p/syncthing/files/stdiscosrv.initd
new file mode 100644
index 000000000000..333b980897b3
--- /dev/null
+++ b/net-p2p/syncthing/files/stdiscosrv.initd
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+SD_USER=stdiscosrv
+SD_GROUP=stdiscosrv
+SD_HOMEDIR=/var/lib/stdiscosrv
+SD_LOGFILE=/var/log/syncthing/stdiscosrv.log
+
+
+description="Discovery service for syncthing"
+command="/usr/libexec/syncthing/stdiscosrv"
+command_args="${SD_OPTS}"
+pidfile="/run/stdiscosrv.pid"
+start_stop_daemon_args="--background
+  --user ${SD_USER}
+  --group ${SD_GROUP}
+  --chdir \"${SD_HOMEDIR}\"
+  --make-pidfile
+  --stdout \"${SD_LOGFILE}\"
+  --stderr \"${SD_LOGFILE}\"
+  "
+
+depend() {
+  need net
+}
+
+start_pre() {
+  checkpath -q -d -o ${SD_USER}:${SD_GROUP} ${SD_HOMEDIR}
+  checkpath -q -f -o ${SD_USER}:${SD_GROUP} ${SD_LOGFILE}
+}
diff --git a/net-p2p/syncthing/files/stdiscosrv.logrotate b/net-p2p/syncthing/files/stdiscosrv.logrotate
new file mode 100644
index 000000000000..406a1122a240
--- /dev/null
+++ b/net-p2p/syncthing/files/stdiscosrv.logrotate
@@ -0,0 +1,6 @@
+/var/log/syncthing/stdiscosrv.log {
+    missingok
+    notifempty
+    sharedscripts
+    copytruncate
+}
diff --git a/net-p2p/syncthing/files/stdiscosrv.service b/net-p2p/syncthing/files/stdiscosrv.service
new file mode 100644
index 000000000000..4011c7d4c5bd
--- /dev/null
+++ b/net-p2p/syncthing/files/stdiscosrv.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Syncthing discovery server
+After=network.target
+
+[Service]
+User=stdiscosrv
+Group=stdiscosrv
+ExecStart=/usr/libexec/syncthing/stdiscosrv
+WorkingDirectory=/var/lib/stdiscosrv
+
+PrivateTmp=true
+ProtectSystem=full
+ProtectHome=true
+NoNewPrivileges=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-p2p/syncthing/syncthing-1.1.0-r1.ebuild b/net-p2p/syncthing/syncthing-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..b03fd9fcd02e
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.1.0-r1.ebuild
@@ -0,0 +1,163 @@
+# 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.0"
+	"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.0.0"
+	"github.com/mattn/go-isatty v0.0.4"
+	"github.com/minio/sha256-simd cc1980cb03383b1d46f518232672584432d7532d"
+	"github.com/onsi/ginkgo 6c46eb8334b30dc55b42f1a1c725d5ce97375390"
+	"github.com/onsi/gomega ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64"
+	"github.com/oschwald/geoip2-golang v1.1.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 user 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="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 discovery server
+		enewgroup stdiscosrv
+		enewuser stdiscosrv -1 -1 /var/lib/stdiscosrv stdiscosrv
+		keepdir /var/lib/stdiscosrv
+		fowners stdiscosrv:stdiscosrv /var/lib/stdiscosrv
+
+		# 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() {
+	# 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.3.ebuild b/net-p2p/syncthing/syncthing-1.1.3.ebuild
new file mode 100644
index 000000000000..b03fd9fcd02e
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.1.3.ebuild
@@ -0,0 +1,163 @@
+# 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.0"
+	"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.0.0"
+	"github.com/mattn/go-isatty v0.0.4"
+	"github.com/minio/sha256-simd cc1980cb03383b1d46f518232672584432d7532d"
+	"github.com/onsi/ginkgo 6c46eb8334b30dc55b42f1a1c725d5ce97375390"
+	"github.com/onsi/gomega ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64"
+	"github.com/oschwald/geoip2-golang v1.1.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 user 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="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 discovery server
+		enewgroup stdiscosrv
+		enewuser stdiscosrv -1 -1 /var/lib/stdiscosrv stdiscosrv
+		keepdir /var/lib/stdiscosrv
+		fowners stdiscosrv:stdiscosrv /var/lib/stdiscosrv
+
+		# 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() {
+	# 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
+}