New upstream version

(Portage version: 2.1_pre7-r4)

5 files changed, 405 insertions, 11 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 1de018e998bb..fe434d31cdbe 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.209 2006/03/30 23:49:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.210 2006/04/05 12:21:02 pauldv Exp $
+
+*subversion-1.3.1 (05 Apr 2006)
+
+  05 Apr 2006; <pauldv@gentoo.org>
+  +files/subversion-1.3.1-neon-config.patch, +subversion-1.3.1.ebuild:
+  New upstream version that resolves some issues.
 
   30 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   subversion-1.3.0.ebuild:
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 3821a72dea43..274b1c9244e4 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5db6f04c169fcde2786033037b7fad5c ChangeLog 35962
 RMD160 cd9ae89529fcdd25ac3897dc4f3684d4aca29600 ChangeLog 35962
 SHA256 23cdd6ab8fd143a3faa23e5a953e33c4b7248e6e4aaa3930e731fc3688a70398 ChangeLog 35962
@@ -22,9 +19,15 @@ SHA256 1bc32a0a7716e4158624d978e12872aeff5a87e77df8b552c8886178117dc709 files/di
 MD5 5c719104432bb659631f0d4e9e4cea00 files/digest-subversion-1.3.0 256
 RMD160 e123cbab5da8ffb0991b4708f0d15c471a7b4598 files/digest-subversion-1.3.0 256
 SHA256 9863f7eb663f54a7514becf00404015b67459e2af0baeedbb47afac4fa540571 files/digest-subversion-1.3.0 256
+MD5 ebd5c63debfadbc4c1556fc61b7e6156 files/digest-subversion-1.3.1 256
+RMD160 f91649eba78a1dc2c83bc9e12bbee734e71b113c files/digest-subversion-1.3.1 256
+SHA256 18e41e86ec820c4c45ae1edc935e7a490b45efaf2fb0febef5df59516058a74b files/digest-subversion-1.3.1 256
 MD5 b8146e2661f55257aef6d41e79897b63 files/subversion-1.1.1-perl-vendor.patch 713
 RMD160 fdc54d38c44c3e1273b654b3d1a2f4a76f91aec3 files/subversion-1.1.1-perl-vendor.patch 713
 SHA256 d7c5994fa66d77ec956b2e1ca1020fadcf1200bdd2acce974033e9839bb8f7c3 files/subversion-1.1.1-perl-vendor.patch 713
+MD5 c357b009b610db967d0df27d61cd3704 files/subversion-1.3.1-neon-config.patch 1237
+RMD160 ccf7449e030afe6ef6388c12157831d5f2d59d6b files/subversion-1.3.1-neon-config.patch 1237
+SHA256 6e0f152a8254b7e7c0b498ce011f1798d475b2acf18d779b4dfe0758de1f3049 files/subversion-1.3.1-neon-config.patch 1237
 MD5 ce6f3698724b55cf49e647727207cca5 files/subversion-db4.patch 563
 RMD160 36a0ae5ed2bdf2d9511865e3b4d1aeb228c55d6d files/subversion-db4.patch 563
 SHA256 7d84d8ec5beb7b30e6ee6e27afdbaa2bed9e4b9e5df45c572c543547b4317f5b files/subversion-db4.patch 563
@@ -67,10 +70,6 @@ SHA256 2a23c97f9b38bb55863b6eb753cf1c677759ca28d022de431339034080856340 subversi
 MD5 9d6f84d540f50aced2ea571c46975970 subversion-1.3.0.ebuild 11515
 RMD160 2eca0cc08a29594f7dac281ffdecc9306a8b5f60 subversion-1.3.0.ebuild 11515
 SHA256 5540cd1b4516b44bd093e68f6f4884e103fd9c893f0c49cb59128eadab6041ab subversion-1.3.0.ebuild 11515
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFELG65AiZjviIA2XgRAgBOAKCKysGEx4HrIe5CwMt7lfDK6ZECtQCfcfNE
-X0wI5u3WHdctSsEIa4bjYVU=
-=Wpyb
------END PGP SIGNATURE-----
+MD5 d906feabef8f1c52c6bc25f285ab20dd subversion-1.3.1.ebuild 11521
+RMD160 aa2ece70d471e6974fdd20c290a217e2f162e8f5 subversion-1.3.1.ebuild 11521
+SHA256 7ac31c729051302e0832bcc69231cc916c00f4ec32b3c16c48a75fe2794f3b6f subversion-1.3.1.ebuild 11521
diff --git a/dev-util/subversion/files/digest-subversion-1.3.1 b/dev-util/subversion/files/digest-subversion-1.3.1
new file mode 100644
index 000000000000..3017710ecdbb
--- /dev/null
+++ b/dev-util/subversion/files/digest-subversion-1.3.1
@@ -0,0 +1,3 @@
+MD5 07b95963968ae345541ca99d0e7bf082 subversion-1.3.1.tar.bz2 6796453
+RMD160 5a8ce81cdb76ad2a6faf9df22178f5458d3b5e6f subversion-1.3.1.tar.bz2 6796453
+SHA256 4f10334d72266815ff427eb25e0e574efcc684dcf01e0229b7d02f63b068d39d subversion-1.3.1.tar.bz2 6796453
diff --git a/dev-util/subversion/files/subversion-1.3.1-neon-config.patch b/dev-util/subversion/files/subversion-1.3.1-neon-config.patch
new file mode 100644
index 000000000000..b164729a1a2e
--- /dev/null
+++ b/dev-util/subversion/files/subversion-1.3.1-neon-config.patch
@@ -0,0 +1,35 @@
+--- subversion-1.3.0/build/ac-macros/neon.m4.orig	2006-02-27 16:13:32.000000000 +0100
++++ subversion-1.3.0/build/ac-macros/neon.m4	2006-02-27 16:19:34.000000000 +0100
+@@ -142,7 +142,7 @@
+       if test -z $svn_allowed_neon_on_system; then
+         echo "You have neon version $NEON_VERSION,"
+         echo "but Subversion needs neon $NEON_LATEST_WORKING_VER."
+-        SVN_DOWNLOAD_NEON()
++        SVN_DOWNLOAD_NEONFAIL()
+       fi
+ 
+     else
+@@ -177,3 +177,23 @@
+   AC_MSG_RESULT([no suitable neon found])
+   svn_lib_neon="no"
+ ])
++
++dnl SVN_DOWNLOAD_NEONFAIL()
++dnl no neon found, print out a message telling the user what to do
++AC_DEFUN(SVN_DOWNLOAD_NEONFAIL,
++[
++  echo ""
++  echo "An appropriate version of neon could not be found, so libsvn_ra_dav"
++  echo "will not be built.  If you want to build libsvn_ra_dav, please either"
++  echo "install neon ${NEON_LATEST_WORKING_VER} on this system"
++  echo ""
++  echo "or"
++  echo ""
++  echo "get neon ${NEON_LATEST_WORKING_VER} from:"
++  echo "    ${NEON_URL}"
++  echo "unpack the archive using tar/gunzip and rename the resulting"
++  echo "directory from ./neon-${NEON_LATEST_WORKING_VER}/ to ./neon/"
++  echo ""
++  AC_MSG_FAILURE([no suitable neon found])
++  svn_lib_neon="no"
++])
diff --git a/dev-util/subversion/subversion-1.3.1.ebuild b/dev-util/subversion/subversion-1.3.1.ebuild
new file mode 100644
index 000000000000..0f0bfe46021d
--- /dev/null
+++ b/dev-util/subversion/subversion-1.3.1.ebuild
@@ -0,0 +1,351 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.3.1.ebuild,v 1.1 2006/04/05 12:21:03 pauldv Exp $
+
+inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module
+
+DESCRIPTION="A compelling replacement for CVS"
+HOMEPAGE="http://subversion.tigris.org/"
+SRC_URI="http://subversion.tigris.org/downloads/${P/_rc/-rc}.tar.bz2"
+
+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"
+RESTRICT="test"
+
+COMMONDEPEND="apache2? ( ${APACHE2_DEPEND} )
+	>=dev-libs/apr-util-0.9.5
+	python? ( >=dev-lang/python-2.0 )
+	perl? ( >=dev-lang/perl-5.8.6-r6
+		!dev-perl/ExtUtils-MakeMaker
+		!=dev-lang/perl-5.8.7 )
+	ruby? ( >=dev-lang/ruby-1.8.2 )
+	!nowebdav? ( >=net-misc/neon-0.24.7 )
+	berkdb? ( =sys-libs/db-4* )
+	zlib? ( sys-libs/zlib )
+	java? ( virtual/jdk )
+	emacs? ( virtual/emacs )"
+RDEPEND="${COMMONDEPEND}
+	java? ( virtual/jre )"
+
+DEPEND="${COMMONDEPEND}
+	java? ( virtual/jdk )
+	>=sys-devel/autoconf-2.59"
+# Does not work because jikes is broken
+#	jikes? (dev-java/jikes)"
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+# Allow for custion repository locations.
+# This can't be in pkg_setup because the variable needs to be available to
+# pkg_config.
+: ${SVN_REPOS_LOC:=/var/svn}
+
+pkg_setup() {
+	if use berkdb && has_version '<dev-util/subversion-0.34.0' && [[ -z ${SVN_DUMPED} ]]; then
+		echo
+		ewarn "Presently you have $(best_version subversion)"
+		ewarn "Subversion has changed the repository filesystem schema from 0.34.0."
+		ewarn "So you MUST dump your repositories before upgrading."
+		ewarn
+		ewarn 'After doing so call emerge with SVN_DUMPED=1 emerge !*'
+		ewarn
+		ewarn "More details on dumping:"
+		ewarn "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
+		echo
+		die "Ensure that you dump your repository first"
+	fi
+}
+
+src_unpack() {
+	unpack $A
+	cd ${S}
+
+	epatch ${FILESDIR}/subversion-db4.patch
+	epatch ${FILESDIR}/subversion-1.1.1-perl-vendor.patch
+	epatch ${FILESDIR}/subversion-hotbackup-config.patch
+	epatch ${FILESDIR}/subversion-1.3.1-neon-config.patch
+
+	export WANT_AUTOCONF=2.5
+	autoconf
+	(cd apr; autoconf)
+	(cd apr-util; autoconf)
+	sed -i -e 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo "exported" \2,' Makefile.in
+
+	elibtoolize
+
+	use emacs && cp ${FILESDIR}/vc-svn.el ${S}/contrib/client-side/vc-svn.el
+}
+
+src_compile() {
+	local myconf
+	myconf="--with-apr=/usr --with-apr-util=/usr"
+
+	use apache2 && myconf="${myconf} --with-apxs=${APXS2}"
+	use apache2 || myconf="${myconf} --without-apxs"
+
+	myconf="${myconf} $(use_enable java javahl)"
+#	use java && myconf="${myconf} $(use_with jikes)"
+	use java && myconf="${myconf} --without-jikes"
+
+	if use python || use perl || use ruby; then
+		myconf="${myconf} --with-swig"
+	else
+		myconf="${myconf} --without-swig"
+	fi
+
+	if use nowebdav; then
+		myconf="${myconf} --without-neon"
+	else
+		myconf="${myconf} --with-neon=/usr"
+	fi
+
+	append-flags `/usr/bin/apr-config --cppflags`
+
+	econf ${myconf} \
+		$(use_with berkdb berkeley-db) \
+		$(use_with zlib) \
+		$(use_with python) \
+		$(use_enable nls) \
+		--with-apr=/usr \
+		--with-apr-util=/usr \
+		--disable-experimental-libtool \
+		--disable-mod-activation || die "econf failed"
+
+	# Respect the user LDFLAGS
+	export EXTRA_LDFLAGS="${LDFLAGS}"
+
+	# Build subversion, but do it in a way that is safe for parallel builds.
+	# 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 LT_LDFLAGS="-L${D}/usr/$(get_libdir)" 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
+
+	if use perl; then
+		# Work around a buggy Makefile.PL, bug 64634
+		mkdir -p subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc}
+		make swig-pl || die "Perl library building failed"
+	fi
+
+	if use ruby; then
+		make swig-rb || die "Ruby library building failed"
+	fi
+
+	if use java; then
+		# ensure that the destination dir exists, else some compilation fails
+		mkdir -p ${S}/subversion/bindings/java/javahl/classes
+		# Compile javahl
+		make JAVACFLAGS="-source 1.3 -encoding iso8859-1" javahl || die "Compilation failed"
+	fi
+
+	if use emacs; then
+		einfo "compiling emacs support"
+		elisp-compile ${S}/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
+		elisp-compile ${S}/contrib/client-side/vc-svn.el || die "emacs modules failed"
+	fi
+
+	# svn-config isn't quite built correctly; it contains references to
+	# @SVN_DB_LIBS@ and @SVN_DB_INCLUDES@.  It appears the best thing is to remove that.  #64634
+	sed -i 's/@SVN_DB_[^@]*@//g' svn-config || die "sed failed"
+}
+
+
+src_install () {
+	python_version
+	PYTHON_DIR=/usr/$(get_libdir)/python${PYVER}
+
+	make DESTDIR=${D} install || die "Installation of subversion failed"
+
+#	This might not be necessary with the new install
+#	if [[ -e ${D}/usr/$(get_libdir)/apache2 ]]; then
+#		if [ "${APACHE2_MODULESDIR}" != "/usr/$(get_libdir)/apache2/modules" ]; then
+#			mkdir -p ${D}/`dirname ${APACHE2_MODULESDIR}`
+#			mv ${D}/usr/$(get_libdir)/apache2/modules ${D}/${APACHE2_MODULESDIR}
+#			rmdir ${D}/usr/$(get_libdir)/apache2 2>/dev/null
+#		fi
+#	fi
+
+
+	dobin svn-config
+	if use python; then
+		make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D}  LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" || die "Installation of subversion python bindings failed"
+
+		# move python bindings
+		mkdir -p ${D}${PYTHON_DIR}/site-packages
+		mv ${D}/usr/$(get_libdir)/svn-python/svn ${D}${PYTHON_DIR}/site-packages
+		mv ${D}/usr/$(get_libdir)/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages
+		rmdir ${D}/usr/$(get_libdir)/svn-python
+	fi
+	if use perl; then
+		make DESTDIR=${D} install-swig-pl || die "Perl library building failed"
+		fixlocalpod
+	fi
+	if use ruby; then
+		make DESTDIR=${D} install-swig-rb || die "Installation of subversion ruby bindings failed"
+	fi
+	if use java; then
+		make DESTDIR="${D}" install-javahl || die "installation failed"
+	fi
+
+	# Install apache module config
+	if useq apache2; then
+		MOD="${APACHE2_MODULESDIR/${APACHE2_BASEDIR}\//}"
+		mkdir -p ${D}/${APACHE2_MODULES_CONFDIR}
+		cat <<EOF >${D}/${APACHE2_MODULES_CONFDIR}/47_mod_dav_svn.conf
+<IfDefine SVN>
+	<IfModule !mod_dav_svn.c>
+		LoadModule dav_svn_module	${MOD}/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	${MOD}/mod_authz_svn.so
+		</IfModule>
+	</IfDefine>
+</IfDefine>
+EOF
+	fi
+
+	# Bug 43179 - Install bash-completion if user wishes
+	dobashcompletion tools/client-side/bash_completion subversion
+
+	# Install hot backup script, bug 54304
+	newbin tools/backup/hot-backup.py svn-hot-backup
+
+	# The svn_load_dirs script is installed by Debian and looks like a good
+	# candidate for us to install as well
+	newbin contrib/client-side/svn_load_dirs.pl svn-load-dirs
+
+	# Install svnserve init-script and xinet.d snippet, bug 43245
+	exeinto /etc/init.d ; newexe ${FILESDIR}/svnserve.initd svnserve
+	insinto /etc/conf.d ; newins ${FILESDIR}/svnserve.confd svnserve
+	insinto /etc/xinetd.d ; newins ${FILESDIR}/svnserve.xinetd svnserve
+
+	# Install documentation
+
+	dodoc BUGS COMMITTERS COPYING HACKING INSTALL README
+	dodoc CHANGES
+	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
+	find contrib tools -name \*.in -print0 | xargs -0 rm -f
+	mkdir -p ${D}/usr/share/doc/${PF}/
+	cp -r tools/{client-side,examples,hook-scripts} ${D}/usr/share/doc/${PF}/
+	cp -r contrib/hook-scripts ${D}/usr/share/doc/${PF}/
+
+	docinto notes
+	for f in notes/*
+	do
+		[[ -f ${f} ]] && dodoc ${f}
+	done
+
+	# 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
+}
+
+src_test() {
+	ewarn "Testing does not work for subversion"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use perl && perl-module_pkg_postinst
+
+	einfo "Subversion Server Notes"
+	einfo "-----------------------"
+	einfo
+
+	einfo "If you intend to run a server, a repository needs to be created using"
+	einfo "svnadmin (see man svnadmin) or the following command to create it in"
+	einfo "/var/svn:"
+	einfo
+	einfo "    emerge --config =${CATEGORY}/${PF}"
+	einfo
+	einfo "If you upgraded from an older version of berkely db and experience"
+	einfo "problems with your repository then run the following commands as root:"
+	einfo "    db4_recover -h ${SVN_REPOS_LOC}/repos"
+	einfo "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
+	einfo
+	einfo "Subversion has multiple server types, take your pick:"
+	einfo
+	einfo " - svnserve daemon: "
+	einfo "   1. edit /etc/conf.d/svnserve"
+	einfo "   2. start daemon: /etc/init.d/svnserve start"
+	einfo "   3. make persistent: rc-update add svnserve default"
+	einfo
+	einfo " - svnserve via xinetd:"
+	einfo "   1. edit /etc/xinetd.d/svnserve (remove disable line)"
+	einfo "   2. restart xinetd.d: /etc/init.d/xinetd restart"
+	einfo
+	einfo " - svn over ssh:"
+	einfo "   1. Fix the repository permissions:"
+	einfo "        groupadd svnusers"
+	einfo "        chown -R root:svnusers /var/svn/repos/"
+	einfo "        chmod -R g-w /var/svn/repos"
+	einfo "        chmod -R g+rw /var/svn/repos/db"
+	einfo "        chmod -R g+rw /var/svn/repos/locks"
+	einfo "   2. create an svnserve wrapper in /usr/local/bin to set the umask you"
+	einfo "      want, for example:"
+	einfo "         #!/bin/bash"
+	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
+
+	einfo "If you intend to use svn-hot-backup, you can specify the number of"
+	einfo "backups to keep per repository by specifying an environment variable."
+	einfo "If you want to keep e.g. 2 backups, do the following:"
+	einfo "echo '# hot-backup: Keep that many repository backups around' > /etc/env.d/80subversion"
+	einfo "echo 'SVN_HOTBACKUP_NUM_BACKUPS=2' >> /etc/env.d/80subversion"
+	einfo ""
+}
+
+pkg_postrm() {
+	has_version virtual/emacs && elisp-site-regen
+	use perl && perl-module_pkg_postrm
+}
+
+pkg_config() {
+	if [[ ! -x /usr/bin/svnadmin ]]; then
+		die "You seem to only have built the subversion client"
+	fi
+
+	einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..."
+	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
+		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
+}