Adding metadata

5 files changed, 33 insertions, 111 deletions

diff --git a/sys-cluster/charm/charm-6.8.2.ebuild b/sys-cluster/charm/charm-6.8.2.ebuild
index 3f8d8cc1cce0..d3a9a0b8dc71 100644
--- a/sys-cluster/charm/charm-6.8.2.ebuild
+++ b/sys-cluster/charm/charm-6.8.2.ebuild
@@ -26,7 +26,8 @@ BDEPEND="virtual/pkgconfig"
 
 REQUIRED_USE="
 	cmkopt? ( !charmdebug !charmtracing )
-	charmproduction? ( !charmdebug !charmtracing )"
+	charmproduction? ( !charmdebug !charmtracing )
+	mpi? ( !tcp )"
 
 get_opts() {
 	local CHARM_OPTS
@@ -57,6 +58,7 @@ get_opts() {
 	fi
 
 	CHARM_OPTS+="$(usex numa ' --with-numa' '')"
+
 	echo ${CHARM_OPTS}
 }
 
@@ -72,13 +74,12 @@ src_prepare() {
 	append-cppflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
 
 	sed \
-		-e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)") ${FCFLAGS}:g" \
-		-e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
-		-e "/CMK_CF90/s:\`which f90.*$::g" \
-		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)") ${CPPFLAGS}:g" \
-		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)") ${CPPFLAGS}:g" \
-		-e '/CMK_F90_MODINC/s:-p:-I:g' \
-		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
+		-e "/CMK_CF77/s|[fg]77|$(usex mpi "mpif90" "$(tc-getF77)") ${FCFLAGS}|g" \
+		-e "/CMK_CF90/s|f95|$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}|g" \
+		-e "/CMK_CF90/s|\`which f90.*$||g" \
+		-e "/CMK_CXX/s|g++|$(usex mpi "mpic++" "$(tc-getCXX)") ${CPPFLAGS}|g" \
+		-e "/CMK_CC/s|gcc|$(usex mpi "mpicc" "$(tc-getCC)") ${CPPFLAGS}|g" \
+		-e '/CMK_F90_MODINC/s|-p|-I|g' \
 		-i src/arch/$(usex mpi "mpi" "net")*-linux*/*sh || die
 
 	sed \
@@ -87,20 +88,13 @@ src_prepare() {
 		-e "/CMK_LDXX='g++'/s|g++|$(usex mpi "mpic++" "$(tc-getCXX)")|" \
 		-e "s|CMK_CF90=\$(which .*)|CMK_CF90=\$(which $(usex mpi "mpif90" "$(tc-getFC)"))|" \
 		-e "/-z \$CMK_CF90/d" \
-		-e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
-		-e "/f95target/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
-		-e "/f95version/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
+		-e "/F90DIR/s|gfortran|$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}|g" \
+		-e "/f95target/s|gfortran|$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}|g" \
+		-e "/f95version/s|gfortran|$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}|g" \
 		-i src/arch/common/*.sh || die
 
 	sed \
-		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
-		-e "s:-o charmxi:${LDFLAGS} &:g" \
-		-e "s:-o charmrun-silent:${LDFLAGS} &:g" \
-		-e "s:-o charmrun-notify:${LDFLAGS} &:g" \
-		-e "s:-o charmrun:${LDFLAGS} &:g" \
-		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
-		-e "s:-o charmd:${LDFLAGS} &:g" \
-		-e "/^CHARMC/s:$: ${CPPFLAGS}:g" \
+		-e "/^CHARMC/s|$| ${CPPFLAGS}|g" \
 		-i \
 		src/scripts/Makefile \
 		src/util/charmrun-src/Makefile || die
@@ -109,7 +103,8 @@ src_prepare() {
 		-e "s|^OPTS=\"\"|OPTS=\"-c++-option ${CXXFLAGS} -cc-option ${CFLAGS}\"|" \
 		build || die
 
-	eapply "${FILESDIR}"/${P}-cxxflags.patch
+	eapply "${FILESDIR}"/${P}-cxxflags.patch \
+		"${FILESDIR}"/${P}-soname.patch
 
 	# CMK optimization
 	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
@@ -124,7 +119,7 @@ src_compile() {
 	local build_version="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '')"
 	local build_options="$(get_opts)"
 	#build only accepts -j from MAKEOPTS
-	local build_commandline="${build_version} ${build_options} -j$(makeopts_jobs)"
+	local build_commandline="${build_version} ${build_options} -j$(makeopts_jobs) -ld-option ${LDFLAGS}"
 
 	# Build charmm++ first.
 	einfo "running ./build charm++ ${build_commandline}"
@@ -189,10 +184,10 @@ src_install() {
 	# Install examples.
 	if use examples; then
 		find examples/ -name 'Makefile' | xargs sed \
-			-r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \
+			-r "s|(../)+bin/charmc|/usr/bin/charmc|" -i || \
 			die "Failed to fix examples"
 		find examples/ -name 'Makefile' | xargs sed \
-			-r "s:./charmrun:./charmrun ++local:" -i || \
+			-r "s|./charmrun|./charmrun ++local|" -i || \
 			die "Failed to fix examples"
 		docinto examples
 		dodoc -r examples/charm++/*
diff --git a/sys-cluster/charm/files/charm-6.8.2-soname.patch b/sys-cluster/charm/files/charm-6.8.2-soname.patch
new file mode 100644
index 000000000000..eebe3b9ce704
--- /dev/null
+++ b/sys-cluster/charm/files/charm-6.8.2-soname.patch
@@ -0,0 +1,11 @@
+--- a/src/scripts/charmc	2026-08-20 12:06:09.410852033 +0200
++++ b/src/scripts/charmc	2026-08-20 12:08:41.675240108 +0200
+@@ -1492,7 +1492,7 @@
+ 	then
+  	  soCmd="$CMK_LDXX -o $OBJECT $OPTS_LD $OPTS_LDRO $OBJECTFILES $PRE_LIBRARIES $POST_LIBRARIES $CMK_LD_SHARED_LIBS"
+ 	else
+-	  soCmd="$CMK_LD -o $OBJECT $OPTS_LD $OPTS_LDRO $OBJECTFILES $PRE_LIBRARIES $POST_LIBRARIES $CMK_LD_SHARED_LIBS"
++	  soCmd="$CMK_LD -o $OBJECT -Wl,-soname,$(basename $OBJECT) $OPTS_LD $OPTS_LDRO $OBJECTFILES $PRE_LIBRARIES $POST_LIBRARIES $CMK_LD_SHARED_LIBS"
+ 	fi
+ 	DoNoErrCheck $soCmd
+ 	Do_res=$?
diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest
index b0b5d9b82531..5385d059d716 100644
--- a/sys-cluster/minikube/Manifest
+++ b/sys-cluster/minikube/Manifest
@@ -1,6 +1,4 @@
-DIST minikube-1.34.0-deps.tar.xz 10740660 BLAKE2B 70bc9d0023f874314e334d9e90255f1d386c190ce0f6595fa9da2e8e38faf3761a652c89580b733e89228722cf2f4ada4b76d8f2c9873bfd8211de393954f4e9 SHA512 a24686a842ecb079feb712f2dd59385e4b83a3580982f07e63e5804a4c5a050653e42e0891f8c0099c2d60b0e42eb2679d416e6eb6bde80c1e0322e5d8f3022c
-DIST minikube-1.34.0.tar.gz 88461867 BLAKE2B 13534d330a17c5f542053c90780c97de1821e3388ebaf80512116f7bbdc6f3cd9068edc8f157a3f82364b589fc5c6600a2ab15a9fbcd973b879ed500562e26e9 SHA512 bc70f533bf7d0a9cf7eb1a09d71b05d6eacddf954d328e3f2a8221f5e175be95d9d260a61d901d85e777af9939a8a02ccf81e74700453bddd15e7b3f59e50b55
-DIST minikube-1.35.0-deps.tar.xz 11771972 BLAKE2B 9e20c273dc7773038a1c012d629d1d4738888d0274b6c6ad1e92c30a714baec8ce8cb6af5ce4cecb94be65577e5db1b7880ffe1b61f1aa78aaef54b19e1e0de5 SHA512 37561c3919721f6bb0de53f3a5e9edfcff30285d3431a4ef54d7cfd4ece38420143c5b97d24939ffe51dccb81b674698cc1e0fe72d66b33a642e288552082e73
-DIST minikube-1.35.0.tar.gz 104887585 BLAKE2B 4d4f7e5ef1046cc8a1ea88558182f948ce7aa7783eeadc4efb2e27ec4c0e6807c2ae03d9526b163e755a79b02e79cc2871407b96192d932269ae8eba5c9c0af9 SHA512 ba016e4c74cf9db0acaeb45716ecfd9a1d8f7b730667a556e8b812bd5aa52a9b659ec0e5aff6a977172d833e25a543968658ae06e34b71d9576708fc16a70a40
 DIST minikube-1.37.0-deps.tar.xz 8843024 BLAKE2B 465eea55caa9acc07c647beba2f00842767136ab00a18b7aba813e2991e6c5ad2f929bfc4cb65910236e686056c60ea5eec6c9aed390c77bcd00c513a752dfdc SHA512 d748be33d3ede1a6f68115c58290dbeed5f7a93d1ec232f57f7ad0425eaac0773a214f93f44bec72ce4f4425e23276576d4bf3785e1d59ff8a8aa57849b31b6a
 DIST minikube-1.37.0.tar.gz 88912353 BLAKE2B 2c849fedd98f5e0f3036968c7fa367ff8ba6e8c14dcb11b11de2e2b574b36f624d4ddb164d983312ddd3498b192e28ea324282f0a3eae41063bf9ee113bbff84 SHA512 c6a30526230ff2fd26380727794a1db390762f5326cda30a2339065ad5b53326edcba887b39a09113fd8a9717018add3bf0f350796c9e80933a35325b5a74275
+DIST minikube-1.38.1-deps.tar.xz 8747084 BLAKE2B 750b8b4d2eaa5c720e9b1ecb1c3592991e6038c0c8656dc2e0920a70716bd13591fb98383503c494c12500c6ade214c4c98ec2486e67f875d429c7fb874ac651 SHA512 347346f5a36dcd2f4dac5675b5e9244842a4679899d704d65fb9b1d2cdc37518e27f61dcf84879f29e3e11305d94baa97e436a25c5fc8da035ed406e5abdbb1e
+DIST minikube-1.38.1.tar.gz 69059579 BLAKE2B 1dfe2126f2e7b5995194e6cc9f2b2cc7c14ad352320beb98aa452da89a2febafd41e44741d8dd973c3cf67b759cbc76c79a3b35ba2c74dc8e617751dc7573deb SHA512 4d567c74ddabcbb24259e3dfb3477dd7a33fec198d940646ee36ace5e3ad60a986a1f50afcca84c01b1762e0e275936762446208162c2bd16cfb8a037dca147f
diff --git a/sys-cluster/minikube/minikube-1.34.0.ebuild b/sys-cluster/minikube/minikube-1.34.0.ebuild
deleted file mode 100644
index 35599ed144c9..000000000000
--- a/sys-cluster/minikube/minikube-1.34.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module toolchain-funcs
-GIT_COMMIT=210b148df93a80eb872ecbeb7e35281b3c582c61
-GIT_COMMIT_SHORT=${GIT_COMMIT:0:9}
-
-DESCRIPTION="Single Node Kubernetes Cluster"
-HOMEPAGE="https://github.com/kubernetes/minikube https://kubernetes.io"
-
-SRC_URI="https://github.com/kubernetes/minikube/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 CC0-1.0 GPL-2 ISC LGPL-3 MIT MPL-2.0 WTFPL-2 ZLIB || ( LGPL-3+ GPL-2 ) || ( Apache-2.0 LGPL-3+ ) || ( Apache-2.0 CC-BY-4.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="libvirt"
-
-COMMON_DEPEND="libvirt? ( app-emulation/libvirt:=[qemu] )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	ln -sv ../vendor ./ || die
-	default
-}
-
-src_configure() {
-	case "${ARCH}" in
-		amd64|arm*)
-			minikube_arch="${ARCH}" ;;
-		ppc64)
-			# upstream does not support big-endian ppc64
-			minikube_arch="${ARCH}le" ;;
-		*)
-			die "${ARCH} is not supported" ;;
-	esac
-	minikube_target="out/minikube-linux-${minikube_arch}"
-}
-
-src_compile() {
-	# out/docker-machine-driver-kvm2 target is amd64 specific
-	# but libvirt useflag is masked on most arches.
-	COMMIT=${GIT_COMMIT} \
-	COMMIT_NO=${GIT_COMMIT} \
-	COMMIT_SHORT=${GIT_COMMIT_SHORT} \
-	LDFLAGS="" \
-	emake \
-		$(usex libvirt "out/docker-machine-driver-kvm2" "") \
-		"${minikube_target}"
-}
-
-src_install() {
-	newbin "${minikube_target}" minikube
-	use libvirt && dobin out/docker-machine-driver-kvm2
-	dodoc -r site CHANGELOG.md README.md
-
-	if ! tc-is-cross-compiler; then
-		"${minikube_target}" completion bash > "${T}/bashcomp" || die
-		"${minikube_target}" completion fish > "${T}/fishcomp" || die
-		"${minikube_target}" completion zsh > "${T}/zshcomp" || die
-
-		newbashcomp "${T}/bashcomp" minikube
-		insinto /usr/share/fish/vendor_completions.d
-		newins "${T}/fishcomp" minikube.fish
-		insinto /usr/share/zsh/site-functions
-		newins "${T}/zshcomp" _minikube
-	fi
-}
-
-pkg_postinst() {
-	elog "You may want to install the following optional dependencies:"
-	elog "  app-emulation/virtualbox or app-emulation/virtualbox-bin"
-	elog "  sys-cluster/kubectl"
-}
diff --git a/sys-cluster/minikube/minikube-1.35.0.ebuild b/sys-cluster/minikube/minikube-1.38.1.ebuild
index a54bd087e83c..6331c6c5b34b 100644
--- a/sys-cluster/minikube/minikube-1.35.0.ebuild
+++ b/sys-cluster/minikube/minikube-1.38.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 inherit bash-completion-r1 go-module toolchain-funcs
-GIT_COMMIT=dd5d320e41b5451cdf3c01891bc4e13d189586ed
+GIT_COMMIT=c93a4cb9311efc66b90d33ea03f75f2c4120e9b0
 GIT_COMMIT_SHORT=${GIT_COMMIT:0:9}
 
 DESCRIPTION="Local kubernetes clusters for learning and development"
@@ -31,6 +31,7 @@ src_unpack() {
 src_prepare() {
 	ln -sv ../vendor ./ || die
 	default
+	sed -e '/export GOTOOLCHAIN/d' -i Makefile || die
 }
 
 src_configure() {