Version bump.

Package-Manager: portage-2.1.2_rc4-r1

5 files changed, 104 insertions, 9 deletions

diff --git a/www-apache/mod_caucho/ChangeLog b/www-apache/mod_caucho/ChangeLog
index f57106e0e298..75348e8e578a 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.6 2006/11/19 12:24:10 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.7 2006/12/26 01:50:59 nelchael Exp $
+
+*mod_caucho-3.1.0 (26 Dec 2006)
+
+  26 Dec 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/mod_caucho-3.1.0-gentoo.patch, +mod_caucho-3.1.0.ebuild:
+  Version bump.
 
 *mod_caucho-3.0.22 (19 Nov 2006)
 
diff --git a/www-apache/mod_caucho/Manifest b/www-apache/mod_caucho/Manifest
index bbf5a6db0179..459981e63d88 100644
--- a/www-apache/mod_caucho/Manifest
+++ b/www-apache/mod_caucho/Manifest
@@ -13,8 +13,13 @@ AUX mod_caucho-3.0.22-gentoo.patch 783 RMD160 186ce598a34264008eeac9ed2b9c0b0943
 MD5 ed670b62f8e7eca8ed2b748c6c168458 files/mod_caucho-3.0.22-gentoo.patch 783
 RMD160 186ce598a34264008eeac9ed2b9c0b094310ff5a files/mod_caucho-3.0.22-gentoo.patch 783
 SHA256 308de706f120962508fadb8e4d5caab504ed2cd49f80d7bca0289b706f075e9c files/mod_caucho-3.0.22-gentoo.patch 783
+AUX mod_caucho-3.1.0-gentoo.patch 779 RMD160 2bd24d536c97b07b5366b5c450be9e0e878c1d44 SHA1 775eaa939ff0c8cf0ed4c43a1866631acf94aad4 SHA256 667c97c8fa9c34102303a7096cc271f422e83cc4fc1fd09a1630368babdd9c34
+MD5 b2b19809a96fd5e41d11294c9d0c144b files/mod_caucho-3.1.0-gentoo.patch 779
+RMD160 2bd24d536c97b07b5366b5c450be9e0e878c1d44 files/mod_caucho-3.1.0-gentoo.patch 779
+SHA256 667c97c8fa9c34102303a7096cc271f422e83cc4fc1fd09a1630368babdd9c34 files/mod_caucho-3.1.0-gentoo.patch 779
 DIST resin-3.0.21-src.tar.gz 5401440 RMD160 1f4d90a28aa772a4dc14259816325285ffea1957 SHA1 00a928d470f69f39c1fac511356b6d368ade54e5 SHA256 c9de627433fbe3ec940507fd604a4a2409e70a16342994ffab881a51f8db1055
 DIST resin-3.0.22-src.tar.gz 5467522 RMD160 093cdcfa8bcd14a30ff54cc9cb8001ace10bbfc6 SHA1 23d4f2fd233033adb0b08f8fcdcb81a1f0aab3fe SHA256 0da5617b6867a0d40e59d2dfe2518158567506fea2c1273d56290c146a64849a
+DIST resin-3.1.0-src.tar.gz 5708227 RMD160 6e347dc2810b328eddeafb39886bfe146c65f409 SHA1 2f3f7c5d6003424f2f1afc27f38f9f36cc312466 SHA256 735af3cd4ed9962631969d2da4ddea26ab28c3d0fd96d0e831e5a2058ef77440
 EBUILD mod_caucho-3.0.21.ebuild 1241 RMD160 d83b6cbb9b2ca7e7cc3f5fb8497b612f5270c19b SHA1 dea143e4f1386fd8bfc11a9758de9edc212b6020 SHA256 44bbc832599dd3380b4ee2ad84babe22d3b1f4b26c679a6ca0052f59cb3fec57
 MD5 e7139e7ad06d81c9d054f4d0df8825d7 mod_caucho-3.0.21.ebuild 1241
 RMD160 d83b6cbb9b2ca7e7cc3f5fb8497b612f5270c19b mod_caucho-3.0.21.ebuild 1241
@@ -23,10 +28,14 @@ EBUILD mod_caucho-3.0.22.ebuild 1242 RMD160 b1d4b0ff8754aef1406efa050a47757299d8
 MD5 7fd9d00809aa3b4f1644b925d483a155 mod_caucho-3.0.22.ebuild 1242
 RMD160 b1d4b0ff8754aef1406efa050a47757299d89754 mod_caucho-3.0.22.ebuild 1242
 SHA256 0f838373805f99dff5f7a631395c811b7a9856b1634c24a6702bf41f50548914 mod_caucho-3.0.22.ebuild 1242
-MISC ChangeLog 1393 RMD160 6396272c9980ff69db5f002aa3254e56bf6bd53b SHA1 b376f463752a11627e37ac53cea7442b69f3b89a SHA256 25d06a4d8f90d20d2f3f97ff394388747ce9b47e64f759367ba70574506cdeac
-MD5 25117a7b10f63300a5d2d708db780fcb ChangeLog 1393
-RMD160 6396272c9980ff69db5f002aa3254e56bf6bd53b ChangeLog 1393
-SHA256 25d06a4d8f90d20d2f3f97ff394388747ce9b47e64f759367ba70574506cdeac ChangeLog 1393
+EBUILD mod_caucho-3.1.0.ebuild 1241 RMD160 3cb6feb65becd1af7eb74efd33b36242f66fcb33 SHA1 929ab50413a6daf5032613d5202ce203770b2f6c SHA256 cf70aab19dd4e29b69474e209a03f88c8f2b9dc8b4331c335c3490e2fa9e95bd
+MD5 635d98ea617398e6863262e86f33c8f3 mod_caucho-3.1.0.ebuild 1241
+RMD160 3cb6feb65becd1af7eb74efd33b36242f66fcb33 mod_caucho-3.1.0.ebuild 1241
+SHA256 cf70aab19dd4e29b69474e209a03f88c8f2b9dc8b4331c335c3490e2fa9e95bd mod_caucho-3.1.0.ebuild 1241
+MISC ChangeLog 1562 RMD160 f8ab2d85e4741776c418913a17dd2f291760eee4 SHA1 17a7175540b0fbfc0e186dbabbb54b1f0f621fd4 SHA256 c628c8140a0d3a8cea50988dcfcd53710e5ebf4c6fec635347d907a4e0d0ef76
+MD5 94ebccc860bf9b955d7a948bec0ef980 ChangeLog 1562
+RMD160 f8ab2d85e4741776c418913a17dd2f291760eee4 ChangeLog 1562
+SHA256 c628c8140a0d3a8cea50988dcfcd53710e5ebf4c6fec635347d907a4e0d0ef76 ChangeLog 1562
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229
 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229
@@ -37,10 +46,13 @@ SHA256 a41462d28571aee053b0bb80907636bc065420f0422b8c3e6661ac5986f2f39d files/di
 MD5 1df6f758925c19f33df250705d01755e files/digest-mod_caucho-3.0.22 253
 RMD160 bd3fd0cce1c7cccefb0440cd6520d7d58f3625eb files/digest-mod_caucho-3.0.22 253
 SHA256 22df3f8469cc556d0c7f3e0238eb0a7bfc0ebf2f64fdf30fee739e286e1505cb files/digest-mod_caucho-3.0.22 253
+MD5 486b2f59227ff5e961aee6f6a7482362 files/digest-mod_caucho-3.1.0 250
+RMD160 29b90fa098e07020808bc9bb0156c404b6e012b3 files/digest-mod_caucho-3.1.0 250
+SHA256 8af0d2e1d33ccff5b8ef7c6cfc0097f92c557d9179a3c1145ea103f7c40a1171 files/digest-mod_caucho-3.1.0 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFYEz3go/w9rxVVVERApI/AJ47peEobE5f0AXYz604mdXU8MgCvACgizh3
-gX4EzNW7yUjPkRGvfDEUHCQ=
-=7QsK
+iD8DBQFFkIAtgo/w9rxVVVERAqB6AJ4ohiOjAaaCmWLNq027a0W6ZKU3RwCfVUSq
+CgCJtk7p22fmEWoR2e5FuUk=
+=180u
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_caucho/files/digest-mod_caucho-3.1.0 b/www-apache/mod_caucho/files/digest-mod_caucho-3.1.0
new file mode 100644
index 000000000000..82f68ed4827c
--- /dev/null
+++ b/www-apache/mod_caucho/files/digest-mod_caucho-3.1.0
@@ -0,0 +1,3 @@
+MD5 bee26233a9bf67935c75fbb8136e9001 resin-3.1.0-src.tar.gz 5708227
+RMD160 6e347dc2810b328eddeafb39886bfe146c65f409 resin-3.1.0-src.tar.gz 5708227
+SHA256 735af3cd4ed9962631969d2da4ddea26ab28c3d0fd96d0e831e5a2058ef77440 resin-3.1.0-src.tar.gz 5708227
diff --git a/www-apache/mod_caucho/files/mod_caucho-3.1.0-gentoo.patch b/www-apache/mod_caucho/files/mod_caucho-3.1.0-gentoo.patch
new file mode 100644
index 000000000000..788c466a9f52
--- /dev/null
+++ b/www-apache/mod_caucho/files/mod_caucho-3.1.0-gentoo.patch
@@ -0,0 +1,17 @@
+diff -Nru resin-3.1.0.vanilla/modules/c/src/apache2/Makefile.in resin-3.1.0/modules/c/src/apache2/Makefile.in
+--- resin-3.1.0.vanilla/modules/c/src/apache2/Makefile.in	2006-12-26 02:44:02.000000000 +0100
++++ resin-3.1.0/modules/c/src/apache2/Makefile.in	2006-12-26 02:46:14.000000000 +0100
+@@ -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.1.0.ebuild b/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild
new file mode 100644
index 000000000000..3ab656889868
--- /dev/null
+++ b/www-apache/mod_caucho/mod_caucho-3.1.0.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.1.0.ebuild,v 1.1 2006/12/26 01:50:59 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."
+
+}