Cleanup.

(Portage version: 2.1.2_rc4-r8)

5 files changed, 71 insertions, 66 deletions

diff --git a/www-apache/mod_mono/ChangeLog b/www-apache/mod_mono/ChangeLog
index 31054e603ac9..19005dd24b8c 100644
--- a/www-apache/mod_mono/ChangeLog
+++ b/www-apache/mod_mono/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/mod_mono
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/ChangeLog,v 1.29 2007/01/02 22:41:48 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/ChangeLog,v 1.30 2007/01/15 17:40:02 chtekk Exp $
+
+  15 Jan 2007; Luca Longinotti <chtekk@gentoo.org> metadata.xml,
+  mod_mono-1.1.13.5.ebuild, mod_mono-1.1.17-r1.ebuild,
+  mod_mono-1.2.1.ebuild:
+  Cleanup.
 
   02 Jan 2007; Jurek Bartuszek <jurek@gentoo.org> mod_mono-1.1.13.5.ebuild,
   mod_mono-1.1.17-r1.ebuild, mod_mono-1.2.1.ebuild:
diff --git a/www-apache/mod_mono/metadata.xml b/www-apache/mod_mono/metadata.xml
index 7b3cb8229079..d44573e1d406 100644
--- a/www-apache/mod_mono/metadata.xml
+++ b/www-apache/mod_mono/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>apache</herd>
-<herd>dotnet</herd>
-    <maintainer>
-        <email>ramereth@gentoo.org</email>
-        <name>Lance Albertson</name>
-    </maintainer>
-    <maintainer>
+	<herd>apache</herd>
+	<herd>dotnet</herd>
+	<maintainer>
+		<email>ramereth@gentoo.org</email>
+		<name>Lance Albertson</name>
+	</maintainer>
+	<maintainer>
 		<email>jurek@gentoo.org</email>
 		<name>Jurek Bartuszek</name>
 	</maintainer>
diff --git a/www-apache/mod_mono/mod_mono-1.1.13.5.ebuild b/www-apache/mod_mono/mod_mono-1.1.13.5.ebuild
index 7ef9e4d5d57a..a08d7130c411 100644
--- a/www-apache/mod_mono/mod_mono-1.1.13.5.ebuild
+++ b/www-apache/mod_mono/mod_mono-1.1.13.5.ebuild
@@ -1,29 +1,29 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-1.1.13.5.ebuild,v 1.3 2007/01/02 22:41:48 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-1.1.13.5.ebuild,v 1.4 2007/01/15 17:40:02 chtekk Exp $
 
 inherit apache-module eutils versionator
 
 MY_PV=$(get_version_component_range 1-3)
 
-DESCRIPTION="Apache module for Mono"
+KEYWORDS="~amd64 ~ppc x86"
+
+DESCRIPTION="Apache module for Mono."
 HOMEPAGE="http://www.go-mono.com/"
 SRC_URI="http://go-mono.com/sources/${PN}/${P}.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
 IUSE="debug"
-DEPEND=">=dev-dotnet/xsp-${MY_PV}
-		<dev-dotnet/xsp-1.1.17"
 
+DEPEND="=dev-dotnet/xsp-${MY_PV}*"
 RDEPEND="${DEPEND}"
 
-APACHE1_MOD_FILE="${S}/src/.libs/mod_mono.so"
-APACHE1_MOD_CONF="${MY_PV}/70_mod_mono"
+APACHE1_MOD_FILE="${S}/src/.libs/${PN}.so"
+APACHE1_MOD_CONF="${MY_PV}/70_${PN}"
 APACHE1_MOD_DEFINE="MONO"
 
-APACHE2_MOD_FILE="${S}/src/.libs/mod_mono.so"
-APACHE2_MOD_CONF="${MY_PV}/70_mod_mono"
+APACHE2_MOD_FILE="${S}/src/.libs/${PN}.so"
+APACHE2_MOD_CONF="${MY_PV}/70_${PN}"
 APACHE2_MOD_DEFINE="MONO"
 
 DOCFILES="AUTHORS ChangeLog COPYING INSTALL NEWS README"
@@ -31,29 +31,27 @@ DOCFILES="AUTHORS ChangeLog COPYING INSTALL NEWS README"
 need_apache
 
 pkg_setup() {
-
 	ewarn "Some users are experiencing problems with mod_mono, where mod-mono-server"
 	ewarn "will not start automatically, or requests will get a HTTP 500 application"
-	ewarn "error.  If you experience these problems, please report it on:"
+	ewarn "error. If you experience these problems, please report it on:"
 	ewarn
 	ewarn "http://bugs.gentoo.org/show_bug.cgi?id=77169"
 	ewarn
-	ewarn "with as much information as possible.  Thanks!"
+	ewarn "with as much information as possible. Thanks!"
 }
 
-
-
 src_compile() {
-	epatch ${FILESDIR}/${P}-configure-apr-config.patch
+	epatch "${FILESDIR}/${P}-configure-apr-config.patch"
 
-	conf="$(use_enable debug) \
-		  --disable-dependency-tracking"
-	econf ${conf} || die "econf failed"
+	econf \
+		$(use_enable debug) \
+		--disable-dependency-tracking \
+		|| die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	mv src/.libs/mod_mono.so{.0.0.0,}
+	mv -f "src/.libs/${PN}.so.0.0.0" "src/.libs/${PN}.so"
 	apache-module_src_install
 	doman man/mod_mono.8
 }
@@ -61,7 +59,7 @@ src_install() {
 pkg_postinst() {
 	apache-module_pkg_postinst
 
-	einfo "To enable mod_mono, add \"-D MONO\" to your apache's"
+	einfo "To enable mod_mono, add \"-D MONO\" to your Apache's"
 	einfo "conf.d configuration file. Additionally, to view sample"
 	einfo "ASP.NET applications, add \"-D MONO_DEMO\" too."
 }
diff --git a/www-apache/mod_mono/mod_mono-1.1.17-r1.ebuild b/www-apache/mod_mono/mod_mono-1.1.17-r1.ebuild
index 230a710a6a6b..6c57f4e579df 100644
--- a/www-apache/mod_mono/mod_mono-1.1.17-r1.ebuild
+++ b/www-apache/mod_mono/mod_mono-1.1.17-r1.ebuild
@@ -1,49 +1,50 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-1.1.17-r1.ebuild,v 1.2 2007/01/02 22:41:48 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-1.1.17-r1.ebuild,v 1.3 2007/01/15 17:40:02 chtekk Exp $
 
 inherit apache-module eutils
 
-DESCRIPTION="Apache module for Mono"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DESCRIPTION="Apache module for Mono."
 HOMEPAGE="http://www.go-mono.com/"
 SRC_URI="http://go-mono.com/sources/${PN}/${P}.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="debug aspnet2"
-DEPEND=">=dev-dotnet/xsp-1.1.17"
+IUSE="aspnet2 debug"
 
+DEPEND=">=dev-dotnet/xsp-${PV}"
 RDEPEND="${DEPEND}"
 
-APACHE1_MOD_FILE="${S}/src/.libs/mod_mono.so"
-APACHE1_MOD_CONF="${PV}/70_mod_mono"
+APACHE1_MOD_FILE="${S}/src/.libs/${PN}.so"
+APACHE1_MOD_CONF="${PV}/70_${PN}"
 APACHE1_MOD_DEFINE="MONO"
 
-APACHE2_MOD_FILE="${S}/src/.libs/mod_mono.so"
-APACHE2_MOD_CONF="${PV}/70_mod_mono"
+APACHE2_MOD_FILE="${S}/src/.libs/${PN}.so"
+APACHE2_MOD_CONF="${PV}/70_${PN}"
 APACHE2_MOD_DEFINE="MONO"
 
 DOCFILES="AUTHORS ChangeLog COPYING INSTALL NEWS README"
 
 need_apache
 
-src_unpack()
-{
+src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	use aspnet2 && epatch ${FILESDIR}/mono_auto_application_aspnet2.patch
+	use aspnet2 && epatch "${FILESDIR}/mono_auto_application_aspnet2.patch"
 }
 
 src_compile() {
-	conf="$(use_enable debug) \
-		  --disable-dependency-tracking"
-	econf ${conf} || die "econf failed"
+	econf \
+		$(use_enable debug) \
+		--disable-dependency-tracking \
+		|| die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	mv src/.libs/mod_mono.so{.0.0.0,}
+	mv -f "src/.libs/${PN}.so.0.0.0" "src/.libs/${PN}.so"
 	apache-module_src_install
 	doman man/mod_mono.8
 }
@@ -51,10 +52,10 @@ src_install() {
 pkg_postinst() {
 	apache-module_pkg_postinst
 
-	elog "To enable mod_mono, add \"-D MONO\" to your apache's"
+	elog "To enable mod_mono, add \"-D MONO\" to your Apache's"
 	elog "conf.d configuration file. Additionally, to view sample"
 	elog "ASP.NET applications, add \"-D MONO_DEMO\" too."
 	elog ""
 	elog "If you want mod_mono to handle AutoHosting requests using"
-	elog "ASP.NET 2.0 engine, enable the aspnet2 USE flag"
+	elog "ASP.NET 2.0 engine, enable the aspnet2 USE flag."
 }
diff --git a/www-apache/mod_mono/mod_mono-1.2.1.ebuild b/www-apache/mod_mono/mod_mono-1.2.1.ebuild
index 1835f1de10e0..671bc88dafca 100644
--- a/www-apache/mod_mono/mod_mono-1.2.1.ebuild
+++ b/www-apache/mod_mono/mod_mono-1.2.1.ebuild
@@ -1,49 +1,50 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-1.2.1.ebuild,v 1.2 2007/01/02 22:41:48 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-1.2.1.ebuild,v 1.3 2007/01/15 17:40:02 chtekk Exp $
 
 inherit apache-module eutils
 
-DESCRIPTION="Apache module for Mono"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DESCRIPTION="Apache module for Mono."
 HOMEPAGE="http://www.go-mono.com/"
 SRC_URI="http://go-mono.com/sources/${PN}/${P}.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="debug aspnet2"
-DEPEND=">=dev-dotnet/xsp-${PV}"
+IUSE="aspnet2 debug"
 
+DEPEND=">=dev-dotnet/xsp-${PV}"
 RDEPEND="${DEPEND}"
 
-APACHE1_MOD_FILE="${S}/src/.libs/mod_mono.so"
-APACHE1_MOD_CONF="${PV}/70_mod_mono"
+APACHE1_MOD_FILE="${S}/src/.libs/${PN}.so"
+APACHE1_MOD_CONF="${PV}/70_${PN}"
 APACHE1_MOD_DEFINE="MONO"
 
-APACHE2_MOD_FILE="${S}/src/.libs/mod_mono.so"
-APACHE2_MOD_CONF="${PV}/70_mod_mono"
+APACHE2_MOD_FILE="${S}/src/.libs/${PN}.so"
+APACHE2_MOD_CONF="${PV}/70_${PN}"
 APACHE2_MOD_DEFINE="MONO"
 
 DOCFILES="AUTHORS ChangeLog COPYING INSTALL NEWS README"
 
 need_apache
 
-src_unpack()
-{
+src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	use aspnet2 && epatch ${FILESDIR}/mono_auto_application_aspnet2.patch
+	use aspnet2 && epatch "${FILESDIR}/mono_auto_application_aspnet2.patch"
 }
 
 src_compile() {
-	conf="$(use_enable debug) \
-		  --disable-dependency-tracking"
-	econf ${conf} || die "econf failed"
+	econf \
+		$(use_enable debug) \
+		--disable-dependency-tracking \
+		|| die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	mv src/.libs/mod_mono.so{.0.0.0,}
+	mv -f "src/.libs/${PN}.so.0.0.0" "src/.libs/${PN}.so"
 	apache-module_src_install
 	doman man/mod_mono.8
 }
@@ -51,10 +52,10 @@ src_install() {
 pkg_postinst() {
 	apache-module_pkg_postinst
 
-	elog "To enable mod_mono, add \"-D MONO\" to your apache's"
+	elog "To enable mod_mono, add \"-D MONO\" to your Apache's"
 	elog "conf.d configuration file. Additionally, to view sample"
 	elog "ASP.NET applications, add \"-D MONO_DEMO\" too."
 	elog ""
 	elog "If you want mod_mono to handle AutoHosting requests using"
-	elog "ASP.NET 2.0 engine, enable the aspnet2 USE flag"
+	elog "ASP.NET 2.0 engine, enable the aspnet2 USE flag."
 }