[gentoo-commits] proj/musl:master commit in: dev-java/jamvm/

["Jory Pratt" <anarchy@gentoo.org>]

commit:     1ef677ea660a587c7ffbe07c62d9422abd2443f1
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 30 14:18:36 2021 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Wed Jun 30 14:18:36 2021 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=1ef677ea

dev-java/jamvm: sync with ::gentoo

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 dev-java/jamvm/Manifest              |  2 +-
 dev-java/jamvm/jamvm-2.0.0-r1.ebuild | 26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
index 7aa2e6b..ad8f943 100644
--- a/dev-java/jamvm/Manifest
+++ b/dev-java/jamvm/Manifest
@@ -1 +1 @@
-DIST jamvm-2.0.0.tar.gz 741459 SHA256 76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d WHIRLPOOL 7e80be683fafb444cd417502b96089ce4f6879a049ca49e33691b4d5d6755814654ab4ed7626b666dd48f9d6101567b2a12de43b916055ea1d067c5d4df06443
+DIST jamvm-2.0.0.tar.gz 741459 BLAKE2B 9b8b0f8cfd8f56c0b835144c07aaca709ef466fdfe5df18438d05c66cd8a07fecfebf27e1581c67658feb3674a96c2e916b85f13dc434baf2db9be4e4fbfd0cf SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d

diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
index f16fd6a..2ccbf65 100644
--- a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
+++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils flag-o-matic multilib java-vm-2 autotools
+inherit epatch flag-o-matic multilib java-vm-2 autotools toolchain-funcs
 
 DESCRIPTION="An extremely small and specification-compliant virtual machine"
 HOMEPAGE="http://jamvm.sourceforge.net/"
@@ -14,12 +14,17 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug libffi"
 
-DEPEND="dev-java/gnu-classpath:0.98
+RDEPEND="dev-java/gnu-classpath:0.98
 	|| ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* )
-	libffi? ( virtual/libffi )
-	ppc64? ( virtual/libffi )
-	sparc? ( virtual/libffi )"
-RDEPEND="${DEPEND}"
+	libffi? ( dev-libs/libffi:= )
+	ppc64? ( dev-libs/libffi:= )
+	sparc? ( dev-libs/libffi:= )"
+DEPEND="
+	${DEPEND}
+	ppc64? ( virtual/pkgconfig )
+	sparc? ( virtual/pkgconfig )
+	libffi? ( virtual/pkgconfig )
+"
 
 PATCHES=(
 	"${FILESDIR}"/"${P}-classes-location.patch"
@@ -45,7 +50,7 @@ src_configure() {
 	filter-flags "-fomit-frame-pointer"
 
 	if use ppc64 || use sparc || use libffi; then
-		append-cflags "$(pkg-config --cflags-only-I libffi)"
+		append-cflags "$($(tc-getPKG_CONFIG) --cflags-only-I libffi)"
 	fi
 
 	local fficonf="--enable-ffi"
@@ -54,7 +59,6 @@ src_configure() {
 	fi
 
 	econf ${fficonf} \
-		--disable-dependency-tracking \
 		$(use_enable debug trace) \
 		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
 		--includedir="${EPREFIX}"/usr/include/${PN} \
@@ -87,10 +91,10 @@ src_install() {
 	dosym /usr/bin/jamvm ${JDK_DIR}/bin/java
 	for files in ${CLASSPATH_DIR}/g*; do
 		if [ $files = "${CLASSPATH_DIR}/bin/gjdoc" ] ; then
-			dosym $files ${JDK_DIR}/bin/javadoc || die
+			dosym $files ${JDK_DIR}/bin/javadoc
 		else
 			dosym $files \
-				${JDK_DIR}/bin/$(echo $files|sed "s#$(dirname $files)/g##") || die
+				${JDK_DIR}/bin/$(echo $files|sed "s#$(dirname $files)/g##")
 		fi
 	done