gentoo resync : 17.02.2018

5 files changed, 128 insertions, 3 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 0652bc60fcb5..f3687d98ec24 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 880b218c73c2..06b3833e7e99 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -6,5 +6,5 @@ DIST qbittorrent-4.0.3.tar.xz 4274292 BLAKE2B c6f6a87d26f01db318ac021a8ab9f8d1ad
 EBUILD qbittorrent-3.3.16.ebuild 1427 BLAKE2B 710e1375e511e52b1da0f8466a03b311b510b722b6452fb80525517e6858fbda6f535097a5d1d26fb93c5f74f5de59f8733a10a19fe835c09f2a0f0dd779631d SHA512 c658f61dc584c05ef36b7e13c115448acbb9cdf048c4a3406e2647209eaa97ee3dd0c7a71e4407b7413b9635f72766c17d9f89a3df7ae7d9c468b7107fb313bc
 EBUILD qbittorrent-4.0.1.ebuild 1353 BLAKE2B aed8773456f37a72bcbb071d66b8ee308056c7404b8b93e48f05d537fe568a8e8da49279fa15e11684b26a24ab0ddc9def215d4749347759508dac0451bc1a45 SHA512 58c97dbef3ec0faed7c60e1e120ffe0ace7a2aaed2ba4682a44b7ba5c69d50cb17961044823df46a75dab825344883a4e0624d5c05446aa5d83a2c3115e5659e
 EBUILD qbittorrent-4.0.3.ebuild 1448 BLAKE2B 797b6aca6af8d6501c12dcc8829d7718c4fc6035a76f662f412500454368454a61fadb996c59f3dc1fc311b18f592568a8dcb4af3b85600f67179bff23e6cd23 SHA512 efdb99bc1841f68bd166b46c800758293c2b4da8ad1d1babe05e16d60ce9f3c783ca2648c94a576ed9b7d69a66a25c99677d6a91542ccf96a95919af22e7936c
-EBUILD qbittorrent-9999.ebuild 1445 BLAKE2B 816d2de89120937baa12c50c3fb05c30237fe2050cad353b813cbb72482a4b4a9ca917477e003f26b5cac9f2d6669c594aca77f9047bd4e50a0a1a7eee88c657 SHA512 6c12806b1d9d493498ec840d2f72866558157dbfcd7db73bb4161eb13c1a2b1f3751871d3e8f248101330bbbe595e071da2c9b90b3f7c7d048f1ace1bec8dec6
+EBUILD qbittorrent-9999.ebuild 1448 BLAKE2B c51207c9c5b5225990470343a5765d2e4b15d47b1141290a4174999cf4ee3b158cf1c523a6a28af7a86bd02d229b5e56e2ad25492acf3c82d93689be7f4a0fd6 SHA512 b3efaa9f8b9811056f208a7c56ff454876d2a98ac7758bab2ca0f24d6ac98fb30d43edeb209d4ad18f58ea9cf0381f3af84e5880cb9385ddbd3d64404c5022f0
 MISC metadata.xml 563 BLAKE2B 9d0793b4c9a7b7022c837f0f671895908c647616e1609625273a3f15dbf4bfcd384ffbfe610639235b378068aa08bfa6cd493e051a239d4ead65c4f2d3a2f672 SHA512 23f8dfd139eed877c504f7661e98168c561385930afe5b910bb60040d01b33820f25b8a9f6048001fae462bddc2199532ebd05fefe4937639f4c68e906d59462
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index 9ebc91b0bdb1..7e6aa7150d8e 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-libs/boost-1.62.0-r1:=
 	dev-qt/qtcore:5
 	dev-qt/qtnetwork:5[ssl]
-	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5,X?]
+	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?]
 	dev-qt/qtxml:5
 	>=net-libs/libtorrent-rasterbar-1.0.6
 	sys-libs/zlib
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 2b3f77677438..c5544b570c6c 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -6,6 +6,8 @@ AUX syncthing.initd 1195 BLAKE2B d3724b2ac5c2a746b8a9a1477bfb01b08e7d8136de89586
 AUX syncthing.logrotate 101 BLAKE2B af499a6979e5c61cc4791932e247fe7f25baffbbf690907a2e2b8c2954da72154a885759589249c541f36b2740980f3fcd3e99db0d3f6d5a1bacee8c1574f9bc SHA512 73a5f7062b48ab4c7b343b43367b1999f8e133eadb624bd5e3e147ae41f135ded6acb4c617db2d385311441c9a52c288333791308c36762cb5273a853cce5a67
 DIST syncthing-0.14.38.tar.gz 8246629 BLAKE2B 93c01750fedd57cc07bffa14fe65d98fc1cf48b43eaf965fc3ff9546a24acada411a89a19b47e2f5b5e7508e57646d0560559c35bb3c378b7c04e3db14b7ffaa SHA512 be5f7527d63e8db427705c34b26d783d9abd7cb5727d3dcf08ee62b1ace5454b7dfed4f030ec53e847a34f560cf349460f68c859a1008c5105aef65ef42c5cc5
 DIST syncthing-0.14.40.tar.gz 8300965 BLAKE2B 6cafde21707c3334b55d29f741059dae79c9566373e365e2e5f275df60170b2d0a7e13db8b0a061410f327387c4eb446f5104cebf2457918dc0f5419baec7acc SHA512 3e79b034d71d1c862d21433f897dc774d3e421628804ed9c8304d4ed0dccb90fa8ec738aef476bf074ba70d4c9947114c5b6a8326faa5d6b6e5dcc03dacabecb
+DIST syncthing-0.14.44.tar.gz 10225689 BLAKE2B 67531246b9ffef72289f8c3d1372b4596f307a9608a2c2f09f96c2ca4eacd7413029cda9fadb0351c7980f7dc1ce17fa498fafa64860aa8437b158fa5e217fa2 SHA512 3a68c8ad3f586af22243d502322ed8269b10ea4d85b0a1bc39578d3da1bcc61e8753a6b94d5a7c8d7b56b86777932327450c2c08f447bb8a190a0171e2c015d4
 EBUILD syncthing-0.14.38.ebuild 3605 BLAKE2B d6aea1f123925c75361640308366646e548e0f7cc255b0ada8a398f98b6d77f7a1a3d4bf036aba3a45893450fab8c09353f4e33fc134d5c56ced38fdd720aa30 SHA512 fa626658a0368e3fae989b26dba92740701465a146e8a4d3686ee71e3b0bc9eb60b8d1b154b4d8db047f7e64bc8839e45b15bedcb0b246d8356f8e2c1ca59184
 EBUILD syncthing-0.14.40.ebuild 3607 BLAKE2B 0527e7cdb4c79bc6149c030248189d15ed2f2e5349204278f6a83cd35c261ecef866b8c2613d5f7381a118aab939fcb4c5682f82cf4c0b90eda07300fd9e362b SHA512 054d1d9ba8f0a9a74cf0f2211012ba206068a00b8d750df6a9d12d591ce5e9b558cf4fa03a9376e016a2c08fe37b3678f6c54f2e086a8556a0168a83e31bb90a
+EBUILD syncthing-0.14.44.ebuild 3607 BLAKE2B 505dd788fd96503f0952acf33ae38d1343e781573bb987110bc5ec16112b4c6735ff132e72b67123d970b843448f4498853e3e8362d7530049efa51b6888ba35 SHA512 bf28b811f3e126914f60ea9632449fee4db627db7a7054d80d949d47732a1981015bd40c46a198d3904cf5003e463acac6ebc697b6af3d9691aec67f9e6842b7
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/syncthing-0.14.44.ebuild b/net-p2p/syncthing/syncthing-0.14.44.ebuild
new file mode 100644
index 000000000000..00190a582b6b
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-0.14.44.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 versionator
+
+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 [[ $(get_version_component_range 2) -gt \
+				$(get_version_component_range 2 ${v}) ]]; then
+			ewarn "Version ${PV} is not protocol-compatible with version" \
+				"0.$(($(get_version_component_range 2) - 1)).x or lower."
+			ewarn "Make sure all your devices are running at least version" \
+				"0.$(get_version_component_range 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
+}