diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2016-10-06 11:09:32 +0200 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2016-10-06 11:09:32 +0200 |
| commit | b163fe4be61755c002cf947469dcdc3fa8aeb65d (patch) | |
| tree | 029f242cceb7000ef8ec541b8809c6d25fce66f3 /dev-java | |
| parent | dev-java/netbeans-ide: fixed eapi 6 issue (diff) | |
| download | gentoo-b163fe4be61755c002cf947469dcdc3fa8aeb65d.tar.gz gentoo-b163fe4be61755c002cf947469dcdc3fa8aeb65d.tar.bz2 gentoo-b163fe4be61755c002cf947469dcdc3fa8aeb65d.zip | |
dev-java/netbeans-java: fixed eapi 6 issue
Package-Manager: portage-2.3.1
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/netbeans-java/netbeans-java-8.2.ebuild | 18 |
1 files 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 875bf5c16d31..5395ea6db877 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() { |