summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/Manifest.gzbin51331 -> 51173 bytes
-rw-r--r--sys-apps/mouseemu/Manifest6
-rw-r--r--sys-apps/mouseemu/files/mouseemu-0.13-fix.patch14
-rw-r--r--sys-apps/mouseemu/files/mouseemu-0.15-build.patch9
-rw-r--r--sys-apps/mouseemu/files/mouseemu-0.15-openrc.patch8
-rw-r--r--sys-apps/mouseemu/metadata.xml8
-rw-r--r--sys-apps/mouseemu/mouseemu-0.15.ebuild40
-rw-r--r--sys-apps/ripgrep-all/Manifest2
-rw-r--r--sys-apps/ripgrep-all/ripgrep-all-0.10.6.ebuild2
-rw-r--r--sys-apps/systemd-utils/Manifest9
-rw-r--r--sys-apps/systemd-utils/files/musl-efi-wchar.patch29
-rw-r--r--sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild4
-rw-r--r--sys-apps/systemd-utils/systemd-utils-254.12.ebuild4
-rw-r--r--sys-apps/systemd-utils/systemd-utils-254.13.ebuild4
-rw-r--r--sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild (renamed from sys-apps/systemd-utils/systemd-utils-255.7.ebuild)12
15 files changed, 46 insertions, 105 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 20f05fe85401..bf793210bd29 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/mouseemu/Manifest b/sys-apps/mouseemu/Manifest
deleted file mode 100644
index 83580e053e47..000000000000
--- a/sys-apps/mouseemu/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX mouseemu-0.13-fix.patch 707 BLAKE2B 6c0eaf3573d856899a43cd435d2c8f59434ab927f2e0c297d6db1da2bf16134344b59ffa2d9c0a61e245f02827a43a159346fef5f2a597e6de8706c2f41af830 SHA512 dfcd90a8e300d98e85ccb16455989a2a8e31f9b782887834e5ab3491391f0a681571f438e808860e095639e95fef4fbfc7f8d1c0edccd4b7b5d9bc915facfc87
-AUX mouseemu-0.15-build.patch 191 BLAKE2B 419963f29c2513906d0ef5f766fe2142e875684055a03726a9e4cb49f3ef39404e92cd7bcb8dd022fd355e22c8da09da1f081ddfab3effbe9beaa83d138c0acf SHA512 e0c55d7b77b18bfadd0b060d9fb6dd534e0fdf3cbcf5768262d8bdb8c26c0beb976c2c000bdf6cb9b26781dfb0e3dd5bb99cd005e34e49cfb0147ab4b19800e9
-AUX mouseemu-0.15-openrc.patch 228 BLAKE2B a05e7fdfb812f800b1c372fbf1d2f27d6eae5f476ae4fe39baee92208220d85e383c407e65f7d4d62aaa2385db2c5b5e9f49523844a6bfe9d15e00fef05ffadf SHA512 e26a9749c777852eb1a0feb5c15f6ed64635f40264e6065b4e9a7fb450db53357132e08b522724ae63735720d24fe92431f9a31d9b5ae2023783fc45f882269a
-DIST mouseemu-0.15.tar.gz 13958 BLAKE2B 2e27a901309897a208875ab737843ffbe2f733a21daa9bcf0a6c45aea0403898edc4f1aaef7c3fc0243627e09101ec73672b937b4f5fdf3ff25a0b4c6520e30e SHA512 7a6cbb0526a9ca51632d589bf873adb182c02f4a666cf9e94cedba9499d6c6cc1ad2ac7e5a482d22949e64ad69f04f444cb0fa78ea728c5653989d150f62918b
-EBUILD mouseemu-0.15.ebuild 985 BLAKE2B 9e47f537c0d12a8b28d5a8b7b112597fd778f632d4adbdcd5bcff437d0f52bed1d0757d1c6a3bb216aa63d3c5b205916cc233b6e0934cdabe61826f0713a9f52 SHA512 b2b1e40fda25c1d85d2f771da7de49ee0b759ab790e17875aabbf13d32b45e853600505f71baa5727b2fb97c0dd9ae1a876b3bcac503f5a38466013d1aa2fdb9
-MISC metadata.xml 253 BLAKE2B 18a71a745b5c3bf672066dbbe1d32903637c63f01f7ab9aff20832f6318529302405a48f7102d59ca51ccba0a38b16ba3cf023a80952918ed25f25fa4a57eb04 SHA512 f8767779e37fabd3617e7fdb023433cdf31f3be3e54f6a5ac86bc7c00a1310f46eae4a954aa43069539399360e2cadb22edb0561dc76b955f9fb28ba0b8cde94
diff --git a/sys-apps/mouseemu/files/mouseemu-0.13-fix.patch b/sys-apps/mouseemu/files/mouseemu-0.13-fix.patch
deleted file mode 100644
index f4d0aa981762..000000000000
--- a/sys-apps/mouseemu/files/mouseemu-0.13-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur ../mouseemu.orig/mouseemu.conf ./mouseemu.conf
---- ../mouseemu.orig/mouseemu.conf 1970-01-01 01:00:00.000000000 +0100
-+++ ./mouseemu.conf 2005-02-14 09:10:30.236462888 +0100
-@@ -0,0 +1,10 @@
-+# Mouseemu Configuration File
-+# Each uncommented line is read by the mouseemu initscript
-+# (/etc/init.d/mouseemu). If you use mouseemu without the
-+# initscript, source this file in your .bashrc/.cshrc/.zshrc
-+# Keycodes can be found using the "showkey" program.
-+
-+#MID_CLICK="-middle 0 68" # F10 with no modifier
-+#RIGHT_CLICK="-right 0 87" # F11 with no modifier
-+#SCROLL="-scroll 56" # Alt key
-+#TYPING_BLOCK="-typing-block 300" # block mouse for 300ms after a keypress
diff --git a/sys-apps/mouseemu/files/mouseemu-0.15-build.patch b/sys-apps/mouseemu/files/mouseemu-0.15-build.patch
deleted file mode 100644
index ad4deae7bf22..000000000000
--- a/sys-apps/mouseemu/files/mouseemu-0.15-build.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,5 +1,5 @@
- all:
-- gcc -Wall -g -o mouseemu mouseemu.c
-+ gcc -Wall $(CFLAGS) $(LDFLAGS) -o mouseemu mouseemu.c
- clean:
- rm -f *.o core* mouseemu
- install:
diff --git a/sys-apps/mouseemu/files/mouseemu-0.15-openrc.patch b/sys-apps/mouseemu/files/mouseemu-0.15-openrc.patch
deleted file mode 100644
index fdd7e4578633..000000000000
--- a/sys-apps/mouseemu/files/mouseemu-0.15-openrc.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/mouseemu.init.gentoo
-+++ b/mouseemu.init.gentoo
-@@ -1,4 +1,4 @@
--#!/sbin/runscript
-+#!/sbin/openrc-run
- # Copyright 1999-2004 Gentoo Technologies, Inc.
- # Distributed under the terms of the GNU General Public License v2
-
diff --git a/sys-apps/mouseemu/metadata.xml b/sys-apps/mouseemu/metadata.xml
deleted file mode 100644
index 675be6dd398c..000000000000
--- a/sys-apps/mouseemu/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>ppc@gentoo.org</email>
- <name>PowerPC architecture team</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-apps/mouseemu/mouseemu-0.15.ebuild b/sys-apps/mouseemu/mouseemu-0.15.ebuild
deleted file mode 100644
index 5e0d1d31274a..000000000000
--- a/sys-apps/mouseemu/mouseemu-0.15.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Emulates scrollwheel, right- & left-click for one-button mice/touchpads"
-HOMEPAGE="http://geekounet.org/powerbook/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/${PN}
-PATCHES=(
- "${FILESDIR}"/${PN}-0.13-fix.patch
- "${FILESDIR}"/${PN}-0.15-build.patch
- "${FILESDIR}"/${PN}-0.15-openrc.patch
-)
-
-src_install() {
- dosbin mouseemu
- einstalldocs
-
- newinitd mouseemu.init.gentoo mouseemu
- insinto /etc
- doins mouseemu.conf
-}
-
-pkg_postinst() {
- einfo "For mouseemu to work you need uinput support in your kernel:"
- einfo " CONFIG_INPUT_UINPUT=y"
- einfo "(Device Drivers->Input device support->Misc->User level driver support)"
- einfo "Don't forget to add mouseemu to your default runlevel:"
- einfo " rc-update add mouseemu default"
- einfo "Configuration is in /etc/mouseemu.conf."
-}
diff --git a/sys-apps/ripgrep-all/Manifest b/sys-apps/ripgrep-all/Manifest
index 65116098ec41..91b900aa2cfc 100644
--- a/sys-apps/ripgrep-all/Manifest
+++ b/sys-apps/ripgrep-all/Manifest
@@ -384,6 +384,6 @@ DIST zstd-safe-5.0.2+zstd.1.5.2.crate 17273 BLAKE2B 74dc561046f9bc595c58b62bc6ff
DIST zstd-safe-7.0.0.crate 20463 BLAKE2B 8c4cb034d1a12ae54abeeb8f12101f09ef82115ec26630103e7fad29ce1d0045e59dbd8ae301dbe8f47c90515ab9575288137ced98aea667a9cdd7ad0e2a6234 SHA512 2f0d66c874f7880d05fce39f4bdec5e217e8e18b44bfe97b4ea33c7d5c8719c5bd9615f7274f0b19734a465eb2477993fb8ae8d60abc7da36eac361e8fc4a437
DIST zstd-sys-1.4.15+zstd.1.4.4.crate 2014730 BLAKE2B ac978e2103688671f1dccb30da144a144e76a5aa054aca4a46e9fa18070e432e0498cf36d6e6294b21b1f4d30fca46a3c1df2eed5841674ce81f2d90b4021391 SHA512 523eb1f4183deca8be3cb018e43b9e51f1910b9e04b42795fb23e036c6f13e2b81ac70ea11837200dc3061622562d360499ed3b939fd8ff23c486fbcc35ec779
DIST zstd-sys-2.0.9+zstd.1.5.5.crate 728791 BLAKE2B f08f8730d9cc1efc5520f223e9bfb0854b3a67a2907e47c38e0572d8eca688c1bae61560e11e664834dbff1bed3d40608b23d08f102ce6cd7f1af72b48446e4c SHA512 604c01eae4975745aca1dc1d351db98fec34f7036143e59dfeb4d36e6ee18ac9f3871a288557c8ebdc9e816967a008da43154dc9a0eb3cac85071ccb05bf58aa
-EBUILD ripgrep-all-0.10.6.ebuild 5771 BLAKE2B c0b2e40acb18e7296d9ca52aaf4f205e01ea91f568f6dddaed2547067c3aa8cbde5e8a9871e12576da4e59237937ff984e676203099d803e9de17017a0a19e49 SHA512 6f431de9c66e2997ab337f3ed4e843b024b18ef4ec9cdfb0d90ca42c7d0ec3da8eed4bdae647c23e1cd83e7369bac948064d591596f228544a6f09bcdd195e5a
+EBUILD ripgrep-all-0.10.6.ebuild 5770 BLAKE2B 50e9da40ae5400e36c873d68919d9fd787628325c5cded860b0c7814e392fb88f4aca20c04f360ee0e977453f547c1d01f46ae0d5142f2d762f05128751787c1 SHA512 79207ae952b400465a758ab29a8b32ab7f74655190bbe11379f0bc838fe3c6b8cc44917e8eba2e41d25e3ed3046ab94d96706d924137485c7ba66db0548b6e78
EBUILD ripgrep-all-0.9.6-r1.ebuild 3733 BLAKE2B 905377ef81b12756dff56151a180753c443722e176beff6f7e720c3b4ad6f5095cfc792c187a630b9590f1b78aeb25a464fb2b05e7d78e60454926092a281cbc SHA512 78ff3c3cc64d1c30c6f984315bc1695da11f88dba5cb2762524a9f680a42580f2e459213b8f2a799a61b60cb58ccd168d0af4b98930db52fb87f4963496130c8
MISC metadata.xml 332 BLAKE2B f63941f7d6c27935e2120b33badfbbab45040dbc954e6a6e66c104e1a6e6360bba68c2b1f1dcefef8b73465021b13cf8a5169ca3bddc3d67e45415e1fbcb580b SHA512 e694d99c36d79629c3a3212355170f57493b62e3d491e9fb035fcda4fa9124b226398cab87d11804ea8140d79c57ea82eb9591600f822de316ab600d856ccda4
diff --git a/sys-apps/ripgrep-all/ripgrep-all-0.10.6.ebuild b/sys-apps/ripgrep-all/ripgrep-all-0.10.6.ebuild
index aba72ce549b9..d9c74f7553bb 100644
--- a/sys-apps/ripgrep-all/ripgrep-all-0.10.6.ebuild
+++ b/sys-apps/ripgrep-all/ripgrep-all-0.10.6.ebuild
@@ -260,7 +260,7 @@ LICENSE="AGPL-3+"
# Dependent crate licenses
LICENSE+=" 0BSD Apache-2.0 BSD MIT Unicode-DFS-2016"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 83ae4a3283b9..7b8972393eee 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,5 +1,6 @@
AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b
AUX legacy.conf 80 BLAKE2B 23eca4dd1743a5cf77767894d23d419c1663147c5aee6be971da64fdea0531eadfe97ac8bc4e63b44404dcf89940d438de6b7081158b78639945ce0fadbb103c SHA512 f74f05991102b644dee7822a80cb8e6c14cd1eb48bd9342bc662d5947b9f04d32e875d2a5e6476a67bdbface4d2b2159b99c11d72eb4658c5cb4caf595f138be
+AUX musl-efi-wchar.patch 938 BLAKE2B 92cf6983032a1bbf39255de7ed77371113fa87b21b9606c3d3d83bbcf868933d3d49301faea90fcf64f4a4accb03aa7dabadb57f8940f7df91f5372ed2c953b1 SHA512 17f44277678e30d48c57dbf99380b955c06c444e0986f8beb216064297eb4e5e95162433ae4e3230eda9a4e0d9ac342706e4f1ee55e7ed96d4bb16d760240537
AUX systemd-tmpfiles-clean 58 BLAKE2B 6a33f92a136218f3a27ea31e5cdd519706b15a3bba368f6f900d1d540f50493905a2cdab35ee3d216c9cb45e821251bfacc4965ad5a2ca7b1e1ae5627f4a3680 SHA512 3084eb1623b56cb09e4c9bd3e314a3e1d6d88f002149bea75b1c506a30b6345c51c7a90a1330baa5eec86ae6b90116f9970d8ff5add91929167df84bef6e82fe
AUX systemd-tmpfiles-setup 329 BLAKE2B 7b4d801ec7c29a3d6073c47af8fa1c9fa670b3762c5358d0008ecf372e675e3f65cba3ea453d374c5e23453cfe32252421b69dff23aaeea636c611b960eb7b11 SHA512 cd7f7c69d1b1861cb4eac90d44579361e365ee77906376b6124ff79ba1c0d414b8891ffca19e715585d7400bddc5e9ad973f191125039a4a2c37acb95a111c37
AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3c569ee604a83707310f074740a41832d2e3fa3b528a3816202132e18be50ce40dbcded9430031ed9a2a172d3187 SHA512 3c5e29fc5bc2829984458149de1186075eec48775983376a8b47da162cbf4892754f19a3b277170f8b759a862bb5d910789da1db2bbf8447d6dacccb411be222
@@ -11,8 +12,8 @@ DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bb
DIST systemd-stable-254.12.tar.gz 14529517 BLAKE2B ed6e4a78363930840e505c4bd789d1d44c238f30d3c0768d435e1cacb43ac3ab07e0dc9085546b4142152bbb4ceb4e2c0a9560e74e1a2b8c09fc885620695e73 SHA512 fa3679915392e641bed73ccb48f5def386ab13ba5ff7efdac952214193c3311543bec4c4370d6880f9599f63e377506b343805c3c56b7dde7eb5e3bbc0dc7a87
DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
DIST systemd-stable-255.7.tar.gz 15068684 BLAKE2B 6fb5415d9e013bc8695ef837affce7063d214027529412a25ea73eb25473d1f07cff6ad3ea3ea18b7bbf9d73d2bb8e39838e1aeb2a14d016b3b47e4ba24d02d0 SHA512 1cd2a00f292751b923bd93c60bdcdd66d82792b45e32dce11d77e2b3b6fc5c8ba4c5db386652deffa8c24e75032af1a745700ba91f1726e249f0c447daf85c2a
-EBUILD systemd-utils-254.10-r1.ebuild 13317 BLAKE2B b7694b1f3d640819a80c299ab825ebfc8b4c37d0b6b4f5dbb507af8b31534ffdcfd572132b3062ed93a146bb2173b4e04cebf0e09f9190025903d9ad11a02259 SHA512 c2bbf5f8b8b009386ae680b352c3b1ae3e16e445d21ecc84540d68ac4375b24bfbca9ffd3cc1d633c92a740b2c25b092c22221e527f64239872f122525a99441
-EBUILD systemd-utils-254.12.ebuild 13325 BLAKE2B d2653bcb36e4a3af84ea28c8ddd1fb5fbb6015a297d519827f3f2895366fb7e37217830470eb2e352ca47d197fee067fe075774c23946322afbcc9a59caf4969 SHA512 74de09c449345a8d3817a5b87a99ad66a0caec148e365da13b992cb0d2cd94426fc5db535b84b483361a0236e89a26814ae8cbac9972b6b721bc7aab855f67d6
-EBUILD systemd-utils-254.13.ebuild 13318 BLAKE2B 4989c2f5490ee1e91836f626bc57221adf104fcbf0c38466a4404eab6e9fa4dd98edad7dc9e85caec7b209dc0e17837e2be9e0ed42d75ca383642c6eda952b6c SHA512 e932919621c7132a3c61dec276b06fec38d52abeeeb72a92f12219a00382d253142384eca58923bbee029f80abc7b8d1c5783ab1efb7893d42b3ea7db5d1093c
-EBUILD systemd-utils-255.7.ebuild 13764 BLAKE2B 774c6cd3219ad89167dca515e9dd4f374a15747ef6c7aeb7d22337ad66dc258102bb4cf30761c81a5f2f29fb144a5865064ae01f016bff45eab92584c6c67221 SHA512 5f59fecb39ee6af1f7fa019663598cec359c5604a0b73f6d983f859035942ce7b5e402fd390ef112ab296fa91a378e5522ec61ef75ffec74511e0c831846f457
+EBUILD systemd-utils-254.10-r1.ebuild 13355 BLAKE2B 9e88dd7b2bc7c280aa4430d9e4ec9bea942b365408c775d0e5a53ae9d6b1eee3f79bada47ac83f3f3b4bd0fa5245b3158fc48e4b5003ba15bb7c3eb9179c9bc2 SHA512 86199fe50859269f739b37d2fa6d345b17ad90edd0aefd203f3beafdfd36c79affb16a61546da919e984836fcaded2831bd406f7123b0a84ee50ef65ac4d8b5c
+EBUILD systemd-utils-254.12.ebuild 13363 BLAKE2B 21cc042bc1041556b71f12c160a8fd5b23f31a9598d6a85b13b77ccd01b5b0e34350bde236f151662873734003fe2fd5a001c746370c16fb8308fb51e283d843 SHA512 9660bcde5c1a06aa03dd7bc90aad59421eeea53757ed1edc2d674c1cddc0addf6b7670520426bd569c5f3e309f66ab641362c260c1fbdfdd20fb10198032677a
+EBUILD systemd-utils-254.13.ebuild 13356 BLAKE2B b4892ba9c9ab31ded67652533fabf4f36d5b76377ea14e5d145795bb45cbdcf300660f1a54abe61a050a3287c08309e8fadfcf5f4d17b0c4bc7640b5382499ba SHA512 c8d72fe488c33f75f3e9ff11fc885befed66b61f3dea70c1e367b91a037536bc7d4668983644048c1099e07ee0977203a8ea6908b89dbd27371f5b1e4ce1bbd1
+EBUILD systemd-utils-255.7-r1.ebuild 13700 BLAKE2B e5410d9a84a8a11fa26900d2f8bf95c7a955de574cb2bc3a7fe6cea3b15a130a2eee35ada345fd10ae8bed3d981d106db9458000893560810d4985fa1b9166c1 SHA512 34c573fbea37536d52e1c17030e299d227324b74155ebfca9166a5391c13d03734e718df27b634e9871d2c5bbcbce030671494094aa85472b327dab802c12c98
MISC metadata.xml 888 BLAKE2B b799e1d62a1208dbbec1a1cfb47592b069d5c79cb18efffef922c72b0d61e30938d26c6f4e0d3951f9c327601dd71de14062dad0a47e6b84a61b1a8b125f1a6b SHA512 6debd964f9c127ba4332e0c0b86e506d3cf10cbe3cd45442bf7955b16e790a9eccdd928d473b3722b11b4a75d34fe5bb91f4867a5dc92e786ba73d9ec3f54712
diff --git a/sys-apps/systemd-utils/files/musl-efi-wchar.patch b/sys-apps/systemd-utils/files/musl-efi-wchar.patch
new file mode 100644
index 000000000000..a3681552d33f
--- /dev/null
+++ b/sys-apps/systemd-utils/files/musl-efi-wchar.patch
@@ -0,0 +1,29 @@
+From c4050bd401611f6223c00e58ac9c26b9caccd286 Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Sat, 9 Sep 2023 13:10:53 -0400
+Subject: [PATCH] efi: append -D__DEFINED_wchar_t to LDFLAGS
+
+This forces systemd-boot to use the wchar_t type defined from
+__WCHAR_TYPE__ in efi.h, instead of the wchar_t defined in musl's
+alltypes.h. Adapted from openembedded's solution.
+
+Signed-off-by: Violet Purcell <vimproved@inventati.org>
+---
+ src/boot/efi/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
+index 2773eaf286..3c1e09c729 100644
+--- a/src/boot/efi/meson.build
++++ b/src/boot/efi/meson.build
+@@ -130,6 +130,7 @@ efi_includes = [fundamental_include, include_directories('.')]
+
+ efi_c_args = [
+ '-DSD_BOOT=1',
++ '-D__DEFINED_wchar_t',
+ '-ffreestanding',
+ '-fno-strict-aliasing',
+ '-fshort-wchar',
+--
+2.42.0
+
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
index b906b6110034..af3b023e8eb8 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
@@ -292,7 +292,7 @@ multilib_src_compile() {
if use kernel-install; then
targets+=(
kernel-install
- 90-loaderentry.install
+ src/kernel-install/90-loaderentry.install
man/kernel-install.8
)
fi
@@ -368,7 +368,7 @@ multilib_src_compile() {
if use ukify; then
targets+=(
ukify
- 60-ukify.install
+ src/kernel-install/60-ukify.install
man/ukify.1
)
fi
diff --git a/sys-apps/systemd-utils/systemd-utils-254.12.ebuild b/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
index 4e14021f3732..d76d79f1f07f 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
@@ -292,7 +292,7 @@ multilib_src_compile() {
if use kernel-install; then
targets+=(
kernel-install
- 90-loaderentry.install
+ src/kernel-install/90-loaderentry.install
man/kernel-install.8
)
fi
@@ -368,7 +368,7 @@ multilib_src_compile() {
if use ukify; then
targets+=(
ukify
- 60-ukify.install
+ src/kernel-install/60-ukify.install
man/ukify.1
)
fi
diff --git a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
index 29677faa1af9..3f52033ed095 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
@@ -292,7 +292,7 @@ multilib_src_compile() {
if use kernel-install; then
targets+=(
kernel-install
- 90-loaderentry.install
+ src/kernel-install/90-loaderentry.install
man/kernel-install.8
)
fi
@@ -368,7 +368,7 @@ multilib_src_compile() {
if use ukify; then
targets+=(
ukify
- 60-ukify.install
+ src/kernel-install/60-ukify.install
man/ukify.1
)
fi
diff --git a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
index 01d50ad73596..dbab6cb8489d 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
@@ -86,7 +86,6 @@ RDEPEND="${COMMON_DEPEND}
acct-group/usb
acct-group/video
!sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
!<sys-fs/udev-250
!sys-fs/eudev
)
@@ -138,6 +137,7 @@ src_prepare() {
if use elibc_musl; then
PATCHES+=(
"${WORKDIR}/${MUSL_PATCHSET}"
+ "${FILESDIR}/musl-efi-wchar.patch"
)
fi
default
@@ -291,7 +291,7 @@ multilib_src_compile() {
if use kernel-install; then
targets+=(
kernel-install
- 90-loaderentry.install
+ src/kernel-install/90-loaderentry.install
man/kernel-install.8
)
fi
@@ -357,10 +357,6 @@ multilib_src_compile() {
rules.d/50-udev-default.rules
rules.d/60-persistent-storage.rules
rules.d/64-btrfs.rules
- rules.d/70-uaccess.rules
- rules.d/71-seat.rules
- rules.d/73-seat-late.rules
- rules.d/99-systemd.rules
)
if use test; then
targets+=(
@@ -381,7 +377,7 @@ multilib_src_compile() {
if use ukify; then
targets+=(
ukify
- 60-ukify.install
+ src/kernel-install/60-ukify.install
man/ukify.1
)
fi
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 10:38:35 +0000