Add new upstream version
authorPaul de Vrieze <pauldv@gentoo.org>
Sun, 7 Nov 2004 13:36:41 +0000 (13:36 +0000)
committerPaul de Vrieze <pauldv@gentoo.org>
Sun, 7 Nov 2004 13:36:41 +0000 (13:36 +0000)
dev-util/subversion/ChangeLog
dev-util/subversion/Manifest
dev-util/subversion/files/digest-subversion-1.1.1 [new file with mode: 0644]
dev-util/subversion/subversion-1.1.1.ebuild [new file with mode: 0644]

index 5112712043ef2764edeb97e75737cda38d249f41..c1e2afefa09f0a6dda5984d0f6ea3ff64b7bbd25 100644 (file)
@@ -1,10 +1,15 @@
 # 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.116 2004/11/05 21:25:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.117 2004/11/07 13:36:41 pauldv Exp $
 
   05 Nov 2004; Aron Griffis <agriffis@gentoo.org> subversion-1.0.9.ebuild:
   Remove attempted installation of cvs2svn #47099
 
+*subversion-1.1.1 (05 Nov 2004)
+
+  05 Nov 2004; <pauldv@gentoo.org> +subversion-1.1.1.ebuild:
+  New upstream version
+
   04 Nov 2004; Aron Griffis <agriffis@gentoo.org> subversion-1.0.9.ebuild,
   subversion-1.1.0.ebuild:
   add ia64 keywords
index d58e05062d07616143be255e005288f570d44091..99ff595bebc448684a2be512b55f2a121ab6a087 100644 (file)
@@ -1,15 +1,17 @@
-MD5 306adb95f02efe1978a74099d278bcb5 ChangeLog 19833
+MD5 a241aa80cc0ddd74293e1ebd7442379f ChangeLog 19949
 MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222
-MD5 ecd763525d0c57232e2a80efe9f29437 subversion-1.1.0.ebuild 9234
-MD5 76fbed9ef27746928125c0403de48f6c subversion-1.0.9.ebuild 9589
 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 76fbed9ef27746928125c0403de48f6c subversion-1.0.9.ebuild 9589
+MD5 23946afa80c04a1d40ff6a0b3f2f3ef4 subversion-1.1.1.ebuild 9218
 MD5 614fa934711031d1ecfb0b9fa3107d6b subversion-1.0.8.ebuild 9719
 MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136
-MD5 257be4b439c371b285685b3be0e17568 files/digest-subversion-1.1.0 70
-MD5 b355b623d5259b4b1ff75eead17fac0b files/digest-subversion-1.0.9 70
-MD5 69cf99186dd88a6b26c6c121fc4c16a9 files/digest-subversion-0.32.1 132
 MD5 e232822bee0a8ed00f6b9d7805b83307 files/digest-subversion-0.27.0 132
+MD5 69cf99186dd88a6b26c6c121fc4c16a9 files/digest-subversion-0.32.1 132
 MD5 ce6f3698724b55cf49e647727207cca5 files/subversion-db4.patch 563
 MD5 062d550a01e930b20be035b5616cadbe files/subversion-1.1.0-build.patch 771
+MD5 b355b623d5259b4b1ff75eead17fac0b files/digest-subversion-1.0.9 70
+MD5 53809180b5372b204b32db3962b409ba files/digest-subversion-1.1.1 70
 MD5 87d4c36172feaa28b4be6158906f3644 files/digest-subversion-1.0.8 70
+MD5 257be4b439c371b285685b3be0e17568 files/digest-subversion-1.1.0 70
diff --git a/dev-util/subversion/files/digest-subversion-1.1.1 b/dev-util/subversion/files/digest-subversion-1.1.1
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/subversion-1.1.1.ebuild b/dev-util/subversion/subversion-1.1.1.ebuild
new file mode 100644 (file)
index 0000000..f7fbe1e
--- /dev/null
@@ -0,0 +1,299 @@
+# 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.ebuild,v 1.1 2004/11/07 13:36:41 pauldv 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"
+IUSE="ssl apache2 berkdb python emacs perl java jikes"
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+#Allow for custion repository locations
+if [ "${SVN_REPOS_LOC}x" = "x" ]; then
+       SVN_REPOS_LOC="/var/svn"
+fi
+
+RDEPEND="python? ( >=dev-lang/python-2.0 )
+       apache2? ( >=net-www/apache-2.0.49 )
+       !apache2? ( !>=net-www/apache-2* )
+       !dev-libs/apr
+       python? ( || ( =dev-lang/swig-1.3.21
+                       =dev-lang/swig-1.3.19
+       ) )
+       perl? ( !python? ( || ( =dev-lang/swig-1.3.21
+                       =dev-lang/swig-1.3.19
+               ) )
+               >=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"
+
+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' && [ "${SVN_DUMPED}" == "" ]; then
+               einfo ""
+               ewarn ":  Now 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 !!"
+               einfo ""
+               einfo "More details on dumping:"
+               einfo "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
+               die "ensure that you dump your repository first"
+       fi
+
+       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. Specifying the apache2 useflag will also enable the building of"
+               einfo "the apache2 module."
+       fi
+}
+
+src_unpack() {
+       cd ${WORKDIR}
+       unpack ${P/_rc/-rc}.tar.bz2 || die "unpacking failed for some strange reason"
+       cd ${S}
+
+       epatch ${FILESDIR}/subversion-db4.patch
+       epatch ${FILESDIR}/subversion-1.1.0-build.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
+
+       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"
+       use python || myconf="${myconf} --without-python"
+
+       if use java; then
+               myconf="${myconf} --enable-javahl"
+               use jikes && myconf="${myconf} --with-jikes=yes"
+               use jikes || myconf="${myconf} --without-jikes"
+       else
+               myconf="${myconf} --disable-javahl"
+       fi
+
+       if use python || use perl; then
+               myconf="${myconf} --with-swig"
+       else
+               myconf="${myconf} --without-swig"
+       fi
+
+       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
+
+       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
+               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
+
+       cd ${S}
+       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 () {
+       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
+
+       dodoc BUGS COMMITTERS COPYING HACKING INSTALL README
+       dodoc CHANGES
+       dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
+       cp -r tools/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
+
+
+
+       #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
+}
+
+pkg_postinst() {
+
+       use emacs && elisp-site-regen
+       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 <path to ${PVR}.ebuild> config\" command"
+       einfo "or using svnadmin (see man svnadmin) if this subversion install is used as server"
+       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
+}
+
+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
+}