diff options
Diffstat (limited to 'sci-physics/thepeg/files/thepeg-2.2.3-java.patch')
| -rw-r--r-- | sci-physics/thepeg/files/thepeg-2.2.3-java.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/sci-physics/thepeg/files/thepeg-2.2.3-java.patch b/sci-physics/thepeg/files/thepeg-2.2.3-java.patch new file mode 100644 index 000000000000..88bd3c5acac0 --- /dev/null +++ b/sci-physics/thepeg/files/thepeg-2.2.3-java.patch @@ -0,0 +1,61 @@ + +We are changing the javac -soure value from 1.4 to java-pkg_get-source +and java-pkg_get-target which is supported by all Java versions presently +available in ::gentoo. +--- a/configure.ac ++++ b/configure.ac +@@ -123,7 +123,7 @@ AC_ARG_WITH(javagui, + [ --with-javagui Compile and install the java-based GUI.]) + + if test "x$with_javagui" != "xno"; then +- THEPEG_HAS_JAVA([1.4], [], [with_javagui=no; AC_MSG_NOTICE([Java GUI disabled])]) ++ THEPEG_HAS_JAVA([JAVA_PKG_GET_SOURCE], [], [with_javagui=no; AC_MSG_NOTICE([Java GUI disabled])]) + fi + + AM_CONDITIONAL([JAVAGUI], [test "x$with_javagui" != "xno"]) +--- a/java/Makefile.am ++++ b/java/Makefile.am +@@ -11,8 +12,7 @@ JAVASOURCES = SetupThePEG.java ObjectFrame.java \ + + CLEANFILES = ThePEG.jar thepeg.sh + +-jardir = $(pkglibdir) +-nodist_jar_DATA = ThePEG.jar ++noinst_DATA = ThePEG.jar + + dist_noinst_DATA = $(JAVASOURCES) jar-manifest + +@@ -27,14 +27,14 @@ clean-local: + ThePEG: + mkdir -p ThePEG + for file in $(JAVASOURCES) jar-manifest; do \ +- cd ThePEG; $(LN_S) ../$(srcdir)/$$file $$file; cd ..; done ++ cd ThePEG; cp ../$(srcdir)/$$file $$file; cd ..; done + + ThePEG.jar: ThePEG $(JAVASOURCES) +- $(JAVAC) `for file in $(JAVASOURCES); do echo ThePEG/$$file; done` ++ $(JAVAC) -source JAVA_PKG_GET_SOURCE -target JAVA_PKG_GET_TARGET `for file in $(JAVASOURCES); do echo ThePEG/$$file; done` + $(JAR) cmf ThePEG/jar-manifest ThePEG.jar ThePEG/*.class + + thepeg.sh: thepeg.install Makefile +- sed -e s:@pkglibdir[@]:$(pkglibdir):g \ ++ sed -e s:@datadir[@]:$(datadir):g \ + -e s:@bindir[@]:$(bindir):g \ + -e s:@java[@]:$(JAVA):g $(srcdir)/thepeg.install > thepeg.sh + chmod +x thepeg.sh +--- a/java/thepeg.install ++++ b/java/thepeg.install +@@ -1,6 +1,6 @@ + #!/bin/sh + +-pkglibdir=@pkglibdir@ ++source @datadir@/thepeg/package.env + bindir=@bindir@ + + ThePEG_CMD="${bindir}/setupThePEG" +@@ -19,4 +19,4 @@ + + + +-exec @java@ ${HEADLESS} -jar ${pkglibdir}/ThePEG.jar ${ThePEG_CMD} "$@" ++exec @java@ ${HEADLESS} -jar ${CLASSPATH} ${ThePEG_CMD} "$@" |
