cleanup ebuild and convert to EAPI2

Package-Manager: portage-2.2_rc40/cvs/Linux i686

6 files changed, 66 insertions, 110 deletions

diff --git a/www-apache/mod_caucho/ChangeLog b/www-apache/mod_caucho/ChangeLog
index c7c7bddd4f21..66f679b31a16 100644
--- a/www-apache/mod_caucho/ChangeLog
+++ b/www-apache/mod_caucho/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/mod_caucho
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.47 2009/08/02 14:13:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.48 2009/09/18 12:52:19 hollow Exp $
+
+  18 Sep 2009; Benedikt Böhm <hollow@gentoo.org> files/88_mod_caucho.conf,
+  mod_caucho-3.0.25.ebuild, mod_caucho-3.1.8.ebuild,
+  mod_caucho-3.2.1.ebuild:
+  cleanup ebuild and convert to EAPI2
 
   02 Aug 2009; Markus Meier <maekke@gentoo.org> mod_caucho-3.2.1.ebuild:
   amd64 stable, bug #275672
diff --git a/www-apache/mod_caucho/Manifest b/www-apache/mod_caucho/Manifest
index 7b230a920dd2..fbcea4792b7b 100644
--- a/www-apache/mod_caucho/Manifest
+++ b/www-apache/mod_caucho/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 88_mod_caucho.conf 520 RMD160 4c0b7ec0ca59e2165dd5ce11b694ee0edcad8a24 SHA1 981920c3d9976b996e423a24aa115441cadb7ab8 SHA256 65cae0fb7d09a43f5559a35d285c2cf527e3552e4933aba9de0a9f9b83c5870d
+AUX 88_mod_caucho.conf 496 RMD160 e6621b434726e565216e53577f08e0be282e5ba5 SHA1 42a43453c431789286815285779045ed30f65224 SHA256 6b12d77e108f406ea311564de19a3e34393b74bfd4d35fabbd66d23d86338dfa
 DIST resin-3.0.25-src.zip 10690692 RMD160 f613bf9f35a2fb99f16a2253aed715104575d3ca SHA1 48e1cdbb7e1e1501d6c1a920361558c70930463a SHA256 ed1e8ce03ea2c5454980bb5353f625d12bdd0713653dd845ac6b00cb239c1cdc
 DIST resin-3.1.8-src.zip 13604988 RMD160 0d72302adb320758224626f7a4863f53e9dfa83b SHA1 189d05af3d1a411cbe224c1482bc118888ab75ff SHA256 fbc9dc0253ca741b5642df761e2008ed82d4b663fa752a6cec0564ebae404abc
 DIST resin-3.2.1-src.zip 14228533 RMD160 42ab0609d1c00a5bba8f5d3be64b09ca81a8b0a9 SHA1 25c74bb307bd2fbce6e6324effb644b33715c1fb SHA256 d51d81b7748f90936c9f13ad4dea704d250fe9bd4cc73ddf2387def05ed3f591
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 RMD160 b7e370e5ce5869e22659caa77f81fe341894e8e6 SHA1 b11675e71cd0a5c019ad4368a2c4440bbe42226a SHA256 6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd
 DIST resin-gentoo-patches-3.1.8.tar.bz2 3883 RMD160 af457d88928c2d817524434dce917de78baa8915 SHA1 794b493060b684a492619c3ad80ad5badb94b0f5 SHA256 6b304e3e593d1c2727d945b2b3d9e41ea2880e96b3e3691ccc1dfcf7ae4759a6
 DIST resin-gentoo-patches-3.2.1.tar.bz2 3737 RMD160 7c0ebad6f727d2db06f9e494cffbe7abebf7222a SHA1 05f3785568ec4a7d28477ece39de647048921220 SHA256 0145db7190f98f080cfd946804b422bccbfaa64a610faf294f98ddee68dd2f6f
-EBUILD mod_caucho-3.0.25.ebuild 1267 RMD160 64a5bbc71eba17200f41e6ef48a258fe12d93813 SHA1 9426af5a642ee683cfd3733abf039ddea946dc98 SHA256 9bdc9e368edd1ef78a58256e4504684329e65646af693fc762ae3a21f1148769
-EBUILD mod_caucho-3.1.8.ebuild 1364 RMD160 e18425ffeefb98163972e6bb6688aac90d084a87 SHA1 26d881b6ce969c19308698020b5a81c0f3430850 SHA256 237124695db330ef46dc6a57f6fb4071dc0e12076aba946ff6b2733e653ac722
-EBUILD mod_caucho-3.2.1.ebuild 1302 RMD160 4dfa5884e366280e69b5e246a7bdaf1a88714d1f SHA1 3d16231a55a5867b591932804428257a5cc827f0 SHA256 03f2b89d382862acd24401ddc59abf03d2f02fc57879fa29e483198e34c4e2c5
-MISC ChangeLog 8828 RMD160 d24b1db096fc31d44a7aa7550620c004701e0dc9 SHA1 1ebf49c29039c4938abc50b8d682d8b5ea23a9cb SHA256 7bd637b164d93c0933550a830c7d5614a26919691bfc9f1094ae4767b33ef19f
+EBUILD mod_caucho-3.0.25.ebuild 1079 RMD160 ba90d961b1e8806220f090c61182105c68240d38 SHA1 ee72cfae749e28859f978bd71138fd3a53bb34c5 SHA256 ab800ce3e6ed97f972f38e6a965b47158c1e350bc4176d290586186bfabe9a42
+EBUILD mod_caucho-3.1.8.ebuild 1140 RMD160 0b660ef836410b3917a4e1961027ff8a036e36bc SHA1 582392cd91e2db73936fa3f00f36aa6ad58e9265 SHA256 2b5bb22c107989ba430283dfbd851ebcb901c86a2d5d7eb85a2495d97a1a3e12
+EBUILD mod_caucho-3.2.1.ebuild 1080 RMD160 440b44cc8e98252a2b2b44292f69de39c9b8c434 SHA1 f6572cf9d5c932d4a2f2cb433726defcaebd2861 SHA256 1c3f8c5aac5a1d25a0eb23d05c60ee489a7607c63acbcf9a254c19b10e77c281
+MISC ChangeLog 9023 RMD160 3864aab726b5f0375b713b7bc474c09d828822af SHA1 f75ff823952faeb7c7588c6128e7e8fa2134a5e8 SHA256 4d559a65f84f4bb5a1030422548721b03ccd666f4d258edb1e573d2d32cb1c03
 MISC metadata.xml 245 RMD160 ab2afa1527b94d2776eb4cff88ab06b86f4da8d4 SHA1 e75506fde1ffe1aab92c624c3299957c9819fafe SHA256 2934a1d824233ffc25ba694782ed7386f899e39e3020cc5fa82f5a0e371b1957
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkp1nz4ACgkQkKaRLQcq0GIaBACeMLi2MWCRvkOHVxCXgka1v2/w
-4X0An2igDyWU/2H39mt6h0aiT/EEMVrG
-=MOfX
------END PGP SIGNATURE-----
diff --git a/www-apache/mod_caucho/files/88_mod_caucho.conf b/www-apache/mod_caucho/files/88_mod_caucho.conf
index 079791061ccc..20e0e7081136 100644
--- a/www-apache/mod_caucho/files/88_mod_caucho.conf
+++ b/www-apache/mod_caucho/files/88_mod_caucho.conf
@@ -1,25 +1,21 @@
-#
-# mod_caucho Resin Configuration
-#
-
 <IfDefine CAUCHO>
+# Load module:
+LoadModule caucho_module modules/mod_caucho.so
 
-	# Load module:
-	LoadModule caucho_module modules/mod_caucho.so
-
-	# Define first Resin server:
-	ResinConfigServer localhost 6802
+# Define first Resin server:
+ResinConfigServer localhost 6802
 
-	# If you want to use load balancing add more hosts:
-	# ResinConfigServer host1.example.com 6802
-	# ResinConfigServer host2.example.com 6802
+# If you want to use load balancing add more hosts:
+# ResinConfigServer host1.example.com 6802
+# ResinConfigServer host2.example.com 6802
 
-	# This enables status page of server: http://localhost/caucho-status
-	CauchoStatus yes
-
-	# To use this module:
-	#<Location /webapp/*>
-	#	SetHandler caucho-request
-	#</Location>
+# This enables status page of server: http://localhost/caucho-status
+CauchoStatus yes
 
+# To use this module:
+#<Location /webapp/*>
+#	SetHandler caucho-request
+#</Location>
 </IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_caucho/mod_caucho-3.0.25.ebuild b/www-apache/mod_caucho/mod_caucho-3.0.25.ebuild
index 73b6844e73a3..ae638bb598b9 100644
--- a/www-apache/mod_caucho/mod_caucho-3.0.25.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-3.0.25.ebuild
@@ -1,52 +1,47 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.25.ebuild,v 1.5 2008/05/11 16:54:04 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.25.ebuild,v 1.6 2009/09/18 12:52:19 hollow Exp $
 
-inherit eutils apache-module autotools
+EAPI="2"
 
-KEYWORDS="amd64 ppc ppc64 x86"
+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
 
-DEPEND="${DEPEND}
-	app-arch/unzip"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	for i in "${WORKDIR}"/${PV}/mod_caucho-*; do
 		epatch "${i}"
 	done
+
 	eautoreconf
 	chmod 755 ./configure
 }
 
-src_compile() {
+src_configure() {
 	econf --with-apxs=${APXS} || die "econf failed"
-
-	emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed"
 }
 
-src_install() {
-	cd "${S}/modules/c/src/apache2"
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	insinto "${APACHE_MODULES_CONFDIR}"
-	doins "${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
-	|| die "internal ebuild error: ${APACHE2_MOD_CONF} not found."
+src_compile() {
+	emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed"
 }
diff --git a/www-apache/mod_caucho/mod_caucho-3.1.8.ebuild b/www-apache/mod_caucho/mod_caucho-3.1.8.ebuild
index c35714ba7243..9237c051e7a4 100644
--- a/www-apache/mod_caucho/mod_caucho-3.1.8.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-3.1.8.ebuild
@@ -1,20 +1,23 @@
 # Copyright 1999-2009 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.8.ebuild,v 1.1 2009/01/10 15:14:13 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.8.ebuild,v 1.2 2009/09/18 12:52:19 hollow Exp $
 
-inherit eutils apache-module autotools
+EAPI="2"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+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="${DEPEND}
+	app-arch/unzip"
 RDEPEND=""
 
 S="${WORKDIR}/resin-${PV}"
@@ -22,18 +25,11 @@ 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
 
-DEPEND="${DEPEND}
-	app-arch/unzip"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd "${S}"
-
+src_prepare() {
 	for i in "${WORKDIR}"/${PV}/mod_caucho-*; do
 		epatch "${i}"
 	done
@@ -41,23 +37,12 @@ src_unpack() {
 
 	eautoreconf
 	chmod 755 ./configure
-
 }
 
-src_compile() {
-
+src_configure() {
 	econf --with-apxs=${APXS} || die "econf failed"
-	emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed"
-
 }
 
-src_install() {
-
-	cd "${S}/modules/c/src/apache2"
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	insinto "${APACHE_MODULES_CONFDIR}"
-	doins "${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
-		|| die "internal ebuild error: ${APACHE2_MOD_CONF}.conf not found."
-
+src_compile() {
+	emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed"
 }
diff --git a/www-apache/mod_caucho/mod_caucho-3.2.1.ebuild b/www-apache/mod_caucho/mod_caucho-3.2.1.ebuild
index f85bb8a3a9e4..a35dcc9b032e 100644
--- a/www-apache/mod_caucho/mod_caucho-3.2.1.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-3.2.1.ebuild
@@ -1,20 +1,23 @@
 # Copyright 1999-2009 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.2.1.ebuild,v 1.3 2009/08/02 14:13:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.2.1.ebuild,v 1.4 2009/09/18 12:52:19 hollow Exp $
 
-inherit eutils apache-module autotools
+EAPI="2"
 
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+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="${DEPEND}
+	app-arch/unzip"
 RDEPEND=""
 
 S="${WORKDIR}/resin-${PV}"
@@ -22,41 +25,23 @@ 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
 
-DEPEND="${DEPEND}
-	app-arch/unzip"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd "${S}"
-
+src_prepare() {
 	for i in "${WORKDIR}"/${PV}/mod_caucho-*; do
 		epatch "${i}"
 	done
 
 	eautoreconf
 	chmod 755 ./configure
-
 }
 
-src_compile() {
-
+src_configure() {
 	econf --with-apxs=${APXS} || die "econf failed"
-	emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed"
-
 }
 
-src_install() {
-
-	cd "${S}/modules/c/src/apache2"
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	insinto "${APACHE_MODULES_CONFDIR}"
-	doins "${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
-		|| die "internal ebuild error: ${APACHE2_MOD_CONF}.conf not found."
-
+src_compile() {
+	emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed"
 }