code cleanup

Package-Manager: portage-2.0.51-r14

3 files changed, 25 insertions, 27 deletions

diff --git a/www-apache/mod_dav_svn/ChangeLog b/www-apache/mod_dav_svn/ChangeLog
index a48ce3a36383..9844ba9e274c 100644
--- a/www-apache/mod_dav_svn/ChangeLog
+++ b/www-apache/mod_dav_svn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_dav_svn
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_dav_svn/ChangeLog,v 1.4 2005/01/23 07:42:17 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_dav_svn/ChangeLog,v 1.5 2005/01/24 02:59:02 trapni Exp $
+
+  24 Jan 2005; Christian Parpart <trapni@gentoo.org>
+  mod_dav_svn-1.1.3.ebuild:
+  code cleanup
 
   23 Jan 2005; Christian Parpart <trapni@gentoo.org>
   mod_dav_svn-1.1.3.ebuild:
diff --git a/www-apache/mod_dav_svn/Manifest b/www-apache/mod_dav_svn/Manifest
index 849282eee7cc..20a1119fc4ab 100644
--- a/www-apache/mod_dav_svn/Manifest
+++ b/www-apache/mod_dav_svn/Manifest
@@ -1,9 +1,9 @@
+MD5 0eeb1d66f8193763627faadef6813485 ChangeLog 990
 MD5 076120dcb616242eb54dc09f25dd3fba metadata.xml 402
-MD5 864b71f4d5021beece7ab2a585871a50 ChangeLog 893
 MD5 8575517f5dcdbd4057ca1422d1458ba0 mod_dav_svn-1.1.1.ebuild 2811
 MD5 1193ae3af9740bd93ce30c4f10f0d2de mod_dav_svn-1.1.2.ebuild 2811
-MD5 7890f2b400009fcac6296ce75083bb56 mod_dav_svn-1.1.3.ebuild 2818
-MD5 53809180b5372b204b32db3962b409ba files/digest-mod_dav_svn-1.1.1 70
+MD5 578cc112f2c77e5f9f10a2c780c37ebb mod_dav_svn-1.1.3.ebuild 2702
 MD5 cce30a16934a26c3f4b894c601cc41a7 files/47_mod_dav_svn.conf 1833
+MD5 53809180b5372b204b32db3962b409ba files/digest-mod_dav_svn-1.1.1 70
 MD5 fb33afd7667fd3807a4601565815135b files/digest-mod_dav_svn-1.1.2 70
 MD5 1c207179f5bf0b148528312cbc37632d files/digest-mod_dav_svn-1.1.3 70
diff --git a/www-apache/mod_dav_svn/mod_dav_svn-1.1.3.ebuild b/www-apache/mod_dav_svn/mod_dav_svn-1.1.3.ebuild
index 463311dd3b5a..153d4306d74b 100644
--- a/www-apache/mod_dav_svn/mod_dav_svn-1.1.3.ebuild
+++ b/www-apache/mod_dav_svn/mod_dav_svn-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_dav_svn/mod_dav_svn-1.1.3.ebuild,v 1.2 2005/01/23 07:42:18 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_dav_svn/mod_dav_svn-1.1.3.ebuild,v 1.3 2005/01/24 02:59:02 trapni Exp $
 
 # FIXME this ebuild acutally installes mod_dav_svn *and* mod_authz_svn... 
 # what about this? shall it be splitted up, too?
@@ -34,10 +34,10 @@ DEPEND=">=dev-util/subversion-1.1.0-r1"
 need_apache2
 
 src_unpack() {
-	cd ${WORKDIR}
-	unpack ${MY_P}.tar.bz2 || die "unpacking failed for some strange reason"
+	cd "${WORKDIR}"
+	unpack "${MY_P}.tar.bz2" || die "unpacking failed for some strange reason"
 
-	cd ${S}
+	cd "${S}"
 	export WANT_AUTOCONF_2_5=1
 	autoconf
 	(cd apr; autoconf)
@@ -46,14 +46,12 @@ src_unpack() {
 }
 
 src_compile() {
-	cd ${S}
-
 	econf \
 		`use_with ssl` \
-		--with-apxs=${APXS2} \
-		--with-apr=/usr \
-		--with-apr-util=/usr \
-		--with-neon=/usr \
+		--with-apxs="${APXS2}" \
+		--with-apr="/usr" \
+		--with-apr-util="/usr" \
+		--with-neon="/usr" \
 		--without-swig \
 		--without-python \
 		--disable-experimental-libtool \
@@ -68,26 +66,22 @@ src_compile() {
 
 src_install() {
 	# however, it shall only install the mod_dav_svn (FIXME: what about  mod_authz_svn?)
-	make DESTDIR=${D} install-mods-shared || die "Installation of subversion failed"
+	make DESTDIR="${D}" install-mods-shared || die "Installation of subversion failed"
 
-	if [ -e ${D}/usr/lib/apache2 ]; then
-		if has_version '>=net-www/apache-2.0.48-r2'; then
-			mv ${D}/usr/lib/apache2/modules ${D}/${APACHE2_MODULESDIR}
-			rmdir ${D}/usr/lib/apache2
-		else
-			mv ${D}/usr/lib/apache2 ${D}/${APACHE2_MODULESDIR}
-		fi
-	fi
+	# do some apache2 dir voodoo
+	mv ${D}/usr/lib/apache2/modules ${D}/${APACHE2_MODULESDIR}
+	rmdir ${D}/usr/lib/apache2
 
 	# do we need them? well, I guess they may be helpful for the enduser anyway
 	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
 
 	# install apache module config
-	sed -e "s:@SVN_REPOS_LOC@:${SVN_REPOS_LOC}:" ${FILESDIR}/${APACHE2_MOD_CONF}.conf \
-		> ${APACHE2_MOD_CONF}.conf
+	sed -e "s:@SVN_REPOS_LOC@:${SVN_REPOS_LOC}:" \
+		"${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
+		> "${APACHE2_MOD_CONF}.conf"
 
-	insinto ${APACHE2_MODULES_CONFDIR}
-	doins ${APACHE2_MOD_CONF}.conf
+	insinto "${APACHE2_MODULES_CONFDIR}"
+	doins "${APACHE2_MOD_CONF}.conf"
 
 	einfo
 	einfo "Configuration file installed as ${APACHE2_MODULES_CONFDIR}/${APACHE2_MOD_CONF}.conf"