6 files changed, 4 insertions, 30 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 036b2cc13e14..5b46ba628312 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/gnuserv/Manifest b/app-emacs/gnuserv/Manifest
index b46b94d16d4e..f7406b2f9186 100644
--- a/app-emacs/gnuserv/Manifest
+++ b/app-emacs/gnuserv/Manifest
@@ -11,5 +11,5 @@ AUX gnuserv-3.12.8-process-query.patch 554 BLAKE2B 94f09a1e86ea787a05e51ed5e2742
 AUX gnuserv-3.12.8-warnings.patch 2487 BLAKE2B 39581dce0cfdfb6d9769eefe0a99af2f9d2d091dbab5ce06c942df3348d06581e88ed8968192f13d15598045ab3752b5f96342e88e9ff3305f609117d41fcea5 SHA512 269b69c5618730a02694b25941c2de0cc94f516fd2bd8e80f339527f9f683e3052840240d34dede4b2686a4cdc90dcfbaeb26ab394dad255e5ada773b9df16f6
 DIST gnuserv-3.12.8.tar.gz 124070 BLAKE2B 7531d85f6cd1873f75499c37230907f96ac484e1d58a4a3459f44d3bfaa6a6124d44f99a7c27d1fa3deb16b1cc29d08313b911cdc1782a1c5b24bd702ef4c9ba SHA512 e8f387a554c22fb2eb166d388085b9d68a0d865ae56ab71f3ffe09ff46bef04a4ba5b05ca51a1110e1dff67ae2cd6acc8b18a0fb9df9299dbbf4a001f0924f31
 EBUILD gnuserv-3.12.8-r5.ebuild 1752 BLAKE2B affe2261d573ec8d003c89fe509cb52f0d6237db66ae25e8716819e9e097639cd8d96899b119d7bd6058b132ca3cf5375a50083a9dd2d78d90ba201544c89a16 SHA512 5a9ecfb745a7d70da2cf367330a8505654dd0f05f61e884cd086844214689bb7ed7f0ca4f020825483bab6a73ac6b259d928803ba4bb13b4aceeadd7570a5e06
-EBUILD gnuserv-3.12.8-r8.ebuild 1996 BLAKE2B 7269ee940e86aaeb2cab7b77fd7efdb614a708a7aa784e65453e9e0473057d976b669b5c2ce29585edbd8dfda24490c0fc642319e660e5a4ff73ea8f80bfe536 SHA512 a11742b5e282e4cbc555802a57063d36a6e87aabee71d9f0db249f2bd0a437f678d97a5019ccd107518a7177278067d099485d58b41fd214bece6cc3a1185262
+EBUILD gnuserv-3.12.8-r8.ebuild 1995 BLAKE2B 6e5746868a1c9dac14a531a8814c626a7cd343bcc91491831836d85f300d88847608e35d5ecaf45ab470448f353615382f4a4b4305e6edcab7eca2af875bf951 SHA512 34db13a44e926cbd7656f7f29c31f99b96f206474cc19df44d61ab3e9a57894ad48906133cff0ef6a9b52dc74dc112efb03325bffe34bdb924ddb7de7feffba0
 MISC metadata.xml 260 BLAKE2B a187a6020d68e0ac53c6bb25461b0988c938fb112a8a7e3a906b827269347d70f8366594d404329695b4fa52fff2cde7fbc51d501e674bf8adc821a4141ccfcf SHA512 2ff2d68bb3c552f006474e86ecab8ebbcfcb35588384c045a665d305f79c739c4d80c0ea639a71c39123b8c5c1b3a96977ee8c0c3e973449a732ac3ac8f2c3a3
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r8.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r8.ebuild
index 4cb5f7e12303..ddfd53b868d7 100644
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r8.ebuild
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://web.archive.org/web/20150908031821/http://martin.meltin.net/sit
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
 IUSE="gui"
 
 RDEPEND=">=app-eselect/eselect-emacs-1.15
diff --git a/app-emacs/nxml-gentoo-schemas/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest
index f8621a657aa8..5d63ccdeb3a1 100644
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@@ -1,6 +1,4 @@
 AUX 60nxml-gentoo-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
-DIST nxml-gentoo-schemas-20230914.tar.xz 8812 BLAKE2B fa039f3cf1556ef97684d7c485be5efa0cddae3dfa5a98a0bddd924a0e6f736b519a3a841712b8221dde2ee8351c8680c4b1bfb391151cf0a1ef3f073373e58d SHA512 e4cda867fb635a0b7f17a692b38a1f65966f439c585a130319ba8f53f571dedc3ca9d61a34c61ffd3ba09b04ef9aae61578bea9bb9f0562b542296c8a98d64c9
 DIST nxml-gentoo-schemas-20231022.tar.xz 8860 BLAKE2B eb6d997d5597fd83d547b356f1551c3087f69860808168dcd6bdec0a808e0effae96188d55f6c3d5dcb779ecc727fb965ce1190c60a1ec6591853f98e9a40cdd SHA512 2fbb674b7f8e6b854af1587ab03605bfe7f75e40a6f10122565264c9225d03fd30a5f569158ca83da6f84aaa31c18cced6d51a0782bb64172ab7fbfe077a630d
-EBUILD nxml-gentoo-schemas-20230914.ebuild 605 BLAKE2B 579aa11ed152a0f94ca8dae0a2294f85c0c18b0c0e30f52a71a8e6586753af30d49b99118229116796181b7ff00f044a72319d6f5ed194a81ef5b40b81589deb SHA512 2ad2d92b55dce6552d67c2bf3e43fc81133031d46cf49cb79d88027ad7c0c705f640c7d3b95ab2a50e4c21d59d17e66494ddcba4701eec6c5d21265389399a8c
-EBUILD nxml-gentoo-schemas-20231022.ebuild 612 BLAKE2B c77884c5a93ba997c9a133b58c594089f86c6561c12b2032625c0b7e0dbd04fb57b56d6ea3acabb2e8588e76c7192b326c858874d9a610f733cb334c295071ac SHA512 f751b8bdf32a7229b4ea42e37d5c4f0feb85c1d2edadd245621c52544720f92bde8c9b5b0bd306565152eb07c77af0f8521b981ba0b504c2c2d5f2989c6ab273
+EBUILD nxml-gentoo-schemas-20231022.ebuild 605 BLAKE2B 579aa11ed152a0f94ca8dae0a2294f85c0c18b0c0e30f52a71a8e6586753af30d49b99118229116796181b7ff00f044a72319d6f5ed194a81ef5b40b81589deb SHA512 2ad2d92b55dce6552d67c2bf3e43fc81133031d46cf49cb79d88027ad7c0c705f640c7d3b95ab2a50e4c21d59d17e66494ddcba4701eec6c5d21265389399a8c
 MISC metadata.xml 370 BLAKE2B 2af6298a56b5da7f2c32b4bed09ae442df3068aecaddf3be04c6d6d4abed1f23430d14a54bb33b13580cfeca7177e2da00c8eab62d17a84427ad1201e105572b SHA512 abaa11228666364188cd1b23903b43b5b49456050287ba12be8a6bd31a1f063c65b3efe50de478614f8f70f953ae22b238989724be5179df71a2ce820d356904
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20230914.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20230914.ebuild
deleted file mode 100644
index dd2b680092d5..000000000000
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20230914.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
-HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="MIT GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_compile() { :; }
-
-src_install() {
-	insinto "${SITEETC}/${PN}"
-	doins schemas.xml *.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20231022.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20231022.ebuild
index 94311b25501f..dd2b680092d5 100644
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20231022.ebuild
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20231022.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="MIT GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 SITEFILE="60${PN}-gentoo.el"