[gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-native/

["Patrice Clement" <monsieurp@gentoo.org>]

commit:     2770348aa9189330c09b4ace422dcfae6ec6af00
Author:     William L. Thomson Jr <wlt <AT> o-sinc <DOT> com>
AuthorDate: Tue Oct 13 00:38:13 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> 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"