Version bump to match www-servers/resin version.

Package-Manager: portage-2.1.1_pre4-r3

5 files changed, 104 insertions, 9 deletions

diff --git a/www-apache/mod_caucho/ChangeLog b/www-apache/mod_caucho/ChangeLog
index a87a7968ae6a..89a6f64d33ee 100644
--- a/www-apache/mod_caucho/ChangeLog
+++ b/www-apache/mod_caucho/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_caucho
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.2 2006/07/27 06:40:13 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.3 2006/08/05 16:22:05 nelchael Exp $
+
+*mod_caucho-3.0.20 (05 Aug 2006)
+
+  05 Aug 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/mod_caucho-3.0.20-gentoo.patch, +mod_caucho-3.0.20.ebuild:
+  Version bump to match www-servers/resin version.
 
   27 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   mod_caucho-3.0.19.ebuild:
diff --git a/www-apache/mod_caucho/Manifest b/www-apache/mod_caucho/Manifest
index 98beea725769..53a4a1dfe349 100644
--- a/www-apache/mod_caucho/Manifest
+++ b/www-apache/mod_caucho/Manifest
@@ -9,15 +9,24 @@ AUX mod_caucho-3.0.19-gentoo.patch 783 RMD160 1095793f52b556363e02dbe49e6714a981
 MD5 53f2db3a7bcef95f01f945ef99b016d8 files/mod_caucho-3.0.19-gentoo.patch 783
 RMD160 1095793f52b556363e02dbe49e6714a9819941f3 files/mod_caucho-3.0.19-gentoo.patch 783
 SHA256 4e0b68a50340adc6fa525e52fbb67c95f2b5e6f42e982004251e334ceeb915dc files/mod_caucho-3.0.19-gentoo.patch 783
+AUX mod_caucho-3.0.20-gentoo.patch 783 RMD160 86d461f330daa795f3da56e95a065656eaffa009 SHA1 6d8c09cb4076b017190541e9c9b62c6f4d68f471 SHA256 a31f159563e3ef392cecb70e55107f8280addd1a8fee696d7d40a6d9a1219aaf
+MD5 a3f913005b00b059603d7c560c1f6157 files/mod_caucho-3.0.20-gentoo.patch 783
+RMD160 86d461f330daa795f3da56e95a065656eaffa009 files/mod_caucho-3.0.20-gentoo.patch 783
+SHA256 a31f159563e3ef392cecb70e55107f8280addd1a8fee696d7d40a6d9a1219aaf files/mod_caucho-3.0.20-gentoo.patch 783
 DIST resin-3.0.19-src.tar.gz 5031722 RMD160 691fd9c6a47c93dd10ba356901901a3d736ffbf9 SHA1 9de0832abcb3ec18d717702afd8108f61c102aac SHA256 d8d0210e098f370d499439a695c68033d3fbe3e2cacf4d0da884e6891f3defd3
+DIST resin-3.0.20-src.tar.gz 5396774 RMD160 0e82848e3e88048db10019563d0c731e71b52b66 SHA1 b262642aedc1d131b39d6405412a894f7b968a35 SHA256 b78f94ae294289292eb954a11ae4cbe10ed7e8e8de068b14f916cb46e2cd735e
 EBUILD mod_caucho-3.0.19.ebuild 1242 RMD160 f379c4e55f2475129517ff0ee384996571782ae9 SHA1 da524c6dc848d6742e0f893742969e238b41d20b SHA256 42a414b23112f56293fa116703f4862a46ada1cbd4cf4578004696f952bba2f9
 MD5 a559de71c8cc04ce365df3a373392ec8 mod_caucho-3.0.19.ebuild 1242
 RMD160 f379c4e55f2475129517ff0ee384996571782ae9 mod_caucho-3.0.19.ebuild 1242
 SHA256 42a414b23112f56293fa116703f4862a46ada1cbd4cf4578004696f952bba2f9 mod_caucho-3.0.19.ebuild 1242
-MISC ChangeLog 557 RMD160 7038badb60105d06217b856bbc29d0c92089c2a0 SHA1 3bd84d2e6d7c28308ebbf1ebaffd7c9834a9ed8d SHA256 5496588bcd48817eac0e0eff7ea5b2ca5974fdb2520848bc691e43c062844f1e
-MD5 87a061cee1ea4d4bc29aaa844bf1d031 ChangeLog 557
-RMD160 7038badb60105d06217b856bbc29d0c92089c2a0 ChangeLog 557
-SHA256 5496588bcd48817eac0e0eff7ea5b2ca5974fdb2520848bc691e43c062844f1e ChangeLog 557
+EBUILD mod_caucho-3.0.20.ebuild 1242 RMD160 5630636b2d6c735ecf90472fbaab48b4e660fc80 SHA1 4932d77373612f1fde2a29d0ac126ebc2a0175b3 SHA256 76f280761fcca9373a20dd49e45a24688b0ecec02cf4a191958995c75b53e44a
+MD5 f9fc3ada0a49656042f3354bb140b4e9 mod_caucho-3.0.20.ebuild 1242
+RMD160 5630636b2d6c735ecf90472fbaab48b4e660fc80 mod_caucho-3.0.20.ebuild 1242
+SHA256 76f280761fcca9373a20dd49e45a24688b0ecec02cf4a191958995c75b53e44a mod_caucho-3.0.20.ebuild 1242
+MISC ChangeLog 764 RMD160 f88758887301d8715c35298ec54d642713f25ba7 SHA1 a12b79277558431ab263637248d240b397385ef2 SHA256 0b61eb5efae32379fd89b5f1cb82cbd22c09336ebb4344794a8502796d9aea71
+MD5 6b19e9884eae33840507d7badd8437f5 ChangeLog 764
+RMD160 f88758887301d8715c35298ec54d642713f25ba7 ChangeLog 764
+SHA256 0b61eb5efae32379fd89b5f1cb82cbd22c09336ebb4344794a8502796d9aea71 ChangeLog 764
 MISC metadata.xml 224 RMD160 ff26da53f08837159410ff3eee9c11933ef21a68 SHA1 37c1f64045f8874b69bb7dffd084e7f699c37678 SHA256 8727090a0c21416083f038251a19559b983ff39bbefc2aa9b5c6c5bdc25b299d
 MD5 83f6bf68e595b0ec2e45d8e4b78c1f5a metadata.xml 224
 RMD160 ff26da53f08837159410ff3eee9c11933ef21a68 metadata.xml 224
@@ -25,10 +34,13 @@ SHA256 8727090a0c21416083f038251a19559b983ff39bbefc2aa9b5c6c5bdc25b299d metadata
 MD5 0c5de37c2495a8cd57a0ccafa02eca53 files/digest-mod_caucho-3.0.19 253
 RMD160 72e08fd9c7fb5e14df3f4579ea3a8c442b83aea4 files/digest-mod_caucho-3.0.19 253
 SHA256 092bf61d5004c321668d0e000c821dd9a7f2a8fce1acaaa42059f37f7dcd6fe4 files/digest-mod_caucho-3.0.19 253
+MD5 6296765725f98c29390e1f34c15d69d7 files/digest-mod_caucho-3.0.20 253
+RMD160 01a32245b86cd2aeb34982ae43eb29d5d1668431 files/digest-mod_caucho-3.0.20 253
+SHA256 2b0b455e54b71e73ea2ff94fe33d9fae7288707dbaac66829c388d322d87e4b7 files/digest-mod_caucho-3.0.20 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEyF/ggo/w9rxVVVERApBXAKDCbj8BjeBhJRXOezuND7KUfzak9wCglcvF
-yX0AwJicBS65NULnPyYRWgc=
-=OggC
+iD8DBQFE1MW7go/w9rxVVVERAmHsAKCkjt+LXjnRC2LqLUyso2TFg75q/ACfUmg1
+uInNaj99hAySrggo8+rzqik=
+=xuYz
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_caucho/files/digest-mod_caucho-3.0.20 b/www-apache/mod_caucho/files/digest-mod_caucho-3.0.20
new file mode 100644
index 000000000000..6ba5b302e614
--- /dev/null
+++ b/www-apache/mod_caucho/files/digest-mod_caucho-3.0.20
@@ -0,0 +1,3 @@
+MD5 8ae9651a4a8a928b696352288636e5f7 resin-3.0.20-src.tar.gz 5396774
+RMD160 0e82848e3e88048db10019563d0c731e71b52b66 resin-3.0.20-src.tar.gz 5396774
+SHA256 b78f94ae294289292eb954a11ae4cbe10ed7e8e8de068b14f916cb46e2cd735e resin-3.0.20-src.tar.gz 5396774
diff --git a/www-apache/mod_caucho/files/mod_caucho-3.0.20-gentoo.patch b/www-apache/mod_caucho/files/mod_caucho-3.0.20-gentoo.patch
new file mode 100644
index 000000000000..2fad0cc7c444
--- /dev/null
+++ b/www-apache/mod_caucho/files/mod_caucho-3.0.20-gentoo.patch
@@ -0,0 +1,17 @@
+diff -Nru resin-3.0.20.vanilla/modules/c/src/apache2/Makefile.in resin-3.0.20/modules/c/src/apache2/Makefile.in
+--- resin-3.0.20.vanilla/modules/c/src/apache2/Makefile.in	2006-08-05 18:17:13.000000000 +0200
++++ resin-3.0.20/modules/c/src/apache2/Makefile.in	2006-08-05 18:18:16.000000000 +0200
+@@ -36,11 +36,8 @@
+ 	$(CC) -c $(INCLUDES) $(CFLAGS) $<
+ 
+ install	: mod_caucho.la
+-	$(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)
+-	- rm -f $(apache_libexec)/mod_caucho.la
+-	- rm -f $(apache_libexec)/mod_caucho.a
+-	sh install.sh -conf $(apache_conf) -libexec $(apache_libexec) \
+-	   -resin_home $(resin_home)
++	mkdir -p $(DESTDIR)$(apache_libexec)
++	$(LIBTOOL) --mode=install $(CP) mod_caucho.la $(DESTDIR)$(apache_libexec)
+ 
+ clean	:
+ 	- rm -r *.o *.lo *.la *.so .libs
diff --git a/www-apache/mod_caucho/mod_caucho-3.0.20.ebuild b/www-apache/mod_caucho/mod_caucho-3.0.20.ebuild
new file mode 100644
index 000000000000..bc765075ef7b
--- /dev/null
+++ b/www-apache/mod_caucho/mod_caucho-3.0.20.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.20.ebuild,v 1.1 2006/08/05 16:22:05 nelchael Exp $
+
+inherit apache-module autotools
+
+DESCRIPTION="mod_caucho connects Resin and Apache2"
+HOMEPAGE="http://www.caucho.com"
+SRC_URI="http://www.caucho.com/download/resin-${PV}-src.tar.gz"
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SLOT="0"
+
+# See apache-module.eclass for more information.
+APACHE2_MOD_CONF="88_${PN}"
+APACHE2_MOD_DEFINE="CAUCHO"
+
+need_apache2
+
+RDEPEND="${RDEPEND}"
+
+S="${WORKDIR}/resin-${PV}"
+
+src_unpack() {
+
+	unpack "${A}"
+
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	cd "${S}"
+	eautoreconf
+
+	chmod 755 ./configure
+
+}
+
+src_compile() {
+
+	econf --with-apxs=${APXS2} || die "econf failed"
+
+	emake -j1 -C "${S}/modules/c/src/common/" || die "emake failed"
+	emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed"
+
+}
+
+src_install() {
+
+	cd "${S}/modules/c/src/apache2"
+	make DESTDIR="${D}" install || die "install failed"
+
+	insinto ${APACHE2_MODULES_CONFDIR}
+	doins ${FILESDIR}/${APACHE2_MOD_CONF}.conf || \
+		die "internal ebuild error: '${FILESDIR}/${APACHE2_MOD_CONF}.conf' not found."
+
+}