From 0de739e70c8f2d24432102756ec9f09a9f16d548 Mon Sep 17 00:00:00 2001
From: William Thomson <wltjr@gentoo.org>
Date: Mon, 18 Feb 2008 00:20:13 +0000
Subject: Added sed to set version 1.1.12 -> 1.1.13, bad upstream. Removed
 version with wrong tagging. (Portage version: 2.1.4.1)

---
 dev-java/tomcat-native/ChangeLog                   |  9 +++-
 .../tomcat-native/tomcat-native-1.1.13-r1.ebuild   | 49 ++++++++++++++++++++++
 dev-java/tomcat-native/tomcat-native-1.1.13.ebuild | 43 -------------------
 3 files changed, 57 insertions(+), 44 deletions(-)
 create mode 100644 dev-java/tomcat-native/tomcat-native-1.1.13-r1.ebuild
 delete mode 100644 dev-java/tomcat-native/tomcat-native-1.1.13.ebuild

(limited to 'dev-java')

diff --git a/dev-java/tomcat-native/ChangeLog b/dev-java/tomcat-native/ChangeLog
index 752c324f3b2c..ce30b5cfd110 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.13 2008/02/15 19:49:17 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-native/ChangeLog,v 1.14 2008/02/18 00:20:13 wltjr Exp $
+
+*tomcat-native-1.1.13-r1 (18 Feb 2008)
+
+  18 Feb 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  -tomcat-native-1.1.13.ebuild, +tomcat-native-1.1.13-r1.ebuild:
+  Added sed to set version 1.1.12 -> 1.1.13, bad upstream. Removed version
+  with wrong tagging.
 
 *tomcat-native-1.1.13 (15 Feb 2008)
 
diff --git a/dev-java/tomcat-native/tomcat-native-1.1.13-r1.ebuild b/dev-java/tomcat-native/tomcat-native-1.1.13-r1.ebuild
new file mode 100644
index 000000000000..08c7d58d99d1
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.1.13-r1.ebuild
@@ -0,0 +1,49 @@
+# 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.13-r1.ebuild,v 1.1 2008/02/18 00:20:13 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
+
+	# 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"
+}
+
+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.13.ebuild b/dev-java/tomcat-native/tomcat-native-1.1.13.ebuild
deleted file mode 100644
index 7f4fbf3ea361..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.1.13.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.13.ebuild,v 1.1 2008/02/15 19:49:17 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
-}
-- 
cgit v1.2.3-65-gdbad