diff options
| author |   Luca Longinotti <chtekk@gentoo.org> | 2007-06-22 15:19:39 +0000 |
|---|---|---|
| committer | Luca Longinotti <chtekk@gentoo.org> | 2007-06-22 15:19:39 +0000 |
| commit | e46838f546e88abc899dcb202dbf9c12afb9fc08 (patch) | |
| tree | 8980ea0cacb15341edef55daee641d95e3b1584f /dev-util | |
| parent | Add amrnb, amrwb local use flags for media-video/mplayer (diff) | |
| download | gentoo-2-e46838f546e88abc899dcb202dbf9c12afb9fc08.tar.gz gentoo-2-e46838f546e88abc899dcb202dbf9c12afb9fc08.tar.bz2 gentoo-2-e46838f546e88abc899dcb202dbf9c12afb9fc08.zip | |
Improve apr-suffix check, thanks to Axel Dyks.
(Portage version: 2.1.2.7)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/subversion/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/subversion/subversion-1.3.2-r4.ebuild | 5 | ||||
| -rw-r--r-- | dev-util/subversion/subversion-1.4.4-r2.ebuild | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index 40b13cf19271..0f224aa881a5 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -1,6 +1,10 @@ # 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.267 2007/06/22 12:01:24 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.268 2007/06/22 15:19:39 chtekk Exp $ + + 22 Jun 2007; Luca Longinotti <chtekk@gentoo.org> + subversion-1.3.2-r4.ebuild, subversion-1.4.4-r2.ebuild: + Improve apr-suffix check, thanks to Axel Dyks. *subversion-1.4.4-r2 (22 Jun 2007) diff --git a/dev-util/subversion/subversion-1.3.2-r4.ebuild b/dev-util/subversion/subversion-1.3.2-r4.ebuild index 6d6d9b563900..32caf21672d6 100644 --- a/dev-util/subversion/subversion-1.3.2-r4.ebuild +++ b/dev-util/subversion/subversion-1.3.2-r4.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.3.2-r4.ebuild,v 1.6 2007/06/22 08:21:43 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.3.2-r4.ebuild,v 1.7 2007/06/22 15:19:39 chtekk Exp $ inherit elisp-common libtool python eutils multilib bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2 @@ -41,7 +41,8 @@ S=${WORKDIR}/${P/_rc/-rc} discover_apr_suffix() { if use apache2 ; then - if has_version '=net-www/apache-2.0*' ; then + if has_version '=net-www/apache-2.0*' \ + && has_version '=dev-libs/apr-util-0.9*' ; then aprsuffix="" else aprsuffix="-1" diff --git a/dev-util/subversion/subversion-1.4.4-r2.ebuild b/dev-util/subversion/subversion-1.4.4-r2.ebuild index 33a7620a37c3..0b60cd183637 100644 --- a/dev-util/subversion/subversion-1.4.4-r2.ebuild +++ b/dev-util/subversion/subversion-1.4.4-r2.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.4-r2.ebuild,v 1.1 2007/06/22 12:01:24 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.4-r2.ebuild,v 1.2 2007/06/22 15:19:39 chtekk Exp $ inherit elisp-common libtool python eutils multilib bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2 @@ -40,7 +40,8 @@ S=${WORKDIR}/${P/_rc/-rc} discover_apr_suffix() { if use apache2 ; then - if has_version '=net-www/apache-2.0*' ; then + if has_version '=net-www/apache-2.0*' \ + && has_version '=dev-libs/apr-util-0.9*' ; then aprsuffix="" else aprsuffix="-1" |