summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2011-09-16 19:52:07 +0000
committerMiroslav Šulc <fordfrog@gentoo.org>2011-09-16 19:52:07 +0000
commit43d9c392ad9011e81e03cad8eb8e93addf181920 (patch)
tree8e6d7dc74a4b3d150c1f0182d2eedc6c2bbb887e /dev-java
parentdev-java/netbeans-mobility: fixed jdk dependency (diff)
downloadhistorical-43d9c392ad9011e81e03cad8eb8e93addf181920.tar.gz
historical-43d9c392ad9011e81e03cad8eb8e93addf181920.tar.bz2
historical-43d9c392ad9011e81e03cad8eb8e93addf181920.zip
dev-java/netbeans-nb: fixed jdk dependency
Package-Manager: portage-2.1.10.18/cvs/Linux x86_64
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/netbeans-nb/ChangeLog6
-rw-r--r--dev-java/netbeans-nb/netbeans-nb-7.0.1.ebuild8
-rw-r--r--dev-java/netbeans-profiler/Manifest2
-rw-r--r--dev-java/netbeans-websvccommon/Manifest4
4 files changed, 12 insertions, 8 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
diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 63c22fdee853..a7a2592b6259 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -1,5 +1,5 @@
DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-EBUILD netbeans-profiler-7.0.1.ebuild 3173 RMD160 d0809667e8816d6635571835d4f09ea9c9038723 SHA1 cdef65b1481c55bf13e369851bda18893c35ed8b SHA256 1fc28f7dcac9567063c6656011260828f5ac6f91a17b58a8803c9091700069a6
+EBUILD netbeans-profiler-7.0.1.ebuild 3171 RMD160 6141a1e3f0a3a1bc8bb01525c9c383d551213cf7 SHA1 38b4c0761df5b1d831ee2bc0cbcdd2728ae429bf SHA256 aebc1055b8ecc72b1fdafa68e29053054f0ee30372d11c59b7d4a260fcc0260b
MISC ChangeLog 1018 RMD160 c9df00830a08793fa16978e148c097ece2248148 SHA1 1d5067e4d43aa314c9be2c976bc29d2b207097e1 SHA256 9319f60c3ff3d77bcecb7f8f75f4a66cfd7a503529efeafd8ad92e5e8ade3081
MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 88572cb6ca1f..cbf537b52bc8 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -1,5 +1,5 @@
DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-EBUILD netbeans-websvccommon-7.0.1.ebuild 2760 RMD160 d85bf9d5dd7346fc2a7fdc6012aeda9bb108897a SHA1 0bc1c8faaa2ec015a11b7e82d4fed8cb0b72b12d SHA256 d013f80b0f779854f8685e39c1b743a64f3ff2fd05d44c5620e65d38fdb8be04
-MISC ChangeLog 1070 RMD160 abfbbfd59fbd8f9d904fbfb29a17070f71be77c2 SHA1 533c25c0270fc1671b34f96c71cdf66b3cf5cf2d SHA256 ba602e7adaadd48ac0168f22bff2067342b12c4d9f93ee7530ee925d28ac67d5
+EBUILD netbeans-websvccommon-7.0.1.ebuild 2758 RMD160 7c8f7db3b53bb3fb7e39e99bb5a1fa1389cb5050 SHA1 34467d0773eacdab46905b07ea3761bf1ee3e3ff SHA256 b057aeba9bd69865f0e69bcf51665fe3a3af1916da11d9b026cf6a57f39dd9ec
+MISC ChangeLog 1212 RMD160 b700cdb2da16ed5b19b9fdb76c5a6630382ef12a SHA1 51e459ad50eb023a71e675464530fcfc475db65c SHA256 207b00df398c24e9588f504915e864d8d64bc7e3287c0f3569e46ec3029e22fc
MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003