gentoo resync : 29.12.2022

4 files changed, 5 insertions, 28 deletions

diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 5eef3848ef62..8275768d536b 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,8 +1,6 @@
 AUX 50ebuild-mode-gentoo-1.54.el 1509 BLAKE2B 98cf2a1672723ffaa3f4d2f57b4b67b897df56cc2d7352366b79df0578b927faae53c3cc703fa70cf23bd0b1006d8c49dd8e59fcaffa3a231fd7ec5e26c7dce5 SHA512 91c59e85ea79733c195985e4a33dfb1aec8ac13457c0dc3fe7353fb2616787ebde4393b671a2943b752725593929070b658c24955d5e2132b6e9b76daa749850
 DIST ebuild-mode-1.56.tar.xz 36448 BLAKE2B 9126dd5d004a5818a5214f10c88db84faee3945ac25ee141a577a868bf7f127490ee34d6ea103fb788f96c391eea3d00d18abe12564a2f6c70650fc8fe9c6cdf SHA512 2b67208d9f553a322761dc9b64e7b891722c2099cc7c9bfc929e1a424b22ec32c594e0ba029554434b51ef233d2d4435b6c639b06c25fd551608fe5dd830cb03
-DIST ebuild-mode-1.57.tar.xz 36548 BLAKE2B 85f677cc5459077d89536e2032049b8be75f24cfad742955b439a1e94beaf82a2a39a4ddb1de1bb8fa847ede637702356d470556f2fab09a13ae6416419a5e07 SHA512 c7eed4bc8e68909abb3407b5a352816c6eb43ada345a967e9e1b666937a44cacf0476475d2b1eeb3f48ddcea04b31ccf7fc938a8cb70f8655cf2b5946d4c0a04
-DIST ebuild-mode-1.58.tar.xz 36796 BLAKE2B c2762c0d00038206d9ceacb887c2c0a1503e7e5dbdc68796aaa27eec5cab52fae1d6e4baf5155b79842fd2e74d91dab1c203c26d9f68986155426b36635b7722 SHA512 37e393b5c5b6672045dea7aafa77df81f7aee2d16ead90e12841026442eac63fe3eece1538401dc4b7444573aec61f4c920f821b65f8489b5a48d54de4d78b52
+DIST ebuild-mode-1.60.tar.xz 36996 BLAKE2B a566c9f602ec6ac4126a4a13610e515faf2a02b8ca89f417a037a28f4b9ea633518d589d78f6deb54084be34cdc30c2a1896546b2f86c1166cedd47289edcfd8 SHA512 b04b37b7a376dc48a7f80ec0e60bf36a8b7ea92edcbdd45fbd002e80e8ea29111905a726177a869d607adffe78094efcdc94b1aad32afe1444a09b4e714dcecd
 EBUILD ebuild-mode-1.56.ebuild 729 BLAKE2B a4760a8a7b2f4e7189b7af2a2f7d82e84ecad7b0e3edf67e2b3301f23653766664ebb56091a0b0ae0c8d9e3a9eef25e805fae951f4a9225f0692f63d2d6421c6 SHA512 798294723f21671372eb91c9ce2a747ec31abc9c25869adc5d0c4a00b58dcc7d8c4a60de0ed98b33455f9dd6b8429cdbee5101a0b2e40acaab6d8ff3e97035f1
-EBUILD ebuild-mode-1.57.ebuild 736 BLAKE2B 71e62344d03621defdb9be57b0f1da6a4db3e1d84c0d6ef9118273fa5025c5cdb999ed4e509c4d0f8d551fc8a58d9bbaf891e5e61bdb7a64e177fc7314a24d20 SHA512 73dee87d1887bf399a87d22022aa80b6cac9697e5a537b9e953555d4aa3ec84f0d5f74ebcd03be59ceb0e07df22ee2298214f1826d9f0129c4f3708a5d9d6b64
-EBUILD ebuild-mode-1.58.ebuild 736 BLAKE2B 71e62344d03621defdb9be57b0f1da6a4db3e1d84c0d6ef9118273fa5025c5cdb999ed4e509c4d0f8d551fc8a58d9bbaf891e5e61bdb7a64e177fc7314a24d20 SHA512 73dee87d1887bf399a87d22022aa80b6cac9697e5a537b9e953555d4aa3ec84f0d5f74ebcd03be59ceb0e07df22ee2298214f1826d9f0129c4f3708a5d9d6b64
-MISC metadata.xml 427 BLAKE2B 2c0846e1ff38584a4101b645f7242526d43c4b6e2eaa202f7d063de531fca4bcecefbdd81278caf3b9e6fe1492277d4c2aa33104eae3ce99f7c4b30c5709946e SHA512 5f4d98e87b3e28bfeb13476382ad46673cb5896bfaa994b856350609ffe9fce1bf31ff8e63702689f5d0a7e07c2e50c1a8b22b09559d77606321981e63e79467
+EBUILD ebuild-mode-1.60.ebuild 729 BLAKE2B a4760a8a7b2f4e7189b7af2a2f7d82e84ecad7b0e3edf67e2b3301f23653766664ebb56091a0b0ae0c8d9e3a9eef25e805fae951f4a9225f0692f63d2d6421c6 SHA512 798294723f21671372eb91c9ce2a747ec31abc9c25869adc5d0c4a00b58dcc7d8c4a60de0ed98b33455f9dd6b8429cdbee5101a0b2e40acaab6d8ff3e97035f1
+MISC metadata.xml 483 BLAKE2B 203c30fd4195b63532c0462427658547b0805fb23b57c9a04c554eba8ef0a9b9bc7e3100a51c3cb7feb11d1dcb9472357e5e53640e9a94658e35594cd3369f56 SHA512 78804ced19849c5d88cf942117714db3302cb2187e93ab3924b5526d0c6aa973dbda2cdb5a67c9e0639d5ac3278ea8da9df1e20c2b3cb96231f3fee5fc6845fb
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.58.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.58.ebuild
deleted file mode 100644
index 54add5db8bed..000000000000
--- a/app-emacs/ebuild-mode/ebuild-mode-1.58.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-BDEPEND="sys-apps/texinfo"
-
-DOCS="ChangeLog keyword-generation.sh"
-ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.54.el"
-DOC_CONTENTS="Some optional features may require installation of additional
-	packages, like dev-python/docutils-glep for glep."
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.57.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.60.ebuild
index 54add5db8bed..0ecdcc8ea7b9 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.57.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.60.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/ebuild-mode/metadata.xml b/app-emacs/ebuild-mode/metadata.xml
index 80d8f14ad170..3f5a3e021741 100644
--- a/app-emacs/ebuild-mode/metadata.xml
+++ b/app-emacs/ebuild-mode/metadata.xml
@@ -11,5 +11,6 @@
     <email>emacs@gentoo.org</email>
     <name>Gentoo Emacs project</name>
   </maintainer>
+  <remote-id type="gentoo">proj/ebuild-mode</remote-id>
 </upstream>
 </pkgmetadata>