From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6F34413888F for ; Tue, 13 Oct 2015 10:48:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9121E07D5; Tue, 13 Oct 2015 10:48:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 87E5AE07D5 for ; Tue, 13 Oct 2015 10:48:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3D6FF340836 for ; Tue, 13 Oct 2015 10:48:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29556FF3 for ; Tue, 13 Oct 2015 10:48:31 +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: <1444732777.2770348aa9189330c09b4ace422dcfae6ec6af00.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-native/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/tomcat-native/tomcat-native-1.1.33-r1.ebuild dev-java/tomcat-native/tomcat-native-1.1.33.ebuild X-VCS-Directories: dev-java/tomcat-native/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: 2770348aa9189330c09b4ace422dcfae6ec6af00 X-VCS-Branch: master Date: Tue, 13 Oct 2015 10:48:31 +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: f42ab598-8157-4ece-9bc3-fde4a306a7b1 X-Archives-Hash: 91fdecece668974e64ff4d4772013586 commit: 2770348aa9189330c09b4ace422dcfae6ec6af00 Author: William L. Thomson Jr o-sinc com> AuthorDate: Tue Oct 13 00:38:13 2015 +0000 Commit: Patrice Clement gentoo org> CommitDate: Tue Oct 13 10:39:37 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2770348a dev-java/tomcat-native: Modified to build jar. Modified ebuild to build the jar in addition to the .so ....1.33.ebuild => tomcat-native-1.1.33-r1.ebuild} | 24 ++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dev-java/tomcat-native/tomcat-native-1.1.33.ebuild b/dev-java/tomcat-native/tomcat-native-1.1.33-r1.ebuild similarity index 72% rename from dev-java/tomcat-native/tomcat-native-1.1.33.ebuild rename to dev-java/tomcat-native/tomcat-native-1.1.33-r1.ebuild index 8d4011a..c6f89cd 100644 --- a/dev-java/tomcat-native/tomcat-native-1.1.33.ebuild +++ b/dev-java/tomcat-native/tomcat-native-1.1.33-r1.ebuild @@ -4,7 +4,7 @@ EAPI="5" -inherit base eutils java-pkg-2 +inherit base eutils java-pkg-2 java-ant-2 DESCRIPTION="Native APR library for Tomcat" @@ -13,30 +13,42 @@ SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.t HOMEPAGE="http://tomcat.apache.org/" KEYWORDS="~amd64 ~x86" LICENSE="Apache-2.0" -IUSE="" +IUSE="test" -RDEPEND="=dev-libs/apr-1* +RDEPEND="dev-libs/apr:1 dev-libs/openssl:= - >=virtual/jre-1.5:*" + >=virtual/jre-1.7 + test? ( dev-java/ant-junit:0 )" -DEPEND=">=virtual/jdk-1.5:* +DEPEND=">=virtual/jdk-1.7 ${RDEPEND}" -S=${WORKDIR}/${P}-src/jni/native +S=${WORKDIR}/${P}-src/jni src_configure(){ + cd native econf --with-apr=/usr/bin/apr-1-config \ --with-ssl=/usr || die "Could not configure native sources" } src_compile() { + eant jar -f build.xml + + cd native base_src_compile } src_install() { + java-pkg_newjar dist/${PN}-${PV}-dev.jar ${PN}.jar + + cd native emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so" } +src_test() { + java-pkg-2_src_test +} + pkg_postinst() { elog elog " APR should be available with Tomcat, for more information"