diff options
author | Lim Swee Tat <st_lim@gentoo.org> | 2004-03-24 17:20:07 +0000 |
---|---|---|
committer | Lim Swee Tat <st_lim@gentoo.org> | 2004-03-24 17:20:07 +0000 |
commit | 31d80633c844e761297eace6a4a5316a54d380d5 (patch) | |
tree | cd7c752f96b72bb31d3bc36a8ba9e0f2b1c495c1 /dev-util | |
parent | Added IUSE. (diff) | |
download | gentoo-2-31d80633c844e761297eace6a4a5316a54d380d5.tar.gz gentoo-2-31d80633c844e761297eace6a4a5316a54d380d5.tar.bz2 gentoo-2-31d80633c844e761297eace6a4a5316a54d380d5.zip |
Updated eclipse-sdk-2.1.2-r1 and added eclipse-2.1.3
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/eclipse-sdk/ChangeLog | 9 | ||||
-rw-r--r-- | dev-util/eclipse-sdk/Manifest | 14 | ||||
-rw-r--r-- | dev-util/eclipse-sdk/eclipse-sdk-2.1.2-r1.ebuild | 12 | ||||
-rw-r--r-- | dev-util/eclipse-sdk/eclipse-sdk-2.1.3.ebuild | 226 | ||||
-rw-r--r-- | dev-util/eclipse-sdk/files/digest-eclipse-sdk-2.1.3 | 1 |
5 files changed, 251 insertions, 11 deletions
diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog index 1217ecc19c88..8ae2d6985baa 100644 --- a/dev-util/eclipse-sdk/ChangeLog +++ b/dev-util/eclipse-sdk/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/eclipse-sdk # Copyright 2003-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.9 2004/01/11 14:04:22 lanius Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.10 2004/03/24 17:20:07 st_lim Exp $ + + 25 Mar 2004; Lim Swee Tat <st_lim@gentoo.org> + eclipse-sdk-2.1.2-r1.ebuild: + Updated eclipse-sdk-2.1.2-r1 and added eclipse-2.1.3 There is a deprecation of + GtkCombo in gtk+-2.4 and the deprecation causes compilation of libswt-pi-gtk + to fail. Removed "#define GTK_DISABLE_DEPRECATION" to allow for compilation + Only tested against gtk+-2.4 11 Jan 2004; Heinrich Wendel <lanius@gentoo.org> eclipse-sdk-2.1.1.ebuild, eclipse-sdk-2.1.2-r1.ebuild, eclipse-sdk-2.1.2.ebuild, diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest index 1b34d11d6f58..b1b71318f7af 100644 --- a/dev-util/eclipse-sdk/Manifest +++ b/dev-util/eclipse-sdk/Manifest @@ -1,15 +1,17 @@ +MD5 d8832cdee920578dbe14bc702b8b7dde ChangeLog 2182 MD5 1599279350669a35135a2bb9b79a89b6 eclipse-sdk-2.1.1.ebuild 7553 MD5 6ed0d1437bb43085909e8bd431d2ecda eclipse-sdk-2.1.2-r1.ebuild 7877 -MD5 98c827d4c23fe349b30e507705eeb077 eclipse-sdk-3.0.0_pre5.ebuild 8992 MD5 1b7dd5acbe8da5ca6f3a967eb7a63916 eclipse-sdk-2.1.2.ebuild 7619 -MD5 d8832cdee920578dbe14bc702b8b7dde ChangeLog 2182 -MD5 9cc8d5162e981d7b7fc1ef9fa1ac0e65 metadata.xml 919 MD5 2822ab14e7466312674e21a7fe2b8e9a eclipse-sdk-2.1.ebuild 82880 +MD5 98c827d4c23fe349b30e507705eeb077 eclipse-sdk-3.0.0_pre5.ebuild 8992 +MD5 9cc8d5162e981d7b7fc1ef9fa1ac0e65 metadata.xml 919 +MD5 0ad7496e630ef2b2a79bc6032249b7ec eclipse-sdk-2.1.3.ebuild 7876 MD5 6c2995197ef0a038015ffff1dee7ac72 files/00-refactor_rename.patch 59577 -MD5 9b30c0b9d4af6ed66a09e216efadefe6 files/eclipse 1067 -MD5 a01c2dd64e43d4ee9dd96dbf0b4578c7 files/eclipse.desktop 213 MD5 5bea1174eca3d2e368ad728e5086b24a files/digest-eclipse-sdk-2.1 86 MD5 76c2f3ddbb548ca9d3f1522498f51bc0 files/digest-eclipse-sdk-2.1.1 88 MD5 cc086062a18b18e0a241f27d0ed2de44 files/digest-eclipse-sdk-2.1.2 88 -MD5 9613d7a4f2ef2deb91c83738ea882570 files/digest-eclipse-sdk-3.0.0_pre5 88 MD5 cc086062a18b18e0a241f27d0ed2de44 files/digest-eclipse-sdk-2.1.2-r1 88 +MD5 9613d7a4f2ef2deb91c83738ea882570 files/digest-eclipse-sdk-3.0.0_pre5 88 +MD5 9b30c0b9d4af6ed66a09e216efadefe6 files/eclipse 1067 +MD5 a01c2dd64e43d4ee9dd96dbf0b4578c7 files/eclipse.desktop 213 +MD5 bfc0f8c0e74a36e0eeebf31cf6a7616c files/digest-eclipse-sdk-2.1.3 88 diff --git a/dev-util/eclipse-sdk/eclipse-sdk-2.1.2-r1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-2.1.2-r1.ebuild index 4785c26b11d0..d156b2703da6 100644 --- a/dev-util/eclipse-sdk/eclipse-sdk-2.1.2-r1.ebuild +++ b/dev-util/eclipse-sdk/eclipse-sdk-2.1.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-2.1.2-r1.ebuild,v 1.4 2004/01/11 14:04:22 lanius Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-2.1.2-r1.ebuild,v 1.5 2004/03/24 17:20:07 st_lim Exp $ DESCRIPTION="Eclipse Tools Platform" HOMEPAGE="http://www.eclipse.org/" @@ -28,7 +28,7 @@ RDEPEND=">=virtual/jdk-1.3 ( >=x11-libs/gtk+-2.2.1-r1 ) ) ) motif? ( x11-libs/openmotif ) gnome? ( =gnome-base/gnome-vfs-2* ) - gtk? ( >=x11-libs/gtk+-2.2.1-r1 )" + gtk? ( >=x11-libs/gtk+-2.4 )" S=${WORKDIR}/eclipse @@ -132,13 +132,17 @@ src_compile() { cd "${gtk_swt_src_dir}" cp ${WORKDIR}/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/* . - cp make_gtk.mak make_gtk.mak.orig sed -e "s:/bluebird/teamswt/swt-builddir/ive:$JAVA_HOME:" \ -e "s:JAVA_JNI=\$(IVE_HOME)/bin/include:JAVA_JNI=\$(IVE_HOME)/include:" \ -e "s:\`pkg-config --libs gthread-2.0\`:${GTHREAD_LIB}:" \ -e "s:\`pkg-config --libs gnome-vfs-2.0\`:${GNOME_LIB}:" \ -e "s:-I\$(JAVA_JNI):-I\$(JAVA_JNI) -I\$(JAVA_JNI)/linux:" \ - make_gtk.mak.orig > make_gtk.mak + -i make_gtk.mak + + # It appears that gtk+-2.4 which most everyone should be using by + # now deprecates the use of combobox. But eclipse is apparently + # still using this deprecation + sed -e "s:#define GTK_DISABLE_DEPRECATED::g" -i swt.c make -f make_gtk.mak make_swt if [ "${gnome}" = "y" ] ; then diff --git a/dev-util/eclipse-sdk/eclipse-sdk-2.1.3.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-2.1.3.ebuild new file mode 100644 index 000000000000..062bc9f4fa4e --- /dev/null +++ b/dev-util/eclipse-sdk/eclipse-sdk-2.1.3.ebuild @@ -0,0 +1,226 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-2.1.3.ebuild,v 1.1 2004/03/24 17:20:07 st_lim Exp $ + +DESCRIPTION="Eclipse Tools Platform" +HOMEPAGE="http://www.eclipse.org/" +SRC_URI="http://download.eclipse.org/downloads/drops/R-2.1.3-200403101828/eclipse-sourceBuild-srcIncluded-2.1.3.zip" +IUSE="gtk motif gnome kde" + +SLOT="0" +LICENSE="CPL-1.0" +KEYWORDS="~x86 ~ppc ~sparc" + +DEPEND="${RDEPEND} + >=dev-java/ant-1.5.3 + >=sys-apps/findutils-4.1.7 + >=app-shells/tcsh-6.11" + +# removed since the bin lives in /opt and this in /usr +# !dev-util/eclipse-platform-bin +# !dev-util/eclipse-jdt-bin +# !dev-util/eclipse-cdt-bin" + +RDEPEND=">=virtual/jdk-1.3 + kde? ( kde-base/kde x11-libs/openmotif ) : + ( gnome? ( =gnome-base/gnome-vfs-2* ) : + ( motif? ( x11-libs/openmotif ) : + ( >=x11-libs/gtk+-2.2.1-r1 ) ) ) + motif? ( x11-libs/openmotif ) + gnome? ( =gnome-base/gnome-vfs-2* ) + gtk? ( >=x11-libs/gtk+-2.4 )" + +S=${WORKDIR}/eclipse + +src_compile() { + + # This ebuild is doing some slightly funky things since the + # source tarball also contains all the binaries for eclipse. On + # top of this, there are a ton of files that need to be merged + # so instead of specifying all these files, we're instead + # removing all the extra fluff from the source tree and then + # merging it all over when we're done. + + # This ebuild will compile eclipse for gtk2, motif, and kde + # toolkits depending on the use flags set. If all are set, the + # default version linked to is the GTK2 version. When building + # for KDE though, the motif version must be built with support + # for KDE. Apparently the motif build also supports KDE when + # this is done - I could be wrong though. + + gtk_launcher_src_dir="${WORKDIR}/plugins/platform-launcher/library/gtk" + motif_launch_src_dir="${WORKDIR}/plugins/platform-launcher/library/motif" + gtk_swt_src_dir=${WORKDIR}/plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library + motif_swt_src_dir=${WORKDIR}/plugins/org.eclipse.swt/Eclipse\ SWT\ PI/motif/library + + case $ARCH in + sparc) + gtk_swt_dest_dir="${WORKDIR}/plugins/org.eclipse.swt.gtk/os/solaris/sparc" + motif_swt_dest_dir="${WORKDIR}/plugins/org.eclipse.swt.motif/os/solaris/sparc" + ;; + x86) + gtk_swt_dest_dir="${WORKDIR}/plugins/org.eclipse.swt.gtk/os/linux/x86" + motif_swt_dest_dir="${WORKDIR}/plugins/org.eclipse.swt.motif/os/linux/x86" + ;; + ppc) + gtk_swt_dest_dir="${WORKDIR}/plugins/org.eclipse.swt.gtk/os/linux/ppc" + motif_swt_dest_dir="${WORKDIR}/plugins/org.eclipse.swt.motif/os/linux/ppc" + ;; + esac + + use gtk && gtk=y + use motif && motif=y + use gnome && gnome=y gtk=y + use kde && kde=y motif=y + + # force gtk to be the default if motif isn't selected + if ! [ ${motif} = "y" ] ; then + gtk=y + fi + + cd ${WORKDIR} + + # First build all java code + + # this export is pulled from the build shellscript supplied by + # eclipse. It fixes an outOfMemory exception during the ant build + # process. + export ANT_OPTS=-Xmx256m + + override_motif_target= + if [ "${gtk}" = "y" ] ; then + einfo "Building GTK+ frontend" + ant -buildfile build.xml -Dos=linux -Dws=gtk + #only do a compile/install for motif... Don't do a buildDoc. This will save time... + override_motif_target=compile install + fi + if [ "${motif}" = "y" ] ; then + einfo "Building Motif frontend" + ant -buildfile ${override_motif_target} build.xml -Dos=linux -Dws=motif + fi + + # remove all .so files shipped with the tarball + find ${WORKDIR} -name '*.so' -exec rm -f {} \; + + # remove the eclipse binary copied from the ant build above. + rm -f ${WORKDIR}/eclipse + + + # I'm replacing these pkg-config lines since --libs for them + # returns -pthread instead of -lpthread and remove the -Wl, since + # ld doesn't know what to do with it. + + GNOME_LIB=`pkg-config --libs gnome-vfs-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export:--export:"` + GTHREAD_LIB=`pkg-config --libs gthread-2.0 | sed -e "s:-pthread:-lpthread:"` + + # Build for the gtk toolkit + if [ "${gtk}" = "y" ] ; then + # Build the eclipse gtk binary + cd ${WORKDIR}/plugins/platform-launcher/library/gtk + tcsh build.csh -arch $ARCH || die + mv eclipse ${WORKDIR}/eclipse-gtk + + cd "${gtk_swt_src_dir}" + cp ${WORKDIR}/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/* . + + sed -e "s:/bluebird/teamswt/swt-builddir/ive:$JAVA_HOME:" \ + -e "s:JAVA_JNI=\$(IVE_HOME)/bin/include:JAVA_JNI=\$(IVE_HOME)/include:" \ + -e "s:\`pkg-config --libs gthread-2.0\`:${GTHREAD_LIB}:" \ + -e "s:\`pkg-config --libs gnome-vfs-2.0\`:${GNOME_LIB}:" \ + -e "s:-I\$(JAVA_JNI):-I\$(JAVA_JNI) -I\$(JAVA_JNI)/linux:" \ + -i make_gtk.mak + + # It appears that gtk+-2.4 which most everyone should be using by + # now deprecates the use of combobox. But eclipse is apparently + # still using this deprecation + sed -e "s:#define GTK_DISABLE_DEPRECATED::g" -i swt.c + + make -f make_gtk.mak make_swt + if [ "${gnome}" = "y" ] ; then + make -f make_gtk.mak make_gnome + fi + + # move the *.so files to the right path so eclipse can find them + mkdir "${gtk_swt_dest_dir}" + mv *.so "${gtk_swt_dest_dir}" + make -f make_linux.mak clean #do a clean since everything is going to end up getting merged + fi + + # Build for the motif toolkit + if [ "${motif}" = "y" ] ; then + # Build the eclipse motif binary + cd ${WORKDIR}/plugins/platform-launcher/library/motif + tcsh build.csh -arch $ARCH || die + mv eclipse ${WORKDIR}/eclipse-motif + + cd "${motif_swt_src_dir}" + cp ${WORKDIR}/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/* . + + mv make_linux.mak make_linux.mak.orig + sed -e "s:/bluebird/teamswt/swt-builddir/ive:$JAVA_HOME:" \ + -e "s:JAVA_JNI=\$(IVE_HOME)/bin/include:JAVA_JNI=\$(IVE_HOME)/include:" \ + -e "s:/bluebird/teamswt/swt-builddir/motif21:/usr/X11R6:" \ + -e "s:\`pkg-config --libs gthread-2.0\`:${GTHREAD_LIB}:" \ + -e "s:\`pkg-config --libs gnome-vfs-2.0\`:${GNOME_LIB}:" \ + -e "s:/usr/lib/qt3:/usr/qt/3:" \ + -e "s:-lkdecore:-L\`kde-config --prefix\`/lib -lkdecore:" \ + -e "s:-I/usr/include/kde:-I\`kde-config --prefix\`/include:" \ + -e "s:-I\$(JAVA_JNI):-I\$(JAVA_JNI) -I\$(JAVA_JNI)/linux:" \ + make_linux.mak.orig > make_linux.mak + + make -f make_linux.mak make_swt + if [ "${gnome}" = "y" ] ; then + make -f make_linux.mak make_gnome + fi + if [ "${kde}" = "y" ] ; then + make -f make_linux.mak make_kde + fi + + # move the *.so files to the right path so eclipse can find them + mkdir "${motif_swt_dest_dir}" + mv *.so "${motif_swt_dest_dir}" + make -f make_linux.mak clean #do a clean since everything is going to end up getting merged + fi + + + # remove all the java files so we can install this. + # there is no install target in build.xml for some reason and + # we don't want all of these files merged. + # also remove all the .project, .classpath and build.* files spread out all over the place + find ${WORKDIR} -name '*.java' -exec rm -f {} \; + find ${WORKDIR} -name '.classpath' -exec rm -f {} \; + find ${WORKDIR} -name '.project' -exec rm -f {} \; + find ${WORKDIR} -name 'build.*' -exec rm -f {} \; + +} + +src_install() { + cd ${WORKDIR} + + exeinto /usr/bin + doexe ${FILESDIR}/eclipse + + dodir /usr/lib/eclipse + exeinto /usr/lib/eclipse + + if [ -f eclipse-gtk ] ; then + doexe eclipse-gtk + dosym /usr/lib/eclipse/eclipse-gtk /usr/lib/eclipse/eclipse + fi + if [ -f eclipse-motif ] ; then + doexe eclipse-motif + dosym /usr/bin/eclipse /usr/bin/eclipse-motif + if ! [ -f eclipse-gtk ] ; then + dosym /usr/lib/eclipse/eclipse-motif /usr/lib/eclipse/eclipse + fi + fi + + insinto /usr/lib/eclipse + doins plugins/org.eclipse.platform/.eclipseproduct + + cp -dpR features icon.xpm plugins splash.bmp startup.jar \ + ${D}/usr/lib/eclipse/ + + insinto /usr/share/gnome/apps/Development + doins ${FILESDIR}/eclipse.desktop +} diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-2.1.3 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-2.1.3 new file mode 100644 index 000000000000..54978fc2e107 --- /dev/null +++ b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-2.1.3 @@ -0,0 +1 @@ +MD5 cd8132138afbd252bf35bb83546534dc eclipse-sourceBuild-srcIncluded-2.1.3.zip 45066815 |