From 37f029d4fa0d4af56027995cbe71772bb24b81f5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Petteri=20R=C3=A4ty?= <betelgeuse@gentoo.org>
Date: Wed, 21 Apr 2010 15:37:02 +0000
Subject: [PATCH] Version bump. Fixes bug #316545. Package-Manager:
 portage-2.2_rc67/cvs/Linux i686

---
 dev-java/tomcat-native/ChangeLog              |  8 +++-
 dev-java/tomcat-native/Manifest               | 14 +++++-
 .../tomcat-native/tomcat-native-1.1.20.ebuild | 47 +++++++++++++++++++
 3 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 dev-java/tomcat-native/tomcat-native-1.1.20.ebuild

diff --git a/dev-java/tomcat-native/ChangeLog b/dev-java/tomcat-native/ChangeLog
index b6063a96f1de..c283b07501cd 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-native/ChangeLog,v 1.26 2010/03/02 13:50:27 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-native/ChangeLog,v 1.27 2010/04/21 15:37:02 betelgeuse Exp $
+
+*tomcat-native-1.1.20 (21 Apr 2010)
+
+  21 Apr 2010; Petteri Räty <betelgeuse@gentoo.org>
+  +tomcat-native-1.1.20.ebuild:
+  Version bump. Fixes bug #316545.
 
   02 Mar 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   tomcat-native-1.1.18.ebuild:
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 031daa355eb3..fce235a79aa6 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
+DIST tomcat-native-1.1.20-src.tar.gz 241274 RMD160 df7cb9d6d536b713014d0cf5b83cff24b7e82400 SHA1 35a176f3eb6516d84a109514d6a8b7c0af91441a SHA256 847ea04b5e66f56c8db94c8675f6e9e70b8d04f8aa2dc646a4050f8cf4d0d47e
 EBUILD tomcat-native-1.1.15.ebuild 1146 RMD160 be64289d8daa12cad08a8f8d9e9718c77eddc95b SHA1 f104f8b781f1f0984e0765d1a0fa7a047b99a4a6 SHA256 fe38ab044feccadced4ad13852c4ed8ac1ff412419001729819f5baf05a250d9
 EBUILD tomcat-native-1.1.16.ebuild 1125 RMD160 ea25aac37375171b1dc8a9722a3fa8e3248f4e06 SHA1 714febaf50685423730af24b05ea041cdcbcac66 SHA256 6c64c2a9c7ecb3c64011fe4aa2b199e46654132870354ba547f6b8c5fdc16c11
 EBUILD tomcat-native-1.1.18.ebuild 1135 RMD160 eb96d7af8b748dffa4ea65138612d7c4c5f6bba3 SHA1 5004877461dd3516ccc45ed1e724ae531250d868 SHA256 2d236c003404a32154afe19f9cf03f2656c16625e7b8242dd93367d288397036
-MISC ChangeLog 4015 RMD160 505eae4f0c52e43a7e78001b28c80f5a9b19ac76 SHA1 c379879a3f358a1d24d7bf3ab40cefb534c843d2 SHA256 144e95c4dca2b61c865a0bcd6ac6ed91d9ff4f5537fbaec2e99ae900b8ce7e95
+EBUILD tomcat-native-1.1.20.ebuild 1136 RMD160 af312dfa94c5c0f1f8f7ee8fcd2f7c1f15d8c924 SHA1 f4c24cb6e65df64a2d2239c44dbd14622518ab82 SHA256 c703ef1a2d64d09e98e6a400b090a68e621229cc546141659862390f8072c98f
+MISC ChangeLog 4173 RMD160 241c65166eac0ebafeda7e0fc4b4a2d1730e4cdc SHA1 18fb42bd2c9072aeaa3831c7355d2a8509c51c23 SHA256 f2b4c5413a23dbcb4d1d62b6d0a7c52691d6070d000ccf02a55d3eb959c385bc
 MISC metadata.xml 720 RMD160 14c71fff6c4adc774494505a4d46e8c97d491c24 SHA1 e7050f75ab52c7bee9b7e1f97b61d777ae4beea8 SHA256 5b5a6694441dd98294c262370bba9708b48ec9792161963490520de875a78ead
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkvPG6wACgkQcxLzpIGCsLRgOQCcCAIkU7rDopR0ZSMm8tpSIbmC
+FLoAnRyXcTcl8akhrJ1wCUQ/A4baUSuT
+=84TP
+-----END PGP SIGNATURE-----
diff --git a/dev-java/tomcat-native/tomcat-native-1.1.20.ebuild b/dev-java/tomcat-native/tomcat-native-1.1.20.ebuild
new file mode 100644
index 000000000000..5d321886dff8
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.1.20.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.20.ebuild,v 1.1 2010/04/21 15:37:02 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
+}
-- 
2.26.2