From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4D8CF13997D for ; Sun, 10 Nov 2019 10:35:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB997E0B47; Sun, 10 Nov 2019 10:30:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9E96AE0AD5 for ; Sun, 10 Nov 2019 10:30:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B1D634CC7E for ; Sat, 9 Nov 2019 21:33:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B6B928A9 for ; Sat, 9 Nov 2019 21:33:22 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1573335190.081ca95a8710c73f0bfeec037fb5c83c9a650bfe.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/radeox/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/radeox/radeox-1.0_beta2-r1.ebuild X-VCS-Directories: dev-java/radeox/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 081ca95a8710c73f0bfeec037fb5c83c9a650bfe X-VCS-Branch: master Date: Sat, 9 Nov 2019 21:33:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8380e390-3521-409d-916c-9be4774e850c X-Archives-Hash: 7b326f876978b4bc6cdb4c9ab2bf345d commit: 081ca95a8710c73f0bfeec037fb5c83c9a650bfe Author: Michał Górny gentoo org> AuthorDate: Sat Nov 9 21:06:11 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Nov 9 21:33:10 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=081ca95a dev-java/radeox: Bump to EAPI 7 Closes: https://bugs.gentoo.org/697358 Signed-off-by: Michał Górny gentoo.org> dev-java/radeox/radeox-1.0_beta2-r1.ebuild | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dev-java/radeox/radeox-1.0_beta2-r1.ebuild b/dev-java/radeox/radeox-1.0_beta2-r1.ebuild index 8b728eddce5..76aa9507000 100644 --- a/dev-java/radeox/radeox-1.0_beta2-r1.ebuild +++ b/dev-java/radeox/radeox-1.0_beta2-r1.ebuild @@ -1,49 +1,50 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=0 +EAPI=7 JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 +MY_P="${P/_beta/-BETA-}" DESCRIPTION="Radeox Wiki render engine" HOMEPAGE="http://www.radeox.org" -MY_PV="${PV/_beta/-BETA-}" -MY_P="${PN}-${MY_PV}" SRC_URI="ftp://snipsnap.org/radeox/${MY_P}-src.tgz" -LICENSE="LGPL-2.1" + +LICENSE="LGPL-2.1+" SLOT="1" KEYWORDS="amd64 x86" IUSE="" + RDEPEND=">=virtual/jre-1.4 - =dev-java/commons-logging-1*" + =dev-java/commons-logging-1*:0" DEPEND=">=virtual/jdk-1.4 ${RDEPEND}" S=${WORKDIR}/${MY_P} -src_unpack() { - unpack ${A} - cd "${S}" +EANT_BUILD_TARGET="jar jar-api" + +src_prepare() { + default # TOOD: # these would get bundled to the final jar # we should try to run the tests though rm -rf src/org/radeox/example/ \ - src/test/ src/org/radeox/test/ + src/test/ src/org/radeox/test/ || die rm -v lib/*.jar || die rm -v src/org/radeox/filter/*.class || die rm -v src/org/radeox/*/*/*.class || die - cd lib + + cd lib || die java-pkg_jar-from commons-logging } -EANT_BUILD_TARGET="jar jar-api" - src_install() { - dodoc Changes.txt README Radeox.version || die + dodoc Changes.txt README Radeox.version use doc && java-pkg_dojavadoc docs/api use source && java-pkg_dosrc src/org java-pkg_dojar lib/{radeox,radeox-api}.jar