diff options
author | Sven Eden <sven.eden@gmx.de> | 2013-01-07 14:53:34 +0100 |
---|---|---|
committer | Sven Eden <sven.eden@gmx.de> | 2013-01-07 14:53:34 +0100 |
commit | 9251180ceb78cfe78152542890e2f953563f0769 (patch) | |
tree | e98961e9851382b9547461f03f0b013de043f775 /dev-util | |
parent | Updated metadata.xml to use the same e-mail address I use on bugs.gentoo.org. (diff) | |
download | seden-9251180ceb78cfe78152542890e2f953563f0769.tar.gz seden-9251180ceb78cfe78152542890e2f953563f0769.tar.bz2 seden-9251180ceb78cfe78152542890e2f953563f0769.zip |
dev-utils/eclipse-sdk-3.7.1-r9 : Now depends on swt-3.7.2 (stable) instead of swt-3.7.1 (unstable) and allows icedtea7:
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/eclipse-sdk/ChangeLog | 11 | ||||
-rw-r--r-- | dev-util/eclipse-sdk/Manifest | 20 | ||||
-rw-r--r-- | dev-util/eclipse-sdk/eclipse-sdk-3.7.1-r9.ebuild (renamed from dev-util/eclipse-sdk/eclipse-sdk-3.7.1-r8.ebuild) | 27 | ||||
-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 | ||||
-rw-r--r-- | dev-util/eclipse-sdk/files/4.2/eclipse-4.2 | 46 | ||||
-rw-r--r-- | dev-util/eclipse-sdk/files/4.2/eclipserc-4.2 | 20 | ||||
-rw-r--r-- | dev-util/eclipse-sdk/files/4.2/gtk_makefile.patch | 36 | ||||
-rw-r--r-- | dev-util/eclipse-sdk/files/4.2/hamcrest-junit-lib.patch | 11 | ||||
-rw-r--r-- | dev-util/eclipse-sdk/files/4.2/iterators.patch | 70 | ||||
-rw-r--r-- | dev-util/eclipse-sdk/metadata.xml | 2 |
14 files changed, 415 insertions, 11 deletions
diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog index 8771df4..e8dbe9f 100644 --- a/dev-util/eclipse-sdk/ChangeLog +++ b/dev-util/eclipse-sdk/ChangeLog @@ -2,6 +2,17 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*eclipse-sdk-3.7.1-r9.ebuild (07 Jan 2013) + + 07 Jan 2013 Sven Eden <sven.eden@gmx.de> +eclise-sdk-3.7.1-r9.ebuild, + -eclipse-sdk-3.7.1-r8.ebuild : + Happy new year 2013! + Eclipse now depends on either sun-jdk-1.6.0* or icedtea7 as it has + been reported (thank you very much, Milan Ševčík!) that Eclipse + works with icedtea7 without any issues. + Further updated the ebuild to use the stable swt-3.7.2 instead of + the keyworded swt-3.7.1. + *eclipse-sdk-3.7.1-r8.ebuild (17 Dec 2012) 17 Dec 2012 Sven Eden <sven.eden@gmx.de> +eclise-sdk-3.7.1-r8.ebuild, diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest index a3bd761..e3fec93 100644 --- a/dev-util/eclipse-sdk/Manifest +++ b/dev-util/eclipse-sdk/Manifest @@ -3,8 +3,18 @@ AUX 3.7/eclipserc-3.7 858 SHA256 0aea733c968ca064ad5ca95d5895778ecf7387826198b51 AUX 3.7/gtk_makefile.patch 1541 SHA256 5b33a3bb23856cdd46381a4de50100392858e9e37cbf814d2426589fa0bbdf58 SHA512 12dec72e897fa4d5d0686a66491249bae740f7aa415e739de410cb5352a73cd5e4d3a58351f42d4623eda4a9a16b7de99c80ad43f4a796a2db40ef3b02f0b4ef WHIRLPOOL c9dbee05925109ae0ea571038b7ead13f7f436dbea7c1fdefe7c0de993c0c9566f5fca0ef5623e34744ab58f6c1c5c5d5dbf3c5bbcd3b3b6c7b4764f66c4165b AUX 3.7/hamcrest-junit-lib.patch 1236 SHA256 fbf4cf2b341e87b0e14be8e9794bee89b31e12af1fdf6e078d465d4d29bf09eb SHA512 2a26b1c34e4a583ed210d9aeefd695e121b1271e8cd01ea04bd93bec8a174d63c36b712846423cde99f99be90a33785a5b940bc988073ae312405e5386f1888e WHIRLPOOL 5cdea3981da1d44780079f4ed177c6a517bafeb0ac5f9f7ce0fb14a960ff0c088b9786e9571985a25206afb531c027711b46ebc6f10502842471a707343fcb42 AUX 3.7/iterators.patch 2058 SHA256 cc2a1da26b8f63d9c4b75ededf10d7aa67a0d53dea390154eef882dc75e37f2b SHA512 f5e6e0e87428df3636578387b26c4cc1634910fb374537bd527724807740abfa9a37b28def10190d41dd1713b8716db25ec7295491924f45875cf4ffbf2adc43 WHIRLPOOL f920d3506324cca59427cca7a9830088b77ce23210cb4c14c5e492d0a7d74c74df30a8db641da1eb14524180991462352bbf402f1c5b8548931832935dccbd01 -DIST eclipse-3.7.1-src.tar.bz2 69243059 SHA256 f3a87ff4408aeadc6823eb849330527df07d5706d6456af282170bb9bbbd31d6 -DIST eclipse-build-9e028fbc74e844e96a6fd944d7d4f68909283a5d.tar.bz2 267292 SHA256 38fbf55a846ab5be2215e67c5a8855aacc1cf26a7d66d0307dd01c26ea56333c -EBUILD eclipse-sdk-3.7.1-r8.ebuild 14648 SHA256 2a39e46c55333ea3a5da6d5ff6fe1452f25e92209837d74c4744108f23f97a5b SHA512 72abf74b094cde6b6506d505f57c8f8702b49d41c19106374cb6250b56abe4a93c4d8afb00756ed4d364b89261743bace3aee71291ebe261e830efe121c4c9c3 WHIRLPOOL 4d5786c5bb521ad0b485985cc0fbf042e1955e80fd30de2cc089c1e6a240a4f5e1c7e6425e8f04d27c53f75a955f096863ba4129dc13c0b3ccec604fad874755 -MISC ChangeLog 5293 SHA256 274eac860e3b089f6232e92e242902e0625a09b3870e639e2bbaa5160687bbd4 SHA512 4a35965735c900db0dd2243fe39af91da275c4abde8f15e0605f5e6f27b432317d762523cf6e4d2197827be998601a61719538cf874473050f05969e41dd95ef WHIRLPOOL 70d1418f611fc3264658cef160cd01f37bee90fd798291895a9673effdd917c4a1e21a478b79c8577469829899cf83fad93703d3dbbcd39194e72d4da20c77d2 -MISC metadata.xml 233 SHA256 9849720f07c522d066a00309338b1bbae91ed536b98c64cdb39878840018d56d SHA512 7446f7f39c6c0689be858afd2227cbbca717c3976ba79afeb1c98d46e7c2cbc0329be4c6fd126a1bc037b67f2c5d1e370d4c3849cbbf6651e69ad8b38db833cc WHIRLPOOL 01b47ff344af605c91ded4501a3f819abdb56d5d2254017434c998ee7d352528ac035a401680a8fbee2237b35479f124b2684e655b5781b9af87ed6ca6790f6d +AUX 3.8/eclipse-3.8 1387 SHA256 3bfc3031c995a8291bc12274cf00b93832197af07461a851a58a6f4541eaedb5 SHA512 ce3c96b4fa54a0ff599eabdc7011a7bdd6f420474e985480ae306ee386d94dd52901bbad8d2011cb73c8606c1afb1dcefe376921b071b34c883d6f9bc5cb32ff WHIRLPOOL 234b1d4f35d875d7c01e23a16c5badeb18dee8f4dc224c927b2dbaa9b1d418f4c09333b22b5f0ab55d7aa96da0fd6ed54a0cc366394ba3cb3517eb9d1884a51f +AUX 3.8/eclipserc-3.8 858 SHA256 0aea733c968ca064ad5ca95d5895778ecf7387826198b512e98d0cbb7dd353f1 SHA512 8705aac02f998bf43d797c9c13592927e73154a1c908d2ac85544b6e197b249b20bc6f189d11eea4a48a76f184ac818d145fa6c05d4980bfe9a542eb9f42dd7b WHIRLPOOL 5dabd6bf5c6d584221192ee6c84c4defb9c011d465fef2679745161f9e38b88fd420cca803367f9ae13ec71036dbd3b8b8fc8fe7e6d47bb570b7b6438d638f7a +AUX 3.8/gtk_makefile.patch 1541 SHA256 5b33a3bb23856cdd46381a4de50100392858e9e37cbf814d2426589fa0bbdf58 SHA512 12dec72e897fa4d5d0686a66491249bae740f7aa415e739de410cb5352a73cd5e4d3a58351f42d4623eda4a9a16b7de99c80ad43f4a796a2db40ef3b02f0b4ef WHIRLPOOL c9dbee05925109ae0ea571038b7ead13f7f436dbea7c1fdefe7c0de993c0c9566f5fca0ef5623e34744ab58f6c1c5c5d5dbf3c5bbcd3b3b6c7b4764f66c4165b +AUX 3.8/hamcrest-junit-lib.patch 1236 SHA256 fbf4cf2b341e87b0e14be8e9794bee89b31e12af1fdf6e078d465d4d29bf09eb SHA512 2a26b1c34e4a583ed210d9aeefd695e121b1271e8cd01ea04bd93bec8a174d63c36b712846423cde99f99be90a33785a5b940bc988073ae312405e5386f1888e WHIRLPOOL 5cdea3981da1d44780079f4ed177c6a517bafeb0ac5f9f7ce0fb14a960ff0c088b9786e9571985a25206afb531c027711b46ebc6f10502842471a707343fcb42 +AUX 3.8/iterators.patch 2058 SHA256 cc2a1da26b8f63d9c4b75ededf10d7aa67a0d53dea390154eef882dc75e37f2b SHA512 f5e6e0e87428df3636578387b26c4cc1634910fb374537bd527724807740abfa9a37b28def10190d41dd1713b8716db25ec7295491924f45875cf4ffbf2adc43 WHIRLPOOL f920d3506324cca59427cca7a9830088b77ce23210cb4c14c5e492d0a7d74c74df30a8db641da1eb14524180991462352bbf402f1c5b8548931832935dccbd01 +AUX 4.2/eclipse-4.2 1387 SHA256 442e95e93fdf5b2ebb5cf742cff72906c0bfac362c8b557d41b3b27c46edc6f8 SHA512 834f365bf647dc03708e0872094a435b6013247c77eb77fe3c83e4a4897e85fd8ae9c1f3da08a271e3c522051c6e9f1fc88ba3f351086edaa236512e58c5af43 WHIRLPOOL a0864055ed80483728a3cc9e600da9a7554d2a671daba7553e693b0bfffce25aa793e6bb93157741eecb1cf596de931d874776ad01f3c63b3249d8d86213330c +AUX 4.2/eclipserc-4.2 858 SHA256 0aea733c968ca064ad5ca95d5895778ecf7387826198b512e98d0cbb7dd353f1 SHA512 8705aac02f998bf43d797c9c13592927e73154a1c908d2ac85544b6e197b249b20bc6f189d11eea4a48a76f184ac818d145fa6c05d4980bfe9a542eb9f42dd7b WHIRLPOOL 5dabd6bf5c6d584221192ee6c84c4defb9c011d465fef2679745161f9e38b88fd420cca803367f9ae13ec71036dbd3b8b8fc8fe7e6d47bb570b7b6438d638f7a +AUX 4.2/gtk_makefile.patch 1541 SHA256 5b33a3bb23856cdd46381a4de50100392858e9e37cbf814d2426589fa0bbdf58 SHA512 12dec72e897fa4d5d0686a66491249bae740f7aa415e739de410cb5352a73cd5e4d3a58351f42d4623eda4a9a16b7de99c80ad43f4a796a2db40ef3b02f0b4ef WHIRLPOOL c9dbee05925109ae0ea571038b7ead13f7f436dbea7c1fdefe7c0de993c0c9566f5fca0ef5623e34744ab58f6c1c5c5d5dbf3c5bbcd3b3b6c7b4764f66c4165b +AUX 4.2/hamcrest-junit-lib.patch 1236 SHA256 fbf4cf2b341e87b0e14be8e9794bee89b31e12af1fdf6e078d465d4d29bf09eb SHA512 2a26b1c34e4a583ed210d9aeefd695e121b1271e8cd01ea04bd93bec8a174d63c36b712846423cde99f99be90a33785a5b940bc988073ae312405e5386f1888e WHIRLPOOL 5cdea3981da1d44780079f4ed177c6a517bafeb0ac5f9f7ce0fb14a960ff0c088b9786e9571985a25206afb531c027711b46ebc6f10502842471a707343fcb42 +AUX 4.2/iterators.patch 2058 SHA256 cc2a1da26b8f63d9c4b75ededf10d7aa67a0d53dea390154eef882dc75e37f2b SHA512 f5e6e0e87428df3636578387b26c4cc1634910fb374537bd527724807740abfa9a37b28def10190d41dd1713b8716db25ec7295491924f45875cf4ffbf2adc43 WHIRLPOOL f920d3506324cca59427cca7a9830088b77ce23210cb4c14c5e492d0a7d74c74df30a8db641da1eb14524180991462352bbf402f1c5b8548931832935dccbd01 +DIST eclipse-3.7.1-src.tar.bz2 69243059 SHA256 f3a87ff4408aeadc6823eb849330527df07d5706d6456af282170bb9bbbd31d6 SHA512 6743730a50225b38ef88b726b211dca31d13fd8e3297208f44b10a7972f594067c3c79774154e0d1bdde837c4094699b6f2723cd3b0977c4887a628b09b43d5a WHIRLPOOL d31347f4f8536101f7e9bf4b3d61df69a4b4dcd65b15735d719ba295970cf51dca2c30fac3d75f38be44adbf26cc26b81bcda6861784cc5a20c339591990ecc5 +DIST eclipse-build-9e028fbc74e844e96a6fd944d7d4f68909283a5d.tar.bz2 267292 SHA256 38fbf55a846ab5be2215e67c5a8855aacc1cf26a7d66d0307dd01c26ea56333c SHA512 7451f9b5e063bc0f74b6c13619922bab2fb080fa1bf76ec976499c56e7ed2c8f6e6b240bcaaaddabf9ecae8ede2e13126f9eab9737aadeb875bddebab63e2df6 WHIRLPOOL 35e72b0a49b25a6938ed107bae6b12302cfab081b9fccaad73e66e230211fc5b0cd996dc31ec6909d08a545e9862c0754d9854016d9bc0d6438009930e19bfc4 +EBUILD eclipse-sdk-3.7.1-r9.ebuild 15110 SHA256 128f70112d191b35f9c8455208af71b383a39626d56c7a70cab52d76a4935b9a SHA512 52879e5767fb376e3ea34383f98e5528ad42e0f69ce3db47b29e6d606ca2750597315c3e84fc91367cf2a9a4eb6e3f8566d7aa1392828c390bcc6498a41b348d WHIRLPOOL abf8e93e6b19f04414759ecdc66461a98c7a5efec68aec94f3fbbe81739314afd4038f607cbf900b9b2921f17a9d11d700e290e8ca0e56a6c20fc8652fd093f4 +MISC ChangeLog 5741 SHA256 2a09a76a8855bd46bf7f0213c6cf5e1c951a0e0451a55583f09792995b4f9888 SHA512 1838d409a2e0ae1ff09f9b57a174ddd1f3fe10823dbc9391e342a7f9f545ec8910d2bf2324512443b22a7ffcdf4c37332a30969d478bfa1a42689624da0a74cd WHIRLPOOL c887a23ce9c37be1102937e913487236ad5e9fa326a82480e3f6916f45dffec65268b8cff13d3a6ea683d258848e646a1a182b06f7ad23396961692e402ec081 +MISC metadata.xml 234 SHA256 e95df0f231cedcea2efba532f194f75011890bbe80a45eb3db283c2d8418af92 SHA512 f75803e1198bed583644fd785710da8f9f4b6c0f31350bd7dd62e5a8dd3eb1cfb3c86b7bcfc7993d9ae01418661de6521b6947f2bbfff69f65f342f3834f3d43 WHIRLPOOL 44efe8ba006b0a0c45017871190bd3868131125eb174c465fdd5e4eb9db8f4b907013edddd2ba9058357890ed91c6e0de35a1feb38b05f279656575d2ff717d3 diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.7.1-r8.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.7.1-r9.ebuild index 09cf0d3..8af5f5e 100644 --- a/dev-util/eclipse-sdk/eclipse-sdk-3.7.1-r8.ebuild +++ b/dev-util/eclipse-sdk/eclipse-sdk-3.7.1-r9.ebuild @@ -9,7 +9,7 @@ EAPI="4" # and push them upstream JAVA_PKG_BSFIX="off" -inherit java-pkg-2 java-ant-2 check-reqs +inherit java-pkg-2 java-ant-2 check-reqs multilib BUILD_VER="3.7.1" BUILD_ID="I20110909-1335" @@ -31,8 +31,13 @@ KEYWORDS="~amd64 ~x86" IUSE="doc gnome source" ANT="1.8.2" +SWT="3.7.2" -CDEPEND="~dev-java/swt-${BUILD_VER}:${SLOT} +# JDKs tested so far are: +# =dev-java/sun-jdk-1.6.0* +# =dev-java/icedtea-7* + +CDEPEND="~dev-java/swt-${SWT}:${SLOT} >=dev-java/ant-${ANT} >=dev-java/asm-3.3.1:3 >=dev-java/commons-codec-1.3 @@ -79,9 +84,10 @@ DEPEND="${CDEPEND} >=dev-java/ant-junit4-${ANT} >=dev-java/ant-swing-${ANT} >=dev-java/ant-testutil-${ANT} - >=virtual/jdk-1.6 - !dev-java/icedtea - !dev-java/icedtea-bin" + || ( + =dev-java/sun-jdk-1.6.0* + =dev-java/icedtea-7* + )" OSGI_DEPENDENCIES=( 'com.ibm.icu - icu4j-4.4' @@ -274,6 +280,17 @@ src_install() { chmod +x "${D}${destDir}"/eclipse rm -f "${D}${destDir}"/libcairo-swt.so # use the system-installed SWT libraries + # if swt-3.7.2 is installed, the swt libraries need symlinks or + # eclipse will not find them: + local xLibDir="/usr/$(get_libdir)" + ebegin "Symlinking swt libraries in ${xLibDir}" + for xLib in atk-gtk gtk pi-gtk ; do + local xSrc="${xLibDir}/libswt-${xLib}.so" + local xTgt="$(basename $(ls ${xLibDir}/libswt-${xLib}-*.so))" + dosym "${xTgt}" "${xSrc}" || die + done + eend + # redo symlinks ebegin 'Relinking dependencies' local dep ; for dep in "${OSGI_DEPENDENCIES[@]}" ; do diff --git a/dev-util/eclipse-sdk/files/3.8/eclipse-3.8 b/dev-util/eclipse-sdk/files/3.8/eclipse-3.8 new file mode 100644 index 0000000..e15a0f3 --- /dev/null +++ b/dev-util/eclipse-sdk/files/3.8/eclipse-3.8 @@ -0,0 +1,46 @@ +#! /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 new file mode 100644 index 0000000..703b649 --- /dev/null +++ b/dev-util/eclipse-sdk/files/3.8/eclipserc-3.8 @@ -0,0 +1,20 @@ +# 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 new file mode 100644 index 0000000..dd71e95 --- /dev/null +++ b/dev-util/eclipse-sdk/files/3.8/gtk_makefile.patch @@ -0,0 +1,36 @@ +--- 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 new file mode 100644 index 0000000..edad52c --- /dev/null +++ b/dev-util/eclipse-sdk/files/3.8/hamcrest-junit-lib.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 0000000..eca230e --- /dev/null +++ b/dev-util/eclipse-sdk/files/3.8/iterators.patch @@ -0,0 +1,70 @@ +--- 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 ++} diff --git a/dev-util/eclipse-sdk/files/4.2/eclipse-4.2 b/dev-util/eclipse-sdk/files/4.2/eclipse-4.2 new file mode 100644 index 0000000..1496dfc --- /dev/null +++ b/dev-util/eclipse-sdk/files/4.2/eclipse-4.2 @@ -0,0 +1,46 @@ +#! /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="4.2" + +[ -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/4.2/eclipserc-4.2 b/dev-util/eclipse-sdk/files/4.2/eclipserc-4.2 new file mode 100644 index 0000000..703b649 --- /dev/null +++ b/dev-util/eclipse-sdk/files/4.2/eclipserc-4.2 @@ -0,0 +1,20 @@ +# 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/4.2/gtk_makefile.patch b/dev-util/eclipse-sdk/files/4.2/gtk_makefile.patch new file mode 100644 index 0000000..dd71e95 --- /dev/null +++ b/dev-util/eclipse-sdk/files/4.2/gtk_makefile.patch @@ -0,0 +1,36 @@ +--- 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/4.2/hamcrest-junit-lib.patch b/dev-util/eclipse-sdk/files/4.2/hamcrest-junit-lib.patch new file mode 100644 index 0000000..edad52c --- /dev/null +++ b/dev-util/eclipse-sdk/files/4.2/hamcrest-junit-lib.patch @@ -0,0 +1,11 @@ +--- 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/4.2/iterators.patch b/dev-util/eclipse-sdk/files/4.2/iterators.patch new file mode 100644 index 0000000..eca230e --- /dev/null +++ b/dev-util/eclipse-sdk/files/4.2/iterators.patch @@ -0,0 +1,70 @@ +--- 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 ++} diff --git a/dev-util/eclipse-sdk/metadata.xml b/dev-util/eclipse-sdk/metadata.xml index 2c6fb2d..9567340 100644 --- a/dev-util/eclipse-sdk/metadata.xml +++ b/dev-util/eclipse-sdk/metadata.xml @@ -2,7 +2,7 @@ <pkgmetadata> <herd /> <maintainer> - <email>sven.eden@ggmx.de</email> + <email>yamakuzure@gmx.net</email> <description>Only through my private overlay - STRICTLY EXPERIMENTAL!</description> </maintainer> <use /> |