mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 06:31:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

eclass/elisp-common: Sync with Gentoo

Browse Source 
It's from Gentoo commit 3ba318e113caaa573ee6c2ce8360a8c6f5b1167d.
This commit is contained in:
Flatcar Buildbot 2025-04-28 07:14:58 +00:00
parent 5b68190314
commit 13488ef752
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sdk_container/src/third_party/portage-stable/eclass/elisp-common.eclass vendored
View File

@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors # Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# @ECLASS: elisp-common.eclass # @ECLASS: elisp-common.eclass
@ -626,12 +626,12 @@ elisp-modules-install() {
elisp-site-file-install() { elisp-site-file-install() {
local sf="${1##*/}" my_pn="${2:-${PN}}" modules ret local sf="${1##*/}" my_pn="${2:-${PN}}" modules ret
local add_header="1 { local add_header="0,/\S/ {
# Find first non-empty line # Delete any leading blank lines
:x; /^\$/ { n; bx; } /\S/! d
# Insert a header, unless we already look at one # Insert a header, unless we are already looking at one
/^;.*${PN}/I! s/^/;;; ${PN} site-lisp configuration\n\n/ /^;.*${PN}/I! \
1 s/^/\n/ i ;;; ${PN} site-lisp configuration -*-lexical-binding:t-*-\n
}" }"
[[ ${sf} == [0-9][0-9]*-gentoo*.el ]] \ [[ ${sf} == [0-9][0-9]*-gentoo*.el ]] \
@ -711,11 +711,15 @@ elisp-site-regen() {
;; DO NOT EDIT THIS FILE ;; DO NOT EDIT THIS FILE
;;; Code: ;;; Code:
EOF
# Use sed instead of cat here, since files may miss a trailing newline.
sed '$q' "${sflist[@]}" </dev/null >>"${T}"/site-gentoo.el || ret=$?
cat <<-EOF >>"${T}"/site-gentoo.el || ret=$?
EOF
# Concatenate all site initialisation files.
# 1{/^;/s/\s*-\*-.*-\*-//} deletes file-local-var cookies from line 1.
# /\S/,$!d deletes any leading blank lines.
# $G inserts a blank line after each file.
sed -s '1{/^;/s/\s*-\*-.*-\*-//};/\S/,$!d;$G' "${sflist[@]}" \
</dev/null >>"${T}"/site-gentoo.el || ret=$?
cat <<-EOF >>"${T}"/site-gentoo.el || ret=$?
${page} ${page}
(provide 'site-gentoo) (provide 'site-gentoo)