From 77398e424e45d9e98c1cef3c43bdadb9d56e81ef Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Nov 2019 13:21:36 +0000 Subject: gentoo resync : 10.11.2019 --- dev-java/radeox/Manifest | 2 +- dev-java/radeox/radeox-1.0_beta2-r1.ebuild | 31 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 16 deletions(-) (limited to 'dev-java/radeox') diff --git a/dev-java/radeox/Manifest b/dev-java/radeox/Manifest index 0132f227174d..83f43eab6c6e 100644 --- a/dev-java/radeox/Manifest +++ b/dev-java/radeox/Manifest @@ -1,3 +1,3 @@ DIST radeox-1.0-BETA-2-src.tgz 1720998 BLAKE2B 2142933e8eca18578333c8d144c7cdd79b62c96433c479578e3b9a779de77f9535140f8cb69f399ca868a2dda445099cc60f4df35e7cf26fe3bd72b3acdc6363 SHA512 57e746e2cb3f6a39ab0e7e7171c4c47325712a61235a9622205d5f069cb4f82492ebec8482eb674619c9d58699a501461c863a97119ca674a337af5a331389d2 -EBUILD radeox-1.0_beta2-r1.ebuild 1105 BLAKE2B 8b1093201c55efb86c14e21cf93f0c3026b773149a42e62c422dc418b20e4899ca6a97bb9a44ffa9f331e79c622e134072a07be5db5df0f9492d677f9f5e3179 SHA512 413b63fdc6440aac3e59e2a29746e169061b6e413aa0d941106e3ba0c668e431da17c11ee39db0b700f736d29040cce4d586e236b1832e2c1d65c51498ab9269 +EBUILD radeox-1.0_beta2-r1.ebuild 1079 BLAKE2B 844be5ee20d3a714ed198d5a156faf6056ecca81db87fe444874f07b70618068c4d8b868f7e2f8dd26c5e4c8914aeaa9683d412a86f194a4c1d8bcaf1da1658a SHA512 461a9afa749f5bad179928ba176a78b036dd47968e099c8def9bb4eb482a4b7c3ffece83b9765334eb77d2a4cbfbccf27b017b4b3b9fa5f47254309f600a2387 MISC metadata.xml 655 BLAKE2B 4a37407e7b85b3053cbd8287272c070f53c3be44c760c172cde49e85131d23bcc8fb7defbd7f8b3a1db83a0b6270a6b38be67e2996bc452cf1076114c3d830b6 SHA512 71964076f4e7cda88973c4f51c28f40df3400be100b322da00f811b68755ec2a4008bc4fb61dde3babdfa6a06d6c55b0e17addd86ee9f40a695c20ff9a4cfe96 diff --git a/dev-java/radeox/radeox-1.0_beta2-r1.ebuild b/dev-java/radeox/radeox-1.0_beta2-r1.ebuild index 8b728eddce57..0619bfaeff1e 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*" + +RDEPEND=">=virtual/jre-1.4:* + =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 -- cgit v1.2.3