version bump

4 files changed, 109 insertions, 2 deletions

diff --git a/www-apache/mod_dav_svn/ChangeLog b/www-apache/mod_dav_svn/ChangeLog
index 1bc8797a362f..5941c6fcabce 100644
--- a/www-apache/mod_dav_svn/ChangeLog
+++ b/www-apache/mod_dav_svn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_dav_svn
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_dav_svn/ChangeLog,v 1.1 2005/01/10 23:02:53 trapni Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_dav_svn/ChangeLog,v 1.2 2005/01/10 23:26:44 trapni Exp $
+
+*mod_dav_svn-1.1.2 (11 Jan 2005)
+
+  11 Jan 2005; Christian Parpart <trapni@gentoo.org>
+  +mod_dav_svn-1.1.2.ebuild:
+  version bump
 
   13 Oct 2004; Christian Parpart <trapni@gentoo.org> :
   added <LimitExcept> for prividing auth-on-write-only;
diff --git a/www-apache/mod_dav_svn/Manifest b/www-apache/mod_dav_svn/Manifest
index fc2cd7b0dbab..ed4b9f1bdb6b 100644
--- a/www-apache/mod_dav_svn/Manifest
+++ b/www-apache/mod_dav_svn/Manifest
@@ -1,5 +1,7 @@
 MD5 076120dcb616242eb54dc09f25dd3fba metadata.xml 402
 MD5 28a09e2387d0c29077101630e57dc832 ChangeLog 520
 MD5 8575517f5dcdbd4057ca1422d1458ba0 mod_dav_svn-1.1.1.ebuild 2811
+MD5 f9ec5e1f9d9db2e162940b9533ca0fa8 mod_dav_svn-1.1.2.ebuild 2702
 MD5 53809180b5372b204b32db3962b409ba files/digest-mod_dav_svn-1.1.1 70
 MD5 cce30a16934a26c3f4b894c601cc41a7 files/47_mod_dav_svn.conf 1833
+MD5 fb33afd7667fd3807a4601565815135b files/digest-mod_dav_svn-1.1.2 70
diff --git a/www-apache/mod_dav_svn/files/digest-mod_dav_svn-1.1.2 b/www-apache/mod_dav_svn/files/digest-mod_dav_svn-1.1.2
new file mode 100644
index 000000000000..71c3244fb4f5
--- /dev/null
+++ b/www-apache/mod_dav_svn/files/digest-mod_dav_svn-1.1.2
@@ -0,0 +1 @@
+MD5 b93a792b6bc610dc6c1c254591979a8c subversion-1.1.2.tar.bz2 6779312
diff --git a/www-apache/mod_dav_svn/mod_dav_svn-1.1.2.ebuild b/www-apache/mod_dav_svn/mod_dav_svn-1.1.2.ebuild
new file mode 100644
index 000000000000..0d5ce65acbda
--- /dev/null
+++ b/www-apache/mod_dav_svn/mod_dav_svn-1.1.2.ebuild
@@ -0,0 +1,98 @@
+# 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.2.ebuild,v 1.1 2005/01/10 23:26:44 trapni Exp $
+
+# FIXME this ebuild acutally installes mod_dav_svn *and* mod_authz_svn... 
+# what about this? shall it be splitted up, too?
+
+inherit eutils depend.apache
+
+MY_P="${P/mod_dav_svn/subversion}"
+MY_P="${MY_P/_rc/-rc}"
+
+DESCRIPTION="The apache front end module for Subversion."
+SRC_URI="http://subversion.tigris.org/tarballs/${MY_P}.tar.bz2"
+HOMEPAGE="http://subversion.tigris.org/"
+
+SLOT="0"
+LICENSE="Apache-1.1"
+KEYWORDS="~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+SVN_REPOS_LOC="${SVN_REPOS_LOC:-/var/svn}"
+
+APACHE2_MOD_FILE="mod_dav_svn"
+APACHE2_MOD_CONF="47_${APACHE2_MOD_FILE}"
+APACHE2_MOD_DEFINE="SVN"
+
+DOCFILES=""
+
+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 ${S}
+	export WANT_AUTOCONF_2_5=1
+	autoconf
+	(cd apr; autoconf)
+	(cd apr-util; autoconf)
+	sed -i -e 's,\(subversion/svnversion/svnversion\)\(>.*svn-revision.txt\),echo "external" \2,' Makefile.in
+}
+
+src_compile() {
+	cd ${S}
+
+	econf \
+		`use_with ssl` \
+		--with-apxs=${APXS2} \
+		--with-apr=/usr \
+		--with-apr-util=/usr \
+		--with-neon=/usr \
+		--without-swig \
+		--without-python \
+		--disable-experimental-libtool \
+		--disable-mod-activation || die "configuration failed"
+
+	# build subversion, but do it in a way that is safe for paralel builds
+	# Also apparently the included apr does have 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 mod_{dav,authz}_svn ) || die
+}
+
+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"
+
+	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 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
+
+	insinto ${APACHE2_MODULES_CONFDIR}
+	doins ${APACHE2_MOD_CONF}.conf
+
+	einfo
+	einfo "Configuration file installed as ${APACHE2_MODULES_CONFDIR}/${APACHE2_MOD_CONF}.conf"
+	einfo "You may want to edit it before turning the module on in /etc/conf.d/apache2"
+	einfo
+}
+
+# vim:ts=4