Support apache 2.4 (#532816), drop old

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

6 files changed, 25 insertions, 219 deletions

diff --git a/www-apache/mod_caucho/ChangeLog b/www-apache/mod_caucho/ChangeLog
index 52b0685028a6..a8a2907edb21 100644
--- a/www-apache/mod_caucho/ChangeLog
+++ b/www-apache/mod_caucho/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apache/mod_caucho
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.75 2014/08/10 20:15:01 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.76 2015/05/09 08:16:46 pacho Exp $
+
+*mod_caucho-4.0.26-r1 (09 May 2015)
+
+  09 May 2015; Pacho Ramos <pacho@gentoo.org> +mod_caucho-4.0.26-r1.ebuild,
+  -mod_caucho-4.0.13.ebuild, -mod_caucho-4.0.14.ebuild,
+  -mod_caucho-4.0.15.ebuild, -mod_caucho-4.0.22.ebuild,
+  -mod_caucho-4.0.25.ebuild:
+  Support apache 2.4 (#532816), drop old
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> mod_caucho-4.0.13.ebuild,
   mod_caucho-4.0.14.ebuild, mod_caucho-4.0.15.ebuild, mod_caucho-4.0.22.ebuild,
diff --git a/www-apache/mod_caucho/mod_caucho-4.0.13.ebuild b/www-apache/mod_caucho/mod_caucho-4.0.13.ebuild
deleted file mode 100644
index 01d8953f5489..000000000000
--- a/www-apache/mod_caucho/mod_caucho-4.0.13.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.13.ebuild,v 1.5 2014/08/10 20:15:01 slyfox Exp $
-
-EAPI="2"
-
-inherit eutils 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.zip
-	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="${DEPEND}
-	app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}/resin-${PV}"
-
-# See apache-module.eclass for more information.
-APACHE2_MOD_CONF="88_${PN}"
-APACHE2_MOD_DEFINE="CAUCHO"
-APACHE2_MOD_FILE="${S}/modules/c/src/apache2/.libs/${PN}.so"
-
-need_apache2_2
-
-src_prepare() {
-	for i in "${WORKDIR}"/${PV}/mod_caucho-*; do
-		epatch "${i}"
-	done
-
-	mkdir m4
-	eautoreconf
-	chmod 755 ./configure
-}
-
-src_configure() {
-	econf --with-apxs=${APXS} || die "econf failed"
-}
-
-src_compile() {
-	emake -C "${S}/modules/c/src/apache2/" || die "emake failed"
-}
diff --git a/www-apache/mod_caucho/mod_caucho-4.0.15.ebuild b/www-apache/mod_caucho/mod_caucho-4.0.15.ebuild
deleted file mode 100644
index 584915cdf32a..000000000000
--- a/www-apache/mod_caucho/mod_caucho-4.0.15.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.15.ebuild,v 1.3 2014/08/10 20:15:01 slyfox Exp $
-
-EAPI="2"
-
-inherit eutils 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.zip
-	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="${DEPEND}
-	app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}/resin-${PV}"
-
-# See apache-module.eclass for more information.
-APACHE2_MOD_CONF="88_${PN}"
-APACHE2_MOD_DEFINE="CAUCHO"
-APACHE2_MOD_FILE="${S}/modules/c/src/apache2/.libs/${PN}.so"
-
-need_apache2_2
-
-src_prepare() {
-	for i in "${WORKDIR}"/${PV}/mod_caucho-*; do
-		epatch "${i}"
-	done
-
-	mkdir m4
-	eautoreconf
-	chmod 755 ./configure
-}
-
-src_configure() {
-	econf --with-apxs=${APXS} || die "econf failed"
-}
-
-src_compile() {
-	emake -C "${S}/modules/c/src/apache2/" || die "emake failed"
-}
diff --git a/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild b/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild
deleted file mode 100644
index cdb921d653f1..000000000000
--- a/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild,v 1.7 2014/08/10 20:15:01 slyfox Exp $
-
-EAPI="2"
-
-inherit eutils 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.zip
-	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="${DEPEND}
-	app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}/resin-${PV}"
-
-# See apache-module.eclass for more information.
-APACHE2_MOD_CONF="88_${PN}"
-APACHE2_MOD_DEFINE="CAUCHO"
-APACHE2_MOD_FILE="${S}/modules/c/src/apache2/.libs/${PN}.so"
-
-need_apache2_2
-
-src_prepare() {
-	for i in "${WORKDIR}"/${PV}/mod_caucho-*; do
-		epatch "${i}"
-	done
-
-	sed -i \
-		-e 's,-m32,,g; s,-m64,,g;' \
-		-e '/.*Java 1.6 required.*/d' \
-		configure.ac || die "sed for configure.ac failed"
-	sed -i \
-		-e 's,\$(LIBS_SHLIB),$(LDFLAGS) $(LIBS_SHLIB),g' \
-		modules/c/src/apache2/Makefile.in || die "sed for Makefile.in failed"
-
-	mkdir m4
-	eautoreconf
-	chmod 755 ./configure
-}
-
-src_configure() {
-	econf --with-apxs=${APXS} --with-java-home=/usr || die "econf failed"
-}
-
-src_compile() {
-	emake -C "${S}/modules/c/src/apache2/" || die "emake failed"
-}
diff --git a/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild b/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild
deleted file mode 100644
index aec57a47e241..000000000000
--- a/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild,v 1.5 2014/08/10 20:15:01 slyfox Exp $
-
-EAPI="2"
-
-inherit eutils 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.zip
-	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="${DEPEND}
-	app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}/resin-${PV}"
-
-# See apache-module.eclass for more information.
-APACHE2_MOD_CONF="88_${PN}"
-APACHE2_MOD_DEFINE="CAUCHO"
-APACHE2_MOD_FILE="${S}/modules/c/src/apache2/.libs/${PN}.so"
-
-need_apache2_2
-
-src_prepare() {
-	for i in "${WORKDIR}"/${PV}/mod_caucho-*; do
-		epatch "${i}"
-	done
-
-	sed -i \
-		-e 's,-m32,,g; s,-m64,,g;' \
-		configure.ac || die "sed for configure.ac failed"
-	sed -i \
-		-e 's,\$(LIBS_SHLIB),$(LDFLAGS) $(LIBS_SHLIB),g' \
-		modules/c/src/apache2/Makefile.in || die "sed for Makefile.in failed"
-
-	mkdir m4
-	eautoreconf
-	chmod 755 ./configure
-}
-
-src_configure() {
-	econf --with-apxs=${APXS} --with-java-home=/usr || die "econf failed"
-}
-
-src_compile() {
-	emake -C "${S}/modules/c/src/apache2/" || die "emake failed"
-}
diff --git a/www-apache/mod_caucho/mod_caucho-4.0.14.ebuild b/www-apache/mod_caucho/mod_caucho-4.0.26-r1.ebuild
index cd4a44c38b6b..a1c46bf41656 100644
--- a/www-apache/mod_caucho/mod_caucho-4.0.14.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-4.0.26-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.14.ebuild,v 1.3 2014/08/10 20:15:01 slyfox Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.26-r1.ebuild,v 1.1 2015/05/09 08:16:46 pacho Exp $
 
+EAPI=5
 inherit eutils apache-module autotools
 
 DESCRIPTION="mod_caucho connects Resin and Apache2"
@@ -16,9 +15,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-DEPEND="${DEPEND}
-	app-arch/unzip"
-RDEPEND=""
+DEPEND="app-arch/unzip
+	~virtual/jre-1.6.0"
+RDEPEND="~virtual/jre-1.6.0"
 
 S="${WORKDIR}/resin-${PV}"
 
@@ -27,9 +26,15 @@ APACHE2_MOD_CONF="88_${PN}"
 APACHE2_MOD_DEFINE="CAUCHO"
 APACHE2_MOD_FILE="${S}/modules/c/src/apache2/.libs/${PN}.so"
 
-need_apache2_2
+need_apache2_4
 
 src_prepare() {
+	# Apache 2.4
+	sed -i \
+		-e 's/remote_ip/client_ip/g' \
+		-e 's/remote_addr/client_addr/g' \
+		modules/c/src/apache2/mod_caucho.c || die
+
 	for i in "${WORKDIR}"/${PV}/mod_caucho-*; do
 		epatch "${i}"
 	done
@@ -40,9 +45,9 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-apxs=${APXS} || die "econf failed"
+	econf --with-apxs=${APXS} --with-java-home=/usr
 }
 
 src_compile() {
-	emake -C "${S}/modules/c/src/apache2/" || die "emake failed"
+	emake -C "${S}/modules/c/src/apache2/"
 }