dev-util/eclim: Version bump

svn path=/sunrise/; revision=10274

4 files changed, 47 insertions, 19 deletions

diff --git a/dev-util/eclim/ChangeLog b/dev-util/eclim/ChangeLog
index f8c9ed297..c3449f3df 100644
--- a/dev-util/eclim/ChangeLog
+++ b/dev-util/eclim/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Mar 2010; Eric Smith (gentooer) <eric225125@gmail.com>
+  -eclim-1.5.5.ebuild, -files/eclim-1.5.5_fix_build_gant.patch,
+  +eclim-1.5.6.ebuild, +files/eclim-1.5.6_fix_build_gant.patch:
+  Version bump
+
   24 Feb 2010; Eric Smith (gentooer) <eric225125@gmail.com>
   -eclim-1.5.4.ebuild, -files/eclim-1.5.4_fix_build_gant.patch,
   +eclim-1.5.5.ebuild, +files/eclim-1.5.5_fix_build_gant.patch:
diff --git a/dev-util/eclim/Manifest b/dev-util/eclim/Manifest
index 248e2e3f5..dfb33bd58 100644
--- a/dev-util/eclim/Manifest
+++ b/dev-util/eclim/Manifest
@@ -1,5 +1,5 @@
-AUX eclim-1.5.5_fix_build_gant.patch 1725 RMD160 65587475a20f5820fb755250d24de12163593bfc SHA1 a8bb62b3d4c597bf1d730eb2c8c8b7564b9d9d17 SHA256 d3d547c404f888cfb0ae255f5e906e6dd35fe2b26037e50b6bc838ad86604966
-DIST eclim_1.5.5.tar.gz 17711215 RMD160 23fc56434351e8754cb4a47f9dfa924f8bc67e42 SHA1 06b8a0eb767177dfcb5c1bfb72d8464aaac53c97 SHA256 c828f8fea2ce33d2b6ab982bf536b8425bbda98337177293d1eec1461a01864a
-EBUILD eclim-1.5.5.ebuild 2403 RMD160 cb80e2de1d373d3087fe32e46abdf4d7bd26af43 SHA1 a17b8e801c1368253ce981ea44507927a28f303b SHA256 47b349c0f7e55e0b9a60148f05d54f662594521167d89447aafe258bef4e9d85
-MISC ChangeLog 624 RMD160 165a6841d038c5a9b326b7ae60deaca534d1fd92 SHA1 cc9ef4d20090db4fbd5eefdeee7adac6a886965d SHA256 367f6b8e7672034e508b4efbcb5eee7d99a5ff674056d692fb08d17b5e90d1b8
+AUX eclim-1.5.6_fix_build_gant.patch 2257 RMD160 b0ee4ed77f17b38c898bd67346ae579cedabc6e6 SHA1 91032432822691e840da2c3a2f9ad56c9a410cb9 SHA256 68811f943875f4f9f4d11ad23603197d2e4f074b21c0a30feab2cdfcf3c3b887
+DIST eclim_1.5.6.tar.gz 17727460 RMD160 f58420b9d8ef6c03c706a314d05df2053c984522 SHA1 247cf29697e808ef497451d53e31ff0fe9b821b4 SHA256 9f259de30d401cc1e9a9379cfd1dee4e98af6fd6f85605fbfc72fb271fea1edd
+EBUILD eclim-1.5.6.ebuild 2253 RMD160 3103cd0e3f7118389e77678fde4bbd2c22d75bdf SHA1 622a0546a994bda8b5db66c656a1f9cc86c8e560 SHA256 a23ac694d4741a9edc9762415fddc0bf268b9bbe31da3f50318929d1081ea76e
+MISC ChangeLog 828 RMD160 de63afce01cf7392f13794df5d1caaa177811a66 SHA1 9cbda78506894559c16cccb4b9092e5cf703c25c SHA256 de483848e2bc4c161136cb6c020ff0ce84b9b56d5c4c513af1e99b94510b210c
 MISC metadata.xml 242 RMD160 80aa71ffe30e9b716835ac5f7e5a003a205715f9 SHA1 2e243a0aafcf5b40f127ec947dcc7de239c24e3d SHA256 f2e3319efa5e524d4c31180ae7cc3e87108ab182418bb5c590b80f3e4bdc7a65
diff --git a/dev-util/eclim/eclim-1.5.5.ebuild b/dev-util/eclim/eclim-1.5.6.ebuild
index ba07adc94..57a6a2867 100644
--- a/dev-util/eclim/eclim-1.5.5.ebuild
+++ b/dev-util/eclim/eclim-1.5.6.ebuild
@@ -62,10 +62,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Fix a bug caused by incorrect version detection
-	sed -i "s/execute('git', 'describe')/'${PV}'/" \
-		"${S}"/src/ant/build.gant || die "sed failed"
-
 	# Fix up the installation process
 	epatch "${FILESDIR}"/${P}_fix_build_gant.patch
 }
diff --git a/dev-util/eclim/files/eclim-1.5.5_fix_build_gant.patch b/dev-util/eclim/files/eclim-1.5.6_fix_build_gant.patch
index 250da40a3..792c6e01e 100644
--- a/dev-util/eclim/files/eclim-1.5.5_fix_build_gant.patch
+++ b/dev-util/eclim/files/eclim-1.5.6_fix_build_gant.patch
@@ -1,6 +1,15 @@
---- src/ant/build.gant	2010-01-27 17:39:20.612426014 +0100
-+++ src/ant/build.gant.new	2010-01-27 17:37:33.816426014 +0100
-@@ -210,26 +210,6 @@
+--- src/ant/build.gant	2010-03-06 20:25:35.000000000 +0100
++++ src/ant/build.gant.new	2010-03-11 00:37:38.666832375 +0100
+@@ -216,7 +216,7 @@
+ }
+ 
+ target(name: 'deploy'){
+-  depends('deploy.eclipse', 'deploy.resources', 'deploy.vim')
++  depends('deploy.eclipse', 'deploy.vim')
+ }
+ 
+ target(name: 'deploy.eclipse'){
+@@ -226,31 +226,6 @@
  
    mkdir(dir: '${eclim.plugins}')
  
@@ -12,11 +21,16 @@
 -  }
 -
 -  if (existing != null && existing.getName() != "org.eclim_${version}"){
--    echo('###\n# New eclim version, shutting down old version...\n###')
--    execute("${existing.path}/bin/eclim", '-command shutdown', failonerror=false)
--    execute("${existing.path}/bin/eclim",
--        '-f ${basedir}/src/test/resources/eclimrc.test -command shutdown',
--        failonerror=false)
+-    echo('###\n# New eclim version, shutting down old version...###')
+-    instances = new File(binding.getVariable('user.home') + '/.eclim/.eclimd_instances')
+-    if (instances.exists()){
+-      instances.eachLine { line ->
+-        port = line.replaceFirst(/.*:/, '')
+-        echo("#  shutdown: ${line}")
+-        eclim('-command shutdown', port=port, failonerror=false)
+-      }
+-    }
+-    echo('###')
 -  }
 -
 -  delete(includeemptydirs: true){
@@ -27,7 +41,7 @@
    copy(todir: '${eclim.plugins}'){
      fileset(dir: '${build.plugins}', includes: '**/*')
    }
-@@ -242,14 +222,6 @@
+@@ -263,14 +238,6 @@
    }else{
      chmod(dir: '${eclim.plugins}/org.eclim_${eclim.version}/bin',
          includes: '**/*', excludes: '*.sed', perm: 'ugo+x')
@@ -36,9 +50,22 @@
 -      arg(line: '${eclipse.home}/eclim ${eclipse.home}/eclimd')
 -    }
 -    symlink(link: '${eclipse.home}/eclim',
--        resource: '${eclim.plugins}/org.eclim_${eclim.version}/bin/eclim')
+-        resource: 'plugins/org.eclim_${eclim.version}/bin/eclim')
 -    symlink(link: '${eclipse.home}/eclimd',
--        resource: '${eclim.plugins}/org.eclim_${eclim.version}/bin/eclimd')
+-        resource: 'plugins/org.eclim_${eclim.version}/bin/eclimd')
    }
  
    replace(file: '${eclim.plugins}/org.eclim_${eclim.version}/plugin.properties',
+@@ -282,12 +249,6 @@
+   }
+ }
+ 
+-target(name: 'deploy.resources'){
+-  copy(todir: '${user.home}/.eclim/resources', overwrite: true){
+-    fileset(dir: 'src/resources', includes: '**/*')
+-  }
+-}
+-
+ target(name: 'deploy.vim'){
+   depends('build.vim')
+