diff options
author | Jeroen Roovers <jer@gentoo.org> | 2010-07-09 00:28:45 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2010-07-09 00:28:45 +0000 |
commit | b8007702c230e0c776fda7ee20a259d5040bd211 (patch) | |
tree | 50a5797601b2cf88798f642f9ed05f1426c63e47 /dev-libs | |
parent | Stable for PPC (bug #325431). (diff) | |
download | gentoo-2-b8007702c230e0c776fda7ee20a259d5040bd211.tar.gz gentoo-2-b8007702c230e0c776fda7ee20a259d5040bd211.tar.bz2 gentoo-2-b8007702c230e0c776fda7ee20a259d5040bd211.zip |
Fix installing with automake-1.11 and coreutils-8.4 (bug #318013).
(Portage version: 2.2_rc67/cvs/Linux i686)
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/libconfig/ChangeLog | 6 | ||||
-rw-r--r-- | dev-libs/libconfig/libconfig-1.2.ebuild | 8 | ||||
-rw-r--r-- | dev-libs/libconfig/libconfig-1.3.2.ebuild | 8 |
3 files changed, 15 insertions, 7 deletions
diff --git a/dev-libs/libconfig/ChangeLog b/dev-libs/libconfig/ChangeLog index da930df710fe..4aa2111e76d8 100644 --- a/dev-libs/libconfig/ChangeLog +++ b/dev-libs/libconfig/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libconfig # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/ChangeLog,v 1.20 2010/02/16 20:26:07 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/ChangeLog,v 1.21 2010/07/09 00:28:45 jer Exp $ + + 09 Jul 2010; Jeroen Roovers <jer@gentoo.org> libconfig-1.2.ebuild, + libconfig-1.3.2.ebuild: + Fix installing with automake-1.11 and coreutils-8.4 (bug #318013). *libconfig-1.4.2 (16 Feb 2010) diff --git a/dev-libs/libconfig/libconfig-1.2.ebuild b/dev-libs/libconfig/libconfig-1.2.ebuild index 58a79d88b532..d53ddad61ec6 100644 --- a/dev-libs/libconfig/libconfig-1.2.ebuild +++ b/dev-libs/libconfig/libconfig-1.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/libconfig-1.2.ebuild,v 1.5 2008/03/31 21:22:27 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/libconfig-1.2.ebuild,v 1.6 2010/07/09 00:28:45 jer Exp $ inherit autotools @@ -20,7 +20,9 @@ src_unpack() { unpack ${A} cd "${S}" - sed -i -e 's#^SUBDIRS = . samples doc$#SUBDIRS = . doc#' Makefile.am + sed -i Makefile.am \ + -e 's#^SUBDIRS = . samples doc$#SUBDIRS = . doc#' \ + -e '/^libinc_cpp/s: $(libinc) ::g' || die "sed failed" eautoreconf || die } diff --git a/dev-libs/libconfig/libconfig-1.3.2.ebuild b/dev-libs/libconfig/libconfig-1.3.2.ebuild index 27816d4e06a7..8a53eaff67a3 100644 --- a/dev-libs/libconfig/libconfig-1.3.2.ebuild +++ b/dev-libs/libconfig/libconfig-1.3.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/libconfig-1.3.2.ebuild,v 1.4 2009/09/27 19:42:22 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/libconfig-1.3.2.ebuild,v 1.5 2010/07/09 00:28:45 jer Exp $ EAPI="2" @@ -19,7 +19,9 @@ DEPEND="sys-devel/libtool" RDEPEND="" src_prepare() { - sed -i -e 's#^SUBDIRS = . samples doc$#SUBDIRS = . doc#' Makefile.am + sed -i Makefile.am \ + -e 's#^SUBDIRS = . samples doc$#SUBDIRS = . doc#' \ + -e '/^libinc_cpp/s: $(libinc) ::g' || die "sed failed" eautoreconf } |