4 files changed, 16 insertions, 88 deletions
diff --git a/dev-java/tomcat-native/ChangeLog b/dev-java/tomcat-native/ChangeLog
index 72e3f0dc23cb..e9cf5a2f2ba5 100644
--- a/dev-java/tomcat-native/ChangeLog
+++ b/dev-java/tomcat-native/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/tomcat-native
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-native/ChangeLog,v 1.17 2008/03/02 14:15:37 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-native/ChangeLog,v 1.18 2008/07/07 18:56:12 wltjr Exp $
+
+*tomcat-native-1.1.14 (07 Jul 2008)
+
+  07 Jul 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  -tomcat-native-1.1.8.ebuild, -tomcat-native-1.1.10.ebuild,
+  -tomcat-native-1.1.12.ebuild, +tomcat-native-1.1.14.ebuild:
+  Bumped to lastest release, removed past versions/cleanup
 
   02 Mar 2008; Wulf C. Krueger <philantrop@gentoo.org>
   tomcat-native-1.1.13-r1.ebuild:
diff --git a/dev-java/tomcat-native/tomcat-native-1.1.10.ebuild b/dev-java/tomcat-native/tomcat-native-1.1.10.ebuild
deleted file mode 100644
index 460b7f5f9809..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.1.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 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.10.ebuild,v 1.4 2007/10/12 05:32:02 cla Exp $
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Native APR library for Tomcat"
-
-SLOT="0"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${P}-src.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 x86"
-LICENSE="Apache-2.0"
-
-RDEPEND="=dev-libs/apr-1*
-	dev-libs/openssl
-	>=virtual/jre-1.5"
-
-DEPEND=">=virtual/jdk-1.5
-	${RDEPEND}"
-
-S=${WORKDIR}/${P}-src
-
-src_compile(){
-	cd "${S}"/jni/native
-	econf --with-apr=/usr/bin/apr-1-config  \
-		--with-ssl=/usr || die "Could not configure native sources"
-	emake || die "Could not build libtcnative-1.so"
-}
-
-src_install() {
-	cd "${S}"/jni/native
-	make 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
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.1.12.ebuild b/dev-java/tomcat-native/tomcat-native-1.1.14.ebuild
index 11b993aa08de..80c4a15dcbfa 100644
--- a/dev-java/tomcat-native/tomcat-native-1.1.12.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.12.ebuild,v 1.2 2008/02/18 02:38:42 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-native/tomcat-native-1.1.14.ebuild,v 1.1 2008/07/07 18:56:12 wltjr Exp $
 
 inherit eutils java-pkg-2
 
@@ -11,6 +11,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${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
@@ -23,6 +24,12 @@ S=${WORKDIR}/${P}-src
 
 src_compile(){
 	cd "${S}"/jni/native
+
+	# set version since upstream is slacking
+	sed -i -e 's:1.1.12:1.1.13:' tcnative.spec
+	sed -i -e 's:TCN_PATCH_VERSION       12:TCN_PATCH_VERSION       13:' \
+		include/tcn_version.h
+
 	econf --with-apr=/usr/bin/apr-1-config  \
 		--with-ssl=/usr || die "Could not configure native sources"
 	emake || die "Could not build libtcnative-1.so"
diff --git a/dev-java/tomcat-native/tomcat-native-1.1.8.ebuild b/dev-java/tomcat-native/tomcat-native-1.1.8.ebuild
deleted file mode 100644
index 6b9d43b5fd9c..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.1.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 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.8.ebuild,v 1.9 2007/10/12 03:02:39 wltjr Exp $
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Native APR library for Tomcat"
-
-SLOT="0"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${P}-src.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="amd64 x86"
-LICENSE="Apache-2.0"
-
-RDEPEND="=dev-libs/apr-1*
-	dev-libs/openssl
-	>=virtual/jre-1.5"
-
-DEPEND=">=virtual/jdk-1.5
-	${RDEPEND}"
-
-S=${WORKDIR}/${P}-src
-
-src_compile(){
-	cd "${S}"/jni/native
-	econf --with-apr=/usr/bin/apr-1-config  \
-		--with-ssl=/usr || die "Could not configure native sources"
-	emake || die "Could not build libtcnative-1.so"
-}
-
-src_install() {
-	cd "${S}"/jni/native
-	make 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
-}