[arch-commits] Commit in tomcat7/trunk (PKGBUILD)

[Guillaume Alaux]

    Date: Monday, January 7, 2013 @ 07:22:34
  Author: guillaume
Revision: 174767

Got rid of Arch ecj FS#33151 - sources

Modified:
  tomcat7/trunk/PKGBUILD

----------+
 PKGBUILD |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-07 11:39:56 UTC (rev 174766)
+++ PKGBUILD	2013-01-07 12:22:34 UTC (rev 174767)
@@ -2,11 +2,11 @@
 pkgbase=tomcat7
 pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
 pkgver=7.0.34
-pkgrel=1
+pkgrel=2
 arch=('any')
 url='http://tomcat.apache.org/'
 license=('APACHE')
-makedepends=('java-environment' 'apache-ant>=1.8' 'java-commons-daemon' 'eclipse-ecj')
+makedepends=('java-environment' 'apache-ant>=1.8' 'java-commons-daemon')
 source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
         http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
         tomcat7.conf.d
@@ -32,7 +32,6 @@
   ant deploy \
     -Dbase.path=${srcdir}/DOWN_LIBS \
     -Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
-    -Djdt.jar=/usr/share/java/eclipse-ecj.jar \
     -Dno.build.dbcp=true
 }
 
@@ -67,7 +66,7 @@
 
 package_tomcat7() {
   pkgdesc="Servlet-3.0/JSP-2.2 Container"
-  depends=('java-runtime>=6' 'java-jsvc' 'eclipse-ecj'
+  depends=('java-runtime>=6' 'java-jsvc'
            "java-servlet3.0-tomcat=${pkgver}" "java-jsp2.2-tomcat=${pkgver}")
   optdepends=('tomcat-native: to allow optimal performance in production environments')
   backup=(etc/tomcat7/catalina.policy
@@ -88,10 +87,7 @@
   rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
   cp -r bin ${pkgdir}/usr/share/${pkgname}
 
-  # eclipse-ecj is packaged on its own
-  rm lib/eclipse-ecj.jar
   install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/eclipse-ecj.jar
 
   # Provided by previous packages
   rm ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar