Merge updates from master

app-misc/doublecmd-bin/Manifest

@@ -2,3 +2,7 @@ DIST doublecmd-1.0.6.gtk2.i386.tar.xz 7383328 BLAKE2B 8e56421c4188a2cb65bc9cfa2d
 DIST doublecmd-1.0.6.gtk2.x86_64.tar.xz 8129312 BLAKE2B 4184327ddf7eea72af031ded2f11ce74c5c75cb58fbb5dd5c4098cff2cbd0f096a178142ff9ef33bbc1e0551251609a9ebd713778e61ae478e1ee9ac83753b3a SHA512 6c2f4091805db83d28ccb2ba0980def766c1ab85b31045fc078ee3e10884d30a734dfd0f42bc4080c7a2df5d3d8da02cacd4b2f26c1a23083ba3050ecf314282
 DIST doublecmd-1.0.6.qt.i386.tar.xz 7936084 BLAKE2B e4f0f63afa4b86ace5f37f6cc7d9bb76ae095476a62bc2d4f896924f29452e59aef4c510c434937cab5d2354b6ff67246332782af7dfd6acca6fb873151aaeee SHA512 7a1fba9cdd919863e16233d5b6d6098e4ef4df7fc3a3d99fb4c16958d58515d330cced90278e8008676f5b9ab5f4a7df697ba6d60bd98f4ebf34a6d9fdb004dc
 DIST doublecmd-1.0.6.qt.x86_64.tar.xz 8622596 BLAKE2B 7437413af925aca5e4544119a5782f57eec03d075296c7ad127666205c26b44322668f0e8e63102ac73de1f447cdc2e7e20b3da100abc1a3643a75c7589115ef SHA512 1cd2b2ce36643e793e0a42efb036d9a6923e76816a6e7ea2a5365e58690d969a7e5e1443a80369b135d617bdba38739d0e193a7cefe57d7de67d9b746499bbf8
+DIST doublecmd-1.0.7.gtk2.i386.tar.xz 7520284 BLAKE2B fb0c1c0585ee27153dfaef6c77341beb19663dc45a94dbc943c8d70efafc4076b52cb531f11f1091e11a02d164f8b971ca2ca2b833fe176641bbcce0002018f4 SHA512 b85dfb7a806746374b6597388f82bb5c2395216b3a75773ab7eb6558d385cfe96e34c0d486afe2d74db7f4914bec39e630336aef0945c9748078476f51625656
+DIST doublecmd-1.0.7.gtk2.x86_64.tar.xz 8281832 BLAKE2B 1225d00e744c766ba52f10b1f69cfae4ceeda450e590bde5961960565ed2d7e5eeb8bb63059ddb283da50b95b626d0cbf3296d30df82086b07cf79c0faf2bb7c SHA512 5eab1ddb41ed569671db8f30358873ef7a5bdec3d9d65e296c212bb8282c1382a77123fe4cb58ac2f0b78c4d52a6fde80ed97f8d3278cf4e202f339ad381c585
+DIST doublecmd-1.0.7.qt.i386.tar.xz 7909008 BLAKE2B ef5512404d071c1b3780527046109dfa4a2569392e4e89ebdc5ac5eb1304e84d16e1e6d6eb72af51db6463f31158cea46f398c9af7e00a2a838ccc72b940113f SHA512 1186b17eacc87b762d10de23e0ae319ef1282b832e10561633ce6b42916bb97825d8467e8f96b61fcf723c4f21ce401a3f6ae5adc736d023953b1ed733129f25
+DIST doublecmd-1.0.7.qt.x86_64.tar.xz 8609844 BLAKE2B 47f8e37e9ff20811fae59e00c46bb9a04bc500ca8583f03da9aa8b66ced305bd3eba86b35a725bf17ea47c833167e81982a4b17e0f55a1aea2bddee8f7f77988 SHA512 b8f59dc8c8d417bf2491dfb74594d6069f2eebeee7ba3c37dfa047b05e9d8b5383b6f234025f0b6ce4357488900be73f3dc0bea7c0861d6e21c3d28d1d729078

app-misc/doublecmd-bin/doublecmd-bin-1.0.7.ebuild

@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper xdg
+
+MY_PN="doublecmd"
+DESCRIPTION="Free cross platform open source file manager with two panels side by side."
+HOMEPAGE="https://doublecmd.sourceforge.io/"
+
+SRC_URI="amd64? (
+		gtk? ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV}.gtk2.x86_64.tar.xz )
+		qt5?  ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV}.qt.x86_64.tar.xz )
+	)
+	x86? (
+		gtk? ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV}.gtk2.i386.tar.xz )
+		qt5?  ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV}.qt.i386.tar.xz )
+	)"
+
+# Licenses for package and plugins
+LICENSE="GPL-2+ LGPL-2-with-linking-exception LGPL-2.1+ LGPL-3 GPL-1 freedist"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE="gtk qt5"
+REQUIRED_USE=" ^^ ( gtk qt5 ) "
+
+S="${WORKDIR}/${MY_PN}"
+
+QA_PREBUILT="
+	*/doublecmd
+	*/libQt5Pas.so.1
+"
+
+## "ldd doublecmd" output show linking to some libraries provided by sys-libs/glibc:2.2
+## (maybe virtual/libc-1) and no libraries of sys-libs/ncurses (that removed here).
+## x11-libs/X11 is optional dependency of dev-qt/qtgui:5 by [xcb] or [X]
+## therefore it is mentioned here explicitly.
+RDEPEND="
+	dev-libs/glib:2
+	sys-apps/dbus
+	x11-libs/libX11
+	virtual/libc
+	gtk? ( x11-libs/gtk+:2 )
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtx11extras:5
+	)
+"
+
+src_install(){
+	insinto "/opt/${PN}"
+	doins -r "${S}/."
+
+	# Remove doublecmd.inf to use config from user home directory
+	rm "${ED}/opt/${PN}"/doublecmd.inf || die
+
+	exeinto "/opt/${PN}"
+	doexe "${S}/${MY_PN}"
+	make_wrapper ${MY_PN} "/opt/${PN}/${MY_PN}" "" "/opt/${PN}" "/opt/bin/"
+
+	doicon -s 48 ${MY_PN}.png
+	make_desktop_entry "${MY_PN}" "Double Commander" "${MY_PN}" "Utility;" || die "Failed making desktop entry!"
+}

dev-util/dockerfile-language-server/Manifest

@@ -0,0 +1,2 @@
+DIST dockerfile-language-server-0.9.0-deps.tar.xz 947604 BLAKE2B 440d68131507f3e0b265ea117fda452f860233960ad5bccf41e9163c12ce62fedd643e067a074bb007031b041b16ee67379bb755931d0476e7e0399a67d72537 SHA512 6195007faa078319e4a67c1fbe8c33fe002f6f92f0dfd18f5393151cf78b27d1ff57e0d2916be45b4817b5a67c6da35843f4a5fd96d3c2f02301705f304caeb8
+DIST dockerfile-language-server-nodejs-0.9.0.tgz 19571 BLAKE2B 0b75afcdb2238b4c28799b27642ea4f26cc60c4615b3636bc875e183911c70ec65234d8a7131a5d9e327e9c8d29973ea52524995117735c9ec142373a813e4d2 SHA512 40f59c5316db35369669142b24a5019825c8ea213c97b7fcd5b0956998b3088915838a72ff8a369a1a3e00a94b52c65c0a6979b2cf0c909db9ed2155d816560a

dev-util/dockerfile-language-server/dockerfile-language-server-0.9.0.ebuild

@@ -0,0 +1,44 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-nodejs-${PV}"
+
+DESCRIPTION="A language server for Dockerfiles"
+HOMEPAGE="https://github.com/rcjsuen/dockerfile-language-server-nodejs"
+SRC_URI="
+	mirror://npm/${PN}-nodejs/-/${MY_P}.tgz
+	https://tastytea.de/files/gentoo/${P}-deps.tar.xz
+"
+S="${WORKDIR}"
+
+# NOTE: to generate the dependency tarball:
+#       npm --cache "$(realpath ./npm-cache)" install $(portageq envvar DISTDIR)/${MY_P}.tgz
+#       tar -caf ${P}-deps.tar.xz npm-cache
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="net-libs/nodejs"
+BDEPEND="net-libs/nodejs[npm]"
+
+src_unpack() {
+	cd "${T}" || die "Could not cd to temporary directory"
+	unpack ${P}-deps.tar.xz
+}
+
+src_install() {
+	npm \
+		--offline \
+		--verbose \
+		--progress false \
+		--foreground-scripts \
+		--global \
+		--prefix "${ED}"/usr \
+		--cache "${T}"/npm-cache \
+		install "${DISTDIR}"/${MY_P}.tgz || die "npm install failed"
+
+	einstalldocs
+}

dev-util/dockerfile-language-server/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@tastytea.de</email>
+		<name>Ronny (tastytea) Gutbrod</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rcjsuen/dockerfile-language-server-nodejs</remote-id>
+	</upstream>
+</pkgmetadata>

dev-util/pmbootstrap/Manifest

@@ -1 +1 @@
-DIST pmbootstrap-1.45.0.tar.gz 226591 BLAKE2B 163c10102fab1c700d493bad7a007ebb2feed83f99ee9faba8ef71f1aab9ebbe6a8f2ff19d181ba01a1b121d31e36f32b20dd6ce4b9d408ec5eddc9f90b998c7 SHA512 7e62bed9350a54ea875bed6c17c7070b87900589e0db89b865baa0a5d7d211a439f308cf5b544f896d58cb4439bb1ce424e9d42defeb8ec7b14308f62a0529bf
+DIST pmbootstrap-1.46.0.tar.gz 226827 BLAKE2B 5352f6c9bc359698d85aad53bbd9046869fed084d0f81c7a40efff829e186b7635e166cd6812f205ce017bfbd9e1f9f5744e0fb241d909889e0de1cc7abf8a0f SHA512 d685cb9e1ee457f4839935f92c3e2941e7642439b29a02a352b217f4bf2dc270ecff5883bb7fb1ccb2e413d20d3d92fc9cd7db048e90d5bfa0bc570f7a7db39d

dev-util/pmbootstrap/pmbootstrap-1.46.0.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 linux-info

sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild

@@ -20,12 +20,15 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 # As of 3.5.6, wayland support required for gtk even when running on xorg.
-RDEPEND=">=x11-libs/gtk+-3.24.34[wayland]
+RDEPEND="x11-libs/gtk+:3[wayland]
+	x11-libs/gtk+:2
 	>=virtual/glu-9.0-r2
 	>=virtual/jdk-17"
 
 RESTRICT="strip"
 
+QA_PREBUILT="opt/VESTA/*"
+
 src_install() {
 	insinto /opt/VESTA
 	doins -r "${S}"/*

sci-chemistry/xcrysden/files/xcrysden-1.6.2-LDFLAGS.patch

@@ -0,0 +1,171 @@
+diff --git a/C/Makefile b/C/Makefile
+index 2aa0307..452e0f1 100644
+--- a/C/Makefile
++++ b/C/Makefile
+@@ -12,7 +12,7 @@ include make-objects
+ 
+ .SUFFIXES: .o .c
+ .c.o:
+-	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $<
++	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $<
+ 
+ objects = $(XC_OBJS) $(EXTERNAL_OBJS)
+ 
+@@ -24,18 +24,18 @@ compile:
+ #objects: $(objects)
+ #
+ #$(objects): %.o: %.c
+-#	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $<
++#	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $<
+ 
+ xcrys: $(XC_OBJS) $(EXTERNAL_OBJS)
+-	$(CC)  $(CFLAGS) $(XC_OBJS) $(EXTERNAL_OBJS) \
++	$(CC) $(LDFLAGS)  $(CFLAGS) $(XC_OBJS) $(EXTERNAL_OBJS) \
+ 	-o xcrys $(FFTW3_LIB) $(MESCHACH_LIB) $(TK_LIB) $(TCL_LIB) $(TOGL_LIB) $(GLU_LIB) $(GL_LIB) $(X_LIB) $(MATH) $(LDLIB) $(EXT_LIB)
+ 
+ xctclsh: xcTclsh.o
+-	$(CC) $(CFLAGS) xcTclsh.o -o xctclsh $(TCL_LIB) $(MATH) $(LDLIB)
++	$(CC) $(LDFLAGS) $(CFLAGS) xcTclsh.o -o xctclsh $(TCL_LIB) $(MATH) $(LDLIB)
+ 
+ XFS_OBJS = xsf2xsf.o
+ xsf2xsf: $(XFS_OBJS) 
+-	$(CC) $(CFLAGS) $(XFS_OBJS) -o xsf2xsf $(MATH) $(LDLIB)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(XFS_OBJS) -o xsf2xsf $(MATH) $(LDLIB)
+ 
+ 
+ install:
+diff --git a/F/Makefile b/F/Makefile
+index 3f8270e..92f17d1 100644
+--- a/F/Makefile
++++ b/F/Makefile
+@@ -4,10 +4,10 @@ include ../Make.sys
+ .SUFFIXES : .o .f .f90
+ 
+ .f90.o:
+-	$(FC) $(FFLAGS) -c $<
++	$(FC) $(LDFLAGS) $(FFLAGS) -c $<
+ 
+ .f.o:
+-	$(FC) $(FFLAGS) -c $<
++	$(FC) $(LDFLAGS) $(FFLAGS) -c $<
+ 
+ OBJ =   gengeom.o \
+ 	multhexa.o \
+@@ -73,70 +73,70 @@ spaghetti:
+ 	cd SRC_spaghetti; $(MAKE)
+ 
+ gengeom: $(OBJ)
+-	$(FC) $(FFLAGS) -o gengeom $(OBJ)
++	$(FC) $(LDFLAGS) $(FFLAGS) -o gengeom $(OBJ)
+ 
+ calplane: $(OBJ2)
+-	$(FC) $(FFLAGS) -o calplane $(OBJ2)
++	$(FC) $(LDFLAGS) $(FFLAGS) -o calplane $(OBJ2)
+ 
+ atomlab: $(OBJ3)
+-	$(FC) $(FFLAGS) -o atomlab $(OBJ3)
++	$(FC) $(LDFLAGS) $(FFLAGS) -o atomlab $(OBJ3)
+ 
+ recvec: recvec.o auxil.o
+-	$(FC) $(FFLAGS) -o recvec recvec.o auxil.o 
++	$(FC) $(LDFLAGS) $(FFLAGS) -o recvec recvec.o auxil.o 
+ 
+ str2xcr: $(OBJ5)
+-	$(FC) $(FFLAGS) -o str2xcr $(OBJ5)
++	$(FC) $(LDFLAGS) $(FFLAGS) -o str2xcr $(OBJ5)
+ 
+ fracCoor: fracCoor.o auxil.o  readf1.o
+-	$(FC) $(FFLAGS) -o fracCoor fracCoor.o auxil.o  readf1.o
++	$(FC) $(LDFLAGS) $(FFLAGS) -o fracCoor fracCoor.o auxil.o  readf1.o
+ 
+ multislab: $(OBJ6)
+-	$(FC) $(FFLAGS) -o multislab $(OBJ6)
++	$(FC) $(LDFLAGS) $(FFLAGS) -o multislab $(OBJ6)
+ 
+ savestruct: $(OBJ7)
+-	$(FC) $(FFLAGS) -o savestruct $(OBJ7)
++	$(FC) $(LDFLAGS) $(FFLAGS) -o savestruct $(OBJ7)
+ 
+ ftnunit: ftnunit.o
+-	$(FC) $(FFLAGS) -o ftnunit ftnunit.o
++	$(FC) $(LDFLAGS) $(FFLAGS) -o ftnunit ftnunit.o
+ 
+ kPath: $(OBJ8)
+-	$(FC) $(FFLAGS) -o kPath $(OBJ8)
++	$(FC) $(LDFLAGS) $(FFLAGS) -o kPath $(OBJ8)
+ 
+ pwKPath: $(OBJ88)
+-	$(FC) $(FFLAGS) -o pwKPath $(OBJ88)
++	$(FC) $(LDFLAGS) $(FFLAGS) -o pwKPath $(OBJ88)
+ 
+ fhi_inpini2ftn34: fhi_inpini2ftn34.o
+-	$(FC) $(FFLAGS) -o fhi_inpini2ftn34 fhi_inpini2ftn34.o
++	$(FC) $(LDFLAGS) $(FFLAGS) -o fhi_inpini2ftn34 fhi_inpini2ftn34.o
+ 
+ fhi_coord2xcr: fhi_coord2xcr.o
+-	$(FC) $(FFLAGS) -o fhi_coord2xcr fhi_coord2xcr.o
++	$(FC) $(LDFLAGS) $(FFLAGS) -o fhi_coord2xcr fhi_coord2xcr.o
+ 
+ wn_readbands: $(OBJ9)
+-	$(FC) $(FFLAGS) -o wn_readbands $(OBJ9)  $(OBJ10)
++	$(FC) $(LDFLAGS) $(FFLAGS) -o wn_readbands $(OBJ9)  $(OBJ10)
+ 
+ wn_readbakgen: wn_readbakgen.o
+-	$(FC) $(FFLAGS) -o wn_readbakgen wn_readbakgen.o
++	$(FC) $(LDFLAGS) $(FFLAGS) -o wn_readbakgen wn_readbakgen.o
+ 
+ pw: pwi2xsf pwi2xsf_old pwo_xsf2xsf
+ 
+ 
+ pwi2xsf_old: $(OBJ11) 
+-	$(FC) $(FFLAGS) -o pwi2xsf_old $(OBJ11)
++	$(FC) $(LDFLAGS) $(FFLAGS) -o pwi2xsf_old $(OBJ11)
+ 
+ pwi2xsf: $(OBJ111)
+-	$(FC) $(FFLAGS) -o pwi2xsf $(OBJ111)
++	$(FC) $(LDFLAGS) $(FFLAGS) -o pwi2xsf $(OBJ111)
+ 
+ pwo_xsf2xsf: $(OBJ13)
+-	$(FC) $(FFLAGS) -o pwo_xsf2xsf $(OBJ13)
++	$(FC) $(LDFLAGS) $(FFLAGS) -o pwo_xsf2xsf $(OBJ13)
+ 
+ fsReadBXSF: $(OBJ12)
+-	$(FC) $(FFLAGS) -o fsReadBXSF $(OBJ12)
++	$(FC) $(LDFLAGS) $(FFLAGS) -o fsReadBXSF $(OBJ12)
+ 
+ cube2xsf: cube2xsf.o
+-	$(FC) $(FFLAGS) -o cube2xsf cube2xsf.o
++	$(FC) $(LDFLAGS) $(FFLAGS) -o cube2xsf cube2xsf.o
+ 
+ xsf2cube: xsf2cube.o
+-	$(FC) $(FFLAGS) -o xsf2cube xsf2cube.o
++	$(FC) $(LDFLAGS) $(FFLAGS) -o xsf2cube xsf2cube.o
+ 
+ PROGRAMS = \
+ 	gengeom calplane atomlab recvec str2xcr fracCoor \
+diff --git a/F/SRC_nn/Makefile b/F/SRC_nn/Makefile
+index 2e44de1..06ae768 100644
+--- a/F/SRC_nn/Makefile
++++ b/F/SRC_nn/Makefile
+@@ -7,7 +7,7 @@ OBJ =   nn.o \
+ all: nn install
+ 
+ nn:     $(OBJ)
+-	$(FC) $(FFLAGS) $(OBJ) -o nn 
++	$(FC) $(LDFLAGS) $(FFLAGS) $(OBJ) -o nn 
+ 
+ install:
+ 	if test -f nn.exe ; then cp nn.exe ../../bin ; \
+diff --git a/Makefile b/Makefile
+index cfdc14a..f40c8c1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,6 +4,8 @@
+ #
+ #------------------------------------------------------------------------
+ 
++export LDFLAGS
++
+ SHELL     = /bin/sh
+ TOPDIR    = $(CURDIR)
+ TCL_INDEX = $(TOPDIR)/util/tcl_index

sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild

@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-ext-bwidget.patch"
+	"${FILESDIR}/${P}-LDFLAGS.patch"
 	"${FILESDIR}/${P}-Togl-lib.patch"
 	"${FILESDIR}/${P}-wrapper-paths.patch"
 )

sys-boot/woeusb-ng/Manifest

@@ -0,0 +1 @@
+DIST woeusb-ng-0.2.10.tar.gz 213600 BLAKE2B 384d4e93eff97c3b953770247b18409c8f611c9fe72a3292ed69e1d4ba12bf02018336adc5fcceeb8a59b494380816bfe75a571818ec44b1311f6ce02afa478b SHA512 3fd3ad3c725aabf86ead18cde7a812d97dee81ada5830e91548bd4033bba94a2b77085d00b1972d999e5cc9978ee58d74d8b376a04fd7d6ce47c44c749c9d6a8

sys-boot/woeusb-ng/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>duje.mihanovic@skole.hr</email>
+    <name>Duje Mihanović</name>
+  </maintainer>
+</pkgmetadata>

sys-boot/woeusb-ng/woeusb-ng-0.2.10.ebuild

@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1
+
+DESCRIPTION="Create Windows installer USB from ISO (rewrite of WoeUSB)"
+HOMEPAGE="https://github.com/WoeUSB/WoeUSB-ng"
+SRC_URI="https://github.com/WoeUSB/WoeUSB-ng/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/WoeUSB-ng-${PV}"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+DEPEND="
+dev-python/wxpython
+"
+RDEPEND="
+app-arch/p7zip
+sys-boot/grub[grub_platforms_pc]
+"