gentoo auto-resync : 01:09:2022 - 19:24:10

11 files changed, 84 insertions, 64 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index b8b1b7e86c0f..9ee92d79b512 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 81622f29cbc9..7bf0173069af 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,10 +1,12 @@
 AUX README.gentoo 494 BLAKE2B 8a92171cbc9e8a93cc5e73101bf478b27945e85f843ef244daea881f0aa061820645c425e52dd6a75adc0bd09c95126a059694bc7d5f6084e4f0222fc5e8ab85 SHA512 07e35ef0ac603b2b817c33fd2bc06b9b254a2e3fee16e7ec8fc0c86d27330c795b8d1eae660c42c414de4d721faea2cab1d41c5950ca7a1032d758626011ae3c
 AUX Xsession 1921 BLAKE2B 9127e95c28d2a22f6a1d5f2997edf5997315667d20522c7a8b839fe492d576e0e69cf280ce2fea1fb8d4df61e3b254a38782dbd3c78fdc4ef79924b224311306 SHA512 efa046db5445464e7deb3c5aa43b1a2e1abb7ec0537d4040567d4d9932f15b954866cdd9c3a2bd703de9d7818d4fccff76008426061bc97dc342f7805cb645c1
+AUX lightdm-1.30.0-musl-locale.patch 1479 BLAKE2B 9187e6837820f14be86cd302cd2e76e11bca1c3256289c9c8bcd63640203d71d1f09fe1c8a9b35f6e34176130bc885b805901df17fc90d6869f095da5cb9dad9 SHA512 effa56b8b4716d92c33c1e64755ff735de8899c9781259759c03ea81e8e9e751de63ff867346ec72a739661932cb99990a73371875477fb0230f19f1567bea44
+AUX lightdm-1.30.0-musl-updwtmpx.patch 950 BLAKE2B aaf6169707e0fd98e24b893c0b8602a1ccf982e7506f85e584b2623bb645eeb8c13b36cda1662085e01735e0472f6d279c02fe34b1b5cbea2b9e351f277898b2 SHA512 fe41980da22a0aac067ef1c0ef4a1cba8dc5523a0436b6f264f065bcf83264d2f900c0a0d71aae2f24ccd23a87e34b4015e350046253285f150be5b13df4c4bd
 AUX lightdm-autologin 157 BLAKE2B 54ce42f09f88c793e90f5f21743e17a0184227b83c11192e766d6f3c1020fe0dc4227da0eb8e404c8d67d6a5bcfe9b55075820fb911f1611347e99cd5c99493f SHA512 35bfeee42d2e4e34a42f5cd645c2b7aac801d8a8396b42ec7725179827ec8a52b3db106dcddaa100c3d5d6d19a2df5e462f121a18c848bd898dcce3e43fa791f
 AUX lightdm.service 279 BLAKE2B 92a9602d1d1c10fedfabd58b0794a68a278939d905f4d790ea9c2a0632abe8238a6187b3e01b4296a1187349864b30291853889ceaa519f5a12a98b2aecbb1ea SHA512 5b60788e35ebd7918b21ab52dc3f5cc29dd3aa45ddf6cfe75a72d1c541620f0438378a9bd681e2c151a465cf981e803b399f61b48ff5d0f2e1a3cc950c30d23a
 DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
 DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
 DIST lightdm-1.32.0.tar.xz 518168 BLAKE2B 90191559895a58e2c5892705ea95766aaaaa87d3470f1372ab90fcf3991d27f9280d5bbabe0cfce70e25f960d63c1e7eab7beeeb501341996afd155788cbe1c7 SHA512 81497fb25904bc2e8687dc99992628eb534f7418f72e1908c4766e917fc1221714210d998739417e1cae2ee15e3197a2eb8d4981cb944cfeb0334dc9e356e716
-EBUILD lightdm-1.30.0-r3.ebuild 4032 BLAKE2B ed5d0eb3806fd77814ba2fea76455a8d2bf0cea76532b76ab02245623d7614f2bdf9849b8747f3f961a2f3ead512f80b091e2d5875b2754c62a4cbc61678dee7 SHA512 c3dbbd3af45fb8e5f496c1635885f2e6e761760924be7950d55f4d0421fa3c0927b3d49867b78896fe859a8ab646eada1c2bd75558a3d6cdf9a4bd5e5615bbb1
-EBUILD lightdm-1.32.0.ebuild 3987 BLAKE2B c9dfbf09347b521b0a7f9d5378a8ceac41c33e93913057c40fbba2afadb323890b0bbdabbe28dbd4999cc9be89d2a9ed87ff38ae79cd4f0d34a8cfc9968f7434 SHA512 90ef88ba3997239cc687cd0d5d0042a7fb5db9fb88b13ca2ec74495cb8ba759bcf63bd09b25de04b775404758bb7dc3c47ce15d57fdfad3f26c732be4e162198
+EBUILD lightdm-1.30.0-r3.ebuild 4139 BLAKE2B bb436a18ccb2e229b57ec10be9524542fc81dae8034b802b00dee64b69f704723a9d79b270c2a46ac056edb837c47827c7fab9fe36efe78ce4015f0cda886d20 SHA512 c004da29823aa0dd3db06c22a0bb36548d6d25a593636cff79511c1972b695f1b7920e17f23f4a7b911b7bfd45e0bc1cfea81986bf7d92c463536ca3549740f7
+EBUILD lightdm-1.32.0.ebuild 4094 BLAKE2B bf75edebcf6b8da393be5d4aaa50c6768d792c1a4431d1e80b7e81f606d1df47baec7c2a58af713997b10f6145db826d404dd26141c6b81fa6a8f23876d86f2f SHA512 4ca285fb16cc7b7d5c496f2994fbcb23e46953e65ddfd699016bafe144cc5904817fcf4356192413f6b6e0253e1bddc232d56e13aea478b8a36fb867db296594
 MISC metadata.xml 454 BLAKE2B 66c069f7c5e3b820059e67736ebd898389a8243bce08fd364c8d0a1704f484a13a935bc2a7a31ad975535f8df5a091cbc337c48ea65f45a1cebdcb2c0888b8dc SHA512 f5e5c7467eef552ac808daa8289f803438fc72c81028b48cb20f4f18ff2462216520312294eeff8fffc1357a4330e1e264da70dd35ef3c20baff2c5c26bc654e
diff --git a/x11-misc/lightdm/files/lightdm-1.30.0-musl-locale.patch b/x11-misc/lightdm/files/lightdm-1.30.0-musl-locale.patch
new file mode 100644
index 000000000000..46c65d79f764
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm-1.30.0-musl-locale.patch
@@ -0,0 +1,42 @@
+https://github.com/canonical/lightdm/pull/261
+
+# Fix LC_IDENTIFICATION undeclared on musl or other libc that doesn't have it defined
+# Patch is taken from Alpine linux [1]
+# [1]: https://git.alpinelinux.org/aports/tree/community/lightdm/musl-language.patch
+# Closes: https://bugs.gentoo.org/766866
+diff --git a/liblightdm-gobject/language.c b/liblightdm-gobject/language.c
+index 3d4fa96..e38f5ce 100644
+--- a/liblightdm-gobject/language.c
++++ b/liblightdm-gobject/language.c
+@@ -210,6 +210,7 @@ lightdm_language_get_name (LightDMLanguage *language)
+
+     if (!priv->name)
+     {
++#if HAVE_LC_IDENTIFICATION
+         g_autofree gchar *locale = get_locale_name (priv->code);
+         if (locale)
+         {
+@@ -223,6 +224,7 @@ lightdm_language_get_name (LightDMLanguage *language)
+
+             setlocale (LC_ALL, current);
+         }
++#endif
+         if (!priv->name)
+         {
+             g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 2);
+@@ -250,6 +252,7 @@ lightdm_language_get_territory (LightDMLanguage *language)
+
+     if (!priv->territory && strchr (priv->code, '_'))
+     {
++#if HAVE_LC_IDENTIFICATION
+         g_autofree gchar *locale = get_locale_name (priv->code);
+         if (locale)
+         {
+@@ -263,6 +266,7 @@ lightdm_language_get_territory (LightDMLanguage *language)
+
+             setlocale (LC_ALL, current);
+         }
++#endif
+         if (!priv->territory)
+         {
+             g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 3);
diff --git a/x11-misc/lightdm/files/lightdm-1.30.0-musl-updwtmpx.patch b/x11-misc/lightdm/files/lightdm-1.30.0-musl-updwtmpx.patch
new file mode 100644
index 000000000000..0df9bd4f051e
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm-1.30.0-musl-updwtmpx.patch
@@ -0,0 +1,26 @@
+https://github.com/canonical/lightdm/pull/261
+
+# A little bit modified version of Alpine linux patch [1]. On musl the default
+# implementation of updwtmpx will give conflicting types error and build will
+# fail. This patch should fix that. This issue is noticed together with bug
+# 766866 [2].
+# [1]: https://git.alpinelinux.org/aports/tree/community/lightdm/musl-updwtmpx.patch
+# [2]: https://bugs.gentoo.org/766866
+diff --git a/src/session-child.c b/src/session-child.c
+index eef51e4..0052904 100644
+--- a/src/session-child.c
++++ b/src/session-child.c
+@@ -193,8 +193,13 @@ read_xauth (void)
+ }
+
+ /* GNU provides this but we can't rely on that so let's make our own version */
++#if defined(__GLIBC__)
+ static void
+ updwtmpx (const gchar *wtmp_file, struct utmpx *ut)
++#else // use this version in libc's other than glibc
++void
++updwtmpx (const char *wtmp_file, const struct utmpx *ut)
++#endif
+ {
+     struct utmp u;
+     memset (&u, 0, sizeof (u));
diff --git a/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild b/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild
index 2c0883c92e03..5f23bb293fae 100644
--- a/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild
+++ b/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild
@@ -51,6 +51,11 @@ DOCS=( NEWS )
 RESTRICT="test"
 REQUIRED_USE="vala? ( introspection )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.30.0-musl-locale.patch
+	"${FILESDIR}"/${PN}-1.30.0-musl-updwtmpx.patch
+)
+
 pkg_setup() {
 	export LIGHTDM_USER=${LIGHTDM_USER:-lightdm}
 }
diff --git a/x11-misc/lightdm/lightdm-1.32.0.ebuild b/x11-misc/lightdm/lightdm-1.32.0.ebuild
index 48f403d1bc88..9c50443b7a3c 100644
--- a/x11-misc/lightdm/lightdm-1.32.0.ebuild
+++ b/x11-misc/lightdm/lightdm-1.32.0.ebuild
@@ -51,6 +51,11 @@ DOCS=( NEWS )
 RESTRICT="test"
 REQUIRED_USE="vala? ( introspection )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.30.0-musl-locale.patch
+	"${FILESDIR}"/${PN}-1.30.0-musl-updwtmpx.patch
+)
+
 pkg_setup() {
 	export LIGHTDM_USER=${LIGHTDM_USER:-lightdm}
 	vala_setup
diff --git a/x11-misc/xbindkeys/Manifest b/x11-misc/xbindkeys/Manifest
index 3e28a68b4adc..76d11a52a136 100644
--- a/x11-misc/xbindkeys/Manifest
+++ b/x11-misc/xbindkeys/Manifest
@@ -1,6 +1,3 @@
-AUX xbindkeys-apply-mask-on-release-event-status.patch 986 BLAKE2B fb8cd2b05f2be572e558d36540d1c4dd9bda2d92620a48dde328edeb8bc568537b28e52f9afbede970c726f74f2ee196aea8979b8caf34a579e72b650b2995fc SHA512 6a0fa8fff688074a9c7e635d450412c4734944439f0603d38017c532a454ba971b78c05bae3bcd49f96f64d5238e6114770c66aaae5a10d9eaac08de9c31e95c
-DIST xbindkeys-1.8.6.tar.gz 151941 BLAKE2B f5eafb8f3655cbfa1ae7d7c5ed0bcdac97d4105df8df7a0aeecc267e08fbae8297713fc14c3e36871493e23959b624d5a88ba45cbef715a79df7de1f0927152f SHA512 3c77541eae9f87d2020c2272984c221094276dae2a8690c5cec9fe1b23c0139229b8f56876170da70684aeaa128642349b6835c375d473186cbf8123517173ba
 DIST xbindkeys-1.8.7.tar.gz 177532 BLAKE2B 9ff6c9cd10bb6f2bf96a288482edb50e6671c9e4e3b5c136bdfaa92796f9e9bcfc42ab69ca3546c3871bdcdba1e952631cbd3d288dce9738986c20680e91c316 SHA512 a6b1478e8ef4bedc686fdd15abc11a8a592ac17c69e1a5a13f60e735e9be9646faed62e980cdac4aa7bc7e3253237465de38dee98935dd3f9911d4e48209b2e9
-EBUILD xbindkeys-1.8.6-r1.ebuild 701 BLAKE2B 1b72bc9693648a4eee6c6233b5ae8505f73fd3181c73436f77a8ba6a7797643e56fc34ebc6b23bedaf7011163616ad3c837d94a4b7f77c5141720fe34d4c701c SHA512 c9e3d967375a19566a3c89407105faaf2f28d85113c0c61f91a1f91c2f25f682ed3743e99c9913e6a4e2bfc675171a5858291a0a681a26caa9b68eaa8fa6c7bb
 EBUILD xbindkeys-1.8.7-r2.ebuild 828 BLAKE2B 0ad6705c71fc3000388f78769440a77edf1af70265bff54f91d3bafc84807fa3ebd1cde5aa3f4a017d29a44a706e9c860cf77821b62b68d16af2d704af63e91b SHA512 9c6ebc52c70e99219e23fc7d96a58bcdae2abe2d6af3ba4ae62b00ad30fe66ce14392731538e5ceb2dd5062bfec1d9e1a7a4d0852be09fbdf6b04882b24d149c
 MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/x11-misc/xbindkeys/files/xbindkeys-apply-mask-on-release-event-status.patch b/x11-misc/xbindkeys/files/xbindkeys-apply-mask-on-release-event-status.patch
deleted file mode 100644
index 427983e2d12b..000000000000
--- a/x11-misc/xbindkeys/files/xbindkeys-apply-mask-on-release-event-status.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit ceb7093f8d77cf5952e8e7778db02a6f3e8d8872
-Author: Alberto <address@hidden>
-Date:   Mon Feb 10 09:21:57 2014 +0200
-
-    fix keyboard layout problems
-
-diff --git a/xbindkeys.c b/xbindkeys.c
-index b0adef9..162e47e 100644
---- a/xbindkeys.c
-+++ b/xbindkeys.c
-@@ -377,7 +377,7 @@ event_loop (Display * d)
- 	      printf ("e.xbutton.state=%d\n", e.xbutton.state);
- 	    }
- 
--	  e.xbutton.state &= ~(numlock_mask | capslock_mask | scrolllock_mask
-+	  e.xbutton.state &= 0x1FFF && ~(numlock_mask | capslock_mask | scrolllock_mask
- 			       | Button1Mask | Button2Mask | Button3Mask
- 			       | Button4Mask | Button5Mask);
- 
-@@ -409,7 +409,7 @@ event_loop (Display * d)
- 	      printf ("e.xbutton.state=%d\n", e.xbutton.state);
- 	    }
- 
--	  e.xbutton.state &= ~(numlock_mask | capslock_mask | scrolllock_mask
-+	  e.xbutton.state &= 0x1FFF && ~(numlock_mask | capslock_mask | scrolllock_mask
- 			       | Button1Mask | Button2Mask | Button3Mask
- 			       | Button4Mask | Button5Mask);
- 
diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.6-r1.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.6-r1.ebuild
deleted file mode 100644
index ff72ad31364c..000000000000
--- a/x11-misc/xbindkeys/xbindkeys-1.8.6-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Tool for launching commands on keystrokes"
-SRC_URI="https://www.nongnu.org/${PN}/${P}.tar.gz"
-HOMEPAGE="https://www.nongnu.org/xbindkeys/xbindkeys.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="guile tk"
-
-RDEPEND="x11-libs/libX11
-	guile? ( >=dev-scheme/guile-1.8.4[deprecated] )
-	tk? ( dev-lang/tk )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-apply-mask-on-release-event-status.patch"
-)
-
-src_configure() {
-	econf \
-		$(use_enable tk) \
-		$(use_enable guile)
-}
diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
index 743f5f2197ab..66d23f384e5b 100644
--- a/x11-misc/xmobar/Manifest
+++ b/x11-misc/xmobar/Manifest
@@ -1,3 +1,3 @@
 DIST xmobar-0.44.1.tar.gz 156756 BLAKE2B bee81627744146989b402ae04d36edb5e4a69686b546457afebad81cda96ece4ce0ace8a2855bd5136610be3fc396c2f62121ea062fffb1ad837145cf3238fdb SHA512 e04f3f9f40ffa4095df2b523916686d93d28b4cbb880f7732cf63d6f1915e721043764b9d723ed8b3c4938c3df749d0e5a9ddb9a9e64a2a015f8f0d6b3f46c97
-EBUILD xmobar-0.44.1.ebuild 3823 BLAKE2B 5990fba3338810d3ebd4c0d47678a927b4c6ae1b426690130fc09b240d492f153c3c224bbd00da522dcec06a9cd5711f5b8962e2d2d612d0e7fdc294cde49c88 SHA512 9365d27d276ed4b06565778b1b6b707a0f73d0ee71b64f2719a168846fda184e5504d46892e5f6cfeb5879438364b64d4dbf110b91ca5b173767b1a32ee99331
+EBUILD xmobar-0.44.1.ebuild 3830 BLAKE2B 5a9d70e735998c2b63a2aaad10b3a6e57a1e609d7b809b33a2fc8c8b8de6ace1d6c1ea7b616f9a77b688eb692722847265215e91ee2223183e7eb2fcab9e12de SHA512 0774886861830f11c5098e20373feaf2c79e5eddc32f241822a55b530440e5f6df3edff1dc1ea8bc5a06c75a50ae217d79d40833c4b60ecd1b19189b2e177b51
 MISC metadata.xml 1060 BLAKE2B ca04a6c33985ddc558cd68be42c3042c0e87928251ceb681a97b6533e23c6f8d1d2af82355b4fac9af70d2276c2e7cb40e3bf5867f47ad27ca109f5f74b3eb6b SHA512 c875c4b26a7c4c88f7e5d5c3610c90fe100f98e9b018ba649f60e7d68a9bb71d94c1bdf8ddaf703326f11ebccafff5a480ab2976fc7048decae771cd0b44fa57
diff --git a/x11-misc/xmobar/xmobar-0.44.1.ebuild b/x11-misc/xmobar/xmobar-0.44.1.ebuild
index 8d0b3c15b0d0..d09d7919119c 100644
--- a/x11-misc/xmobar/xmobar-0.44.1.ebuild
+++ b/x11-misc/xmobar/xmobar-0.44.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="alsa dbus mpd mpris +rtsopts timezone uvmeter +weather wifi xft xpm"
 
 RDEPEND=">=dev-haskell/aeson-1.4.7.1:=[profile?]