gentoo resync : 19.03.2019

3 files changed, 77 insertions, 81 deletions

diff --git a/net-p2p/resilio-sync/Manifest b/net-p2p/resilio-sync/Manifest
index 64603a841ab1..30c9cec52149 100644
--- a/net-p2p/resilio-sync/Manifest
+++ b/net-p2p/resilio-sync/Manifest
@@ -5,10 +5,10 @@ AUX resilio-sync.confd 312 BLAKE2B eee3179791594a3af6176abc2eba5b2db3e0a14d602dd
 AUX resilio-sync.initd 462 BLAKE2B 775e1824d9b374bef32798bb05bb7fb2fd66ff1b859aa50d72dd02c80033bcf8b12275bf1e4d9eae2b2fdc1a1da7a1710c8e5ce1bd6da37427a4433967afb1bb SHA512 06cc963db70c969ca81a249c17c467fd4013a7cde39b37f65c934393e9e891776f247397b976f5caf20b6d29cee64865703bb2b3b78cd7a0e68be102db46a7fb
 AUX resilio-sync.service 382 BLAKE2B f61c181137d41aeb59c721688a2b208c16d985c0b74c32e556cf3cc5218a549c7f58da50dde584bfbfca88ce6a00f1ecbbd67e58af04e88774b3e648d4d8513e SHA512 c278b35ba0cc888beb7d4b75e5b5c5c0304ec89ba1ac0136713256d05e95896254504b58f9c3a0a534aa04aee5e36468b579b2e18397f0bfb3615527b82195db
 AUX resilio-sync.tmpfile 41 BLAKE2B fb3e9001a32e45cd230f4efef60509f20f52253ad575fb2b1493bae9846ad46210eed639c7a3f9e4a4fa7c901b42a9a7756f8583c204a4bb847e6eb96a2af323 SHA512 d9d54076785ce601023980e3fe5e2eab42e5eaf3b0bdb9caefe508e0d5fda8d32faf1338c6b901deb29488401de74228023016d72d7b0ec9db362b4c2d87edd2
-DIST resilio-sync_2.5.12-1_amd64.deb 10466894 BLAKE2B d9125bfe49738db3a2cab0d66cad9fed2ae712ee613ccd104bc1d8764bd072b082f71fc0102b15d52f791b592d88ffa4f03892e7e4088e3bf4a847b6c15b4296 SHA512 bafc8dbce182253d585185e5d0a27f0a8ca18f768bba65c348752cc089e0e690c8c1848a71cb1b125c67d2c265cbbf13e98d7c99289b0bb0268d43d3e38454d3
-DIST resilio-sync_2.5.12-1_i386.deb 10334238 BLAKE2B 447baf18db1f6c47a6a2518f9ba6a27b0d9a7092cc41d63958a66be6492cab3868a0ecae9faadfa91cfc5f777e1289cb62017519a0994b93ae448042de9b32d3 SHA512 bb46498070f6aa0e3debee839f50a9292116bd5f9105fe75c65d11f9f3199e6e5b8f828b34b364e7f3cb896bf88fd37a255289c68158df7414acf809e4701b32
 DIST resilio-sync_2.6.1-1_amd64.deb 11576892 BLAKE2B 710bd96b91be84bc7210d8efe0d8954a33be878fc948694e7a1c62e7b53b5ac94133a16b89c4872e18798bc03f3508c7c130d4d56a3480c35d30edff5589ef3a SHA512 a37d73a621a740f57b4f2824cc2a3178f365ccc8180a0e814480dde8d1b74b9d54da4e07bd18c89cc6a93c12b526f8a43e08165d3c2f0fdc913e1f38e46eb183
 DIST resilio-sync_2.6.1-1_i386.deb 11465194 BLAKE2B b56e01f79c5beec6a5ebd09724bebd1ce8c6d44eac694cd7fb89dc44823ccba22531b14e241fdd985ae63e6e0f177021becb593923eac8ac0183629e533ac72d SHA512 84676c3fe5fcee484bcd58c6496aba0d2e3c86c339adb90b8b3cef28ae46d7b6f28c5fd0371a2cfe612ab8b3658eca2b9b2f6cfc9caa70aaff95946942a5c749
-EBUILD resilio-sync-2.5.12.ebuild 2349 BLAKE2B 3299319dec3fc935935c327a35a663307830a6d3ecb0caa1d9b4668385cfaf197796d9cb26b894eb784244f72ad9ff1eb4e4f92a751f33a5d18cc0ac75736d7b SHA512 8f8507ef0676b1265845201d3df6c4eb6b29b9d1a744967ab84414424c3edda4a805386898b6e9960eb56139ff7c04312f7bcc60c156242f6ba631b70f8bf628
+DIST resilio-sync_2.6.3-1_amd64.deb 12109918 BLAKE2B e89ca0eedadd29d1d0519f0e894f6cbb865b39600df6b516a85411da45e58751caf1c0988d13c821b134ac2318f6487cdad82a75b7357686bde1865b88779f3e SHA512 4531936a5ddd23cfcf2354ea9c7f285e08d1afdd0922d1254baec2900f1c4bfdbbe5d57a5f9cf079b8b3fee69cc9f0a1557218657c1386f800d6e19cc6de31a3
+DIST resilio-sync_2.6.3-1_i386.deb 12062106 BLAKE2B f070844fc513ce052e1cb480f4b521216da485ffc00fb0b7e512d877ae6d0bb39452015bc24f931850542490e69d3b210c5a4dd8635a43f16901791144134880 SHA512 18e01ae12c198e7e921a8fd74e934365f027607940ada7378adb239b5c8a25b94e47ac4290c738acac54c53beff25e1ba35f4e079ce8145852f385212bd8794b
 EBUILD resilio-sync-2.6.1.ebuild 2229 BLAKE2B d23975c7f37c48b79e94e0a30fbabd14fa715beadce66b9afe2f2c83d35a698afa2e4d20c4552197099b9575e68f55a4f3043d5e0936093d67aee8cfa6c56a4e SHA512 dc85455bd1943f99a664dfea988d8899a18db51c4fc5e349eea8211773487afa5d0326f918177a8a14dbccc171c442ca325fb19a6455f0c24664ae79e9c4745d
+EBUILD resilio-sync-2.6.3.ebuild 2208 BLAKE2B 8bece7919526363ce81ccb7e75be9a5988ac4139c7dd08a52b935d82304ab1594ad4d0116902d6c44912be98ec9bbf2fd835d0551e7054e854ed98321453031f SHA512 ad764e73f9acc60c926a3a57dbf792a4c25cd722d230b99e0a3d2534c0d95446553c3ff69b80f21d68bbeeafcb8671bb2f50cf11ce2b2ea5410656c802af399d
 MISC metadata.xml 889 BLAKE2B e6e81874032bbb5ae212b3894f04cb1dbcefae1bf87dd94f86e16a5e6547cfa4e17c1db9214bfe9d2da35c86011501776ee1ed0e0327a8aa607db39ddac2595a SHA512 0943a2d2215dbe2534622e3f90edf51b340613294d9b0b2ed2594b4223c7a26a8c1d054e7d90d957874e204f7fe32cf5d6f00d43e16164d618e193ac86a96b4c
diff --git a/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild b/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild
deleted file mode 100644
index 33a5201ff219..000000000000
--- a/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-BASE_URI="http://linux-packages.resilio.com/${PN}/deb/pool/non-free/r/${PN}/${PN}_${PV}-1_@arch@.deb"
-
-inherit pax-utils readme.gentoo-r1 systemd tmpfiles unpacker user
-
-NAME="rslsync"
-QA_PREBUILT="usr/bin/${NAME}"
-
-DESCRIPTION="Resilient, fast and scalable file synchronization tool"
-HOMEPAGE="https://getsync.com/"
-SRC_URI="amd64? ( ${BASE_URI/@arch@/amd64} )
-	x86? ( ${BASE_URI/@arch@/i386} )"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel"
-RESTRICT="mirror"
-
-S="${WORKDIR}"
-
-DOC_CONTENTS="You may need to review /etc/${PN}/config.json\\n
-Default metadata path is /var/lib/${PN}/.sync\\n
-Default web-gui URL is http://localhost:8888/\\n\\n"
-
-pkg_setup() {
-	enewgroup "${NAME}"
-	enewuser "${NAME}" -1 -1 /var/lib/"${PN}" "${NAME}"
-}
-
-src_unpack() {
-	unpacker_src_unpack
-
-	unpack usr/share/man/man1/"${PN}".1.gz
-}
-
-src_install() {
-	dobin usr/bin/"${NAME}"
-	use pax_kernel && pax-mark m "${ED%/}"/usr/bin/"${NAME}"
-
-	doman "${PN}".1
-
-	dodir /var/log/"${PN}"
-	keepdir /etc/"${PN}" /var/lib/"${PN}"/ /var/lib/"${PN}"/.sync /var/log/"${PN}"
-	fperms 0700 /etc/"${PN}" /var/lib/"${PN}" /var/lib/"${PN}"/.sync /var/log/"${PN}"
-	fowners -R "${NAME}":"${NAME}" /etc/"${PN}" /var/lib/"${PN}" /var/log/"${PN}"
-
-	newinitd "${FILESDIR}"/"${PN}".initd "${PN}"
-	newconfd "${FILESDIR}"/"${PN}".confd "${PN}"
-	newinitd "${FILESDIR}"/"${PN}"-user.initd "${PN}"-user
-	newconfd "${FILESDIR}"/"${PN}"-user.confd "${PN}"-user
-	systemd_dounit "${FILESDIR}"/"${PN}".service
-	systemd_douserunit "${FILESDIR}"/"${PN}"-user.service
-	newtmpfiles "${FILESDIR}"/resilio-sync.tmpfile resilio-sync.conf
-
-	readme.gentoo_create_doc
-
-	# Generate sample config
-	"${ED%/}"/usr/bin/"${NAME}" --dump-sample-config > \
-		"${ED%/}"/etc/"${PN}"/config.json || die "generate config failed"
-	fowners "${NAME}":"${NAME}" /etc/"${PN}"/config.json
-	# Uncomment config directives and change their values
-	sed -i \
-		-e "/storage_path/s|//| |g" \
-		-e "/pid_file/s|//| |g" \
-		-e "/storage_path/s|/home/user/.sync|/var/lib/${PN}/.sync|g" \
-		-e "/pid_file/s|resilio/resilio|${PN}/${PN}|g" \
-		"${ED%/}"/etc/"${PN}"/config.json || die "sed failed for config.json"
-}
-
-pkg_postinst() {
-	tmpfiles_process resilio-sync.conf
-	readme.gentoo_print_elog
-}
diff --git a/net-p2p/resilio-sync/resilio-sync-2.6.3.ebuild b/net-p2p/resilio-sync/resilio-sync-2.6.3.ebuild
new file mode 100644
index 000000000000..95ea559330a0
--- /dev/null
+++ b/net-p2p/resilio-sync/resilio-sync-2.6.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils readme.gentoo-r1 systemd tmpfiles unpacker user
+
+QA_PREBUILT="usr/bin/rslsync"
+BASE_URI="http://download-cdn.resilio.com/${PV}/Debian/${PN}_${PV}-1_@arch@.deb"
+
+DESCRIPTION="Resilient, fast and scalable file synchronization tool"
+HOMEPAGE="https://resilio.com/"
+SRC_URI="amd64? ( ${BASE_URI/@arch@/amd64} )
+	x86? ( ${BASE_URI/@arch@/i386} )"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}"
+
+DOC_CONTENTS="You may need to review /etc/resilio-sync/config.json\\n
+Default metadata path is /var/lib/resilio-sync/.sync\\n
+Default web-gui URL is http://localhost:8888/\\n\\n"
+
+pkg_setup() {
+	enewgroup rslsync
+	enewuser rslsync -1 -1 /var/lib/resilio-sync rslsync
+}
+
+src_unpack() {
+	unpacker_src_unpack
+
+	unpack usr/share/man/man1/resilio-sync.1.gz
+}
+
+src_install() {
+	dobin usr/bin/rslsync
+	use pax_kernel && pax-mark m "${ED%/}"/usr/bin/rslsync
+
+	doman resilio-sync.1
+
+	newinitd "${FILESDIR}"/resilio-sync.initd resilio-sync
+	newconfd "${FILESDIR}"/resilio-sync.confd resilio-sync
+	newinitd "${FILESDIR}"/resilio-sync-user.initd resilio-sync-user
+	newconfd "${FILESDIR}"/resilio-sync-user.confd resilio-sync-user
+	systemd_dounit "${FILESDIR}"/resilio-sync.service
+	systemd_douserunit "${FILESDIR}"/resilio-sync-user.service
+	newtmpfiles "${FILESDIR}"/resilio-sync.tmpfile resilio-sync.conf
+
+	readme.gentoo_create_doc
+
+	# Generate sample config, uncomment config directives and change values
+	insopts -orslsync -grslsync -m0644
+	insinto /etc/resilio-sync
+	newins - config.json < <("${ED%/}"/usr/bin/rslsync --dump-sample-config | \
+		sed \
+			-e "/storage_path/s|//| |g" \
+			-e "/pid_file/s|//| |g" \
+			-e "/storage_path/s|/home/user/.sync|/var/lib/resilio-sync/.sync|g" \
+			-e "/pid_file/s|resilio/resilio|resilio-sync/resilio-sync|g" \
+			|| die "sed failed for config.json" )
+
+	diropts -orslsync -grslsync -m0700
+	keepdir /etc/resilio-sync /var/lib/resilio-sync/ \
+		/var/lib/resilio-sync/.sync /var/log/resilio-sync
+}
+
+pkg_postinst() {
+	tmpfiles_process resilio-sync.conf
+	readme.gentoo_print_elog
+}