diff options
| author | Bertrand Jacquin <beber@meleeweb.net> | 2007-08-20 11:42:50 +0200 |
|---|---|---|
| committer | Bertrand Jacquin <beber@meleeweb.net> | 2007-08-20 11:42:50 +0200 |
| commit | 116a0de7721d4b4004e1632ae32156e89a34e8a4 (patch) | |
| tree | b1a368c877a0731039b99b663357c545ac4969dd | |
| parent | delete oldies and not use xmms things (diff) | |
| download | portage-116a0de7721d4b4004e1632ae32156e89a34e8a4.tar.xz | |
delete eclipse oldies things
24 files changed, 0 insertions, 1466 deletions
diff --git a/dev-util/cvsps/Manifest b/dev-util/cvsps/Manifest deleted file mode 100644 index 12489ae8..00000000 --- a/dev-util/cvsps/Manifest +++ /dev/null @@ -1,12 +0,0 @@ -AUX amd64fix.patch 304 RMD160 4a9c37d57bb9d2faf46e96e45b4b8550c29e6d0f SHA1 aa2c568836851b016b559e7b093055c5192a8cff SHA256 8927fce70180d8c05cf725dcd6749ab950c5084f10619ca0bb90e425364c7ccc size 304 -MD5 da70b7ac3bcf66fca70aa29fff7a1f6a files/amd64fix.patch 304 -RMD160 4a9c37d57bb9d2faf46e96e45b4b8550c29e6d0f files/amd64fix.patch 304 -SHA256 8927fce70180d8c05cf725dcd6749ab950c5084f10619ca0bb90e425364c7ccc files/amd64fix.patch 304 -DIST cvsps-2.1.tar.gz 61634 RMD160 a3063f638fbf1136761549658432d5842e4a766f SHA1 a53a62b121e7b86e07a393bcb8aa4f0492a747c4 SHA256 91d3198b33463861a581686d5fcf99a5c484e7c4d819384c04fda9cafec1075a size 61634 -EBUILD cvsps-2.1-r1.ebuild 683 RMD160 6dcfd6018f32d74b314e793b40b6a917ab976f45 SHA1 388115b1127d7c06e62b4ac606de24fde7db154d SHA256 b80605af8680c8cf31b8c6ee68ba32ebcb16a3c5575916a8e4db2b33593b2435 size 683 -MD5 be9176b318cf8fdde4e5b51c732a495c cvsps-2.1-r1.ebuild 683 -RMD160 6dcfd6018f32d74b314e793b40b6a917ab976f45 cvsps-2.1-r1.ebuild 683 -SHA256 b80605af8680c8cf31b8c6ee68ba32ebcb16a3c5575916a8e4db2b33593b2435 cvsps-2.1-r1.ebuild 683 -MD5 a31476b1cd9ad9078ac6b6d1dac8e413 files/digest-cvsps-2.1-r1 226 -RMD160 cfdf2ef3f4eb61445b735a0e05424ad21825d8e7 files/digest-cvsps-2.1-r1 226 -SHA256 4897b3cddeee982a5ed32be309deb1c4750c0a28dd98cbd24c34ae5805f2e051 files/digest-cvsps-2.1-r1 226 diff --git a/dev-util/cvsps/cvsps-2.1-r1.ebuild b/dev-util/cvsps/cvsps-2.1-r1.ebuild deleted file mode 100644 index 3a83f598..00000000 --- a/dev-util/cvsps/cvsps-2.1-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsps/cvsps-2.1.ebuild,v 1.6 2006/02/07 20:42:09 blubb Exp $ - -inherit eutils - -MY_P="${P/_/}" -S="${WORKDIR}/${MY_P}" -DESCRIPTION="Generates patchset information from a CVS repository" -HOMEPAGE="http://www.cobite.com/cvsps/" -SRC_URI="http://www.cobite.com/cvsps/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ~hppa ~mips ~ppc ppc64 ~sparc x86" -IUSE="" - -DEPEND="" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/amd64fix.patch -} - -src_install() { - dobin cvsps - doman cvsps.1 - dodoc README CHANGELOG COPYING -} diff --git a/dev-util/cvsps/files/amd64fix.patch b/dev-util/cvsps/files/amd64fix.patch deleted file mode 100644 index 357d1f3e..00000000 --- a/dev-util/cvsps/files/amd64fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- cbtcommon/tcpsocket.c -+++ cbtcommon/tcpsocket.c -@@ -198,7 +198,7 @@ convert_address(long *dest, const char * - memcpy(dest, &ip.s_addr, sizeof(ip.s_addr)); - } - #else -- if ( (*dest = inet_addr(addr_str)) != -1) -+ if ( (*dest = inet_addr(addr_str)) != INADDR_NONE) - { - /* nothing */ - } - diff --git a/dev-util/cvsps/files/digest-cvsps-2.1-r1 b/dev-util/cvsps/files/digest-cvsps-2.1-r1 deleted file mode 100644 index e86657c4..00000000 --- a/dev-util/cvsps/files/digest-cvsps-2.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 bde2110ed9f5d14de8f8cb04e9d596fe cvsps-2.1.tar.gz 61634 -RMD160 a3063f638fbf1136761549658432d5842e4a766f cvsps-2.1.tar.gz 61634 -SHA256 91d3198b33463861a581686d5fcf99a5c484e7c4d819384c04fda9cafec1075a cvsps-2.1.tar.gz 61634 diff --git a/dev-util/eclipse-cdt/ChangeLog b/dev-util/eclipse-cdt/ChangeLog deleted file mode 100644 index e591c4aa..00000000 --- a/dev-util/eclipse-cdt/ChangeLog +++ /dev/null @@ -1,36 +0,0 @@ -# ChangeLog for dev-util/eclipse-cdt -# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-cdt/ChangeLog,v 1.7 2004/12/21 21:47:05 karltk Exp $ - - 25 Nov 2004; Karl Trygve Kalleberg <karltk@gentoo.org> eclipse-cdt-2.0-r2.ebuild: - Changed dep to 3.0.0, so that it at least compiles again. - - 28 Sep 2004; Sven Wegener <swegener@gentoo.org> : - Gentoo Technologies, Inc. -> Gentoo Foundation - -*eclipse-cdt-2.0-r2 (14 Sep 2004) - - 14 Sep 2004; Karl Trygve Kalleberg <karltk@gentoo.org> - eclipse-cdt-2.0-r2.ebuild: Now requires 3.0, since we haven't tested on - 3.1 yet. Fixes #63905. - -*eclipse-cdt-2.0-r2 (21 Aug 2004) - - 21 Aug 2004; Karl Trygve Kalleberg <karltk@gentoo.org> - Removed CVS connetions, reworked the .tar.bz2 snapshot, now uses eclipse-ext - properly. Still ugly, but apperas to work somewhat on x86. Removed old - revisions. - -*eclipse-cdt-2.0-r1 (30 Jul 2004) - - 30 Jul 2004; Karl Trygve Kalleberg <karltk@gentoo.org> - Minor fixes. - - 28 Jul 2004; Karl Trygve Kalleberg <karltk@gentoo.org> eclipse-cdt-2.0.ebuild: - Fixed depends. - -*eclipse-cdt-2.0 (27 Jul 2004) - - 27 Jul 2004; Karl Trygve Kalleberg <karltk@gentoo.org> eclipse-cdt-2.0.ebuild: - Initial import. Ebuild submitted by myself. Needs a lot of work still. - diff --git a/dev-util/eclipse-cdt/Manifest b/dev-util/eclipse-cdt/Manifest deleted file mode 100644 index 96ce7893..00000000 --- a/dev-util/eclipse-cdt/Manifest +++ /dev/null @@ -1,16 +0,0 @@ -DIST eclipse-cdt-2.0-gentoo-1.tar.bz2 6767450 RMD160 117d24735833f63831b81f7e1d0b04cb3c7df697 SHA1 b180ad1d1a8f3f50b380cc9fab6a270e4b0bfeab SHA256 293a2bd4edc843b9d1b916bb51a9b1b1ceafeee063345ff9067b8a90e94bae1e -EBUILD eclipse-cdt-2.0-r3.ebuild 2089 RMD160 6e1a05ccffcfbaf619ddeac984cb46d6e05a2328 SHA1 f227eecfdbec51e9f9d98e8387f11d385a80ca43 SHA256 bb6869a181bf6ca1329753d8c2f1bd30761045bb3839814d10cf4493a87924ba -MD5 33df760a72c34f94412ad48863292a88 eclipse-cdt-2.0-r3.ebuild 2089 -RMD160 6e1a05ccffcfbaf619ddeac984cb46d6e05a2328 eclipse-cdt-2.0-r3.ebuild 2089 -SHA256 bb6869a181bf6ca1329753d8c2f1bd30761045bb3839814d10cf4493a87924ba eclipse-cdt-2.0-r3.ebuild 2089 -MISC ChangeLog 1312 RMD160 cde9a86bb7b12154f66dd7e81d9f2cf944050ed8 SHA1 5a57e3bbee4b526cba15ce4b8d5c24fbcde50af0 SHA256 874012a105a99df3194ba3654f599dbc53ce1d086e0537040bf85f490c4b1a66 -MD5 d5aae5b5354f9deb9b334a325c02a1ac ChangeLog 1312 -RMD160 cde9a86bb7b12154f66dd7e81d9f2cf944050ed8 ChangeLog 1312 -SHA256 874012a105a99df3194ba3654f599dbc53ce1d086e0537040bf85f490c4b1a66 ChangeLog 1312 -MISC metadata.xml 687 RMD160 d5ef02140d607b55c588d6eb91ae779c802af57b SHA1 64561f63505337b291f1c9c3a2f1d5d871bc51a1 SHA256 5456cdb47b63c4aa70f0f1985c09b100f5d86f82d33a3428bd9d4a09d3b99a0b -MD5 76bafb39ef6b0c48d76cd8c5917fe441 metadata.xml 687 -RMD160 d5ef02140d607b55c588d6eb91ae779c802af57b metadata.xml 687 -SHA256 5456cdb47b63c4aa70f0f1985c09b100f5d86f82d33a3428bd9d4a09d3b99a0b metadata.xml 687 -MD5 455a8b4c85e16d481f888e6ae99df932 files/digest-eclipse-cdt-2.0-r3 280 -RMD160 51ddba9ba94387fa70fef8694761cac45bbdea40 files/digest-eclipse-cdt-2.0-r3 280 -SHA256 211ea246062dcb48e6304e88db3d6629b858f9ed0b5d1720e74da6dd22db5908 files/digest-eclipse-cdt-2.0-r3 280 diff --git a/dev-util/eclipse-cdt/eclipse-cdt-2.0-r3.ebuild b/dev-util/eclipse-cdt/eclipse-cdt-2.0-r3.ebuild deleted file mode 100644 index 22d0a6a6..00000000 --- a/dev-util/eclipse-cdt/eclipse-cdt-2.0-r3.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-cdt/eclipse-cdt-2.0-r2.ebuild,v 1.6 2004/11/25 13:51:32 karltk Exp $ - -inherit eclipse-ext - -DESCRIPTION="Eclipse C/C++ Development Tools" -HOMEPAGE="http://www.eclipse.org/cdt" -SRC_URI="http://dev.gentoo.org/~karltk/projects/eclipse/distfiles/eclipse-cdt-2.0-gentoo-1.tar.bz2" -LICENSE="CPL-1.0" -SLOT="2" -KEYWORDS="-* ~x86 ~amd64" -IUSE="" -DEPEND="=dev-util/eclipse-sdk-3.0.0* - x11-misc/lndir" - -# karltk: A lot more work to do: -# - add back other arches - -src_unpack() { - unpack ${A} - cd ${S} - mkdir -p ${S}/results/eclipse-copy - ( - cd ${S}/results/eclipse-copy - lndir -silent /usr/lib/eclipse-3 - # getProtectionDomain().getCodeSource() my buttocks... - rm startup.jar ; cp /usr/lib/eclipse-3/startup.jar . - ) - mkdir -p ${S}/results/final-result - touch ${S}/results/final-result/compilelog.txt - - sed -e "s/name=\"buildId\" value=\"[^\"]*\"/name=\"buildId\" value=\"${P}_gentoo\"/" \ - -e 's:name="zipsdir" value="[^"]*":name="zipsdir" value="${buildDirectory}/final-result":' \ - -i build.xml - - sed -e "s:ECLIPSE_HOME=.*:ECLIPSE_HOME=${S}/results/eclipse-copy:" \ - -i build.sh - - sed -e "s:buildLabel=.*:buildLabel=final-result:" \ - -i platform/build.properties \ - -i sdk/build.properties -} - -src_compile() { - # Use java-utils - addwrite /proc/cpuinfo - einfo "Building native code" - ( - cd results/plugins/org.eclipse.cdt.core.linux/library || die - make ARCH=x86 all || die "Failed to compile platform-specific code" - ) - einfo "Building Java code" - ./build.sh || die "Failed to compile" - - finalzip=results/final-result/org.eclipse.cdt-2.1.0-eclipse-cdt-2.0_gentoo-linux.x86.zip - if [ ! -f ${finalzip} ] ; then - die "Compilation of final SDK zip failed" - fi - - unzip ${finalzip} -d results/final-result/ -} - -src_install() { - eclipse-ext_require-slot 3 - - eclipse-ext_create-ext-layout source - - eclipse-ext_install-features results/final-result/eclipse/features/* - eclipse-ext_install-plugins results/final-result/eclipse/plugins/* -} - diff --git a/dev-util/eclipse-cdt/files/digest-eclipse-cdt-2.0-r3 b/dev-util/eclipse-cdt/files/digest-eclipse-cdt-2.0-r3 deleted file mode 100644 index eaa61c60..00000000 --- a/dev-util/eclipse-cdt/files/digest-eclipse-cdt-2.0-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 6f398d3fcec4dd7097b65c639e50ef97 eclipse-cdt-2.0-gentoo-1.tar.bz2 6767450 -RMD160 117d24735833f63831b81f7e1d0b04cb3c7df697 eclipse-cdt-2.0-gentoo-1.tar.bz2 6767450 -SHA256 293a2bd4edc843b9d1b916bb51a9b1b1ceafeee063345ff9067b8a90e94bae1e eclipse-cdt-2.0-gentoo-1.tar.bz2 6767450 diff --git a/dev-util/eclipse-cdt/metadata.xml b/dev-util/eclipse-cdt/metadata.xml deleted file mode 100644 index a5a5dd54..00000000 --- a/dev-util/eclipse-cdt/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> - -<pkgmetadata> -<herd>dev-tools</herd> - -<longdescription> -The CDT (C/C++ Development Tools) Project is working towards providing a fully -functional C and C++ Integrated Development Environment (IDE) for the Eclipse -platform. - -Features: -* C/C++ Editor (basic functionality, syntax highlighting, code completion etc.) -* C/C++ Debugger (APIs & Default implementation, using GDB) -* C/C++ Launcher (APIs & Default implementation, launches and external application) -* Parser -* Search Engine -* Content Assist Provider -* Makefile generator -</longdescription> -</pkgmetadata> diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest deleted file mode 100644 index f0ea6ff2..00000000 --- a/dev-util/eclipse-sdk/Manifest +++ /dev/null @@ -1,42 +0,0 @@ -MD5 b8db34b4a65e556e13d0267c83b272cf eclipse-sdk-3.2_pre5.ebuild 11914 -RMD160 f57c74fc1bc3bf0f02487ca182a37f325e71e1c8 eclipse-sdk-3.2_pre5.ebuild 11914 -SHA256 4aa5467f0ea93ded8167a2f035ea268a737605b0eab660a8db2d947fd2f9c664 eclipse-sdk-3.2_pre5.ebuild 11914 -MD5 079f75226c43ea3705bfae89d9d54364 files/3.2-path-fixups.patch 2788 -RMD160 2631e8f68f886dccabd3d7152649ccbc6c51a0c9 files/3.2-path-fixups.patch 2788 -SHA256 241934b9ef5d61a22e41e9bd00e4ac7db0542ca7de22b1397f4a869e37e78a13 files/3.2-path-fixups.patch 2788 -MD5 b45dd630bd71a1fe3e5b0f6025c0afb0 files/build-eclipse-classmap 1038 -RMD160 fbbd4cc07eebd35bedba396ec6176e77e23779b8 files/build-eclipse-classmap 1038 -SHA256 4a698cb0768bb15d3dad97e99a449e50f6c40e307e415959b633346a62e92a58 files/build-eclipse-classmap 1038 -MD5 f90e7013f9451494c98bf16754793ce9 files/digest-eclipse-sdk-3.2_pre5 313 -RMD160 f2675d95599b6762c510e19b2ca6d373a9309d1c files/digest-eclipse-sdk-3.2_pre5 313 -SHA256 59740d6e0618a2750172f3dec4644b30406e61165474bd9de0bf127ace46d162 files/digest-eclipse-sdk-3.2_pre5 313 -MD5 3070727f277dba706bf8e943dec990d9 files/eclipse-3.2 1680 -RMD160 2621c99f7a7ca197c7b790b92c2667ad28d34238 files/eclipse-3.2 1680 -SHA256 21359d7b3be659945b6af357ba4e0c941b037f50746a221cf0bd03ff8e63f363 files/eclipse-3.2 1680 -MD5 26c40f43c7646520e01ad4fa0562b11f files/eclipse-3.2.desktop 226 -RMD160 7dec133c198d1487302ad94daff4fe22efe03c9b files/eclipse-3.2.desktop 226 -SHA256 3640ba9a6aa4ee96a84ade83c46a059f91f8da53721916f2b933cbdc02e953ac files/eclipse-3.2.desktop 226 -MD5 8c5268d563b36ca3e67c2060f92702ee files/eclipse-buildfix.diff 752 -RMD160 2abd277b1aaf25e01cc77da261f492d95d8d4acf files/eclipse-buildfix.diff 752 -SHA256 320c8d3be44c5bc02a99c5582db1913273cb469211e43cbea69d9b2c97369c70 files/eclipse-buildfix.diff 752 -MD5 32be5292ce0af7ff9c1866c1f59e1859 files/eclipse.1 2607 -RMD160 06aaeb02a7c7720c8d8b26d9d1252095b6098a25 files/eclipse.1 2607 -SHA256 5165b07f736763eab05decb39397be0be8ae03b77f614ba3794eff71d411537b files/eclipse.1 2607 -MD5 90048be196527e5629974953d9286c26 files/fedora/eclipse-bz162177.patch 657 -RMD160 0ade04cd6baa6edf766d95199278ae94050d9280 files/fedora/eclipse-bz162177.patch 657 -SHA256 4401500fa58b95e0ed86ebcff43c78ccedf67a9a41e3da8880e2fa1524e9996c files/fedora/eclipse-bz162177.patch 657 -MD5 cf9cb89992a971926ee1b3665ea65ca8 files/fedora/eclipse-gnuformatterjdt.patch 13942 -RMD160 6375a2ee7db2d05ff279a4067dcc8abcca48f992 files/fedora/eclipse-gnuformatterjdt.patch 13942 -SHA256 00f966070f3e7642c8596d3b9a5a03f3a81dfabb551bc662fe16a08db3a48d28 files/fedora/eclipse-gnuformatterjdt.patch 13942 -MD5 656abb992a36db7359578f61e19e4bb5 files/fedora/eclipse-gnuformatterjdtui.patch 3984 -RMD160 33617c9315f86aa07f4cf17c2e62639e8ebce204 files/fedora/eclipse-gnuformatterjdtui.patch 3984 -SHA256 a69d02c73c6f2329c5a6194f34bc08907289ac62a814667ace694b16b1c9cbb0 files/fedora/eclipse-gnuformatterjdtui.patch 3984 -MD5 a126256fbd30fc549cd57d3fd614a2d6 files/fedora/eclipse-helpindexbuilder.patch 1044 -RMD160 c0ae862bf47c5a19db2ebcecf69084de8559b8e3 files/fedora/eclipse-helpindexbuilder.patch 1044 -SHA256 b0fee704652632a200cb3e1d3e177ef3f7feda43317bbff9fcd320bbdb721fb7 files/fedora/eclipse-helpindexbuilder.patch 1044 -MD5 4b1293cba8a53bb6891cc544ee4743b8 files/gcj-disable.apt.diff 8532 -RMD160 5a87efbcd0ac8b37be064956c14aae0dee865c3a files/gcj-disable.apt.diff 8532 -SHA256 40cf48e5ff629832b4cee7506d8401dfc6cca9125bf8438b5bddef1a249e7ef1 files/gcj-disable.apt.diff 8532 -MD5 92fd1affa35c1f5846f375114919b133 files/gcj-output.diff 1885 -RMD160 987f1abb63efd3815a4520a080742397eca43517 files/gcj-output.diff 1885 -SHA256 d1d76b1a7e2125ad7ee9e2667b0ce7c8cb34dc2ad28264947ba33ee52ef02a3f files/gcj-output.diff 1885 diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.2_pre5.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.2_pre5.ebuild deleted file mode 100644 index 45ece7a3..00000000 --- a/dev-util/eclipse-sdk/eclipse-sdk-3.2_pre5.ebuild +++ /dev/null @@ -1,390 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1.1.ebuild,v 1.1 2005/11/09 19:00:28 axxo Exp $ - -inherit eutils java-pkg-2 - -MY_PV="${PV/_pre/M}a" -MY_A="eclipse-sourceBuild-srcIncluded-${MY_PV}.zip" -RELEASE_DATE="200602231656" -DESCRIPTION="Eclipse Tools Platform" -HOMEPAGE="http://www.eclipse.org/" -SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/S-${MY_PV}-${RELEASE_DATE}/${MY_A}" -IUSE="gcj gnome mozilla firefox nosrc nodoc atk" -SLOT="3.2" -LICENSE="CPL-1.0" -KEYWORDS="~x86 ~ppc" - -RDEPEND=">=virtual/jre-1.4 - gcj? ( dev-java/gcj-jdk ) - >=x11-libs/gtk+-2.2.4 - mozilla? ( firefox? ( >=www-client/mozilla-firefox-1.0.7 ) - !firefox? ( >=www-client/mozilla-1.7 ) ) - atk? ( >=dev-libs/atk-1.6 ) - gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )" - -DEPEND="${RDEPEND} - >=virtual/jdk-1.4 - >=dev-java/ant-1.6.2 - >=dev-java/ant-core-1.6.2-r4 - >=sys-apps/findutils-4.1.7 - app-arch/unzip - app-arch/zip" - -# TODO: -# - use CFLAGS from make.conf when building native libraries -# - must patch eclipse build files -# - also submit patch to bugs.eclipse -# - intergration to eclipse plugin ebuilds most likely broken -# - ppc support not tested, but not explicitly broken either - -pkg_setup() { - einfo "Checking for sufficient physical RAM" - check-ram - check-cflags - java-pkg_ensure-vm-version-ge 1 4 2 - - # all other gentoo archs match in eclipse build system except amd64 - if [ ${ARCH} == 'amd64' ] ; then - eclipsearch=x86_64 - else - eclipsearch=${ARCH} - fi - - # all other gentoo archs match in sun jdk library patch except x86 - if [ ${ARCH} == 'x86' ] ; then - jvmarch=i386 - else - jvmarch=${ARCH} - fi -} - -src_unpack() { - mkdir ${S} - cd ${S} - unpack ${MY_A} || die "Could not unpack ${MY_A}" - - epatch ${FILESDIR}/${SLOT}-path-fixups.patch - epatch ${FILESDIR}/eclipse-buildfix.diff - EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ - epatch ${FILESDIR}/fedora/ - - if use gcj ; then - epatch ${FILESDIR}/gcj-output.diff - # needs 1.5 version of java.util.Map - epatch ${FILESDIR}/gcj-disable.apt.diff - rm -rf ${S}/plugins/org.eclipse.jdt.apt.* - fi - - einfo "Cleaning out prebuilt code" - clean-prebuilt-code - - einfo "Patching makefiles" - process-makefiles - - patch_amd64_ibm_jvm -} - -src_compile() { - # karltk: this should be handled by the java-pkg eclass in setup-vm - addwrite "/proc/self/maps" - addwrite "/proc/cpuinfo" - addwrite "/dev/random" - - # Figure out VM, set up ant classpath and native library paths - setup-jvm-opts - - ${use_gtk} && use mozilla && setup-mozilla-opts - - einfo "Bootstrapping bootstrap ecj" - eant ${bootstrap_ant_opts} -q -f jdtcoresrc/compilejdtcorewithjavac.xml || die "Failed to bootstrap ecj" - - einfo "Bootstrapping ecj" - ant -lib jdtcoresrc/ecj.jar -q -f jdtcoresrc/compilejdtcore.xml || die "Failed to bootstrap ecj" - - # Build native library of ecj.jar to speed up compile! - # native build time 2mins / eclipse build time reduced by 11mins - if use gcj ; then - do_native_lib - export CLASSPATH=".:${S}/ecj.jar" - export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=${S}/ecj.gcjdb" - fi - - einfo "Compiling Eclipse -- see ${S}/compilelog.txt for details" - ANT_OPTS="${ANT_OPTS} -Xmx1024M" \ - ant -lib jdtcoresrc/ecj.jar -q -f build.xml \ - -DinstallOs=linux \ - -DinstallWs=gtk \ - -DinstallArch=${eclipsearch} \ - -Dbootclasspath=${bootclasspath} \ - -Dlibsconfig=true \ - -DjavacTarget=1.4 \ - -DjavacSource=1.4 \ - -DjavacVerbose=false \ - -DjavacFailOnError=true \ - -DjavacDebugInfo=true \ - -DbuildId="Gentoo Linux ${PF}" \ - || die "Failed to compile Eclipse" - - cp launchertmp/eclipse eclipse-gtk || die "Cannot find eclipse binary" - - einfo "Creating .desktop entry" - create-desktop-entry -} - -src_install() { - eclipse_dir="/usr/lib/eclipse-${SLOT}" - - dodir /usr/lib - - einfo "Installing features and plugins" - - [ -f result/linux-gtk-${eclipsearch}-sdk.tar.gz ] || die "tar.gz bundle was not built properly!" - tar zxf result/linux-gtk-${eclipsearch}-sdk.tar.gz -C ${D}/usr/lib || die "Failed to extract the built package" - mv ${D}/usr/lib/eclipse ${D}/${eclipse_dir} - - # Install launchers and native code - insinto ${eclipse_dir} - exeinto ${eclipse_dir} - - einfo "Installing eclipse-gtk binary" - doexe eclipse-gtk || die "Failed to install eclipse binary" - - if use nosrc ; then - einfo "Stripping away source code" - strip-src - fi - - if use nodoc ; then - einfo "Stripping away documentation" - strip-docs - fi - - # create Java native libraries - use gcj && java-pkg_cachejar "no" - - # Install startup script - exeinto /usr/bin - doexe ${FILESDIR}/eclipse-${SLOT} - use gcj && doexe ${FILESDIR}/build-eclipse-classmap - - install-desktop-entry - install-link-files - doman ${FILESDIR}/eclipse.1 -} - -pkg_postinst() { - if use gcj ; then - einfo "To make use of the native libraries run:" - einfo - einfo " build-eclipse-classmap ${SLOT}" - fi -} - -# ----------------------------------------------------------------------------- -# Helper functions -# ----------------------------------------------------------------------------- - -function do_native_lib() { - einfo "Build native library of ecj.jar ..." - ${JAVA_PKG_NATIVE_LINKER} ${JAVA_PKG_NATIVE_LIB_LDFLAGS} ${JAVA_PKG_NATIVE_LDFLAGS} \ - -O2 -o ecj.jar.so ecj.jar \ - || die "failed to build native library of ecj.jar!" - rm -f ecj.gcjdb - ${JAVA_PKG_DB_TOOL} -n ecj.gcjdb 30000 \ - || die "failed to create gcj db" - ${JAVA_PKG_DB_TOOL} -a ecj.gcjdb ecj.jar ecj.jar.so \ - || die "failed to add ecj.jar.so to gcj db" -} - -function setup-mozilla-opts() { - mozilla_dir="--mozdir-unset---" - - if use firefox && [ -f ${ROOT}/usr/lib/mozilla-firefox/libgtkembedmoz.so ] ; then - einfo "Compiling against www-client/mozilla-firefox" - mozilla_dir=/usr/lib/mozilla-firefox - elif [ -f ${ROOT}/usr/lib/mozilla/libgtkembedmoz.so ] ; then - einfo "Compiling against www-client/mozilla" - mozilla_dir=/usr/lib/mozilla - else - eerror "You have enabled the embedded mozilla component, but no suitable" - eerror "provider was found. You need Mozilla or Firefox compiled against" - eerror "gtk+ v2.0 or newer." - eerror "To merge it, execute 'USE=\"gtk2\" emerge mozilla' as root." - eerror "To disable embedded mozilla, remove \"mozilla\" from your USE flags." - die "Need Mozilla compiled with gtk+-2.x support" - fi - - export GECKO_SDK="${mozilla_dir}" - export GECKO_INCLUDES="-include ${GECKO_SDK}/include/mozilla-config.h \ - -I${GECKO_SDK}/include/xpcom \ - -I${GECKO_SDK}/include/string \ - -I${GECKO_SDK}/include/embed_base \ - -I${JAVA_HOME}/include/linux" - export GECKO_LIBS="-L${GECKO_SDK} -lgtkembedmoz" - - if use firefox && has_version '>=www-client/mozilla-firefox-1.5-r11' ; then - export GECKO_INCLUDES="${GECKO_INCLUDES} -I/usr/include/nspr" - else - export GECKO_INCLUDES="${GECKO_INCLUDES} \ - -I${GECKO_SDK}/include/nspr -I${GECKO_SDK}/include/nspr/include" - fi -} - -function build-native() { - sh features/org.eclipse.platform.launchers/library/gtk/build.sh \ - -os linux -ws gtk \ - -arch ${eclipsearch} || die "Failed to build launcher" -} - -function process-makefiles() { - # Comment out hard-coded JAVA_HOME - sed -i 's/^JAVA_HOME/#JAVA_HOME/' plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile || die "Failed to patch Makefile" - - # Select the set of native libraries to compile - local libs="make_swt make_awt make_atk make_glx" - - if use gnome ; then - einfo "Building GNOME VFS support" - libs="${libs} make_gnome" - fi - - if use mozilla ; then - einfo "Building Mozilla embed support" - libs="${libs} make_mozilla" - fi - - if use atk ; then - einfo "Building ATK support" - libs="${libs} make_atk" - fi - - sed -i "s/^all:.*/all: ${libs}/" "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak" || die "Failed to patch make_linux.mak" -} - -function create-desktop-entry() { - cat ${FILESDIR}/eclipse-${SLOT}.desktop | \ - sed -e "s/@PV@/${PV}/" \ - > eclipse-${SLOT}.desktop || die "Failed to create desktop entry" -} - -function install-desktop-entry() { - dodir /usr/share/applications - insinto /usr/share/applications - doins eclipse-${SLOT}.desktop -} - -function clean-prebuilt-code() { - find ${S} -type f \( -name '*.class' -o -name '*.so' -o -name '*.so.*' -o -name 'eclipse' \) | xargs rm -f -} - -function get-memory-total() { - cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([0-9]+).*/\1/" -} - -function check-ram() { - [ $(get-memory-total) -ge 775000 ] && return - echo - ewarn "To build Eclipse, at least 768MB of RAM is recommended." - ewarn "Your machine has less RAM. Continuing anyway. If the build" - ewarn "stops with an error about invalid memory, increase your swap." - echo -} - -function install-link-files() { - einfo "Installing link files" - - dodir /usr/lib/eclipse-${SLOT}/links - - echo "path=/opt/eclipse-extensions-3" > ${D}/${eclipse_dir}/links/eclipse-binary-extensions-3.link - echo "path=/opt/eclipse-extensions-${SLOT}" > ${D}/${eclipse_dir}/links/eclipse-binary-extensions-${SLOT}.link - - echo "path=/usr/lib/eclipse-extensions-3" > ${D}/${eclipse_dir}/links/eclipse-extensions-3.link - echo "path=/usr/lib/eclipse-extensions-${SLOT}" > ${D}/${eclipse_dir}/links/eclipse-extensions-${SLOT}.link -} - -function patch_amd64_ibm_jvm() { - # the ibm jdk ebuild should have fixed headers, but until then - # we just fix the compiling here (see bug #97421) - if [ ${ARCH} == 'amd64' ]; then - if [ ! -z "`java-config --java-version | grep IBM`" ] ; then - einfo "Fixing IBM jdk header problem" - find plugins -name "make_linux.mak" -print0 | xargs -0 sed -i -e 's/^CFLAGS =/CFLAGS = -D_JNI_IMPORT_OR_EXPORT_= /' - fi - fi -} - -function setup-jvm-opts() { - # Figure out correct boot classpath - # karltk: this should be handled by the java-pkg eclass in setup-vm - if [ ! -z "`java-config --java-version | grep IBM`" ] ; then - # IBM JRE - local bp="$(java-config --jdk-home)/jre/lib" - bootclasspath="${bp}/core.jar:${bp}/xml.jar:${bp}/graphics.jar:${bp}/security.jar:${bp}/server.jar" - JAVA_LIB_DIR="$(java-config --jdk-home)/jre/bin" - elif [ ! -z "`java-config --java-version | grep 'GNU libgcj'`" ] ; then - # GCJ - JAVA_LIB_DIR="$(java-config --jdk-home)/lib" - else - # Sun derived JREs (Blackdown, Sun) - local bp="$(java-config --jdk-home)/jre/lib" - bootclasspath="${bp}/rt.jar:${bp}/jsse.jar" - JAVA_LIB_DIR="$(java-config --jdk-home)/jre/lib/${jvmarch}" - fi - einfo "Using bootclasspath ${bootclasspath}" - einfo "Using JVM library path ${JAVA_LIB_DIR}" - - if [[ ! -f ${JAVA_LIB_DIR}/libawt.so ]] ; then - die "Could not find libjawt.so library" - fi - - export AWT_LIB_PATH=${JAVA_LIB_DIR} -} - -function strip-src() { - local bp=${D}/${eclipse_dir} - - rm -rf ${bp}/plugins/org.eclipse.pde.source_3* - rm -rf ${bp}/plugins/org.eclipse.jdt.source_3* - rm -rf ${bp}/plugins/org.eclipse.platform.source.linux.* - rm -rf ${bp}/plugins/org.eclipse.platform.source_3* - - rm -rf ${bp}/features/org.eclipse.jdt.source_3*/ - rm -rf ${bp}/features/org.eclipse.pde.source_3*/ - rm -rf ${bp}/features/org.eclipse.platform.source_3*/ -} - -function strip-docs() { - local bp=${D}/${eclipse_dir} - - rm -rf ${bp}/plugins/org.eclipse.platform.doc.* - rm -rf ${bp}/plugins/org.eclipse.jdt.doc.* - rm -rf ${bp}/plugins/org.eclipse.pde.doc.* -} - -function check-cflags() { - einfo "Checking for bad CFLAGS" - - local badflags="-fomit-frame-pointer -msse2" - local error=false - - for x in ${badflags} ; do - if [ ! -z "$(echo ${CFLAGS} | grep -- $x)" ] ; then - ewarn "Found offending option $x in your CFLAGS" - error=true - fi - done - if [ ${error} == "true" ]; then - echo - ewarn "One or more potentially gruesome CFLAGS detected. When you run into trouble," - ewarn "please edit /etc/make.conf and remove all offending flags, then recompile" - ewarn "Eclipse and all its dependencies before submitting a bug report." - echo - ewarn "In particular, gtk+ is extremely sensitive to which which flags it was" - ewarn "compiled with." - echo - einfo "Tip: use equery depgraph \"=${PF}\" to list all dependencies." - echo - ebeep - fi -} diff --git a/dev-util/eclipse-sdk/files/3.2-path-fixups.patch b/dev-util/eclipse-sdk/files/3.2-path-fixups.patch deleted file mode 100644 index f61f4adb..00000000 --- a/dev-util/eclipse-sdk/files/3.2-path-fixups.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -ur eclipse.orig/plugins/org.eclipse.update.core.linux/src/build.xml eclipse.fix/plugins/org.eclipse.update.core.linux/src/build.xml ---- eclipse.orig/plugins/org.eclipse.update.core.linux/src/build.xml 2005-05-13 21:37:28.000000000 +0300 -+++ eclipse.fix/plugins/org.eclipse.update.core.linux/src/build.xml 2005-05-23 21:43:30.000000000 +0300 -@@ -5,7 +5,7 @@ - <!-- Set a meaningful default value for when it is not. --> - <property name="eclipse-home" value="${basedir}/../.."/> - <property name="jdk-path" value="${java.home}"/> -- <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/x86/"/> -+ <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/${arch}/"/> - <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/> - <property name="src-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/> - -@@ -47,17 +47,16 @@ - <property name="header-path" value="${jdk-path}/../include"/> - <property name="header-linux-path" value="${header-path}/linux" /> - -- <echo message="gcc -o ${library-file} -shared -I${src-path} -I${header-linux-path} ${library-file} -static -lc"/> -+ <echo message="gcc -o ${library-file} -shared -fPIC -I${src-path} -I${header-linux-path} ${library-file}"/> - - <apply executable="gcc" dest="${eclipse-home}/" parallel="false"> - <arg value="-o"/> - <arg value="${library-file}"/> - <arg value="-shared"/> -+ <arg value="-fPIC"/> - <arg value="-I${src-path}"/> - <arg value="-I${header-path}"/> - <arg value="-I${header-linux-path}"/> - <srcfile/> -- <arg value="-static"/> -- <arg value="-lc"/> - <fileset dir="${src-path}" includes="*.c"/> - <mapper type="glob" from="*.c" to="*.o"/> ---- eclipse-sdk-3.1/plugins/org.eclipse.help.webapp/build.xml.orig 2005-07-02 23:53:29.888012464 +0000 -+++ eclipse-sdk-3.1/plugins/org.eclipse.help.webapp/build.xml 2005-07-02 23:53:42.596080544 +0000 -@@ -165,7 +165,7 @@ - <java - classname="org.apache.jasper.JspC" - fork="true" -- failonerror="false" -+ failonerror="true" - classpathref="jasper.classpath" - output="${temp.folder}/WEB-INF/lib/jsp.jar.bin.log"> - <arg value="-v3" /> ---- eclipse-sdk-3.1/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2006-03-10 00:37:00.000000000 +0100 -+++ eclipse-sdk-3.1/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2006-03-10 00:38:47.000000000 +0100 -@@ -110,7 +110,7 @@ - fi - fi - --if [ -f ${AWT_LIB_PATH}/libjawt.so ]; then -+if [[ ( -f ${AWT_LIB_PATH}/libjawt.so ) || ( -f ${AWT_LIB_PATH}/libgcjawt.so ) ]]; then - MAKE_AWT=make_awt - else - echo "libjawt.so not found, the SWT/AWT integration library will not be compiled." diff --git a/dev-util/eclipse-sdk/files/build-eclipse-classmap b/dev-util/eclipse-sdk/files/build-eclipse-classmap deleted file mode 100644 index f1bd085b..00000000 --- a/dev-util/eclipse-sdk/files/build-eclipse-classmap +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -# set defaults -JAVA_PKG_DB_TOOL=${JAVA_PKG_DB_TOOL:="${JAVA_HOME}/bin/gcj-dbtool"} -ECLIPSE_VER="${1}" -DB_FILE="/usr/lib/eclipse-${ECLIPSE_VER}/eclipse.gcjdb" - -# functions -die() { - echo "ERROR: ${@}" - exit 1 -} - -add_lib() { - echo "register: ${2}" - ${JAVA_PKG_DB_TOOL} -a ${DB_FILE} ${1} ${2} \ - || die "failed to register library" -} - -reg_classpath() { - local jar to - for jar in $(find /usr/lib/eclipse-${ECLIPSE_VER}/ -type f -name *.jar) - do - to="$(dirname ${jar})/lib$(basename ${jar}).so" - [[ ( -f ${jar} ) && ( ".jar" == "${jar: -4:4}" ) && ( -f ${to} ) ]] \ - && add_lib ${jar} ${to} - done -} - -# errors -if [[ ! -x ${JAVA_PKG_DB_TOOL} ]] ; then - die "Java database tool unusable!" -fi - -if [[ ! -d $(dirname ${DB_FILE}) ]] ; then - die "Path to database file missing?!" -fi - -if [ ".gcjdb" != "${DB_FILE: -6:6}" ] ; then - die "Given file has unknown format?!" -fi - -# start -echo "create database (${DB_FILE})" -rm -f ${DB_FILE} -${JAVA_PKG_DB_TOOL} -n ${DB_FILE} - -# register native libraries -reg_classpath - -echo "... done!" -exit 0 diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.2_pre5 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.2_pre5 deleted file mode 100644 index 95ac05b5..00000000 --- a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.2_pre5 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 31d28a4cd1768b061509e9c21bffb61a eclipse-sourceBuild-srcIncluded-3.2M5a.zip 76634475 -RMD160 09032d62de4e3f947d1b3deec67dd95694627985 eclipse-sourceBuild-srcIncluded-3.2M5a.zip 76634475 -SHA256 bbde8495227a7d6a1fd344418a943a70fce0aae606bd4926e7d052cd5618d125 eclipse-sourceBuild-srcIncluded-3.2M5a.zip 76634475 diff --git a/dev-util/eclipse-sdk/files/eclipse-3.2 b/dev-util/eclipse-sdk/files/eclipse-3.2 deleted file mode 100644 index fe9fd214..00000000 --- a/dev-util/eclipse-sdk/files/eclipse-3.2 +++ /dev/null @@ -1,58 +0,0 @@ -#! /bin/sh -# -# Tiny startup wrapper for the Eclipse 3.0.x series -# -# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org> -# Copyright (c) 2004, Gentoo Foundation -# -# Licensed under the GNU General Public License, version 2 -# - -if [ -f $HOME/.eclipserc ] ; then - . $HOME/.eclipserc -fi - -if [ -z "${ECLIPSE_HOME}" ] ; then - ECLIPSE_HOME=/usr/lib/eclipse-3.2 -fi - -if [ "${PREFERRED_FRONTEND}" == "gtk" ] && [ -x ${ECLIPSE_HOME}/eclipse-gtk ] ; then - ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-gtk -elif [ "${PREFERRED_FRONTEND}" == "motif" ] && [ -x ${ECLIPSE_HOME}/eclipse-motif ] ; then - ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-motif -else - if [ -x ${ECLIPSE_HOME}/eclipse-gtk ] ; then - ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-gtk - elif [ -x ${ECLIPSE_HOME}/eclipse-motif ] ; then - ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-motif - fi -fi - -if [ ! -x ${ECLIPSE_BIN} ] ; then - echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr - exit -1 -fi - -if [ $(whoami) == "root" ] ; then - echo "!!! You are running Eclipse as root. Be advised that this will modify the contents of" - echo "!!! /usr/lib/eclipse-3.2, and that such a modification may prevent you from safely" - echo "!!! upgrading to later 3.2 revisions." - echo - echo "!!! To ensure correct behavior on your next upgrade, do:" - echo "!!! 1) 'emerge unmerge \"=eclipse-sdk-3.2\"'" - echo "!!! 2) 'rm -rf /usr/lib/eclipse-3.2'" - echo "!!! 3) 'emerge eclipse-sdk'" -fi - -if [[ "$(java-config -f)" =~ "gcj" ]] ; then - FILES="." - for file in $(find ${ECLIPSE_HOME} -type f -name *.jar) - do - FILES="${FILES}:${file}" - done - - export JAVA_PKG_CLASSMAP="${ECLIPSE_HOME}/eclipse.gcjdb" - export CLASSPATH="${FILES}" -fi - -${ECLIPSE_BIN} $@ diff --git a/dev-util/eclipse-sdk/files/eclipse-3.2.desktop b/dev-util/eclipse-sdk/files/eclipse-3.2.desktop deleted file mode 100644 index 92a72c10..00000000 --- a/dev-util/eclipse-sdk/files/eclipse-3.2.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Eclipse @PV@ -Comment=A Java Development Environment -Icon=/usr/lib/eclipse-3.2/icon.xpm -Exec=/usr/bin/eclipse-3.2 -Terminal=false -Type=Application -Categories=GNOME;Application;Development -StartupNotify=true diff --git a/dev-util/eclipse-sdk/files/eclipse-buildfix.diff b/dev-util/eclipse-sdk/files/eclipse-buildfix.diff deleted file mode 100644 index e5018d4f..00000000 --- a/dev-util/eclipse-sdk/files/eclipse-buildfix.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- plugins/org.eclipse.core.runtime.compatibility.registry/build.xml.orig 2006-03-10 01:22:56.000000000 +0100 -+++ plugins/org.eclipse.core.runtime.compatibility.registry/build.xml 2006-03-10 01:23:36.000000000 +0100 -@@ -61,6 +61,7 @@ - <pathelement path="${build.result.folder}/../org.eclipse.osgi/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.jobs/bin/"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.jobs/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.runtime/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.equinox.common/bin/"/> - <pathelement path="${build.result.folder}/../org.eclipse.equinox.common/@dot"/> - <pathelement path="classes/"/> diff --git a/dev-util/eclipse-sdk/files/eclipse.1 b/dev-util/eclipse-sdk/files/eclipse.1 deleted file mode 100644 index 6572ca4e..00000000 --- a/dev-util/eclipse-sdk/files/eclipse.1 +++ /dev/null @@ -1,87 +0,0 @@ -.TH eclipse 1 "3.0.0" -.SH "NAME" -.LP -eclipse \- Eclipse Tools Platform -.SH "SYNTAX" -.LP -eclipse gensync [\fIplatform options\fP] [\fI-vmargs [Java VM arguments]\fP] - -.SH "DESCRIPTION" - -\fIeclipse\fR is the Gentoo startup script for the Eclipse Tools platform. It -will search for an appropriate front-end for Eclipse (either gtk+ or Motif, in -order of preference), and start the platform. - -.SH "OPTIONS" - -.LP -\fB-application <app id>\fB -.IP -Identifies the application to run. If not specified, the Eclipse workbench is -run. Applications are declared by plug-ins supplying extensions to the -org.eclipse.core.runtime.applications extension point. - - -.LP -\fB-boot <boot code path>\fB -.IP -Defines the path to the boot plug-in code (i.e., boot.jar). Only required when -changing the relative location of startup.jar and boot.jar. - - -.LP -\fB-consolelog\fB -.IP -Mirrors the platform's error log to the console used to run Eclipse. - - -.LP -\fB-data <workspace path>\fB -.IP -Defines the path of the workspace on which to run the platform. - - -.LP -\fB-debug [options file path]\fB -.IP -Puts the platform in debug mode and loads the debug options in the specified file. If a file path is not given, the platform looks in the platform install directory and in the workspace's metadata directory for a file called ".options". - - -.LP -\fB-dev [classpath entries]\fB -.IP -Puts the platform in development mode. The optional classpath entries (a comma-separated list) are added to each plug-in's classpath. For example, when developing plug-ins, use "-dev bin" to add the Java tooling's bin directory for each plug-in. Redundant or non-existant classpath entries are eliminated. - - -.LP -\fB-nosplash\fB -.IP -Runs the platform without putting up the splash screen. - - -.LP -\fB-os <os-id>\fB -.IP -Defines the operating system on which the platform is running. Typically the platform can detect the OS but some situations may require explicit specification. The value specified here is related to Platform.getOS(). - - -.LP -\fB-vm <vm path>\fB -.IP -Specifies the Java VM to use to run the platform. If not specified, a Java VM is located relative to the Eclipse executable. - - -.LP -\fB-ws <ws-id>\fB -.IP -Defines the window system on which the platform is running. In many cases the platform can detect the window system but some situations may require explicit specification. The value specified here is related to Platform.getWS(). - -.SH "SEE ALSO" -.LP -\fIhttp://dev.gentoo.org/~karltk/projects/eclipse\fR for tips and tricks. - -.SH "AUTHORS" -.LP -Karl Trygve Kalleberg <karltk@gentoo.org> -.br -The Eclipse Project, \fIwww.eclipse.org\fR diff --git a/dev-util/eclipse-sdk/files/fedora/eclipse-bz162177.patch b/dev-util/eclipse-sdk/files/fedora/eclipse-bz162177.patch deleted file mode 100644 index 673c6dc0..00000000 --- a/dev-util/eclipse-sdk/files/fedora/eclipse-bz162177.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- eclipse-3.1.0_fc/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java~ 2005-06-17 21:40:09.000000000 +0100 -+++ eclipse-3.1.0_fc/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java 2005-07-04 15:12:23.000000000 +0100 -@@ -2027,7 +2027,7 @@ - } - if (mode == InsideClasspath || mode == InsideBootClasspath || mode == InsideSourcepath) { - StringTokenizer tokenizer = new StringTokenizer(currentArg, -- File.pathSeparator + "[]", true); //$NON-NLS-1$ -+ File.pathSeparator, true); //$NON-NLS-1$ - // state machine - final int start = 0; - final int readyToClose = 1; diff --git a/dev-util/eclipse-sdk/files/fedora/eclipse-gnuformatterjdt.patch b/dev-util/eclipse-sdk/files/fedora/eclipse-gnuformatterjdt.patch deleted file mode 100644 index 2f78fae2..00000000 --- a/dev-util/eclipse-sdk/files/fedora/eclipse-gnuformatterjdt.patch +++ /dev/null @@ -1,235 +0,0 @@ -Index: formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java -=================================================================== -RCS file: /home/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java,v -retrieving revision 1.61 -diff -u -r1.61 DefaultCodeFormatterConstants.java ---- plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java 1 Apr 2005 10:54:15 -0000 1.61 -+++ plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java 18 Apr 2005 18:17:47 -0000 -@@ -3134,6 +3134,16 @@ - return DefaultCodeFormatterOptions.getEclipseDefaultSettings().getMap(); - } - -+ /** -+ * Returns the default GNU formatter settings -+ * -+ * @return the GNU default settings -+ * @since 3.1 -+ */ -+ public static Map getGNUSettings() { -+ return DefaultCodeFormatterOptions.getGNUSettings().getMap(); -+ } -+ - /** - * <p>Return the force value of the given alignment value. - * The given alignment value should be created using the <code>createAlignmentValue(boolean, int, int)</code> -Index: formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java -=================================================================== -RCS file: /home/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java,v -retrieving revision 1.63 -diff -u -r1.63 DefaultCodeFormatterOptions.java ---- plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java 1 Apr 2005 10:54:15 -0000 1.63 -+++ plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java 18 Apr 2005 18:17:48 -0000 -@@ -39,6 +39,12 @@ - return options; - } - -+ public static DefaultCodeFormatterOptions getGNUSettings() { -+ DefaultCodeFormatterOptions options = new DefaultCodeFormatterOptions(); -+ options.setGNUDefaultSettings(); -+ return options; -+ } -+ - public static DefaultCodeFormatterOptions getJavaConventionsSettings() { - DefaultCodeFormatterOptions options = new DefaultCodeFormatterOptions(); - options.setJavaConventionsSettings(); -@@ -2036,6 +2042,190 @@ - this.tab_size = 4; - } - -+ public void setGNUDefaultSettings() { -+ this.comment_clear_blank_lines = true; -+ this.comment_format = true; -+ this.comment_format_header = false; -+ this.comment_format_html = true; -+ this.comment_format_source = true; -+ this.comment_indent_parameter_description = true; -+ this.comment_indent_root_tags = true; -+ this.comment_line_length = 80; -+ this.comment_insert_new_line_for_parameter = true; -+ this.comment_indent_root_tags = true; -+ this.align_type_members_on_columns = false; -+ this.alignment_for_arguments_in_allocation_expression = 18; -+ this.alignment_for_arguments_in_explicit_constructor_call = 18; -+ this.alignment_for_arguments_in_method_invocation = 18; -+ this.alignment_for_arguments_in_qualified_allocation_expression = 18; -+ this.alignment_for_binary_expression = 18; -+ this.alignment_for_compact_if = 16; -+ this.alignment_for_conditional_expression = 82; -+ this.alignment_for_expressions_in_array_initializer = 18; -+ this.alignment_for_multiple_fields = 16; -+ this.alignment_for_parameters_in_constructor_declaration = 18; -+ this.alignment_for_parameters_in_method_declaration = 18; -+ this.alignment_for_selector_in_method_invocation = 0; -+ this.alignment_for_superclass_in_type_declaration = 16; -+ this.alignment_for_superinterfaces_in_type_declaration = 16; -+ this.alignment_for_throws_clause_in_constructor_declaration = 16; -+ this.alignment_for_throws_clause_in_method_declaration = 16; -+ this.blank_lines_after_imports = 1; -+ this.blank_lines_after_package = 1; -+ this.blank_lines_before_field = 1; -+ this.blank_lines_before_first_class_body_declaration = 0; -+ this.blank_lines_before_imports = 1; -+ this.blank_lines_before_member_type = 1; -+ this.blank_lines_before_method = 1; -+ this.blank_lines_before_new_chunk = 1; -+ this.blank_lines_before_package = 2; -+ this.blank_lines_between_type_declarations = 1; -+ this.brace_position_for_anonymous_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE; -+ this.brace_position_for_array_initializer = DefaultCodeFormatterConstants.END_OF_LINE; -+ this.brace_position_for_block = DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED; -+ this.brace_position_for_block_in_case = DefaultCodeFormatterConstants.NEXT_LINE; -+ this.brace_position_for_constructor_declaration = DefaultCodeFormatterConstants.NEXT_LINE; -+ this.brace_position_for_method_declaration = DefaultCodeFormatterConstants.NEXT_LINE; -+ this.brace_position_for_switch = DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED; -+ this.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE; -+ this.compact_else_if = true; -+ this.continuation_indentation = 2; -+ this.continuation_indentation_for_array_initializer = 2; -+ this.keep_guardian_clause_on_one_line = false; -+ this.indent_body_declarations_compare_to_type_header = true; -+ this.indent_breaks_compare_to_cases = true; -+ this.indent_statements_compare_to_block = true; -+ this.indent_statements_compare_to_body = true; -+ this.indent_switchstatements_compare_to_cases = true; -+ this.indent_switchstatements_compare_to_switch = false; -+ this.insert_new_line_after_opening_brace_in_array_initializer = false; -+ this.insert_new_line_before_catch_in_try_statement = true; -+ this.insert_new_line_before_closing_brace_in_array_initializer = false; -+ this.insert_new_line_before_else_in_if_statement = true; -+ this.insert_new_line_before_finally_in_try_statement = true; -+ this.insert_new_line_before_while_in_do_statement = true; -+ this.insert_new_line_in_empty_anonymous_type_declaration = true; -+ this.insert_new_line_in_empty_block = true; -+ this.insert_new_line_in_empty_method_body = true; -+ this.insert_new_line_in_empty_type_declaration = true; -+ this.insert_space_after_assignment_operator = true; -+ this.insert_space_after_binary_operator = true; -+ this.insert_space_after_closing_brace_in_block = true; -+ this.insert_space_after_closing_paren_in_cast = true; -+ this.insert_space_after_colon_in_assert = true; -+ this.insert_space_after_colon_in_case = true; -+ this.insert_space_after_colon_in_conditional = true; -+ this.insert_space_after_colon_in_labeled_statement = true; -+ this.insert_space_after_comma_in_allocation_expression = true; -+ this.insert_space_after_comma_in_array_initializer = true; -+ this.insert_space_after_comma_in_constructor_declaration_parameters = true; -+ this.insert_space_after_comma_in_constructor_declaration_throws = true; -+ this.insert_space_after_comma_in_explicit_constructor_call_arguments = true; -+ this.insert_space_after_comma_in_for_increments = true; -+ this.insert_space_after_comma_in_for_inits = true; -+ this.insert_space_after_comma_in_method_declaration_parameters = true; -+ this.insert_space_after_comma_in_method_declaration_throws = true; -+ this.insert_space_after_comma_in_method_invocation_arguments = true; -+ this.insert_space_after_comma_in_multiple_field_declarations = true; -+ this.insert_space_after_comma_in_multiple_local_declarations = true; -+ this.insert_space_after_comma_in_superinterfaces = true; -+ this.insert_space_after_opening_brace_in_array_initializer = true; -+ this.insert_space_after_opening_bracket_in_array_allocation_expression = false; -+ this.insert_space_after_opening_bracket_in_array_reference = false; -+ this.insert_space_after_opening_paren_in_cast = false; -+ this.insert_space_after_opening_paren_in_catch = false; -+ this.insert_space_after_opening_paren_in_constructor_declaration = false; -+ this.insert_space_after_opening_paren_in_for = false; -+ this.insert_space_after_opening_paren_in_if = false; -+ this.insert_space_after_opening_paren_in_method_declaration = false; -+ this.insert_space_after_opening_paren_in_method_invocation = false; -+ this.insert_space_after_opening_paren_in_parenthesized_expression = false; -+ this.insert_space_after_opening_paren_in_switch = false; -+ this.insert_space_after_opening_paren_in_synchronized = false; -+ this.insert_space_after_opening_paren_in_while = false; -+ this.insert_space_after_postfix_operator = false; -+ this.insert_space_after_prefix_operator = false; -+ this.insert_space_after_question_in_conditional = true; -+ this.insert_space_after_semicolon_in_for = true; -+ this.insert_space_after_unary_operator = false; -+ this.insert_space_before_assignment_operator = true; -+ this.insert_space_before_binary_operator = true; -+ this.insert_space_before_closing_brace_in_array_initializer = true; -+ this.insert_space_before_closing_bracket_in_array_allocation_expression = false; -+ this.insert_space_before_closing_bracket_in_array_reference = false; -+ this.insert_space_before_closing_paren_in_cast = false; -+ this.insert_space_before_closing_paren_in_catch = false; -+ this.insert_space_before_closing_paren_in_constructor_declaration = false; -+ this.insert_space_before_closing_paren_in_for = false; -+ this.insert_space_before_closing_paren_in_if = false; -+ this.insert_space_before_closing_paren_in_method_declaration = false; -+ this.insert_space_before_closing_paren_in_method_invocation = false; -+ this.insert_space_before_closing_paren_in_parenthesized_expression = false; -+ this.insert_space_before_closing_paren_in_switch = false; -+ this.insert_space_before_closing_paren_in_synchronized = false; -+ this.insert_space_before_closing_paren_in_while = false; -+ this.insert_space_before_colon_in_assert = true; -+ this.insert_space_before_colon_in_case = false; -+ this.insert_space_before_colon_in_conditional = true; -+ this.insert_space_before_colon_in_default = false; -+ this.insert_space_before_colon_in_labeled_statement = false; -+ this.insert_space_before_comma_in_allocation_expression = false; -+ this.insert_space_before_comma_in_array_initializer = false; -+ this.insert_space_before_comma_in_constructor_declaration_parameters = false; -+ this.insert_space_before_comma_in_constructor_declaration_throws = false; -+ this.insert_space_before_comma_in_explicit_constructor_call_arguments = false; -+ this.insert_space_before_comma_in_for_increments = false; -+ this.insert_space_before_comma_in_for_inits = false; -+ this.insert_space_before_comma_in_method_declaration_parameters = false; -+ this.insert_space_before_comma_in_method_declaration_throws = false; -+ this.insert_space_before_comma_in_method_invocation_arguments = false; -+ this.insert_space_before_comma_in_multiple_field_declarations = false; -+ this.insert_space_before_comma_in_multiple_local_declarations = false; -+ this.insert_space_before_comma_in_superinterfaces = false; -+ this.insert_space_before_opening_brace_in_anonymous_type_declaration = true; -+ this.insert_space_before_opening_brace_in_array_initializer = true; -+ this.insert_space_before_opening_brace_in_block = true; -+ this.insert_space_before_opening_brace_in_constructor_declaration = true; -+ this.insert_space_before_opening_brace_in_method_declaration = true; -+ this.insert_space_before_opening_brace_in_switch = true; -+ this.insert_space_before_opening_brace_in_type_declaration = true; -+ this.insert_space_before_opening_bracket_in_array_allocation_expression = false; -+ this.insert_space_before_opening_bracket_in_array_reference = false; -+ this.insert_space_before_opening_bracket_in_array_type_reference = false; -+ this.insert_space_before_opening_paren_in_catch = true; -+ this.insert_space_before_opening_paren_in_constructor_declaration = false; -+ this.insert_space_before_opening_paren_in_for = true; -+ this.insert_space_before_opening_paren_in_if = true; -+ this.insert_space_before_opening_paren_in_method_declaration = false; -+ this.insert_space_before_opening_paren_in_method_invocation = false; -+ this.insert_space_before_opening_paren_in_parenthesized_expression = false; -+ this.insert_space_before_opening_paren_in_switch = true; -+ this.insert_space_before_opening_paren_in_synchronized = true; -+ this.insert_space_before_opening_paren_in_while = true; -+ this.insert_space_before_postfix_operator = false; -+ this.insert_space_before_prefix_operator = false; -+ this.insert_space_before_question_in_conditional = true; -+ this.insert_space_before_semicolon = false; -+ this.insert_space_before_semicolon_in_for = false; -+ this.insert_space_before_unary_operator = false; -+ this.insert_space_between_brackets_in_array_type_reference = false; -+ this.insert_space_between_empty_braces_in_array_initializer = false; -+ this.insert_space_between_empty_brackets_in_array_allocation_expression = false; -+ this.insert_space_between_empty_parens_in_constructor_declaration = false; -+ this.insert_space_between_empty_parens_in_method_declaration = false; -+ this.insert_space_between_empty_parens_in_method_invocation = false; -+ this.keep_else_statement_on_same_line = false; -+ this.keep_empty_array_initializer_on_one_line = true; -+ this.keep_simple_if_on_one_line = false; -+ this.keep_then_statement_on_same_line = false; -+ this.page_width = 80; -+ this.blank_lines_at_beginning_of_method_body = 0; -+ this.number_of_empty_lines_to_preserve = 1; -+ this.put_empty_statement_on_new_line = true; -+ this.tab_char = SPACE; -+ this.tab_size = 2; -+ } -+ - public void setJavaConventionsSettings() { - this.alignment_for_arguments_in_allocation_expression = Alignment.M_COMPACT_SPLIT; - this.alignment_for_arguments_in_enum_constant = Alignment.M_COMPACT_SPLIT; diff --git a/dev-util/eclipse-sdk/files/fedora/eclipse-gnuformatterjdtui.patch b/dev-util/eclipse-sdk/files/fedora/eclipse-gnuformatterjdtui.patch deleted file mode 100644 index e30a992d..00000000 --- a/dev-util/eclipse-sdk/files/fedora/eclipse-gnuformatterjdtui.patch +++ /dev/null @@ -1,72 +0,0 @@ -Index: ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties -=================================================================== -RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties,v -retrieving revision 1.39 -diff -u -r1.39 FormatterMessages.properties ---- plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties 1 Apr 2005 13:45:00 -0000 1.39 -+++ plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties 18 Apr 2005 18:26:05 -0000 -@@ -519,6 +519,7 @@ - NewLinesTabPage_annotations_group_title=Annotations - NewLinesTabPage_annotations_group_option_after_annotation=&Insert new line after annotations - -+ProfileManager_gnu_profile_name=GNU [built-in] - ProfileManager_default_profile_name=Eclipse 2.1 [built-in] - ProfileManager_eclipse_profile_name=Eclipse [built-in] - ProfileManager_java_conventions_profile_name=Java Conventions [built-in] -Index: ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileManager.java -=================================================================== -RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileManager.java,v -retrieving revision 1.19 -diff -u -r1.19 ProfileManager.java ---- plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileManager.java 1 Apr 2005 13:45:00 -0000 1.19 -+++ plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileManager.java 18 Apr 2005 18:26:05 -0000 -@@ -292,6 +292,7 @@ - */ - public final static String ECLIPSE21_PROFILE= "org.eclipse.jdt.ui.default_profile"; //$NON-NLS-1$ - public final static String ECLIPSE_PROFILE= "org.eclipse.jdt.ui.default.eclipse_profile"; //$NON-NLS-1$ -+ public final static String GNU_PROFILE= "org.eclipse.jdt.ui.default.gnu_profile"; //$NON-NLS-1$ - public final static String JAVA_PROFILE= "org.eclipse.jdt.ui.default.sun_profile"; //$NON-NLS-1$ - public final static String SHARED_PROFILE= "org.eclipse.jdt.ui.default.shared"; //$NON-NLS-1$ - -@@ -582,6 +583,10 @@ - final Profile eclipse21Profile= new BuiltInProfile(ECLIPSE21_PROFILE, FormatterMessages.ProfileManager_default_profile.name, getEclipse21Settings(), 3); //$NON-NLS-1$ - profiles.put(eclipse21Profile.getID(), eclipse21Profile); - profilesByName.add(eclipse21Profile); -+ -+ final Profile gnuProfile = new BuiltInProfile(GNU_PROFILE, FormatterMessages.ProfileManager_gnu_profile_name, getGNUSettings(), 4); //$NON-NLS-1$ -+ profiles.put(gnuProfile.getID(), gnuProfile); -+ profilesByName.add(gnuProfile); - } - - -@@ -604,8 +609,18 @@ - ProfileVersioner.setLatestCompliance(options); - return options; - } -- -- /** -+ -+ /** -+ * @return Returns the settings for the GNU profile. -+ */ -+ public static Map getGNUSettings() { -+ final Map options = DefaultCodeFormatterConstants.getGNUSettings(); -+ -+ ProfileVersioner.setLatestCompliance(options); -+ return options; -+ } -+ -+ /** - * @return Returns the settings for the Java Conventions profile. - */ - public static Map getJavaSettings() { ---- plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java.orig 2006-03-09 23:13:02.000000000 +0100 -+++ plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java 2006-03-09 23:13:51.000000000 +0100 -@@ -429,6 +429,7 @@ - public static String NewLinesTabPage_array_group_option_before_closing_brace_of_array_initializer; - public static String NewLinesTabPage_annotations_group_title; - public static String NewLinesTabPage_annotations_group_option_after_annotation; -+ public static String ProfileManager_gnu_profile_name; - public static String ProfileManager_default_profile_name; - public static String ProfileManager_eclipse_profile_name; - public static String ProfileManager_unnamed_profile_name0; diff --git a/dev-util/eclipse-sdk/files/fedora/eclipse-helpindexbuilder.patch b/dev-util/eclipse-sdk/files/fedora/eclipse-helpindexbuilder.patch deleted file mode 100644 index d228fba8..00000000 --- a/dev-util/eclipse-sdk/files/fedora/eclipse-helpindexbuilder.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -r -u plugins/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java plugins/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java ---- plugins/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java 2005-10-27 15:18:45.000000000 +0200 -+++ plugins/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java 2005-10-27 15:30:57.000000000 +0200 -@@ -555,8 +555,15 @@ - hrefs.add(href); - } - NodeList subtopics = topic.getElementsByTagName("topic"); //$NON-NLS-1$ -- for (int i = 0; i < subtopics.getLength(); i++) -- add((Element) subtopics.item(i), hrefs); -+ for (int i = 0; i < subtopics.getLength(); i++) { -+ Element subtopic = (Element) subtopics.item(i); -+ href = getAttribute(subtopic, "href"); -+ if (href != null && !href.equals("") && !href.startsWith("http://") && !href.startsWith("https://")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ -+ href = SearchIndex.getIndexableHref(href); -+ if (href != null) -+ hrefs.add(href); -+ } -+ } - } - - /* diff --git a/dev-util/eclipse-sdk/files/gcj-disable.apt.diff b/dev-util/eclipse-sdk/files/gcj-disable.apt.diff deleted file mode 100644 index e4cf7add..00000000 --- a/dev-util/eclipse-sdk/files/gcj-disable.apt.diff +++ /dev/null @@ -1,172 +0,0 @@ ---- features/org.eclipse.jdt/build.xml.orig 2006-03-10 02:01:36.000000000 +0100 -+++ features/org.eclipse.jdt/build.xml 2006-03-10 02:01:56.000000000 +0100 -@@ -67,16 +67,6 @@ - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.core" target="${target}"> -- <property name="arch" value="x86"/> -- <property name="os" value="win32"/> -- <property name="ws" value="win32"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.ui" target="${target}"> -- <property name="arch" value="x86"/> -- <property name="os" value="win32"/> -- <property name="ws" value="win32"/> -- </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ant.ui" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> ---- plugins/org.eclipse.jdt.source/build.xml.orig 2006-03-10 02:07:00.000000000 +0100 -+++ plugins/org.eclipse.jdt.source/build.xml 2006-03-10 02:07:42.000000000 +0100 -@@ -64,18 +64,10 @@ - <ant antfile="build.xml" dir="../org.eclipse.ant.ui" target="gather.sources"> - <property name="destination.temp.folder" value="${basedir}/src"/> - </ant> -- <ant antfile="build.xml" dir="../org.eclipse.jdt.apt.core" target="build.sources"/> -- <ant antfile="build.xml" dir="../org.eclipse.jdt.apt.core" target="gather.sources"> -- <property name="destination.temp.folder" value="${basedir}/src"/> -- </ant> - <ant antfile="build.xml" dir="../org.eclipse.jdt.ui" target="build.sources"/> - <ant antfile="build.xml" dir="../org.eclipse.jdt.ui" target="gather.sources"> - <property name="destination.temp.folder" value="${basedir}/src"/> - </ant> -- <ant antfile="build.xml" dir="../org.eclipse.jdt.apt.ui" target="build.sources"/> -- <ant antfile="build.xml" dir="../org.eclipse.jdt.apt.ui" target="gather.sources"> -- <property name="destination.temp.folder" value="${basedir}/src"/> -- </ant> - <ant antfile="build.xml" dir="../org.eclipse.jdt.core" target="build.sources"/> - <ant antfile="build.xml" dir="../org.eclipse.jdt.core" target="gather.sources"> - <property name="destination.temp.folder" value="${basedir}/src"/> ---- assemble.org.eclipse.sdk.linux.gtk.x86.xml.orig 2006-03-10 14:24:56.000000000 +0100 -+++ assemble.org.eclipse.sdk.linux.gtk.x86.xml 2006-03-10 14:26:01.000000000 +0100 -@@ -49,9 +49,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.team.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -310,9 +307,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.ant.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ssh2" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -398,10 +392,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060214-2220"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.team.ui_3.2.0.I200602170010"/> - </antcall> - <antcall target="jarUp"> -@@ -678,10 +668,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060214-2220"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.pde.runtime_3.2.0.v20060131"/> - </antcall> - <antcall target="jarUp"> ---- assemble.org.eclipse.sdk.linux.gtk.x86_64.xml.orig 2006-03-10 14:27:09.000000000 +0100 -+++ assemble.org.eclipse.sdk.linux.gtk.x86_64.xml 2006-03-10 14:27:33.000000000 +0100 -@@ -49,9 +49,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.team.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -310,9 +307,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.ant.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ssh2" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -398,10 +392,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060214-2220"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.team.ui_3.2.0.I200602170010"/> - </antcall> - <antcall target="jarUp"> -@@ -678,10 +668,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060214-2220"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.pde.runtime_3.2.0.v20060131"/> - </antcall> - <antcall target="jarUp"> ---- assemble.org.eclipse.sdk.linux.gtk.ppc.xml.orig 2006-03-10 14:59:35.000000000 +0100 -+++ assemble.org.eclipse.sdk.linux.gtk.ppc.xml 2006-03-10 15:00:03.000000000 +0100 -@@ -49,9 +49,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.team.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -307,9 +304,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.ant.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ssh2" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -395,10 +389,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060214-2220"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.team.ui_3.2.0.I200602170010"/> - </antcall> - <antcall target="jarUp"> -@@ -671,10 +661,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060214-2220"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.pde.runtime_3.2.0.v20060131"/> - </antcall> - <antcall target="jarUp"> diff --git a/dev-util/eclipse-sdk/files/gcj-output.diff b/dev-util/eclipse-sdk/files/gcj-output.diff deleted file mode 100644 index 05d1c1a9..00000000 --- a/dev-util/eclipse-sdk/files/gcj-output.diff +++ /dev/null @@ -1,45 +0,0 @@ ---- plugins.orig/org.eclipse.jdt.doc.isv/buildDoc.xml 2005-11-03 12:08:20.000000000 -0500 -+++ plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2005-11-03 12:06:01.000000000 -0500 -@@ -67,7 +67,7 @@ - <delete dir="reference/api"/> - <mkdir dir="reference/api"/> - -- <exec dir="." executable="${javadoc}" output="doc.bin.log"> -+ <exec dir="." executable="${javadoc}"> - <arg line="@${basedir}/${optionsFile} -J-Xmx500M" /> - </exec> - </target> -diff -uNr plugins.orig/org.eclipse.pde.doc.user/buildDoc.xml plugins/org.eclipse.pde.doc.user/buildDoc.xml ---- plugins.orig/org.eclipse.pde.doc.user/buildDoc.xml 2005-11-03 12:09:10.000000000 -0500 -+++ plugins/org.eclipse.pde.doc.user/buildDoc.xml 2005-11-03 12:06:01.000000000 -0500 -@@ -52,7 +52,7 @@ - <delete dir="reference/api"/> - <mkdir dir="reference/api"/> - -- <exec dir="." executable="${javadoc}" output="doc.bin.log"> -+ <exec dir="." executable="${javadoc}"> - <arg line="@${basedir}/${optionsFile} -J-Xmx1000M" /> - </exec> - </target> ---- plugins/org.eclipse.help.webapp/build.xml.orig 2006-03-10 00:44:23.000000000 +0100 -+++ plugins/org.eclipse.help.webapp/build.xml 2006-03-10 00:44:35.000000000 +0100 -@@ -179,7 +179,7 @@ - fork="true" - failonerror="false" - classpathref="jasper.classpath" -- output="${temp.folder}/WEB-INF/lib/jsp.jar.bin.log"> -+ > - <arg value="-v3" /> - <arg value="-d" /><arg value="${temp.folder}/jsp.jar.src" /> - <arg value="-die" /> ---- plugins/org.eclipse.platform.doc.isv/buildDoc.xml.orig 2006-03-10 00:44:53.000000000 +0100 -+++ plugins/org.eclipse.platform.doc.isv/buildDoc.xml 2006-03-10 00:45:18.000000000 +0100 -@@ -101,7 +101,7 @@ - <delete dir="reference/api"/> - <mkdir dir="reference/api"/> - -- <exec dir="." executable="${javadoc}" output="doc.bin.log"> -+ <exec dir="." executable="${javadoc}"> - <arg line="@${basedir}/${optionsFile} -J-Xmx1000M" /> - </exec> - |