[gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/, dev-java/gcj-jdk/files/

["Florian Schmaus" <flow@gentoo.org>]

commit:     3ed1e6aba13d86ee7fe04f81a863fb52ef302e8a
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 08:18:33 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 08:18:33 2024 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=3ed1e6ab

dev-java/gcj-jdk: treeclean

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/gcj-jdk/ChangeLog               | 160 -------------------------------
 dev-java/gcj-jdk/files/gcj-jdk.env.sh    |  18 ----
 dev-java/gcj-jdk/files/javac.in          |  57 -----------
 dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild | 109 ---------------------
 dev-java/gcj-jdk/metadata.xml            |  21 ----
 5 files changed, 365 deletions(-)

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
deleted file mode 100644
index 8beb1bcc..00000000
--- a/dev-java/gcj-jdk/ChangeLog
+++ /dev/null
@@ -1,160 +0,0 @@
-# ChangeLog for dev-java/gcj-jdk
-# Copyright 1999-2018 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.19 2015/05/21 08:50:13 chewi Exp $
-
-*gcj-jdk-5.4.0-r1 (03 Feb 2018)
-
-  03 Feb 2018; Andrew John Hughes <gnu_andrew@member.fsf.org>
-  +files/gcj-jdk.env.sh, +gcj-jdk-5.4.0-r1.ebuild, -files/gcj-jdk.env,
-  -gcj-jdk-5.1.0-r2.ebuild, -gcj-jdk-5.3.0.ebuild:
-  dev-java/gcj-jdk: Update to latest version of GCC 5 and merge with broken
-  system version, which lacks environment file.
-
-*gcj-jdk-5.3.0 (25 Mar 2016)
-
-  25 Mar 2016; Andrew John Hughes <gnu_andrew@member.fsf.org>
-  +gcj-jdk-5.3.0.ebuild, metadata.xml:
-  dev-java/gcj-jdk: Add support for GCJ 5.3.0.
-
-*gcj-jdk-5.1.0-r1 (23 Jun 2015)
-
-  23 Jun 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
-  +gcj-jdk-5.1.0-r1.ebuild, -gcj-jdk-5.1.0.ebuild, metadata.xml:
-  Make javadoc symlink optional and provide it using GNU Classpath. Resolves bug
-  #465572.
-
-  21 May 2015; James Le Cuirot <chewi@gentoo.org> -gcj-jdk-4.8.3.ebuild,
-  gcj-jdk-4.8.4.ebuild:
-  ~ppc keyword.
-
-*gcj-jdk-4.8.4 (03 May 2015)
-
-  03 May 2015; James Le Cuirot <chewi@gentoo.org> +gcj-jdk-4.8.4.ebuild,
-  -gcj-jdk-4.7.3.ebuild, -gcj-jdk-4.8.2.ebuild, gcj-jdk-4.9.2.ebuild:
-  Let's just keep versions for the latest stable and unstable gcc in each SLOT.
-
-*gcj-jdk-4.9.2 (17 Mar 2015)
-
-  17 Mar 2015; James Le Cuirot <chewi@gentoo.org> +gcj-jdk-4.9.2.ebuild:
-  Simple version bump. Tested with ecj 4.4 to build icedtea 7.
-
-*gcj-jdk-4.8.3 (14 Jul 2014)
-*gcj-jdk-4.8.2 (14 Jul 2014)
-*gcj-jdk-4.7.4 (14 Jul 2014)
-*gcj-jdk-4.7.3-r1 (14 Jul 2014)
-
-  14 Jul 2014; Ralph Sennhauser <sera@gentoo.org> -gcj-jdk-4.5.1-r1.ebuild,
-  -gcj-jdk-4.5.2-r1.ebuild, -gcj-jdk-4.5.3.ebuild, -gcj-jdk-4.5.4.ebuild,
-  -gcj-jdk-4.5.4-r1.ebuild, -gcj-jdk-4.6.0.ebuild, -gcj-jdk-4.6.1.ebuild,
-  -gcj-jdk-4.6.2-r1.ebuild, -gcj-jdk-4.6.3.ebuild, -gcj-jdk-4.6.3-r1.ebuild,
-  -gcj-jdk-4.6.3-r2.ebuild, -gcj-jdk-4.6.3-r3.ebuild, -gcj-jdk-4.7.2.ebuild,
-  +gcj-jdk-4.7.3-r1.ebuild, +gcj-jdk-4.7.4.ebuild, +gcj-jdk-4.8.2.ebuild,
-  +gcj-jdk-4.8.3.ebuild, +files/javac.in:
-  Add missing versions for 4.7 and 4.8
-  Fix 4.7.3 to be able to build ant-core-1.9 #489266
-  Thanks to Andrew John Hughes <gnu_andrew@member.fsf.org> for the javac
-  wrapper und for providing new API diffs
-  Drop 4.5 and 4.6 as they are to old to build current icedtea:7
-  Drop ia64 ppc ppc64 on 4.8 as the correspondig gcc is missing those keywords
-
-  18 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> -gcj-jdk-4.4.4-r1.ebuild,
-  -gcj-jdk-4.4.5-r1.ebuild, -gcj-jdk-4.4.6.ebuild:
-  [QA] Removed ebuilds which have no gcc counterpart anymore.
-
-  24 Dec 2013; Tom Wijsman <TomWij@gentoo.org> gcj-jdk-4.4.4-r1.ebuild,
-  gcj-jdk-4.4.5-r1.ebuild, gcj-jdk-4.4.6.ebuild, gcj-jdk-4.5.1-r1.ebuild,
-  gcj-jdk-4.5.2-r1.ebuild, gcj-jdk-4.5.3.ebuild, gcj-jdk-4.5.4-r1.ebuild,
-  gcj-jdk-4.5.4.ebuild, gcj-jdk-4.6.0.ebuild, gcj-jdk-4.6.1.ebuild,
-  gcj-jdk-4.6.2-r1.ebuild, gcj-jdk-4.6.3-r1.ebuild, gcj-jdk-4.6.3-r2.ebuild,
-  gcj-jdk-4.6.3-r3.ebuild, gcj-jdk-4.6.3.ebuild, gcj-jdk-4.7.2.ebuild,
-  gcj-jdk-4.7.3.ebuild:
-  Reflect gtk --> awt USE flag change of sys-devel/gcc.
-
-*gcj-jdk-4.7.3 (27 Jun 2013)
-
-  27 Jun 2013; Tom Wijsman <TomWij@gentoo.org> +gcj-jdk-4.7.3.ebuild:
-  Version bump to 4.7.3; fixes bug #473074, reported by Ivan Iraci.
-
-  17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
-  Add proxy-maintainers to metadata.xml
-
-*gcj-jdk-4.7.2 (23 Jan 2013)
-*gcj-jdk-4.6.3-r3 (23 Jan 2013)
-*gcj-jdk-4.5.4-r1 (23 Jan 2013)
-
-  23 Jan 2013; Ralph Sennhauser <sera@gentoo.org> +gcj-jdk-4.5.4-r1.ebuild,
-  +gcj-jdk-4.6.3-r3.ebuild, +gcj-jdk-4.7.2.ebuild:
-  Bump and make gcc[gtk] dep optional. #453422
-
-  13 Jan 2013; Ralph Sennhauser <sera@gentoo.org> files/gcj-jdk.env:
-  Make vm env file Prefix aware. #445350
-
-*gcj-jdk-4.6.3-r2 (23 Oct 2012)
-*gcj-jdk-4.5.4 (23 Oct 2012)
-
-  23 Oct 2012; Ralph Sennhauser <sera@gentoo.org> +gcj-jdk-4.5.4.ebuild,
-  +gcj-jdk-4.6.3-r2.ebuild:
-  Don't require corresponding gcc to be active. #439228
-  Backport various fixes to 4.5.4.
-
-*gcj-jdk-4.6.3-r1 (28 Sep 2012)
-
-  28 Sep 2012; Ralph Sennhauser <sera@gentoo.org> +gcj-jdk-4.6.3-r1.ebuild:
-  No longer install symlinks in /usr/bin to work with recent gcc-config.
-  #431930
-  Add missing dodir for server vm.
-  Use get_libdir for vm home.
-
-  16 Sep 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
-  gcj-jdk-4.6.3.ebuild:
-  Keyword ~arm, bug #305773.
-
-*gcj-jdk-4.6.3 (05 Jun 2012)
-*gcj-jdk-4.6.2-r1 (05 Jun 2012)
-*gcj-jdk-4.6.1 (05 Jun 2012)
-*gcj-jdk-4.6.0 (05 Jun 2012)
-
-  05 Jun 2012; Ralph Sennhauser <sera@gentoo.org> +gcj-jdk-4.6.0.ebuild,
-  +gcj-jdk-4.6.1.ebuild, +gcj-jdk-4.6.2-r1.ebuild, +gcj-jdk-4.6.3.ebuild:
-  Import from java-overlay.
-  Adds Prefix support and missing use dep, thanks to XU Benda
-  <heroxbd@gentoo.org>. #416367
-  Remove JAVA_PROVIDE, old style virtuals are dead.
-
-  15 Apr 2012; Mike Frysinger <vapier@gentoo.org> gcj-jdk-4.5.3.ebuild:
-  Add back ia64 love #349020 by Dennis Schridde.
-
-*gcj-jdk-4.5.2-r1 (20 Sep 2011)
-*gcj-jdk-4.5.1-r1 (20 Sep 2011)
-*gcj-jdk-4.4.6 (20 Sep 2011)
-*gcj-jdk-4.4.5-r1 (20 Sep 2011)
-*gcj-jdk-4.4.4-r1 (20 Sep 2011)
-
-  20 Sep 2011; Vlastimil Babka <caster@gentoo.org> -gcj-jdk-4.4.4.ebuild,
-  +gcj-jdk-4.4.4-r1.ebuild, -gcj-jdk-4.4.5.ebuild, +gcj-jdk-4.4.5-r1.ebuild,
-  +gcj-jdk-4.4.6.ebuild, -gcj-jdk-4.5.1.ebuild, +gcj-jdk-4.5.1-r1.ebuild,
-  -gcj-jdk-4.5.2.ebuild, +gcj-jdk-4.5.2-r1.ebuild:
-  Add 4.4.6 variant and revbump the rest to have the same set of symlinks as
-  added for 4.5.3.
-
-*gcj-jdk-4.5.3 (10 Aug 2011)
-
-  10 Aug 2011; Vlastimil Babka <caster@gentoo.org> +gcj-jdk-4.5.3.ebuild:
-  Version bump for gcc-4.5.3, apply improvements (more tool symlinks) from
-  java-overlay.
-
-*gcj-jdk-4.5.2 (07 Jan 2011)
-
-  07 Jan 2011; Vlastimil Babka <caster@gentoo.org> +gcj-jdk-4.5.2.ebuild:
-  Version bump.
-
-*gcj-jdk-4.5.1 (14 Nov 2010)
-*gcj-jdk-4.4.5 (14 Nov 2010)
-*gcj-jdk-4.4.4 (14 Nov 2010)
-
-  14 Nov 2010; Vlastimil Babka <caster@gentoo.org> +gcj-jdk-4.4.4.ebuild,
-  +gcj-jdk-4.4.5.ebuild, +gcj-jdk-4.5.1.ebuild, +files/gcj-jdk.env,
-  +metadata.xml:
-  Initial import from java-overlay. Great thanks to Hanno Meyer-Thurow
-  (geki) <h.mth@web.de> and Andrew John Hughes <gnu_andrew@member.fsf.org>
-  for maintaining it in the overlays.

diff --git a/dev-java/gcj-jdk/files/gcj-jdk.env.sh b/dev-java/gcj-jdk/files/gcj-jdk.env.sh
deleted file mode 100644
index 0fde8b32..00000000
--- a/dev-java/gcj-jdk/files/gcj-jdk.env.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION="GCJ ${PV}"
-JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${P}"
-JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${P}"
-JAVAC="${JAVA_HOME}/bin/javac"
-PATH="${JAVA_HOME}/bin"
-ROOTPATH="${JAVA_HOME}/bin"
-LDPATH="${JAVA_HOME}/lib"
-INFOPATH="${JAVA_HOME}/info"
-MANPATH="${JAVA_HOME}/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.5"
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH INFOPATH MANPATH"

diff --git a/dev-java/gcj-jdk/files/javac.in b/dev-java/gcj-jdk/files/javac.in
deleted file mode 100644
index 8eeda68c..00000000
--- a/dev-java/gcj-jdk/files/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/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
deleted file mode 100644
index 021552bc..00000000
--- a/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2 multilib
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="awt javadoc"
-
-API_DIFF_PV="5.1.0"
-
-# perl is needed for javac wrapper
-RDEPEND="
-	dev-java/ecj-gcj:*
-	dev-lang/perl
-	~sys-devel/gcc-${PV}[awt?,gcj]
-	javadoc? ( dev-java/gnu-classpath:0[gjdoc] )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gcc_version=${PV}
-	local gccbin=$(gcc-config -B ${gcc_version})
-	gccbin=${gccbin#"${EPREFIX}"}
-	local gcclib=$(gcc-config -L ${gcc_version} | cut -d':' -f1)
-	gcclib=${gcclib#"${EPREFIX}"}
-	local gcjhome="/usr/$(get_libdir)/${P}"
-	local gcjprefix="${EPREFIX}${gcjhome}"
-	local gccchost="${CHOST}"
-	local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*)
-	gcjlibdir=${gcjlibdir#"${EPREFIX}"}
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gccbin}/gij ${gcjhome}/bin/java
-	dosym ${gccbin}/gij ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dodir ${gcjhome}/jre/lib/${libarch}/server
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	use awt && dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-	use javadoc && dosym /usr/bin/gjdoc ${gcjhome}/bin/javadoc
-
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}/include
-
-	exeinto ${gcjhome}/bin
-	sed -e "s#@JAVA@#${gcjprefix}/bin/java#" \
-		-e "s#@ECJ_JAR@#${EPREFIX}/usr/share/eclipse-ecj/ecj.jar#" \
-		-e "s#@RT_JAR@#${gcjprefix}/jre/lib/rt.jar#" \
-		-e "s#@TOOLS_JAR@#${gcjprefix}/lib/tools.jar#" \
-		"${FILESDIR}"/javac.in \
-	| newexe - javac
-	assert
-
-	java-vm_install-env
-}
-
-pkg_postinst() {
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 or 1.6 APIs."
-	ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${API_DIFF_PV}.html"
-	ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${API_DIFF_PV}.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn "Long-term, GCJ is deprecated in GCC 6 and will be removed from GCC 7"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-}

diff --git a/dev-java/gcj-jdk/metadata.xml b/dev-java/gcj-jdk/metadata.xml
deleted file mode 100644
index ca7a5fb7..00000000
--- a/dev-java/gcj-jdk/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gnu_andrew@member.fsf.org</email>
-		<name>Andrew John Hughes</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>This provides a JDK wrapper for GCJ, in the style of gcj-java-compat in other distributions.</longdescription>
-	<use>
-		<flag name="awt">Install AWT libraries, needed by some GUIs (not needed to build icedtea)</flag>
-		<flag name="javadoc">Provide javadoc using gjdoc from GNU Classpath.</flag>
-	</use>
-</pkgmetadata>