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 8BD6F158086 for ; Wed, 20 Oct 2021 02:42:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7DD2E0824; Wed, 20 Oct 2021 02:42:37 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8A520E07F9 for ; Wed, 20 Oct 2021 02:42:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1834B34392E for ; Wed, 20 Oct 2021 02:42:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 827A9165 for ; Wed, 20 Oct 2021 02:42:34 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1634695678.242a046ff0e59f24fb494b7944b66c7ef30a35c4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/bndlib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/bndlib/bndlib-2.1.0-r1.ebuild X-VCS-Directories: dev-java/bndlib/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 242a046ff0e59f24fb494b7944b66c7ef30a35c4 X-VCS-Branch: master Date: Wed, 20 Oct 2021 02:42:34 +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: 707630d9-28ff-443a-9590-a4bb0753191d X-Archives-Hash: 02c0a82a1050e6498f26fbfb9210b606 commit: 242a046ff0e59f24fb494b7944b66c7ef30a35c4 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sat Sep 4 10:47:36 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Oct 20 02:07:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=242a046f dev-java/bndlib: limit virtual/{jre,jdk} to 1.8 otherwise it fails with openjdk:11 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/22213 Signed-off-by: Sam James gentoo.org> dev-java/bndlib/bndlib-2.1.0-r1.ebuild | 72 ++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dev-java/bndlib/bndlib-2.1.0-r1.ebuild b/dev-java/bndlib/bndlib-2.1.0-r1.ebuild new file mode 100644 index 00000000000..e8cfe3bbe14 --- /dev/null +++ b/dev-java/bndlib/bndlib-2.1.0-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="test" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="A swiss army knife for OSGi" +HOMEPAGE="https://bnd.bndtools.org/" +SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" + +CDEPEND="dev-java/libg:0 + dev-java/osgi-compendium:0 + dev-java/osgi-core-api:0 + dev-java/osgi-enterprise-api:0" + +# Tests appear broken and cause a circular dependency. +# test? ( dev-java/bnd-junit:0 ) +DEPEND="virtual/jdk:1.8 + ${CDEPEND} + test? ( dev-java/junit:4 )" + +RDEPEND="virtual/jre:1.8 + ${CDEPEND}" + +S="${WORKDIR}/bnd-${PV}.REL/biz.aQute.${PN}" + +EANT_BUILD_TARGET="build" + +JAVA_ANT_REWRITE_CLASSPATH="true" + +# Tests appear broken and cause a circular dependency. +RESTRICT="test" + +src_prepare() { + default + # Move the correct build.xml into place, needed for testing. + cp ../cnf/build.xml . || die + + # Remove bundled jar files. + find . -name '*.jar' -delete > /dev/null + + if ! use test ; then + rm -rf src/aQute/bnd/test || die "Failed to remove tests." + fi +} + +src_compile() { + local extra_cp="" + + if use test ; then + extra_cp=":$(java-pkg_getjars --build-only junit-4)" + fi + + EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjars libg):$(java-pkg_getjars osgi-compendium):$(java-pkg_getjars osgi-core-api):$(java-pkg_getjars osgi-enterprise-api)${extra_cp}" \ + java-pkg-2_src_compile +} + +EANT_TEST_GENTOO_CLASSPATH="junit-4,bnd-junit" +src_test() { + java-pkg-2_src_test +} + +src_install() { + java-pkg_newjar generated/biz.aQute.${PN}.jar +}