From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Sep 2020 10:22:15 +0100 Subject: gentoo resync : 23.09.2020 --- dev-java/xsdlib/Manifest | 2 +- dev-java/xsdlib/xsdlib-20090415.ebuild | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) (limited to 'dev-java/xsdlib') diff --git a/dev-java/xsdlib/Manifest b/dev-java/xsdlib/Manifest index d7dfdc73fa8a..c409e31573df 100644 --- a/dev-java/xsdlib/Manifest +++ b/dev-java/xsdlib/Manifest @@ -1,3 +1,3 @@ DIST xsdlib.20090415.zip 914126 BLAKE2B 7f8dc45c590606ece1775d08634f87bb7cd392c69c66204073d4867f925cf7159fe14b43cde6d59a72da90ab284d9a3adc0c4d6aa117ea5143eff8efc5bf6534 SHA512 479b20bb24c32f7a8bf548689cb6d7efc99e36d7f887d9e33b34b2e4707d74149ae1e312f7166a90acbd44422248729d6158a55d710616b656eb628cafc1e3f2 -EBUILD xsdlib-20090415.ebuild 1140 BLAKE2B 2930216d726b2555e39622a2973f1cd8e8ac0ea1d2a40bf5865989e1c4882ffadfa4bf7de00a84bb20251f8f25e6e9889c5fe8b5967ca334b84fa0a54bb79d0e SHA512 9097e2318b21b184c067a7ea2898b7229d802f75fb368cb4ff0393de35ea4fb473c8da09ea2fc7500df83f149576636407069e7b8c5c801b5ada87e2e61a38af +EBUILD xsdlib-20090415.ebuild 1157 BLAKE2B c1573697f8119eb0b1b4162d39781eb1493e26ae1c4a69a83fc8f02a9a6d465bc2c862bf48dd1bb9069e20122e9f022c33eabca1c0ecac335ea8f06167767d44 SHA512 5d9cd42055027a5ea47cb394600edfaeb06bfe0b689d854d0beaf1aa6971fbd43e071ee09556b767f1b923fcc88e50355430396a64c575a4a4d6ffbe22a6cd7a MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 diff --git a/dev-java/xsdlib/xsdlib-20090415.ebuild b/dev-java/xsdlib/xsdlib-20090415.ebuild index 0cb2aba0120a..9be3fe0b7cb5 100644 --- a/dev-java/xsdlib/xsdlib-20090415.ebuild +++ b/dev-java/xsdlib/xsdlib-20090415.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 JAVA_PKG_IUSE="doc source" @@ -14,33 +14,33 @@ SRC_URI="http://java.net/downloads/msv/releases/${PN}.${PV}.zip" LICENSE="BSD Apache-1.1" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" COMMON_DEP=" dev-java/xerces:2 dev-java/relaxng-datatype:0" +BDEPEND="app-arch/unzip" RDEPEND="${COMMON_DEP} >=virtual/jre-1.4" DEPEND="${COMMON_DEP} - >=virtual/jdk-1.4 - app-arch/unzip" + >=virtual/jdk-1.4" S="${WORKDIR}/${P}" -java_prepare() { - find -name '*.jar' -exec rm -v {} + || die -} - JAVA_SRC_DIR=( "src" "src-apache" ) JAVA_GENTOO_CLASSPATH="relaxng-datatype,xerces-2" +src_prepare() { + default + find -name '*.jar' -delete || die +} + src_compile() { java-pkg-simple_src_compile local dir; for dir in "${JAVA_SRC_DIR[@]}"; do pushd ${dir} > /dev/null || die - jar -uf "${S}"/${PN}.jar $(find -name '*.properties') || die - popd > /dev/null + jar -uf "${S}"/${PN}.jar $(find -name '*.properties') || die + popd > /dev/null || die done } @@ -48,5 +48,6 @@ src_install() { java-pkg-simple_src_install dodoc README.txt - dohtml HowToUse.html + docinto html + dodoc HowToUse.html } -- cgit v1.2.3