From 43240c37fa6d9ab64af0e960c4983949ee99711d Mon Sep 17 00:00:00 2001
From: Luca Longinotti <chtekk@gentoo.org>
Date: Mon, 15 Jan 2007 17:40:02 +0000
Subject: [PATCH] Cleanup. Package-Manager: portage-2.1.2_rc4-r8

---
 www-apache/mod_mono/ChangeLog                 |  7 +++-
 www-apache/mod_mono/Manifest                  | 40 +++++++++----------
 www-apache/mod_mono/metadata.xml              | 14 +++----
 www-apache/mod_mono/mod_mono-1.1.13.5.ebuild  | 38 +++++++++---------
 www-apache/mod_mono/mod_mono-1.1.17-r1.ebuild | 39 +++++++++---------
 www-apache/mod_mono/mod_mono-1.2.1.ebuild     | 39 +++++++++---------
 6 files changed, 91 insertions(+), 86 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/Manifest b/www-apache/mod_mono/Manifest
index 49aa9859fc6e..4e71e16d0a2a 100644
--- a/www-apache/mod_mono/Manifest
+++ b/www-apache/mod_mono/Manifest
@@ -21,26 +21,26 @@ SHA256 166e09aae2ce8a44dbdb7793b6d02eaf610b76050f4cb7bec341ee6fcbf86393 files/mo
 DIST mod_mono-1.1.13.5.tar.gz 335683 RMD160 a37023ce18b09170aa6f05425041c0d36e772c25 SHA1 c6023ff400361206917d03bd723504b5bacece61 SHA256 91ada9c15770cbf8c7cb768f61382c07c624c484a4574c0c72a5455c1e3eeebb
 DIST mod_mono-1.1.17.tar.gz 334754 RMD160 0e567ea06deaa7255b63dd835e4be9549e5c1e35 SHA1 c042f45a97b23f18abb3473c044701e5d416873a SHA256 92dc2703c2d675529698e779d3d60afcfb5842a784da0bb0ddf573c0757a1144
 DIST mod_mono-1.2.1.tar.gz 335399 RMD160 2d19954cc0f3e349d9f025d277519395f243e8db SHA1 902f1904123816fd94304f92450fccc83509167a SHA256 078554a25ff0cf4b6196702b1b75ee341dd969a4a3ae34bb2f889f1b7542f646
-EBUILD mod_mono-1.1.13.5.ebuild 1805 RMD160 2c3d1fa05b23a9a4e4eb2c932f5bcd818a83c4a9 SHA1 16143aa228a628816964c5f79e612ed59d4c5146 SHA256 051f1e03b272f6ae69983632f5ba51397f446c423d82be28adcb265889a467a5
-MD5 f457d8f606f13ffb7fc2d335f746b8f9 mod_mono-1.1.13.5.ebuild 1805
-RMD160 2c3d1fa05b23a9a4e4eb2c932f5bcd818a83c4a9 mod_mono-1.1.13.5.ebuild 1805
-SHA256 051f1e03b272f6ae69983632f5ba51397f446c423d82be28adcb265889a467a5 mod_mono-1.1.13.5.ebuild 1805
-EBUILD mod_mono-1.1.17-r1.ebuild 1533 RMD160 5398ab72e0aa73ba21706aaa626f400df424bec5 SHA1 2e5a6205ba699614432e5128796da835a7cdf40c SHA256 afd8ec537e86ff88d9647a8f7c4fce1ea9ab8453fc4d5a0f2f896c858760103c
-MD5 7a03cee3161825bae9927c1c880ad8bb mod_mono-1.1.17-r1.ebuild 1533
-RMD160 5398ab72e0aa73ba21706aaa626f400df424bec5 mod_mono-1.1.17-r1.ebuild 1533
-SHA256 afd8ec537e86ff88d9647a8f7c4fce1ea9ab8453fc4d5a0f2f896c858760103c mod_mono-1.1.17-r1.ebuild 1533
-EBUILD mod_mono-1.2.1.ebuild 1528 RMD160 08a740dad07eb4e9baadbb8de43bda1ba38ce1b0 SHA1 7a0a0943c0d6b9caa29bdf43254030e3752d539a SHA256 e48045a216f1110a17df719b819d9eb1d4424e3f99805dfc6c670aa5163bc94e
-MD5 21810d1b0cb6f15ba5f274fd671f0848 mod_mono-1.2.1.ebuild 1528
-RMD160 08a740dad07eb4e9baadbb8de43bda1ba38ce1b0 mod_mono-1.2.1.ebuild 1528
-SHA256 e48045a216f1110a17df719b819d9eb1d4424e3f99805dfc6c670aa5163bc94e mod_mono-1.2.1.ebuild 1528
-MISC ChangeLog 7038 RMD160 903a89f43bf99c3e5a268dc184ad7bd4a73b7413 SHA1 6731d08aa61f80ce54c74dc41110fe29387c65cb SHA256 dba5cd7079981c73acfca4e975e4c347c9e3bdb49bd13a136d9254898020b485
-MD5 dfd0187e709eb8de7c4ab06f52d5dd18 ChangeLog 7038
-RMD160 903a89f43bf99c3e5a268dc184ad7bd4a73b7413 ChangeLog 7038
-SHA256 dba5cd7079981c73acfca4e975e4c347c9e3bdb49bd13a136d9254898020b485 ChangeLog 7038
-MISC metadata.xml 644 RMD160 ed7db36cf1436198919aadd15bbf52c69f821f7c SHA1 6840dc0a879baf3816edd92a29c404849bc4c21d SHA256 d66b1588ded70e801109646fe95939c3c158141155009054f84a179a835ff6e8
-MD5 68004dcec16c46ac5f4bb99c49e87277 metadata.xml 644
-RMD160 ed7db36cf1436198919aadd15bbf52c69f821f7c metadata.xml 644
-SHA256 d66b1588ded70e801109646fe95939c3c158141155009054f84a179a835ff6e8 metadata.xml 644
+EBUILD mod_mono-1.1.13.5.ebuild 1778 RMD160 420e2a5b01f0515cf20f62584a84eaafbc5b9309 SHA1 aefddef832c7775e1e44de2484f8be0808a08fc9 SHA256 fc34442814fc96e8912f8f0de1c7f2d0508f1a1826152a4222b0ca00cf0aeff4
+MD5 3046b4ad2deb4343f7d7717fca32b6a9 mod_mono-1.1.13.5.ebuild 1778
+RMD160 420e2a5b01f0515cf20f62584a84eaafbc5b9309 mod_mono-1.1.13.5.ebuild 1778
+SHA256 fc34442814fc96e8912f8f0de1c7f2d0508f1a1826152a4222b0ca00cf0aeff4 mod_mono-1.1.13.5.ebuild 1778
+EBUILD mod_mono-1.1.17-r1.ebuild 1538 RMD160 923293a54a017219d53b1a07b5efac43dc0c0cf4 SHA1 7da27344d1f80a834c3051bfa9562be41a73569d SHA256 a6acb07d53aa533b3571e6726f0653e84eb8c917e0b9e7f420364b4934dc91b3
+MD5 2e4b07947896e6293dcc7c2a377f31f5 mod_mono-1.1.17-r1.ebuild 1538
+RMD160 923293a54a017219d53b1a07b5efac43dc0c0cf4 mod_mono-1.1.17-r1.ebuild 1538
+SHA256 a6acb07d53aa533b3571e6726f0653e84eb8c917e0b9e7f420364b4934dc91b3 mod_mono-1.1.17-r1.ebuild 1538
+EBUILD mod_mono-1.2.1.ebuild 1534 RMD160 cd476162b070b52ff459ca8bcc4ce76cdf0a040a SHA1 0f6bd5cc897a302d185a69441979edb6aae91050 SHA256 ee8c69be6dedfc419d66df3044aaf5e8646b2abbf8bbb506559d8ef45e239f0c
+MD5 ea28a243d1cec77aa7a406684b1e6015 mod_mono-1.2.1.ebuild 1534
+RMD160 cd476162b070b52ff459ca8bcc4ce76cdf0a040a mod_mono-1.2.1.ebuild 1534
+SHA256 ee8c69be6dedfc419d66df3044aaf5e8646b2abbf8bbb506559d8ef45e239f0c mod_mono-1.2.1.ebuild 1534
+MISC ChangeLog 7196 RMD160 cc46c012d8bdf26775fa9621609c872c2c329e3b SHA1 5f4746d25720a5acd02462fbb602986c36aba7c0 SHA256 2914307b58e00f946634e2106191667a16dce5bf61305610349051e058b6a9cb
+MD5 5241c63754de3f80a41dce66d1484dcd ChangeLog 7196
+RMD160 cc46c012d8bdf26775fa9621609c872c2c329e3b ChangeLog 7196
+SHA256 2914307b58e00f946634e2106191667a16dce5bf61305610349051e058b6a9cb ChangeLog 7196
+MISC metadata.xml 625 RMD160 e8756fc1d98769d534bf16b2e7acb8cc63c4a1bc SHA1 a04b505f6a38c77422fbf3071ba4a3e33ec02bf4 SHA256 975786170c5bb9cd2095f1f8c00648059222baab844fadd2e67c5029d29f298f
+MD5 dc6afa01b4cf4cb70752aa89e70eb741 metadata.xml 625
+RMD160 e8756fc1d98769d534bf16b2e7acb8cc63c4a1bc metadata.xml 625
+SHA256 975786170c5bb9cd2095f1f8c00648059222baab844fadd2e67c5029d29f298f metadata.xml 625
 MD5 ff1fa8accfd1c2b1fcfeeaff2139310d files/digest-mod_mono-1.1.13.5 253
 RMD160 2601de689b05c016aa1832d828bf6fafcf79993f files/digest-mod_mono-1.1.13.5 253
 SHA256 0096aa0b9a779533cf39e59c36bef76032b4dc683fb69749aeba5c05229f1537 files/digest-mod_mono-1.1.13.5 253
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."
 }
-- 
2.26.2