From 1099a3f01ea156dfaa69595c21b912ce7f087a91 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Miroslav=20=C5=A0ulc?= Date: Fri, 16 Sep 2011 19:40:28 +0000 Subject: [PATCH] dev-java/netbeans-ergonomics: fixed jdk dependency Package-Manager: portage-2.1.10.18/cvs/Linux x86_64 --- dev-java/netbeans-ergonomics/ChangeLog | 6 +++++- .../netbeans-ergonomics/netbeans-ergonomics-7.0.1.ebuild | 4 ++-- dev-java/netbeans-ide/Manifest | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dev-java/netbeans-ergonomics/ChangeLog b/dev-java/netbeans-ergonomics/ChangeLog index 14984f103e40..a86531b19039 100644 --- a/dev-java/netbeans-ergonomics/ChangeLog +++ b/dev-java/netbeans-ergonomics/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/netbeans-ergonomics # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-ergonomics/ChangeLog,v 1.5 2011/08/22 12:38:53 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-ergonomics/ChangeLog,v 1.6 2011/09/16 19:40:28 fordfrog Exp $ + + 16 Sep 2011; Miroslav Å ulc + netbeans-ergonomics-7.0.1.ebuild: + Building NetBeans is supported only with JDK 1.6 22 Aug 2011; Miroslav Å ulc -netbeans-ergonomics-7.0.ebuild: diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.0.1.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.0.1.ebuild index 665935ca8854..19185cf7b9f0 100644 --- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.0.1.ebuild +++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-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-ergonomics/netbeans-ergonomics-7.0.1.ebuild,v 1.1 2011/08/05 10:25:54 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.0.1.ebuild,v 1.2 2011/09/16 19:40:28 fordfrog Exp $ EAPI="4" WANT_ANT_TASKS="ant-nodeps" @@ -20,7 +20,7 @@ S="${WORKDIR}" CDEPEND="~dev-java/netbeans-ide-${PV} ~dev-java/netbeans-nb-${PV} ~dev-java/netbeans-platform-${PV}" -DEPEND=">=virtual/jdk-1.6 +DEPEND="virtual/jdk:1.6 app-arch/unzip ${CDEPEND} dev-java/javahelp:0" diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest index 2bd443c17645..4a1d592daee1 100644 --- a/dev-java/netbeans-ide/Manifest +++ b/dev-java/netbeans-ide/Manifest @@ -44,6 +44,6 @@ DIST F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip 459564 RMD1 DIST FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar 182065 RMD160 424c76e973ea39aba3851f556e046643ca8d335d SHA1 facc6d84b0b0a650b1d44fed941e9add9f326862 SHA256 171034ff98f1c480bc84029f7a0f5fc57a25adeaf691112a5a251345b81fc5ce 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-ide-7.0.1.ebuild 22703 RMD160 db357b96bff4b0a41ecede5ec22f94d73af12916 SHA1 2475eb51dcfa9faf1ee73a27796d012dd8ccf414 SHA256 1037f7e7c72df21666a9149bf32a4518cbbdc97b0249839ad8ea6dc11fcc3367 -MISC ChangeLog 1218 RMD160 219159dad17c6f23065d7346d4daf13b931d0c45 SHA1 73fccc8ee11f343e2575854a61f0d1b95a85024a SHA256 af7fb643efa5b095167670429d411a0641212de814f07915ddcbe1efa473c7f0 +EBUILD netbeans-ide-7.0.1.ebuild 22701 RMD160 750d49dfe3202f5b98a0d3b2c128689da98d975b SHA1 7d8e4b6519e2275562a3834771fade75341097ec SHA256 c4e3b140f61587ae706ebac96b867131d35394397f1d59aece062836fb69f642 +MISC ChangeLog 1349 RMD160 95c19b863c2d1163e4c17d443fba2cc199241693 SHA1 87224f30fc207e21147927179df591d4c7b443a7 SHA256 5e54fda0e7b3f910bd0636d21e2f4eeac21de28adf14055e1d2a416ecb8fcb16 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 -- 2.26.2