mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 04:06:33 +02:00
app-admin/eselect: Sync with Gentoo
It's from Gentoo commit d7dfa749e63d3a3cec49980a0385115f31cad213.
This commit is contained in:
parent
4af4b45e91
commit
608b0d6cd5
@ -1,2 +1,2 @@
|
||||
DIST eselect-1.4.22.tar.xz 183480 BLAKE2B 8f86bdddaf98bc075694bdf7283cbd366e0ef93635472b3bbac11fdd9765984cd82e493b16836bae66e4b2c42a9cb33ad0d2aacaaf8529b59e4898e11f172d26 SHA512 73a10278d604f462aefa099df398eec2b08aee33da69419351ff2faf1cf4c0f3de0f301d92015e52da63046fe7e2c1c388e11ac84b7deb3def505a59fa291dac
|
||||
DIST eselect-1.4.25.tar.xz 184300 BLAKE2B 630fe27338bee0c921a2f90e42d0a8abbb60a141a82bc2c4e7cf43d37582c24b06986ae1cbd341f8d3e69d011edc6c29675bf91ceaf1dcbc2593086f451b8f5f SHA512 98f2752d61e2c31ff6d735d5df0e7d98c3cc51d51c26b71d796948b141ccbc017002185022e6e1e48660ae0012bfc9cd383dd5ac50f644b35bb0893b9271121b
|
||||
DIST eselect-1.4.26.tar.xz 184332 BLAKE2B ee1e8890802fc50646c8d1d5219f1ab0ec5cfc0138c758f73ad6baccf673992bbf3e763d8e84491f33e724ba4e1cf3bed6971ba7fa4373e0f06464ff4a5fa1e6 SHA512 397ae2f15d90d722eb84225b08f1afaaf6f89758bfae5d93b0a1c3eddc997c21e74ab62e09ee5e71941d3a8587b3372b64336d12054c3bbf0e56e1ba398a26f9
|
||||
DIST eselect-1.4.27.tar.xz 184464 BLAKE2B 718874f4d0651194f361ca3202e5140982812bf486c8efe82354944d55206b0113fa135992203e8baa00019c3fd773a90ddaf67157c16f4ac2d69965d9822fbd SHA512 f534785fc1f79869840f420b4ab2b2bf35593c504cce878a6d3d07f75012cf32288009ea9ac2a5607dba216a794110a64c5f2c54d5d8a3c641328489cecc024b
|
||||
|
||||
@ -3,6 +3,11 @@
|
||||
|
||||
EAPI=7
|
||||
|
||||
# Packages sharing a common release tarball:
|
||||
# app-admin/eselect
|
||||
# app-emacs/eselect-mode
|
||||
# Please bump and mark them stable together!
|
||||
|
||||
inherit bash-completion-r1
|
||||
|
||||
DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
|
||||
@ -11,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
|
||||
SLOT="0"
|
||||
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"
|
||||
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="doc emacs vim-syntax"
|
||||
|
||||
DEPEND="sys-apps/sed
|
||||
@ -3,6 +3,11 @@
|
||||
|
||||
EAPI=7
|
||||
|
||||
# Packages sharing a common release tarball:
|
||||
# app-admin/eselect
|
||||
# app-emacs/eselect-mode
|
||||
# Please bump and mark them stable together!
|
||||
|
||||
inherit bash-completion-r1
|
||||
|
||||
DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
|
||||
@ -26,8 +31,6 @@ BDEPEND="doc? ( dev-python/docutils )"
|
||||
PDEPEND="emacs? ( app-emacs/eselect-mode )
|
||||
vim-syntax? ( app-vim/eselect-syntax )"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${P}-env-module.patch" )
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
use doc && emake html
|
||||
@ -1,19 +0,0 @@
|
||||
env.eselect: More robust file type detection
|
||||
https://bugs.gentoo.org/908401
|
||||
|
||||
--- a/modules/env.eselect
|
||||
+++ b/modules/env.eselect
|
||||
@@ -46,9 +46,10 @@ is_envfile() {
|
||||
[[ -n ${envfile##*~} ]] || return 1
|
||||
[[ ${envfile##*.} != bak ]] || return 1
|
||||
|
||||
- mime=$(POSIXLY_CORRECT=1 file -i "${envfile}" \
|
||||
- | cut -d ' ' -f 2 | sed -e 's/;$//')
|
||||
- if ! has ${mime} ${MIME_WHITELIST}; then
|
||||
+ mime=$(POSIXLY_CORRECT=1 file -bi -e soft "${envfile}") \
|
||||
+ || die "'file' command failed"
|
||||
+ mime=${mime%%;*}
|
||||
+ if ! has "${mime}" ${MIME_WHITELIST}; then
|
||||
echo "Skipping non-text file ${envfile}."
|
||||
return 1
|
||||
fi
|
||||
Loading…
x
Reference in New Issue
Block a user