gentoo resync : 10.11.2017

4 files changed, 5 insertions, 75 deletions

diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index 78bb4cd7b01a..6e6800fac201 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -1,9 +1,7 @@
 AUX airdcpp-webclient-2.1.0-disable-automagic.patch 1106 SHA256 d9e1013899759a8ff2511d6384b54ca56a6a6a018f2420cfebec91b232cfdb4b SHA512 9e16724429869d03138142188b3105e6cd360a6e99595329702fbe5724ce98a951c5c6ae1649df205eeb6203fd99a97957bc82da842234791223690296bbdaac WHIRLPOOL 7814d4b68cf2fba75e6de5e5b50b41a592e7ef7d2fa7d07ac5195d956b35609ef0eacb6dbbd0cf471cc0938fb9efc004f6174efb62a31465e078d023104502d1
 AUX airdcppd.confd 198 SHA256 69890132eb0d7479f76a79903568022bfe4d816d79ec4b79f26ef2c0d45afa72 SHA512 025ec93c208173771fe697574c9161b9af8d740eab0b1290c8d3857961dc3635339bdb9c18b97fdde6fa7dc8924f4453b9c609ca57e61f1cad9ff47683fb613e WHIRLPOOL 918159b29016e9a654ec72b2c3f3dd583ae2faf728318c6e65dcd5ef68cd259545cdff351396aaa57ab0610b6eb00180d2b9bc8265249f9cccbce4c69b31c569
-AUX airdcppd.initd 585 SHA256 82e2a41dd546e609c09b4961bef29751401a7b7349f10de770b83875c1151ecc SHA512 054974808c2e457a36d9b916b60ec0fce68fdfff6b0d1055a03729911d29f3c40ea746d7200880f91e49775c142c57ba3b029ab6389986a31510d780dbcea4b9 WHIRLPOOL 56b8a53c41cc6d55c06a959ed6f6771c1ca832023ee9a2719869c5ac0029ead0b51521d44f824aa591ab78782106163886ab5ece291b08e6837693ff7b881a37
-DIST airdcpp-webclient-2.1.0.tar.gz 844435 SHA256 a8d8a33e3974d23009359709da0bee85e8983e3ea1fe78f21a867078f93b81fa SHA512 755555d30183e772ad5d2e38a813f548e3322ca034b759200f289a834ae21b64f56102f57a13832a837e8a11324efe74a860e941a0f28a02d1f843aed92a328f WHIRLPOOL 5a0a61bcf0ad1de1706786fc2080aeba0ae634386957876a20d1ca638d3fc8b724f5c866d59588f4958a6010fc192d474f1cfe7ff04d4403106ba631b800739b
-DIST airdcpp-webclient-2.2.0.tar.gz 844968 SHA256 77cde1acd8730370e87e3546f9895bb993a459ad8f70e1713803ec3ba0a849cb SHA512 a7fc608109ee5823f844bd575d9355d0cbb4094c89e5dcba522018685d969974e82d3dea56bd334591a424010e0b43858f227e2bb66d738c0151c1456175800d WHIRLPOOL 040076d1fd2d7973ccaa6dd0935c0f2b1828c6e4d3bff6de362fd53656d54bf9a9c5733c23fbee35fd6ece897fd5a2ca2b277ceeda51b03c66277f2c81759eb3
-EBUILD airdcpp-webclient-2.1.0.ebuild 1545 SHA256 549d84527e6b153ef95f46da1b87fa9096d70cdadeaea0d7b2f5f4646b59a080 SHA512 19611bc2fd11c3b5fae5ad5000be6109040cd018a81bd9226079f0144eed66df94f14d931e3dcafc6c751d401c20be8cd6a65cba373dd884839267e4667a8e49 WHIRLPOOL 84e699aaad06c8728a7631ea23e2605aedddb15bee62d58458905961c49845209b1041315524ad5b1d032a5e9f22a7e6527b63b887e8ecd70ca3144096a7af49
-EBUILD airdcpp-webclient-2.2.0.ebuild 1431 SHA256 5c52f29d0a3179df26b04b81999017f6e0a86b95581941237c74c0f53ed81425 SHA512 40fd30c487e3ac0eb2cc80ed3fc40bdda23adb9be229499a47b4abb12e2cff73fd95ab1cc2e920ae8f867d6f3b55cbd441ecee3396bd465b0dbfc0678ad1e902 WHIRLPOOL 00a09f942af4450bb63a4feb233902a9436fce84f8fc10d10ffbe90052700c5507d72cd56ddfc2b8ee210be7da73f4d37229bf77bf6e82b2c0d1b8fed6291779
+AUX airdcppd.initd 584 SHA256 8f3e9abf7d713fa4591060aaec77933894dc7685d8f8f68767342238fea3a259 SHA512 f6de7a576eaef662e73dd488acd956371891278a6fa6c912be864c630a22435541deaca9055c6d7912bf483de228db2cd0bd9c9666a1a436de55112561783721 WHIRLPOOL ffab7c4345e7b2d49e5db04096077374493d2ec9027f26c94c3239f3d3666024a1ded52c58ecaaba18e4f973ed60cb751f32f7146942480e084bd03917b51f12
+DIST airdcpp-webclient-2.2.1.tar.gz 845507 SHA256 19286ab01fab6be27dbb5ccbcbc09bcc9dacc3108fb3b285916803933e36421e SHA512 97c5b32e590b2fc735fe4978c1a173272c55f84fe97212f7cd1e8bd4a279553c1d992573185781aeceafbbe6bb51303ddb2cd164c748fa798993a661f3abfb81 WHIRLPOOL 6aca14b4af57a1138cd98fe68b7eb49c4d13da6bdf4e4e47ce6f26810d17516376d6e7599ca88c9a364208d9ba1d41436816bcc3ec0177875f72ae6c40a1842b
+EBUILD airdcpp-webclient-2.2.1.ebuild 1431 SHA256 5c52f29d0a3179df26b04b81999017f6e0a86b95581941237c74c0f53ed81425 SHA512 40fd30c487e3ac0eb2cc80ed3fc40bdda23adb9be229499a47b4abb12e2cff73fd95ab1cc2e920ae8f867d6f3b55cbd441ecee3396bd465b0dbfc0678ad1e902 WHIRLPOOL 00a09f942af4450bb63a4feb233902a9436fce84f8fc10d10ffbe90052700c5507d72cd56ddfc2b8ee210be7da73f4d37229bf77bf6e82b2c0d1b8fed6291779
 MISC ChangeLog 5774 SHA256 413c74dd7918bb53d1912dd52e6573d4d5cc434e7f4c90a1449d9caa4591498b SHA512 a1cec201ee12d72078c8c74d1430ae7042defb53807d2136deb157db7c970c9be1cdde945b412153dc991af11bfba46d972cd4b94b8ed33018280e016702f63b WHIRLPOOL d4b0d8dccd5dab5fe087197b7a3f7ef3cc0bb44eae8794f72abd680e93a6dbd1a72b597bc49f20f5303d58996857d6dde122b44f9986305e29d866f7df2ceffc
 MISC metadata.xml 928 SHA256 1e43915c6ee247c2f6042a67e85e40a26ee440a6bd357c6f4055fa08132ca5b6 SHA512 ceccd70826faff18052a1cfe3cdcef1a253ed1227565fa94e865fba8c0a5b8a03535844a3b78d98f6bc26e8a9f29202f0bf1e19fa833d4356ace1e6b26e3936e WHIRLPOOL 60fac94dc950612f19a1693460127a8b60357c4fb12fd91ba2dcceb5f06eec33088e83a96daf51b265acc36631c785e957d5809baf2a387f62692bd4e63f7286
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.1.0.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.1.0.ebuild
deleted file mode 100644
index cee109040c4f..000000000000
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.1.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
-
-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/geoip
-	dev-libs/leveldb:=
-	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 )"
-
-# https://github.com/airdcpp-web/airdcpp-webclient/pull/248
-PATCHES=( "${FILESDIR}/${P}-disable-automagic.patch" )
-
-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.2.0.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.2.1.ebuild
index fd8f46fe630b..fd8f46fe630b 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.2.0.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.2.1.ebuild
diff --git a/net-p2p/airdcpp-webclient/files/airdcppd.initd b/net-p2p/airdcpp-webclient/files/airdcppd.initd
index 1cad833d8ae2..ed322b3e35a7 100644
--- a/net-p2p/airdcpp-webclient/files/airdcppd.initd
+++ b/net-p2p/airdcpp-webclient/files/airdcppd.initd
@@ -1,10 +1,10 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 AIRDCPPD_USER="${AIRDCPPD_USER:-${RC_SVCNAME}}"
 AIRDCPPD_GROUP="${AIRDCPPD_GROUP:-${RC_SVCNAME}}"
-AIRDCPPD_UMASK="${SYNCTHING_UMASK:-007}"
+AIRDCPPD_UMASK="${AIRDCPPD_UMASK:-007}"
 AIRDCPPD_HOME="$(getent passwd "${AIRDCPPD_USER}" | cut -d: -f6)"
 
 command="/usr/bin/airdcppd"