diff options
author | Paul de Vrieze <pauldv@gentoo.org> | 2006-04-18 07:56:43 +0000 |
---|---|---|
committer | Paul de Vrieze <pauldv@gentoo.org> | 2006-04-18 07:56:43 +0000 |
commit | 8f93b506d032edb05b8d783e939ff4f03809fe78 (patch) | |
tree | 6462303258d6efc6fc2de1494dd4a389cbefb543 | |
parent | initial commit - ebuild submitted by Cristiano Chiucchiolo via bug #130192 (diff) | |
download | historical-8f93b506d032edb05b8d783e939ff4f03809fe78.tar.gz historical-8f93b506d032edb05b8d783e939ff4f03809fe78.tar.bz2 historical-8f93b506d032edb05b8d783e939ff4f03809fe78.zip |
Enable building with new 0.9 apr version
Package-Manager: portage-2.1_pre7-r5
-rw-r--r-- | dev-util/subversion/ChangeLog | 7 | ||||
-rw-r--r-- | dev-util/subversion/Manifest | 15 | ||||
-rw-r--r-- | dev-util/subversion/files/subversion-apr-version.patch | 92 | ||||
-rw-r--r-- | dev-util/subversion/subversion-1.3.1.ebuild | 3 |
4 files changed, 109 insertions, 8 deletions
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index 9ed620368586..0b434e087b18 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.211 2006/04/17 19:19:34 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.212 2006/04/18 07:56:43 pauldv Exp $ + + 18 Apr 2006; Paul de Vrieze <pauldv@gentoo.org> + +files/subversion-apr-version.patch, subversion-1.3.1.ebuild: + Add a patch extracted from the subversion repository to enable newer apr + versions. Fixes bug #130306. 17 Apr 2006; Paul de Vrieze <pauldv@gentoo.org> +files/subversion-apr_cppflags.patch, subversion-1.3.1.ebuild: diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest index 5de414ab7629..175fe27e7f61 100644 --- a/dev-util/subversion/Manifest +++ b/dev-util/subversion/Manifest @@ -1,6 +1,6 @@ -MD5 0739193a2932659a0daf802230fde6f9 ChangeLog 36398 -RMD160 3e04c4de0bbb32182ac9f81e54150d43f8167dba ChangeLog 36398 -SHA256 e0b802b694908b666e8d6a884a84225ba944ee2484f2ea0f50eede80bca699fe ChangeLog 36398 +MD5 43886ae9829068ea89b7f80d11f674bd ChangeLog 36620 +RMD160 73a67544267152c15aae76d88d8f519d654ed647 ChangeLog 36620 +SHA256 6be352d4884c03d6ae4b021748b9fcf4344192d978a66a5aa3f0d80769dee6e6 ChangeLog 36620 MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136 RMD160 d130792953a0b14b78b9a54a982f0812428f0d5e files/70svn-gentoo.el 136 SHA256 85dc5461709d3cd28be3fbdaf0f02778f98bc9c970b50bcb00ca7658e88f3274 files/70svn-gentoo.el 136 @@ -28,6 +28,9 @@ SHA256 d7c5994fa66d77ec956b2e1ca1020fadcf1200bdd2acce974033e9839bb8f7c3 files/su MD5 c357b009b610db967d0df27d61cd3704 files/subversion-1.3.1-neon-config.patch 1237 RMD160 ccf7449e030afe6ef6388c12157831d5f2d59d6b files/subversion-1.3.1-neon-config.patch 1237 SHA256 6e0f152a8254b7e7c0b498ce011f1798d475b2acf18d779b4dfe0758de1f3049 files/subversion-1.3.1-neon-config.patch 1237 +MD5 25d9476112d0d6e3a4f7efc5be8d6a21 files/subversion-apr-version.patch 2867 +RMD160 cc34107d60f3e1df7cb926b87e0c9cda094bbc25 files/subversion-apr-version.patch 2867 +SHA256 3c466fa14da964999aceabd19ca5c64176cf563a0fca54498bc36c881e163601 files/subversion-apr-version.patch 2867 MD5 e7538c50c65c0ae5c7b0cfc7057f8620 files/subversion-apr_cppflags.patch 426 RMD160 245d52ce05da6652e5f5984f0e33aa51e534082a files/subversion-apr_cppflags.patch 426 SHA256 0d7e52ce90cc806270ccb5e3c2b700fdb6d251a17001b91f08de5beab66295e6 files/subversion-apr_cppflags.patch 426 @@ -73,6 +76,6 @@ SHA256 2a23c97f9b38bb55863b6eb753cf1c677759ca28d022de431339034080856340 subversi MD5 9d6f84d540f50aced2ea571c46975970 subversion-1.3.0.ebuild 11515 RMD160 2eca0cc08a29594f7dac281ffdecc9306a8b5f60 subversion-1.3.0.ebuild 11515 SHA256 5540cd1b4516b44bd093e68f6f4884e103fd9c893f0c49cb59128eadab6041ab subversion-1.3.0.ebuild 11515 -MD5 0356ed755035f783cac31d72da2a0ac8 subversion-1.3.1.ebuild 11568 -RMD160 e4a8bbb29d221f5a0782a5d8479273be6e860edc subversion-1.3.1.ebuild 11568 -SHA256 12f7151e0bcbe9d332f71cc7a5b68fc217e47df8734d927a5111d5c296ee0b31 subversion-1.3.1.ebuild 11568 +MD5 0f9354a870152178ac2682c5a9d39e82 subversion-1.3.1.ebuild 11617 +RMD160 d56cd955191e3610e860e896a46c84d400b449a6 subversion-1.3.1.ebuild 11617 +SHA256 d352204c3b3cc816941467d020022ef7d09e77ab631eee43bd9427b70139eeda subversion-1.3.1.ebuild 11617 diff --git a/dev-util/subversion/files/subversion-apr-version.patch b/dev-util/subversion/files/subversion-apr-version.patch new file mode 100644 index 000000000000..201a127d9853 --- /dev/null +++ b/dev-util/subversion/files/subversion-apr-version.patch @@ -0,0 +1,92 @@ +Index: configure.in +=================================================================== +--- configure.in (revision 19124) ++++ configure.in (revision 19125) +@@ -84,14 +84,13 @@ + + dnl verify apr version and set apr flags + dnl These regular expressions should not contain "\(" and "\)". +-APR_VER_REGEX=["0\.9\.[5-9]"] +-APR_VER_REGEX_TOO="1\." +-APU_VER_REGEX=["0\.9\.[5-9]"] +-APU_VER_REGEX_TOO="1\." + +-SVN_LIB_APR($APR_VER_REGEX, $APR_VER_REGEX_TOO) +-SVN_LIB_APRUTIL($APU_VER_REGEX, $APU_VER_REGEX_TOO) ++APR_VER_REGEXES=["0\.9\.[5-9] 0\.9\.1[0-9] 1\."] ++APU_VER_REGEXES=["0\.9\.[5-9] 0\.9\.1[0-9] 1\."] + ++SVN_LIB_APR($APR_VER_REGEXES) ++SVN_LIB_APRUTIL($APU_VER_REGEXES) ++ + dnl What version of Expat are we using? ----------------- + + APU_HAVE_OLD_EXPAT="`$apu_config --old-expat`" +Index: build/ac-macros/aprutil.m4 +=================================================================== +--- build/ac-macros/aprutil.m4 (revision 19124) ++++ build/ac-macros/aprutil.m4 (revision 19125) +@@ -15,8 +15,7 @@ + + AC_DEFUN(SVN_LIB_APRUTIL, + [ +- APRUTIL_WANTED_REGEX="$1" +- APRUTIL_WANTED_REGEX_TOO="$2" ++ APRUTIL_WANTED_REGEXES="$1" + + AC_MSG_NOTICE([Apache Portable Runtime Utility (APRUTIL) library configuration]) + +@@ -49,9 +48,16 @@ + fi + AC_MSG_RESULT([$apu_version]) + +- if test `expr $apu_version : $APRUTIL_WANTED_REGEX` -eq 0 \ +- -a `expr $apu_version : $APRUTIL_WANTED_REGEX_TOO` -eq 0; then +- echo "wanted regex is $APRUTIL_WANTED_REGEX or $APRUTIL_WANTED_REGEX_TOO" ++ APU_WANTED_REGEX_MATCH=0 ++ for apu_wanted_regex in $APRUTIL_WANTED_REGEXES; do ++ if test `expr $apu_version : $apu_wanted_regex` -ne 0; then ++ APU_WANTED_REGEX_MATCH=1 ++ break ++ fi ++ done ++ ++ if test $APU_WANTED_REGEX_MATCH -eq 0; then ++ echo "wanted regexes are $APRUTIL_WANTED_REGEXES" + AC_MSG_ERROR([invalid apr-util version found]) + fi + +Index: build/ac-macros/apr.m4 +=================================================================== +--- build/ac-macros/apr.m4 (revision 19124) ++++ build/ac-macros/apr.m4 (revision 19125) +@@ -10,8 +10,7 @@ + + AC_DEFUN(SVN_LIB_APR, + [ +- APR_WANTED_REGEX="$1" +- APR_WANTED_REGEX_TOO="$2" ++ APR_WANTED_REGEXES="$1" + + AC_MSG_NOTICE([Apache Portable Runtime (APR) library configuration]) + +@@ -36,9 +35,16 @@ + fi + AC_MSG_RESULT([$apr_version]) + +- if test `expr $apr_version : $APR_WANTED_REGEX` -eq 0 \ +- -a `expr $apr_version : $APR_WANTED_REGEX_TOO` -eq 0; then +- echo "wanted regex is $APR_WANTED_REGEX or $APR_WANTED_REGEX_TOO" ++ APR_WANTED_REGEX_MATCH=0 ++ for apr_wanted_regex in $APR_WANTED_REGEXES; do ++ if test `expr $apr_version : $apr_wanted_regex` -ne 0; then ++ APR_WANTED_REGEX_MATCH=1 ++ break ++ fi ++ done ++ ++ if test $APR_WANTED_REGEX_MATCH -eq 0; then ++ echo "wanted regexes are $APR_WANTED_REGEXES" + AC_MSG_ERROR([invalid apr version found]) + fi + diff --git a/dev-util/subversion/subversion-1.3.1.ebuild b/dev-util/subversion/subversion-1.3.1.ebuild index 657ac9118945..69ce365b0e10 100644 --- a/dev-util/subversion/subversion-1.3.1.ebuild +++ b/dev-util/subversion/subversion-1.3.1.ebuild @@ -1,6 +1,6 @@ # 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.1.ebuild,v 1.2 2006/04/17 19:19:34 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.3.1.ebuild,v 1.3 2006/04/18 07:56:43 pauldv Exp $ inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module @@ -67,6 +67,7 @@ src_unpack() { epatch ${FILESDIR}/subversion-hotbackup-config.patch epatch ${FILESDIR}/subversion-1.3.1-neon-config.patch epatch ${FILESDIR}/subversion-apr_cppflags.patch + epatch ${FILESDIR}/subversion-apr-version.patch export WANT_AUTOCONF=2.5 autoconf |