Support apache 2.4 (#532816), drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

7 files changed, 30 insertions, 238 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/Manifest b/www-apache/mod_caucho/Manifest
index 7d959c03dbdd..22e8ff5d5bf6 100644
--- a/www-apache/mod_caucho/Manifest
+++ b/www-apache/mod_caucho/Manifest
@@ -2,30 +2,16 @@
 Hash: SHA256
 
 AUX 88_mod_caucho.conf 496 SHA256 6b12d77e108f406ea311564de19a3e34393b74bfd4d35fabbd66d23d86338dfa SHA512 0e0751e633af0734e95306d26a05e6e6c8dd301862a46a47ebfa04721f648a16f5615554fd3a52288cef14bb9fb4786b11720fd96db7e8f6dcfdae651e578a26 WHIRLPOOL f5b0474955a953d479b3d0a683d71c56723a09d8d1456d5010f0a20f15ecae990da3e2ed5e7f12f3a9f864052ebadad3d4524002f5f694ec2f12bea0c4639751
-DIST resin-4.0.13-src.zip 17439983 SHA256 2dd13eab5a23383e180ff018aa7c6318c094369359ea313fcf698ba1fa412b6e
-DIST resin-4.0.14-src.zip 17542066 SHA256 6a0b1bed5240609672041529a1b6b926f45356f47114ce4db0df1262a0b98fa5
-DIST resin-4.0.15-src.zip 17560013 SHA256 e9dcedcc4de44d738571d0bbb2cce747aaeff517ae571ab6e46f74fa969d4f39
-DIST resin-4.0.22-src.zip 17540820 SHA256 5b79a28e82849f97fc6bbf670306e29c19159b061b370f7eabc483f56a54053a SHA512 f9ddffa0ab0151041881464edfe9579ed9391da87cf79b18122a28d2dc656d05aa6140430bc3c9a0d79e562ce7b324011d9c933541cc1430a291ec72e55ee799 WHIRLPOOL 458df4fb3463d291940b1282eb23141eb46b465009d9e3fa42b8af43a7c846552ddc3ff75b4ab99557e0c53a4937508f7f37f20f837d7f5684796776ad686d9d
-DIST resin-4.0.25-src.zip 17971688 SHA256 e30ace9c2c9ececb1769402ea7a6cd2fe8ea73f9f38009da1b4d2ba23ab6972a
 DIST resin-4.0.26-src.zip 17879008 SHA256 0f7bbea8bd4803d499e1d212a49ac8672500ede80194c4daa12c980ad405e34e SHA512 aae0304664c67667b9abf304ccc3dbaf073be42fcd1dd6aa380d841a34a2a44f0187fa91abe6bf92bf66f394b4b2d4eda7c4c9a55b5cb8a76436446cca3d5512 WHIRLPOOL a536b28cad14219ce5c8aaa791a859d21539176b6f729072483e6278fa9b45de2bb367d6696225c1bafe0148c86c3bb0e46ec81595222160aa742ffdf9d5674c
-DIST resin-gentoo-patches-4.0.13.tar.bz2 2487 SHA256 56bc88cb760d683f893b68f9421465c2205681de5d3ad7a5f58888d6d0e5a6e4
-DIST resin-gentoo-patches-4.0.14.tar.bz2 2486 SHA256 716f23fa775a8a6460e8ebdf2873932433f18fbe1f05ef868c4769ab4db5c30e
-DIST resin-gentoo-patches-4.0.15.tar.bz2 2494 SHA256 e404a734c715123625541d4a4770c8709855a81abc9336b81be5bd6b3be81fee
-DIST resin-gentoo-patches-4.0.22.tar.bz2 2489 SHA256 ba5494cd88c10bdfb3d382d9c5a563d69db4ab7435f0296783dd3ab665ad093e SHA512 742029acf18bf587da94da707c418acd6d41b10b93d1b6dcecb36cd491401fa682ad3f7acffcbd1593602d7e31d9cdf3c7834b7fae213b0f1f595e9ee8079aef WHIRLPOOL 36d0e3675cf2ffffe31d957dd7c8729272fbe1445e36be26313970774c46d31354858db9069d4d5483cd5fcbc3fb135878a0c9d287d4b0c83d5b0b81b5a86882
-DIST resin-gentoo-patches-4.0.25.tar.bz2 2482 SHA256 60131072b485459e7e7882ad3620194de6e1c8ce16d50999071ca0a7fd35502d
 DIST resin-gentoo-patches-4.0.26.tar.bz2 3826 SHA256 adff1fb68e38af68add2e16e3832406a105e14532ee022ad315a955d6d6f4f31 SHA512 fc23c6b82f55b76c063276169e8b6be40ab697dfa07ab8f8f560db33b9c48993526f07190b137406f952e0d1a548cc45f30b6a9ceb4983e2a9eed5de8f4ab5d3 WHIRLPOOL cf7403adcdd0b98fcab2ace7733af7e9fa57361f9e2b2fb128ee8c3a9d787c5e8437f6749889cea1aacbf1ec9b9725647e6737fe4e3d1a98d69d1965c129c2d2
-EBUILD mod_caucho-4.0.13.ebuild 1088 SHA256 499340fc8ccc64c40140e4cbe942cb6de175646cf0ff0bb2145d5f3ac0169647 SHA512 4f4a481a6ae5489133ff4db0ae4fa55707f4873a8eda7b7f8788634bc2ff42e280936d8ad1583db62737e7cf432d4d7c4ee4568ef52a68bb79a0bdc048f2d237 WHIRLPOOL 7bfc413ba1b37d08ead6d8b4b42847e7c9aec1ccf71135cdf1a16cc465a8fd7c0670748026dc2d122d668253ae887788b20beed6328d62e3c5e8d8c7d92bd8ed
-EBUILD mod_caucho-4.0.14.ebuild 1090 SHA256 782f49baebc52d37e8c9bfa5df959e5d62598b6491903b7854d1a896ad2cddab SHA512 311812f48a3cc92602f0135e1baf6378410b6465cc4bd8f8260912300543786f562e1fdfff3491e048112734481aa5a4b2fece42143b83370a98c33cd6ab9b1f WHIRLPOOL f20d3912b304cdbe53e3df39f12d55b66c7a7cfbee7a6ac93e9a15a1667ece3894a052eca1155b4f359c5f2020c97f37a2f301742741f29eec72d86e87d8a3b7
-EBUILD mod_caucho-4.0.15.ebuild 1090 SHA256 628d7f661982da7bdb716af00172e830983de6abb8f647f5452d6faf2112beec SHA512 9708553e83779d30c0ddb0f0c5200fc79a91f2d4246e5716ced3213b4dbd40e25cf24682eddf9e3ec1ef6e9944a49912dedc53ec517bf3621e25d70d2185b9a2 WHIRLPOOL a6280aa55889fdafd9f24058e78be8d1ff058818995f74dcf4dd4c9f1e2670a01b5691957b58191a26b2bc8f6e7e99866f127b8a865b9a3ae547320634b4a1e6
-EBUILD mod_caucho-4.0.22.ebuild 1373 SHA256 925a729517ea533d41e57b66ce041655aa6f7aeb9cd09efbb75c7b160df2a16c SHA512 d89e6e6517515a95e672579b5713a0735e5e567a515cd0bf8b1574e172aaee8c7e56a7786fd2b9427ffac6ce7d3aeecb8fc1b5fa719531ba022052eb7fc8635d WHIRLPOOL 363a502a7e323610d24b7eae345c55a12606343aafe86b555988750d3723dce74ea2b999c95a78cccd843e2d0648b7e6a6cd11e763bd5130398db271d88039d9
-EBUILD mod_caucho-4.0.25.ebuild 1341 SHA256 0cd59c0a983f53fb4c12339bff11410ba390562d3d878302032064d0fbe26b60 SHA512 aa2e68d79791e22dfaf56353e022f7cec95b8760cf84973023de4fd0c13305c4e9539ab1296a904c49b8063ad393948d62068d958dd4de6b4402be873f1ab06e WHIRLPOOL 5c2676eb25fb10d1815c40b1067f7a45a5566363e2577f2f65a4cfea2fd0b8b8a8c879a823f904b801bd130f6f81ef0ce187ee66aeb6e8dfca16f1a04efe367d
+EBUILD mod_caucho-4.0.26-r1.ebuild 1233 SHA256 fb6b52e04e3a0a820c9b082bea310f3229a2ddfdb1560adf615e691608fc4808 SHA512 801542135d108f1ea578770a320bcdbed450f3419050267b23b9865b0682405a455a3581ddb4c1fec827d9f193faccf8fc12ae0d28cd6509508c41c2595161f3 WHIRLPOOL a96fb2dc6c1d00148f40f547f5d6f5632b45c3efaf79ad9453693f70f50226748401b3a5a05eb02646c73c9ad4b265fe56ed924f95c2394a4760e2140b505463
 EBUILD mod_caucho-4.0.26.ebuild 1137 SHA256 faa83da77b7b1b6bd43af629b5af87c65a7c1d2be4b9c9eeddcd39b3bfb081d3 SHA512 451492cf9ecc772978d720f2813952985c66b6a30a984f6bde5c23a33a2e25e2b34776986b28c2df652e2267e74b598e7683904665f1179418d8379516f93289 WHIRLPOOL 0a95ec1d4425a0f01498876165a01bffc4253581b8c3e305c3bf40fd4db790d79f63383339c1605dda14f62394888bb4cda95853a0f33278d8ff461c26107f79
-MISC ChangeLog 12900 SHA256 a328ab931382e9b318301ad8aa8edffbfeab65fdde413075dc1029fed70744f2 SHA512 9bd24c02bb8cb50d9bcb2c4c6796293954604d1798ef62152c4bd81a15878695360639876295f6353cd55607c3869edbb1788f03c315cd6010a0464446737c73 WHIRLPOOL 997c268ae5437d2fcb5b9cddbee3a74ed67b2b78c423a0bedf7e8b1059da94e12c1eb7071b421f2ae8478358232cc18befb5cff6d279cad27ad24869ba2bfa1e
+MISC ChangeLog 13195 SHA256 28f3bf7736d2f8693c531c3a35ab240ba7376b8bcaac98105376c0eebc8ed4ad SHA512 55653b081c8880707385210189721917ee0d8254de1a2ec67657e6efcf6af45e8163138436a838c84c8034baf8787f9a681dc814070433e288eed8e86c1d9bbe WHIRLPOOL 1894cf246ae574808bf96574ba21988754f40d481aa1dbd484c145290e1d39b2e6037d2d8fba3e1cdc10aebe393d1e48285b9d1257f6ac17fa2cda8b14bfb834
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn0sYACgkQcaHudmEf86o4IwCfYFkjVwApu6DfLMsmBM2p5zl5
-lDUAn3C6H7zM9ONyZwAcdihAh7xGDD8u
-=fOzO
+iEYEAREIAAYFAlVNwm8ACgkQCaWpQKGI+9Tk0gCfS97sw6PVmezjPIpeMcav++Xy
+KpMAnRGS+UDBybDox87REMMgMTb0LRCG
+=hNQ8
 -----END PGP SIGNATURE-----
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/"
 }