gentoo resync : 02.06.2019

3 files changed, 2 insertions, 69 deletions

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