Updating liguros repo

7 files changed, 42 insertions, 76 deletions

diff --git a/dev-java/jamvm/jamvm-2.0.0-r2.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
index ef74f5d8e878..f83162260dc8 100644
--- a/dev-java/jamvm/jamvm-2.0.0-r2.ebuild
+++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
@@ -72,7 +72,7 @@ create_launcher() {
 
 src_install() {
 	local libdir=$(get_libdir)
-	local CLASSPATH_DIR=/usr/gnu-classpath-0.98/bin
+	local CLASSPATH_DIR=/usr/libexec/gnu-classpath-0.98
 	local JDK_DIR=/usr/${libdir}/${PN}-jdk
 
 	emake DESTDIR="${D}" install
@@ -84,11 +84,9 @@ src_install() {
 	dodir ${JDK_DIR}/bin
 	dosym /usr/bin/jamvm ${JDK_DIR}/bin/java
 	for files in ${CLASSPATH_DIR}/g*; do
-		if [ $files = "${CLASSPATH_DIR}/gjdoc" ] ; then
+		if [ $files = "${CLASSPATH_DIR}/bin/gjdoc" ] ; then
 			dosym $files ${JDK_DIR}/bin/javadoc
 		else
-			echo $files \
-				${JDK_DIR}/bin/$(echo $files|sed "s#$(dirname $files)/g##")
 			dosym $files \
 				${JDK_DIR}/bin/$(echo $files|sed "s#$(dirname $files)/g##")
 		fi
diff --git a/dev-java/jamvm/metadata.xml b/dev-java/jamvm/metadata.xml
index 7ad8fa8daa1d..0c64fff222eb 100644
--- a/dev-java/jamvm/metadata.xml
+++ b/dev-java/jamvm/metadata.xml
@@ -8,5 +8,5 @@
 	<upstream>
 		<remote-id type="sourceforge">jamvm</remote-id>
 	</upstream>
-	<origin>calculatelinux-overlay</origin>
+	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-java/xjavac/Manifest b/dev-java/xjavac/Manifest
index ea686a1da020..5df3da88841d 100644
--- a/dev-java/xjavac/Manifest
+++ b/dev-java/xjavac/Manifest
@@ -1 +1 @@
-DIST xjavac-20110814.tar.gz 2217 BLAKE2B 2a2faa87f958c1a089ae600798eca190c7784f5343887fd6236447e433f500bf134f9241dfd98aca4a1a0223811f9a426c0f7a3c73c4b7c4fd6c682e30561cd3 SHA512 f4c5aa437d135a8495c926387df68df8f47878e206ea8f279a7c3e8e32561dbac5a8c8002f77a2bf03863f42475cad5068e3c1031121b64b32fb4d15242c3b3e
+DIST xjavac-2.4.0.tar.gz 2472 BLAKE2B 4693c2fa74a2951909ff6dc55638e7f3de19fecf82bcfeba0abfeaff82f941ea9d02dde3de969e850da9c5bfc98684b0a34be391d6db6c3fe12de0a734137afd SHA512 6a12c605f6f455f20981214d1ce8ed752070ae2b268e9279692a3b05921c84857636055d9c4d7b1de92bafbaa4b528f36983dc2eca0ca883a7fa340320e503a0
diff --git a/dev-java/xjavac/files/xjavac-20041208-build.xml b/dev-java/xjavac/files/xjavac-20041208-build.xml
deleted file mode 100644
index 5c9a466ca8e8..000000000000
--- a/dev-java/xjavac/files/xjavac-20041208-build.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="xjavac" default="jar">
-	<!-- some properties -->
-	<property name="src.dir" value="." />
-	<property name="build.dir" value="build" />
-	<property name="docs.dir" value="docs" />
-	<property name="dist.dir" value="dist" />
-	<property name="lib.dir" value="lib" />
-	<property name="jarfile" value="${dist.dir}/xjavac.jar" />
-	<property name="target.jdk" value="1.4" />
-	
-	<!-- init -->
-	<target name="init">
-		<mkdir dir="${dist.dir}" />
-		<mkdir dir="${build.dir}" />
-		<mkdir dir="${docs.dir}" />
-	</target>	
-
-	<!-- compile everything -->
-	<target name="compile" depends="init">
-		<mkdir dir="${build.dir}" />
-		<javac srcdir="${src.dir}" 
-			destdir="${build.dir}"
-			classpath="${classpath}"
-			source="${target.jdk}"
-			target="${target.jdk}"/>
-	</target>
-
-	<!-- build the jar file -->
-	<target name="jar" depends="compile">
-		<jar jarfile="${jarfile}" basedir="${build.dir}" />
-	</target>
-	
-	<!-- clean up -->
-	<target name="clean">
-		<delete dir="${build.dir}" />
-		<delete dir="${docs.dir}" />
-		<delete dir="${dist.dir}" />
-	</target>
-</project>
diff --git a/dev-java/xjavac/metadata.xml b/dev-java/xjavac/metadata.xml
new file mode 100644
index 000000000000..428163197653
--- /dev/null
+++ b/dev-java/xjavac/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-java/xjavac/xjavac-2.4.0.ebuild b/dev-java/xjavac/xjavac-2.4.0.ebuild
new file mode 100644
index 000000000000..552ee4b12b4d
--- /dev/null
+++ b/dev-java/xjavac/xjavac-2.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Xerses Java Parser"
+HOMEPAGE="https://xerces.apache.org/xerces-j"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CDEPEND="dev-java/ant-core:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.7"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.7"
+
+JAVA_GENTOO_CLASSPATH="ant-core"
diff --git a/dev-java/xjavac/xjavac-20110814.ebuild b/dev-java/xjavac/xjavac-20110814.ebuild
deleted file mode 100644
index f12b0d8b561b..000000000000
--- a/dev-java/xjavac/xjavac-20110814.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The implementation of the javac compiler for IBM JDK 1.4 (needed for xerces-2)"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-#Note that the tarball has xjavac-ibm-1_5.patch already applied (not in upstream)
-IUSE=""
-HOMEPAGE="https://cvs.apache.org/viewcvs.cgi/xml-xerces/java/tools/src/XJavac.java"
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.7"
-
-java_prepare() {
-	cp "${FILESDIR}/${PN}-20041208-build.xml" ./build.xml || die "failed to cp build.xml"
-}
-
-src_compile() {
-	eant jar -Dclasspath=$(java-pkg_getjars ant-core)
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-}