Install svn_load_dirs.pl as /usr/bin/svn-load-dirs #57715 Install more hook-scripts...
authorAron Griffis <agriffis@gentoo.org>
Fri, 12 Nov 2004 04:38:19 +0000 (04:38 +0000)
committerAron Griffis <agriffis@gentoo.org>
Fri, 12 Nov 2004 04:38:19 +0000 (04:38 +0000)
dev-util/subversion/ChangeLog
dev-util/subversion/Manifest
dev-util/subversion/files/digest-subversion-1.1.1-r1 [new file with mode: 0644]
dev-util/subversion/files/subversion-1.1.1-perl-vendor.patch [new file with mode: 0644]
dev-util/subversion/subversion-1.1.1-r1.ebuild [new file with mode: 0644]

index 9fb086da7cdcc0d19424da41f93afbda7539ccfa..25ee3eb35d4233b63ff64fc08f145f73a0317b31 100644 (file)
@@ -1,6 +1,19 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.118 2004/11/09 16:29:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.119 2004/11/12 04:38:19 agriffis Exp $
+
+*subversion-1.1.1-r1 (11 Nov 2004)
+
+  11 Nov 2004; Aron Griffis <agriffis@gentoo.org>
+  +subversion-1.1.1-r1.ebuild:
+  Install svn_load_dirs.pl as /usr/bin/svn-load-dirs #57715
+  Install more hook-scripts in /usr/share/doc #50593
+  Don't tell the user to su apache #53233
+  Install hot-backup.py as /usr/bin/svn-hot-backup #54304
+  Install bash-completion snippet #43179
+  Fix svn-config to omit references to @SVN_DB_*@ #64634
+  Fix perl bindings Makefile.PL bug #65230 #62979
+  Install perl bindings in vendor_perl instead of site_perl #66712
 
   09 Nov 2004; Aron Griffis <agriffis@gentoo.org> subversion-1.1.1.ebuild:
   Replace ~ppc64 and ~ia64 keywords which went missing
index 02b147a86a88184901f10fd4fdbb86e2eed4a694..85b095d20f790db1970f5f96bc3adbb5f2a535ab 100644 (file)
@@ -1,17 +1,20 @@
-MD5 d2723bb5a934ac1701a541bf745da310 ChangeLog 20082
-MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222
+MD5 ecd763525d0c57232e2a80efe9f29437 subversion-1.1.0.ebuild 9234
 MD5 1b9acc042ae6c0b58071cf9ea8adc57a subversion-0.27.0.ebuild 7880
 MD5 5cff2e6d2191553c86d931e5240ba23a subversion-0.32.1.ebuild 8136
-MD5 ecd763525d0c57232e2a80efe9f29437 subversion-1.1.0.ebuild 9234
+MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222
+MD5 614fa934711031d1ecfb0b9fa3107d6b subversion-1.0.8.ebuild 9719
 MD5 76fbed9ef27746928125c0403de48f6c subversion-1.0.9.ebuild 9589
 MD5 3c9b3b6e54fbc977d3c8157faf01f9b6 subversion-1.1.1.ebuild 9233
-MD5 614fa934711031d1ecfb0b9fa3107d6b subversion-1.0.8.ebuild 9719
-MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136
+MD5 188d3e52ec2f1216f9f2c70d697e58d2 subversion-1.1.1-r1.ebuild 10149
+MD5 331b219f53c36d65742136dbca893f79 ChangeLog 20628
+MD5 062d550a01e930b20be035b5616cadbe files/subversion-1.1.0-build.patch 771
+MD5 87d4c36172feaa28b4be6158906f3644 files/digest-subversion-1.0.8 70
+MD5 257be4b439c371b285685b3be0e17568 files/digest-subversion-1.1.0 70
 MD5 e232822bee0a8ed00f6b9d7805b83307 files/digest-subversion-0.27.0 132
 MD5 69cf99186dd88a6b26c6c121fc4c16a9 files/digest-subversion-0.32.1 132
-MD5 257be4b439c371b285685b3be0e17568 files/digest-subversion-1.1.0 70
-MD5 062d550a01e930b20be035b5616cadbe files/subversion-1.1.0-build.patch 771
+MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136
+MD5 ce6f3698724b55cf49e647727207cca5 files/subversion-db4.patch 563
 MD5 b355b623d5259b4b1ff75eead17fac0b files/digest-subversion-1.0.9 70
 MD5 53809180b5372b204b32db3962b409ba files/digest-subversion-1.1.1 70
-MD5 ce6f3698724b55cf49e647727207cca5 files/subversion-db4.patch 563
-MD5 87d4c36172feaa28b4be6158906f3644 files/digest-subversion-1.0.8 70
+MD5 53809180b5372b204b32db3962b409ba files/digest-subversion-1.1.1-r1 70
+MD5 b8146e2661f55257aef6d41e79897b63 files/subversion-1.1.1-perl-vendor.patch 713
diff --git a/dev-util/subversion/files/digest-subversion-1.1.1-r1 b/dev-util/subversion/files/digest-subversion-1.1.1-r1
new file mode 100644 (file)
index 0000000..1286320
--- /dev/null
@@ -0,0 +1 @@
+MD5 a180c3fe91680389c210c99def54d9e0 subversion-1.1.1.tar.bz2 6768086
diff --git a/dev-util/subversion/files/subversion-1.1.1-perl-vendor.patch b/dev-util/subversion/files/subversion-1.1.1-perl-vendor.patch
new file mode 100644 (file)
index 0000000..5da7451
--- /dev/null
@@ -0,0 +1,16 @@
+This patch fixes bug 66712 by installing the perl bindings in vendor
+instead of site.  The INSTALLDIRS bit is stolen from perl-module.eclass
+
+11 Nov 2004 agriffis
+
+--- subversion-1.1.1/Makefile.in.vendor        2004-11-11 23:20:10.000000000 -0500
++++ subversion-1.1.1/Makefile.in       2004-11-11 23:21:42.815937984 -0500
+@@ -571,7 +571,7 @@
+         done
+ 
+ $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
+-      cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
++      cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL INSTALLDIRS=vendor
+ 
+ swig-pl_DEPS = libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_ra libsvn_repos libsvn_subr libsvn_wc libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile
+ swig-pl: $(swig-pl_DEPS)
diff --git a/dev-util/subversion/subversion-1.1.1-r1.ebuild b/dev-util/subversion/subversion-1.1.1-r1.ebuild
new file mode 100644 (file)
index 0000000..60b8dea
--- /dev/null
@@ -0,0 +1,315 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.1-r1.ebuild,v 1.1 2004/11/12 04:38:19 agriffis Exp $
+
+inherit elisp-common libtool python eutils
+
+DESCRIPTION="A compelling replacement for CVS"
+SRC_URI="http://subversion.tigris.org/tarballs/${P/_rc/-rc}.tar.bz2"
+HOMEPAGE="http://subversion.tigris.org/"
+
+SLOT="0"
+LICENSE="Apache-1.1"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~alpha ~hppa ~ppc64 ~ia64"
+IUSE="ssl apache2 berkdb python emacs perl java jikes"
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+# Presently subversion doesn't build with swig-1.3.22, bug 65424
+RDEPEND="apache2? ( >=net-www/apache-2.0.49 )
+       !apache2? ( !>=net-www/apache-2* )
+       !dev-libs/apr
+       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* )
+       java? ( virtual/jdk )
+       emacs? ( virtual/emacs )"
+
+DEPEND="${RDEPEND}
+       || ( >=sys-devel/autoconf-2.59 =sys-devel/autoconf-2.57* )
+       !=sys-devel/autoconf-2.58"
+
+# 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 has_version =sys-devel/autoconf-2.58*; then
+               die "Subversion WILL NOT BUILD with autoconf-2.58"
+       fi
+
+       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
+
+       if use apache2; then
+               echo
+               einfo "The apache2 subversion module will be built, and libapr from the"
+               einfo "apache package will be used instead of the included."
+               echo
+       else
+               echo
+               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. Specifying the apache2 useflag will also enable the building of"
+               einfo "the apache2 module."
+               echo
+       fi
+}
+
+src_unpack() {
+       unpack ${P/_rc/-rc}.tar.bz2
+       cd ${S}
+
+       epatch ${FILESDIR}/subversion-db4.patch
+       epatch ${FILESDIR}/subversion-1.1.0-build.patch
+       epatch ${FILESDIR}/subversion-1.1.1-perl-vendor.patch
+
+       export WANT_AUTOCONF=2.5
+       elibtoolize
+       autoconf
+       (cd apr; autoconf)
+       (cd apr-util; autoconf)
+       sed -i -e 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo "exported" \2,' Makefile.in
+}
+
+src_compile() {
+       local myconf
+
+       use apache2 && myconf="${myconf} --with-apxs=/usr/sbin/apxs2 \
+               --with-apr=/usr --with-apr-util=/usr"
+       use apache2 || myconf="${myconf} --without-apxs"
+
+       myconf="${myconf} $(use_enable java javahl)"
+       use java && myconf="${myconf} $(use_with jikes)"
+
+       if use python || use perl; then
+               myconf="${myconf} --with-swig"
+       else
+               myconf="${myconf} --without-swig"
+       fi
+
+       econf ${myconf} \
+               $(use_with ssl) \
+               $(use_with berkdb berkeley-db) \
+               $(use_with python) \
+               --with-neon=/usr \
+               --disable-experimental-libtool \
+               --disable-mod-activation || die "econf failed"
+
+       # 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.
+       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
+
+       if use python; then
+               # Building fails without the apache apr-util as includes are wrong.
+               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
+
+       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 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 () {
+       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
+               make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D}  LD_LIBRARY_PATH="-L${D}/usr/lib" || die "Installation of subversion python bindings failed"
+
+               # move python bindings
+               mkdir -p ${D}${PYTHON_DIR}/site-packages
+               mv ${D}/usr/lib/svn-python/svn ${D}${PYTHON_DIR}/site-packages
+               mv ${D}/usr/lib/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages
+               rmdir ${D}/usr/lib/svn-python
+       fi
+       if use perl; then
+               make DESTDIR=${D} install-swig-pl || die "Perl library building failed"
+       fi
+       if use java; then
+               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 !authz_svn_module.c>
+                       LoadModule authz_svn_module     extramodules/mod_authz_svn.so
+               </IfModule>
+       </IfDefine>
+</IfDefine>
+EOF
+       fi
+
+       # Install bash completion (until somebody complains, then move it to
+       # /usr/share/bash-completion and make people source it explicitly)
+       # Bug 43179
+       insinto /etc/bash_completion.d
+       newins 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
+
+       # 
+       # Past here is all documentation and examples
+       #
+
+       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
+       cp -r --parents tools/{client-side,examples,hook-scripts} ${D}/usr/share/doc/${PF}/
+       cp -r --parents contrib/hook-scripts ${D}/usr/share/doc/${PF}/
+
+       # Install documentation
+       docinto notes
+       for f in notes/*
+       do
+               [[ -f ${f} ]] && dodoc ${f}
+       done
+
+       # Install the book in it's own dir
+       docinto book
+       cd ${S}
+       echo "installing html book"
+       dohtml -r doc/book/book/svn-book.html doc/book/book/styles.css doc/book/book/images || die "Installing book failed"
+
+       # 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
+}
+
+pkg_postinst() {
+       use emacs && elisp-site-regen
+
+       einfo "Subversion Installation 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 "    ebuild /path/to/ebuild/${PF}.ebuild config"
+       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
+
+       if use apache2; then
+               einfo
+               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
+               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
+}
+
+pkg_postrm() {
+       has_version virtual/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
+}