Fix building with recent toolchain wrt #422789 by Diego Elio Pettenò. Missing dependencies of e2fsprogs, os-headers, and pkg-config.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 44 insertions, 20 deletions

diff --git a/sys-fs/ext3grep/ChangeLog b/sys-fs/ext3grep/ChangeLog
index 8b151356637d..6ae3c1ae4547 100644
--- a/sys-fs/ext3grep/ChangeLog
+++ b/sys-fs/ext3grep/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/ext3grep
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext3grep/ChangeLog,v 1.6 2012/11/03 09:53:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext3grep/ChangeLog,v 1.7 2012/11/03 10:03:44 ssuominen Exp $
+
+  03 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> ext3grep-0.10.2.ebuild,
+  +files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch:
+  Fix building with recent toolchain wrt #422789 by Diego Elio Pettenò.
+  Missing dependencies of e2fsprogs, os-headers, and pkg-config.
 
   03 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> -ext3grep-0.10.1.ebuild:
   old
diff --git a/sys-fs/ext3grep/Manifest b/sys-fs/ext3grep/Manifest
index bed93c469890..0659ee68da15 100644
--- a/sys-fs/ext3grep/Manifest
+++ b/sys-fs/ext3grep/Manifest
@@ -2,19 +2,20 @@
 Hash: SHA256
 
 AUX ext3grep-0.10.1-gcc44.patch 7824 SHA256 44162b8e0cb8d29c45afad37a125dc831b186923ec631f4698cb4dd7054c5e72 SHA512 11404bb9f606a223f328068d7b42911a49df05a0bee68e88e15b58c66964357bab1888af4a3284f3ea7ed559753ac7c80d4db59c63b53ee52117b8c92aae5607 WHIRLPOOL 88af4ebc1e8e76a5f2bf2c896f0aa8ea5ba20a46a4167f711683622545aeab7fc0eeb68a980b1375bc851cb74231293e6fc95bf75fa9fb94abaffe44d443aa7e
+AUX ext3grep-0.10.2-include-unistd_h-for-sysconf.patch 267 SHA256 cf6e664b30df2d2bddf6e6b183b386854999e8f88ee2207e9465831d4b605fd1 SHA512 4675ec597a131f91d9452f10c2d163fa8fa0d883b3138e475992596778cfd80f0499d3dff4092f6bbf09b6e7653c8d35ff18ca98217c8856d1a85596621079ac WHIRLPOOL 7ba7c7a3020115e55178519e113d4b5af453e7768c2494a5f1f1472b17c6174a6eba883ca3c962015095aba29071e575c131012f62023295f4b9580e0c4363a7
 AUX ext3grep-0.10.2-new-e2fsprogs.diff 1478 SHA256 86407fe3bb74218d32dce0a8f4c4f21b3158a115111b3b225072d77ac4475a47 SHA512 f16b5ed428c7bd1bf453d331eb1c114a13a2ec7fdc19d61b9788c5f4f3e5d4d85c013c738e04dbea12967a678d81bddedb60e573ac97c801efffa3ef27774e19 WHIRLPOOL b52a977600bf29f82571a2b98f1c64a079ad19ed00d4fc82e3201a9743f8a5981d3040f77dfaa18eea097e93303313e15ee4917954ed3ab81ac3432bb6446242
-DIST ext3grep-0.10.2.tar.gz 236364 SHA256 586f3e939d2ffd782f6f006b81a3df2dc477c6da03f21edb8860c5c4f7198f3e
-EBUILD ext3grep-0.10.2.ebuild 884 SHA256 362d5a1ebd3e5cf65f01c284753350139a2bfc843f1b2ca7db8eb3088a809bee SHA512 7beb64e4a02b1727f00ec29adf895e0b98465f8220a5f240e55faaccebbf233f4293229243a6536ad9e3c37bd7dadbdaef8d2f8feb7bb58490b3129477f629d1 WHIRLPOOL 0f3a2de8b0d566844567d765574bd3dc32c177e43c58a24d83375485e56cd55a64be6b9720a73157645305a03184f850cb7528bed809b5bc7ea7f7e1f0abf082
-MISC ChangeLog 1005 SHA256 fe1edcde69006a0135941ae3f43be55d8994bd0b0187c166d9f80126de92c7df SHA512 5dd2036c13951ad30540d5e5dcb62b5f5f722f66325eed0e6acf964e22c138c5e3522b26a9f881b8d7107469b3879aca027494e0b1cdf8bb32215db60a0058f9 WHIRLPOOL 61c10ec45c7bb727c24f698c8cd6ab5c5d4edc9b92065f7c013a191884c96c178eec2688095df271b872d2be9e9fec62c9fe30adfdd9d4b5e12929518fd67d3d
+DIST ext3grep-0.10.2.tar.gz 236364 SHA256 586f3e939d2ffd782f6f006b81a3df2dc477c6da03f21edb8860c5c4f7198f3e SHA512 301a65c91d2342753a4588c40d496114067a18ceceb999f10fe3fc49c7d3a20c7836dba915575db352c89de7ff0ed3553cd8fbd2d1540109cb0ff7fa8f530b6f WHIRLPOOL ec56fae174c57c4736284f7f06628353b6c60490b1c9847fbade5808be50aa6a05aa427d8fa5d634c50dfdc196ef744b3dfc7e70955ea4122f2d84e7122259ae
+EBUILD ext3grep-0.10.2.ebuild 931 SHA256 a7bba4997e392ba7bf7cef2e719487141acfc6e1f69927d518ad551b0a5baefd SHA512 d7de235d849d48ff7a23ba614483ab3067be3be8e885716497d7a7d2090c2d1541da928d4b8dfc02c3afaa10893df8741f526b741078404706c60e8f9dc53565 WHIRLPOOL 8d771f63de5dba3d2907abf86d6c87b2dee86dd66eca203d697a1ae8b276fe20584fce1c9b899b6896d85f22e26dbc65b7059e6ffd23743b2f61d257bbe8fb17
+MISC ChangeLog 1283 SHA256 b9cbab9d53c605a47da1815d0a633ffba929cace38a5e49b1af1213e615d70ef SHA512 feea111efd06173ede03fc5ef80557f55b2c453190f652914e33262b0c0135c6a266839b4c70bfe5e031437562f8e297710d1b026a74c360da0051e82886725d WHIRLPOOL 3bbdddf51619c100af903f8823bb478b35da08b0de84513b71e64856915e16a52c55732c850d1e67c22c202c6594555ec3c9794897a4527348961a289a519805
 MISC metadata.xml 280 SHA256 95f4751d3dbe0bb2a0e430a6add74b6dccb2703d1f2b3ea4e6fe00d790e2edbf SHA512 6a9216040b3f9f1cc3c2074fe0d19244747f36a0624633a46c2f4ba39137067ee2c687d3404bcc16929cdbfe4e4477b78cd242cdda35f93df7709eec21030b41 WHIRLPOOL c06f6b840b5c5205f3d81f0255626ad0a11f057577f85ab71e3870071be8605742ee18ed0b9c92430fb0da06296e1b06c03b0a753b392468bf2aa352b27d48e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQlOiGAAoJEEdUh39IaPFNiFEH/RHIYUR2eDPuAijFpAko83Hk
-3izpC58oLkoOeJ3zbcV7hEBBTraUyHuAjmL6XGXaGFCh/nOscFhbs12kyNNdypHv
-ACwGxhmAX4kuUsecbg/YSfzJrlPHe3heFSNIPIFopwjWe+EHm2pY9IeL6nrQ4seC
-8BUy/kDY0cPvzL8d5m7k0SXYbZeudhv9mK8xN8mxvKZeLgmSqgpPq+Q5qPqAt1zF
-vKBiLygVC7ucdzZP+gdnU9A7ShQcSMUu06a5oSJ2ynnCs0QSBHnZNSqZvNnTxM+n
-0gYQia4rLmK1cVxu51Pe7Ie2UGnqK91EhnXlZd8bBFpCrMcw1PE24AefEizJFRk=
-=2QJz
+iQEcBAEBCAAGBQJQlOrYAAoJEEdUh39IaPFNRawH/jDjczfce+ERvDfQMIg80lrd
+e57Y7GLyPuGzCK4HfujZHqGxZT63np0WWXbxgXlLqFUTUXhUO20aKDkIGGQDTgNI
+Et2UrBDr7JC8Pn6AK77lBILu8lUcuvENyoEDLLDO/5Pcu/1yqHyt0RRiC9ZGfg3N
+Le1bXWHu0i9yx87IDxA8OfC6cyTKw3rio6XwutMoOnIkS0KHZnb8uWGkeoVx/87C
+FKytqUfxs7Ma7Vgt5PAEYiEVRLUMqY1iymAZP7TCebJZ9S4aQJpfWK6KgGBcIGdY
+llu27ZqVk28/bFRscl1UIqKjJ9k9nMA8beJ75Lm4G2B/jeOlQBNHo8WpL0SiC3s=
+=tI7i
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/ext3grep/ext3grep-0.10.2.ebuild b/sys-fs/ext3grep/ext3grep-0.10.2.ebuild
index 04293ffeaee0..9a6dc3f180fa 100644
--- a/sys-fs/ext3grep/ext3grep-0.10.2.ebuild
+++ b/sys-fs/ext3grep/ext3grep-0.10.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext3grep/ext3grep-0.10.2.ebuild,v 1.3 2012/02/26 17:51:44 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext3grep/ext3grep-0.10.2.ebuild,v 1.4 2012/11/03 10:03:44 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 inherit eutils
 
 DESCRIPTION="Recover deleted files on an ext3 file system"
@@ -14,8 +14,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug pch"
 
+DOCS="NEWS README"
+
+RDEPEND=""
+DEPEND="sys-fs/e2fsprogs
+	virtual/os-headers
+	virtual/pkgconfig"
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.10.1-gcc44.patch
+	epatch \
+		"${FILESDIR}"/${PN}-0.10.1-gcc44.patch \
+		"${FILESDIR}"/${P}-include-unistd_h-for-sysconf.patch
 
 	# Fix build against latest e2fsprogs, taken from
 	# https://code.google.com/p/ext3grep/issues/detail?id=34
@@ -24,12 +33,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		$(use_enable debug) \
 		$(use_enable pch)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS README || die
-}
diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch b/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch
new file mode 100644
index 000000000000..bf38c27e7095
--- /dev/null
+++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/422789
+
+--- src/init_consts.cc
++++ src/init_consts.cc
+@@ -27,6 +27,10 @@
+ #include "debug.h"
+ #endif
+ 
++#if USE_MMAP
++#include <unistd.h> /* sysconf */
++#endif
++
+ #include "globals.h"
+ #include "superblock.h"
+ #include "forward_declarations.h"