New upstream version

3 files changed, 268 insertions, 3 deletions

diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 5c1e161922cb..9f5707a0278a 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,10 +1,9 @@
 MD5 360d05cfd37a1aa6a193562dc161e701 ChangeLog 6909
 MD5 f9ff39f6bfa10175352d543164009e78 subversion-0.28.0.ebuild 8033
 MD5 5beb0e419efb23ad3ddf0332fadb63ea subversion-0.27.0.ebuild 7887
-MD5 d331a24a3232f190294ad86693567a62 subversion-0.32.1.ebuild 8758
+MD5 8c67d6007ae1e2062eb25b33b2c27aa8 subversion-0.32.1.ebuild 8133
 MD5 08cce066639ea61a3d84f937e9c3ae00 subversion-0.30.0.ebuild 7572
 MD5 3e2b7510b9bd2c114db99887dd2a4f91 subversion-0.31.0.ebuild 8279
-MD5 d331a24a3232f190294ad86693567a62 subversion-0.31.0-r1.ebuild 8758
 MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222
 MD5 e232822bee0a8ed00f6b9d7805b83307 files/digest-subversion-0.27.0 132
 MD5 72aa5ab58a4d6274b6035ce3370e5c3f files/subversion-db4.patch 556
@@ -12,5 +11,4 @@ MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136
 MD5 c055aef559559580f75e60ede5051e79 files/digest-subversion-0.28.0 130
 MD5 c239e1be5d94572ff970508d3ac8f9b0 files/digest-subversion-0.30.0 135
 MD5 86365b02198a65328b2f189759d9e3d3 files/digest-subversion-0.31.0 132
-MD5 86365b02198a65328b2f189759d9e3d3 files/digest-subversion-0.31.0-r1 132
 MD5 69cf99186dd88a6b26c6c121fc4c16a9 files/digest-subversion-0.32.1 132
diff --git a/dev-util/subversion/files/digest-subversion-0.32.1 b/dev-util/subversion/files/digest-subversion-0.32.1
new file mode 100644
index 000000000000..39b03afe90ec
--- /dev/null
+++ b/dev-util/subversion/files/digest-subversion-0.32.1
@@ -0,0 +1,2 @@
+MD5 b06717a8ef50db4b5c4d380af00bd901 subversion-0.32.1.tar.gz 7234917
+MD5 6b13bf7122876fa7a93a6194bc21efd4 svnadmin-0.27.bz2 582304
diff --git a/dev-util/subversion/subversion-0.32.1.ebuild b/dev-util/subversion/subversion-0.32.1.ebuild
new file mode 100644
index 000000000000..1ccc2bb5bd39
--- /dev/null
+++ b/dev-util/subversion/subversion-0.32.1.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.32.1.ebuild,v 1.1 2003/10/29 14:29:06 pauldv Exp $
+
+inherit elisp-common libtool
+
+BACKUP_ADMIN="svnadmin-0.27"
+BACKUP_ADMIN_DIR="/usr/lib/subversion/bin"
+DESCRIPTION="A compelling replacement for CVS"
+SRC_URI="http://svn.collab.net/tarballs/${P}.tar.gz
+	mirror://gentoo/${BACKUP_ADMIN}.bz2"
+HOMEPAGE="http://subversion.tigris.org/"
+
+SLOT="0"
+LICENSE="Apache-1.1"
+KEYWORDS="~x86"
+IUSE="ssl apache2 berkdb python emacs"
+
+S=${WORKDIR}/${PN}-${PV}
+
+#Allow for custion repository locations
+if [ "${SVN_REPOS_LOC}x" = "x" ]; then
+	SVN_REPOS_LOC="/home/svn"
+fi
+
+#
+#
+# Note that to disable the server part of subversion you need to specify
+# USE="-berkdb" emerge subversion.
+#
+#
+
+DEPEND="python? ( >=dev-lang/python-2.0 )
+	apache2? ( >=net-www/apache-2.0.47 )
+	!apache2? ( !>=net-www/apache-2* )
+	!dev-libs/apr
+	python? ( >=dev-lang/swig-1.3.16 )
+	>=net-misc/neon-0.24.2
+	berkdb? ( =sys-libs/db-4* )"
+
+pkg_setup() {
+
+	if use apache2; then
+		einfo "The apache2 subversion module will be built, and libapr from the"
+		einfo "apache package will be used instead of the included"
+	else
+		einfo "Please note that subversion and apache2 cannot be installed"
+		einfo "simultaneously without specifying the apache2 use flag. This is"
+		einfo "because subversion installs its own libapr and libapr-util in that"
+		einfo "case."
+	fi
+	if has_version '<subversion-0.28.0'; then
+		einfo ""
+		ewarn ":  Now you have $(best_version subversion)"
+		ewarn " Subversion had chaged the repository filesystem schema from 0.28.0."
+		ewarn " So you MUST dump your repositories before upgrading."
+		einfo ""
+		einfo "More details:"
+		einfo "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
+		sleep 5
+	fi
+}
+
+src_unpack() {
+	cd ${WORKDIR}
+	unpack ${PN}-${PV}.tar.gz
+	cd ${S}
+
+	patch -p1 <${FILESDIR}/subversion-db4.patch
+	export WANT_AUTOCONF_2_5=1
+	elibtoolize
+	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() {
+	local myconf
+
+	cd ${S}
+	use ssl && myconf="${myconf} --with-ssl"
+	use ssl || myconf="${myconf} --without-ssl"
+
+	use apache2 && myconf="${myconf} --with-apxs=/usr/sbin/apxs2 \
+		--with-apr=/usr --with-apr-util=/usr"
+	use apache2 || myconf="${myconf} --without-apxs"
+
+	use berkdb && myconf="${myconf} --with-berkeley-db"
+	use berkdb || myconf="${myconf} --without-berkeley-db"
+
+	use python && myconf="${myconf} --with-python=/usr/bin/python --with-swig"
+	use python || myconf="${myconf} --without-python --without-swig"
+
+	econf ${myconf} \
+		--with-neon=/usr \
+		--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
+	if use apache2; then
+		( emake external-all && emake LT_LDFLAGS="-L${D}/usr/lib" local-all ) || die "make of subversion failed"
+	else
+		( emake external-all && emake local-all ) || die "make of subversion failed"
+	fi
+
+	#building fails without the apache apr-util as includes are wrong.
+	#Also the python bindings do not work without db installed
+	if use python; then
+		if use berkdb; then
+			if use apache2; then
+				emake swig-py || die "subversion python bindings failed"
+			else
+				emake SVN_APR_INCLUDES="-I${S}/apr/include -I${S}/apr-util/include" swig-py || die "subversion python bindings failed"
+			fi
+		fi
+	fi
+	if use emacs; then
+		emacs -batch -f batch-byte-compile contrib/client-side/vc-svn.el
+		emacs -batch -f batch-byte-compile contrib/client-side/psvn/psvn.el
+	fi
+}
+
+
+src_install () {
+	use apache2 && mkdir -p ${D}/etc/apache2/conf
+
+	make DESTDIR=${D} install || die "Installation of subversion failed"
+	if [ -e ${D}/usr/lib/apache2 ]; then
+		mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules
+	fi
+
+	if use python; then
+		if use berkdb; then
+			make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D}  LD_LIBRARY_PATH="-L${D}/usr/lib" || die "Installation of subversion python bindings failed"
+			# install cvs2svn
+			dobin tools/cvs2svn/cvs2svn.py
+			mv ${D}/usr/bin/cvs2svn.py ${D}/usr/bin/cvs2svn
+			doman tools/cvs2svn/cvs2svn.1
+
+			# move python bindings
+			mkdir -p ${D}/usr/lib/python2.2/site-packages
+			cp -r tools/cvs2svn/rcsparse ${D}/usr/lib/python2.2/site-packages
+			mv ${D}/usr/lib/svn-python/svn ${D}/usr/lib/python2.2/site-packages
+			mv ${D}/usr/lib/svn-python/libsvn ${D}/usr/lib/python2.2/site-packages
+			rmdir ${D}/usr/lib/svn-python
+		fi
+	fi
+
+	dodoc BUGS COMMITTERS COPYING HACKING INSTALL README
+	dodoc CHANGES
+	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
+
+	# install documentation
+	docinto notes
+	for f in notes/*
+	do
+		[ -f ${f} ] && dodoc ${f}
+	done
+	if use berkdb; then
+		mkdir -p ${D}/${BACKUP_ADMIN_DIR}
+		cp ${DISTDIR}/${BACKUP_ADMIN}.bz2 ${D}${BACKUP_ADMIN_DIR} ||die
+		bunzip2 ${D}${BACKUP_ADMIN_DIR}/${BACKUP_ADMIN}.bz2 ||die
+	fi
+
+	cd ${S}
+	echo "installing html book"
+	dohtml -r doc/book/book/book.html doc/book/book/styles.css doc/book/book/images
+
+	# install emacs lisps
+	if use emacs; then
+		insinto /usr/share/emacs/site-lisp/subversion
+		doins contrib/client-side/psvn/psvn.el*
+		doins  contrib/client-side/vc-svn.el*
+
+		elisp-site-file-install ${FILESDIR}/70svn-gentoo.el
+	fi
+
+
+
+	#Install apache module config
+	if use 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>
+EOF
+	fi
+}
+
+pkg_postinst() {
+
+	use emacs && elisp-site-regen
+	if use berkdb; then
+		if use apache2; then
+			einfo "Subversion has multiple server types. To enable the http based version"
+			einfo "you must edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
+			einfo ""
+		fi
+		einfo "A repository needs to be created using the ebuild ${PN} config command"
+		einfo ""
+		einfo "If you upgraded from an older version of berkely db and experience"
+		einfo "problems with your repository then run the following command:"
+		einfo "    su apache -c \"db4_recover -h /path/to/repos\""
+
+		if use apache2; then
+			einfo ""
+			einfo "To allow web access a htpasswd file needs to be created using the"
+			einfo "following command:"
+			einfo "   htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
+		fi
+
+		if [ -x ${BACKUP_ADMIN} ]; then
+			ewarn ""
+			ewarn "The subversion database format has been changed. For that reason the"
+			ewarn "old admin utility was kept, and can now be found at the following"
+			ewarn "location: ${BACKUP_ADMIN}"
+			ewarn ""
+			ewarn "For more information look at:"
+			ewarn "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
+		fi
+	else
+		einfo "Your subversion is client only as the server is only build when"
+		einfo "the berkdb flag is set"
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
+
+pkg_config() {
+	if [ ! -x /usr/bin/svnadmin ]; then
+		die "You seem to only have build the subversion client"
+	fi
+	einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..."
+	if [ -f ${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
+		mkdir -p ${SVN_REPOS_LOC}/conf
+		einfo ">>> Populating repository directory ..."
+		# create initial repository
+		/usr/bin/svnadmin create ${SVN_REPOS_LOC}/repos
+
+		einfo ">>> Setting repository permissions ..."
+		chown -Rf apache:apache ${SVN_REPOS_LOC}/repos
+		chmod -Rf 755 ${SVN_REPOS_LOC}/repos
+	fi
+}