Fix installing with automake-1.11 and coreutils-8.4 (bug #318013).

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 18 insertions, 20 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/Manifest b/dev-libs/libconfig/Manifest
index 7e608847fc74..4d7bf7b08c9d 100644
--- a/dev-libs/libconfig/Manifest
+++ b/dev-libs/libconfig/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST libconfig-1.2.tar.gz 505661 RMD160 55fd341ad0332fec67f515dfccfa82228b6cc53b SHA1 a7672dd5eff1fcd344c038b06ca6334848ea7def SHA256 9b487ca9efed6317c37da52de1c3a9c0d4d33633124864683474ff680f60cfe6
 DIST libconfig-1.3.2.tar.gz 531217 RMD160 b3d2e8898eee651311d5fc8154d4bd905e50ca89 SHA1 0dce0cd5fc103c4801feea2f68a9c57dcb16d6dc SHA256 2a680bb33e290c3c799e3a90cf2c0fb9f5482dd930ad93d9f83ce39923258c0a
 DIST libconfig-1.4.2.tar.gz 535537 RMD160 928faceb4739bfdb74db6d9c9ac36e5dac3ddd4a SHA1 6ac073687f8135ea0579751527db71d711410d27 SHA256 bec3371e837669ab9fe078b02442bf5fe848550027d879d8dd1a80ba2859ffa9
-EBUILD libconfig-1.2.ebuild 787 RMD160 e05d74e973b72e6e442f1ac7a71a56262c1e511e SHA1 904a595c2eb63e58a5b9e3ec8183b25918cd39e3 SHA256 02f1e1bb91ee54441cef254334c72ea1255f3108ee9761d213305c991cbf2e8c
-EBUILD libconfig-1.3.2.ebuild 764 RMD160 24c4c301acf42f9ca23657b207ffc505e4002f42 SHA1 d55692936ae3be23bfdd43a0a0cd6ea459e3d937 SHA256 4707debc74756af767dd19021ccc7d525fd0e757cc6be96de976eb56c2810c9f
+EBUILD libconfig-1.2.ebuild 847 RMD160 62747eb3886ee2ca956b9f63d3eab7bd94f60595 SHA1 38475adbf252a334cc81466db2db91b3af16b754 SHA256 b2d74b0d648603c60105c9beb9d5f8839b65c61620a7bcbeb95cdb3609bb7bab
+EBUILD libconfig-1.3.2.ebuild 824 RMD160 bd16c7663fb547fa882d5847d41b9a16ee864e8f SHA1 70aa389d4fa89a111657fa7a4b4a2d7163b7c4dd SHA256 ee0ebdb81ce5bf49566c4e971726f450f6f70b42c2a3af9c1e90bd3c3619fc65
 EBUILD libconfig-1.4.2.ebuild 663 RMD160 0de98bcb902e0b515ae7b2976be01d2664857230 SHA1 34ba33de5b8f8dcb9bad7a8f0011a258a88a23a5 SHA256 4b3169839db333fdc41b3bfa9d73fd1e8033b2d0f3cbbc23ab98b386f1be7674
-MISC ChangeLog 2592 RMD160 74ced5abc5ae03ab1ed2a517a373a87e893448b2 SHA1 b62b5640b5626faa18079ab560567f77472a9235 SHA256 1e08479027af830889e4893e6a30525c0a4d8e3e964a10256efb502606982103
+MISC ChangeLog 2756 RMD160 f3b3cf95df738f4a2db9e99682cc0706445e2d4d SHA1 53828bd31a4d64d094d8c577041188f1485d0e82 SHA256 ccbf4ad34b141b0c35912f878debb78480241df1eaecbfb58f287e8f11466747
 MISC metadata.xml 251 RMD160 df72d20e36f1fbbdfafcee71e79739e623e4a1d9 SHA1 18d311b89d961d761ccfa45ec7a089d50862ab48 SHA256 9cd1b414990fd6b32ad4aa48f8a1dc58f01479901f910210a340b8705f92e72a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkt6/2QACgkQgAnW8HDreRa8dgCghi9L/BZflni0tP+xjPQgLUJe
-hY4AoJnhg+TD8bt7cAdYgbrZAWToJfk+
-=k6qx
------END PGP SIGNATURE-----
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
 }