From: Paul de Vrieze Date: Mon, 5 Jun 2006 10:59:40 +0000 (+0000) Subject: New version X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0739668454e2bfdf2d34379cc5e456c88cc5fed0;p=gentoo.git New version Package-Manager: portage-2.1_rc3-r5 --- diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index f303d4f45928..48b256705854 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -1,6 +1,11 @@ # 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.213 2006/06/04 11:58:03 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.214 2006/06/05 10:59:40 pauldv Exp $ + +*subversion-1.3.2 (05 Jun 2006) + + 05 Jun 2006; Paul de Vrieze +subversion-1.3.2.ebuild: + New upstream version 04 Jun 2006; Paul de Vrieze subversion-1.3.1.ebuild: Mark stable diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest index c537b27ddd7e..a9836ff5ce33 100644 --- a/dev-util/subversion/Manifest +++ b/dev-util/subversion/Manifest @@ -54,6 +54,7 @@ DIST subversion-1.1.3.tar.bz2 6793419 DIST subversion-1.2.3.tar.bz2 7238176 RMD160 46de1455fb61a5814b9d67bada10216e70ea6795 SHA1 513a217ba4a8045ea3daba5c3b0816f80ce0041b SHA256 af25cf282c9f5605148e223699fcf3e78f13bab70a3f9a3a8f4e626098ed1cd2 DIST subversion-1.3.0.tar.bz2 6811793 RMD160 da1d5a61e49c9337fc5d2ed31cf361b07a2d5f5c SHA1 0c5c4acfbd576da39cd60450f3e16b81c3d7c209 SHA256 c5837d2e7ee6ccfbe526b7dd624c2e09407160887707ed2c5fbe82b87109366d DIST subversion-1.3.1.tar.bz2 6796453 RMD160 5a8ce81cdb76ad2a6faf9df22178f5458d3b5e6f SHA1 f8d670a0ae931fca17192d02862aa93a229e5dda SHA256 4f10334d72266815ff427eb25e0e574efcc684dcf01e0229b7d02f63b068d39d +DIST subversion-1.3.2.tar.bz2 6834364 RMD160 dc9fbe683379ce25a62b91810eb5652ead19abcf SHA1 688ab178db1f6acb2ad3bd99f030402621f837b6 SHA256 805cb0ee894d2c219fe979dde98ccd56c06de6c3ca3986d87c80a2a2bcc08185 EBUILD subversion-1.1.3.ebuild 11455 RMD160 2521fe6571d2e2e66a641df5fc166abbcc6847c5 SHA1 ed8941a19bb08ee84efd0ffd2f44e82fc5190442 SHA256 6ed3f767be16219877c729108eab33c52d55e2b07fe382fa2ca851220934252e MD5 ca3a936739225f65768f983874af98fe subversion-1.1.3.ebuild 11455 RMD160 2521fe6571d2e2e66a641df5fc166abbcc6847c5 subversion-1.1.3.ebuild 11455 @@ -78,10 +79,14 @@ EBUILD subversion-1.3.1.ebuild 11616 RMD160 93335dbb15f9aade18960f40b54948cc5518 MD5 6ad3411bf99fed24fe722c6cf87b38ad subversion-1.3.1.ebuild 11616 RMD160 93335dbb15f9aade18960f40b54948cc55185c5d subversion-1.3.1.ebuild 11616 SHA256 1df029c9032b3950a7632fba18046122660a71207b504e0efbea56d4291d06af subversion-1.3.1.ebuild 11616 -MISC ChangeLog 36710 RMD160 fe80c2b39200049ac5fa9e082d204884ecaa04de SHA1 8be7040a27a7d54c4c7d152971c139c9ef813c14 SHA256 9e25bfb1a17f163f8a5567da2fc06e0087d2e62ee27eb95f8cb54e8d4fe9938e -MD5 86ca6b505a203b5c3155356a16a0c62b ChangeLog 36710 -RMD160 fe80c2b39200049ac5fa9e082d204884ecaa04de ChangeLog 36710 -SHA256 9e25bfb1a17f163f8a5567da2fc06e0087d2e62ee27eb95f8cb54e8d4fe9938e ChangeLog 36710 +EBUILD subversion-1.3.2.ebuild 11568 RMD160 a1428b6899ea79e770ba13a94d128a3c281e233e SHA1 ccaadeceb3335199ec3e282ee62d59a01c924936 SHA256 7d6f519d6f7e20ad65c81321e639a7cd0564ed00f981c24facc4ba685fa7b4b9 +MD5 6518efffad1b8fa11d9f1ab82f67731f subversion-1.3.2.ebuild 11568 +RMD160 a1428b6899ea79e770ba13a94d128a3c281e233e subversion-1.3.2.ebuild 11568 +SHA256 7d6f519d6f7e20ad65c81321e639a7cd0564ed00f981c24facc4ba685fa7b4b9 subversion-1.3.2.ebuild 11568 +MISC ChangeLog 36843 RMD160 b35545b107648228b27f0967bbd59e7d9bc923ad SHA1 a42a0375350d2f1ada8b06172f7faaa1fad4cadb SHA256 161098dc6971a813d3ab1da5d89af2383526c30e4957675f0a014a16b01e76c8 +MD5 00a746bf13ecc645d4ddfc6594b00821 ChangeLog 36843 +RMD160 b35545b107648228b27f0967bbd59e7d9bc923ad ChangeLog 36843 +SHA256 161098dc6971a813d3ab1da5d89af2383526c30e4957675f0a014a16b01e76c8 ChangeLog 36843 MISC metadata.xml 222 RMD160 b21e9d4420a67a847d490dc86a587e1d5f21fff0 SHA1 76e56ef0ec9c71b3032d1c501e358dd80fa1664b SHA256 4710a38e11b23d4355a7a0cba621d9680e2148aa173528491e88903487e93152 MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222 RMD160 b21e9d4420a67a847d490dc86a587e1d5f21fff0 metadata.xml 222 @@ -104,3 +109,6 @@ SHA256 9863f7eb663f54a7514becf00404015b67459e2af0baeedbb47afac4fa540571 files/di 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 f451fb992815e387265f7dd7afb3ddb6 files/digest-subversion-1.3.2 256 +RMD160 2f2fa8d1f158c558014773611365d6488f55ea09 files/digest-subversion-1.3.2 256 +SHA256 b77de6fcac8e868c91fb08f21a08d8e45e26d50f7efa510c9940722746b37cc5 files/digest-subversion-1.3.2 256 diff --git a/dev-util/subversion/files/digest-subversion-1.3.2 b/dev-util/subversion/files/digest-subversion-1.3.2 new file mode 100644 index 000000000000..3cbcc285bd36 --- /dev/null +++ b/dev-util/subversion/files/digest-subversion-1.3.2 @@ -0,0 +1,3 @@ +MD5 34aaac35a8326eba1c8076ee9e93fb6c subversion-1.3.2.tar.bz2 6834364 +RMD160 dc9fbe683379ce25a62b91810eb5652ead19abcf subversion-1.3.2.tar.bz2 6834364 +SHA256 805cb0ee894d2c219fe979dde98ccd56c06de6c3ca3986d87c80a2a2bcc08185 subversion-1.3.2.tar.bz2 6834364 diff --git a/dev-util/subversion/subversion-1.3.2.ebuild b/dev-util/subversion/subversion-1.3.2.ebuild new file mode 100644 index 000000000000..6089ce8c98ae --- /dev/null +++ b/dev-util/subversion/subversion-1.3.2.ebuild @@ -0,0 +1,352 @@ +# 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.2.ebuild,v 1.1 2006/06/05 10:59:40 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 '.*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 <${D}/${APACHE2_MODULES_CONFDIR}/47_mod_dav_svn.conf + + + LoadModule dav_svn_module ${MOD}/mod_dav_svn.so + + + DAV svn + SVNPath ${SVN_REPOS_LOC}/repos + AuthType Basic + AuthName "Subversion repository" + AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers + Require valid-user + + + + LoadModule authz_svn_module ${MOD}/mod_authz_svn.so + + + +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 +}