dev-util/eclim: Fix nailgun Makefile

svn path=/sunrise/; revision=10289

diff --git a/dev-util/eclim/ChangeLog b/dev-util/eclim/ChangeLog
index c3449f3df57530f2f27eebfc0c3dcd0486ba5437..9acf0c33ef76c99c83edb216783d6c8f3c9d5bc3 100644 (file)
--- a/dev-util/eclim/ChangeLog
+++ b/dev-util/eclim/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Mar 2010; Eric Smith (gentooer) <eric225125@gmail.com>
+  eclim-1.5.6.ebuild:
+  Fix nailgun Makefile
+
   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:

diff --git a/dev-util/eclim/Manifest b/dev-util/eclim/Manifest
index dfb33bd58478e2271914d7e4ab14fb48be8d89e5..4ae65c6a00e56fd3965fb8a93e6bc7927d781213 100644 (file)
--- a/dev-util/eclim/Manifest
+++ b/dev-util/eclim/Manifest
@@ -1,5 +1,5 @@
 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
+EBUILD eclim-1.5.6.ebuild 2378 RMD160 12847592723fe98a2d32d970da15451206da2ccd SHA1 ffe59c1c32c9117367953a9adaa7e808ceff06a2 SHA256 1b189e47ed59f3133626ac1f2f91011999775b61d2f85457837b50268c4391a4
+MISC ChangeLog 934 RMD160 9db198bec9aa3d423be443eca82bd069a1237a21 SHA1 541e5540102eea46aa5537f3aba11938743294a5 SHA256 97266ace0dfbe21feaa3af80a36573ac05c683076860835585133ba8742c4362
 MISC metadata.xml 242 RMD160 80aa71ffe30e9b716835ac5f7e5a003a205715f9 SHA1 2e243a0aafcf5b40f127ec947dcc7de239c24e3d SHA256 f2e3319efa5e524d4c31180ae7cc3e87108ab182418bb5c590b80f3e4bdc7a65

diff --git a/dev-util/eclim/eclim-1.5.6.ebuild b/dev-util/eclim/eclim-1.5.6.ebuild
index 57a6a2867ba307882f256f5d68397d94be7671fd..b7cd67d83ec70b73ad0d98a95465ce22bd81f3cb 100644 (file)
--- a/dev-util/eclim/eclim-1.5.6.ebuild
+++ b/dev-util/eclim/eclim-1.5.6.ebuild
@@ -64,6 +64,10 @@ pkg_setup() {
 src_prepare() {
        # Fix up the installation process
        epatch "${FILESDIR}"/${P}_fix_build_gant.patch
+
+       # Fix nailgun Makefile
+       sed -i -e '/CFLAGS=/d' -e 's/${CFLAGS}/& ${LDFLAGS}/' \
+               src/nailgun/Makefile || die "sed failed"
 }
 
 src_install() {