From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-java/jamvm/Manifest | 7 -- .../jamvm/files/jamvm-2.0.0-classes-location.patch | 27 ----- dev-java/jamvm/files/jamvm-2.0.0-env.file | 15 --- dev-java/jamvm/files/jamvm-2.0.0-javac.in | 57 --------- dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch | 48 -------- dev-java/jamvm/jamvm-2.0.0-r1.ebuild | 127 --------------------- dev-java/jamvm/metadata.xml | 11 -- 7 files changed, 292 deletions(-) delete mode 100644 dev-java/jamvm/Manifest delete mode 100644 dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch delete mode 100644 dev-java/jamvm/files/jamvm-2.0.0-env.file delete mode 100644 dev-java/jamvm/files/jamvm-2.0.0-javac.in delete mode 100644 dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch delete mode 100644 dev-java/jamvm/jamvm-2.0.0-r1.ebuild delete mode 100644 dev-java/jamvm/metadata.xml (limited to 'dev-java/jamvm') diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest deleted file mode 100644 index 64450cad29c2..000000000000 --- a/dev-java/jamvm/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX jamvm-2.0.0-classes-location.patch 1276 BLAKE2B 7e7fd91a3dcdc1eeea665517043a856bf8ab3e76d6dd91a27ea91c422555fde0c0bc853a4410bc4feb6552efae1d9ba577e39f5f9774aa2b2f601dfcb251826c SHA512 c399cb8ebce0556a778a1511fec43eeedc2e8d4b1ca732ebd201faf49d6a607baef914fb54e34f2c5b494ace6f5c072d296fb30c65038461e97a518c9e1924bd -AUX jamvm-2.0.0-env.file 544 BLAKE2B 25197538a4c10d6ae1b0038113c094cdbca9a1a22b2b8dbca5bc228163ba786e8187dd3f98259fc77ced451464dd8dfe383052a374f49c6c134edde0a56847fd SHA512 bf79384865e1bcaeff6c9b11d4b7d2cbd3740e87e83470f62c5ecc69029d3eaa876c5d69a376175f703d6a169041589b8c552cfe9f136be4d3050ea1888a771a -AUX jamvm-2.0.0-javac.in 1739 BLAKE2B ff167bfba594dbfb71dd1d09e41ce502ebfcc598fbcef0794cb967c00894745f8b16412adc7b4afbd167878defa29351e99b30a71b4377987c5c8a692f404e30 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb -AUX jamvm-2.0.0-noexecstack.patch 1387 BLAKE2B afd020772bf627c3dbd6b5da9e03d3b03e8f5c9dc3844279fe325183819cb11deadaedb4920ebfb0c6b25321daeee9f0e4fff45addd162e2b6c02e3f3ea12d31 SHA512 17c38ad0017e5659295dea7ed57f263eb0eee673bbc1f5d1e44e0c8fe588f4172a8a05c832a1fd41f3dc094779fade66aa710c8ce48c754412b0b6afdea6551a -DIST jamvm-2.0.0.tar.gz 741459 BLAKE2B 9b8b0f8cfd8f56c0b835144c07aaca709ef466fdfe5df18438d05c66cd8a07fecfebf27e1581c67658feb3674a96c2e916b85f13dc434baf2db9be4e4fbfd0cf SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d -EBUILD jamvm-2.0.0-r1.ebuild 3701 BLAKE2B 22026d1c5487c76207fe309aad02dedece43e952f4d1324e34ce54ef855309aa2dc988be0b95d9ccaa5bd4eb562fb222e24ed8e0d70d797d75fc1b45601dd995 SHA512 96967a52414796749f5bce41695d8db746d2bbe720c968c15a3db6977d9b2ac4a72de508a2512457d04a9326af5d9cb2ceecd707427a845a17a651e39a4d07d9 -MISC metadata.xml 311 BLAKE2B f89901d2404c3d1004a7b53345d8e533059995634d1109f620d6685de9defd6126dc1e619f8c8ba0d8f53d57a1d7b1f2f51b0f93fc12b1afb179385b30b4d514 SHA512 3c73e7134e8adf35e0a1418dfcb0215082b5cfc7e3baabc11d89fb1044996a382c551309e5c04dbc54257a65173384b690ad951ceaec2b8569d89bb8a5e757ee diff --git a/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch b/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch deleted file mode 100644 index 6cf7611f1f35..000000000000 --- a/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 @@ - install_dir=$prefix - fi - AC_DEFINE_UNQUOTED(INSTALL_DIR, "$install_dir", [Installation directory (prefix)]) -+AC_DEFINE_UNQUOTED(PKGDATADIR, "$datadir/$PACKAGE", [Package data directory (pkgdatadir)]) - - 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 @@ - separate class files in a directory structure */ - - #ifdef USE_ZIP --#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip" -+#define JAMVM_CLASSES PKGDATADIR"/classes.zip" - #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip" - #else --#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes" -+#define JAMVM_CLASSES PKGDATADIR"/classes" - #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath" - #endif - diff --git a/dev-java/jamvm/files/jamvm-2.0.0-env.file b/dev-java/jamvm/files/jamvm-2.0.0-env.file deleted file mode 100644 index 1b92cd02bb79..000000000000 --- a/dev-java/jamvm/files/jamvm-2.0.0-env.file +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -VERSION="JamVM JDK @PV@" -JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk" -JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk" -BOOTCLASSPATH="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@/classes.zip:${JAVA_HOME}/lib/rt.jar" -JAVAC="${JAVA_HOME}/bin/javac" -PATH="${JAVA_HOME}/bin" -ROOTPATH="${JAVA_HOME}/bin" -PROVIDES_TYPE="JRE" -PROVIDES_VERSION="1.5" -GENERATION="2" -ENV_VARS="JAVA_HOME JAVAC PATH" -LDPATH="${JAVA_HOME}/lib" diff --git a/dev-java/jamvm/files/jamvm-2.0.0-javac.in b/dev-java/jamvm/files/jamvm-2.0.0-javac.in deleted file mode 100644 index 8eeda68c7a5e..000000000000 --- a/dev-java/jamvm/files/jamvm-2.0.0-javac.in +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/perl -w -use strict; -use constant NO_DUP_ARGS => qw(-source -target -d -encoding); -use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:); - -my $ECJ_WARNINGS="-nowarn"; - -my ( @bcoption, @source15, @target15, @cp ); -push @bcoption, '-bootclasspath', '@RT_JAR@:@TOOLS_JAR@' - unless grep {$_ eq '-bootclasspath'} @ARGV; -push @source15, '-source', '1.5' - unless grep {$_ eq '-source'} @ARGV; -push @target15, '-target', '1.5' - unless grep {$_ eq '-target'} @ARGV; -push @cp, '-cp', '.' - unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV or $ENV{CLASSPATH}; -my @ecj_parms = ($ECJ_WARNINGS, @bcoption, @source15, @target15, @cp); - -# Work around ecj's inability to handle duplicate command-line -# options and unknown javac options. -sub gen_ecj_opts -{ - my @new_args = @{$_[0]}; - - for my $opt (NO_DUP_ARGS) - { - my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args; - if (@indices > 1) { - shift @indices; # keep last instance only - splice @new_args, $_, 2 for @indices; - } - } - - for my $opt (STRIP_ARGS) - { - my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args; - splice @new_args, $_, 1 for @indices; - } - - return \@new_args; -} - -sub split_vm_args -{ - my @new_args = @{$_[0]}; - - my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args; - my @javac_args = grep $_ !~ /^-J/, @new_args; - - return (\@vm_args, \@javac_args); -} - -my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV )); -my @CLASSPATH = ('@ECJ_JAR@'); -push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"}; -$ENV{"CLASSPATH"} = join ':', @CLASSPATH; -exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args; diff --git a/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch b/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch deleted file mode 100644 index 2a0f14c71a1e..000000000000 --- a/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/src/os/linux/arm/callNative.S b/src/os/linux/arm/callNative.S -index 245afd1..1583023 100644 ---- a/src/os/linux/arm/callNative.S -+++ b/src/os/linux/arm/callNative.S -@@ -36,3 +36,7 @@ - #include "callNativeOABI.S" - #endif - #endif -+ -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif -diff --git a/src/os/linux/mips/callNative.S b/src/os/linux/mips/callNative.S -index cede343..90d9163 100644 ---- a/src/os/linux/mips/callNative.S -+++ b/src/os/linux/mips/callNative.S -@@ -184,3 +184,7 @@ return: - j $31 - .end callJNIMethod - #endif -+ -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif -diff --git a/src/os/linux/powerpc/callNative.S b/src/os/linux/powerpc/callNative.S -index aa47f6a..763dc0a 100644 ---- a/src/os/linux/powerpc/callNative.S -+++ b/src/os/linux/powerpc/callNative.S -@@ -281,3 +281,7 @@ return: - mr 1,11 - blr - #endif -+ -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif -diff --git a/src/os/linux/x86_64/callNative.S b/src/os/linux/x86_64/callNative.S -index 26404e6..9fb5cdf 100644 ---- a/src/os/linux/x86_64/callNative.S -+++ b/src/os/linux/x86_64/callNative.S -@@ -267,3 +267,7 @@ float_ret: - addq $8, %rcx - jmp return - #endif -+ -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild deleted file mode 100644 index b418c899262f..000000000000 --- a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic multilib java-vm-2 autotools - -DESCRIPTION="An extremely small and specification-compliant virtual machine" -HOMEPAGE="http://jamvm.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug libffi" - -DEPEND="dev-java/gnu-classpath:0.98 - || ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* ) - libffi? ( virtual/libffi ) - ppc64? ( virtual/libffi ) - 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 "${PATCHES[@]}" - eautoreconf - - # These come precompiled. - # configure script uses detects the compiler - # from PATH. I guess we should compile this from source. - # Then just make sure not to hit - # https://bugs.gentoo.org/show_bug.cgi?id=163801 - # - #rm -v lib/classes.zip || die -} - -src_configure() { - filter-flags "-fomit-frame-pointer" - - if use ppc64 || use sparc || use libffi; then - append-cflags "$(pkg-config --cflags-only-I libffi)" - fi - - local fficonf="--enable-ffi" - if { ! use ppc64 && ! use sparc; }; then - fficonf="$(use_enable libffi ffi)" - fi - - econf ${fficonf} \ - --disable-dependency-tracking \ - $(use_enable debug trace) \ - --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \ - --includedir="${EPREFIX}"/usr/include/${PN} \ - --with-classpath-install-dir=/usr -} - -create_launcher() { - local script="${D}/${INSTALL_DIR}/bin/${1}" - cat > "${script}" <<-EOF - #!/bin/sh - exec /usr/bin/jamvm \ - -Xbootclasspath/p:/usr/share/classpath/tools.zip" \ - gnu.classpath.tools.${1}.Main "\$@" - EOF - chmod +x "${script}" || die -} - -src_install() { - local libdir=$(get_libdir) - local CLASSPATH_DIR=/usr/libexec/gnu-classpath-0.98 - local JDK_DIR=/usr/${libdir}/${PN}-jdk - - emake DESTDIR="${D}" install - - dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README - - set_java_env "${FILESDIR}/${P}-env.file" - - dodir ${JDK_DIR}/bin - dosym /usr/bin/jamvm ${JDK_DIR}/bin/java - for files in ${CLASSPATH_DIR}/g*; do - if [ $files = "${CLASSPATH_DIR}/bin/gjdoc" ] ; then - dosym $files ${JDK_DIR}/bin/javadoc || die - else - dosym $files \ - ${JDK_DIR}/bin/$(echo $files|sed "s#$(dirname $files)/g##") || die - fi - done - - dodir ${JDK_DIR}/jre/lib - dosym /usr/share/classpath/glibj.zip ${JDK_DIR}/jre/lib/rt.jar - dodir ${JDK_DIR}/lib - dosym /usr/share/classpath/tools.zip ${JDK_DIR}/lib/tools.jar - - local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)" - exeinto ${JDK_DIR}/bin - 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#" \ - "${FILESDIR}"/"${P}-javac.in" | newexe - javac - - local libarch="${ARCH}" - [ ${ARCH} == x86 ] && libarch="i386" - [ ${ARCH} == x86_64 ] && libarch="amd64" - dodir ${JDK_DIR}/jre/lib/${libarch}/client - dodir ${JDK_DIR}/jre/lib/${libarch}/server - dosym /usr/${libdir}/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/client/libjvm.so - dosym /usr/${libdir}/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/server/libjvm.so - dosym /usr/${libdir}/classpath/libjawt.so ${JDK_DIR}/jre/lib/${libarch}/libjawt.so - - # Can't use java-vm_set-pax-markings as doesn't work with symbolic links - # Ensure a PaX header is created. - local pax_markings="C" - # Usally disabeling MPROTECT is sufficent. - local pax_markings+="m" - # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. - use x86 && pax_markings+="sp" - - pax-mark ${pax_markings} "${ED}"/usr/bin/jamvm -} diff --git a/dev-java/jamvm/metadata.xml b/dev-java/jamvm/metadata.xml deleted file mode 100644 index 991f28de07c6..000000000000 --- a/dev-java/jamvm/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - java@gentoo.org - Java - - - jamvm - - -- cgit v1.2.3