commit: fa3b219107c4ef1f841702ddfa35f1b6d2f66e9e
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 17:25:42 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 17:26:03 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa3b2191
dev-java/jamvm: Sort out patch naming convention. Fixes bug 563988.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
...location.patch => jamvm-1.5.4-classes-location.patch} | 16 ++++++++--------
.../files/{jamvm-1.5.4-r2.env => jamvm-1.5.4-env.file} | 0
...location.patch => jamvm-2.0.0-classes-location.patch} | 0
dev-java/jamvm/files/{jamvm.env => jamvm-2.0.0-env.file} | 0
dev-java/jamvm/files/{javac.in => jamvm-2.0.0-javac.in} | 0
.../{noexecstack.patch => jamvm-2.0.0-noexecstack.patch} | 0
dev-java/jamvm/jamvm-1.5.4-r2.ebuild | 8 ++++++--
dev-java/jamvm/jamvm-2.0.0-r1.ebuild | 16 ++++++++++------
8 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/dev-java/jamvm/files/classes-location.patch
b/dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch
similarity index 59%
copy from dev-java/jamvm/files/classes-location.patch
copy to dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch
index 6cf7611..57d046a 100644
--- a/dev-java/jamvm/files/classes-location.patch
+++ b/dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch
@@ -1,7 +1,7 @@
-diff -Nru jamvm-2.0.0.old/configure.ac jamvm-2.0.0/configure.ac
---- jamvm-2.0.0.old/configure.ac 2014-06-10 21:33:37.000000000 +0100
-+++ jamvm-2.0.0/configure.ac 2014-11-28 19:22:12.183091414 +0000
-@@ -236,6 +236,7 @@
+diff -ur jamvm-1.5.0.old/configure.ac jamvm-1.5.0/configure.ac
+--- jamvm-1.5.0.old/configure.ac 2008-03-03 17:31:46.000000000 +0200
++++ jamvm-1.5.0/configure.ac 2008-03-03 17:36:14.000000000 +0200
+@@ -208,6 +208,7 @@
install_dir=$prefix
fi
AC_DEFINE_UNQUOTED(INSTALL_DIR, "$install_dir", [Installation directory
(prefix)])
@@ -9,10 +9,10 @@ diff -Nru jamvm-2.0.0.old/configure.ac
jamvm-2.0.0/configure.ac
AC_ARG_ENABLE(zip,
[AS_HELP_STRING(--disable-zip,turn-off zip support in the bootstrap
loader)],,)
-diff -Nru jamvm-2.0.0.old/src/classlib/gnuclasspath/class.c
jamvm-2.0.0/src/classlib/gnuclasspath/class.c
---- jamvm-2.0.0.old/src/classlib/gnuclasspath/class.c 2012-05-17
22:01:47.000000000 +0100
-+++ jamvm-2.0.0/src/classlib/gnuclasspath/class.c 2014-11-28
19:23:27.312108240 +0000
-@@ -110,10 +110,10 @@
+diff -ur jamvm-1.5.0.old/src/class.h jamvm-1.5.0/src/class.h
+--- jamvm-1.5.0.old/src/class.h 2008-03-03 17:31:46.000000000 +0200
++++ jamvm-1.5.0/src/class.h 2008-03-03 17:36:51.000000000 +0200
+@@ -39,10 +39,10 @@
separate class files in a directory structure */
#ifdef USE_ZIP
diff --git a/dev-java/jamvm/files/jamvm-1.5.4-r2.env
b/dev-java/jamvm/files/jamvm-1.5.4-env.file
similarity index 100%
rename from dev-java/jamvm/files/jamvm-1.5.4-r2.env
rename to dev-java/jamvm/files/jamvm-1.5.4-env.file
diff --git a/dev-java/jamvm/files/classes-location.patch
b/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch
similarity index 100%
rename from dev-java/jamvm/files/classes-location.patch
rename to dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch
diff --git a/dev-java/jamvm/files/jamvm.env
b/dev-java/jamvm/files/jamvm-2.0.0-env.file
similarity index 100%
rename from dev-java/jamvm/files/jamvm.env
rename to dev-java/jamvm/files/jamvm-2.0.0-env.file
diff --git a/dev-java/jamvm/files/javac.in
b/dev-java/jamvm/files/jamvm-2.0.0-javac.in
similarity index 100%
rename from dev-java/jamvm/files/javac.in
rename to dev-java/jamvm/files/jamvm-2.0.0-javac.in
diff --git a/dev-java/jamvm/files/noexecstack.patch
b/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch
similarity index 100%
rename from dev-java/jamvm/files/noexecstack.patch
rename to dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch
diff --git a/dev-java/jamvm/jamvm-1.5.4-r2.ebuild
b/dev-java/jamvm/jamvm-1.5.4-r2.ebuild
index 163773a..03dccea 100644
--- a/dev-java/jamvm/jamvm-1.5.4-r2.ebuild
+++ b/dev-java/jamvm/jamvm-1.5.4-r2.ebuild
@@ -21,9 +21,13 @@ DEPEND="dev-java/gnu-classpath:${CLASSPATH_SLOT}
amd64? ( virtual/libffi )"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/"${P}-classes-location.patch"
+)
+
src_prepare() {
# without this patch, classes.zip is not found at runtime
- epatch "${FILESDIR}/classes-location.patch"
+ epatch "${PATCHES[@]}"
eautoreconf
# These come precompiled.
@@ -76,7 +80,7 @@ src_install() {
dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README
- set_java_env "${FILESDIR}/${PN}-1.5.4-r2.env"
+ set_java_env "${FILESDIR}/${P}-env.file"
dosym /usr/bin/jamvm ${INSTALL_DIR}/bin/java
dosym ${CLASSPATH_DIR}/share/classpath/glibj.zip
${INSTALL_DIR}/jre/lib/rt.jar
diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
index 65eeb61..878fd1b 100644
--- a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
+++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
@@ -22,10 +22,14 @@ DEPEND="dev-java/gnu-classpath:0.98
sparc? ( virtual/libffi )"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/"${P}-classes-location.patch"
+ "${FILESDIR}"/"${P}-noexecstack.patch"
+)
+
src_prepare() {
# without this patch, classes.zip is not found at runtime
- epatch "${FILESDIR}/classes-location.patch"
- epatch "${FILESDIR}/noexecstack.patch"
+ epatch "${PATCHES[@]}"
eautoreconf
# These come precompiled.
@@ -65,7 +69,7 @@ create_launcher() {
-Xbootclasspath/p:/usr/share/classpath/tools.zip" \
gnu.classpath.tools.${1}.Main "\$@"
EOF
- chmod +x "${script}"
+ chmod +x "${script}" || die
}
src_install() {
@@ -77,7 +81,7 @@ src_install() {
dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README
- set_java_env "${FILESDIR}/${PN}.env"
+ set_java_env "${FILESDIR}/${P}-env.file"
dodir ${JDK_DIR}/bin
dosym /usr/bin/jamvm ${JDK_DIR}/bin/java
@@ -97,11 +101,11 @@ src_install() {
local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
exeinto ${JDK_DIR}/bin
- cat "${FILESDIR}"/javac.in | sed -e "s#@JAVA@#/usr/bin/jamvm#" \
+ sed -e "s#@JAVA@#/usr/bin/jamvm#" \
-e "s#@ECJ_JAR@#${ecj_jar}#" \
-e "s#@RT_JAR@#/usr/share/classpath/glibj.zip#" \
-e "s#@TOOLS_JAR@#/usr/share/classpath/tools.zip#" \
- | newexe - javac
+ "${FILESDIR}"/"${P}-javac.in" | newexe - javac
local libarch="${ARCH}"
[ ${ARCH} == x86 ] && libarch="i386"
