gentoo resync : 24.12.2018

3 files changed, 1 insertions, 97 deletions

diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index 3bcf6db1feab..31418ca6993e 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,9 +1,7 @@
 AUX toxic-0.8.0-verbose-build-log.patch 9264 BLAKE2B c4e94a50711fc3804b11afb260ab82936d563b1bff3d87e106d5897d660b4138864dda1cd2f01d3d0a3a024efc731d4dc97008d0f4022e6124613ff141ea264a SHA512 5f3b1e2c20ff04b11ef40eee0953954c0274044aeefa4c4cde5fd4028591ebedc94d671383656d5af219e2d6ed9bf998ba092a821528e80f6617a4cb85ef003d
-DIST toxic-0.8.0.tar.gz 1145799 BLAKE2B 01dd14d28feac0aadd1e87d8538910601b532e8cb02219091a863502eb80f812a034eecf06f131ff878509dfc1eb40e5f9baf7547180346eeb03bdb7dea4a6ed SHA512 3c59edb61b1bcdbfa3a8391a1a1ceccc6c9c38b49c1709813d60480b180fb39607806116b9dcd1de35ebb02e23e95d78c8191f04a4875e06e27fa43bc9800b33
 DIST toxic-0.8.2.tar.gz 1146526 BLAKE2B 0a1c80313963287e88aa489ecf4614365a3d94c770cdfb3b1f3afd0bf2b70639c35b9c5ce52408647abdaac9822c9529b603ec1883779f5486ff63001d98ff5e SHA512 258e873404315c9a1f59d67f524089afebad88d800116bd9e53c8bc35bd9dd6b66cfcd90db06181f01330ba0a302456510fac5c01fdbfde7d475aa5d6b1070aa
 DIST toxic-0.8.3.tar.gz 1147100 BLAKE2B d73a861112aca65e54773c98473c2858bb81e63fef11212633e34dac9e87101956e3ab0d9d56757767bc5d48d1d5a406e550f8fc55ae34860dbc4977c94ee347 SHA512 c8d746efcc055592dd990dfa57415cc1eacaaa3b66303d7583d9f9e7e98b8829c8f1ae849f36a243c8896e99787dd2e493c92367de719b20a4a160bc7daea76e
 DIST toxic_patches-0.8.2.tar.gz 3859 BLAKE2B 4a19226cea6c7ce60f599fbd4f74171f26b3812259f0f8997997526bde7beb6fe64b922f25fe77e0ac8f9b185db116d2e626cb889631a1508786b92f9bbc8927 SHA512 737cc53e814567e10ad8b7431be63ab8f99b76bb150490c31e03309c4e51ee34a798d141cbde446cbbc4b5c0145ca468f3456a2af4b966c80792cdccc6562b46
-EBUILD toxic-0.8.0-r1.ebuild 2057 BLAKE2B 6758c830e8cf0f58d76c7e2a09d767aa4c5a94acdd082ffb10898c217db6c02d83ad2dbb51df571cbd246427ef1262506d99fe6aff086f7d76796f04f3ea7da3 SHA512 415e828401566250b63a95cd245b61b2237a2081737b6fb6860e031e331fdf309643ed8fc2982eae322d2c1a5bc48be97d49e369cf4a7cfb4f7f02ed8ac29022
 EBUILD toxic-0.8.2.ebuild 2259 BLAKE2B e71336c2ba6967780dbfcb4ec865429955d513679197f3e59ca4ba7277010a9b41cdcccb45c7d5771c3b379170f86d6d611cc3d80e3aafebd5ba7dcf3e86d069 SHA512 3864d5b5de55b14e0a1786229fc6a61611d137c8f9b9c832898dc6865de683d77f34866141ae8111118e5af4e23ab96bbeaaaf071a268d0c2c8e7c5f8c3740ba
 EBUILD toxic-0.8.3.ebuild 1846 BLAKE2B 4fb525bc9a87bb179a896870ce045adfd3fc4b1cf8c668e70881f872f10e700533b4e32d42eb8c682cc0e6ff0ae49438ec37dfbafe567044512fb2048a05ae18 SHA512 37d3d2d0fac7391a3fbb7022bb380439148ea02d329e4d1679e753855e6dbd263efa4c6e446ceb770a584a5b0ef784546870b8a457a243ef572deda35986835c
-MISC metadata.xml 1136 BLAKE2B bf8ee37048be3570aa5b0c8c8503be1aa60f15def81e52aaa80718d086c9e12c63cd1b938ff4de1d4720a27322b77f54dcfcf76777bd58bc760252f276832abf SHA512 33c321202660079cfc0c7313276b775104e617618400932d66a8cc24697fd62d6b789c95f83cd00591bea7d47b5d5f0d5bae1122f4b9d54ce23bbdf660b9e3fa
+MISC metadata.xml 984 BLAKE2B e990138cd52d9a9933635ac1a093a22305dd02896082e38b5fbbe7044fc77a1cf134db1a5923985566e89b360f2e98b7cb948e273580857a10ef5856f33c48e0 SHA512 3211f2bb29f8755718fb0cd45e37c3331271500a6d6dd0c47acee7b8e6f0d550fb9e8910d5d0769cd7ea217e7abeb1998886246c4ede1fe24b23d722a0341865
diff --git a/net-im/toxic/metadata.xml b/net-im/toxic/metadata.xml
index 0ba52a98e62a..02e709980dad 100644
--- a/net-im/toxic/metadata.xml
+++ b/net-im/toxic/metadata.xml
@@ -20,9 +20,7 @@
 		An ncurses-based Tox client written in C. Supports audio and video calling, file sharing, and desktop notifications.
 	</longdescription>
 	<use>
-		<flag name="audio">Enables audio calling</flag>
 		<flag name="notification">Enables desktop notifications with libnotify, with sound support.</flag>
-		<flag name="notifications">Enables desktop notifications with libnotify, with sound support.</flag>
 		<flag name="qrcode">Enables QR code support</flag>
 		<flag name="sound">Enables audio calling</flag>
 		<flag name="video">Enables video calling</flag>
diff --git a/net-im/toxic/toxic-0.8.0-r1.ebuild b/net-im/toxic/toxic-0.8.0-r1.ebuild
deleted file mode 100644
index e9a1018aa90b..000000000000
--- a/net-im/toxic/toxic-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-
-inherit python-single-r1 xdg
-
-DESCRIPTION="A curses-based client for Tox."
-HOMEPAGE="https://github.com/JFreegman/toxic"
-SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+X +audio notifications +python +qrcode +video"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Not a typo; net-libs/tox only has a 'both or neither' option
-RDEPEND="
-	|| (
-	audio? ( net-libs/tox:0/0.1[av] )
-	video? ( net-libs/tox:0/0.1[av] )
-	net-libs/tox:0/0.1
-	)
-	dev-libs/libconfig
-	net-misc/curl:0=
-	sys-libs/ncurses:0=
-	audio? ( media-libs/openal media-libs/freealut )
-	video? ( media-libs/libvpx:= x11-libs/libX11 )
-	notifications? ( x11-libs/libnotify )
-	python? ( ${PYTHON_DEPS} )
-	qrcode? ( media-gfx/qrencode )
-"
-DEPEND="
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-verbose-build-log.patch"
-	)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# bug 630370: version string correction 0.7.2 -> 0.8.0
-	# REMOVE THIS FOR toxic != 0.8.0
-	sed -i \
-		-e 's/^\(TOXIC_VERSION =\).*$/\1 0.8.0/' \
-		cfg/global_vars.mk || die "Version string correction failed."
-}
-
-src_configure() {
-	export USER_CFLAGS="${CFLAGS}"
-	export USER_LDFLAGS="${LDFLAGS}"
-	if ! use video && ! use audio; then
-		export DISABLE_AV=1
-	fi
-	if ! use audio; then
-		export DISABLE_SOUND_NOTIFY=1
-	fi
-	if ! use X; then
-		export DISABLE_X11=1
-	fi
-	if ! use notifications; then
-		export DISABLE_DESKTOP_NOTIFY=1
-	fi
-	if ! use qrcode; then
-		export DISABLE_QRPNG=1
-	fi
-	if use python; then
-		export ENABLE_PYTHON=1
-	fi
-	sed -i \
-		-e "s,/usr/local,${EPREFIX}/usr,g" \
-		cfg/global_vars.mk || die "PREFIX sed failed"
-}
-
-src_compile() {
-	emake V=1 || die "emake failed"
-}
-
-src_install() {
-	default
-	if ! use audio; then
-		rm -r "${ED%/}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
-	fi
-}