diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2011-09-16 19:52:07 +0000 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2011-09-16 19:52:07 +0000 |
| commit | 7825e2aaadd38d1e41121985fddae0fde6134b1d (patch) | |
| tree | 08b3b5228543e5a6e52e3a97e2437a5ddc52554d /dev-java | |
| parent | dev-java/netbeans-mobility: fixed jdk dependency (diff) | |
| download | gentoo-2-7825e2aaadd38d1e41121985fddae0fde6134b1d.tar.gz gentoo-2-7825e2aaadd38d1e41121985fddae0fde6134b1d.tar.bz2 gentoo-2-7825e2aaadd38d1e41121985fddae0fde6134b1d.zip | |
dev-java/netbeans-nb: fixed jdk dependency
(Portage version: 2.1.10.18/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/netbeans-nb/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/netbeans-nb/netbeans-nb-7.0.1.ebuild | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-java/netbeans-nb/ChangeLog b/dev-java/netbeans-nb/ChangeLog index 221bffa497e8..f90cce499d21 100644 --- a/dev-java/netbeans-nb/ChangeLog +++ b/dev-java/netbeans-nb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/netbeans-nb # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-nb/ChangeLog,v 1.5 2011/08/22 12:50:14 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-nb/ChangeLog,v 1.6 2011/09/16 19:52:07 fordfrog Exp $ + + 16 Sep 2011; Miroslav Šulc <fordfrog@gentoo.org> netbeans-nb-7.0.1.ebuild: + Building NetBeans is supported only with JDK 1.6. Also optimized slot related + instructions. 22 Aug 2011; Miroslav Šulc <fordfrog@gentoo.org> -netbeans-nb-7.0.ebuild: Removed obsolete version diff --git a/dev-java/netbeans-nb/netbeans-nb-7.0.1.ebuild b/dev-java/netbeans-nb/netbeans-nb-7.0.1.ebuild index 76343f4c0290..8a9044cd9e9a 100644 --- a/dev-java/netbeans-nb/netbeans-nb-7.0.1.ebuild +++ b/dev-java/netbeans-nb/netbeans-nb-7.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-nb/netbeans-nb-7.0.1.ebuild,v 1.1 2011/08/05 10:25:03 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-nb/netbeans-nb-7.0.1.ebuild,v 1.2 2011/09/16 19:52:07 fordfrog Exp $ EAPI="4" WANT_ANT_TASKS="ant-nodeps" @@ -21,7 +21,7 @@ S="${WORKDIR}" CDEPEND="~dev-java/netbeans-platform-${PV} ~dev-java/netbeans-harness-${PV} ~dev-java/netbeans-ide-${PV}" -DEPEND=">=virtual/jdk-1.6 +DEPEND="virtual/jdk:1.6 app-arch/unzip ${CDEPEND} dev-java/javahelp:0" @@ -115,8 +115,8 @@ src_install() { # fix paths per bug# 163483 if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then - sed -i -e 's:"$progdir"/../etc/:/etc/netbeans-7.0/:' "${D}"/${INSTALL_DIR}/bin/netbeans - sed -i -e 's:"${userdir}"/etc/:/etc/netbeans-7.0/:' "${D}"/${INSTALL_DIR}/bin/netbeans + sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans + sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans fi dodir /usr/share/icons/hicolor/32x32/apps |