diff options
| -rw-r--r-- | dev-util/netbeans/Manifest | 5 | ||||
| -rw-r--r-- | dev-util/netbeans/files/6.9/nbbuild_build.xml.patch | 53 | ||||
| -rw-r--r-- | dev-util/netbeans/files/6.9/nbbuild_templates_projectized.xml.patch | 15 | ||||
| -rw-r--r-- | dev-util/netbeans/files/6.9/netbeans-keychain.patch | 23 | ||||
| -rw-r--r-- | dev-util/netbeans/files/6.9/netbeans.png | bin | 0 -> 20011 bytes | |||
| -rw-r--r-- | dev-util/netbeans/files/6.9/o.jruby.distro_disable.patch | 52 |
6 files changed, 148 insertions, 0 deletions
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest index b99bcaa..8857e47 100644 --- a/dev-util/netbeans/Manifest +++ b/dev-util/netbeans/Manifest @@ -1,3 +1,8 @@ +AUX 6.9/nbbuild_build.xml.patch 2462 RMD160 7063d564dbe9f1eb22af201631918699a40637ee SHA1 9ab9eef8247337510f91656eafed75591e14fd53 SHA256 10d9b0677668711215797977f8766ca76b2f838ab4a27d85c3c8b2bc98b1bbda +AUX 6.9/nbbuild_templates_projectized.xml.patch 935 RMD160 4b11af335e901ba2392bee48a2cc3b1add8b31c5 SHA1 ffbad335f79b0d11f61447b7b3fd6715183ca94f SHA256 bfe90e3da56de91677ba193dac0a5ee3dbd68a6ae32b677c556c0b810e64044e +AUX 6.9/netbeans-keychain.patch 748 RMD160 04f61c66934cd7f8294684ddb6f907860cf76d57 SHA1 e7c578f9248384696d2686324ac7023573d9317c SHA256 1754a9c49d03d2abf1c2e0a07dcce66935d8f64c9e0e6ed52be28f20509afa07 +AUX 6.9/netbeans.png 20011 RMD160 a941b71b571a9cd30c49446aef1bd4244e689465 SHA1 ebd2e748bb4bc29e667ead9a2fb717a9017f9405 SHA256 1d519f018ebeff6e29436c8492dbb266446bd0144fb5519b2ef6637664de6f4a +AUX 6.9/o.jruby.distro_disable.patch 1933 RMD160 703a2183fb5f28dc6b5e5ac6f3767b1675ea765e SHA1 398eecdf43e22932a8a052ca1e3fe9e4a40f4e49 SHA256 c5034e8ef935d6f228d9582775163d2134049b0eb283948c83bd2541078a1318 DIST netbeans-6.9-l10n.tar.bz2 12352439 RMD160 f923d0a8dfbc520cd5d18c9bb97fa1fb0b15ba3a SHA1 4f2530fca18b2a7a28fc527e53d581bf077dec99 SHA256 ce09b2b121bda7da68de3e355b8f9954d4e33afdf346e4df64d7249a26fc0495 DIST netbeans-6.9.tar.bz2 258605390 RMD160 30f1bb44ba024590f39af8c421eed5a0f3bc9ae7 SHA1 cb3429ebbfb2878f73ac72bd412f1b4f66c127b3 SHA256 3521abee5e6c5f68f406f4aef67898742f777a87b782fb4116945e20e625993c EBUILD netbeans-6.9-r4.ebuild 47304 RMD160 9f69cddc73921c82b78d9125b8a3e46d6d50949c SHA1 bda492f07134ce8d3c666ac7767eb7eb87b6f409 SHA256 32671d0f76c1c07d77c0fe7260b1985befe264721cf47e9d6544aecfff48e156 diff --git a/dev-util/netbeans/files/6.9/nbbuild_build.xml.patch b/dev-util/netbeans/files/6.9/nbbuild_build.xml.patch new file mode 100644 index 0000000..54958e2 --- /dev/null +++ b/dev-util/netbeans/files/6.9/nbbuild_build.xml.patch @@ -0,0 +1,53 @@ +--- nbbuild/build.xml.orig 2010-06-22 18:39:18.000000000 +0200 ++++ nbbuild/build.xml 2010-06-22 19:05:03.000000000 +0200 +@@ -85,13 +85,6 @@ + <validate-hg-configuration root=".."/> + <taskdef name="deregisterexternalhook" classname="org.netbeans.nbbuild.extlibs.DeregisterExternalHook" classpath="build/antclasses"/> + <deregisterexternalhook root=".."/> +- <taskdef name="downloadbinaries" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries" classpath="build/antclasses"/> +- <downloadbinaries cache="${binaries.cache}" server="${binaries.server}"> +- <manifest dir="${nb_all}"> +- <include name="apisupport.harness/external/binaries-list"/> +- <include name="javahelp/external/binaries-list"/> +- </manifest> +- </downloadbinaries> + + <echo message="Bootstrapping NetBeans-specific Ant extensions..."/> + <path id="bootstrap-cp"> +@@ -124,12 +117,6 @@ + + <target name="download-all-extbins" unless="ext.binaries.downloaded" depends="bootstrap"> + <echo>Downloading external binaries (*/external/ directories)...</echo> +- <downloadbinaries cache="${binaries.cache}" server="${binaries.server}"> +- <manifest dir="${nb_all}"> +- <include name="*/external/binaries-list"/> +- <include name="contrib/*/external/binaries-list"/> +- </manifest> +- </downloadbinaries> + <property name="ext.binaries.downloaded" value="true"/> + </target> + +@@ -142,9 +129,6 @@ + <map from="${nb_all}/" to=""/> + <globmapper from="*" to="*/external/binaries-list"/> + </pathconvert> +- <downloadbinaries cache="${binaries.cache}" server="${binaries.server}"> +- <manifest dir="${nb_all}" includes="${modules.binaries-list}"/> +- </downloadbinaries> + </target> + + <target name="init-module-list" depends="bootstrap,init-tasks"> +@@ -1064,13 +1048,6 @@ + <include name="contrib/*/external/build.xml"/> + </fileset> + </subant> +- <taskdef name="downloadbinaries" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries" classpath="nbantext.jar"/> +- <downloadbinaries cache="${binaries.cache}" server="${binaries.server}" clean="true"> +- <manifest dir="${nb_all}"> +- <include name="*/external/binaries-list"/> +- <include name="contrib/*/external/binaries-list"/> +- </manifest> +- </downloadbinaries> + </target> + + <target name="-real-clean" depends="-cleanall,localclean,-clean-external"> diff --git a/dev-util/netbeans/files/6.9/nbbuild_templates_projectized.xml.patch b/dev-util/netbeans/files/6.9/nbbuild_templates_projectized.xml.patch new file mode 100644 index 0000000..e2f411c --- /dev/null +++ b/dev-util/netbeans/files/6.9/nbbuild_templates_projectized.xml.patch @@ -0,0 +1,15 @@ +--- nbbuild/templates/projectized.xml.orig 2010-06-22 19:41:31.000000000 +0200 ++++ nbbuild/templates/projectized.xml 2010-06-22 19:41:44.000000000 +0200 +@@ -205,12 +205,6 @@ + + <!-- See: http://wiki.netbeans.org/wiki/view/DevFaqExternalLibrariesUpdated --> + <target name="-release.files" depends="projectized-common.-release.files"> +- <taskdef name="downloadbinaries" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries" classpath="${nb_all}/nbbuild/nbantext.jar"/> +- <downloadbinaries cache="${binaries.cache}" server="${binaries.server}"> +- <manifest dir="."> +- <include name="external/binaries-list"/> +- </manifest> +- </downloadbinaries> + <taskdef name="releasefilesextra" classname="org.netbeans.nbbuild.extlibs.ReleaseFilesExtra" classpath="${nb_all}/nbbuild/nbantext.jar"/> + <releasefilesextra property="release.files.extra"/> + </target> diff --git a/dev-util/netbeans/files/6.9/netbeans-keychain.patch b/dev-util/netbeans/files/6.9/netbeans-keychain.patch new file mode 100644 index 0000000..86c3850 --- /dev/null +++ b/dev-util/netbeans/files/6.9/netbeans-keychain.patch @@ -0,0 +1,23 @@ +--- ide/launcher/unix/netbeans.orig 2010-07-17 20:08:48.778263924 +0200 ++++ ide/launcher/unix/netbeans 2010-07-17 20:11:28.547222625 +0200 +@@ -169,6 +169,20 @@ + then + sh=/bin/bash + fi ++ keychain=`which keychain` ++ if [ -n "$keychain" ]; then ++ $keychain -q ++ . $HOME/.keychain/$HOSTNAME-sh ++ if [ -e $userdir/keychain-keys.txt ]; then ++ for key in `cat $userdir/keychain-keys.txt`; do ++ SSH_ASKPASS=`which x11-ssh-askpass` ++ export SSH_ASKPASS ++ if [ -n "$key" ]; then ++ keychain $key ++ fi ++ done ++ fi ++ fi + if [ "${founduserdir}" = "yes" ]; then + exec $sh "$nbexec" "$@" + else diff --git a/dev-util/netbeans/files/6.9/netbeans.png b/dev-util/netbeans/files/6.9/netbeans.png Binary files differnew file mode 100644 index 0000000..f99dbb6 --- /dev/null +++ b/dev-util/netbeans/files/6.9/netbeans.png diff --git a/dev-util/netbeans/files/6.9/o.jruby.distro_disable.patch b/dev-util/netbeans/files/6.9/o.jruby.distro_disable.patch new file mode 100644 index 0000000..a62cfbe --- /dev/null +++ b/dev-util/netbeans/files/6.9/o.jruby.distro_disable.patch @@ -0,0 +1,52 @@ +diff --git nbbuild/cluster.properties b/nbbuild/cluster.properties +--- nbbuild/cluster.properties ++++ nbbuild/cluster.properties +@@ -915,12 +915,10 @@ + nb.cluster.ide,\ + nb.cluster.harness + nb.cluster.ruby=\ +- glassfish.jruby,\ + jellytools.ruby,\ + libs.jrubyparser,\ + libs.yydebug,\ + o.jruby,\ +- o.jruby.distro,\ + o.kxml2,\ + o.rubyforge.debugcommons,\ + ruby,\ +diff --git ruby.kit/nbproject/project.xml b/ruby.kit/nbproject/project.xml +--- ruby.kit/nbproject/project.xml ++++ ruby.kit/nbproject/project.xml +@@ -56,6 +56,7 @@ + <specification-version>0.114</specification-version> + </run-dependency> + </dependency> ++ <!-- + <dependency> + <code-name-base>org.jruby.distro</code-name-base> + <run-dependency> +@@ -63,6 +64,7 @@ + <specification-version>0.115</specification-version> + </run-dependency> + </dependency> ++ --> + <dependency> + <code-name-base>org.kxml2</code-name-base> + <run-dependency> +@@ -76,6 +78,7 @@ + <specification-version>1.4</specification-version> + </run-dependency> + </dependency> ++ <!-- + <dependency> + <code-name-base>org.netbeans.modules.glassfish.jruby</code-name-base> + <run-dependency> +@@ -83,6 +86,7 @@ + <specification-version>1.0</specification-version> + </run-dependency> + </dependency> ++ --> + <dependency> + <code-name-base>org.netbeans.modules.gsf.codecoverage</code-name-base> + <build-prerequisite/> + |
