gentoo resync : 29.12.2022

5 files changed, 4 insertions, 131 deletions

diff --git a/media-plugins/gst-plugins-libnice/Manifest b/media-plugins/gst-plugins-libnice/Manifest
index ff0cac1fe07f..38d89fae5adf 100644
--- a/media-plugins/gst-plugins-libnice/Manifest
+++ b/media-plugins/gst-plugins-libnice/Manifest
@@ -1,9 +1,6 @@
 AUX gst-plugins-libnice-0.1.18-use-installed-libnice.patch 1778 BLAKE2B 24fe51b4f66c667dacf64b79bf5136fa7a041ec0249dee3f1a2a690acd2dba6eff19868c27f2d096a2aa70ac28989783006e015e07297654864020b8dae15138 SHA512 903b92865e060a67b301897a40c24b3861d57b7a66049c9d85427d99c1a0b726fb80b5f83363670c3f41c14004685be7cad662fcf95b7bb790a741e03ac2c30d
-AUX gst-plugins-libnice-0.1.19-use-installed-libnice.patch 1778 BLAKE2B 24fe51b4f66c667dacf64b79bf5136fa7a041ec0249dee3f1a2a690acd2dba6eff19868c27f2d096a2aa70ac28989783006e015e07297654864020b8dae15138 SHA512 903b92865e060a67b301897a40c24b3861d57b7a66049c9d85427d99c1a0b726fb80b5f83363670c3f41c14004685be7cad662fcf95b7bb790a741e03ac2c30d
-DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
 DIST libnice-0.1.18.tar.gz 439791 BLAKE2B 6bb68bb1484b4a622a580bc9c66b8be260d2615b211cf7991cb50a9f692df525cd0c3c9fc54ef86534426f396f8d2201966cdacfd3f69ff27193971f95886540 SHA512 08bac05874708f7e7a669d28727d8951a10c464b22dd6fada1a4644850bcf5c4cc022cce46bb24c806086a7869b274c4c7d3d6ddaa9ed0ce0bc2c47f72933227
 DIST libnice-0.1.19.tar.gz 453407 BLAKE2B 7bffde82a3e55d9aeeaadd159d944346a5192871e7f574e278dc43e8171e5fde472cd28186777a0b6cddd8bde34e035794b1c6b8f152c7fb4fae5202025bfdac SHA512 1c63cc0b7655186fd6f83da4dd607183d6ccfab9b7ad7189c1bea2ba7413183f24076aba5d6c7231d2ab3fbd471827256729a8a0c0d1bda48803586e68b3778b
-EBUILD gst-plugins-libnice-0.1.15-r100.ebuild 1663 BLAKE2B 1d76f0223d291e6be4bb2b94e8c34539f78a3fae8eef212c76884e59abfbd970ba3f8127ca13ed6ef1e5895ae7911403ae11f3be16683b50a045da73a86b3e2c SHA512 28f23f8bb2f117e9f52c3d2e90d15e6300150676edb2db33942c74ca94eb35940f30e4a99df91440930e091f1d9f89b8db93d9894fa508c083e3dd3c30ccdc03
-EBUILD gst-plugins-libnice-0.1.18.ebuild 1236 BLAKE2B 0b838016fa8f83e5c136f85266729af551b1bab083292c88c3b26875ce6f2b8457bd6aedbb13f9da990cf84db08db673ecfea2cfbfa7b834f3dee38a433f1fa7 SHA512 66da3b6c3844e5515a355e30ea5db1e01792d9b974b322245225661cb3864243ed40f4107c62ab78e22f7cab31fb35a89c0f5225f16d20a49fe07e4b4f6fdd8c
-EBUILD gst-plugins-libnice-0.1.19.ebuild 1236 BLAKE2B 0b838016fa8f83e5c136f85266729af551b1bab083292c88c3b26875ce6f2b8457bd6aedbb13f9da990cf84db08db673ecfea2cfbfa7b834f3dee38a433f1fa7 SHA512 66da3b6c3844e5515a355e30ea5db1e01792d9b974b322245225661cb3864243ed40f4107c62ab78e22f7cab31fb35a89c0f5225f16d20a49fe07e4b4f6fdd8c
+EBUILD gst-plugins-libnice-0.1.18.ebuild 1230 BLAKE2B 930fb2da04ecedf0493ce306cc0cd77f5c56a348360ab0759621e5951164953c3ca87dbe95961eb950d9884dd1c651264f0b791268719f8a085811b8c65e6fc5 SHA512 ba53703bb8de6d05745104b619746bced2e08e56ebd1ec6083842db784ff3e27b726c0d1b1707277ccf6193ab3e6a7111277279304353386ab763ce772a185e7
+EBUILD gst-plugins-libnice-0.1.19.ebuild 1237 BLAKE2B d07ed4a3a332d9ec0cb0aad16cd6c1fcccea21d9d666309a70f8fb2302b157293c79bb75141d14e2b7d258136a5e727287ebd60f018aa6d0c4f6010f671decd9 SHA512 a8e93fb78cfcab489def2bb3b47607e326cdf1de8bc2fb36c00cef23f35c63d095a916e7d361c4fc8fd56f66e0243570bd2d97158ec745c16514a70e18de3082
 MISC metadata.xml 373 BLAKE2B 440aa17e59153e87321e231c92b943329e7726c23255fe76ba8934b34e8a636adda880e90bc3ac285609cfccf6449dbff02dfe0ec6b2318ef039df4f1e780c8c SHA512 a92cce75c15b414f1821cfe274c78717f68c1b44254d9028934abc652ccacd8ff2261105aaf0b5c688e58c787d434b1358c0a5c239ad2ec7625d91de63dba0b1
diff --git a/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.19-use-installed-libnice.patch b/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.19-use-installed-libnice.patch
deleted file mode 100644
index 1b0782e00d6e..000000000000
--- a/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.19-use-installed-libnice.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Carve out everything but gstreamer plugin part, libnice-0.1.18
-
-Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
-
-diff -udBbr libnice-0.1.18-original/gst/meson.build libnice-0.1.18/gst/meson.build
---- libnice-0.1.18-original/gst/meson.build	2020-10-21 04:03:07.271845300 +0300
-+++ libnice-0.1.18/gst/meson.build	2022-03-20 23:38:28.826178730 +0300
-@@ -12,8 +12,7 @@
-   gst_nice_sources,
-   c_args : gst_nice_args,
-   include_directories: nice_incs,
--  dependencies: [nice_deps, gst_dep],
--  link_with: libnice,
-+  dependencies: [libnice_dep, gst_dep],
-   install_dir: gst_plugins_install_dir,
-   install: true)
- 
-diff -udBbr libnice-0.1.18-original/meson.build libnice-0.1.18/meson.build
---- libnice-0.1.18-original/meson.build	2020-10-21 04:03:07.272845300 +0300
-+++ libnice-0.1.18/meson.build	2022-03-20 23:38:05.116302874 +0300
-@@ -263,9 +263,7 @@
- 
- libm = cc.find_library('m', required: false)
- 
--nice_incs = include_directories('.', 'agent', 'random', 'socket', 'stun')
--
--nice_deps = gio_deps + [gthread_dep, crypto_dep, gupnp_igd_dep] + syslibs
-+nice_incs = include_directories('.')
- 
- ignored_iface_prefix = get_option('ignored-network-interface-prefix')
- if ignored_iface_prefix != []
-@@ -278,11 +276,7 @@
- 
- gir = find_program('g-ir-scanner', required : get_option('introspection'))
- 
--subdir('agent')
--subdir('stun')
--subdir('socket')
--subdir('random')
--subdir('nice')
-+libnice_dep = dependency('nice', version: nice_version, required: true)
- 
- if gst_dep.found()
-   subdir('gst')
-@@ -298,14 +292,6 @@
-   endif
- endif
- 
--if not get_option('tests').disabled()
--  subdir('tests')
--endif
--
--if not get_option('examples').disabled()
--  subdir('examples')
--endif
--
- add_test_setup('valgrind',
- 	       exe_wrapper: ['valgrind',
- 			     '--leak-check=full',
diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild
deleted file mode 100644
index 25f28f5855cb..000000000000
--- a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="GStreamer plugin for ICE (RFC 5245) support"
-HOMEPAGE="https://nice.freedesktop.org/wiki/"
-MY_P=libnice-${PV}
-SRC_URI="https://nice.freedesktop.org/releases/${MY_P}.tar.gz"
-
-LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="
-	~net-libs/libnice-${PV}[${MULTILIB_USEDEP}]
-	media-libs/gstreamer:${SLOT}[${MULTILIB_USEDEP}]
-	media-libs/gst-plugins-base:${SLOT}[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	sed -e 's:$(top_builddir)/nice/libnice.la:$(NICE_LIBS):' \
-		-i gst/Makefile.{am,in} || die "sed failed"
-}
-
-multilib_src_configure() {
-	# gnutls vs openssl left intentionally automagic here - the chosen USE flag configuration of libnice will ensure
-	# one of them is present, configure will be happy, but gstreamer bits don't use it, so it doesn't matter.
-	# gupnp is not used in the gst plugin.
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-compile-warnings=yes \
-		--disable-static \
-		--disable-static-plugins \
-		--without-gstreamer-0.10 \
-		--with-gstreamer \
-		--with-crypto-library=auto \
-		--disable-introspection \
-		--disable-gupnp
-}
-
-multilib_src_compile() {
-	emake -C gst \
-		NICE_LIBS="$($(tc-getPKG_CONFIG) --libs-only-l nice)"
-}
-
-multilib_src_test() {
-	:
-}
-
-multilib_src_install() {
-	emake -C gst DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.18.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.18.ebuild
index 99b81c3f7797..ffbb9406d7dd 100644
--- a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.18.ebuild
+++ b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://nice.freedesktop.org/releases/${MY_P}.tar.gz"
 
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.19.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.19.ebuild
index 99b81c3f7797..d232cc42b1a5 100644
--- a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.19.ebuild
+++ b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.19.ebuild
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/gst-plugins-libnice-${PV}-use-installed-libnice.patch
+	"${FILESDIR}"/gst-plugins-libnice-0.1.18-use-installed-libnice.patch
 )
 
 S=${WORKDIR}/${MY_P}