Version bump using EAPI 2. Resolves bug #296163.

Package-Manager: portage-2.2_rc61/cvs/Linux i686

3 files changed, 62 insertions, 7 deletions

diff --git a/dev-java/tomcat-native/ChangeLog b/dev-java/tomcat-native/ChangeLog
index e61629c6885c..3d984ae01a2f 100644
--- a/dev-java/tomcat-native/ChangeLog
+++ b/dev-java/tomcat-native/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/tomcat-native
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-native/ChangeLog,v 1.22 2009/01/16 17:48:36 betelgeuse Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-native/ChangeLog,v 1.23 2010/01/10 13:32:16 betelgeuse Exp $
+
+*tomcat-native-1.1.18 (10 Jan 2010)
+
+  10 Jan 2010; Petteri Räty <betelgeuse@gentoo.org>
+  +tomcat-native-1.1.18.ebuild:
+  Version bump using EAPI 2. Resolves bug #296163.
 
 *tomcat-native-1.1.16 (16 Jan 2009)
 
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 54438f3b600b..25aea1c2134e 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -5,16 +5,18 @@ DIST tomcat-native-1.1.13-src.tar.gz 188391 RMD160 7364885502cc0358a3b739f0a9826
 DIST tomcat-native-1.1.14-src.tar.gz 189757 RMD160 44697feeed60e6c828b9878bd674d91e4003b642 SHA1 319ffc1d259ade3867703002281812ff93782b9e SHA256 25009d94586d16b57046734b0e8b4ee3839dab38711d4474fec9bfc53d03b3ce
 DIST tomcat-native-1.1.15-src.tar.gz 240645 RMD160 028582d05e2415033aba0a16e1381d6b63760ed5 SHA1 c4c83707e781543abf89e9a65a83e049f7074ac0 SHA256 cca0a0cd01bb95515d08e569dde6556128dab133a054c72986d213be32b3ec2b
 DIST tomcat-native-1.1.16-src.tar.gz 240128 RMD160 3fa519c0d9916412612d881547c301912396376c SHA1 2829be691b8c21f854ca884f947b9c3b5b144d8d SHA256 e0996844d391292f6697eb94f76ba44089c9e3c2f77f92493bbd30ccfb245719
+DIST tomcat-native-1.1.18-src.tar.gz 241951 RMD160 767e0acc9e31b0d5c77f3cf4bf55610ecc69df29 SHA1 6e6e6c52fb98cf779b9865e9541edbc9d1439266 SHA256 80b61b847b266b75fb5d59143f4505468c998a36d5ef3449d108acfe2607253e
 EBUILD tomcat-native-1.1.13-r1.ebuild 1328 RMD160 133eb606fcbdb144d49b438cfeaccf09615ae952 SHA1 583c6b812a7e43333987036b0986ed39c3c7fa59 SHA256 d9dfb8027fc283505019e693c1f653020d49a95ae8173de736e2a474ab5db9ff
 EBUILD tomcat-native-1.1.14.ebuild 1330 RMD160 17c704a4dd1e7c2390e38cd50205c0f59de60944 SHA1 9a14f6dede3f9e54fa91289ee0067e78410acf59 SHA256 cdcd8939bd67b3bf8db9504e1441a9245452ff5311b7f1841c88859cf45b9144
 EBUILD tomcat-native-1.1.15.ebuild 1146 RMD160 be64289d8daa12cad08a8f8d9e9718c77eddc95b SHA1 f104f8b781f1f0984e0765d1a0fa7a047b99a4a6 SHA256 fe38ab044feccadced4ad13852c4ed8ac1ff412419001729819f5baf05a250d9
 EBUILD tomcat-native-1.1.16.ebuild 1128 RMD160 a9971a15e19e5f86dc734aecc354c4d6ef7b5b23 SHA1 e33c0ad083560b7b5bcd36393027d61f78b22c3e SHA256 f02842918c9e648f79b2989f2a6acf7ce650c3dda5f0066f92a92fcd657fc713
-MISC ChangeLog 3473 RMD160 59945ee8e7b8c8c4a8494c20ebfedd1cd729d331 SHA1 266ed68baee37701ed4fd4c9fde99cdf9a7ef07f SHA256 158225109aee21ffc2a9dc10eed5464d3abbe894c52a61915209193e7a7058e1
+EBUILD tomcat-native-1.1.18.ebuild 1136 RMD160 32e504eefecc56142cba0274f1220e74fe6ab82f SHA1 c43fa58050ba23e6a5c2c71f2b8c5a9a470ed1e5 SHA256 724dd289a3ac5a9fe9f707a78630901056d1b75d7653c1d4858af4f3e147c9f2
+MISC ChangeLog 3647 RMD160 f5b19b1a27de0ff47e45a8e61f1ecc76287b48ad SHA1 c86ade1368e3e2a967a6bdd9e397956b7390687c SHA256 41d0d8ac4f1541871c95aa7a6db2288110c1e2eaa15d2768c0f3bcbbb612e3b7
 MISC metadata.xml 720 RMD160 14c71fff6c4adc774494505a4d46e8c97d491c24 SHA1 e7050f75ab52c7bee9b7e1f97b61d777ae4beea8 SHA256 5b5a6694441dd98294c262370bba9708b48ec9792161963490520de875a78ead
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkl0SRQACgkQ/ejvha5XGaN4iQCeKKRWcc5OH5GssL95MaQHXN7t
-3FsAn0K9gnPnrXU4dBQUnlRiIaAAPgwk
-=hkIT
+iEUEARECAAYFAktJ1ucACgkQcxLzpIGCsLTBtQCY+IbVmlCT/woq8/h0Etb5YNXG
+HACfVTYuwB/6RC6X3AXMx9YonApwvk8=
+=CV1a
 -----END PGP SIGNATURE-----
diff --git a/dev-java/tomcat-native/tomcat-native-1.1.18.ebuild b/dev-java/tomcat-native/tomcat-native-1.1.18.ebuild
new file mode 100644
index 000000000000..e7127dfea318
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.1.18.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-native/tomcat-native-1.1.18.ebuild,v 1.1 2010/01/10 13:32:16 betelgeuse Exp $
+
+EAPI="2"
+
+inherit base eutils java-pkg-2
+
+DESCRIPTION="Native APR library for Tomcat"
+
+SLOT="0"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
+HOMEPAGE="http://tomcat.apache.org/"
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+IUSE=""
+
+RDEPEND="=dev-libs/apr-1*
+	dev-libs/openssl
+	>=virtual/jre-1.5"
+
+DEPEND=">=virtual/jdk-1.5
+	${RDEPEND}"
+
+S=${WORKDIR}/${P}-src/jni/native
+
+src_configure(){
+	econf --with-apr=/usr/bin/apr-1-config  \
+		--with-ssl=/usr || die "Could not configure native sources"
+}
+
+src_compile() {
+	base_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so"
+}
+
+pkg_postinst() {
+	elog
+	elog " APR should be available with Tomcat, for more information"
+	elog " please see http://tomcat.apache.org/tomcat-6.0-doc/apr.html"
+	elog
+	elog " Please report any bugs to http://bugs.gentoo.org/"
+	elog
+}