gentoo resync : 04.05.2021

3 files changed, 66 insertions, 4 deletions

diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index fffe65e91039..5d48ce42a842 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,3 +1,4 @@
 DIST libtgvoip-2.4.4_p20210302.tar.gz 1097895 BLAKE2B 36551fb915ee5b5895d8ea68196be5a910739e46886c879bd9f932fa2294a94c22ec3215a94d9bad05a5d24519291676a686c594b74f513f594eb063c83de012 SHA512 d8e27be18e521f367a30c63665300496dbd8fe250261fddf5576325afc27d855e280ee31e46d5fcc2294d79a91c4003732e22f2bfb6db0472e357508b5053d29
-EBUILD libtgvoip-2.4.4_p20210302.ebuild 1509 BLAKE2B ac52b621918606c2596e89073fe0a2fb72f01fcb1b57d38089bae921e2a2f42dbb3cdea3f382013fd0ffad067c78a281af57365931f678a19d69a6b1e9e93e5a SHA512 35ff95953390016469e704c3b22ffd5ee94d31f00eb72340e49bb2db3507b777ca81fbe3ec022d08e695e14ad8c74460c55f8b4962373aa97682d7e6e3d6fa53
+EBUILD libtgvoip-2.4.4_p20210302-r1.ebuild 1437 BLAKE2B 806ce3ddd3a3bf23548f93caec64b32371d4780ca044dfb92838c40d25524bca5ac90bb74c75ded1cfd98533959f5e9f70e1ed469668ec1edc3c8ac51c2cb185 SHA512 32384f8f0149c754c773bb74a5a7c6ad9cd348729981f48c2c55e545d484a33bc978c0df152ea12c0ba4d4da1ba90f661f2a8970866d037a80ef7cf23d90e84b
+EBUILD libtgvoip-2.4.4_p20210302.ebuild 1449 BLAKE2B 856046ffa58f3f0064b381b35da7ef356641d0b8212737d9939d2c8e4c3490b85b0297f01dcc475a5e14bec2253590383ec8205686ffcb1294ae7c5a9c96f346 SHA512 594e3ca3432dbd336b03a9c630be73d5e8c7a9256927f8c0cccfb4a148d1f5ab88fa500c9a221576dc4b7e427086e7cf8c94f725f416baf38d8756c482395c3e
 MISC metadata.xml 542 BLAKE2B ddf38189857cb4216e85e9a958daa176e8d030b907735f9d57e25ce5b71d0a6179300bb9064960e4a82532dedf329fc85ee98025faf0494b17b74a00fcb8d056 SHA512 e455e7c38f6171064d6c3923fa04373bd6e902e40d6e2c63f7a1ca8adc8245b93ef5b67051ee3fd3986a3efd0868c3c631b7ae36613f7978eba7441322711c72
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r1.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r1.ebuild
new file mode 100644
index 000000000000..61e1244e5dd3
--- /dev/null
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic autotools
+
+LIBTGVOIP_COMMIT="0c0a6e476df58ee441490da72ca7a32f83e68dbd"
+
+DESCRIPTION="VoIP library for Telegram clients"
+HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"
+SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${LIBTGVOIP_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+dsp +alsa pulseaudio"
+
+DEPEND="
+	media-libs/opus:=
+	alsa? ( media-libs/alsa-lib )
+	dsp? ( media-libs/tg_owt )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+REQUIRED_USE="
+	|| ( alsa pulseaudio )
+"
+
+S="${WORKDIR}/${PN}-${LIBTGVOIP_COMMIT}"
+
+src_prepare() {
+	# Will be controlled by us
+	sed -i -e '/^CFLAGS += -DTGVOIP_NO_DSP/d' Makefile.am || die
+	default
+	# https://bugs.gentoo.org/717210
+	echo 'libtgvoip_la_LIBTOOLFLAGS = --tag=CXX' >> Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		--disable-dsp  # WebRTC is linked from tg_owt
+		$(use_with alsa)
+		$(use_with pulseaudio pulse)
+	)
+	if use dsp; then
+		append-cppflags '-I/usr/include/tg_owt'
+		append-cppflags '-I/usr/include/tg_owt/third_party/abseil-cpp'
+		append-libs '-ltg_owt'
+	else
+		append-cppflags '-DTGVOIP_NO_DSP'
+	fi
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302.ebuild
index b3f91097b27a..05168f911606 100644
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302.ebuild
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302.ebuild
@@ -14,11 +14,10 @@ SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${LIBTGVOIP_COMMIT
 LICENSE="Unlicense"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64"
-IUSE="+dsp libressl pulseaudio"
+IUSE="+dsp pulseaudio"
 
 DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	media-libs/opus:=
 	media-libs/alsa-lib
 	!pulseaudio? ( media-sound/apulse[sdk] )