Added sed to set version 1.1.12 -> 1.1.13, bad upstream. Removed version with wrong...

Package-Manager: portage-2.1.4.1

diff --git a/dev-java/tomcat-native/ChangeLog b/dev-java/tomcat-native/ChangeLog
index 752c324f3b2ceb180b4d8a6bd6e64b83829454da..ce30b5cfd11027911e2498acdf4e724c590df5d7 100644 (file)
--- 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/Manifest b/dev-java/tomcat-native/Manifest
index 0c56aa422dc5328aa160daaa60066b1161f914bf..bf36822448316ca67139916681ddaf82d8b5e781 100644 (file)
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -4,7 +4,7 @@ DIST tomcat-native-1.1.13-src.tar.gz 188391 RMD160 7364885502cc0358a3b739f0a9826
 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 1137 RMD160 ec74e81f2bf52efa0bfcb4d15c9710f66cb09eff SHA1 6d1319a3e365ad3ce0a69358a454e743e655fc68 SHA256 0564eca497504a5e904d362b12bfbbd42ea72ed08e79ccc50dcc71d3c0a64af2
-EBUILD tomcat-native-1.1.13.ebuild 1137 RMD160 13d61cc0336e9927a4f14d348323010a84b7edf4 SHA1 8576c6d952e842384249894447db2bfb6de55822 SHA256 7c3c80ed6f2c56a369eac3e9dfed6d1dd127d08e641860051487f3dd570ea4b5
+EBUILD tomcat-native-1.1.13-r1.ebuild 1324 RMD160 a43978ca1fec3a6a60e820071e852f8470d62fdd SHA1 0715071cef7735961b56ce317b0e84e6fd859dd2 SHA256 a721e2b762d410b7a971d1ab5d35a28f8caae8ae3fa6517c5ecd6eeb68d9b7e6
 EBUILD tomcat-native-1.1.8.ebuild 1134 RMD160 f0532c4a8cfdd7e1b59f0411cc707d2a8519ca80 SHA1 23778aab8b680e103b58c464fdf140196d46d61b SHA256 431f18441481be5b8611f0bde2aea7a425ccf3d465b95bd66fb4601f182b703a
-MISC ChangeLog 1954 RMD160 befe0fd080159a7ac39b8a08f547d4ef607490b4 SHA1 226ce9b0e83ff97a8d68c2af6c51002a1c1d96ce SHA256 e84cbebd4deb8504e00b2bc2cbae56efe3e836cb146cdf2496bb288fa901dfa9
+MISC ChangeLog 2214 RMD160 69211a97512e993935778d67504cde29abb0ff7f SHA1 a31e81421e145918eca142fe2578af9584d652d0 SHA256 2811bedb4d43633d7dcac0148fe39438155fcd9bfcd141303d0533df3fd77aef
 MISC metadata.xml 825 RMD160 1cc8173f5c1ae14d688ccf43578ff621088dd24f SHA1 f44e742a7063a22368c408e3070774dbcfacb625 SHA256 1af9155a727e8470663f21324746f6c9567af0f47fb4b63f3dadba0ee43a5eda

diff --git a/dev-java/tomcat-native/tomcat-native-1.1.13.ebuild b/dev-java/tomcat-native/tomcat-native-1.1.13-r1.ebuild
similarity index 81%
rename from dev-java/tomcat-native/tomcat-native-1.1.13.ebuild
rename to dev-java/tomcat-native/tomcat-native-1.1.13-r1.ebuild
index 7f4fbf3ea3611cc690f9b619c57688a799dc634c..08c7d58d99d11f66f2cc59a2d7aa7797f8522207 100644 (file)
--- a/dev-java/tomcat-native/tomcat-native-1.1.13.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.1.13-r1.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.13.ebuild,v 1.1 2008/02/15 19:49:17 wltjr Exp $
+# $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
 
@@ -23,6 +23,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"