gentoo resync : 15.01.2020

7 files changed, 26 insertions, 224 deletions

diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index bc8cbda17e57..d42dbbbfcc64 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -1,13 +1,10 @@
 AUX confd 27 BLAKE2B 16d0801db1dceed2044c14e9f1220ee4f31268622102a50669135dcb199ed21c2d6e0fd61e639d2eb669ee00c53088db2b6290dc98149ce20b0fafd8700c891c SHA512 1f7d9888a794ca4db64332430f6fd4ed3e257618fd87855922ff9186bca332827197f4f5aa199a27586fd2fcee04ed4d617bbaeb3866d9ba6f9c37ff8cb61ba1
-AUX initd 533 BLAKE2B 0e5b218af1b78b3613bfcd33b9c6c941ff708e55dff6383d234aea19b1677b7cc1f5f69205f4a9ae3db7a668887537d52281c7738f95506ab06088188c3b665e SHA512 46fb490c26244a894e2a33b464083c0b653f9c195af08848cd85b6f74f1677ffe66664c90e9c85e8ddbefec91d773ceec95e7043ea678f7f96c50ed0f96efb56
-AUX tox-bootstrapd.conf 2171 BLAKE2B 25021453c2be24bad5ff8e5484c41ebf0c2487f326e30af305fd13f949242098c4a0392caafed2653196b56b8c7f495964e465a5ef0d0dbe22100ee58e8aae89 SHA512 b2fc5db3facc47bc9ae13824ff355b2e7fb496f489ef5e5cc01d17d8fe31befa740d510d76130967c858930ae6ef6183a5feff5a6a0b6853a008100859e4afda
+AUX initd 655 BLAKE2B bc837b09c4d75cb086bc1757ba1b1963b60ae2123ba041a53557a2ae7c05145be0898ce5c10d60c894ef369c46afe2a65454ab9e2d2a23d1c859c074d80b8a86 SHA512 c7eaf934497329a369ea9fe5eefe061937719e34d965c464ccea6b72b12bf16c7b79bd821e3550fecb1fde3b014f40afad61c10cf4d7140f42d3d8ba964acdc6
+AUX tox-bootstrapd.conf 2397 BLAKE2B 336317dc2b2a7958420164d3ef3197ea2aefbb51822791d2feccb8e44cf09e90779986210bf854c0cff0d1b4519c1b4acd92723e92b8b262859f7d9da7ee55e9 SHA512 0d90ffb47e42013af68b5eb7ffb03d670523b20de17ba7fe63e227502188cfd72242450d09e94d381fa201cdff459307622c9ab19f3bf651d6948979e103e3c6
 AUX tox-bootstrapd.service 365 BLAKE2B f17891d280007180811414f85f1f8a4defd85436410113f11cffd60dd14a02cd24a0637c347a75ea11322c050e4030702e9f95f02810705aef512df6558e66d5 SHA512 d565430c53b91343d57b6db573884c9f11aaf8bbddfd70bf3a46a6dede91c01ab8f1371ae052b4dd529cc521bef28924069fc7f4bc3d610c01cbd6d6569707f8
 DIST c-toxcore-0.2.10.tar.gz 515842 BLAKE2B 8e79f9a5045b5fef7825e5eb21644625607d86e472ec75ff45ff826712efa515682f9439181d52444b2a6a21472c6e78a3bea5bb7e356373faf733e2644a315d SHA512 8a6a78c52a67be0b727d0d3a8d1cece20ad716a2e694df0aa747eee7764f64c957458584f59db5e727a9803ed7b21adc1ad8d7e80fd6651e7774ca3504b38fc7
-DIST c-toxcore-0.2.8.tar.gz 502907 BLAKE2B 0ca2c861b3cd982b471fac5cf8bdacd21c3248118846cc17e51f33ba04cf3da12a64578744e47daa27bb8613762a6f562eb550f0b7af05a66696412f6d0a6360 SHA512 a23a87a74fe97091b00ea76676a22578ed1e2426ac777146bb6efc984f1bfd3fff0d7fb149691155b8e2db56e1e088a1884536e5b717ff5c45a87b437f275735
 DIST c-toxcore-0.2.9.tar.gz 510806 BLAKE2B e67bdb86757d1431cc9d627dbc9afa9f54c3deb7814b38c2126849d10e9225aa58d2b23d175622678be74894ea197d3084719422a605d95eb4c55c4597a79f98 SHA512 917826a906a9ca4f04f34494616b8e36ec9e74c6b0709c50e8fe2dd9da680d170013fef242a3fe1b834e8e54cd2dde6be1c14e5d977f8531436ef34280bc3966
 EBUILD tox-0.2.10.ebuild 3145 BLAKE2B 5c4e33623b746c48d7527ed054919218a18bfa8b44c10cc7acf529d86e179d141428de3753b9c8a5bca7810cf548ed5dca2968140f0d92f37fe62a4c2de6bcf2 SHA512 f22a73a65c2720e0c5a0742f796d8a02cb9a0c07843837e3b8c4c20e2444b7f7dfb313f884c79cb8029b1e51d21eb1ee5eaca18a9e75a961ec0c17feef6a3d71
-EBUILD tox-0.2.8.ebuild 2784 BLAKE2B 3941172b9bc29f67f4c289756e1e040ea8d8b5205885bcf8ba0370ed1c18b8d0355c8fce8a669d4b366a4c7447899f49f198c8b5936e477ff65aec48cfa660a7 SHA512 33a3deccf95578f8594cd7d0faee8953fa80839f48a62aafe7831170e0e25eeb1e97a3e93b5b5a4a6702622f3a8ad6f8fb363a2c833f3de5d856cbd5d5755ca4
-EBUILD tox-0.2.9-r1.ebuild 3155 BLAKE2B 4d494a5b28e07969e3bbad6211af176da73a05e61197cf87f6c57d95725b72ea43cda690b046a32eea40178137513f5927dfed5efe1d3196ecb570bb13db7d2e SHA512 db0d847bdf211f04c9bd392085cb061f5b72c2de85aa979e7bd38cd01fa44b3fe39bb43d5ba6231d126b061e9c4602f2db582b96c3bd938614ccd2b07138a4d8
-EBUILD tox-0.2.9.ebuild 2722 BLAKE2B ef78575e1f4cc95612425dbda0393c843713d0e6aa926ba797e4b353d3f8509b98353372448c6f43b9a65874f0a1a9056b8cbd1dc662567d4f434d887c36f2e5 SHA512 2ab0f1b5a6161bf6e42b54f1453bda7a4c4660dfa6b314407271f827d1e5460e12f5cb3651701f513e28eb9101565bed30f5d6767a13e7735d1d923b9e4908d0
+EBUILD tox-0.2.9-r1.ebuild 3167 BLAKE2B 62cdc2dfdc2492712eaafd05d96534c429dbc6c49687775bf211d33783d845a36b304778123b7fccf99e680534f4559cda4986e30594e4ebc47cc585ee147a7e SHA512 cfd6ccc8f583dae2bade9d6d17bec74099997521eba68637b7bbb5d5934a91cc31eac6686151ef942057aec24d473ca3666a4b0ee148037665896d8fe9979302
 EBUILD tox-9999.ebuild 3084 BLAKE2B 2265c2ddb19ba08857148cc05623b4bb6a42d9979661f201be265cb25602992aa344c37e1c7863031075478663f70878df877e23c4c7125f9e92a865b0b79ee8 SHA512 c78c1c80f5da28a58f710446b74f03c3b849fece2bfec36f71cefe49a6d045d37076c127c754b7d8e370b01f7ea47075f54e29e77c6962a6abe3345334c268ed
-MISC metadata.xml 935 BLAKE2B 27a67342b8cc389cc89a3640589c158ece6be9b25ff2550f063bdcc4d0ded3e39f50ed6ea261e3fb627434a00a4d1e1454797f61fda050ad6c38cc4aa0453ed4 SHA512 24effa76d3f6b31308cb2c18e3f618d4a3392c88bb63b55df65ce7ac9dcacd5ed269b126ffb1af29e0f83bd631d6cc96e14a0343fde709693ebe9d301de9b279
+MISC metadata.xml 870 BLAKE2B fe6cd17ce54fce4f002d1952694a0f3b6cbfc55be321de1256590721aa6d2e248bf8e9b080708c6cf06bbf8cccba327dc71a18223500d1a0910d1c6edb9ffc55 SHA512 7600b6b0558499e346cec1d6f5ddfadfa7a9fa97187737febe8076379af759f30f7ba90c46f38c70b69a91b39a365c7deb04182f6cc77ba54da9bd792ceb2025
diff --git a/net-libs/tox/files/initd b/net-libs/tox/files/initd
index 101d3297056f..49880897a1a0 100644
--- a/net-libs/tox/files/initd
+++ b/net-libs/tox/files/initd
@@ -1,7 +1,10 @@
 #!/sbin/openrc-run
 
 PIDDIR=/run/tox-bootstrapd
-PIDFILE="${PIDDIR}"/tox-bootstrap.pid
+PIDFILE="${PIDDIR}"/tox-bootstrapd.pid
+KEYSDIR=/var/lib/tox-bootstrapd
+TOX_USER=tox
+TOX_GROUP=tox
 
 depend() {
 	need net
@@ -11,6 +14,7 @@ start() {
 	ebegin "Starting tox-dht-bootstrap daemon"
 
 	checkpath -d -q -o "${TOX_USER}":"${TOX_GROUP}" "${PIDDIR}"
+	checkpath -d -q -o "${TOX_USER}":"${TOX_GROUP}" "${KEYSDIR}"
 
 	start-stop-daemon --start \
 		--pidfile "${PIDFILE}" \
diff --git a/net-libs/tox/files/tox-bootstrapd.conf b/net-libs/tox/files/tox-bootstrapd.conf
index 3413f5907d46..34836de6287d 100644
--- a/net-libs/tox/files/tox-bootstrapd.conf
+++ b/net-libs/tox/files/tox-bootstrapd.conf
@@ -5,13 +5,16 @@ port = 33445
 
 // A key file is like a password, so keep it where no one can read it.
 // If there is no key file, a new one will be generated.
-// The daemon should have permission to read/write it.
+// If you change this directory, either change the keys directory
+// in the /etc/init.d/tox-dht-daemon script or manually set the
+// new directory to have user "tox" and group "tox".
 keys_file_path = "/var/lib/tox-bootstrapd/keys"
 
 // The PID file written to by the daemon.
-// Make sure that the user that daemon runs as has permissions to write to the
-// PID file.
-pid_file_path = "/var/run/tox-bootstrapd/tox-bootstrapd.pid"
+// Make sure that the user that daemon runs as has permissions to 
+// write to the PID file. If you change this file, please edit the 
+// etc/init.d/tox-dht-daemon script to reflect the change.
+pid_file_path = "/run/tox-bootstrapd/tox-bootstrapd.pid"
 
 // Enable IPv6.
 enable_ipv6 = true
diff --git a/net-libs/tox/metadata.xml b/net-libs/tox/metadata.xml
index 9b67a0bb1737..bfbb95186f12 100644
--- a/net-libs/tox/metadata.xml
+++ b/net-libs/tox/metadata.xml
@@ -12,7 +12,6 @@
 	<use>
 		<flag name="av">Adds support for audio and video.</flag>
 		<flag name="dht-node">Enables DHT Bootstrap Node.</flag> 
-		<flag name="no-log">Log level: 0 (no debug info logged)</flag>
 		<flag name="log-error">Log level: 1</flag>
 		<flag name="log-warn">Log level: 2</flag>
 		<flag name="log-info">Log level: 3</flag>
diff --git a/net-libs/tox/tox-0.2.8.ebuild b/net-libs/tox/tox-0.2.8.ebuild
deleted file mode 100644
index 7e056d8ed926..000000000000
--- a/net-libs/tox/tox-0.2.8.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils systemd user
-
-MY_P="c-toxcore-${PV}"
-DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
-HOMEPAGE="https://tox.chat"
-SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0/0.2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+av daemon ipv6 no-log log-trace log-debug log-info log-warn +log-error static-libs test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( no-log log-trace log-debug log-info log-warn log-error )"
-
-RDEPEND="
-	av? ( media-libs/libvpx:=
-		media-libs/opus )
-	daemon? ( dev-libs/libconfig )
-	>=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	#remove faulty tests
-	for testname in bootstrap lan_discovery save_compatibility tcp_relay; do
-		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TOXAV=$(usex av)
-		-DMUST_BUILD_TOXAV=$(usex av)
-		-DBOOTSTRAP_DAEMON=$(usex daemon)
-		-DENABLE_STATIC=$(usex static-libs)
-		-DENABLE_SHARED=ON
-		-DBUILD_AV_TEST=$(usex test)
-		-DUSE_IPV6=$(usex test && usex ipv6)
-	)
-	if use test; then
-		mycmakeargs+=(-DTEST_TIMEOUT_SECONDS=120)
-	fi
-	if use no-log; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="")
-		einfo "logging disable"
-	elif use log-trace; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="TRACE")
-		einfo "Trace logging enabled"
-	elif use log-debug; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="DEBUG")
-		einfo "debug logging enabled"
-	elif use log-info; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="INFO")
-		einfo "info logging enabled"
-	elif use log-warn; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="WARNING")
-		einfo "warning logging enabled"
-	else
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="ERROR")
-		einfo "error logging enabled"
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use daemon; then
-		newinitd "${FILESDIR}"/initd tox-dht-daemon
-		newconfd "${FILESDIR}"/confd tox-dht-daemon
-		insinto /etc
-		doins "${FILESDIR}"/tox-bootstrapd.conf
-		systemd_dounit "${FILESDIR}"/tox-bootstrapd.service
-	fi
-}
-
-pkg_postinst() {
-	if use daemon; then
-		enewgroup tox
-		enewuser tox -1 -1 -1 tox
-		if [[ -f ${EROOT%/}/var/lib/tox-dht-bootstrap/key ]]; then
-			ewarn "Backwards compatability with the bootstrap daemon might have been"
-			ewarn "broken a while ago. To resolve this issue, REMOVE the following files:"
-			ewarn "    ${EROOT%/}/var/lib/tox-dht-bootstrap/key"
-			ewarn "    ${EROOT%/}/etc/tox-bootstrapd.conf"
-			ewarn "    ${EROOT%/}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid"
-			ewarn "Then just re-emerge net-libs/tox"
-		fi
-	fi
-}
diff --git a/net-libs/tox/tox-0.2.9-r1.ebuild b/net-libs/tox/tox-0.2.9-r1.ebuild
index 54d31725efe7..5307394b1288 100644
--- a/net-libs/tox/tox-0.2.9-r1.ebuild
+++ b/net-libs/tox/tox-0.2.9-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils systemd user
+inherit cmake-utils systemd
 
 MY_P="c-toxcore-${PV}"
 DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
@@ -14,17 +14,19 @@ LICENSE="GPL-3+"
 SLOT="0/0.2"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
-RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
 		daemon? ( dht-node )"
+RESTRICT="!test? ( test )"
 
-RDEPEND="
-	av? ( media-libs/libvpx:=
-		media-libs/opus )
-	daemon? ( dev-libs/libconfig )
-	>=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]"
 BDEPEND="virtual/pkgconfig"
+DEPEND=">=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]
+	av? ( media-libs/libvpx
+		media-libs/opus )
+	daemon? ( dev-libs/libconfig )"
+RDEPEND="${DEPEND}
+	daemon? ( acct-group/tox
+		  acct-user/tox )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -97,8 +99,6 @@ pkg_postinst() {
 		ewarn "consider disabling the DHT-node use flag."
 	fi
 	if use daemon; then
-		enewgroup tox
-		enewuser tox -1 -1 -1 tox
 		if [[ -f ${EROOT}/var/lib/tox-dht-bootstrap/key ]]; then
 			ewarn "Backwards compatability with the bootstrap daemon might have been"
 			ewarn "broken a while ago. To resolve this issue, REMOVE the following files:"
diff --git a/net-libs/tox/tox-0.2.9.ebuild b/net-libs/tox/tox-0.2.9.ebuild
deleted file mode 100644
index f227ce28006d..000000000000
--- a/net-libs/tox/tox-0.2.9.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils systemd user
-
-MY_P="c-toxcore-${PV}"
-DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
-HOMEPAGE="https://tox.chat"
-SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0/0.2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+av daemon ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )"
-
-RDEPEND="
-	av? ( media-libs/libvpx:=
-		media-libs/opus )
-	daemon? ( dev-libs/libconfig )
-	>=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	#remove faulty tests
-	for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do
-		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAUTOTEST=$(usex test)
-		-DBOOTSTRAP_DAEMON=$(usex daemon)
-		-DBUILD_MISC_TESTS=$(usex test)
-		-DBUILD_TOXAV=$(usex av)
-		-DENABLE_SHARED=ON
-		-DENABLE_STATIC=$(usex static-libs)
-		-DMUST_BUILD_TOXAV=$(usex av))
-	if use test; then
-		mycmakeargs+=(
-			-DBUILD_AV_TEST=$(usex av)
-			-DTEST_TIMEOUT_SECONDS=120
-			-DUSE_IPV6=$(usex ipv6))
-	else
-		mycmakeargs+=(
-			-DBUILD_AV_TEST=OFF
-			-DUSE_IPV6=OFF)
-	fi
-
-	if use log-trace; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="TRACE")
-	elif use log-debug; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="DEBUG")
-	elif use log-info; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="INFO")
-	elif use log-warn; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="WARNING")
-	elif use log-error; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="ERROR")
-	else
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="")
-		einfo "Logging disabled"
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use daemon; then
-		newinitd "${FILESDIR}"/initd tox-dht-daemon
-		newconfd "${FILESDIR}"/confd tox-dht-daemon
-		insinto /etc
-		doins "${FILESDIR}"/tox-bootstrapd.conf
-		systemd_dounit "${FILESDIR}"/tox-bootstrapd.service
-	fi
-}
-
-pkg_postinst() {
-	if use daemon; then
-		enewgroup tox
-		enewuser tox -1 -1 -1 tox
-		if [[ -f ${EROOT}/var/lib/tox-dht-bootstrap/key ]]; then
-			ewarn "Backwards compatability with the bootstrap daemon might have been"
-			ewarn "broken a while ago. To resolve this issue, REMOVE the following files:"
-			ewarn "    ${EROOT}/var/lib/tox-dht-bootstrap/key"
-			ewarn "    ${EROOT}/etc/tox-bootstrapd.conf"
-			ewarn "    ${EROOT}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid"
-			ewarn "Then just re-emerge net-libs/tox"
-		fi
-	fi
-}