From 410b9832f6786e0cfcd589e9a1a9c479af9b4488 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Tue, 16 Oct 2012 17:59:01 +0200 Subject: [PATCH] now upstream --- dev-java/gcj-jdk/ChangeLog | 161 -------------------------- dev-java/gcj-jdk/Manifest | 4 - dev-java/gcj-jdk/files/gcj-jdk.env | 18 --- dev-java/gcj-jdk/gcj-jdk-4.6.2.ebuild | 106 ----------------- dev-java/gcj-jdk/metadata.xml | 10 -- 5 files changed, 299 deletions(-) delete mode 100644 dev-java/gcj-jdk/ChangeLog delete mode 100644 dev-java/gcj-jdk/Manifest delete mode 100644 dev-java/gcj-jdk/files/gcj-jdk.env delete mode 100644 dev-java/gcj-jdk/gcj-jdk-4.6.2.ebuild delete mode 100644 dev-java/gcj-jdk/metadata.xml diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog deleted file mode 100644 index bc2e1e4..0000000 --- a/dev-java/gcj-jdk/ChangeLog +++ /dev/null @@ -1,161 +0,0 @@ -# ChangeLog for dev-java/gcj-jdk -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 20 Sep 2011; Vlastimil Babka -gcj-jdk-4.4.3-r2.ebuild, - -gcj-jdk-4.4.4-r1.ebuild, -gcj-jdk-4.4.5-r1.ebuild, - -gcj-jdk-4.5.1-r1.ebuild, -gcj-jdk-4.5.2-r1.ebuild: - Remove versions that are in main tree. - -*gcj-jdk-4.6.0 (04 Apr 2011) - - 04 Apr 2011; Andrew John Hughes +gcj-jdk-4.6.0.ebuild: - Support gcc 4.6.0. - -*gcj-jdk-4.5.2-r1 (22 Feb 2011) -*gcj-jdk-4.5.1-r1 (22 Feb 2011) -*gcj-jdk-4.4.5-r1 (22 Feb 2011) -*gcj-jdk-4.4.4-r1 (22 Feb 2011) -*gcj-jdk-4.4.3-r2 (22 Feb 2011) - - 22 Feb 2011; Andrew John Hughes -gcj-jdk-4.4.3-r1.ebuild, - +gcj-jdk-4.4.3-r2.ebuild, -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.5.1.ebuild, - +gcj-jdk-4.5.1-r1.ebuild, -gcj-jdk-4.5.2.ebuild, +gcj-jdk-4.5.2-r1.ebuild: - Add support for native2ascii, orbd, rmid, serialver and tnameserv. - -*gcj-jdk-4.5.2 (31 Dec 2010) - - 31 Dec 2010; Andrew John Hughes +gcj-jdk-4.5.2.ebuild: - Support gcc 4.5.2. - - 14 Nov 2010; Vlastimil Babka gcj-jdk-4.4.3-r1.ebuild, - gcj-jdk-4.4.4.ebuild, gcj-jdk-4.4.5.ebuild, gcj-jdk-4.5.1.ebuild: - Don't set as system VM, include explanation and how to emerge icedtea. - - 14 Nov 2010; Vlastimil Babka -gcj-jdk-4.3-r5.ebuild, - -gcj-jdk-4.5.0.ebuild: - Remove 4.3 which is fragile to gcc updates anyway, and 4.5.0 whose gcc - version was removed. - - 21 Oct 2010; Andrew John Hughes gcj-jdk-4.5.1.ebuild: - Enable keywords on gcj-jdk-4.5.1 now gcc-4.5.1 is keyworded. - - 18 Oct 2010; Vlastimil Babka +gcj-jdk-4.4.5.ebuild: - Bump 4.4 series. - -*gcj-jdk-4.5.1 (22 Aug 2010) - - 22 Aug 2010; Andrew John Hughes +gcj-jdk-4.5.1.ebuild: - Support gcc 4.5.1 - -*gcj-jdk-4.4.4 (15 Jun 2010) - - 15 Jun 2010; Vlastimil Babka +gcj-jdk-4.4.4.ebuild: - Bump 4.4 to latest version. - - 27 Apr 2010; Andrew John Hughes gcj-jdk-4.5.0.ebuild: - Remove keywords from gcj-jdk-4.5.0 until it is available in the main tree. - -*gcj-jdk-4.5.0 (27 Apr 2010) - - 27 Apr 2010; Andrew John Hughes +gcj-jdk-4.5.0.ebuild: - Add gcj-jdk variant for gcc 4.5.0. - - 01 Apr 2010; Vlastimil Babka -gcj-jdk-4.3-r4.ebuild, - +gcj-jdk-4.3-r5.ebuild, -gcj-jdk-4.4.3.ebuild, +gcj-jdk-4.4.3-r1.ebuild: - Update to ecj-gcj:3.5 - - 22 Mar 2010; Vlastimil Babka +gcj-jdk-4.4.3.ebuild: - Version bump - match exact gcc version, as the symlinks get broken on each - gcc update anyway. Use the new ecj-gcj package as javac to remove dependency - on user-managed ecj symlink. Use gjdoc in gcc-4.4 as javadoc. - - 11 Jan 2009; Petteri Räty gcj-jdk-4.3-r4.ebuild: - Migrate to EAPI 2 - -* gcj-jdk-4.3.1-r4 (01 Dec 2008) - - 01 Dec 2008; Andrew John Hughes gcj-jdk-4.3-r4.ebuild: - Bump to revision 4. Remove geki's cruft which breaks jar->lib mapping. Add gcj-dbtool - and gij to /usr/bin. Make gcj-jdk API warning more accurate. - - 24 Nov 2008; Petteri Räty gcj-jdk-4.3-r3.ebuild: - Don't try to set permissions on the javac symlink to ecj. - - 19 Nov 2008; Petteri Räty gcj-jdk-4.3-r3.ebuild: - Change instructions to set gcj-jdk as system vm to a link to Gentoo Java - Guide and warn about missing 1.5 apis. - -* gcj-jdk-4.3.1-r3 (07 Nov 2008) - - 07 Nov 2008; Andrew John Hughes gcj-jdk-4.3-r3.ebuild: - Add missing server directory and bump to revision 3. - - 29 Oct 2008; Andrew John Hughes gcj-jdk-4.3-r2.ebuild: - Depend on eclipse-ecj-3.3.0-r7 and bump to revision 2. - - 29 Oct 2008; Andrew John Hughes gcj-jdk-4.3-r1.ebuild: - Add include directory symlink and bump to revision 1. - - 09 Oct 2008; Andrew John Hughes gcj-jdk-4.3.ebuild: - Clean up detritus from old slotting. - - 06 Oct 2008; Petteri Räty gcj-jdk-4.3.ebuild: - No need to instruct to emerge gjdoc as we have a PDEPEND on it. - - 26 Sep 2008; Andrew John Hughes gcj-jdk-4.3.ebuild: - Fully support later versions of gcc. - - 23 Sep 2008; Andrew John Hughes gcj-jdk-4.3.0.ebuild: - Allow later versions of gcc. - - 14 Jul 2008; James Le Cuirot gcj-jdk-4.3.1.ebuild: - Don't depend on a specific version of ecj anymore. Let eselect worry about the - /usr/bin/ecj symlink. - - 08 Jul 2008; Andrew John Hughes gcj-jdk-4.3.0.ebuild: - Move creation of jre/bin up to come before the java symlink. - - 08 Jul 2008; Andrew John Hughes gcj-jdk-4.3.0.ebuild: - Add explicit dir creation. - - 08 Jul 2008; Andrew John Hughes gcj-jdk-4.3.0.ebuild: - Remove references to gcj-config. - - 08 Jul 2008; Andrew John Hughes gcj-jdk-4.3.0.ebuild: - Correct bindir so javac is installed. - - 07 Jul 2008; Andrew John Hughes gcj-jdk-4.3.0.ebuild: - Correct ecj symlink to use /usr/bin/ecj or latest of ecj-3* - - 22 Jun 2008; Andrew John Hughes gcj-jdk-4.3.0.ebuild: - Fix use of gcj-config. - - 22 Jun 2008; Andrew John Hughes gcj-jdk-4.3.1.ebuild: - Fix paths to tools.jar and rt.jar, variable substitution and use of gcj-config. - -*gcj-jdk-4.3.1 (16 Jun 2008) - - 16 Jun 2008; Andrew John Hughes gcj-jdk-4.3.1.ebuild: - Convert to use gcc 4.3.1 and include USE flag warning. - - 26 May 2008; Andrew John Hughes gcj-jdk-4.3.0.ebuild: - Fix quoting issue. - - 23 Apr 2008; Andrew John Hughes gcj-jdk-4.3.0.ebuild: - Symlink against versioned ecj. - - 22 Apr 2008; Andrew John Hughes gcj-jdk-4.3.0.ebuild: - Disable gcjwebplugin. - - 15 Apr 2008; Andrew John Hughes gcj-jdk-4.3.0.ebuild: - Use jcf-dump to provide javap. - - 12 Apr 2008; Andrew John Hughes gcj-jdk-4.3.0.ebuild: - Use ecj to provide javac. - -*gcj-jdk-4.3.0 (07 Apr 2008) - - 07 Apr 2008; Andrew John Hughes gcj-jdk-4.3.0.ebuild: - Initial import. diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest deleted file mode 100644 index 7e95d4e..0000000 --- a/dev-java/gcj-jdk/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX gcj-jdk.env 528 RMD160 a69bf2590cc9c15c8801204446dd3dc8f9263669 SHA1 3e4acc3936cfd5bbc15fbb1fe2303152dc3337ed SHA256 2a93e60d100047a9a6c776266994852394bc86d2af53310842d2178b8b672cfb -EBUILD gcj-jdk-4.6.2.ebuild 3630 RMD160 d35650da2a29b1f85d6b868f180e1267530645be SHA1 8e5c44f0072292243dbd346ce371110eb6a625af SHA256 ef4096e3990c7cdabd44d40deccff7388d87dd4bf8a353a28d21507ceb293733 -MISC ChangeLog 6475 RMD160 da660f8cc3d3d7b1b798836171ebb1f7235eaa39 SHA1 ab718a047cfa225005c8656551436008fb4cfb71 SHA256 a1833071efec56b3793c9259c80840f2acd80d47c3e6b9894750e206fc86afac -MISC metadata.xml 389 RMD160 fe30f951b86f4e84a6bb74e5095aab42a593f284 SHA1 961088df6cf697622fccd36d4940e2e9921da195 SHA256 a1a04237211b0bac3c7d591a283c41bd4ee9afcb2304f85cf15a9436a66c724b diff --git a/dev-java/gcj-jdk/files/gcj-jdk.env b/dev-java/gcj-jdk/files/gcj-jdk.env deleted file mode 100644 index 1e349f9..0000000 --- a/dev-java/gcj-jdk/files/gcj-jdk.env +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -VERSION="GCJ @PV@" -JAVA_HOME=/usr/lib/@P@ -JDK_HOME=/usr/lib/@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/gcj-jdk-4.6.2.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.6.2.ebuild deleted file mode 100644 index 7ecef95..0000000 --- a/dev-java/gcj-jdk/gcj-jdk-4.6.2.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit java-vm-2 toolchain-funcs multilib versionator - -DESCRIPTION="Java wrappers around GCJ" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="" - -LICENSE="GPL-2" -#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -SLOT="0" -IUSE="" - -ECJ_GCJ_SLOT="3.6" - -RDEPEND="~sys-devel/gcc-${PV}[gcj] - dev-java/ecj-gcj:${ECJ_GCJ_SLOT}" -DEPEND="${RDEPEND}" - -JAVA_PROVIDE="jdbc-stdext jdbc2-stdext gnu-jaxp" - -pkg_setup() { - if [[ $(gcc-fullversion) != ${PV} ]]; then - eerror "Your current GCC version is not set to ${PV} via gcc-config" - eerror "Please read http://www.gentoo.org/doc/en/gcc-upgrading.xml before you set it" - echo "$(gcc-fullversion) != ${PV}" - die "gcc ${PV} must be selected via gcc-config" - fi - - java-vm-2_pkg_setup -} - -src_install() { - # jre lib paths ... - local libarch="$(get_system_arch)" - local gccbin=$(gcc-config -B) - local gcclib=$(gcc-config -L|cut -d':' -f1) - local gcjhome="/usr/lib/${P}" - local gcc_version=$(gcc-fullversion) - local gccchost="${CHOST}" - - # correctly install gcj - dosym ${gccbin}/gij /usr/bin/gij - dosym ${gccbin}/gcj-dbtool /usr/bin/gcj-dbtool - - # links - dodir ${gcjhome}/bin - dodir ${gcjhome}/jre/bin - dosym ${gcjhome}/bin/java ${gcjhome}/jre/bin/java - dosym ${gccbin}/gjar ${gcjhome}/bin/jar - dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc - 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 - dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so - dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so - dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so - 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} - - dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac; - dosym /usr/bin/gij ${gcjhome}/bin/java; - - set_java_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 APIs." - ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html" - ewarn "Check for existing bugs relating to missing APIs and file" - ewarn "new ones at http://gcc.gnu.org/bugzilla/" - 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 fc15c6c..0000000 --- a/dev-java/gcj-jdk/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - -java - - gnu_andrew@member.fsf.org - Andrew John Hughes - -This provides a JDK wrapper for GCJ, in the style of gcj-java-compat in other distributions. -