From e4ebfd51ef39834bac34bfce822942e36ea557ae Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 7 Dec 2023 16:31:42 +0100 Subject: [PATCH] app-vim/gentoo-syntax: Sync with Gentoo It's from Gentoo commit 5bb294b0939dad84f5bd187d0fd32ff0093ff820. --- .../app-vim/gentoo-syntax/Manifest | 4 +- .../gentoo-syntax-0.20211208.ebuild | 44 ------------------- .../gentoo-syntax-0.20220220.ebuild | 44 ------------------- ...yntax-1.ebuild => gentoo-syntax-12.ebuild} | 4 +- .../gentoo-syntax/gentoo-syntax-9999.ebuild | 13 +++--- .../app-vim/gentoo-syntax/metadata.xml | 1 + 6 files changed, 11 insertions(+), 99 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-0.20211208.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-0.20220220.ebuild rename sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/{gentoo-syntax-1.ebuild => gentoo-syntax-12.ebuild} (79%) diff --git a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/Manifest b/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/Manifest index 33e8f63734..4078c34fad 100644 --- a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/Manifest @@ -1,3 +1 @@ -DIST gentoo-syntax-1.tar.bz2 20223 BLAKE2B 846e07354660b4859cc4131a9fbf4f78d3a2ddeda60fc6a3687b649788a52725602dcd22befa9ab9fe88b173eab1470e569076d587326935efaf40d3aaba5b57 SHA512 1e4d947f0edbf6bd24142d683944f30d43b7e0ca86b90311f2e80516d299d9a634a9842cdc90d98a43e7a693f0dd29b3ff8048256bc3fe688591cc2b84808289 -DIST gentoo-syntax-20211208.tar.bz2 18844 BLAKE2B 52e7025d46f5101f2e1c44afcbf3cba0756a1ec9c626f7af312bb5bbae518645c06c94bfc48822a721e2e3c1ed5f61376e88a074a9688cf4b5b3c352a99c87c9 SHA512 f1cfe2af440f7ed3042cbaa16558cb6df8038f439a2c3e7067f81751a37098854a3afb1653c7c3656ef85ad1874d2db9271429b92a25f494da6ee5c68819e631 -DIST gentoo-syntax-20220220.tar.bz2 19433 BLAKE2B 8f7fbbb56e41f4d682c824deb980035441195785f9ce80fd45808b55cf900c8e0455b5c670f82b1fc639c052792b78de5f0be1142eab853b0cabbd44c6ed0776 SHA512 4b515ca7936a16279c48310d1fa0f58979e35b1d84a2971bdcf4a004784efa3de99619851ac9da5ee0ee77a1f65eb28550d01013cffebd45e39fb70c0136ba12 +DIST gentoo-syntax-12.tar.bz2 21022 BLAKE2B 758993282ccc26384bb1fc761f2a07059d5e2e7038f56d48ec19ac82ddecb7cd1601fbdd4221e6b41b43281195d862c93d98c12c47d2d43f4a6cbb4784ae6b46 SHA512 07bc7102b3f687c53d8e46c5ca91c1d605239490f160c6db11c6d17ae95b94d34e9ac654b3c9935099382f39ba8b92ea373b09f86fc6452840d12f135820b2b3 diff --git a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-0.20211208.ebuild b/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-0.20211208.ebuild deleted file mode 100644 index 5676ffe9c1..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-0.20211208.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit vim-plugin - -MY_P=${P/0.} -DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting" -HOMEPAGE="https://github.com/gentoo/gentoo-syntax" -SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${MY_P}.tar.bz2" -S=${WORKDIR}/${MY_P} - -LICENSE="vim" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="ignore-glep31" - -VIM_PLUGIN_HELPFILES="gentoo-syntax" -VIM_PLUGIN_MESSAGES="filetype" - -src_prepare() { - default - if use ignore-glep31 ; then - for f in ftplugin/*.vim ; do - ebegin "Removing UTF-8 rules from ${f} ..." - sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \ - || die "waah! bad sed voodoo. need more goats." - eend $? - done - fi -} - -pkg_postinst() { - vim-plugin_pkg_postinst - - if [[ -z ${REPLACING_VERSIONS} ]] ; then - if use ignore-glep31 1>/dev/null ; then - ewarn "You have chosen to disable the rules which ensure GLEP 31" - ewarn "compliance. When editing ebuilds, please make sure you get" - ewarn "the character set correct." - fi - fi -} diff --git a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-0.20220220.ebuild b/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-0.20220220.ebuild deleted file mode 100644 index 3cc000eb8f..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-0.20220220.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit vim-plugin - -MY_P=${P/0.} -DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting" -HOMEPAGE="https://github.com/gentoo/gentoo-syntax" -SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${MY_P}.tar.bz2" -S=${WORKDIR}/${MY_P} - -LICENSE="vim" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="ignore-glep31" - -VIM_PLUGIN_HELPFILES="gentoo-syntax" -VIM_PLUGIN_MESSAGES="filetype" - -src_prepare() { - default - if use ignore-glep31 ; then - for f in ftplugin/*.vim ; do - ebegin "Removing UTF-8 rules from ${f} ..." - sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \ - || die "waah! bad sed voodoo. need more goats." - eend $? - done - fi -} - -pkg_postinst() { - vim-plugin_pkg_postinst - - if [[ -z ${REPLACING_VERSIONS} ]] ; then - if use ignore-glep31 1>/dev/null ; then - ewarn "You have chosen to disable the rules which ensure GLEP 31" - ewarn "compliance. When editing ebuilds, please make sure you get" - ewarn "the character set correct." - fi - fi -} diff --git a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-1.ebuild b/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-12.ebuild similarity index 79% rename from sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-1.ebuild rename to sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-12.ebuild index cc256f13f2..717484df95 100644 --- a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2" LICENSE="vim" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="ignore-glep31" VIM_PLUGIN_HELPFILES="gentoo-syntax" diff --git a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-9999.ebuild index a5cb932919..7e46a0bf24 100644 --- a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-9999.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit git-r3 vim-plugin DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting" -HOMEPAGE="https://github.com/gentoo/gentoo-syntax" -EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-syntax.git - https://github.com/gentoo/gentoo-syntax.git" +HOMEPAGE="https://github.com/gentoo/gentoo-syntax/" +EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/gentoo-syntax.git + https://github.com/gentoo/gentoo-syntax.git +" LICENSE="vim" SLOT="0" -KEYWORDS="" IUSE="ignore-glep31" VIM_PLUGIN_HELPFILES="gentoo-syntax" diff --git a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/metadata.xml b/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/metadata.xml index 12b3719f87..d55db2445d 100644 --- a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/metadata.xml @@ -14,6 +14,7 @@ Remove GLEP 31 (UTF-8 file encodings) settings + proj/gentoo-syntax gentoo/gentoo-syntax