gentoo resync : 02.02.2022

4 files changed, 3 insertions, 112 deletions

diff --git a/media-libs/gupnp-dlna/Manifest b/media-libs/gupnp-dlna/Manifest
index 47704d5bfc29..a35ca04994c8 100644
--- a/media-libs/gupnp-dlna/Manifest
+++ b/media-libs/gupnp-dlna/Manifest
@@ -1,7 +1,3 @@
-DIST gupnp-dlna-0.10.5.tar.xz 329468 BLAKE2B 045c890bc05e7a8e8321c46b333b27ec112b470f484961b24dad5652c0d065db52187c4ac19ed392319e12d2cf7b835b43304edf1307ffc3bb5f2c5c7baded4c SHA512 060e997dc85d840722bc31c8eb2c7f986151220ac6f3de9e073f4dd62fdd57ffa049b628080832d6b96c1988f49eacc29d539f738ed61797019264f68ebf7680
-DIST gupnp-dlna-0.11.0.tar.xz 87920 BLAKE2B 8391503c66da267d936563b1b39b1f390bdeb2d4511a900fb99faf968307026e857b66d2f43dd14309e9e4e9790801538947f6c8506391c0da39db6a7b854a6b SHA512 26aad6eb3f7705fa586552a1e4d6931b3ff28b6dbcfd7a626dea297ffd90e67f02957b68e0bb6c80e4fd445dbba1bd47dc47bcf8ac389ff2bb0622cd9ca7f3d1
 DIST gupnp-dlna-0.12.0.tar.xz 89480 BLAKE2B 1e281fa2d8f80bcad146c37ab91c3036ced91b2eae8d7cf29bd34551e38b599f4551a7317f58851b8f3a85ad65313558608f15d42e6d6bccec580be7aa3b19a1 SHA512 a626fe77426b607325bb8cacb6af5c434d451c1aa550272f0cbe59f84103f7ec8d2be5ebc79a9ea4e56b755ad9cadabdcbd059c49b1c0df143ba15a52fcd0ce0
-EBUILD gupnp-dlna-0.10.5.ebuild 1522 BLAKE2B 24ddc3af27cf3342545772827ba1f17844c14f0c2ab9cf7564e5d8d8988163d7582bb5e8d7872ac16443e58356d9bddde3ecfa19ccb2729ebc5c6ba689815937 SHA512 c738ba044bff0cac84ac42b29b4470118ddb69e7006d4f362f684058864a1223df9f3e4b18e5f8739c3ff0a2886c0ba3032e01658a7b4e93ddf55dd8fa096fa0
-EBUILD gupnp-dlna-0.11.0.ebuild 1099 BLAKE2B 336768e59765aa328a28c696e28646880b4d95e2d7ea3bd1e197d11ece1e99ce9b060f1e5c8465213e34c986c3f716686f1da6908d78ef48720bf7d0edd85c27 SHA512 e58311a89a27b83bb9a2618b7c541cba43bbfca6ffa76e6dab74fc016fcff8d239fda8f8090bb5f6bd9c9faee88770cd02ab338071466e2b61d920c5935649ad
-EBUILD gupnp-dlna-0.12.0.ebuild 1099 BLAKE2B 336768e59765aa328a28c696e28646880b4d95e2d7ea3bd1e197d11ece1e99ce9b060f1e5c8465213e34c986c3f716686f1da6908d78ef48720bf7d0edd85c27 SHA512 e58311a89a27b83bb9a2618b7c541cba43bbfca6ffa76e6dab74fc016fcff8d239fda8f8090bb5f6bd9c9faee88770cd02ab338071466e2b61d920c5935649ad
+EBUILD gupnp-dlna-0.12.0.ebuild 1097 BLAKE2B c282f5d9551722ccd59f203e7a2ba792de34411b36e383e2c0065246af81d9ee7d1c92d06d249caffe020b44c00474053b02ef76b297601eb9a4699142458c83 SHA512 20a80d97d745b44619ae0697901c685290030d047864faa5fb0075bd9a43b0543c3dce0712ebc3ee3e988de4b73a7a8077bf893ef23e4db4574ad38b0d611ed1
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.10.5.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.10.5.ebuild
deleted file mode 100644
index 8ab1d92eced5..000000000000
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.10.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Library providing DLNA-related functionality for MediaServers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2"
-SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.34:2
-	>=dev-libs/libxml2-2.5:2
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-	introspection? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# Make doc parallel installable
-	cd "${S}"/doc/gupnp-dlna
-	sed -e "s/\(DOC_MODULE.*=\).*/\1${PN}-${SLOT}/" \
-		-e "s/\(DOC_MAIN_SGML_FILE.*=\).*/\1${PN}-docs-${SLOT}.sgml/" \
-		-i Makefile.am Makefile.in || die
-	sed -e "s/\(<book.*name=\"\)${PN}/\1${PN}-${SLOT}/" \
-		-i html/${PN}.devhelp2 || die
-	mv ${PN}-docs{,-${SLOT}}.sgml || die
-	mv ${PN}-overrides{,-${SLOT}}.txt || die
-	mv ${PN}-sections{,-${SLOT}}.txt || die
-	mv ${PN}{,-${SLOT}}.types || die
-	mv html/${PN}{,-${SLOT}}.devhelp2
-
-	cd "${S}"
-
-	use introspection && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection)
-}
-
-src_install() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=720053
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-}
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.11.0.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.11.0.ebuild
deleted file mode 100644
index 47221219da9c..000000000000
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.11.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson vala
-
-DESCRIPTION="Library providing DLNA-related functionality for MediaServers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp-dlna"
-
-LICENSE="LGPL-2"
-SLOT="2.0/4" # subslot: soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="gtk-doc +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.34:2
-	>=dev-libs/libxml2-2.5:2
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	introspection? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use introspection && vala_src_prepare
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgstreamer_backend=enabled
-		-Ddefault_backend=gstreamer
-		$(meson_use introspection)
-		$(meson_use introspection vapi)
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.12.0.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.12.0.ebuild
index 47221219da9c..ad288a0f8a53 100644
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.12.0.ebuild
+++ b/media-libs/gupnp-dlna/gupnp-dlna-0.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/g
 
 LICENSE="LGPL-2"
 SLOT="2.0/4" # subslot: soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="