New upstream version
authorPaul de Vrieze <pauldv@gentoo.org>
Thu, 22 Feb 2007 21:19:55 +0000 (21:19 +0000)
committerPaul de Vrieze <pauldv@gentoo.org>
Thu, 22 Feb 2007 21:19:55 +0000 (21:19 +0000)
Package-Manager: portage-2.1.2-r9

dev-util/subversion/Manifest
dev-util/subversion/files/digest-subversion-1.4.3 [new file with mode: 0644]
dev-util/subversion/subversion-1.4.3.ebuild [new file with mode: 0644]

index 01d7d64b8aac104f7ce4d37cb2edd1ab02902a5a..5de851c0883fd7cc15c89d3c4550928d60322486 100644 (file)
@@ -69,6 +69,7 @@ DIST subversion-1.3.1.tar.bz2 6796453 RMD160 5a8ce81cdb76ad2a6faf9df22178f5458d3
 DIST subversion-1.3.2.tar.bz2 6834364 RMD160 dc9fbe683379ce25a62b91810eb5652ead19abcf SHA1 688ab178db1f6acb2ad3bd99f030402621f837b6 SHA256 805cb0ee894d2c219fe979dde98ccd56c06de6c3ca3986d87c80a2a2bcc08185
 DIST subversion-1.4.0.tar.bz2 4709293 RMD160 18ba1f5678fe121ce6f685fc7edf546f113c46d2 SHA1 92671bba140e9b9e300b5ffb526c4a7c59aeb5b1 SHA256 6960ed42174be9c54853e8708cc91a7c8355b23c4c3921a6d7fe7947d50843e4
 DIST subversion-1.4.2.tar.bz2 4714508 RMD160 8c6f7e73fbc9caed8b6ac7af8361eb4aad6efe71 SHA1 349847a97ad790cb14ad15bfd7bfe5bc5a9c8837 SHA256 7fe21c880e2a7591740730185fc6b32faeae15e79ccd7a336cd41589536ec4e9
+DIST subversion-1.4.3.tar.bz2 4721031 RMD160 62b1ab174ae4aab39c1768d04a9e602fc08ca66d SHA1 7e740c469b61977b7b623642892470207ae64a50 SHA256 8260a2d3a67c5cebc100e7662f81679582c0f05a2a28260e235bdf051e72aee3
 EBUILD subversion-1.1.3.ebuild 11427 RMD160 958f605daa5e1a9b9fa9e8ff70812ab0e61d24d5 SHA1 4cbd9d92f45547412f75960d202672e31a5d26b4 SHA256 392e782e138556145f4b96dd6765ffbe6d5703439acd56310f06656931a0642c
 MD5 5492b14cd976c4b74652b69899f4b66b subversion-1.1.3.ebuild 11427
 RMD160 958f605daa5e1a9b9fa9e8ff70812ab0e61d24d5 subversion-1.1.3.ebuild 11427
@@ -113,6 +114,10 @@ EBUILD subversion-1.4.2.ebuild 11593 RMD160 4a6241387fac4a0efa0b769a3a988895c8ca
 MD5 b30f32478fe9a4840ad03497c4b1b5b9 subversion-1.4.2.ebuild 11593
 RMD160 4a6241387fac4a0efa0b769a3a988895c8ca4515 subversion-1.4.2.ebuild 11593
 SHA256 68a80a1bb89ce59a50a6af17e18486f9199dd8d9220de2a17aa1589dd4b1ee18 subversion-1.4.2.ebuild 11593
+EBUILD subversion-1.4.3.ebuild 11593 RMD160 3a9a5cfbbe79a154745382e799ee3e676bcd98f5 SHA1 42aa4547c5320e4e47710978a5a8a98c983fffc9 SHA256 5a1a5e5e5c3b1a4d03c5fb6a2b97fd158cf52b0a12b3761f2c21d28fb3f5aeed
+MD5 454c2d018b17fb5bb3a545c9ca6a8c8d subversion-1.4.3.ebuild 11593
+RMD160 3a9a5cfbbe79a154745382e799ee3e676bcd98f5 subversion-1.4.3.ebuild 11593
+SHA256 5a1a5e5e5c3b1a4d03c5fb6a2b97fd158cf52b0a12b3761f2c21d28fb3f5aeed subversion-1.4.3.ebuild 11593
 MISC ChangeLog 41771 RMD160 9af3d9ea2613a1277a5c3803f63bde5f48a94335 SHA1 51e29705d159bbc9ab443dab0a47af3b9f42d0b8 SHA256 7fc05b3cdbe30393b77747520ce2ee0e14e15910102d914d4b09196278af4ff7
 MD5 1a385e6ebd09e9305362ec602aaea1ef ChangeLog 41771
 RMD160 9af3d9ea2613a1277a5c3803f63bde5f48a94335 ChangeLog 41771
@@ -154,3 +159,6 @@ SHA256 bd7fb04b6ddb693ea64dbcaca64d1518705722da5a2a7bfb9bc22ccace19cd12 files/di
 MD5 783368cc0ffe58e31c4f6557a17db45b files/digest-subversion-1.4.2 256
 RMD160 242b7ae279b98b63ce6ad5d7d10e31a92e270416 files/digest-subversion-1.4.2 256
 SHA256 d9f968207d11d28aae086e2a818ddfec68a0f4848280c131e32342b9d98f495f files/digest-subversion-1.4.2 256
+MD5 dbe03357818a0675ab3ff9a0d6afa1fa files/digest-subversion-1.4.3 256
+RMD160 062f9c03c0ce5ec74e40294938f796e03d6fa41e files/digest-subversion-1.4.3 256
+SHA256 84e50e103dcf562174d9e6337847220a875b7607f73e8307fd60ac18aeb05e27 files/digest-subversion-1.4.3 256
diff --git a/dev-util/subversion/files/digest-subversion-1.4.3 b/dev-util/subversion/files/digest-subversion-1.4.3
new file mode 100644 (file)
index 0000000..8bec329
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 de0e792c9804c7bce397d267af5eb30d subversion-1.4.3.tar.bz2 4721031
+RMD160 62b1ab174ae4aab39c1768d04a9e602fc08ca66d subversion-1.4.3.tar.bz2 4721031
+SHA256 8260a2d3a67c5cebc100e7662f81679582c0f05a2a28260e235bdf051e72aee3 subversion-1.4.3.tar.bz2 4721031
diff --git a/dev-util/subversion/subversion-1.4.3.ebuild b/dev-util/subversion/subversion-1.4.3.ebuild
new file mode 100644 (file)
index 0000000..d058c6e
--- /dev/null
@@ -0,0 +1,355 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.3.ebuild,v 1.1 2007/02/22 21:19:55 pauldv Exp $
+
+inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2
+
+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 ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="apache2 berkdb python emacs perl java nls nowebdav ruby"
+RESTRICT="test"
+
+COMMONDEPEND="apache2? ( ${APACHE2_DEPEND} )
+       =dev-libs/apr-util-0*
+       python? ( >=dev-lang/python-2.0 )
+       perl? ( >=dev-lang/perl-5.8.6-r6
+               !=dev-lang/perl-5.8.7 )
+       ruby? ( >=dev-lang/ruby-1.8.2 )
+       !nowebdav? ( net-misc/neon )
+       berkdb? ( =sys-libs/db-4* )
+       java? ( >=virtual/jdk-1.4 )
+       emacs? ( virtual/emacs )"
+RDEPEND="${COMMONDEPEND}
+       java? ( >=virtual/jre-1.4 )"
+
+DEPEND="${COMMONDEPEND}
+       java? ( >=virtual/jdk-1.4 )
+       >=sys-devel/autoconf-2.59"
+
+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
+       java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+       unpack $A
+       cd ${S}
+
+       epatch ${FILESDIR}/subversion-1.4-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
+       epatch ${FILESDIR}/subversion-apr_cppflags.patch
+       # rapidsvn developers work with 1.3.2
+
+       export WANT_AUTOCONF=2.5
+       autoconf
+       sed -i -e 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo "exported" \2,' Makefile.in
+
+       elibtoolize
+}
+
+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} --without-jikes --with-jdk=${JAVA_HOME}"
+
+       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 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 JAVAC_FLAGS="$(java-pkg_javac-args) -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
+}
+
+
+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"
+               java-pkg_regso ${D}/usr/$(get_libdir)/libsvnjavahl*.so
+               java-pkg_dojar ${D}/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
+               rm -r ${D}/usr/$(get_libdir)/svn-javahl/*.jar
+       fi
+
+       # Install apache module config
+       if useq apache2; then
+               MOD=`echo "${APACHE2_MODULESDIR/${APACHE2_BASEDIR}\//}"|sed -e "s,^//*,,"`
+               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/xinetd.d ; newins ${FILESDIR}/svnserve.xinetd svnserve
+
+       insinto /etc/conf.d
+       if use apache2 >/dev/null; then
+               newins ${FILESDIR}/svnserve.confd svnserve
+       else
+               newins ${FILESDIR}/svnserve.confd2 svnserve
+       fi
+
+       # 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 ..."
+               if use apache2 >/dev/null; then
+                       chown -Rf apache:apache ${SVN_REPOS_LOC}/repos
+               else
+                       enewgroup svnusers
+                       enewuser svn -1 -1 /var/svn svnusers
+                       chown -Rf svn:svnusers ${SVN_REPOS_LOC}/repos
+               fi
+               chmod -Rf 755 ${SVN_REPOS_LOC}/repos
+       fi
+}