From: Miroslav Šulc <fordfrog@gentoo.org>
Date: Thu, 19 Dec 2019 20:02:34 +0000 (+0100)
Subject: media-libs/portmidi: fixed java in 217-r3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=405672c46b002f84d812c21a9e3d40f53f07879f;p=gentoo.git

media-libs/portmidi: fixed java in 217-r3

1) ninja fails for java use flag
2) jdk cannot be in BDEPEND

Closes: https://bugs.gentoo.org/703330
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
---

diff --git a/media-libs/portmidi/portmidi-217-r3.ebuild b/media-libs/portmidi/portmidi-217-r3.ebuild
index 5205ea8fbf36..049ce7a544ae 100644
--- a/media-libs/portmidi/portmidi-217-r3.ebuild
+++ b/media-libs/portmidi/portmidi-217-r3.ebuild
@@ -5,6 +5,8 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_OPTIONAL=1
+# ninja: error: build.ninja:521: multiple rules generate pm_java/pmdefaults.jar [-w dupbuild=err]
+CMAKE_MAKEFILE_GENERATOR="emake"
 inherit cmake-utils desktop xdg distutils-r1 java-pkg-opt-2
 
 DESCRIPTION="Library for real time MIDI input and output"
@@ -26,7 +28,6 @@ BDEPEND="
 		dev-texlive/texlive-latexextra
 		virtual/latex-base
 	)
-	java? ( >=virtual/jdk-1.8 )
 	python? ( >=dev-python/cython-0.12.1[${PYTHON_USEDEP}] )
 "
 CDEPEND="
@@ -36,7 +37,10 @@ CDEPEND="
 RDEPEND="${CDEPEND}
 	java? ( >=virtual/jre-1.8 )
 "
-DEPEND="${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	java? ( >=virtual/jdk-1.8 )
+"
 
 S="${WORKDIR}/${PN}"