Bumped to lastest release, removed past versions/cleanup

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo-r4 x86_64

5 files changed, 19 insertions, 95 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/Manifest b/dev-java/tomcat-native/Manifest
index a0913f4a40f2..8a596f2c9bf0 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,10 +1,6 @@
-DIST tomcat-native-1.1.10-src.tar.gz 185398 RMD160 eac2a2ee8b9beadf74f4885b99797a8fed7b2699 SHA1 2e4d7a5705af41101bad17cd0f5ef4ff6d8066f8 SHA256 bd2f8f374e3b75a9b0ef0cd8b076fa043a90ffb3c2763dd2daeb2b6dd06f1b79
-DIST tomcat-native-1.1.12-src.tar.gz 187968 RMD160 fcd19fcd1db1696013c6c280e73cf75684e0b7a6 SHA1 bd02f2af5a1bb496f59004194c191db374a3f20a SHA256 70dd3ea02b9cf9b52f27da9e479b94efb0f0edfde3d6a485e60324189fb3e414
 DIST tomcat-native-1.1.13-src.tar.gz 188391 RMD160 7364885502cc0358a3b739f0a98262889544f84e SHA1 6f0ab0fa5bd87b0fb32ddc0c10fbe68ac4a940a8 SHA256 72cf681cb2a4c17f0fa612d258252d3b260529bdbda4b498718d56cdf64b55f0
-DIST tomcat-native-1.1.8-src.tar.gz 174445 RMD160 0bb333973e7d177fd6d3e2dca1d0003633dfca3e SHA1 ed8a007abd5b658536caa5e5da76140d8112648a SHA256 c4924e416def6993e8ee41e9cb88346705da8f5d51be0523d7567b34530ed1c2
-EBUILD tomcat-native-1.1.10.ebuild 1134 RMD160 d288e72fafedbed9f296399bbc75b7c5e5e350be SHA1 9392b41375492a316392ea8279dfb8adf0c9567d SHA256 9c30fd2e4d21ea9349fdbc866e2af0d034c1fe289f6057719e4afcb127497059
-EBUILD tomcat-native-1.1.12.ebuild 1138 RMD160 57069860104689441a2f12fa2bebba427906b6ea SHA1 a0bf05822b78d80cbaf507904e135d2b4e5bf46f SHA256 33b5cb6d85394628d9a0feb4d6a2de5ac9ae6a36f619da9df1c5ad33c4453b39
+DIST tomcat-native-1.1.14-src.tar.gz 189757 RMD160 44697feeed60e6c828b9878bd674d91e4003b642 SHA1 319ffc1d259ade3867703002281812ff93782b9e SHA256 25009d94586d16b57046734b0e8b4ee3839dab38711d4474fec9bfc53d03b3ce
 EBUILD tomcat-native-1.1.13-r1.ebuild 1328 RMD160 133eb606fcbdb144d49b438cfeaccf09615ae952 SHA1 583c6b812a7e43333987036b0986ed39c3c7fa59 SHA256 d9dfb8027fc283505019e693c1f653020d49a95ae8173de736e2a474ab5db9ff
-EBUILD tomcat-native-1.1.8.ebuild 1134 RMD160 f0532c4a8cfdd7e1b59f0411cc707d2a8519ca80 SHA1 23778aab8b680e103b58c464fdf140196d46d61b SHA256 431f18441481be5b8611f0bde2aea7a425ccf3d465b95bd66fb4601f182b703a
-MISC ChangeLog 2652 RMD160 bd83e48d92abe7a7be1a3b80234e25777fad62a6 SHA1 ce59d49193ccfa1d3a73234bce81e57f234bd603 SHA256 ff6ed05d9611fcb00407f78420493d38ec3894139e8febe845be71e66881b9e9
+EBUILD tomcat-native-1.1.14.ebuild 1330 RMD160 17c704a4dd1e7c2390e38cd50205c0f59de60944 SHA1 9a14f6dede3f9e54fa91289ee0067e78410acf59 SHA256 cdcd8939bd67b3bf8db9504e1441a9245452ff5311b7f1841c88859cf45b9144
+MISC ChangeLog 2924 RMD160 5d9e2b4c7a7ba23eeecfff88bb651099f4ab9502 SHA1 2fc5f11b5f50056046a5bbc8bde62f624e609e2d SHA256 066f32081c946f704ea1816efd472e79f6084177427d9cef208ae3ba830c6d27
 MISC metadata.xml 825 RMD160 1cc8173f5c1ae14d688ccf43578ff621088dd24f SHA1 f44e742a7063a22368c408e3070774dbcfacb625 SHA256 1af9155a727e8470663f21324746f6c9567af0f47fb4b63f3dadba0ee43a5eda
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
-}