gentoo auto-resync : 17:06:2024 - 00:09:46

4 files changed, 15 insertions, 117 deletions

diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index 3608fe3896ea..19a3cbaed822 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1,7 +1,5 @@
-DIST gnome-software-44.4.tar.xz 2426404 BLAKE2B 6f60ffd115ad0e11b619118ae5e665fb35c70621adefe4c532481ab3742c8e2c6a5a0790dae29b2fcf0311f89fda93c323e5bc24b185bbbe95e62a687f71930d SHA512 97eaa33b4dd91a6865ee7eeee28e5acf3cf5fbd6a72a60cf5a7c528f79f6f0684014d1169318314b8efce23c1c29e7d24a71193998ced930584a50494137cf8b
-DIST gnome-software-45.2.tar.xz 2475796 BLAKE2B e8741f4394cb6b86f177dbcce64876d67870c269f9eb41ebc545dff9211a76c7f694412e8be1aafb83eba0caedd9dce1eba56fc767aa7859bb2a1aee17696aca SHA512 ea271146683d199b27ffaaab98a13c25f8f794da3c6cc6b0daeb37f3f4c92d8644926dc592d309ea32dcb131d33e6c77d1c6fa36ac10cf6b23cd7adc73e898cb
 DIST gnome-software-45.3.tar.xz 2477736 BLAKE2B 82a12e4d22e28c6c6345ae654f97911cdfeeff658dc3fbea68df949856c4552520edc6fc5f67d19fcfd85af88eb6d285561ddc294938ce753ffbc05a8b703398 SHA512 45c8c92c9bd046b37b3fb4e817a0ea83fe9323d019f86140357f90bb2a0bf9dda5d33798c4b4d78303e2402c6cb603a4ff467e260e734b7ba97f07ebfaf4044c
-EBUILD gnome-software-44.4.ebuild 2664 BLAKE2B c8464d8e45ea71097e91ceaaacb722e317bd089c27e0e7ade3318ed7e8ec16c274baa1337cb7ea88fbddfdf2c37ad903a21f2736ed24cf5dbf54c04f8227c1d8 SHA512 9163535b7198d7d2369f31d6dbab926b98b628120715f212d88388a11167a60ceffd92971b7dd9f5dd5594f6a7700cb3c6127456fc786bc4f66d551e06f7cddb
-EBUILD gnome-software-45.2.ebuild 2621 BLAKE2B e7e7330bd857a32647bbe52ed4d8c75d1d0626ab7efbfced2b1dabfcd501b7e0068d427ef078583b2f6d006fcf51b75560bdb63d6bf42cd9ec3bc3f8ce1e2cd7 SHA512 e35a64425dcc4ef0ed91b56d99bc865c3128fc29aa97ce0f860547bf44aab5605e0c0a48528872b98846a2c40322d2b72153bfc62c11a70f9a7d5632ba724f6b
+DIST gnome-software-46.2.tar.xz 2574280 BLAKE2B 30ad2dfeebc1477f9917604eb5749f45b04770322de5660fe8661ea4df4df2699854f2fcc18349ba54c62a9af2c0a47e070f152e88b9bffece40f8e6d5be6ef2 SHA512 4e7cccc20001ccee114508bb50e2a25968ee6fea64fb545e1174ff435cd368b2d7c928b6a182874af8e9f0c99f9f506e75c5ac9bf61b35ba0a897368ae0abc3c
 EBUILD gnome-software-45.3.ebuild 2621 BLAKE2B 745b17d6177c4edd5a558c28ee129528a2a18bd61ec20de909ae34d3dc56bd8467a8f82f9edea1120c21f9f8aed1ff5b85368df71dbf0b527a7dc2594d73aa84 SHA512 dc5437e80e458869c431c01f312dd79c5bd9e05a527e1a1c53c991456646caa51d5062a9c0ae27b7c211788bbf37feab12ced61be4db88e1c4cdde80cdd1bb13
-MISC metadata.xml 688 BLAKE2B e157620837f5fd999b67d2a20f09cc64066317a47391ad97ae645b268964cff5a57e2e088e3040bfc98900f75ddcbffed10f1c159516c38f03d11aa1d2d00386 SHA512 9735764b439bdcb3db3b329d986530677ba87e00f10f217178d8014ea4335c3b74ec0e0051117086da92e9eac59849460a62c324ca249f621b13a3a7d50771a4
+EBUILD gnome-software-46.2.ebuild 2723 BLAKE2B ee11e0c8dc80f1b2aba435d5a6bbe3362867901d7ac9905e203c4b7de73be83a4b40f1632538261cfb39177640e7dab965733308f8dd6f1fabdaa33048c6a44a SHA512 901c008b2a5d9c0362d3be65227564f47fa8224c11ebf18af6f1f417dc9e68567170e74b26da240cf9d7880947e5b2bdde89641b97f1c0e12670446472a842b5
+MISC metadata.xml 788 BLAKE2B 0093b639ef68b32b6d6f4c4b81a5e61cd0940da6c00a363fdcdfc1431d7bc3eb3b493dc2d72dea1e5011b1c9c333cd030519e7ec6320d32092249573d772b54d SHA512 cbc4f4573f3892f2c4ecf6ab3a79d49f7c4fc5dd8b0d3d4873a460fb6742d7f1e1a05c48b232cdec03e5c4abef5693134dcc21411490de68725cb0945423eeee
diff --git a/gnome-extra/gnome-software/gnome-software-44.4.ebuild b/gnome-extra/gnome-software/gnome-software-44.4.ebuild
deleted file mode 100644
index 4f2a883a0040..000000000000
--- a/gnome-extra/gnome-software/gnome-software-44.4.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Software https://gitlab.gnome.org/GNOME/gnome-software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="flatpak +firmware gnome gtk-doc sysprof udev test"
-
-RDEPEND="
-	>=dev-libs/appstream-0.14.0:0=
-	>=x11-libs/gdk-pixbuf-2.32.0:2
-	>=dev-libs/libxmlb-0.1.7:=
-	>=gui-libs/gtk-4.9.2:4
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/json-glib-1.6.0
-	>=net-libs/libsoup-3.0:3.0
-	>=gui-libs/libadwaita-1.3_rc:1
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 )
-	sys-auth/polkit
-	firmware? ( >=sys-apps/fwupd-1.5.6 )
-	flatpak? (
-		>=sys-apps/flatpak-1.14.0-r1
-		dev-util/ostree
-	)
-	udev? ( dev-libs/libgudev )
-	>=gnome-base/gsettings-desktop-schemas-3.11.5
-"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/libglib-testing )
-"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3
-	)
-"
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
-	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
-	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test tests)
-		$(meson_feature gnome gsettings_desktop_schemas) # Honoring of GNOME date format settings.
-		-Dman=true
-		-Dpackagekit=false
-		# -Dpackagekit_autoremove
-		-Dpolkit=true
-		-Deos_updater=false # Endless OS updater
-		$(meson_use firmware fwupd)
-		$(meson_use flatpak)
-		-Dmalcontent=false
-		-Drpm_ostree=false
-		-Dwebapps=true
-		-Dhardcoded_foss_webapps=true
-		-Dhardcoded_proprietary_webapps=true
-		$(meson_use udev gudev)
-		-Dapt=false
-		-Dsnap=false
-		-Dexternal_appstream=false
-		$(meson_use gtk-doc gtk_doc)
-		-Dhardcoded_curated=true
-		# TODO: Will this be beneficial to us with flatpak at least? If
-		# enabled, it shows some apps under installed (probably merely due to
-		# /usr/share/app-info presence), but launching and removal of them is
-		# broken
-		-Ddefault_featured_apps=false
-		-Dmogwai=false #TODO?
-		$(meson_feature sysprof)
-		-Dprofile=''
-		-Dsoup2=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-software/gnome-software-45.2.ebuild b/gnome-extra/gnome-software/gnome-software-46.2.ebuild
index 9951ed339e16..fc51a767d046 100644
--- a/gnome-extra/gnome-software/gnome-software-45.2.ebuild
+++ b/gnome-extra/gnome-software/gnome-software-46.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,25 +11,29 @@ HOMEPAGE="https://apps.gnome.org/Software"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~loong ~x86"
-IUSE="flatpak +firmware gnome gtk-doc sysprof udev test"
+IUSE="flatpak +firmware gnome gtk-doc sysprof udev snap test"
 
 RDEPEND="
 	>=dev-libs/appstream-0.14.0:0=
 	>=x11-libs/gdk-pixbuf-2.32.0:2
 	>=dev-libs/libxmlb-0.1.7:=
-	>=gui-libs/gtk-4.10.0:4
+	>=gui-libs/gtk-4.12.0:4
 	>=dev-libs/glib-2.70.0:2
 	>=dev-libs/json-glib-1.6.0
 	>=net-libs/libsoup-3.0:3.0
-	>=gui-libs/libadwaita-1.3_rc:1
+	>=gui-libs/libadwaita-1.4.0:1
 	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
 	gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 )
 	sys-auth/polkit
-	firmware? ( >=sys-apps/fwupd-1.5.6 )
+	firmware? ( >=sys-apps/fwupd-1.6.2 )
 	flatpak? (
 		>=sys-apps/flatpak-1.14.0-r1
 		dev-util/ostree
 	)
+	snap? (
+		app-containers/snapd
+		sys-libs/snapd-glib:=
+	)
 	udev? ( dev-libs/libgudev )
 	>=gnome-base/gsettings-desktop-schemas-3.11.5
 "
@@ -74,7 +78,7 @@ src_configure() {
 		-Dhardcoded_proprietary_webapps=true
 		$(meson_use udev gudev)
 		-Dapt=false
-		-Dsnap=false
+		$(meson_use snap)
 		-Dexternal_appstream=false
 		$(meson_use gtk-doc gtk_doc)
 		-Dhardcoded_curated=true
@@ -87,6 +91,7 @@ src_configure() {
 		$(meson_feature sysprof)
 		-Dprofile=''
 		-Dsoup2=false
+		-Dopensuse-distro-upgrade=false
 	)
 	meson_src_configure
 }
diff --git a/gnome-extra/gnome-software/metadata.xml b/gnome-extra/gnome-software/metadata.xml
index d5cbc23b3fc3..4b4d2f7bed41 100644
--- a/gnome-extra/gnome-software/metadata.xml
+++ b/gnome-extra/gnome-software/metadata.xml
@@ -8,6 +8,7 @@
   <use>
     <flag name="firmware">Enable firmware update support through <pkg>sys-apps/fwupd</pkg></flag>
     <flag name="flatpak">Enable support for flatpak applications using <pkg>sys-apps/flatpak</pkg></flag>
+    <flag name="snap">Enable support for snap packages using <pkg>app-containers/snapd</pkg></flag>
     <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
   </use>
   <upstream>