From dca4b5af3e89bc5fc499cb25e502ef9ca301362a Mon Sep 17 00:00:00 2001 From: Paul de Vrieze Date: Sat, 3 Mar 2007 21:00:31 +0000 Subject: [PATCH] Link against the apr(-util) used by apache. Thus supporting apache-2.2. Package-Manager: portage-2.1.2-r12 --- dev-util/subversion/ChangeLog | 8 +++++++- dev-util/subversion/Manifest | 16 +++++++-------- dev-util/subversion/subversion-1.4.3.ebuild | 22 +++++++++++++++------ 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index ed13bdfd76e0..dc292895763a 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/subversion # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.248 2007/03/03 16:35:37 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.249 2007/03/03 21:00:31 pauldv Exp $ + + 03 Mar 2007; Paul de Vrieze subversion-1.4.3.ebuild: + Fix bug #108777 by preferring the apr version apache was linked against. + When apache2 support is not needed, prefer the 1.x apr(-util). This is + largely based on the patches by Brian Tarricone and + Georgi Georgiev . 03 Mar 2007; Paul de Vrieze files/70svn-gentoo.el, subversion-1.4.3.ebuild: diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest index 1b2bb684ee9f..60792a6dfc3f 100644 --- a/dev-util/subversion/Manifest +++ b/dev-util/subversion/Manifest @@ -82,14 +82,14 @@ EBUILD subversion-1.3.2-r3.ebuild 11762 RMD160 dcecf56e615d3cdd43b20b479d93f9a8a MD5 d83f004e921251c1be1165e2bfa2ded1 subversion-1.3.2-r3.ebuild 11762 RMD160 dcecf56e615d3cdd43b20b479d93f9a8a047b0cf subversion-1.3.2-r3.ebuild 11762 SHA256 532444d16391deda81769dbc526305159a91ae013c83d26e63e49094b30fbc39 subversion-1.3.2-r3.ebuild 11762 -EBUILD subversion-1.4.3.ebuild 11703 RMD160 23a08b610fbd6fc7d637f178db0f0ef16317b70f SHA1 18bc560e7861a06a503a5b7fcfe37b2af0754daa SHA256 5a2e80b54506af8a6eebac9929b1c78750a409c14b0f6d21cf790508f7ffd595 -MD5 35d7070d5fa5af86c8169dd764c3fc7b subversion-1.4.3.ebuild 11703 -RMD160 23a08b610fbd6fc7d637f178db0f0ef16317b70f subversion-1.4.3.ebuild 11703 -SHA256 5a2e80b54506af8a6eebac9929b1c78750a409c14b0f6d21cf790508f7ffd595 subversion-1.4.3.ebuild 11703 -MISC ChangeLog 42594 RMD160 9d317984f4478b03908e6e685a17871f6f5ce49f SHA1 aaba11f9af8ea2f2371c316441b0ef651ca71142 SHA256 c4eb1a50be2ce811ca5cb16efd45cdcacb2981b4a5a263db0f2303d81a4c7afd -MD5 1bcb964b2c62d2a55c6a37dd66ad0275 ChangeLog 42594 -RMD160 9d317984f4478b03908e6e685a17871f6f5ce49f ChangeLog 42594 -SHA256 c4eb1a50be2ce811ca5cb16efd45cdcacb2981b4a5a263db0f2303d81a4c7afd ChangeLog 42594 +EBUILD subversion-1.4.3.ebuild 11917 RMD160 f30be613657fd62a06481398e0833e9ea2954889 SHA1 06f777a0174f0d58193a12b4b13b7a31e18b3863 SHA256 bf871fbeaf15f8ae5e5f49eadfb1cbecf9dee73fc04dbabc513e585e164a1a74 +MD5 5d577e0bdcb1ba35fecbd2f68fb0d587 subversion-1.4.3.ebuild 11917 +RMD160 f30be613657fd62a06481398e0833e9ea2954889 subversion-1.4.3.ebuild 11917 +SHA256 bf871fbeaf15f8ae5e5f49eadfb1cbecf9dee73fc04dbabc513e585e164a1a74 subversion-1.4.3.ebuild 11917 +MISC ChangeLog 42927 RMD160 9260f22d71ca377f32974bc349e27c77772c32cb SHA1 385bcd415565210b78ec67fb7229b85c5c03590b SHA256 b86355e0d3b3e34748cd428e6009f891e7e8246a099bb00d264ebe002a02811c +MD5 a36cf1af542c10edeeaf09c79f652a0b ChangeLog 42927 +RMD160 9260f22d71ca377f32974bc349e27c77772c32cb ChangeLog 42927 +SHA256 b86355e0d3b3e34748cd428e6009f891e7e8246a099bb00d264ebe002a02811c ChangeLog 42927 MISC metadata.xml 222 RMD160 b21e9d4420a67a847d490dc86a587e1d5f21fff0 SHA1 76e56ef0ec9c71b3032d1c501e358dd80fa1664b SHA256 4710a38e11b23d4355a7a0cba621d9680e2148aa173528491e88903487e93152 MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222 RMD160 b21e9d4420a67a847d490dc86a587e1d5f21fff0 metadata.xml 222 diff --git a/dev-util/subversion/subversion-1.4.3.ebuild b/dev-util/subversion/subversion-1.4.3.ebuild index ad7b99c45342..62a63596e022 100644 --- a/dev-util/subversion/subversion-1.4.3.ebuild +++ b/dev-util/subversion/subversion-1.4.3.ebuild @@ -1,6 +1,6 @@ # 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.4 2007/03/03 16:35:37 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.3.ebuild,v 1.5 2007/03/03 21:00:31 pauldv Exp $ inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2 @@ -76,10 +76,20 @@ src_unpack() { src_compile() { local myconf - myconf="--with-apr=/usr --with-apr-util=/usr" + local apr_suffix="" - use apache2 && myconf="${myconf} --with-apxs=${APXS2}" - use apache2 || myconf="${myconf} --without-apxs" + if use apache2; then + myconf="--with-apxs=${APXS2}" + apache_minor="(best_version apache | cut -d. -f2)" + if [ ${apache_minor} -gt 0 ]; then + apr_suffix="-1" + fi + else + if has_version ">dev-libs/apr-util-1"; then + apr_suffix="-1" + fi + myconf="--without-apxs" + fi myconf="${myconf} $(use_enable java javahl)" use java && myconf="${myconf} --without-jikes --with-jdk=${JAVA_HOME}" @@ -102,8 +112,8 @@ src_compile() { $(use_with berkdb berkeley-db) \ $(use_with python) \ $(use_enable nls) \ - --with-apr=/usr \ - --with-apr-util=/usr \ + --with-apr="${ROOT}usr/bin/apr${apr_suffix}-config" \ + --with-apr-util="${ROOT}usr/bin/apu${apr_suffix}-config" \ --disable-experimental-libtool \ --disable-mod-activation || die "econf failed" -- 2.26.2