gentoo auto-resync : 29:11:2022 - 19:21:10

4 files changed, 5 insertions, 141 deletions

diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
index 0db0e9b9ba1e..7b8c55d5d0d5 100644
--- a/net-libs/gssdp/Manifest
+++ b/net-libs/gssdp/Manifest
@@ -1,9 +1,5 @@
 DIST gssdp-1.4.0.1.tar.xz 1229264 BLAKE2B b94e46c79ad0615f976bad4b8efe9dbcaa27105b3189ee23ff349002d175ff83b0a9507846a23f0d8b5ed1e98381658f863a77bec6beff83933ebae5458a6b0e SHA512 c2132b27f49071941be1ad9bd1e642b8b82341aac7e10b87d8a9a0ed3d88759ab6730a4a05ddb904af5e0799602c470b9e83a987c72ec3c1444b7aaef0e36ad8
-DIST gssdp-1.6.0.tar.xz 1232568 BLAKE2B f9c76a867d77f19dbb5f3c8e58177884ebe32a822793dcfdbc12c7a3e80aea5eb56e3212fbf0949535bbf5d1b4eb51a0696c3fbf8c50fce33c9616d94b97d28a SHA512 ad631a869059be06521f093f578228a1c51c7df1eb1be0cf1d2e09ed769c639119565f5af4e252deb336a7edb8d500e6d391b72bb0fd870abd2485874f9f1d8f
-DIST gssdp-1.6.1.tar.xz 2080496 BLAKE2B 29453e746daed62fe651ba726a3bc7ae2d64bdaf08340ecd5647eaf535dbd2960da56e46b36f87bb73054403514b88787f25e4e9e014506864f35e88b579d0d1 SHA512 4569a74252efb597cddd774a9648f899dc784837a164595f7c8d851892a9fbcee7bbf926c136be5cbd72314fabaae0cdbffba941393f62d2d967e3be4146c5ca
 DIST gssdp-1.6.2.tar.xz 2081568 BLAKE2B d11ea1f5d5980c6380dd3a072fc6d8a33894e4cd5c5978862b1fe99ecaed679cee2ecd37a80aa374bb255c8771520501243f334092261465e641a772561a15e0 SHA512 501e2839022b3c175b17b27b8b1134021631726eca331ab7b64f895be770f5b754c50cdfaa03e833a3d95180471cda6a87b17ffeff661f3de228a5b70a2a6cbb
 EBUILD gssdp-1.4.0.1.ebuild 1564 BLAKE2B 9c8ee9713318d5f7999ad7dcab16b57a8e13a5902a10a3a79f75c391bbdc81c72ac60f93c7495136903d487f3667cd0d43615793e5a854a10af0b815a0992271 SHA512 ae40c74510b40291473899f956a101af41fe39ec6ad42c1719e609e1a7c768dfe6e644c35f4776e2fc3c129a8dd55d95f6464f469841d796b0697695670031ea
-EBUILD gssdp-1.6.0.ebuild 1836 BLAKE2B 27b1c8a2fe6396510bf3d2dfe6ed93bb6f5daf930acb3c07b7a07c9d52f3c6cb89cdea1c860cfcec21eb6b9c17fc66cd8bcbcfad74d471d67509900fd9ffd799 SHA512 03ee9da62cfb37a95a50170c3f1c82182a010c1ca6d46fb7826d3cd3eb610fe1c0b89a1cede15c71fde8fe1249261cbd8573141f33490ac7482e41c846c48a2f
-EBUILD gssdp-1.6.1.ebuild 1775 BLAKE2B b304769d63da419c883959960e56e2e407b45a40a391a9203d4be97a8f3f3c4bcd27766ab1f7c95e6853b50014d876f791fd24068957176cb8205fc7c76a7d53 SHA512 10da72ca8656b4de04d1062ec30775f982beb32a93a252196855e6aff42022e19798d45e8ec916f75b0ad38fb44f4274b9a1f97cd47bd8c6d56dedb9d7675d5b
-EBUILD gssdp-1.6.2.ebuild 1844 BLAKE2B 51451a5aba9d5e4a945b7eb4fee44c4b3869eb66f7905baaeffabb677619eeab40e14c8415158960109cae29b5310710809bf4ecd6d3eca4be5bcfbb4f97dd04 SHA512 d7fd280f6d82e14d0e396b300135abb4608a4214b04fa31b8698dc86afe1ed6aacce0ecb9e7c838c1127250bddc684d8df44bce0c6fbface6aa881f77b335e28
+EBUILD gssdp-1.6.2.ebuild 1868 BLAKE2B 8ec758c9e5859545428121e3eadf5f9e1f8cc15435b70c3f73da93c04e319cff0e7d7db857da49f68c0e489132f80a02e7d8b88cae86dd686bc29d4e8c07b7e0 SHA512 940449e942ddd3d77f834402c717518d0162e21d051579af47957c3e9bd0e4058faf3b768f69c6cb2bed829f50be4b1fd326e76f1a169ce751496dc83a4837e6
 MISC metadata.xml 419 BLAKE2B 1f4dd2f5b4eefdc297d9e6faea3cc02358629d82a5dd5641d18ddeca4d8bfd64c97c36ab7b52b076ab43cb96ab07d5472824d8af3a7294abbfe6bf798577bc83 SHA512 43338b7d35dc7a426f9e4a555f9ec6cee5f96de2077158c22552a56c2cd6573cb29aa986c740dada0e1739fccb1db78289f4263cf012360609a4a568cb802731
diff --git a/net-libs/gssdp/gssdp-1.6.0.ebuild b/net-libs/gssdp/gssdp-1.6.0.ebuild
deleted file mode 100644
index 7adc3af3d1b9..000000000000
--- a/net-libs/gssdp/gssdp-1.6.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson-multilib vala xdg
-
-DESCRIPTION="GObject-based API for handling resource discovery and announcement over SSDP"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gssdp"
-
-LICENSE="LGPL-2+"
-SLOT="1.6/1.6-0" # <API version>-<soname>
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="gtk gtk-doc +introspection +vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-
-# has file collision with Slot 0 (/usr/bin/gssdp-device-sniffer), so we remove that from this build
-# and depend on the other slot that has the file as well
-RDEPEND="
-	>=dev-libs/glib-2.69:2[${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.99.0:3.0[${MULTILIB_USEDEP},introspection?]
-	gtk? ( gui-libs/gtk:4 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	>=net-libs/gssdp-1.4:0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? (
-		>=dev-util/gi-docgen-2021.1
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	virtual/pkgconfig
-	vala? (
-		$(vala_depend)
-		net-libs/libsoup:3.0[vala]
-	)
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Never use gi-docgen subproject
-		--wrap-mode nofallback
-
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_native_use_bool gtk sniffer)
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		-Dexamples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	if use gtk-doc ; then
-		mkdir "${ED}"/usr/share/gtk-doc || die
-		mv "${ED}"/usr/share/doc/gssdp-1.6/{reference,html} || die
-		mv "${ED}"/usr/share/{doc,gtk-doc}/gssdp-1.6 || die
-	fi
-	rm "${ED}"/usr/bin/gssdp-device-sniffer || die # because of file collision with slot 0
-}
diff --git a/net-libs/gssdp/gssdp-1.6.1.ebuild b/net-libs/gssdp/gssdp-1.6.1.ebuild
deleted file mode 100644
index 2fb0e8d7fd18..000000000000
--- a/net-libs/gssdp/gssdp-1.6.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson-multilib vala xdg
-
-DESCRIPTION="GObject-based API for handling resource discovery and announcement over SSDP"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gssdp"
-
-LICENSE="LGPL-2+"
-SLOT="1.6/1.6-0" # <API version>-<soname>
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="gtk gtk-doc +introspection +vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-
-# has file collision with Slot 0 (/usr/bin/gssdp-device-sniffer), so we remove that from this build
-# and depend on the other slot that has the file as well
-RDEPEND="
-	>=dev-libs/glib-2.70:2[${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.99.0:3.0[${MULTILIB_USEDEP},introspection?]
-	gtk? ( gui-libs/gtk:4 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	>=net-libs/gssdp-1.4:0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? (
-		>=dev-util/gi-docgen-2021.1
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	virtual/pkgconfig
-	vala? (
-		$(vala_depend)
-		net-libs/libsoup:3.0[vala]
-	)
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Never use gi-docgen subproject
-		--wrap-mode nofallback
-
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_native_use_bool gtk sniffer)
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		-Dexamples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	if use gtk-doc ; then
-		mkdir "${ED}"/usr/share/gtk-doc || die
-		mv "${ED}"/usr/share/{doc,gtk-doc}/gssdp-1.6 || die
-	fi
-	rm "${ED}"/usr/bin/gssdp-device-sniffer || die # because of file collision with slot 0
-}
diff --git a/net-libs/gssdp/gssdp-1.6.2.ebuild b/net-libs/gssdp/gssdp-1.6.2.ebuild
index 2a6c944d5900..0a3614d9bfdf 100644
--- a/net-libs/gssdp/gssdp-1.6.2.ebuild
+++ b/net-libs/gssdp/gssdp-1.6.2.ebuild
@@ -65,5 +65,8 @@ multilib_src_install_all() {
 		mkdir "${ED}"/usr/share/gtk-doc || die
 		mv "${ED}"/usr/share/{doc,gtk-doc}/gssdp-1.6 || die
 	fi
-	rm "${ED}"/usr/bin/gssdp-device-sniffer || die # because of file collision with slot 0
+
+	if use gtk; then
+		rm "${ED}"/usr/bin/gssdp-device-sniffer || die # because of file collision with slot 0
+	fi
 }