[arch-commits] CVS update of extra/devel/eclipse (PKGBUILD)

[Paul Mattal]

    Date: Sunday, October 7, 2007 @ 15:19:53
  Author: paul
    Path: /home/cvs-extra/extra/devel/eclipse

Modified: PKGBUILD (1.20 -> 1.21)

Updated PKGBUILD for 3.3.1
but have not yet gotten it to successfully build


----------+
 PKGBUILD |   41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)


Index: extra/devel/eclipse/PKGBUILD
diff -u extra/devel/eclipse/PKGBUILD:1.20 extra/devel/eclipse/PKGBUILD:1.21
--- extra/devel/eclipse/PKGBUILD:1.20	Tue Apr  3 15:47:04 2007
+++ extra/devel/eclipse/PKGBUILD	Sun Oct  7 15:19:53 2007
@@ -1,53 +1,54 @@
-# $Id: PKGBUILD,v 1.20 2007/04/03 19:47:04 andyrtr Exp $
+# $Id: PKGBUILD,v 1.21 2007/10/07 19:19:53 paul Exp $
 # Contributor: Andrew Wright <andreww at photism.org>
 # Maintainer: Paul Mattal <paul at archlinux.org>
 
 pkgname=eclipse
-pkgver=3.2.2
+pkgver=3.3.1
 pkgrel=1
 pkgdesc="Eclipse IDE development platform"
 arch=('i686' 'x86_64')
 url="http://eclipse.org"
-depends=('j2sdk>=1.5' gtk2)
+depends=('jdk>=1.5' gtk2)
 install=$pkgname.install
 makedepends=(zip libgnomeui apache-ant)
-source=(ftp://ftp.osuosl.org/pub/$pkgname/$pkgname/downloads/drops/R-3.2.2-200702121330/$pkgname-sourceBuild-srcIncluded-$pkgver.zip \
+source=(ftp://ftp.osuosl.org/pub/$pkgname/$pkgname/downloads/drops/R-$pkgver-200709211145/$pkgname-sourceBuild-srcIncluded-$pkgver.zip \
 	eclipse.sh \
 	eclipse.desktop)
 # you also need to download JDK 1.4.x to properly build this package
 # and set your JAVA_HOME to point there
 # try: http://java.sun.com/j2se/1.4.2/download.html
-md5sums=('5d1b9f6a146ffc59191e513083a6ec86' \
+md5sums=('764b585d9a05cd518650e31c32899a29' \
 	 'f08e49e6dad13dda8b2e4036b2a3f28c' \
 	 '0bee44d3b8839d6b217b6a5efb27407f')
 
 build() {
-  export _JAVA_VERSION=$($JAVA_HOME/bin/java -version 2>&1 \
-  	| head -n 1 | cut -f 3 -d " " | cut -f 2 -d \" | cut -f 1 -d _ \
-	| cut -b 1-3)
-  if [ "1.4" != $_JAVA_VERSION ]; then
-	echo "JAVA_HOME = $JAVA_HOME";
-	echo "_JAVA_VERSION = $_JAVA_VERSION";
-	echo "JAVA_HOME must point to a version 1.4 JDK in order to build Eclipse";
-	if [ "$CARCH" = "i686" ]; then
-	  return 1;
-	fi
-  fi
+#  export _JAVA_VERSION=$($JAVA_HOME/bin/java -version 2>&1 \
+#  	| head -n 1 | cut -f 3 -d " " | cut -f 2 -d \" | cut -f 1 -d _ \
+#	| cut -b 1-3)
+#  if [ "1.4" != $_JAVA_VERSION ]; then
+#	echo "JAVA_HOME = $JAVA_HOME";
+#	echo "_JAVA_VERSION = $_JAVA_VERSION";
+#	echo "JAVA_HOME must point to a version 1.4 JDK in order to build Eclipse";
+#	if [ "$CARCH" = "i686" ]; then
+#	  return 1;
+#	fi
+#  fi
 
   cd $startdir/src || return 1
   unset ANT_HOME
 
-  # Arch64 - i cannot reproduce why it most times freezes while "assembling"; got it only once build - happy with that
+  # Arch64 - i cannot reproduce why it most times freezes while "assembling";
+  #          got it only once build - happy with that
   if [ "$CARCH" = "x86_64" ]; then
-      #export MAKEFLAGS="-j1"
+     # export MAKEFLAGS="-j1"
      # no warnings / java5 - http://gcc.gnu.org/ml/java/2007-02/msg00117.html
      find $startdir/src -type f -name '*.xml' -exec sed -r \
             -e "s/(\"compilerArg\" value=\")/\1-nowarn /g" \
             -e "s/(-encoding ISO-8859-1)/\1 -nowarn/g" \
             -e "s:(<property name=\"javacSource\" value=)\".*\":\1\"1.5\":" \
             -e "s:(<property name=\"javacTarget\" value=)\".*\":\1\"1.5\":" -i {} \; 
-         ./build -os linux -ws gtk -arch x86_64 -java5home /opt/java || return 1
-    else ./build -os linux -ws gtk -arch x86 -java5home /opt/java || return 1
+         ./build -os linux -ws gtk -arch x86_64 || return 1
+    else ./build -os linux -ws gtk -arch x86 || return 1
   fi
 
   mkdir $startdir/pkg/opt