[patch] Updated patch, using emacs to find location of cedet files for build

0001-app-emacs-jdee-Fix-bug-394365-use-correct-cedet.patch (text/plain), 1.35 KB, created by Alex Bennee on 2011-12-12 21:07:01 UTC

From bb1aa9b0b9b4a2573fa7e7a243992078a54662b1 Mon Sep 17 00:00:00 2001
From: Alex Bennee <[e-mail]>
Date: Mon, 12 Dec 2011 21:04:52 +0000
Subject: [PATCH] app-emacs/jdee: Fix bug #394365, use correct cedet

This fixes two things. Firstly it changes the cedet dependency to
virtual/cedet so it Does The Right Thing when more modern emacs are
installed. Secondly it uses emacs itself to find the location of the
cedet directory for the build process of jdee.
---
 app-emacs/jde/jde-2.4.0.1.ebuild |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app-emacs/jde/jde-2.4.0.1.ebuild b/app-emacs/jde/jde-2.4.0.1.ebuild
index f9b8729..4a8b33c 100644
--- a/app-emacs/jde/jde-2.4.0.1.ebuild
+++ b/app-emacs/jde/jde-2.4.0.1.ebuild
@@ -20,7 +20,7 @@ IUSE=""
 
 DEPEND=">=virtual/jdk-1.3
 	app-emacs/elib
-	>=app-emacs/cedet-1.0_beta3
+	virtual/cedet
 	dev-java/bsh
 	dev-java/junit:0
 	dev-util/checkstyle"
@@ -46,8 +46,13 @@ src_prepare() {
 }
 
 src_compile() {
+	local cedet
+	cedet=$(${EMACS} ${EMACSFLAGS} --eval '(princ (locate-library "cedet"))')
+    	cedet=${cedet%/*}            # get directory part
+	[[ -n ${cedet} && -d ${cedet} ]] || die "CEDET not found"
+
 	eant bindist \
-		-Dcedet.dir="${EPREFIX}${SITELISP}/cedet" \
+		-Dcedet.dir="${cedet}" \
 		-Delib.dir="${EPREFIX}${SITELISP}/elib"
 
 	use doc && eant source-doc
-- 
1.7.3.4