Added a little sed to fix paths in bin/netbeans script to address bug# 163483

Package-Manager: portage-2.1.2-r1

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index 8227b98d62aa8bb6067118154c3df6ea4620de0d..46a1369cbc28293ec3a45a6dea0141d3410eb923 100644 (file)
--- 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.51 2007/01/27 23:05:45 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.52 2007/01/28 05:10:37 wltjr Exp $
+
+*netbeans-5.5-r3 (28 Jan 2007)
+
+  28 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -netbeans-5.5-r2.ebuild, +netbeans-5.5-r3.ebuild:
+  Added a little sed to fix paths in bin/netbeans script to address bug# 163483
 
   27 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   -files/5.5/deps-txt.patch,

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 4976ca9766853f12c5001d6bd04b45a6d038cbe3..977918c52faf08265d71a8fab14a745d2aadc977 100644 (file)
--- 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-r2.ebuild 17088 RMD160 f29151b7bb7e3564d5e90174395ddd9d531e53e4 SHA1 fe361bec1ca8c7d3457949e9b79582f4774ffb6d SHA256 7b78efe96c5ed6b41cf48788591e8ebed09d19ad1073952cb08310e1f0e3fb37
-MD5 9bf1b87547053a8cfe3e57228a15076b netbeans-5.5-r2.ebuild 17088
-RMD160 f29151b7bb7e3564d5e90174395ddd9d531e53e4 netbeans-5.5-r2.ebuild 17088
-SHA256 7b78efe96c5ed6b41cf48788591e8ebed09d19ad1073952cb08310e1f0e3fb37 netbeans-5.5-r2.ebuild 17088
-MISC ChangeLog 9906 RMD160 7ddc7ba953cc5a04363872b594108be40fcec7f6 SHA1 a66fd5dff4dc2247a7049fbcb62c3df6827fe005 SHA256 728e7b3f158d67adc509b3773423a97b33d6be1078e372fd92348dcb35da268a
-MD5 113d7dbbc0a5053187837089f8d1f591 ChangeLog 9906
-RMD160 7ddc7ba953cc5a04363872b594108be40fcec7f6 ChangeLog 9906
-SHA256 728e7b3f158d67adc509b3773423a97b33d6be1078e372fd92348dcb35da268a ChangeLog 9906
+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
 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-r2 286
-RMD160 f9ccd6b0d51aa578effc86871f374b8d419ef42a files/digest-netbeans-5.5-r2 286
-SHA256 6ccefbf351ddcc6eb05dc70fb8ba2453bbec18957ccf012e31f920e52c73e664 files/digest-netbeans-5.5-r2 286
+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

diff --git a/dev-util/netbeans/files/digest-netbeans-5.5-r2 b/dev-util/netbeans/files/digest-netbeans-5.5-r3
similarity index 100%
rename from dev-util/netbeans/files/digest-netbeans-5.5-r2
rename to dev-util/netbeans/files/digest-netbeans-5.5-r3

diff --git a/dev-util/netbeans/netbeans-5.5-r2.ebuild b/dev-util/netbeans/netbeans-5.5-r3.ebuild
similarity index 98%
rename from dev-util/netbeans/netbeans-5.5-r2.ebuild
rename to dev-util/netbeans/netbeans-5.5-r3.ebuild
index ad4488d5d8c9bfcbfead54eb9c0d181eb7163182..e5160fe5020a1b255b04292f596e203700e456ae 100644 (file)
--- a/dev-util/netbeans/netbeans-5.5-r2.ebuild
+++ b/dev-util/netbeans/netbeans-5.5-r3.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-r2.ebuild,v 1.2 2007/01/23 19:21:29 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-5.5-r3.ebuild,v 1.1 2007/01/28 05:10:37 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2 versionator
 
@@ -78,7 +78,7 @@ BUILDDESTINATION="${S}/nbbuild/netbeans"
 ENTERPRISE="3"
 IDE_VERSION="7"
 PLATFORM="6"
-MY_FDIR="${FILESDIR}/${SLOT}-${PR}"
+MY_FDIR="${FILESDIR}/${SLOT}-r2"
 DESTINATION="/usr/share/netbeans-${SLOT}"
 JAVA_PKG_BSFIX="off"
 
@@ -144,6 +144,10 @@ src_compile() {
 
        # Set a initial default jdk
        echo "netbeans_jdkhome=\"\$(java-config -O)\"" >> ${BUILDDESTINATION}/etc/netbeans.conf
+
+       # fix paths per bug# 163483
+       sed -i -e 's:"$progdir"/../etc/:/etc/netbeans-5.5/:' ${BUILDDESTINATION}/bin/netbeans
+       sed -i -e 's:"${userdir}"/etc/:/etc/netbeans-5.5/:' ${BUILDDESTINATION}/bin/netbeans
 }
 
 src_install() {