[gentoo-commits] repo/user/dlang:master commit in: dev-libs/gtkd/

["Horodniceanu Andrei" <a.horodniceanu@proton.me>]

commit:     938fcc98b345a05eccf5803df27c1216c5cd3693
Author:     Andrei Horodniceanu <a.horodniceanu <AT> proton <DOT> me>
AuthorDate: Tue Apr 30 08:30:03 2024 +0000
Commit:     Horodniceanu Andrei <a.horodniceanu <AT> proton <DOT> me>
CommitDate: Tue Apr 30 08:41:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=938fcc98

dev-libs/gtkd: enable dmd-2_108

Additionally refactor multilib_src_test a little and reorder variable to
please pkgcheck.

Signed-off-by: Andrei Horodniceanu <a.horodniceanu <AT> proton.me>

 dev-libs/gtkd/gtkd-3.10.0-r2.ebuild | 42 ++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/dev-libs/gtkd/gtkd-3.10.0-r2.ebuild b/dev-libs/gtkd/gtkd-3.10.0-r2.ebuild
index bc2c489..f07d56a 100644
--- a/dev-libs/gtkd/gtkd-3.10.0-r2.ebuild
+++ b/dev-libs/gtkd/gtkd-3.10.0-r2.ebuild
@@ -7,14 +7,14 @@ inherit multilib-minimal
 
 DESCRIPTION="GtkD is a D binding and OO wrapper of GTK+"
 HOMEPAGE="https://gtkd.org/"
+SRC_URI="https://gtkd.org/Downloads/sources/GtkD-${PV}.zip"
 LICENSE="LGPL-3"
 
 SLOT="3"
 KEYWORDS="~amd64 ~x86"
-SRC_URI="https://gtkd.org/Downloads/sources/GtkD-${PV}.zip"
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-DLANG_COMPAT=( dmd-2_{106..107} gdc-13 ldc2-1_{35..36} )
+DLANG_COMPAT=( dmd-2_{106..108} gdc-13 ldc2-1_{35..36} )
 declare -A DLANG_REQ_USE=(
 	[dmd]="${MULTILIB_USEDEP}"
 	[gdc]=""
@@ -103,36 +103,34 @@ multilib_src_compile() {
 
 multilib_src_test() {
 	simple_test() {
-		if multilib_is_native_abi; then
-			local cmd=(
+		local cmd=(
+			${DC} ${DCFLAGS} ${DLANG_LDFLAGS}
+			$(dlang_get_model_flag)
+			-Igenerated/gtkd
+			demos/gtkD/TestWindow/*.d
+			$(dlang_get_linker_flag)./libgtkd-3.so
+			$(dlang_get_linker_flag)-ldl
+			$(dlang_get_linker_flag)-rpath=./
+			$(dlang_get_output_flag)TestWindow
+		)
+
+		dlang_exec "${cmd[@]}"
+
+		if use static-libs; then
+			cmd=(
 				${DC} ${DCFLAGS} ${DLANG_LDFLAGS}
 				$(dlang_get_model_flag)
 				-Igenerated/gtkd
 				demos/gtkD/TestWindow/*.d
-				$(dlang_get_linker_flag)./libgtkd-3.so
-				$(dlang_get_linker_flag)-ldl
-				$(dlang_get_linker_flag)-rpath=./
-				$(dlang_get_output_flag)TestWindow
+				./libgtkd-3.a
+				$(dlang_get_output_flag)TestWindow-static
 			)
 
 			dlang_exec "${cmd[@]}"
-
-			if use static-libs; then
-				cmd=(
-					${DC} ${DCFLAGS} ${DLANG_LDFLAGS}
-					$(dlang_get_model_flag)
-					-Igenerated/gtkd
-					demos/gtkD/TestWindow/*.d
-					./libgtkd-3.a
-					$(dlang_get_output_flag)TestWindow-static
-				)
-
-				dlang_exec "${cmd[@]}"
-			fi
 		fi
 	}
 
-	dlang_foreach_impl simple_test
+	multilib_is_native_abi && dlang_foreach_impl simple_test
 }
 
 multilib_src_install() {