gentoo auto-resync : 19:09:2023 - 23:10:29

8 files changed, 76 insertions, 3 deletions

diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 86940ad02207..9d90c77a4d48 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/gnome-console/Manifest b/gui-apps/gnome-console/Manifest
index 1f303c7ad7bc..2f2b3a6167b8 100644
--- a/gui-apps/gnome-console/Manifest
+++ b/gui-apps/gnome-console/Manifest
@@ -1,5 +1,8 @@
+AUX gnome-console-45.0-depend-on-gtk-4.12.1.patch 634 BLAKE2B 20cd5b237a60263d916b685bab73e188d6f4b9526b0947d08ba1be0b7cbba637781a70a47962031c84f54ce77d6fe968e9cc69fc14e6ed2f44d83b75436b93ba SHA512 65637c774207a67f0c50e374557aae4dc241e82ff8370bddb5e3e759d113eca90117a7d6297378bc5667eec9f42a084cb30802b6c1c1399391c3049b54fb74d6
 DIST gnome-console-44.4.tar.xz 160504 BLAKE2B d139108cabe647bf3cda5e30141187f7f579364b26c057f538299b87c08e370ca8f2f5739e8f5abc43a0bdb751751a9576b0165d1099c850772d664643f2dae0 SHA512 3fbd7c16638e829103e2dc517df6d68c7acbaca24f7f2af4a4bfeb79ec79944a98432dbdc778ecefd74fded0a701be179c09af95d099dbad79484d907ab923c6
+DIST gnome-console-45.0.tar.xz 178444 BLAKE2B ca04c31657b19ab1651899c56ff64ffa6d3913935fa5564ba115d83ba6dec50d2b816a47064ab7538aaa07347ebcb1890cc7dcb6e29164f7a36a6e18985e874a SHA512 940f02b8e1b02a680d9c25de59f655243a033883b9e21a183bd40ebe09c1803d6fbbfb45223e9a4ae20401d65e80a2bf0ba28bc7971fe84889176be64062b8d0
 DIST gnome-console-45.beta.tar.xz 169364 BLAKE2B b0834ce6b1398a0635097e29650ccce8dd0dd814e2efa1cb3d45986269e5491c031ef9c47113919fc26e424b04d2065f8c260befc786d62dc7deee09ee12c0b3 SHA512 1c9c9e34c39084c3182c6b03cee159b8e2a99e75acefc2882074d41fc62580e27acc12293c69b06a2cdb7e800a63b10b629f63d20ba52ce4bb493c1e09ffdaa6
 EBUILD gnome-console-44.4.ebuild 943 BLAKE2B 740a38935ae37076687ff397937cd16f6a22e63804f46da39a970620ea09acdb360858d051547dac625e4c7712f89dc9b437a3b726aa3e985103d25fec2a38ee SHA512 c6f583e6cabfb9a0e9c5e14a688c9133feb4fbee210ca2e671af53c8e2925bba39fb2264f104ab918c9429bd52fe7cbf41310ab57d02f2f8145e4607176d344b
+EBUILD gnome-console-45.0.ebuild 1014 BLAKE2B bee4e5c174bb518e5a49ca1c8e8050f2a6cb61c68ca05a6ea7b8085cf54a80b08d4c061813040071bed3e5ac1a567a00dbaaa1631dc940e771b41bc35e3a0d4d SHA512 660485d692c44fd7da493d0b5d650200caac59aedf347a986960a2a0c3d87d8df6d8078f0c44845f1133dd68038e8396fa2f8c945fd7d0a143ec4e9be75ff0cc
 EBUILD gnome-console-45_beta.ebuild 949 BLAKE2B a7e2b0f6a30d390b0dfd1fba05d3a8a02c3e0109fb39119a6c0459c30b986d89e57f5b26a043ec5ad47a093eecebfe48e75a0e7b685d354e3fbd7a2e1d32b9cb SHA512 a6b49949d79f81332f700ebebf864bf2ddf522b007fff44ce138d645cd11c4a1369991c3d49b0977a0c83402a1e65f419bce9b731dc02540fbca582ef6635179
 MISC metadata.xml 348 BLAKE2B 7b68ba89d6cf52bd1ecc31913e6e7e12e4bcf842915293546df88c6dce5ad05d133f1299d4bbc46aef63e65dfa8a9046b3d4b34c1aee5f638918c85560439c01 SHA512 fe32610a9f3cff3b26785ef27b8544afc81c99149e6183fe0fc9516dfd61c30b93c6f57981b35b0882e7042687a011fb8e7f11b6c11b5b581816b97c637117e9
diff --git a/gui-apps/gnome-console/files/gnome-console-45.0-depend-on-gtk-4.12.1.patch b/gui-apps/gnome-console/files/gnome-console-45.0-depend-on-gtk-4.12.1.patch
new file mode 100644
index 000000000000..744f780b85fb
--- /dev/null
+++ b/gui-apps/gnome-console/files/gnome-console-45.0-depend-on-gtk-4.12.1.patch
@@ -0,0 +1,12 @@
+# Upstream is depending on unreleased gtk, reverting to 4.12.1
+--- a/meson.build	2023-09-18 21:52:43.000000000 -0300
++++ b/meson.build	2023-09-19 12:39:04.509999804 -0300
+@@ -125,7 +125,7 @@
+ gio_unix_dep = dependency('gio-unix-2.0', version: '>= 2.76')
+ adw_dep = dependency('libadwaita-1', version: '>= 1.4.alpha')
+ vte_dep = dependency('vte-2.91-gtk4', version: '>= 0.69.91')
+-gtk_dep = dependency('gtk4', version: '>= 4.12.2')
++gtk_dep = dependency('gtk4', version: '>= 4.12.1')
+ gtop_dep = dependency('libgtop-2.0')
+ pcre_dep = dependency('libpcre2-8', version: '>= 10.32')
+ schemas_dep = dependency('gsettings-desktop-schemas')
diff --git a/gui-apps/gnome-console/gnome-console-45.0.ebuild b/gui-apps/gnome-console/gnome-console-45.0.ebuild
new file mode 100644
index 000000000000..96db75306dff
--- /dev/null
+++ b/gui-apps/gnome-console/gnome-console-45.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="A simple user-friendly terminal emulator for the GNOME desktop"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/console"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.76:2
+	>=gui-libs/gtk-4.12.1:4
+	>=gui-libs/libadwaita-1.4_alpha:1
+	>=gui-libs/vte-0.70.0:2.91-gtk4
+	gnome-base/libgtop:2=
+	>=dev-libs/libpcre2-10.32:0=
+	gnome-base/gsettings-desktop-schemas
+
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-util/desktop-file-utils
+		dev-libs/appstream-glib
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-45.0-depend-on-gtk-4.12.1.patch )
+
+src_configure() {
+	local emesonargs=(
+		-Ddevel=false
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gui-apps/swaylock/Manifest b/gui-apps/swaylock/Manifest
index 520ed016f8db..88e11a17729f 100644
--- a/gui-apps/swaylock/Manifest
+++ b/gui-apps/swaylock/Manifest
@@ -1,6 +1,6 @@
 DIST swaylock-1.7.2.tar.gz 37368 BLAKE2B 146d73255a0d1439cf75ccb2fff528e47929718eaa75dc5a1567feeac59e65ebf674679e559dd634f375b5ca1bd44f6fe195f7362441b1979eaa222ba35812b8 SHA512 0593f7dfb258bd77796cb757e2e52d01829e0746306ce7991313a2982feead698c22753db53b00719ac1c82f6573563bcf5815f68c06680aa8ee6d419cac7549
 DIST swaylock-1.7.tar.gz 37149 BLAKE2B 7675b56a28ce932bd163cd41ce498295b61aff51d204c5323b187ddde9ea17f6ef1ac2777272fd92703e49f44b3f749645b4715a75ed54845590513e7dddd524 SHA512 44c5a4e482674caeb86da78e49d4593128a14adad2d6e46994f984b2b2b893416d6ceeb6b0b5746ad5594892e65c9dab9764bbe4bf617a90d92622a41b791ed0
-EBUILD swaylock-1.7.2.ebuild 1150 BLAKE2B a258661cef1b51adac80c3281259c96a48c66fc0344e01b73e31e01ba5903d127273cf6fd39ea8701b33821434b6ba2de6b8543fbd97e8636709cd7c07823ef4 SHA512 250362d66a7498bda6b69fa258cc0821e474314cd5b054396283740960459c95ffedca7ef45a07dc06394156f4cbd19d79f113b0a22f782267987fc1e1dbcba4
-EBUILD swaylock-1.7.ebuild 1146 BLAKE2B 26baf41bdeebc3dd71914d3b450e65112729fba691c07c801389f0ed0a56160a4b1fdac5932cce5ca593bb1a5a4146b6f8fe4f15e7c81927ec6865ade42ffa1c SHA512 dc1a5c50eb014af8d4c6e8212d240d527b30229ec99e921f087bf660fa4540d28d687e27ee2a01be73f4ee294904a12a495e110be35b672877e73a5b49c9a16a
-EBUILD swaylock-9999.ebuild 1150 BLAKE2B a258661cef1b51adac80c3281259c96a48c66fc0344e01b73e31e01ba5903d127273cf6fd39ea8701b33821434b6ba2de6b8543fbd97e8636709cd7c07823ef4 SHA512 250362d66a7498bda6b69fa258cc0821e474314cd5b054396283740960459c95ffedca7ef45a07dc06394156f4cbd19d79f113b0a22f782267987fc1e1dbcba4
+EBUILD swaylock-1.7.2.ebuild 1170 BLAKE2B 2c6d3d8d484ef4a79cbd9ddeb4fbfd1740b78bee65fdcbaf5d69d77337723ff09369ae942abe34c610abc264c467c2bd1e90141f393c969ec19d6cb4dd6e5712 SHA512 ee85b65f4fb05740cd137b42673b4b338fa9056557f31ff7000072e7905b586a26c3e48ea9ac1d02e814afb955565fe1dc3e114791e6f81c9115f3ed88b091be
+EBUILD swaylock-1.7.ebuild 1166 BLAKE2B 92ea949101a89f704935eba363f0dcf52dfab46c06c4483d62354b4ec8804e45b3c824f924014c379dff6a8debbf6442d6a51a9755f926e31b70034b4000a050 SHA512 46036c39bf893afa679e66d1f1e9c25eef51513a760215c8cec0ddcbfd570fbc73d17a46fbd59575a11d58bc0c7a50e9afec190add89566c5ef7e02192399645
+EBUILD swaylock-9999.ebuild 1170 BLAKE2B 2c6d3d8d484ef4a79cbd9ddeb4fbfd1740b78bee65fdcbaf5d69d77337723ff09369ae942abe34c610abc264c467c2bd1e90141f393c969ec19d6cb4dd6e5712 SHA512 ee85b65f4fb05740cd137b42673b4b338fa9056557f31ff7000072e7905b586a26c3e48ea9ac1d02e814afb955565fe1dc3e114791e6f81c9115f3ed88b091be
 MISC metadata.xml 1182 BLAKE2B 26d1cd8d48c9d3cd61c9c00838f5ca27f5794e8ad23177c99f14b80e7b5fb0238b361feecb7f24c871e653532bcc7ac6ad797f554151002cad43faba4f3f3963 SHA512 e3a00a1c6f35bb616b8934e0b841930f8efdc282096cacf0a615478444090d49ac4062b3d5b0cdf40ea22cc0a9835d403ef7716aefaed8cae8cfe508a99ff879
diff --git a/gui-apps/swaylock/swaylock-1.7.2.ebuild b/gui-apps/swaylock/swaylock-1.7.2.ebuild
index aeef41c319be..6351d0bbc4a6 100644
--- a/gui-apps/swaylock/swaylock-1.7.2.ebuild
+++ b/gui-apps/swaylock/swaylock-1.7.2.ebuild
@@ -24,6 +24,7 @@ DEPEND="
 	dev-libs/wayland
 	x11-libs/cairo
 	x11-libs/libxkbcommon
+	virtual/libcrypt:=
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
 	pam? ( sys-libs/pam )
 "
diff --git a/gui-apps/swaylock/swaylock-1.7.ebuild b/gui-apps/swaylock/swaylock-1.7.ebuild
index ee6f9f34b508..a4162dd9b5e7 100644
--- a/gui-apps/swaylock/swaylock-1.7.ebuild
+++ b/gui-apps/swaylock/swaylock-1.7.ebuild
@@ -24,6 +24,7 @@ DEPEND="
 	dev-libs/wayland
 	x11-libs/cairo
 	x11-libs/libxkbcommon
+	virtual/libcrypt:=
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
 	pam? ( sys-libs/pam )
 "
diff --git a/gui-apps/swaylock/swaylock-9999.ebuild b/gui-apps/swaylock/swaylock-9999.ebuild
index aeef41c319be..6351d0bbc4a6 100644
--- a/gui-apps/swaylock/swaylock-9999.ebuild
+++ b/gui-apps/swaylock/swaylock-9999.ebuild
@@ -24,6 +24,7 @@ DEPEND="
 	dev-libs/wayland
 	x11-libs/cairo
 	x11-libs/libxkbcommon
+	virtual/libcrypt:=
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
 	pam? ( sys-libs/pam )
 "