Merge updates from master

2026-07-19 03:53:22 -04:00 · 2022-09-08 10:40:22 +00:00
parent 7b54ed56bc 9b2485d3f7
commit 0dc171e528
22 changed files with 43 additions and 52 deletions
--- a/dev-libs/sirit/sirit-0_p20220725.ebuild
+++ b/dev-libs/sirit/sirit-0_p20220725.ebuild
@@ -26,6 +26,6 @@ src_configure() {

 src_install() {
 	dodoc LICENSE.txt README.md
-	dolib.so ${BUILD_DIR}/src/libsirit.so
+	dolib.so "${BUILD_DIR}/src/libsirit.so"
 	doheader -r include/sirit
 }
--- a/dev-python/markdownify/metadata.xml
+++ b/dev-python/markdownify/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Shaoyu Tseng</name>
 	</maintainer>
 	<upstream>
-    <remote-id type="pypi">markdownify</remote-id>
-    <remote-id type="github">matthewwithanm/python-markdownify</remote-id>
+		<remote-id type="pypi">markdownify</remote-id>
+		<remote-id type="github">matthewwithanm/python-markdownify</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-util/annobin/annobin-10.73.ebuild
+++ b/dev-util/annobin/annobin-10.73.ebuild
@@ -25,7 +25,6 @@ RDEPEND="
 	!clang? ( llvm? ( <sys-devel/llvm-${LLVM_MAX_SLOT}:= ) )
 	llvm? (
 		|| (
-			sys-devel/llvm:12
 			sys-devel/llvm:13
 			sys-devel/llvm:${LLVM_MAX_SLOT}
 		)
--- a/dev-util/annobin/annobin-10.76.ebuild
+++ b/dev-util/annobin/annobin-10.76.ebuild
@@ -25,7 +25,6 @@ RDEPEND="
 	!clang? ( llvm? ( <sys-devel/llvm-${LLVM_MAX_SLOT}:= ) )
 	llvm? (
 		|| (
-			sys-devel/llvm:12
 			sys-devel/llvm:13
 			sys-devel/llvm:${LLVM_MAX_SLOT}
 		)
--- a/dev-util/fnm/fnm-1.31.0-r2.ebuild
+++ b/dev-util/fnm/fnm-1.31.0-r2.ebuild
@@ -402,14 +402,14 @@ src_prepare() {
 src_install() {
 	cargo_src_install

-	${D}/usr/bin/fnm completions --shell bash > fnm.bash-completion || die "Cannot generate bash completions"
+	"${D}"/usr/bin/fnm completions --shell bash > fnm.bash-completion || die "Cannot generate bash completions"
 	newbashcomp fnm.bash-completion fnm

-	${D}/usr/bin/fnm completions --shell zsh > fnm.zsh-completion || die "Cannot generate zsh completions"
+	"${D}"/usr/bin/fnm completions --shell zsh > fnm.zsh-completion || die "Cannot generate zsh completions"
 	insinto /usr/share/zsh/site-functions
 	newins fnm.zsh-completion _fnm

-	${D}/usr/bin/fnm completions --shell fish > fnm.fish-completion || die "Cannot generate fish completions"
+	"${D}"/usr/bin/fnm completions --shell fish > fnm.fish-completion || die "Cannot generate fish completions"
 	insinto /usr/share/fish/vendor_completions.d/
 	newins fnm.fish-completion fnm.fish

--- a/dev-util/glsl-language-server/glsl-language-server-0.3.7.ebuild
+++ b/dev-util/glsl-language-server/glsl-language-server-0.3.7.ebuild
@@ -17,5 +17,5 @@ RDEPEND="${DEPEND}"
 BDEPEND="dev-util/ninja"

 src_install() {
-	DESTDIR="${D}" ninja -C${S}/build install
+	DESTDIR="${D}" ninja -C"${S}/build" install
 }
--- a/games-emulation/yuzu/yuzu-0_p20220725.ebuild
+++ b/games-emulation/yuzu/yuzu-0_p20220725.ebuild
@@ -57,7 +57,7 @@ BDEPEND="
 	discord? ( >=dev-libs/rapidjson-1.1.0 )
 "
 S="${WORKDIR}"/yuzu-mainline-dfaab8f6571856ec3c75cfad303a50503d213665
-PATCHES=( ${FILESDIR}/${P}.patch )
+PATCHES=( "${FILESDIR}/${P}.patch" )

 REQUIRED_USE="|| ( qt5 sdl )"

@@ -70,10 +70,10 @@ pkg_setup() {

 src_unpack() {
 	default
-	mv "${WORKDIR}"/xbyak* ${S}/externals/xbyak/xbyak || die
-	mv "${WORKDIR}"/dynarmic*/* ${S}/externals/dynarmic || die
+	mv "${WORKDIR}"/xbyak* "${S}/externals/xbyak/xbyak" || die
+	mv "${WORKDIR}"/dynarmic*/* "${S}/externals/dynarmic" || die
 	if use discord; then
-		mv "${WORKDIR}"/discord*/* ${S}/externals/discord-rpc || die
+		mv "${WORKDIR}"/discord*/* "${S}/externals/discord-rpc" || die
 	fi
 }

--- a/gnome-extra/junction/metadata.xml
+++ b/gnome-extra/junction/metadata.xml
@@ -5,9 +5,6 @@
    <email>ran.dall@icloud.com</email>
    <name>Randall Vasquez</name>
  </maintainer>
-  <longdescription lang="en">
-    Junction lets you choose the application to open files and links. 
-  </longdescription>
  <upstream>
    <remote-id type="github">sonnyp/Junction</remote-id>
  </upstream>
--- a/net-im/jitsi-meet/jitsi-meet-2022.3.1.ebuild
+++ b/net-im/jitsi-meet/jitsi-meet-2022.3.1.ebuild
@@ -42,7 +42,7 @@ src_install() {
 	doins -r "opt/Jitsi Meet"

 	dobin "opt/Jitsi Meet/jitsi-meet"
-	dosym "${EPREFIX}/opt/Jitsi Meet/jitsi-meet" ${EPREFIX}/usr/bin/jitsi-meet
+	dosym "${EPREFIX}/opt/Jitsi Meet/jitsi-meet" "${EPREFIX}/usr/bin/jitsi-meet"
 	domenu usr/share/applications/jitsi-meet.desktop
 	doicon usr/share/icons/hicolor/512x512/apps/jitsi-meet.png

--- a/net-misc/bee/bee-0.3.1-r1.ebuild
+++ b/net-misc/bee/bee-0.3.1-r1.ebuild
@@ -455,7 +455,6 @@ RDEPEND="
 	|| (
 		( sys-devel/llvm:14 sys-devel/clang:14 )
 		( sys-devel/llvm:13 sys-devel/clang:13 )
-		( sys-devel/llvm:12 sys-devel/clang:12 )
 	)
 "
 DEPEND=${RDEPEND}
--- a/net-misc/bee/bee-1.0.0_alpha4-r1.ebuild
+++ b/net-misc/bee/bee-1.0.0_alpha4-r1.ebuild
@@ -490,7 +490,6 @@ DEPEND="
 	|| (
 		( sys-devel/llvm:14 sys-devel/clang:14 )
 		( sys-devel/llvm:13 sys-devel/clang:13 )
-		( sys-devel/llvm:12 sys-devel/clang:12 )
 	)
 "
 RDEPEND="
--- a/net-misc/yacy/yacy-1.924.20210209.10069.ebuild
+++ b/net-misc/yacy/yacy-1.924.20210209.10069.ebuild
@@ -34,24 +34,24 @@ src_install() {
 	# remove win-only stuff
 	find "${S}" -name "*.bat" -exec rm '{}' \; || die
 	# remove init-scripts
-	rm ${S}/*.sh || die
+	rm "${S}"/*.sh || die
 	# remove sources
 	rm -r "${S}/source" || die
-	rm ${S}/build.properties ${S}/build.xml || die
+	rm "${S}/build.properties" "${S}/build.xml" || die

 	dodoc AUTHORS NOTICE && rm AUTHORS NOTICE COPYRIGHT gpl.txt

 	yacy_home="${EROOT}/usr/share/${PN}"
 	dodir ${yacy_home}
-	cp -r ${S}/* ${D}${yacy_home} || die
+	cp -r "${S}"/* "${D}${yacy_home}" || die

-	rm -r ${D}${yacy_home}/lib/*License
+	rm -r "${D}${yacy_home}"/lib/*License

 	dodir /var/log/yacy || die
 	chown yacy:yacy "${D}/var/log/yacy" || die
 	keepdir /var/log/yacy

-	rmdir "$D/$yacy_home/DATA" || die
+	rmdir "${D}/${yacy_home}/DATA" || die
 	dosym /var/lib/yacy /${yacy_home}/DATA

 	use openrc && {
--- a/sci-electronics/lxi-tools/metadata.xml
+++ b/sci-electronics/lxi-tools/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>gentoo@taujhe.de</email>
-    <name>Jan Henke</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">lxi-tools/lxi-tools</remote-id>
-  </upstream>
-  <longdescription>
-	lxi-tools are open source software tools for managing network attached LXI 
-	compatible test instruments such as modern oscilloscopes, power supplies, 
-	spectrum analyzers etc.
+    <maintainer type="person">
+      <email>gentoo@taujhe.de</email>
+      <name>Jan Henke</name>
+    </maintainer>
+    <upstream>
+      <remote-id type="github">lxi-tools/lxi-tools</remote-id>
+    </upstream>
+    <longdescription>
+    lxi-tools are open source software tools for managing network attached LXI
+    compatible test instruments such as modern oscilloscopes, power supplies,
+    spectrum analyzers etc.

-	Features include automatic discovery of test instruments, sending SCPI 
-	commands, grabbing screenshots from supported instruments, benchmarking 
-	SCPI message performance, and powerful scripting for test automation. Both 
-	a commandline tool and a GUI tool are available.
-  </longdescription>
+    Features include automatic discovery of test instruments, sending SCPI
+    commands, grabbing screenshots from supported instruments, benchmarking
+    SCPI message performance, and powerful scripting for test automation. Both
+    a commandline tool and a GUI tool are available.
+    </longdescription>
 </pkgmetadata>
--- a/sci-libs/Mutationpp/Mutationpp-1.0.5-r1.ebuild
+++ b/sci-libs/Mutationpp/Mutationpp-1.0.5-r1.ebuild
@@ -39,6 +39,7 @@ BDEPEND="
 	dev-util/ninja
 	dev-util/cmake
 	doc? ( app-doc/doxygen )
+	python? ( ${DISTUTILS_DEPS} )
 "

 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
--- a/sci-libs/dart/dart-6.12.1-r2.ebuild
+++ b/sci-libs/dart/dart-6.12.1-r2.ebuild
@@ -160,7 +160,7 @@ src_install() {
 #	use python && cmake_build install-dartpy
 	mv "${ED}/usr/share/doc/dart/data" "${ED}/usr/share/${PN}" || die
 	if [[ -d "${ED}/usr/share/doc/dart" ]] ; then
-		if [[ "$(ls -A ${ED}/usr/share/doc/dart)" ]] ; then
+		if [[ "$(ls -A "${ED}"/usr/share/doc/dart)" ]] ; then
 			mv "${ED}"/usr/share/doc/dart/* "${ED}/usr/share/doc/${PF}" || die
 		fi
 	fi
--- a/sci-mathematics/frama-c/frama-c-24.0.ebuild
+++ b/sci-mathematics/frama-c/frama-c-24.0.ebuild
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}

 S="${WORKDIR}/${P}-${NAME}"

-PATCHES=( ${FILESDIR}/frama-c-24.0-fix-bflags.patch )
+PATCHES=( "${FILESDIR}/frama-c-24.0-fix-bflags.patch" )

 src_prepare() {
 	mv configure.in configure.ac || die
--- a/sys-apps/asus-touchpad-numpad-driver/asus-touchpad-numpad-driver-0_pre20220311.ebuild
+++ b/sys-apps/asus-touchpad-numpad-driver/asus-touchpad-numpad-driver-0_pre20220311.ebuild
@@ -43,9 +43,9 @@ src_install() {
 	insinto /usr/libexec/${PN}
 	doins -r numpad_layouts

-	python_fix_shebang ${ED}/usr/libexec/${PN}/asus_touchpad.py
+	python_fix_shebang "${ED}/usr/libexec/${PN}/asus_touchpad.py"

-	python_optimize ${ED}/usr/libexec/${PN}
+	python_optimize "${ED}/usr/libexec/${PN}"

 	dosym ../libexec/${PN}/asus_touchpad.py /usr/bin/asus_touchpad
 }
--- a/sys-apps/asus-touchpad-numpad-driver/asus-touchpad-numpad-driver-9999.ebuild
+++ b/sys-apps/asus-touchpad-numpad-driver/asus-touchpad-numpad-driver-9999.ebuild
@@ -43,9 +43,9 @@ src_install() {
 	insinto /usr/libexec/${PN}
 	doins -r numpad_layouts

-	python_fix_shebang ${ED}/usr/libexec/${PN}/asus_touchpad.py
+	python_fix_shebang "${ED}/usr/libexec/${PN}/asus_touchpad.py"

-	python_optimize ${ED}/usr/libexec/${PN}
+	python_optimize "${ED}/usr/libexec/${PN}"

 	dosym ../libexec/${PN}/asus_touchpad.py /usr/bin/asus_touchpad
 }
--- a/sys-apps/bat-extras/metadata.xml
+++ b/sys-apps/bat-extras/metadata.xml
@@ -5,9 +5,6 @@
    <email>ran.dall@icloud.com</email>
    <name>Randall Vasquez</name>
  </maintainer>
-  <longdescription lang="en">
-    Bash scripts that integrate bat with various command line tools. 
-  </longdescription>
  <upstream>
    <remote-id type="github">eth-p/bat-extras</remote-id>
  </upstream>
--- a/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild
+++ b/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild
@@ -82,7 +82,7 @@ RDEPEND="

 	runtimes? (
 		sys-cluster/charliecloud[${PYTHON_SINGLE_USEDEP}]
-		|| ( app-containers/apptainer sys-cluster/singularity )
+		app-containers/apptainer
 	)

 	serial? (
--- a/www-apps/nitter/nitter-0.1.0_p20220624.ebuild
+++ b/www-apps/nitter/nitter-0.1.0_p20220624.ebuild
@@ -41,7 +41,7 @@ src_configure() {
 	nimble_src_configure

 	# Error: unhandled exception: cannot open: public/lp.svg
-	ln -s "${S}"/public ${BUILD_DIR}/public || die
+	ln -s "${S}"/public "${BUILD_DIR}/public" || die
 }

 src_compile() {
--- a/www-apps/nitter/nitter-0.1.0_p20220705.ebuild
+++ b/www-apps/nitter/nitter-0.1.0_p20220705.ebuild
@@ -41,7 +41,7 @@ src_configure() {
 	nimble_src_configure

 	# Error: unhandled exception: cannot open: public/lp.svg
-	ln -s "${S}"/public ${BUILD_DIR}/public || die
+	ln -s "${S}"/public "${BUILD_DIR}/public" || die
 }

 src_compile() {