From 185fa19bbf68a4d4dca534d2b46729207a177f16 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 11 May 2021 19:55:43 +0100
Subject: gentoo resync : 11.05.2021

---
 dev-lang/mozart/Manifest            |  2 +-
 dev-lang/mozart/mozart-2.0.1.ebuild | 38 +++++++++++++++++--------------------
 2 files changed, 18 insertions(+), 22 deletions(-)

(limited to 'dev-lang/mozart')

diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index 96462d02d9bf..6b945cb75b64 100644
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -1,4 +1,4 @@
 DIST mozart-2.0.1-gentoo-patchset-1.tar.gz 39069 BLAKE2B 7490d13665314b3a998fb21bd8a342f262d92a395c3b0bbfa9a7813c044220c82ac02eb0103409127862c9bb4e4c44765b1228a7bdea2cb247492c94264f4fe0 SHA512 ce3cdb8ffebd95d6065439432905ad68b9cd8b86f58478092ab55df7ae7c72498a3e29bda462f3305aff6c99d010c45d786f905e2e906550ee61656ba122bbc6
 DIST mozart-2.0.1.tar.gz 2281261 BLAKE2B 7f071e9ec130a0b482b299f4dac15d64f632702d6ecf55b7af0993087064e533b4de80f77520a725f69f68648a9ce763c8c8826bb24e52af49eda8c3ccfba0b5 SHA512 a72a6fa68296d06af72327fd11310b3be152e5ad9a56f1fc4200ac7b89cd177e9a23a38c6721e1885d4f2ed0870065e919fb9fe3c9a2833fcd8e4ac0fd43aeb4
-EBUILD mozart-2.0.1.ebuild 1796 BLAKE2B 0b0e456f623a221e77364b2b1de40d42d020c705a7adeb44615d723d5dcf35c5d1df25645c06d3e303e9ce4217d9debe109b5ebe75783c61d394f5c3c52fea5b SHA512 1d553df0698717a4b7e78c24c161118f8702b041068ce45a9a3d17bf8ad56e21896a6b1af12ecaab68666cc345e90c6c885fc62cf8f5318ef9b1b5fe861e3764
+EBUILD mozart-2.0.1.ebuild 1724 BLAKE2B 7c7e64baaecc2f7c06b54ec818ba723c9b9bf1e22f44db7868a3d6024aa86e6e0f328f2c07e876c46854a93f4537244ec275b14726ede5dbb206090d438b9155 SHA512 17a9fe7d8980dbb54d2e3a666192e2138b00a05fd0f9c8b5bcab33a7168a817ec9571b50f2dbf9fb02302380e540f2378621a48479126f80b6fbcf33d5c7057c
 MISC metadata.xml 248 BLAKE2B 15dcca8e423036aaf3d73f9557507d39f7a22a6fa36d83405d8180df441adc50b9d61f8dd720a9d0045f5b3e6ebc9785fcf8f1340c253b2d277404672d395c1b SHA512 b296da55efb17a1040203bc1f5f3bfa8160711fdb72f0543739e6efe48b75427c082eb6c405d99b3256e8d536d3d29f71fdd0fd8d281cb9a9967060ea467a034
diff --git a/dev-lang/mozart/mozart-2.0.1.ebuild b/dev-lang/mozart/mozart-2.0.1.ebuild
index 09d87b133828..d469901f25b6 100644
--- a/dev-lang/mozart/mozart-2.0.1.ebuild
+++ b/dev-lang/mozart/mozart-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils java-pkg-2 java-ant-2
+inherit cmake java-pkg-2 java-ant-2
 
 PATCHSET_VER="1"
 
@@ -31,50 +31,46 @@ DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest:= )"
 
 S="${WORKDIR}/${PN}2-${PV}"
-BUILD_DIR="${S}/build"
-CMAKE_USE_DIR="${S}"
 
 src_prepare() {
 	if [[ -d "${WORKDIR}"/${PV} ]] ; then
 		eapply "${WORKDIR}"/${PV}
 	fi
-	eapply_user
 
-	touch "${S}"/stdlib/CMakeLists.txt
-	touch "${S}"/vm/vm/test/gtest/CMakeLists.txt
+	touch stdlib/CMakeLists.txt || die
+	touch vm/vm/test/gtest/CMakeLists.txt || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DMOZART_BOOST_USE_STATIC_LIBS=OFF
-		-DEMACS=$(if use emacs; then echo /usr/bin/emacs; fi)
-		)
+		-DEMACS=$(usex emacs "/usr/bin/emacs" "")
+	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
 	EANT_GENTOO_CLASSPATH="scala:2.12"
-	cd "${S}"/bootcompiler
+	pushd bootcompiler > /dev/null || die
 	ANT_OPTS="-Xss2M" eant jar
+	popd > /dev/null || die
 
-	cd "${S}"
-	cmake-utils_src_compile
+	cmake_src_compile
 }
 
 src_test() {
-	cmake-utils_src_compile vmtest platform-test
-	cmake-utils_src_test -V
+	cmake_build vmtest platform-test
+	cmake_src_test -V
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
-	cd "${BUILD_DIR}"
-	dolib.so vm/vm/main/libmozartvm.so
-	dolib.so vm/boostenv/main/libmozartvmboost.so
+	dolib.so "${BUILD_DIR}"/vm/vm/main/libmozartvm.so
+	dolib.so "${BUILD_DIR}"/vm/boostenv/main/libmozartvmboost.so
 }
 
 pkg_postinst() {
-- 
cgit v1.2.3