Do some householding on the stuff from the apache redo team. They used an old ebuild and were too rigorous in removing apache dependencies

(Portage version: 2.0.51-r15)

3 files changed, 87 insertions, 23 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 7c772252c804..38e034d56bec 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.138 2005/01/22 04:36:34 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.139 2005/01/28 20:55:40 pauldv Exp $
+
+  28 Jan 2005; Paul de Vrieze <pauldv@gentoo.org>
+  -subversion-1.1.2-r1.ebuild:
+  Remove broken testing ebuild
+
+  28 Jan 2005; Paul de Vrieze <pauldv@gentoo.org>
+  subversion-1.1.3-r1.ebuild:
+  Redo the apr ebuild so that it is based upon the latest normal ebuild. Also 
+  this ebuild will actually build the apache2 module. The other ebuild should 
+  never have been put in cvs. Even masked. The removal of apache2 has been 
+  rather simplistic. The optional apache2 dependency is still there, it just 
+  isn't overloaded anymore.
 
 *subversion-1.1.3-r1 (22 Jan 2005)
 
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index b5a7733055bd..d3c22191e7cf 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,22 +1,22 @@
-MD5 ac68791a121da48d46e4fdd356cdd002 ChangeLog 23868
-MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222
-MD5 c342955038a5165af58910d6ee25d2ac subversion-1.0.9.ebuild 9522
 MD5 3713b9b909acd5351a192ebd3d08d7f3 subversion-1.1.1-r3.ebuild 10929
+MD5 713b3c0ad0eaeed4ad0a729e852e831a ChangeLog 24289
+MD5 c342955038a5165af58910d6ee25d2ac subversion-1.0.9.ebuild 9522
 MD5 5cefe998f4c8a4ed82c1b37a50f38fbd subversion-1.1.2.ebuild 11092
 MD5 c614c9b062c561a49eaf2317c9155007 subversion-1.1.2-r1.ebuild 8754
 MD5 6be5773bf908e3ddd51e4784732c7af0 subversion-1.1.3.ebuild 11044
-MD5 edbfa9006059f2b22ec16caddfc63952 subversion-1.1.3-r1.ebuild 8706
-MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136
-MD5 b355b623d5259b4b1ff75eead17fac0b files/digest-subversion-1.0.9 70
+MD5 b2693bbbe588fb7c046c4a235710889e subversion-1.1.3-r1.ebuild 10233
+MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222
 MD5 53809180b5372b204b32db3962b409ba files/digest-subversion-1.1.1-r3 70
-MD5 fb33afd7667fd3807a4601565815135b files/digest-subversion-1.1.2 70
+MD5 8de1f6e76dcb072171a09aaba2fd3b2b files/svnserve.confd 323
 MD5 062d550a01e930b20be035b5616cadbe files/subversion-1.1.0-build.patch 771
+MD5 fa7b69a910c49825166c9f1aa302eca7 files/svnserve.initd 686
+MD5 b355b623d5259b4b1ff75eead17fac0b files/digest-subversion-1.0.9 70
 MD5 b8146e2661f55257aef6d41e79897b63 files/subversion-1.1.1-perl-vendor.patch 713
-MD5 bfb75d87b1dc5be163d736a697bb2216 files/subversion-1.1.2-perl.patch 24982
+MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136
 MD5 ce6f3698724b55cf49e647727207cca5 files/subversion-db4.patch 563
-MD5 8de1f6e76dcb072171a09aaba2fd3b2b files/svnserve.confd 323
-MD5 fa7b69a910c49825166c9f1aa302eca7 files/svnserve.initd 686
 MD5 9f06ce72de714decff8fad3a674fb64d files/svnserve.xinetd 334
+MD5 fb33afd7667fd3807a4601565815135b files/digest-subversion-1.1.2 70
+MD5 bfb75d87b1dc5be163d736a697bb2216 files/subversion-1.1.2-perl.patch 24982
 MD5 fb33afd7667fd3807a4601565815135b files/digest-subversion-1.1.2-r1 70
 MD5 1c207179f5bf0b148528312cbc37632d files/digest-subversion-1.1.3 70
 MD5 1c207179f5bf0b148528312cbc37632d files/digest-subversion-1.1.3-r1 70
diff --git a/dev-util/subversion/subversion-1.1.3-r1.ebuild b/dev-util/subversion/subversion-1.1.3-r1.ebuild
index 3f9a236ae466..68776948cc0b 100644
--- a/dev-util/subversion/subversion-1.1.3-r1.ebuild
+++ b/dev-util/subversion/subversion-1.1.3-r1.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/dev-util/subversion/subversion-1.1.3-r1.ebuild,v 1.1 2005/01/22 04:36:34 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.3-r1.ebuild,v 1.2 2005/01/28 20:55:40 pauldv Exp $
 
 inherit elisp-common libtool python eutils bash-completion flag-o-matic
 
@@ -11,16 +11,16 @@ HOMEPAGE="http://subversion.tigris.org/"
 SLOT="0"
 LICENSE="Apache-1.1"
 KEYWORDS="~x86 ~sparc ~amd64 ~hppa ~ppc64"
-IUSE="ssl berkdb python emacs perl java"
+IUSE="ssl apache2 berkdb python emacs perl java"
 
 RESTRICT="maketest"
 
 S=${WORKDIR}/${P/_rc/-rc}
 
 # Presently subversion doesn't build with swig-1.3.22, bug 65424
-RDEPEND="python? ( =dev-lang/swig-1.3.21 >=dev-lang/python-2.0 )
-	dev-libs/apr
-	dev-libs/apr-util
+RDEPEND="apache2? ( >=net-www/apache-2.0.49 )
+	>=dev-libs/apr-util-0.9.5
+	python? ( =dev-lang/swig-1.3.21 >=dev-lang/python-2.0 )
 	perl? ( =dev-lang/swig-1.3.21 >=dev-lang/perl-5.8 )
 	>=net-misc/neon-0.24.7
 	berkdb? ( =sys-libs/db-4* )
@@ -30,7 +30,7 @@ RDEPEND="python? ( =dev-lang/swig-1.3.21 >=dev-lang/python-2.0 )
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.59"
 # Does not work because jikes is broken
-#      jikes? (dev-java/jikes)"
+#	jikes? (dev-java/jikes)"
 
 # Allow for custion repository locations.
 # This can't be in pkg_setup because the variable needs to be available to
@@ -74,6 +74,10 @@ src_unpack() {
 
 src_compile() {
 	local myconf
+	myconf="--with-apr=/usr --with-apr-util=/usr"
+
+	use apache2 && myconf="${myconf} --with-apxs=/usr/sbin/apxs2"
+	use apache2 || myconf="${myconf} --without-apxs"
 
 	myconf="${myconf} $(use_enable java javahl)"
 #	use java && myconf="${myconf} $(use_with jikes)"
@@ -88,12 +92,11 @@ src_compile() {
 	append-flags `/usr/bin/apr-config --cppflags`
 
 	econf ${myconf} \
-		--with-apr=/usr/bin/apr-config \
-		--with-apr-util=/usr/bin/apu-config \
-		--without-apxs \
 		$(use_with ssl) \
 		$(use_with berkdb berkeley-db) \
 		$(use_with python) \
+		--with-apr=/usr \
+		--with-apr-util=/usr \
 		--with-neon=/usr \
 		--disable-experimental-libtool \
 		--disable-mod-activation || die "econf failed"
@@ -102,9 +105,10 @@ src_compile() {
 	# Also apparently the included apr has a libtool that doesn't like -L flags.
 	# So not specifying it at all when not building apache modules and only
 	# specify it for internal parts otherwise.
-	( emake external-all && emake local-all ) || die "make of subversion failed"
+	( emake external-all && emake LT_LDFLAGS="-L${D}/usr/lib" local-all ) || die "make of subversion failed"
 
 	if use python; then
+		# Building fails without the apache apr-util as includes are wrong.
 		emake swig-py || die "subversion python bindings failed"
 	fi
 
@@ -134,10 +138,21 @@ src_compile() {
 
 
 src_install () {
+	use apache2 && mkdir -p ${D}/etc/apache2/conf
+
 	python_version
 	PYTHON_DIR=/usr/lib/python${PYVER}
 
 	make DESTDIR=${D} install || 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}/usr/lib/apache2-extramodules
+			rmdir ${D}/usr/lib/apache2
+		else
+			mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules
+		fi
+	fi
+
 
 	dobin svn-config
 	if use python; then
@@ -156,6 +171,31 @@ src_install () {
 		make DESTDIR="${D}" install-javahl || die "installation failed"
 	fi
 
+	# Install apache module config
+	if useq apache2; then
+		mkdir -p ${D}/etc/apache2/conf/modules.d
+		cat <<EOF >${D}/etc/apache2/conf/modules.d/47_mod_dav_svn.conf
+<IfDefine SVN>
+	<IfModule !mod_dav_svn.c>
+		LoadModule dav_svn_module	extramodules/mod_dav_svn.so
+	</IfModule>
+	<Location /svn/repos>
+		DAV svn
+		SVNPath ${SVN_REPOS_LOC}/repos
+		AuthType Basic
+		AuthName "Subversion repository"
+		AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers
+		Require valid-user
+	</Location>
+	<IfDefine SVN_AUTHZ>
+		<IfModule !mod_authz_svn.c>
+			LoadModule authz_svn_module	extramodules/mod_authz_svn.so
+		</IfModule>
+	</IfDefine>
+</IfDefine>
+EOF
+	fi
+
 	# Bug 43179 - Install bash-completion if user wishes
 	dobashcompletion tools/client-side/bash_completion subversion
 
@@ -171,7 +211,7 @@ src_install () {
 	insinto /etc/conf.d ; newins ${FILESDIR}/svnserve.confd svnserve
 	insinto /etc/xinetd.d ; newins ${FILESDIR}/svnserve.xinetd svnserve
 
-	# 
+	#
 	# Past here is all documentation and examples
 	#
 
@@ -205,6 +245,10 @@ src_install () {
 	fi
 }
 
+src_test() {
+	ewarn "Testing does not work for subversion"
+}
+
 pkg_postinst() {
 	use emacs >/dev/null && elisp-site-regen
 
@@ -241,6 +285,14 @@ pkg_postinst() {
 	einfo "         umask 002"
 	einfo "         exec /usr/bin/svnserve \"\$@\""
 	einfo
+
+	if use apache2 >/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:"
+		einfo "      htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
+		einfo
+	fi
 }
 
 pkg_postrm() {
@@ -253,7 +305,7 @@ pkg_config() {
 	fi
 
 	einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -f ${SVN_REPOS_LOC}/repos ]]; then
+	if [[ -e ${SVN_REPOS_LOC}/repos ]]; then
 		echo "A subversion repository already exists and I will not overwrite it."
 		echo "Delete ${SVN_REPOS_LOC}/repos first if you're sure you want to have a clean version."
 	else