gentoo auto-resync : 12:10:2022 - 13:40:16

3 files changed, 2 insertions, 102 deletions

diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index c1409a4a49e3..35fc88602ecf 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -8,9 +8,7 @@ AUX libsrtp-2.3.0-rtp-header.patch 904 BLAKE2B f2756956a913e6be8c49d0d178f2351cb
 AUX libsrtp-2.4.2-doc.patch 1819 BLAKE2B bc4c53bc623f839e8069b24d8bee6a5e6e52f37783ee66afc9f2f72f325c7fcbb0f9fbdff4d460953050c196a3e2d3531b009c463ba9fca50c18027146f15661 SHA512 4bbb557ad7aa93842a8003084297277a67853fc6c408fb00ce52828a05abc3c2fe726ffebedbad939a15fab6838c08f364de772e4ab9b6037b03f4d2805a5802
 AUX libsrtp-pcap-automagic-r0.patch 615 BLAKE2B 5e4edeafd8f9e921c211b67064c72aecd10a708d16c8e89ea6be01ff69126ca546528532b05bc23aae80f07bac6dd2dacfc0ce6b977f6f0efae44ab017ab03d9 SHA512 ee55bdf6f9c77ebacd7469db92f42ed09728fe91a81496ff425c07ad8610e9998fec2a8992b4fafd7c684bb06989837b0244172ed96483984d1c2e6ff6c0dc0c
 DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f04c6dd084ef473c439d720733d0fd8b38bdfe92e30e05a8a94c41df965d04bca52601b2644352428b49b1ed9093 SHA512 5ac712d0d343c3b63ed248503cc7d33c637895a274c4434c91f513be117836f27cd5daba83088b4647bbd9c82d841e216e6346af8d485cb9ddcd35dee21d4887
-DIST libsrtp-2.3.0.tar.gz 633819 BLAKE2B 9ea40e9689fabc29b7a2c637bd4e4a2c44eec79205a6e5c5e5abf1069dfec7ba28d868ba620462205d61fdb28d0ca3b8532c1f59db704edd508e01afb551d255 SHA512 34b1a01cb9a75aed175be09aadd2827224203b9801becc3fbc5214667cce79c3b87b0f59e4315583863ab5a2cc4fc81d56ab604a5e4c984518b8a8a2a7b77461
 DIST libsrtp-2.4.2.tar.gz 631393 BLAKE2B a062fb7a92294c66f1876c66bf05d9b11412a170c5f7221089680770ab85a62eabb68f781e487981b28602b1f4f7dbba07ebd44ed0248deaf6b9b56061227534 SHA512 6e4805e6d34b2050a6f68f629b0b42356b1d27f2cbaa6cc6166e56957609c3d9aa6b723dcc674e5c74180d122d27badd2f9496639ccb1e0c210b9e1f7949d0e2
 EBUILD libsrtp-1.6.0-r1.ebuild 2337 BLAKE2B 52f337ea0bf805f22faa49c822d13fd93101ea021d5a69dafe48fa94cecb99d897c57674d5948558b9a4f7c052f0eb64f1a46899f91ee9223d86ff35ecc80ad4 SHA512 24b38fea4642f344faaa1f9722909b51f8c9c373fa2c231956309eefea81b938c19e55e7aaa1f4971a26f14130c2bce5d6631551d2bd7c976f17641e707b544b
-EBUILD libsrtp-2.3.0-r1.ebuild 1964 BLAKE2B 190d974f229d348ce03631032c70858e898c28804a7a752e52d755d265c9ae8f443d64a86f54cc01e7be56dc1934462b9f7c64169cc07cb7728f09c5bf217daa SHA512 fa3d3a4d34a7c542df04aaa0a87de790044ca8e735ef6096c035fcca29faae12136b7dffcfca995e0b11ff6f51919987b921a5c88765618a6228e08bcad7991a
-EBUILD libsrtp-2.4.2.ebuild 1660 BLAKE2B 32be7c132e818597acd923353886736149b09ec9fef5cc64f8de140ff95a2ac324fa97f61e8b982872a8b3fc3c3026386c15ef6550f2c56dfcffc31d83e25138 SHA512 cbb6fda92b2fa250b2a5a9b38952280af3a4b1dd8c925f0099a8e2e04e3fa67f84b6208f65a35921b77ff0c35d174185a68d6ab852cff026d9fd95b84680718a
+EBUILD libsrtp-2.4.2.ebuild 1658 BLAKE2B 1db2c2ab648c0f1f6046250d2dea2f40ca99819be5a73e21c938f3f935b00ba34debfecaf0f72156b417b5ea0fa2e59560e211192d533a1d245669815badb2e1 SHA512 d93492bd2b5be0300344445ed24bfab275b5ad72cc79193b7b96b197117a2f82b8b8209a4978ced1e8e2e30a1dcf7e85e358805fec9d7d6d164b5bb9a651e099
 MISC metadata.xml 732 BLAKE2B 77564b70a4af50dea6dad18ad1763a5d61fbd8753fef74039b50d9131eb080758e3de2e06736a1665a66bbc716941549ac82efe44f0d58e321778144faf29166 SHA512 f021171abc6eae3bc732e3beac09a5ef126d4c8f31912192db9281cf523d2e2632f740757420b3fb477b88957ace138e03ee752ab44df63b0b16787f1a29e883
diff --git a/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild b/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
deleted file mode 100644
index 47b538b3851e..000000000000
--- a/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
-HOMEPAGE="https://github.com/cisco/libsrtp"
-SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv -sparc x86 ~ppc-macos ~x64-macos"
-IUSE="debug doc nss openssl static-libs test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="?? ( nss openssl )"
-
-RDEPEND="
-	openssl? (
-		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	)
-	nss? ( >=dev-libs/nss-3.52[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-"
-
-DOCS=( CHANGES )
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc-10.patch"
-	"${FILESDIR}/${P}-nss.patch"
-	"${FILESDIR}/${P}-rtp-header.patch"
-)
-
-src_prepare() {
-	default
-
-	# autoconf-2.7x fix
-	touch ar-lib || die
-
-	eautoreconf
-
-	if use doc; then
-		echo "${PV}" > "${S}/VERSION"
-	fi
-
-	# sadly, tests are too broken to even consider using work-arounds
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# stdout: default error output for messages in debug
-	# pcap: seems to be test-only
-	# openssl-kdf: OpenSSL 1.1.0+
-	econf \
-		--enable-log-stdout \
-		--disable-pcap \
-		--disable-openssl-kdf \
-		$(use_enable debug debug-logging) \
-		$(use_enable openssl) \
-		$(use_enable nss)
-}
-
-multilib_src_compile() {
-	use static-libs && emake ${PN}2.a
-	emake shared_library
-	use test && emake test
-	if multilib_is_native_abi && use doc; then
-		emake libsrtp2doc
-	fi
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}" emake -j1 runtest
-
-	# Makefile.in has '$(testapp): libsrtp2.a'
-	if ! use static-libs; then
-		rm libsrtp2.a || die
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		dodoc -r doc/html
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
diff --git a/net-libs/libsrtp/libsrtp-2.4.2.ebuild b/net-libs/libsrtp/libsrtp-2.4.2.ebuild
index 9ae1ce57d00a..bfe9bb785f30 100644
--- a/net-libs/libsrtp/libsrtp-2.4.2.ebuild
+++ b/net-libs/libsrtp/libsrtp-2.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv -sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv -sparc x86 ~ppc-macos ~x64-macos"
 IUSE="debug doc nss openssl static-libs test"
 RESTRICT="!test? ( test )"