Cleanup.

(Portage version: 2.1.2_rc4-r8)

5 files changed, 69 insertions, 84 deletions

diff --git a/www-apache/mod_caucho/ChangeLog b/www-apache/mod_caucho/ChangeLog
index 75348e8e578a..ec2e0ba06db4 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.7 2006/12/26 01:50:59 nelchael Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.8 2007/01/15 15:54:22 chtekk Exp $
+
+  15 Jan 2007; Luca Longinotti <chtekk@gentoo.org> metadata.xml,
+  mod_caucho-3.0.21.ebuild, mod_caucho-3.0.22.ebuild,
+  mod_caucho-3.1.0.ebuild:
+  Cleanup.
 
 *mod_caucho-3.1.0 (26 Dec 2006)
 
diff --git a/www-apache/mod_caucho/metadata.xml b/www-apache/mod_caucho/metadata.xml
index 39fffcd80808..e022a00fb5a9 100644
--- a/www-apache/mod_caucho/metadata.xml
+++ b/www-apache/mod_caucho/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
-  <maintainer>
-    <email>nelchael@gentoo.org</email>
-  </maintainer>
+	<herd>apache</herd>
+	<herd>java</herd>
+	<maintainer>
+		<email>nelchael@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apache/mod_caucho/mod_caucho-3.0.21.ebuild b/www-apache/mod_caucho/mod_caucho-3.0.21.ebuild
index e9a98be8deea..631d1e2cf15f 100644
--- a/www-apache/mod_caucho/mod_caucho-3.0.21.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-3.0.21.ebuild
@@ -1,17 +1,22 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.21.ebuild,v 1.2 2006/11/13 11:08:56 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.21.ebuild,v 1.3 2007/01/15 15:54:22 chtekk Exp $
 
-inherit apache-module autotools
+inherit eutils apache-module autotools
 
-DESCRIPTION="mod_caucho connects Resin and Apache2"
-HOMEPAGE="http://www.caucho.com"
+KEYWORDS="~amd64 x86"
+
+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"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/resin-${PV}"
 
 # See apache-module.eclass for more information.
 APACHE2_MOD_CONF="88_${PN}"
@@ -19,39 +24,27 @@ APACHE2_MOD_DEFINE="CAUCHO"
 
 need_apache2
 
-RDEPEND="${RDEPEND}"
-
-S="${WORKDIR}/resin-${PV}"
-
 src_unpack() {
-
-	unpack "${A}"
+	unpack ${A}
+	cd "${S}"
 
 	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."
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
 
+	insinto "${APACHE2_MODULES_CONFDIR}"
+	doins "${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
+	|| die "internal ebuild error: '${FILESDIR}/${APACHE2_MOD_CONF}.conf' not found."
 }
diff --git a/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild b/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild
index b9666439c852..04e9e1fe9d23 100644
--- a/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild
@@ -1,17 +1,22 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.22.ebuild,v 1.1 2006/11/19 12:24:10 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild,v 1.2 2007/01/15 15:54:22 chtekk Exp $
 
-inherit apache-module autotools
+inherit eutils apache-module autotools
 
-DESCRIPTION="mod_caucho connects Resin and Apache2"
-HOMEPAGE="http://www.caucho.com"
+KEYWORDS="~amd64 ~x86"
+
+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"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/resin-${PV}"
 
 # See apache-module.eclass for more information.
 APACHE2_MOD_CONF="88_${PN}"
@@ -19,39 +24,27 @@ APACHE2_MOD_DEFINE="CAUCHO"
 
 need_apache2
 
-RDEPEND="${RDEPEND}"
-
-S="${WORKDIR}/resin-${PV}"
-
 src_unpack() {
-
-	unpack "${A}"
+	unpack ${A}
+	cd "${S}"
 
 	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."
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
 
+	insinto "${APACHE2_MODULES_CONFDIR}"
+	doins "${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
+	|| die "internal ebuild error: '${FILESDIR}/${APACHE2_MOD_CONF}.conf' not found."
 }
diff --git a/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild b/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild
index 3ab656889868..f8a935c2ccd1 100644
--- a/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild
@@ -1,17 +1,22 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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 $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild,v 1.2 2007/01/15 15:54:22 chtekk Exp $
 
-inherit apache-module autotools
+inherit eutils apache-module autotools
 
-DESCRIPTION="mod_caucho connects Resin and Apache2"
-HOMEPAGE="http://www.caucho.com"
+KEYWORDS="~amd64 ~x86"
+
+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"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/resin-${PV}"
 
 # See apache-module.eclass for more information.
 APACHE2_MOD_CONF="88_${PN}"
@@ -19,39 +24,27 @@ APACHE2_MOD_DEFINE="CAUCHO"
 
 need_apache2
 
-RDEPEND="${RDEPEND}"
-
-S="${WORKDIR}/resin-${PV}"
-
 src_unpack() {
-
-	unpack "${A}"
+	unpack ${A}
+	cd "${S}"
 
 	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."
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
 
+	insinto "${APACHE2_MODULES_CONFDIR}"
+	doins "${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
+	|| die "internal ebuild error: '${FILESDIR}/${APACHE2_MOD_CONF}.conf' not found."
 }