diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2008-01-10 18:07:23 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2008-01-10 18:07:23 +0000 |
| commit | abb27e9479d9b8a1a5dcabcd6552e3233da40f00 (patch) | |
| tree | 858c209b1acde6035750457470d54ed45b640580 /dev-util | |
| parent | Marked ~hppa (bug #200050). (diff) | |
| download | gentoo-2-abb27e9479d9b8a1a5dcabcd6552e3233da40f00.tar.gz gentoo-2-abb27e9479d9b8a1a5dcabcd6552e3233da40f00.tar.bz2 gentoo-2-abb27e9479d9b8a1a5dcabcd6552e3233da40f00.zip | |
cleanup for bug #203587
(Portage version: 2.1.4_rc11)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/rapidsvn/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/rapidsvn/rapidsvn-0.9.3.ebuild | 14 | ||||
| -rw-r--r-- | dev-util/rapidsvn/rapidsvn-0.9.4.ebuild | 15 |
3 files changed, 16 insertions, 21 deletions
diff --git a/dev-util/rapidsvn/ChangeLog b/dev-util/rapidsvn/ChangeLog index d4526c4a26b9..56fbe26f2e7d 100644 --- a/dev-util/rapidsvn/ChangeLog +++ b/dev-util/rapidsvn/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/rapidsvn -# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/ChangeLog,v 1.53 2007/12/29 06:29:57 nerdboy Exp $ +# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/ChangeLog,v 1.54 2008/01/10 18:07:23 hollow Exp $ + + 10 Jan 2008; Benedikt Böhm <hollow@gentoo.org> rapidsvn-0.9.3.ebuild, + rapidsvn-0.9.4.ebuild: + cleanup for bug #203587 29 Dec 2007; Steve Arnold <nerdboy@gentoo.org> rapidsvn-0.9.3.ebuild, rapidsvn-0.9.4.ebuild: diff --git a/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild b/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild index 7aa5f01cef97..9b7c608f1aeb 100644 --- a/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild +++ b/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild,v 1.20 2007/12/29 06:29:57 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild,v 1.21 2008/01/10 18:07:23 hollow Exp $ inherit eutils libtool autotools wxwidgets flag-o-matic fdo-mime @@ -49,11 +49,7 @@ src_compile() { # Note: this should be fixed in rapidsvn 0.9.3 and later local myconf local xslss_dir - local apr_suffix="" - if has_version ">dev-libs/apr-util-1"; then - apr_suffix="-1" - fi if use doc; then xslss_dir=$(ls -1d /usr/share/sgml/docbook/xsl-stylesheets*|head -n1) myconf="--with-docbook-xsl=$xslss_dir" @@ -71,13 +67,13 @@ src_compile() { need-wxwidgets gtk2 myconf="${myconf} --with-wx-config=${WX_CONFIG}" - append-flags $( /usr/bin/apr${apr_suffix}-config --cppflags ) + append-flags $( /usr/bin/apr-1-config --cppflags ) econf --with-svn-lib=/usr/$(get_libdir) \ --with-svn-include=/usr/include \ --with-neon-config=/usr/bin/neon-config \ - --with-apr-config="/usr/bin/apr${apr_suffix}-config" \ - --with-apu-config="/usr/bin/apu${apr_suffix}-config" \ + --with-apr-config=/usr/bin/apr-1-config \ + --with-apu-config=/usr/bin/apu-1-config \ ${myconf} || die "econf failed" emake || die "emake failed" diff --git a/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild b/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild index c6c23c83ad1b..15697686830c 100644 --- a/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild +++ b/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild,v 1.18 2007/12/29 06:29:57 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild,v 1.19 2008/01/10 18:07:23 hollow Exp $ inherit eutils libtool autotools wxwidgets flag-o-matic fdo-mime @@ -49,11 +49,6 @@ src_compile() { # Note: this should be fixed in rapidsvn 0.9.3 and later local myconf local xslss_dir - local apr_suffix="" - - if has_version ">dev-libs/apr-util-1"; then - apr_suffix="-1" - fi if use doc; then xslss_dir=$(ls -1d /usr/share/sgml/docbook/xsl-stylesheets*|head -n1) @@ -73,13 +68,13 @@ src_compile() { need-wxwidgets gtk2 myconf="${myconf} --with-wx-config=${WX_CONFIG}" - append-flags $( /usr/bin/apr${apr_suffix}-config --cppflags ) + append-flags $( /usr/bin/apr-1-config --cppflags ) econf --with-svn-lib=/usr/$(get_libdir) \ --with-svn-include=/usr/include \ --with-neon-config=/usr/bin/neon-config \ - --with-apr-config="/usr/bin/apr${apr_suffix}-config" \ - --with-apu-config="/usr/bin/apu${apr_suffix}-config" \ + --with-apr-config=/usr/bin/apr-1-config \ + --with-apu-config=/usr/bin/apu-1-config \ ${myconf} || die "econf failed" emake || die "emake failed" } |