[gentoo-commits] repo/gentoo:master commit in: dev-java/netbeans-java/

[Miroslav Šulc]

commit:     b163fe4be61755c002cf947469dcdc3fa8aeb65d
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  6 09:09:32 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct  6 09:09:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b163fe4b

dev-java/netbeans-java: fixed eapi 6 issue

Package-Manager: portage-2.3.1

 dev-java/netbeans-java/netbeans-java-8.2.ebuild | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/dev-java/netbeans-java/netbeans-java-8.2.ebuild b/dev-java/netbeans-java/netbeans-java-8.2.ebuild
index 875bf5c..5395ea6 100644
--- a/dev-java/netbeans-java/netbeans-java-8.2.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-8.2.ebuild
@@ -53,13 +53,13 @@ CDEPEND="~dev-java/netbeans-platform-${PV}
 	dev-java/beansbinding:0
 	dev-java/cglib:3
 	dev-java/jdom:0"
-DEPEND="|| ( virtual/jdk:1.7 virtual/jdk:1.8 )
+DEPEND=">=virtual/jdk-1.7
 	app-arch/unzip
 	${CDEPEND}
 	dev-java/javahelp:0
 	dev-java/json-simple:0
 	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.7
+RDEPEND="|| ( virtual/jdk:1.7 virtual/jdk:1.8 )
 	${CDEPEND}
 	dev-java/absolutelayout:0
 	>=dev-java/antlr-2.7.7-r7:0
@@ -163,19 +163,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
 	java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar
@@ -211,6 +198,7 @@ src_prepare() {
 	popd >/dev/null || die
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_install() {