gentoo resync : 25.08.2020

3 files changed, 30 insertions, 19 deletions

diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index a6d859bd00d9..30b4514077d3 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -1,7 +1,8 @@
 AUX airdcppd.confd 198 BLAKE2B 7d3fbce6527a7f1971f544a37215fa73ed1f19bc5f6c4c3ef90c28b170b84ecd3a82da77b582b69ef442a9a455752192ba4b6b33aeb9a43587c0209fdf380342 SHA512 025ec93c208173771fe697574c9161b9af8d740eab0b1290c8d3857961dc3635339bdb9c18b97fdde6fa7dc8924f4453b9c609ca57e61f1cad9ff47683fb613e
 AUX airdcppd.initd 584 BLAKE2B 6e19d6088b26153527fa51e3789c3968647af3f7a2b1fbe2b355587b14eef94b8800a78565ce3bd54f0474542496bfd9f80566c36fcf6f1e51f55c48aa0654ee SHA512 f6de7a576eaef662e73dd488acd956371891278a6fa6c912be864c630a22435541deaca9055c6d7912bf483de228db2cd0bd9c9666a1a436de55112561783721
-DIST airdcpp-webclient-2.6.0.tar.gz 903873 BLAKE2B 7a82891efef14e8d3c2da9a15165698084daf9c044d420c271dd1401710f030fc3c6fd83d7f58cee746767624b1292e7fcb7a48387e03b0eca2cf779753686d8 SHA512 d6d029638e69d19743d2e49185b08a808d95d725c3f40bd98ab42c384d3eae6d07e4528ac28ac9db50011f8a68592ae60f49cedbbccb45a78e82a5e424bb731c
+AUX airdcppd.service 302 BLAKE2B 5e446eb4253c71648e8e6850da4d71e6f16bdb6d82b611882ba4b1ff755073ff611a5502f5f9dbfc94020610ccef9a022add2f85721d464cba94907320618e66 SHA512 79aa352d7943e5297835ec226142661f084a39bd8ccaebace8d4356db995e2eff7c77a9f04ee636bd50e61103bc5a30e83fa126ffa8d77ec068053da2c1b9508
 DIST airdcpp-webclient-2.6.1.tar.gz 908393 BLAKE2B 8734cdfc1b0e380d231cf6e571d215b7cec196fe012bf842fd2257496f252dd803eee0a308e97033f959652dbd4d21bd2b96559c4a4262a8f7ddd2c491c7d263 SHA512 bad35d09475ef9a95f358bce99d1143586e3eedb58b3c5c74570c707f099ed1b1214714c093f74c6e2bbfa733077dcaf3e590ae3d821330938f9ec32c75a7152
-EBUILD airdcpp-webclient-2.6.0.ebuild 1426 BLAKE2B d94c8917282b654323af2d0fe782f4903b450a24bb8f7a27d8209bbf402cdf3456110aa24107aa7a4499a0196a330d84613b483d26da7419878e45a3aefff784 SHA512 21a0c3545af4979ebf9d178c99b30ee1dd3d5b1aba147287162c804c43d307bc8f8fee92079a61335f534980917c48dc49e5fdbe2416623fb0e0d286224a1419
+DIST airdcpp-webclient-2.8.1.tar.gz 945274 BLAKE2B e98ea603d52f041fed1a60a2c6dd4bff141c230bd554ccc6e7f013a28bd2ef8f2001e5343d3233d09b7cc9ef7e1af8b45a18757f59d29cdfb592763375c01e0c SHA512 c75b20591deb62a62dfb26df1536c521073643d3d7893d2ac85f2206c52a1786349a980994084abf840d1610000128247e6ae94aecf31b1d5266224086257ca7
 EBUILD airdcpp-webclient-2.6.1.ebuild 1426 BLAKE2B d94c8917282b654323af2d0fe782f4903b450a24bb8f7a27d8209bbf402cdf3456110aa24107aa7a4499a0196a330d84613b483d26da7419878e45a3aefff784 SHA512 21a0c3545af4979ebf9d178c99b30ee1dd3d5b1aba147287162c804c43d307bc8f8fee92079a61335f534980917c48dc49e5fdbe2416623fb0e0d286224a1419
+EBUILD airdcpp-webclient-2.8.1.ebuild 1374 BLAKE2B 60939f3eb247d73a9d9f428d92743b5623603a61c55567910caa253d2789026fe29fe05fed70222f325ad21eb2c4a66e6783d0fd26b4d7eb157d47a390704d45 SHA512 abdb3ab03605fe5d5dee77c1ab08d43bfe071b6c9f25a3b42aaccd597d3dd9801c43151c80dce6903de9042db5c3221d04a67484febe35b1fe52b8166927e8c2
 MISC metadata.xml 804 BLAKE2B 4d7003fed4a4fcf24fcf30ecf7d5e2c8970f4c76e6b37444721d09da8413a1d1aeb3a2d4c22174f02bfb7fff7b38e35f23c85a9070625a3eaf63bf0f68fc20e7 SHA512 1408ae27ba8cce6f6f6d53a5fade6d4bf2ce0587cd0b829c3426d88257e83dcd6c69ba5e3cb143d7ac7a31ad7a59e7324a6faf489162f88b62932b4bf8129268
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.0.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.8.1.ebuild
index 8f278445821a..acb5cd4995b0 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.0.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.8.1.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 
-inherit cmake-utils python-any-r1 user
+inherit cmake python-any-r1 systemd
 
 DESCRIPTION="Cross-platform Direct Connect client"
 HOMEPAGE="https://airdcpp-web.github.io/"
@@ -13,9 +13,11 @@ SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="nat-pmp +tbb +webui"
+IUSE="debug nat-pmp +tbb +webui"
 
 RDEPEND="
+	acct-user/airdcppd
+	acct-group/airdcppd
 	app-arch/bzip2
 	dev-cpp/websocketpp
 	dev-libs/boost:=
@@ -23,39 +25,32 @@ RDEPEND="
 	dev-libs/libmaxminddb:=
 	dev-libs/openssl:0=[-bindist]
 	net-libs/miniupnpc:=
-	sys-libs/zlib:=
+	sys-libs/zlib
 	virtual/libiconv
 	nat-pmp? ( net-libs/libnatpmp:= )
 	tbb? ( dev-cpp/tbb:= )
 "
-DEPEND="
+DEPEND="${RDEPEND}"
+BDEPEND="
 	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)
+		-DINSTALL_WEB_UI=OFF
 	)
-	cmake-utils_src_configure
+	CMAKE_BUILD_TYPE=$(usex debug Debug Gentoo) cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	newconfd "${FILESDIR}/airdcppd.confd" airdcppd
 	newinitd "${FILESDIR}/airdcppd.initd" airdcppd
-	keepdir /var/lib/airdcppd
-	fowners airdcppd:airdcppd /var/lib/airdcppd
+	systemd_dounit "${FILESDIR}/airdcppd.service"
 }
 
 pkg_postinst() {
diff --git a/net-p2p/airdcpp-webclient/files/airdcppd.service b/net-p2p/airdcpp-webclient/files/airdcppd.service
new file mode 100644
index 000000000000..00d4ea071865
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/files/airdcppd.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Cross-platform Direct Connect client
+After=network-online.target
+
+[Service]
+Type=forking
+User=airdcppd
+Group=airdcppd
+# Grant write access to group members
+UMask=007
+PIDFile=/var/lib/airdcppd/.airdc++/airdcppd.pid
+ExecStart=/usr/bin/airdcppd -d
+
+[Install]
+WantedBy=multi-user.target