From e6f4755b528a6cb6cdcd2b6e0b4bb00dfee3ca61 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Miroslav=20=C5=A0ulc?= Date: Sun, 28 Jan 2007 19:40:16 +0000 Subject: [PATCH] Corrected bug #164256. Package-Manager: portage-2.1.2-r4 --- dev-util/netbeans/ChangeLog | 8 ++++++- dev-util/netbeans/Manifest | 22 +++++++++---------- ...netbeans-5.5-r3 => digest-netbeans-5.5-r4} | 0 ...s-5.5-r3.ebuild => netbeans-5.5-r4.ebuild} | 13 +++++++---- 4 files changed, 27 insertions(+), 16 deletions(-) rename dev-util/netbeans/files/{digest-netbeans-5.5-r3 => digest-netbeans-5.5-r4} (100%) rename dev-util/netbeans/{netbeans-5.5-r3.ebuild => netbeans-5.5-r4.ebuild} (97%) diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog index 46a1369cbc28..7b6a9b8c3165 100644 --- a/dev-util/netbeans/ChangeLog +++ b/dev-util/netbeans/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/netbeans # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.52 2007/01/28 05:10:37 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.53 2007/01/28 19:40:16 fordfrog Exp $ + +*netbeans-5.5-r4 (28 Jan 2007) + + 28 Jan 2007; Miroslav Å ulc -netbeans-5.5-r3.ebuild, + +netbeans-5.5-r4.ebuild: + Corrected bug #164256. *netbeans-5.5-r3 (28 Jan 2007) diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest index 977918c52faf..81bd9f44fcc5 100644 --- a/dev-util/netbeans/Manifest +++ b/dev-util/netbeans/Manifest @@ -58,14 +58,14 @@ EBUILD netbeans-3.6-r1.ebuild 3140 RMD160 ac4f77b469f1c04a0ad666bc6ef15358c8739d MD5 e0cc15658650890cb727d0889626405b netbeans-3.6-r1.ebuild 3140 RMD160 ac4f77b469f1c04a0ad666bc6ef15358c8739d53 netbeans-3.6-r1.ebuild 3140 SHA256 6464d8799e0dc198b2ed6c83cfd534287449ee8e795072c98d14ba3e64e0fc46 netbeans-3.6-r1.ebuild 3140 -EBUILD netbeans-5.5-r3.ebuild 17285 RMD160 0ded8fbbe0b942f2c1c8407813dcd34c4888abaa SHA1 d6b5cca37ceef9d95096a92a94aa1a9b24acbefe SHA256 df3b7bba73e29abcee808c4e96edd3d8b8fbbd41edcd5f24761525c871b680f9 -MD5 d3173668fddc4b109462a1a50bb62039 netbeans-5.5-r3.ebuild 17285 -RMD160 0ded8fbbe0b942f2c1c8407813dcd34c4888abaa netbeans-5.5-r3.ebuild 17285 -SHA256 df3b7bba73e29abcee808c4e96edd3d8b8fbbd41edcd5f24761525c871b680f9 netbeans-5.5-r3.ebuild 17285 -MISC ChangeLog 10128 RMD160 8f0985eae592954e3ffe11f4fa9cea609035f42b SHA1 dbf22e70ae374f1d6bf70087d488230a26265fc4 SHA256 c585778f6dc13da049bb5bcea8cdd70c466d1018393641d45c2285e9c09b0abe -MD5 0b0634ca836746ed6635013f851861b6 ChangeLog 10128 -RMD160 8f0985eae592954e3ffe11f4fa9cea609035f42b ChangeLog 10128 -SHA256 c585778f6dc13da049bb5bcea8cdd70c466d1018393641d45c2285e9c09b0abe ChangeLog 10128 +EBUILD netbeans-5.5-r4.ebuild 17549 RMD160 19f62634a4b27a1766afd77200fb19a53d916048 SHA1 c6f72c7e722b18b1f6c0460465a36989da126950 SHA256 ea972e0cd67db2f74be30ee2ec3bbbb3ca9b91f986f17c71971b5492da801685 +MD5 5d249c8cb2704c0d97c8f0e2f0cc4042 netbeans-5.5-r4.ebuild 17549 +RMD160 19f62634a4b27a1766afd77200fb19a53d916048 netbeans-5.5-r4.ebuild 17549 +SHA256 ea972e0cd67db2f74be30ee2ec3bbbb3ca9b91f986f17c71971b5492da801685 netbeans-5.5-r4.ebuild 17549 +MISC ChangeLog 10293 RMD160 fbfa02d5b547f7fa89cff38f141c60c0b5b63337 SHA1 94b276a926e09d4b5e65200f1a0b35cb8de30195 SHA256 7c7be061527cfb771d69b5081a9818c9dd8f477b0359338e1c9a0a4f0c859449 +MD5 f35f00f88e9a8eb53f3fb0293e428eeb ChangeLog 10293 +RMD160 fbfa02d5b547f7fa89cff38f141c60c0b5b63337 ChangeLog 10293 +SHA256 7c7be061527cfb771d69b5081a9818c9dd8f477b0359338e1c9a0a4f0c859449 ChangeLog 10293 MISC metadata.xml 1231 RMD160 7bb940d05effa2a91a56ba3e82d9387018890b4f SHA1 4cc032a1928fcb75eb60dc7e1b5b0411704678d9 SHA256 4ff5362b7d9bf8eeed01ee71b738ae3ce845cfe8c645533ea83ae91bcbbc3e2e MD5 fb3f98637f1c435df7f2203cc4d7c04d metadata.xml 1231 RMD160 7bb940d05effa2a91a56ba3e82d9387018890b4f metadata.xml 1231 @@ -79,6 +79,6 @@ SHA256 0789a066b68590a8b0f278ce82c9cb8fa5cac75985a6b3a2b13b4a6f9e9fb76c files/di MD5 4bff75c3ad42f1ea6045bb39cebeb853 files/digest-netbeans-3.6-r1 247 RMD160 f84f34da26bf479b04f759d9b2ad7f9fcd4841a1 files/digest-netbeans-3.6-r1 247 SHA256 d3c304856aab911f497e7031545584f0f325b920a00c28260f97f9bcf0fb406d files/digest-netbeans-3.6-r1 247 -MD5 f237047066edfa79b73944b48b864660 files/digest-netbeans-5.5-r3 286 -RMD160 f9ccd6b0d51aa578effc86871f374b8d419ef42a files/digest-netbeans-5.5-r3 286 -SHA256 6ccefbf351ddcc6eb05dc70fb8ba2453bbec18957ccf012e31f920e52c73e664 files/digest-netbeans-5.5-r3 286 +MD5 f237047066edfa79b73944b48b864660 files/digest-netbeans-5.5-r4 286 +RMD160 f9ccd6b0d51aa578effc86871f374b8d419ef42a files/digest-netbeans-5.5-r4 286 +SHA256 6ccefbf351ddcc6eb05dc70fb8ba2453bbec18957ccf012e31f920e52c73e664 files/digest-netbeans-5.5-r4 286 diff --git a/dev-util/netbeans/files/digest-netbeans-5.5-r3 b/dev-util/netbeans/files/digest-netbeans-5.5-r4 similarity index 100% rename from dev-util/netbeans/files/digest-netbeans-5.5-r3 rename to dev-util/netbeans/files/digest-netbeans-5.5-r4 diff --git a/dev-util/netbeans/netbeans-5.5-r3.ebuild b/dev-util/netbeans/netbeans-5.5-r4.ebuild similarity index 97% rename from dev-util/netbeans/netbeans-5.5-r3.ebuild rename to dev-util/netbeans/netbeans-5.5-r4.ebuild index e5160fe5020a..36fc892d4f49 100644 --- a/dev-util/netbeans/netbeans-5.5-r3.ebuild +++ b/dev-util/netbeans/netbeans-5.5-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-5.5-r3.ebuild,v 1.1 2007/01/28 05:10:37 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-5.5-r4.ebuild,v 1.1 2007/01/28 19:40:16 fordfrog Exp $ inherit eutils java-pkg-2 java-ant-2 versionator @@ -80,7 +80,11 @@ IDE_VERSION="7" PLATFORM="6" MY_FDIR="${FILESDIR}/${SLOT}-r2" DESTINATION="/usr/share/netbeans-${SLOT}" -JAVA_PKG_BSFIX="off" +# NOTE: We cannot turn JAVA_PKG_BSFIX="off" as build file misses target=1.5 for +# ./enterprise3/modules/ext/jsp-parser-ext.jar which causes it to be built using +# default target which depends on JDK used for compilation. If JDK used for +# compilation > 1.5 then it causes bug #164256. + src_unpack () { unpack ${A} @@ -274,7 +278,8 @@ function place_unpack_symlinks() { # MISSING: webserver.jar (something from tomcat) # java - # MISSING: java/external/gjast.jar (no ebuild) + # cd java/external + #gjast.jar (netbeans stuff) einfo "Symlinking jars for junit" cd ${S}/junit/external @@ -426,7 +431,7 @@ function symlink_extjars() { #ddl.jar (netbeans stuff) java-pkg_jar-from flute java-pkg_jar-from jgoodies-forms forms.jar forms-1.0.5.jar - # MISSING: gjast.jar (no ebuild) + #gjast.jar (netbeans stuff) #java-parser.jar (netbeans stuff) java-pkg_jar-from jmi-interface jmi.jar jmi.jar #jmiutils.jar (netbeans stuff) -- 2.26.2