diff options
author | Sven Eden <sven.eden@gmx.de> | 2013-02-13 20:14:08 +0100 |
---|---|---|
committer | Sven Eden <sven.eden@gmx.de> | 2013-02-13 20:14:08 +0100 |
commit | 89017d656c6b711628b6fc3f0599c1c75fb3f054 (patch) | |
tree | 4cfc3b2acfea0d87d9eda5b93e8aa6aa999e256c /dev-util | |
parent | dev-util/eclipse-sdk-3.7.1-r11.ebuild : Allow more 1.7 JDKs, added "android" ... (diff) | |
download | seden-89017d656c6b711628b6fc3f0599c1c75fb3f054.tar.gz seden-89017d656c6b711628b6fc3f0599c1c75fb3f054.tar.bz2 seden-89017d656c6b711628b6fc3f0599c1c75fb3f054.zip |
Some cleanups. And I have generated a use.local.desc.
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/eclipse-sdk/files/3.8/eclipse-3.8 | 46 | ||||
-rw-r--r-- | dev-util/eclipse-sdk/files/3.8/eclipserc-3.8 | 20 | ||||
-rw-r--r-- | dev-util/eclipse-sdk/files/3.8/gtk_makefile.patch | 36 | ||||
-rw-r--r-- | dev-util/eclipse-sdk/files/3.8/hamcrest-junit-lib.patch | 11 | ||||
-rw-r--r-- | dev-util/eclipse-sdk/files/3.8/iterators.patch | 70 |
5 files changed, 0 insertions, 183 deletions
diff --git a/dev-util/eclipse-sdk/files/3.8/eclipse-3.8 b/dev-util/eclipse-sdk/files/3.8/eclipse-3.8 deleted file mode 100644 index e15a0f3..0000000 --- a/dev-util/eclipse-sdk/files/3.8/eclipse-3.8 +++ /dev/null @@ -1,46 +0,0 @@ -#! /bin/sh -# -# Tiny startup wrapper for Eclipse -# -# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org> -# Copyright (c) 2007-2008, Jean-Noël Rivasseau <elvanor@gentoo.org> -# Copyright (c) 2004-2008, Gentoo Foundation -# -# Licensed under the GNU General Public License, version 2 -# - -SLOT="3.8" - -[ -f "/etc/eclipserc-${SLOT}" ] && . "/etc/eclipserc-${SLOT}" -[ -f "$HOME/gentoo/.eclipserc" ] && . "$HOME/gentoo/.eclipserc" - -ECLIPSE_HOME=${ECLIPSE_HOME:="/usr/lib/eclipse-${SLOT}"} -ECLIPSE_BIN="${ECLIPSE_HOME}/eclipse" - -if [ ! -x "${ECLIPSE_BIN}" ] ; then - echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr - exit 1 -fi - -if [ $(id -u) -eq 0 ] ; then - echo "Do not run eclipse as root user! Exiting ..." > /dev/stderr - exit 1 -fi - -case "$(java-config -f)" in - *gcj*) - export JAVA_PKG_CLASSMAP="${ECLIPSE_HOME}/eclipse.gcjdb" - ;; -esac - -eval $(gjl --package "swt-${SLOT}" --get-args) - -[ -n "${ECLIPSE_XMS}" ] && VM_ARGS="${VM_ARGS} -Xms${ECLIPSE_XMS}" -[ -n "${ECLIPSE_XMX}" ] && VM_ARGS="${VM_ARGS} -Xmx${ECLIPSE_XMX}" -[ -n "${ECLIPSE_PERMSIZE}" ] && VM_ARGS="${VM_ARGS} -XX:PermSize=${ECLIPSE_PERMSIZE}" -[ -n "${ECLIPSE_MAX_PERMSIZE}" ] && VM_ARGS="${VM_ARGS} -XX:MaxPermSize=${ECLIPSE_MAX_PERMSIZE}" - -# Fix for JRE 1.5. -export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib - -exec "${ECLIPSE_BIN}" -vm $(java-config --java) "$@" "${ECLIPSE_USER_ARGS}" -vmargs ${VM_ARGS} diff --git a/dev-util/eclipse-sdk/files/3.8/eclipserc-3.8 b/dev-util/eclipse-sdk/files/3.8/eclipserc-3.8 deleted file mode 100644 index 703b649..0000000 --- a/dev-util/eclipse-sdk/files/3.8/eclipserc-3.8 +++ /dev/null @@ -1,20 +0,0 @@ -# This file specifies some initial Eclipse settings, like memory allowed -# These settings only affect Eclipse startup and overall configuration -# Main Eclipse configuration should be done within Eclipse (with the GUI) - -# Following variables controls the minimal and maximum amounts of memory -# allocated to Eclipse (respectively). -# Increase those numbers if you get OutOfMemory errors. - -ECLIPSE_XMS=128m -ECLIPSE_XMX=256m - -# Following variables controls the minimal and maximum amounts of memory -# allocated to the permanent generation space. -# This space contains data related to all classes. -# Thus, if you use a lot of Eclipse plugins, it is recommended to uncomment -# these variables and even increase it, if you have enough RAM. -# Else you will get crashes related to OutOfMemory in PermGen exceptions. - -#ECLIPSE_PERMSIZE=64m -#ECLIPSE_MAX_PERMSIZE=128m
\ No newline at end of file diff --git a/dev-util/eclipse-sdk/files/3.8/gtk_makefile.patch b/dev-util/eclipse-sdk/files/3.8/gtk_makefile.patch deleted file mode 100644 index dd71e95..0000000 --- a/dev-util/eclipse-sdk/files/3.8/gtk_makefile.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- features/org.eclipse.equinox.executable/library/gtk/make_linux.mak~ 2010-02-08 21:14:12.000000000 +0000 -+++ features/org.eclipse.equinox.executable/library/gtk/make_linux.mak 2010-08-09 21:47:30.543247031 +0000 -@@ -27,7 +27,8 @@ - PROGRAM_OUTPUT=eclipse - endif - --PROGRAM_LIBRARY=$(PROGRAM_OUTPUT)_$(LIB_VERSION).so -+PROGRAM_SONAME=$(PROGRAM_OUTPUT)_$(LIB_VERSION) -+PROGRAM_LIBRARY=$(PROGRAM_SONAME).so - - ifeq ($(DEFAULT_JAVA),) - DEFAULT_JAVA=DEFAULT_JAVA_JNI -@@ -44,8 +45,8 @@ - #LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl -lX11 - LIBS = -lpthread -ldl - GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\"" --LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic --CFLAGS = ${M_ARCH} -g -s -Wall\ -+LFLAGS = ${M_ARCH} -shared -Wl,-soname=$(PROGRAM_SONAME) -fpic -Wl,--export-dynamic -+CFLAGS += ${M_ARCH} -Wall\ - -fpic \ - -DLINUX \ - -DMOZILLA_FIX \ -@@ -95,10 +96,10 @@ - $(CC) $(CFLAGS) -c ../eclipseNix.c -o eclipseNix.o - - $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS) -- $(CC) ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS) -+ $(CC) ${M_ARCH} $(LDFLAGS) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS) - - $(DLL): $(DLL_OBJS) $(COMMON_OBJS) -- $(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS) - - install: all - cp $(EXEC) $(OUTPUT_DIR) diff --git a/dev-util/eclipse-sdk/files/3.8/hamcrest-junit-lib.patch b/dev-util/eclipse-sdk/files/3.8/hamcrest-junit-lib.patch deleted file mode 100644 index edad52c..0000000 --- a/dev-util/eclipse-sdk/files/3.8/hamcrest-junit-lib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java~ 2011-03-09 16:38:30.000000000 +0000 -+++ plugins/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java 2011-06-15 18:07:35.272733911 +0000 -@@ -161,7 +161,7 @@ - "org.junit", new VersionRange("[4.7.0,5.0.0)"), "junit.jar", "junit.jar", "org.junit.source", "source-bundle/", JUnitPreferencesConstants.JUNIT4_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ - - private static final JUnitPluginDescription HAMCREST_CORE_PLUGIN= new JUnitPluginDescription( -- "org.hamcrest.core", new VersionRange("[1.1.0,2.0.0)"), null, "org.hamcrest.core_1.*.jar", "org.hamcrest.core.source", "source-bundle/", JUnitPreferencesConstants.HAMCREST_CORE_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ -+ "org.hamcrest.core", new VersionRange("[1.1.0,2.0.0)"), "hamcrest-core.jar", "org.hamcrest.core_1.*.jar", "org.hamcrest.core.source", "source-bundle/", JUnitPreferencesConstants.HAMCREST_CORE_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ - - /** - * @return the JUnit3 classpath container diff --git a/dev-util/eclipse-sdk/files/3.8/iterators.patch b/dev-util/eclipse-sdk/files/3.8/iterators.patch deleted file mode 100644 index eca230e..0000000 --- a/dev-util/eclipse-sdk/files/3.8/iterators.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/CompoundIterator.java~ 2010-02-19 12:12:49.000000000 +0000 -+++ plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/CompoundIterator.java 2010-08-09 23:16:39.201246659 +0000 -@@ -25,7 +25,7 @@ - private final Iterator<? extends Object> iteratorIterator; - private Iterator<T> currentIterator; - -- private T nextObject = noElement(); -+ private Object nextObject = NO_ELEMENT; - - /** - * Creates a compound iterator that will iterated over the elements -@@ -47,8 +47,9 @@ - if (!positionNext()) - throw new NoSuchElementException(); - -- T nxt = nextObject; -- nextObject = noElement(); -+ @SuppressWarnings("unchecked") -+ T nxt = (T) nextObject; -+ nextObject = NO_ELEMENT; - return nxt; - } - -@@ -76,9 +77,4 @@ - nextObject = currentIterator.next(); - return true; - } -- -- @SuppressWarnings("unchecked") -- private static <T> T noElement() { -- return (T) NO_ELEMENT; -- } --} -\ No newline at end of file -+} ---- plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/MatchIteratorFilter.java~ 2010-02-19 12:12:48.000000000 +0000 -+++ plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/MatchIteratorFilter.java 2010-08-09 23:20:33.572246380 +0000 -@@ -21,7 +21,7 @@ - - private final Iterator<? extends T> innerIterator; - -- private T nextObject = noElement(); -+ private Object nextObject = NO_ELEMENT; - - public MatchIteratorFilter(Iterator<? extends T> iterator) { - this.innerIterator = iterator; -@@ -35,8 +35,9 @@ - if (!positionNext()) - throw new NoSuchElementException(); - -- T nxt = nextObject; -- nextObject = noElement(); -+ @SuppressWarnings("unchecked") -+ T nxt = (T) nextObject; -+ nextObject = NO_ELEMENT; - return nxt; - } - -@@ -63,9 +64,4 @@ - } - return false; - } -- -- @SuppressWarnings("unchecked") -- private static <T> T noElement() { -- return (T) NO_ELEMENT; -- } --} -\ No newline at end of file -+} |