gentoo auto-resync : 28:04:2024 - 23:59:44

3 files changed, 18 insertions, 33 deletions

diff --git a/sys-libs/snapd-glib/Manifest b/sys-libs/snapd-glib/Manifest
index a48588dc6a61..3677379d7147 100644
--- a/sys-libs/snapd-glib/Manifest
+++ b/sys-libs/snapd-glib/Manifest
@@ -1,8 +1,7 @@
 AUX snapd-glib-1.65-install-missing-header.patch 372 BLAKE2B b2cd1bc66ff14d3adfb62f15f69b85e5be5c8f658835ac657ef7645d4256876f2fd7d6ae760c7b6fc25dd714f6e4cc497bbabd5445ca253101c351aac8170977 SHA512 7c2afe6558afbf94ce208eb0367f6e9f499f4f409555ba2357b7ab2af53c1b04a42fd1925cfef1c6701ac205d1696f5dad68fb009ce31008d7229e31e957287b
 DIST snapd-glib-1.63.tar.xz 187676 BLAKE2B a212f826ee35ef5458b716ce64d8f4b32474f991938bc314fcdb0feb5c803f93880a517fe5e1550bc82bc4992bee7467dc0d8cf5cb260712e83b8a1fe6b75743 SHA512 94a2f46e4e066270ea5492cb00fd44da247686a354cbe6766fe3e8974e6bb51f4cf1ca95027533417ec8c8117fc9d3866cb173a113b89d789b6ba518489a314f
-DIST snapd-glib-1.64.tar.xz 195580 BLAKE2B 1c6e958033c2b98dd72b5bfb6f1a44739a79d5d9a289fded9756cf3031a1fe62cccbf3ba4ce4c4f34d3c7e48b945b481ff6c3ae245d205a49e37845dd3efbb27 SHA512 a3fa101bcc64b750c170ccd433dbbfaa306354dc6c66d5ab62911c866b7e65f6aefc7e9c82f84f5d16b8b96174edf4bef771a4839ef6e5acd15399a84b93aec4
 DIST snapd-glib-1.65.tar.xz 205948 BLAKE2B e5253cd6f8ac908236a89bf8fa3ec2252d2e4bb0875c6860b63808663d80d59d0a5397a5170ac959492e720e1c8fe77d9674a6469cc58556073cf93888da9a8b SHA512 6bae381c6b5a83312004026228ee76e7b8722a5a561c991ceda35aaf104eaf84451f5a7ba299cad6b1f82e3dbcb16cc4780ac393cadb2ca58478b59a809fc613
 EBUILD snapd-glib-1.63.ebuild 1149 BLAKE2B dd24a67001aad8070a2d59d74b7c6631f81f887d098379a59cbd8cbca79fec6af48e72494f44d382d195b889df4734216eb1a99a7d38a070d3f08a9d2c0c0ee1 SHA512 6767b4e61361089372012b35c8cfc57bf622b66d2a0a52fdffbacd81bdc3704696a69676dddda2d029c8ce8fc1988d2646be249e09e8a72d9bd847407063ab08
-EBUILD snapd-glib-1.64.ebuild 1150 BLAKE2B d766bca4abdb1fc8913e483159e6831e060a148bdc51ae60144072671b83b27ea6be416f0fec150bf148742f570a0d70d817b0fbfc3bb9d440e4ce20a6437031 SHA512 b883fd6d734203d4ed35f1c9a98331236f7d74ffacb77d20985f114a63eb73f9f91ca9aba8da4784782bb62b9393668e5dcf56cd34cb861ef64e6fffd53cbb57
-EBUILD snapd-glib-1.65-r1.ebuild 1570 BLAKE2B 56dc163a4e4f591e99a21c5fdb4647627d1840df0d12df5c4bc9da0f8fc56889119ec32cf77c729fca362b23a1b68a5d06ea231f033bc030f685787608e71890 SHA512 5b937d97cb209fa87996aa0858d38f3edb042641de26167c5e0451660917ac1b485c6b2aafe943cf8d139055e46c2ebfb87c90cb789f4305748ae9778de89ecc
+EBUILD snapd-glib-1.65-r102.ebuild 1254 BLAKE2B a252fdbd88b007e7fb3acb2050d1bba6e7e14a3a037395ba77a446b3c23bda23c010bb7e4810a5cddc409343732e1b46d53d0934eaa8563ed8b12294f8b7ab25 SHA512 861e6fa507d58f6132fb0975dce2727c01b63b74b1f5130d3f4dfbc98d4c0e2f1089f562b3ae61d2da95e31f12f86af15cdbd146fa59704c51ddbc3bb4e69f76
+EBUILD snapd-glib-1.65-r2.ebuild 1276 BLAKE2B c485f68cfba4a389569abf763a6e43007a24096aea45f9d4aaf2ed4d859f9f279cfff811d44942689eb39192271e67a82ebd19346fc2db2e96b3cec51600cdbb SHA512 02499703bf964b59fdfe670ccaf0c854212fe38b36569d93037155b0a1c3b7957ee6d0ca7cf87dc090364eeb98c3db77c241d4b4e0b0ee9842165a8ad6068477
 MISC metadata.xml 406 BLAKE2B ee1d1cdc33311cea7a3bcc4288fb8ec0148327eaa6fc59fd7c18ff3b34d9624a9e42a85f47254205a3d078651012d52ddc5f2dbf693f0250afc4194e389ba4be SHA512 1331657e9efe50b9901b2acc60694edf2c9f518a37f2a0d346969b78ceffe75d88a0503bb43fdac9a75eb81706440d99d8ce3eb6b9b112163438474b823338e1
diff --git a/sys-libs/snapd-glib/snapd-glib-1.65-r1.ebuild b/sys-libs/snapd-glib/snapd-glib-1.65-r102.ebuild
index 558bca6c7442..4a9410b58007 100644
--- a/sys-libs/snapd-glib/snapd-glib-1.65-r1.ebuild
+++ b/sys-libs/snapd-glib/snapd-glib-1.65-r102.ebuild
@@ -13,16 +13,15 @@ LICENSE="LGPL-3"
 SLOT="0/1"
 KEYWORDS="~amd64"
 
-IUSE="doc introspection qml qt5 qt6 vala"
+IUSE="doc introspection qml qt6 vala"
 REQUIRED_USE="
-	qml? ( || ( qt5 qt6 ) )
+	qml? ( qt6 )
 	vala? ( introspection )
 "
 
 BDEPEND="
 	virtual/pkgconfig
 	sys-devel/gettext
-	qt5? ( dev-qt/linguist-tools:5 )
 	qt6? ( dev-qt/qttools:6[linguist] )
 "
 
@@ -34,14 +33,8 @@ DEPEND="
 	doc? ( dev-util/gtk-doc )
 	introspection? ( dev-libs/gobject-introspection )
 	qml? (
-		qt5? ( dev-qt/qtdeclarative:5 )
 		qt6? ( dev-qt/qtdeclarative:6 )
 	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-	)
 	qt6? (
 		dev-qt/qtbase:6[network,widgets]
 	)
@@ -66,26 +59,11 @@ src_configure() {
 		"$(meson_use doc docs)"
 		"$(meson_use introspection)"
 		"$(meson_use qml qml-bindings)"
+		"$(meson_use qt6)"
 		"$(meson_use vala vala-bindings)"
 		-Dsoup2=false
+		-Dqt5=false
 	)
 
-	if use qt5; then
-		emesonargs+=(
-			-Dqt5=true
-			-Dqt6=false
-		)
-	elif use qt6; then
-		emesonargs+=(
-			-Dqt5=false
-			-Dqt6=true
-		)
-	else
-		emesonargs+=(
-			-Dqt5=false
-			-Dqt6=false
-		)
-	fi
-
 	meson_src_configure
 }
diff --git a/sys-libs/snapd-glib/snapd-glib-1.64.ebuild b/sys-libs/snapd-glib/snapd-glib-1.65-r2.ebuild
index 8728ba207b25..be44bfbc7a6a 100644
--- a/sys-libs/snapd-glib/snapd-glib-1.64.ebuild
+++ b/sys-libs/snapd-glib/snapd-glib-1.65-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,12 +32,14 @@ DEPEND="
 	net-libs/libsoup:3.0
 	doc? ( dev-util/gtk-doc )
 	introspection? ( dev-libs/gobject-introspection )
-	qml? ( dev-qt/qtdeclarative:5 )
+	qml? (
+		qt5? ( dev-qt/qtdeclarative:5 )
+	)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtnetwork:5
 		dev-qt/qtwidgets:5
-		)
+	)
 	vala? ( $(vala_depend) )
 "
 
@@ -45,6 +47,11 @@ RDEPEND="${DEPEND}
 	app-containers/snapd
 "
 
+PATCHES=(
+	# https://github.com/snapcore/snapd-glib/pull/152
+	"${FILESDIR}/${P}-install-missing-header.patch"
+)
+
 pkg_setup() {
 	vala_setup
 }
@@ -54,9 +61,10 @@ src_configure() {
 		"$(meson_use doc docs)"
 		"$(meson_use introspection)"
 		"$(meson_use qml qml-bindings)"
-		"$(meson_use qt5 qt-bindings)"
+		"$(meson_use qt5)"
 		"$(meson_use vala vala-bindings)"
 		-Dsoup2=false
+		-Dqt6=false
 	)
 
 	meson_src_configure