public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/xsdlib/
Date: Sun, 20 Sep 2020 02:04:08 +0000 (UTC)	[thread overview]
Message-ID: <1600567435.bb5fa84dec248027e8f1aa59818836f4b429f3ad.sam@gentoo> (raw)

commit:     bb5fa84dec248027e8f1aa59818836f4b429f3ad
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 02:03:48 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 02:03:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb5fa84d

dev-java/xsdlib: port to EAPI 7

Closes: https://bugs.gentoo.org/741026
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/xsdlib/xsdlib-20090415.ebuild | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/dev-java/xsdlib/xsdlib-20090415.ebuild b/dev-java/xsdlib/xsdlib-20090415.ebuild
index 0cb2aba0120..9be3fe0b7cb 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
 }


             reply	other threads:[~2020-09-20  2:04 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-20  2:04 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-17 18:25 [gentoo-commits] repo/gentoo:master commit in: dev-java/xsdlib/ Miroslav Šulc
2024-10-17 15:32 Arthur Zamarin
2024-10-12 17:12 Arthur Zamarin
2022-10-21  3:51 Miroslav Šulc
2022-10-20 18:59 Jakov Smolić
2022-10-12 21:46 Sam James
2022-10-12 18:56 Arthur Zamarin
2022-09-12  9:48 Florian Schmaus
2022-09-12  9:48 Florian Schmaus
2022-08-12 13:21 Arthur Zamarin
2022-08-12 11:55 Agostino Sarubbo
2022-08-04 22:53 Sam James
2022-08-04 18:35 Arthur Zamarin
2022-08-04 16:25 Arthur Zamarin
2022-07-05 11:24 Florian Schmaus
2021-06-21  8:48 Miroslav Šulc
2021-03-12 12:18 Miroslav Šulc
2019-05-18  1:14 Aaron Bauman
2018-03-01  8:46 Michał Górny
2017-07-13 17:27 Alexis Ballier
2017-01-29 15:54 Fabian Groffen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1600567435.bb5fa84dec248027e8f1aa59818836f4b429f3ad.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox