gentoo resync : 02.06.2019

3 files changed, 113 insertions, 1 deletions

diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index 66cea0986429..b61afee6018f 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -5,6 +5,7 @@ AUX tox-bootstrapd.service 365 BLAKE2B f17891d280007180811414f85f1f8a4defd854364
 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.8.ebuild 2757 BLAKE2B 6b95692af1fb7b3aa1ecba363536769a7466c3b0110bb2ce1b0f885767d6d624b7cda900ac891cbf3dcd9b3552b7a99db1523688ace5641ea5799b08ebfcb1c9 SHA512 8bbc00c73c02246985712429187095765677e08f1161438987fe38a26165c45c5dc1bd71acca27001040f6337ad4a307f350bf8efc6b83e56b02d739ff2168a0
+EBUILD tox-0.2.9-r1.ebuild 3128 BLAKE2B a5a0e3a4ec5171fb513a6567916e84a20ec2400ae4a83e97ada018e048b92e03d1874b5accf278dcecf303eae80a917e0d21514a49c6b262e3662f17f0094a9c SHA512 be7033b60e01d5ff19e9465ad2662822a94b97caecf24bd3babd0aa769eec4c7eff67fb62a11d0887b82b5d84d3ccf8e3e8357ff83005ff79637d2c349cbef27
 EBUILD tox-0.2.9.ebuild 2698 BLAKE2B 6ca306040efe329b02f083a143f45253f08d1e9580b7dcde040b227927a0a03353e31233cd947e52176423ae951eb81b0a0e3f6f0cb11d3fcbd9162db0e65f70 SHA512 d0f6f23e05d9fe3a291f45d01cc294ab6255f5af958ef8e88d50c66b6615a8d9585648c8b312d0d5e341411fede14181b2fb0c4832d6876d5ef71d0ff71d5504
 EBUILD tox-9999.ebuild 1803 BLAKE2B 68f3351d491a75643265226fc47e90d23e44cc66f772fe859cff87fcd6b88ced56ffead16ebef992701d023bcd97edd7be45b4075ec72b5afd37b91488b22d01 SHA512 f5dc655a65c4f5f6566008367208d71e017889136e02ad0f023b5a065e3b719c447c9918a3673ce6e9b4c8b0cffdcf7e81b0ca6f701f97b21f3ac04b340ba083
-MISC metadata.xml 875 BLAKE2B 0768a021d85945b52d6b62b91b7c374ac97824842f807f66e6dafa9a95a2701cad54b4c41cba8d567848dc5815d1b52ebd670d23699feb8dfe434b7ef0a20950 SHA512 d0cb0ec14129a7c6ddfc4743fc8ebd2e3ac21b0f01738a4a7f2f3a59a6e062097b046764fe8f6e868c6bf6a56041b750bf769c4451eb5265825fb918cde611f4
+MISC metadata.xml 935 BLAKE2B 27a67342b8cc389cc89a3640589c158ece6be9b25ff2550f063bdcc4d0ded3e39f50ed6ea261e3fb627434a00a4d1e1454797f61fda050ad6c38cc4aa0453ed4 SHA512 24effa76d3f6b31308cb2c18e3f618d4a3392c88bb63b55df65ce7ac9dcacd5ed269b126ffb1af29e0f83bd631d6cc96e14a0343fde709693ebe9d301de9b279
diff --git a/net-libs/tox/metadata.xml b/net-libs/tox/metadata.xml
index 4c464531d0ba..9b67a0bb1737 100644
--- a/net-libs/tox/metadata.xml
+++ b/net-libs/tox/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<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>
diff --git a/net-libs/tox/tox-0.2.9-r1.ebuild b/net-libs/tox/tox-0.2.9-r1.ebuild
new file mode 100644
index 000000000000..96361d5998c8
--- /dev/null
+++ b/net-libs/tox/tox-0.2.9-r1.ebuild
@@ -0,0 +1,110 @@
+# 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 dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
+
+REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
+		daemon? ( dht-node )"
+
+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)
+		-DDHT_BOOTSTRAP=$(usex dht-node)
+		-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 dht-node; then
+		ewarn "There is currently an unresolved issue with tox"
+		ewarn "DHT Bootstrap node that causes the program to be"
+		ewarn "built with a null library reference. This"
+		ewarn "causes an infinite loop for certain revdep-rebuild"
+		ewarn "commands. If you aren't running a node, please"
+		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:"
+			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
+}