aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHan Meyer-Thurow <h.mth@web.de>2008-07-02 22:24:09 +0000
committerHan Meyer-Thurow <h.mth@web.de>2008-07-02 22:24:09 +0000
commit1f80e6f0cac6ec50bf84e01e78872414adb7279a (patch)
treeafe0a5db28453b3a264da322e48d305d28695967 /dev-util
parentOutdated manifest. Bad geki. ;) (diff)
downloadjava-1f80e6f0cac6ec50bf84e01e78872414adb7279a.tar.gz
java-1f80e6f0cac6ec50bf84e01e78872414adb7279a.tar.bz2
java-1f80e6f0cac6ec50bf84e01e78872414adb7279a.zip
dev-util/eclipse-sdk: Do not delete source jars.
svn path=/java-overlay/; revision=6387
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/eclipse-sdk/Manifest2
-rw-r--r--dev-util/eclipse-sdk/eclipse-sdk-3.4_rc4.ebuild28
2 files changed, 6 insertions, 24 deletions
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index 2e3898a8..b9d2c80f 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -6,4 +6,4 @@ AUX 3.4/fedora/eclipse-libupdatebuild2.patch 722 RMD160 6baa55ab7545f02e808ed05c
AUX 3.4/fedora/eclipse-pde.build-add-package-build.patch 11604 RMD160 ba63781fa77452e4c36eae7e07d81b7d39f5ec29 SHA1 7ee30f8fc2732125e1f2ba01038922d995b21456 SHA256 d361930896c940c09a7faf41f2c8d7843d56be9b90391e91538890062e5d7803
AUX eclipse-3.4 1613 RMD160 36a3ccca712882cbf8ae25884dbef80193cf8b6d SHA1 32e8db5ccb37dd9ffbb188320d63a7c3a6d4471d SHA256 cdcef974739c9bd253230c9a42d8f0be9d7de768c7136d515d4dcde5ff001908
DIST eclipse-sourceBuild-srcIncluded-3.4RC4.zip 105616493 RMD160 2d13da0aecfaa6dc546eb2c944cc3bb3d348c12a SHA1 86e0ab2b6be5bc31d5ee65ecf0789bdeaeebc284 SHA256 adfcf0b173910f9876cb9809cfb2d5a0ab0e93e8035928621cfd6e9837fe5d8d
-EBUILD eclipse-sdk-3.4_rc4.ebuild 14969 RMD160 5afd16d95636f8c16ee30dc1c2e59846a1e0a8d3 SHA1 93c254dc2ccb7a1c51726beb3ca7df46d1d3a91c SHA256 b95efdf5c6ef54d2935787773443042594317932109d63ae1248af87ba2ce292
+EBUILD eclipse-sdk-3.4_rc4.ebuild 14069 RMD160 566b8af29c44a75ddcbb76e9bb06af6f6fb0c8d9 SHA1 33cf4960b3ce51fe601ad3e4b4f0b2ba5c39b614 SHA256 42570b80d54cf8dbe3b8644146b6abfd59ef283ae853bd1013008732ef8c730f
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.4_rc4.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.4_rc4.ebuild
index c333eb40..d463c61f 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.4_rc4.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.4_rc4.ebuild
@@ -245,24 +245,6 @@ patch-apply() {
-i assemble.org.eclipse.sdk.linux.gtk.${eclipsearch}.xml
fi
- sed -e "/plugins\/javax.servlet.source_/d" \
- -e "/plugins\/javax.servlet.jsp.source_/d" \
- -e "/plugins\/org.apache.jasper.source_/d" \
- -e "/plugins\/org.apache.commons.el.source_/d" \
- -e "/plugins\/org.apache.commons.logging.source_/d" \
- -e "/plugins\/org.apache.ant.source_/d" \
- -e "/plugins\/org.apache.lucene.source_/d" \
- -e "/plugins\/org.apache.lucene.analysis.source_/d" \
- -e "/value=\"javax.servlet.source_/,/eclipse.plugins/d" \
- -e "/value=\"javax.servlet.jsp.source_/,/eclipse.plugins/d" \
- -e "/value=\"org.apache.jasper.source_/,/eclipse.plugins/d" \
- -e "/value=\"org.apache.commons.el.source_/,/eclipse.plugins/d" \
- -e "/value=\"org.apache.commons.logging.source_/,/eclipse.plugins/d" \
- -e "/value=\"org.apache.ant.source_/,/eclipse.plugins/d" \
- -e "/value=\"org.apache.lucene.source_/,/eclipse.plugins/d" \
- -e "/value=\"org.apache.lucene.analysis.source_/,/eclipse.plugins/d" \
- -i package.org.eclipse.sdk.linux.gtk.${eclipsearch}.xml
-
# waaaaahhhhhhk !!!!11oneone
epatch ${PATCHDIR}/eclipse_build-libs.diff
epatch ${PATCHDIR}/eclipse_String.compareTo.diff
@@ -325,8 +307,8 @@ patch-apply() {
</copy>' plugins/org.eclipse.core.runtime.compatibility.registry/build.xml
# This removes the copying operation for bundled jars
- sed -e "s/<copy.*com\.jcraft\.jsch.*\/>//" \
- -e "s/<copy.*com\.ibm\.icu.*\/>//" \
+ sed -e "s/<copy.*com\.jcraft\.jsch_.*\/>//" \
+ -e "s/<copy.*com\.ibm\.icu_.*\/>//" \
-e "s/<copy.*org\.apache\.commons\.el_.*\/>//" \
-e "s/<copy.*org\.apache\.commons\.logging_.*\/>//" \
-e "s/<copy.*javax\.servlet\.jsp_.*\/>//" \
@@ -348,9 +330,9 @@ remove-bundled-stuff() {
org.eclipse.swt/extra_jars/exceptions.jar
rm -rf org.apache.ant_*/*
- rm org.apache.commons.*.jar com.jcraft.jsch* \
- com.ibm.icu* org.junit_*/*.jar \
- org.junit4*/*.jar javax.*.jar \
+ rm org.apache.commons.el_*.jar org.apache.commons.logging_*.jar \
+ com.jcraft.jsch_*.jar com.ibm.icu_*.jar org.junit_*/*.jar \
+ org.junit4*/*.jar javax.servlet.jsp_*.jar javax.servlet_*.jar \
org.apache.lucene_*.jar org.apache.lucene.analysis_*.jar
for d in $(ls -1 -d org.eclipse.swt.*); do
[[ ${d} = org.eclipse.swt.tools ]] && continue