gentoo auto-resync : 03:04:2023 - 17:20:42

4 files changed, 9 insertions, 137 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 1f3ca8666e4b..668a013957e3 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/lmod/Manifest b/sys-cluster/lmod/Manifest
index 841b250cc11c..8b24bd7ce279 100644
--- a/sys-cluster/lmod/Manifest
+++ b/sys-cluster/lmod/Manifest
@@ -1,10 +1,9 @@
 AUX 99lmod 22 BLAKE2B 6a470f0e5796f21f10e10161ee1fdb4fb3d794a9261bee9887c9e2d17959f21c8576fb3ada236a3a20a06e5d273d939751c5adbfb1bc6964247c19ad6b930461 SHA512 6aede256db3c633f7e6f7ad7d3a237563237b06ac499874c83e1d55177b0035cc4086bd10bfd7472075d10bc94d2e59c1e91790b7932d48433a34d5a7c304fc7
 AUX lmod-8.4.19-no-libsandbox.patch 374 BLAKE2B f4bf516a737f73cb547bd07933d2839748259bef017b740b2cb3e5e5fbba6909e932d3211edb1ba48fd16545ecfd7f3a2239046f5478bfad68f9d7ccdb296307 SHA512 9b5b5300588dda23efd82f8d55373be6f69289efad42260a721eb68dfc01475a8f18a9bba8eead8fe66724b8a8df0d75a4c6a85d51e0d3011cc1435cb8f148b6
 AUX module.1-8.4.20 7580 BLAKE2B 6b4f8f721178326a4124bb9c907d4dc0e7c1b7251c724af2826aa3f495af4702f0c9a8cbb06847fec5d44f525cd463b4f0ec898a6cd3074d11c3195ede191af5 SHA512 cfc9eb011f5e5fb2a40b9dfe71e6a888f573e17a55d0d34fe529dbb887ff7932e17c0172663c95dfbd00b67f883608921ae7bb19d352b6d9ce8207d13ca13c8b
-DIST lmod-8.5.6.tar.gz 20986562 BLAKE2B 49a8062f92beb40ce364281f452d221df73ad540f4a510998a909d5733446c45e2cc017901ce5d2384b37a570b8dddcb16d0dc229209137e3a6483e29b97c8bf SHA512 652c678907740c89d6a86f1e403a3e8370e3e4666c03795340b4e70fab8c67a2e705c31fba84f05fd1bf15eb9868808896c73627e87617d2f2c0b5142c48fa97
 DIST lmod-8.6.14.tar.gz 15804818 BLAKE2B 5a5f076cb7121d073de456da3ad2937127c013cc47d0f389eaf00f9923b571bc4c941f8efd5cc527628d14d328d696e27e062629b4eede2f4c0273cc7015293e SHA512 b14acf4a008ccfe04d12352664bc6d4afe87a677803534ea7ccf9c3adb012a3df83edfb205e39f3d0e65db418f16dbce70871932d90b837924b889dc1829e672
-EBUILD lmod-8.5.6.ebuild 3439 BLAKE2B 4f8023815f0f27953a9fa16e2304dde897370db2dc759185bf02312356d6f0a2b114f3d83cbe5b49db34b5c864742d4bdedc21e5f2f72c4aca8c4ecb1467febd SHA512 00465311e91a56016cfbe803597a3abae02cdeace36d3e85824b647d2bf8faef721c443c3362e8062d86767f7357d23b4f3884ed08c804ba7cd0550955738112
+DIST lmod-8.7.23.tar.gz 20609950 BLAKE2B 20b2028c15a602f7b165eae342a83a238313d37ea4669e08c5ff22c47ae4e18e3190c83739bc6e39178b60d9e3ed19c7ade20466a65833e28677ca56799aa065 SHA512 029be9c08dbe3f3f8fd5c034eaab94746679b8403d8c401bc76b18b800f4f72d21f14b0a71fe20d2c1546b8b9d6f2e032226ea3528992ea6cdab8f02c2a5d99d
 EBUILD lmod-8.6.14-r1.ebuild 3730 BLAKE2B 39acd5ec4e48635771d8c7669c61880cdc4186a3af78ae1dba9557024a6afb9038178ea617e79143194bb64412e570a495f9c3cd686108abbcf0a333558cb5a1 SHA512 a06cf07d4aad635988151331df31bf0b3c51981766687868b67ce894d7dced40ebb32ea805ca60c5acabfc1886d58bb56a089ab311a479933eb6001d778bd9c0
-EBUILD lmod-8.6.14.ebuild 3439 BLAKE2B 973a3b3add66653503cb1a72a59b2c7aabcc2011cb4261e23ece5003ea40b160de6e61863e2c5a39a3abc4529b0cb77f7c3d8c69ddbd1602898ccc853cec4d04 SHA512 afd93d4df57ebe06a7d67f231f5c34c4aed2f84487c07eb0c74f64467f015bce0e07d46a10e3e1358c912e1e550eccbc34f59f29b3458671575f3174d51ff482
+EBUILD lmod-8.7.23.ebuild 3709 BLAKE2B c58262b3fd588e6830b8acb775d3fcd6c711e0066a2004ecdf20ab493be225bdc02ae1a1aaed5a575a81b9c7cb940f857007c61957e223c7f15dcaa47dcbe980 SHA512 32d826dd05e597c56b4ed9aa6ff4a5b4fbcdd14dc2360db9c378ebe1a1a772d5adbaffef618b6305646f48193419666c4d606c4cd1ad3dc222ec382163e95a3c
 EBUILD lmod-9999.ebuild 3439 BLAKE2B 973a3b3add66653503cb1a72a59b2c7aabcc2011cb4261e23ece5003ea40b160de6e61863e2c5a39a3abc4529b0cb77f7c3d8c69ddbd1602898ccc853cec4d04 SHA512 afd93d4df57ebe06a7d67f231f5c34c4aed2f84487c07eb0c74f64467f015bce0e07d46a10e3e1358c912e1e550eccbc34f59f29b3458671575f3174d51ff482
 MISC metadata.xml 965 BLAKE2B c463736b0fd3466f315c9aa58c3bbc5d1dd905cdcf0a3be52c4f425572c99da549fad92046581b5c2bff41a8b64f97a81b8b9f196e937e7073dd64ad1787f844 SHA512 26b650e51fbc0b1d81a73b74f8e3fea92757101398ecc4d9f932edd61fb7638b4fae3ad288ff825c9dc9539d9116311cb4ef784248d9cb618f0f66b414b6494a
diff --git a/sys-cluster/lmod/lmod-8.6.14.ebuild b/sys-cluster/lmod/lmod-8.6.14.ebuild
deleted file mode 100644
index b2d53897161a..000000000000
--- a/sys-cluster/lmod/lmod-8.6.14.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-inherit autotools lua-single prefix
-
-DESCRIPTION="Environment Module System based on Lua"
-HOMEPAGE="https://lmod.readthedocs.io/en/latest https://github.com/TACC/Lmod"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/TACC/Lmod"
-else
-	SRC_URI="https://github.com/TACC/Lmod/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/Lmod-${PV}
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+auto-swap +cache duplicate-paths test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${LUA_DEPS}
-	dev-lang/tcl
-	dev-lang/tk
-	$(lua_gen_cond_dep '
-		>=dev-lua/luafilesystem-1.8.0[${LUA_USEDEP}]
-		dev-lua/luajson[${LUA_USEDEP}]
-		dev-lua/luaposix[${LUA_USEDEP}]
-		dev-lua/lua-term[${LUA_USEDEP}]
-	')
-	virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}
-	test? (
-		$(lua_gen_cond_dep '
-			dev-util/hermes[${LUA_SINGLE_USEDEP}]
-		')
-		app-shells/tcsh
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-8.4.19-no-libsandbox.patch )
-
-pkg_pretend() {
-	elog "You can control the siteName and syshost settings by"
-	elog "using the variables LMOD_SITENAME and LMOD_SYSHOST, during"
-	elog "build time, which are both set to 'Gentoo' by default."
-	elog "There are a lot of options for this package, especially"
-	elog "for run time behaviour. Remember to use the EXTRA_ECONF variable."
-	elog "To see full list of options visit:"
-	elog "\t https://lmod.readthedocs.io/en/latest/090_configuring_lmod.html"
-}
-
-src_prepare() {
-	default
-	rm -r pkgs/{luafilesystem,term} || die
-	rm -r rt/{ck_mtree_syntax,colorize,end2end,help,ifur,settarg} || die
-	hprefixify -w '/#\!\/bin\/tcsh/' rt/csh_swap/csh_swap.tdesc || die
-	eautoreconf
-}
-
-src_configure() {
-	local LMOD_SITENAME="${LMOD_SITENAME:-Gentoo}"
-	local LMOD_SYSHOST="${LMOD_SYSHOST:-Gentoo}"
-
-	local LUAC="${LUA%/*}/luac${LUA#*lua}"
-
-	local myconf=(
-		--with-tcl
-		--with-fastTCLInterp
-		--with-colorize
-		--with-supportKsh
-		--without-useBuiltinPkgs
-		--with-siteControlPrefix
-		--with-siteName="${LMOD_SITENAME}"
-		--with-syshost="${LMOD_SYSHOST}"
-		--with-lua_include="$(lua_get_include_dir)"
-		--with-lua="${LUA}"
-		--with-luac="${LUAC}"
-		--with-module-root-path="${EPREFIX}/etc/modulefiles"
-		--with-spiderCacheDir="${EPREFIX}/etc/lmod_cache/spider_cache"
-		--with-updateSystemFn="${EPREFIX}/etc/lmod_cache/system.txt"
-		--prefix="${EPREFIX}/usr/share/Lmod"
-		--with-caseIndependentSorting
-		--without-hiddenItalic
-		--with-exportedModuleCmd
-		--with-useDotFiles
-		--without-redirect
-		--with-extendedDefault
-		$(use_with cache cachedLoads)
-		$(use_with duplicate-paths duplicatePaths)
-		$(use_with auto-swap autoSwap)
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-	default
-}
-
-src_test() {
-	local -x PATH="${EPREFIX}/opt/hermes/bin:${PATH}"
-	tm -vvv || die
-	testcleanup || die
-}
-
-src_install() {
-	default
-	newman "${FILESDIR}"/module.1-8.4.20 module.1
-	# not a real man page
-	rm -r "${ED}"/usr/share/Lmod/share/man || die
-	doenvd "${FILESDIR}"/99lmod
-	keepdir /etc/modulefiles
-	keepdir /etc/lmod_cache
-}
-
-pkg_postinst() {
-	if use cache ; then
-		elog "Lmod spider cache has been enabled."
-		elog "Remember to update the spider cache with"
-		elog "/usr/share/Lmod/libexec/update_lmod_system_cache_files \ "
-		elog "\t \$MODULEPATH"
-	fi
-}
diff --git a/sys-cluster/lmod/lmod-8.5.6.ebuild b/sys-cluster/lmod/lmod-8.7.23.ebuild
index 9d9f762ccb43..db3d54599e43 100644
--- a/sys-cluster/lmod/lmod-8.5.6.ebuild
+++ b/sys-cluster/lmod/lmod-8.7.23.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1..3} )
 inherit autotools lua-single prefix
@@ -90,7 +90,6 @@ src_configure() {
 		--with-caseIndependentSorting
 		--without-hiddenItalic
 		--with-exportedModuleCmd
-		--with-useDotFiles
 		--without-redirect
 		--with-extendedDefault
 		$(use_with cache cachedLoads)
@@ -112,6 +111,10 @@ src_test() {
 }
 
 src_install() {
+	dosym ../../../usr/share/Lmod/init/profile /etc/bash/bashrc.d/z00_lmod.sh
+	dosym ../../usr/share/Lmod/init/profile /etc/profile.d/z00_lmod.sh
+	dosym ../../usr/share/Lmod/init/cshrc /etc/profile.d/z00_lmod.csh
+	dosym ../../../usr/share/Lmod/init/profile.fish /etc/fish/conf.d/z00_lmod.fish
 	default
 	newman "${FILESDIR}"/module.1-8.4.20 module.1
 	# not a real man page
@@ -119,6 +122,7 @@ src_install() {
 	doenvd "${FILESDIR}"/99lmod
 	keepdir /etc/modulefiles
 	keepdir /etc/lmod_cache
+
 }
 
 pkg_postinst() {