[patch] subversion-1.3.2-r1.ebuild-apacheNo2.patch

subversion-1.3.2-r1.ebuild-apacheNo2.patch (text/plain), 1.61 KB, created by Marek Szuba on 2006-07-12 18:06:29 UTC

--- dev-util/subversion/subversion-1.3.2-r1.ebuild	2006-07-10 16:36:09.000000000 -0400
+++ dev-util/subversion/subversion-1.3.2-r1-apacheNo2.ebuild	2006-07-12 20:09:26.000000000 -0400
@@ -11,10 +11,10 @@
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 sparc ~x86 ~x86-fbsd"
-IUSE="apache2 berkdb python emacs perl java nls nowebdav zlib ruby"
+IUSE="apache berkdb python emacs perl java nls nowebdav zlib ruby"
 RESTRICT="test"
 
-COMMONDEPEND="apache2? ( ${APACHE2_DEPEND} )
+COMMONDEPEND="apache? ( ${APACHE2_DEPEND} )
 	>=dev-libs/apr-util-0.9.5
 	python? ( >=dev-lang/python-2.0 )
 	perl? ( >=dev-lang/perl-5.8.6-r6
@@ -84,8 +84,8 @@
 	local myconf
 	myconf="--with-apr=/usr --with-apr-util=/usr"
 
-	use apache2 && myconf="${myconf} --with-apxs=${APXS2}"
-	use apache2 || myconf="${myconf} --without-apxs"
+	use apache && myconf="${myconf} --with-apxs=${APXS2}"
+	use apache || myconf="${myconf} --without-apxs"
 
 	myconf="${myconf} $(use_enable java javahl)"
 #	use java && myconf="${myconf} $(use_with jikes)"
@@ -196,7 +196,7 @@
 	fi
 
 	# Install apache module config
-	if useq apache2; then
+	if useq apache; then
 		MOD="${APACHE2_MODULESDIR/${APACHE2_BASEDIR}\//}"
 		mkdir -p ${D}/${APACHE2_MODULES_CONFDIR}
 		cat <<EOF >${D}/${APACHE2_MODULES_CONFDIR}/47_mod_dav_svn.conf
@@ -310,7 +310,7 @@
 	einfo "         exec /usr/bin/svnserve \"\$@\""
 	einfo
 
-	if use apache2 >/dev/null; then
+	if use apache >/dev/null; then
 		einfo " - http-based server:"
 		einfo "   1. edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
 		einfo "   2. create an htpasswd file:"