diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2013-02-07 09:41:03 +0000 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2013-02-07 09:41:03 +0000 |
| commit | 43173e981ce0104a3a5ab9363a76f38e477c27ce (patch) | |
| tree | ffcfc2d41cda4aefd1d08272b63dfd3e67c216c6 /net-misc/rancid | |
| parent | Fix HOMEPAGE, wrt bug #353422. Thanks to Branko Majic for discovering this issue (diff) | |
| download | gentoo-2-43173e981ce0104a3a5ab9363a76f38e477c27ce.tar.gz gentoo-2-43173e981ce0104a3a5ab9363a76f38e477c27ce.tar.bz2 gentoo-2-43173e981ce0104a3a5ab9363a76f38e477c27ce.zip | |
Respect CFLAGS wrt bug #455840, fix conditions on nonexistent 'svn' USE flag - use 'subversion' instead
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'net-misc/rancid')
| -rw-r--r-- | net-misc/rancid/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/rancid/rancid-2.3.8.ebuild | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/net-misc/rancid/ChangeLog b/net-misc/rancid/ChangeLog index 3c22c3c29474..959c713a1f81 100644 --- a/net-misc/rancid/ChangeLog +++ b/net-misc/rancid/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/rancid # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rancid/ChangeLog,v 1.2 2013/01/23 16:55:15 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/rancid/ChangeLog,v 1.3 2013/02/07 09:41:03 pinkbyte Exp $ + + 07 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> rancid-2.3.8.ebuild: + Respect CFLAGS wrt bug #455840, fix conditions on nonexistent 'svn' USE flag + - use 'subversion' instead 23 Jan 2013; Michael Weber <xmw@gentoo.org> metadata.xml: fix herd diff --git a/net-misc/rancid/rancid-2.3.8.ebuild b/net-misc/rancid/rancid-2.3.8.ebuild index bafce0c99d7c..1a120c8340bb 100644 --- a/net-misc/rancid/rancid-2.3.8.ebuild +++ b/net-misc/rancid/rancid-2.3.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rancid/rancid-2.3.8.ebuild,v 1.1 2013/01/22 23:08:39 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/rancid/rancid-2.3.8.ebuild,v 1.2 2013/02/07 09:41:03 pinkbyte Exp $ EAPI=4 @@ -33,6 +33,10 @@ src_prepare() { epatch "${FILESDIR}"/${P}-mailprefix.patch epatch "${FILESDIR}"/${P}-config.patch epatch "${FILESDIR}"/${P}-buildsystem.patch + + # respect CFLAGS, bug #455840 + sed -i -e '/^CFLAGS/d' bin/Makefile.am || die 'sed on bin/Makefile.am failed' + eautoreconf } @@ -42,13 +46,13 @@ src_configure() { --enable-conf-install \ --docdir="${EPREFIX}"/usr/share/doc/${PF} \ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - $(use svn && echo "--with-svn=fsfs") + $(use subversion && echo "--with-svn=fsfs") } src_install() { default - if use svn ; then + if use subversion ; then sed -e 's/^RCSSYS=cvs/RCSSYS=svn/' \ -i "${D}"/etc/rancid.conf || die fi |