diff options
| author |   Paul de Vrieze <pauldv@gentoo.org> | 2004-10-08 12:03:10 +0000 |
|---|---|---|
| committer | Paul de Vrieze <pauldv@gentoo.org> | 2004-10-08 12:03:10 +0000 |
| commit | 8c4fe69d6c62a01abfc7450e0b0cad6e4dddcf4e (patch) | |
| tree | 8394885a5fa577c6f792ef4bdd0d63f2e1c59c13 /dev-util | |
| parent | Fix javahl linking again (Manifest recommit) (diff) | |
| download | gentoo-2-8c4fe69d6c62a01abfc7450e0b0cad6e4dddcf4e.tar.gz gentoo-2-8c4fe69d6c62a01abfc7450e0b0cad6e4dddcf4e.tar.bz2 gentoo-2-8c4fe69d6c62a01abfc7450e0b0cad6e4dddcf4e.zip | |
Fix a svn-revision.txt bug
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/subversion/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/subversion/Manifest | 6 | ||||
| -rw-r--r-- | dev-util/subversion/files/subversion-1.1.0-build.patch (renamed from dev-util/subversion/files/subversion-1.1.0-rc4-build.patch) | 15 | ||||
| -rw-r--r-- | dev-util/subversion/subversion-1.1.0.ebuild | 5 |
4 files changed, 13 insertions, 21 deletions
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index c2d1dada52ac..9de1b02ae01e 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -1,6 +1,12 @@ # 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.106 2004/10/08 11:47:23 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.107 2004/10/08 12:03:10 pauldv Exp $ + + 08 Oct 2004; <pauldv@gentoo.org> +files/subversion-1.1.0-build.patch, + -files/subversion-1.1.0-rc4-build.patch, subversion-1.1.0.ebuild: + The previous fix was not applied. Also fix bug #66644 by broadening the + sed script that hacks around the svnversion stuff (the output is + constant) 08 Oct 2004; <pauldv@gentoo.org> files/subversion-1.1.0-rc4-build.patch: Fix javahl linking (again) to fix bug #66625, this fix comes from rc2 diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest index 54bad59d4021..be669464c2eb 100644 --- a/dev-util/subversion/Manifest +++ b/dev-util/subversion/Manifest @@ -1,13 +1,13 @@ -MD5 7f149d7208be33b9ac213cb1d43259bc ChangeLog 18091 +MD5 f6e5b71a301f7c5426f73ce4bacd10e6 ChangeLog 18387 MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222 MD5 1b9acc042ae6c0b58071cf9ea8adc57a subversion-0.27.0.ebuild 7880 MD5 5cff2e6d2191553c86d931e5240ba23a subversion-0.32.1.ebuild 8136 MD5 4c7351dd78c5ddf1c3f49cb621d6efe9 subversion-1.0.8.ebuild 9721 -MD5 949ac57fd20973cb10d0fe938492b109 subversion-1.1.0.ebuild 8807 +MD5 72b3e5ca3d4b19328f3d594828add2c5 subversion-1.1.0.ebuild 8858 MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136 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 87d4c36172feaa28b4be6158906f3644 files/digest-subversion-1.0.8 70 MD5 257be4b439c371b285685b3be0e17568 files/digest-subversion-1.1.0 70 -MD5 d0a60a05e109758afcd4b486f66e8bab files/subversion-1.1.0-rc4-build.patch 1316 diff --git a/dev-util/subversion/files/subversion-1.1.0-rc4-build.patch b/dev-util/subversion/files/subversion-1.1.0-build.patch index 67be4eda7cad..5b5fe1554fe5 100644 --- a/dev-util/subversion/files/subversion-1.1.0-rc4-build.patch +++ b/dev-util/subversion/files/subversion-1.1.0-build.patch @@ -1,18 +1,3 @@ -diff -urN subversion-1.1.0-rc4.orig/configure.in subversion-1.1.0-rc4/configure.in ---- subversion-1.1.0-rc4.orig/configure.in 2004-09-22 23:07:59.000000000 +0200 -+++ subversion-1.1.0-rc4/configure.in 2004-09-23 20:40:14.650146368 +0200 -@@ -702,6 +702,11 @@ - SVN_CONFIG_SCRIPT(tools/hook-scripts/propchange-email.pl) - SVN_CONFIG_SCRIPT(subversion/bindings/swig/perl/native/Makefile.PL) - -+test -z "$SVN_DB_INCLUDES" && SVN_DB_INCLUDES=" -+AC_SUBST(SVN_DB_INCLUDES) -+test -z "$SVN_DB_LIBS" && SVN_DB_LIBS="" -+AC_SUBST(SVN_DB_LIBS) -+ - AC_OUTPUT - - --- subversion-1.1.0.orig/Makefile.in 2004-10-08 13:43:42.856109064 +0200 +++ subversion-1.1.0/Makefile.in 2004-10-08 13:44:05.290698488 +0200 @@ -178,7 +178,7 @@ diff --git a/dev-util/subversion/subversion-1.1.0.ebuild b/dev-util/subversion/subversion-1.1.0.ebuild index 02d0513fbd07..62679fa41a84 100644 --- a/dev-util/subversion/subversion-1.1.0.ebuild +++ b/dev-util/subversion/subversion-1.1.0.ebuild @@ -1,6 +1,6 @@ # 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.0.ebuild,v 1.1 2004/10/01 11:58:02 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.0.ebuild,v 1.2 2004/10/08 12:03:10 pauldv Exp $ inherit elisp-common libtool python eutils @@ -79,13 +79,14 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/subversion-db4.patch + epatch ${FILESDIR}/subversion-1.1.0-build.patch export WANT_AUTOCONF_2_5=1 elibtoolize autoconf (cd apr; autoconf) (cd apr-util; autoconf) - sed -i -e 's,\(subversion/svnversion/svnversion\)\(>.*svn-revision.txt\),echo "external" \2,' Makefile.in + sed -i -e 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo "exported" \2,' Makefile.in } src_compile() { |