Adding metadata

10 files changed, 107 insertions, 101 deletions

diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
index c13ad1428399..004ca865dbdb 100644
--- a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # Common dependencies
 # POM: httpcomponents-client-${PV}/httpclient/pom.xml
diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild
index 8e3fe959caa0..c208cb1c3702 100644
--- a/dev-java/httpcore/httpcore-4.4.14.ebuild
+++ b/dev-java/httpcore/httpcore-4.4.14.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # Compile dependencies
 # POM: httpcore/pom.xml
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild
deleted file mode 100644
index b611b620af97..000000000000
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PV=${PV//./_}
-DESCRIPTION="JAI is a class library for managing images"
-HOMEPAGE="https://jai.dev.java.net/"
-
-BASE=http://download.java.net/media/jai/builds/release/${MY_PV}
-MY_P="jai-${MY_PV}"
-SRC_URI="
-	!amd64? ( ${BASE}/${MY_P}-lib-linux-i586.tar.gz )
-	amd64? ( ${BASE}/${MY_P}-lib-linux-amd64.tar.gz )"
-
-LICENSE="sun-bcla-jai"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.3"
-
-RESTRICT="bindist mirror"
-QA_PREBUILT="*"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	rm LICENSE-jai.txt || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	dodoc *.txt
-
-	java-pkg_dojar lib/*.jar
-	use x86 && java-pkg_doso lib/*.so
-	use amd64 && java-pkg_doso lib/*.so
-}
-
-pkg_postinst() {
-	elog "This ebuild now installs into /opt/${PN} and /usr/share/${PN}"
-	elog 'To use you need to pass the following to java'
-	if use x86 || use amd64; then
-		elog '-Djava.library.path=$(java-config -i sun-jai-bin)'
-	fi
-	elog '-classpath $(java-config -p sun-jai-bin)'
-}
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
index 059d18b249fd..36c1c67af629 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="sun-bcla-jai"
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 DEPEND=""
 RDEPEND="virtual/jre:1.8"
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
deleted file mode 100644
index 1e21ce70574f..000000000000
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PV=${PV//./_}
-DESCRIPTION="JAI is a class library for managing images"
-HOMEPAGE="https://jai.dev.java.net/"
-SRC_URI="http://download.java.net/media/jai/builds/release/${MY_PV}/jai-${MY_PV}-lib-linux-i586.tar.gz"
-
-LICENSE="sun-bcla-jai"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-BDEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.3"
-
-RESTRICT="bindist mirror"
-QA_PREBUILT="*"
-
-S=${WORKDIR}/jai-${MY_PV}
-
-src_prepare() {
-	default
-	rm LICENSE-jai.txt || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	dodoc *.txt
-
-	java-pkg_dojar lib/*.jar
-	use x86 && java-pkg_doso lib/*.so
-}
-
-pkg_postinst() {
-	elog "This ebuild now installs into /opt/${PN} and /usr/share/${PN}"
-	elog 'To use you need to pass the following to java'
-	use x86 && elog '-Djava.library.path=$(java-config -i sun-jai-bin)'
-	elog '-classpath $(java-config -p sun-jai-bin)'
-}
diff --git a/dev-java/xz-java/Manifest b/dev-java/xz-java/Manifest
index afe4ef8de157..b2deaeee2029 100644
--- a/dev-java/xz-java/Manifest
+++ b/dev-java/xz-java/Manifest
@@ -1 +1,2 @@
 DIST xz-java-1.8.zip 152470 BLAKE2B 601e3292936cb8b3a885551a275248628171f0fa15829785e2fb99d5dfefab59fd2283df4040f090a9d96d30bef5dacd5f4aed4f9d3163ee17dea4a72ad1b0f8 SHA512 3d30804baf9bf743347d87befdbf103107f413c4460639171257e87c4ac96c5e9bc6401a85c44939cd40a25b965162d916a552ae9967f1ff1c71ed389508f5b0
+DIST xz-java-1.9.zip 155868 BLAKE2B e1e355e75b3d14cae9a12dd00105ff38e25ab9c270cecafc83f27a7a03b36aa7a33647b40b7458b3592319a2b574e10cef9786413f0a12af585199a8f00731de SHA512 743f81ac715d7ac2760af8cee4c62d8fbeef156c0d3e0e85e4605ae08d6a71d1e6f6675e0558e7906a92d5fb3ca1feab9db015a1d42b5df73de2dec770a339cb
diff --git a/dev-java/xz-java/xz-java-1.9.ebuild b/dev-java/xz-java/xz-java-1.9.ebuild
new file mode 100644
index 000000000000..2a0688b9ae68
--- /dev/null
+++ b/dev-java/xz-java/xz-java-1.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc examples source"
+MAVEN_ID="org.tukaani:xz:1.9"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Implementation of xz data compression in pure java"
+HOMEPAGE="https://tukaani.org/xz/java.html"
+SRC_URI="https://tukaani.org/xz/${P}.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.8:*"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="src/org"
+
+DOCS=( README NEWS COPYING THANKS )
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples src/*Demo.java
+	einstalldocs
+}
diff --git a/dev-java/zstd-jni/Manifest b/dev-java/zstd-jni/Manifest
index 29b899e69c49..48a9a9fd25d0 100644
--- a/dev-java/zstd-jni/Manifest
+++ b/dev-java/zstd-jni/Manifest
@@ -1 +1,2 @@
 DIST zstd-jni-1.4.9.1.tar.gz 9283717 BLAKE2B 1f5f397e6ee78d029110b98aadbf77e8acaf3b3721ff0729b1b382f193367c8ffb20e08c1f7f905c34a5128e6e061652792cdd4f83dd292e3a3b19906f3bf86b SHA512 2a3a2020e46fbf654796ca065ec84fdce05c308d7925a667b239aa0cc8607f78d8944230578e3c663cdd7932bce05e056895f8457af523d939afb24f68f8087b
+DIST zstd-jni-1.5.0.4.tar.gz 9296353 BLAKE2B 1b4011cc7876d3d4ca2636d9872b1127d3a700f4cc6b159a36dbff5e73a2ec3af91d4a27965123c9dbb9f017200bb68bf7e078806d25d7e395243c2251936891 SHA512 2d83a1e4ff6c25ef301dc25343dcfd4f2dda7f8c44aae2d1d5da2159affb6d0c2885693022dd5cbd2d360540092bebfe0635b61c899fc7ce8dc496a96ba6f017
diff --git a/dev-java/zstd-jni/files/zstd-jni-1.5.0.4-filter-flags.patch b/dev-java/zstd-jni/files/zstd-jni-1.5.0.4-filter-flags.patch
new file mode 100644
index 000000000000..8c880da46623
--- /dev/null
+++ b/dev-java/zstd-jni/files/zstd-jni-1.5.0.4-filter-flags.patch
@@ -0,0 +1,9 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5d0092f..d0f45b5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,4 +10,3 @@ file(GLOB_RECURSE SOURCES RELATIVE ${CMAKE_SOURCE_DIR} "src/*.c")
+ add_library(zstd-jni-${NATIVE_VERSION} SHARED ${SOURCES})
+ add_definitions("-DZSTD_MULTITHREAD=1")
+ add_definitions("-DZSTD_LEGACY_SUPPORT=4")
+-add_definitions("-Oz")
diff --git a/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild b/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild
new file mode 100644
index 000000000000..116244dc24e7
--- /dev/null
+++ b/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MAVEN_ID="com.github.luben:zstd-jni:1.5.0-4"
+MY_PV="$(ver_rs 3 -)"
+
+inherit java-pkg-2 java-pkg-simple cmake
+
+DESCRIPTION="JNI bindings for Zstd native library"
+
+HOMEPAGE="https://github.com/luben/zstd-jni"
+SRC_URI="https://github.com/luben/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-filter-flags.patch"
+)
+
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	cmake_src_prepare
+
+	echo -e "package com.github.luben.zstd.util;\n\npublic class ZstdVersion\n{\n\tpublic static final String VERSION = \"${PV}\";\n}\n" \
+		>> ${JAVA_SRC_DIR}/com/github/luben/zstd/util/ZstdVersion.java || die "Failed to generate version class"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	mkdir -p "${S}/target/classes/META-INF" || die "Failed to create META-INF dir"
+	echo "Manifest-Version: 1.0
+Implementation-Version: ${MY_PV}
+Bundle-NativeCode: libzstd-jni.so;osname=Linux" > "${S}/target/classes/META-INF/MANIFEST.MF" || die "Failed to create MANIFEST.MF"
+	java-pkg-simple_src_compile
+	java-pkg_addres ${JAVA_JAR_FILENAME} "${BUILD_DIR}" -name libzstd-jni.so || die "Failed to add library to jar"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+}