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 D42C21382C5 for ; Fri, 16 Feb 2018 22:36:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05F28E0A00; Fri, 16 Feb 2018 22:36:00 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 C808EE0A00 for ; Fri, 16 Feb 2018 22:35:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 BD853335C49 for ; Fri, 16 Feb 2018 22:35:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 370D0246 for ; Fri, 16 Feb 2018 22:35:56 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1518820545.300bbfeadd6383d672c55889dd00eee6302be0f3.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/commons-logging/commons-logging-1.2-r2.ebuild X-VCS-Directories: dev-java/commons-logging/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: 300bbfeadd6383d672c55889dd00eee6302be0f3 X-VCS-Branch: master Date: Fri, 16 Feb 2018 22:35:56 +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-Archives-Salt: c1403c5e-ff63-4479-89fb-d9bfd9525da7 X-Archives-Hash: cdafc81a0c9ca58b51972cf35c011697 commit: 300bbfeadd6383d672c55889dd00eee6302be0f3 Author: Patrice Clement gentoo org> AuthorDate: Fri Feb 16 19:55:57 2018 +0000 Commit: Patrice Clement gentoo org> CommitDate: Fri Feb 16 22:35:45 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=300bbfea dev-java/commons-logging: fix compilation failure. Closes: https://bugs.gentoo.org/647868 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../commons-logging/commons-logging-1.2-r2.ebuild | 30 ++++++++-------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild index bb17056e251..9d530b2fd23 100644 --- a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild +++ b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild @@ -34,28 +34,22 @@ DEPEND=" S="${WORKDIR}/${P}-src" -JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes" -JAVA_ANT_REWRITE_CLASSPATH="yes" EANT_BUILD_TARGET="compile" -EANT_DOC_TARGET="" - -PATCH=( - # patch to make the build.xml respect no servletapi - "${FILESDIR}/${P}-servletapi.patch" - "${FILESDIR}/${P}-gentoo.patch" -) +JAVA_ANT_REWRITE_CLASSPATH="yes" +JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes" DOCS=( RELEASE-NOTES.txt PROPOSAL.html ) src_prepare() { default + epatch "${FILESDIR}/${P}-gentoo.patch" + # patch to make the build.xml respect no servletapi + epatch "${FILESDIR}/${P}-servletapi.patch" + # bug #208098 echo "jdk.1.4.present=true" > build.properties || die - if use servletapi; then - echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties || die - fi if use avalon-framework; then echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties || die fi @@ -65,22 +59,20 @@ src_prepare() { if use log4j; then echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties || die fi -} -src_compile() { - java-pkg-2_src_compile - if use doc; then - ejavadoc -d api -sourcepath src/main/java -subpackages org || die + if use servletapi; then + echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties || die fi } src_install() { - local pkg="org.apache.commons.logging" + local pkg=org.apache.commons.logging java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\"" java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar - use doc && java-pkg_dojavadoc api + einstalldocs + use doc && java-pkg_dojavadoc target/docs/ use source && java-pkg_dosrc src/main/java/org }