summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-emacs/jde/files/jde-2.4.0.1-classpath-gentoo.patch
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-emacs/jde/files/jde-2.4.0.1-classpath-gentoo.patch')
-rw-r--r--app-emacs/jde/files/jde-2.4.0.1-classpath-gentoo.patch69
1 files changed, 69 insertions, 0 deletions
diff --git a/app-emacs/jde/files/jde-2.4.0.1-classpath-gentoo.patch b/app-emacs/jde/files/jde-2.4.0.1-classpath-gentoo.patch
new file mode 100644
index 000000000000..47fdd4e11e47
--- /dev/null
+++ b/app-emacs/jde/files/jde-2.4.0.1-classpath-gentoo.patch
@@ -0,0 +1,69 @@
+Initialise classpath for beanshell and checkstyle using java-config.
+Gentoo specific patch.
+
+--- jde-orig/lisp/beanshell.el
++++ jde/lisp/beanshell.el
+@@ -809,6 +809,14 @@
+ "BeanShell intended to be used independently of any other
+ Emacs package.")
+
++(defun bsh-get-gentoo-classpath ()
++ (or bsh-classpath
++ (with-temp-buffer
++ (call-process "java-config" nil t nil "-d" "-p" "bsh")
++ (skip-chars-backward "\n")
++ (setq bsh-classpath
++ (split-string (buffer-substring (point-min) (point)) ":+")))))
++
+ (defmethod initialize-instance ((this bsh-standalone-bsh) &rest fields)
+ "Constructor for the standard bsh BeanShell instance."
+ (call-next-method)
+@@ -845,7 +853,7 @@
+ bsh-vm)
+ (executable-find (if (eq system-type 'windows-nt) "javaw" "java"))))
+
+- (oset this cp bsh-classpath)
++ (oset this cp (bsh-get-gentoo-classpath))
+
+ (oset this startup-dir bsh-startup-directory))
+
+--- jde-orig/lisp/jde-bsh.el
++++ jde/lisp/jde-bsh.el
+@@ -187,7 +187,7 @@
+ (jde-get-tools-jar)
+ (if ant-home (expand-file-name "lib" ant-home)))
+ (jde-pi-get-bsh-classpath)
+- bsh-classpath
++ (bsh-get-gentoo-classpath)
+ (jde-expand-classpath (jde-get-global-classpath)))))))
+
+ ;; Create the BeanShell wrapper object.
+--- jde-orig/lisp/jde-checkstyle.el
++++ jde/lisp/jde-checkstyle.el
+@@ -305,6 +305,14 @@
+ (format "-D%s=%s" (car prop) (cdr prop)))
+ jde-checkstyle-expanded-properties))
+
++(defun jde-checkstyle-get-gentoo-classpath ()
++ (or jde-checkstyle-classpath
++ (with-temp-buffer
++ (call-process "java-config" nil t nil "-d" "-p" "checkstyle")
++ (skip-chars-backward "\n")
++ (setq jde-checkstyle-classpath
++ (split-string (buffer-substring (point-min) (point)) ":+")))))
++
+ (defmethod jde-checkstyle-exec ((this jde-checkstyle-checker))
+
+ (jde-checkstyle-create-checker-buffer this)
+@@ -327,9 +335,8 @@
+ (jde-checkstyle-get-property-args this))
+ (oref this :interactive-args)
+ (list "-classpath"
+- (if jde-checkstyle-classpath
+- (jde-build-classpath jde-checkstyle-classpath)
+- (jde-normalize-path jde-checkstyle-jar-file)))
++ (jde-build-classpath
++ (jde-checkstyle-get-gentoo-classpath)))
+ (list jde-checkstyle-class)
+ (list "-c"
+ (if jde-checkstyle-style