Apply patch to fix building with boost >= 1.50. Bug #425422, Thanks to Olivier Huber <oli.huber@gmail.com>

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

4 files changed, 168 insertions, 7 deletions

diff --git a/sys-fs/e4rat/ChangeLog b/sys-fs/e4rat/ChangeLog
index 3e9f414ed052..79b2257ef1a2 100644
--- a/sys-fs/e4rat/ChangeLog
+++ b/sys-fs/e4rat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/e4rat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e4rat/ChangeLog,v 1.8 2012/10/17 03:49:02 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e4rat/ChangeLog,v 1.9 2012/11/06 20:55:32 hwoarang Exp $
+
+*e4rat-0.2.3-r1 (06 Nov 2012)
+
+  06 Nov 2012; Markos Chandras <hwoarang@gentoo.org> +e4rat-0.2.3-r1.ebuild,
+  +files/e4rat-0.2.3-boostfsv3.patch:
+  Apply patch to fix building with boost >= 1.50. Bug #425422, Thanks to Olivier
+  Huber <oli.huber@gmail.com>
 
   17 Oct 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> e4rat-0.2.3.ebuild:
   x86 stable wrt bug #436684
@@ -42,4 +49,3 @@
   +metadata.xml:
   Initial commit. Bug #363207. Thanks to Michael Orlitzky
   <michael@orlitzky.com>
-
diff --git a/sys-fs/e4rat/Manifest b/sys-fs/e4rat/Manifest
index 50fb343ef516..36d25bfb8e49 100644
--- a/sys-fs/e4rat/Manifest
+++ b/sys-fs/e4rat/Manifest
@@ -3,20 +3,32 @@ Hash: SHA256
 
 AUX e4rat-0.2.2-libdir.patch 509 SHA256 7b8427c7380c6a56a9c70a1f2f8794550e46f4a110efd9e4cd476f9079e39157 SHA512 c942b1fe189500c666e0994c3b7563a96b05fe065f0b3c2ff5f99bb3a0b462cc13e5ac6ecc692e10d6eec43f2d83c1f80bed7c3f354cda3f3f0d85d358e85d0f WHIRLPOOL 65d0fc8e1ac179346ff75bd60332c920215d3a9252cdd2044515df106d1fb35ec1d15ddde15a9622e7fdd03d50a90ed7584e2d0ccb5a668fab10a1b274b5b478
 AUX e4rat-0.2.2-shared-build.patch 2560 SHA256 0ece6e10a5a77857bb16a61952c69211318046c435cd7f91c522c0c59c19cbaa SHA512 0cb8acc4c2df6cc92574f46153516dbc0cb91240cccb46e2879d60a515af066688db3c79a5f66cf5da43b5a51a85c9cea22cef52178ebea5aec7c267f67562d0 WHIRLPOOL 67361405f6cf52f1f130054b7ad0669c7e06313c761c71f51549acac63a56762bb0dd57d556c6c6ebbe0e7e9dafb774869bd517defbde54e0546dfb1521a1c12
+AUX e4rat-0.2.3-boostfsv3.patch 3372 SHA256 c11ec1c272f470e7fa0594c824c79fe2e30de9f182438d69a16b62a77e99c63a SHA512 6a11506ef567df8f3ab021bb1de2c05abb2e51e018b4cbae10d22bd4ab9f178fca9ed02d43dffef65edafc328401880d64aafa9e81249cbf92277f2cd367a139 WHIRLPOOL 9825c694fe4ba5585216c3083437117f73f39714ed3ce935fef087f95ebc62471f34f7495046e6ba745bab762b5b9024c5bb88ddf6c40556d169db91910c1c74
 AUX e4rat-libdir.patch 842 SHA256 2af52e6c8e30e6c6f629312297d324a9a98ad900bed4c10294dc2dc13714c7e2 SHA512 d5dc8acaac6a8e43de75ee49d1a68d854c95b9ea23a62c7108b3fc23e8ab609bc8393e79039be46b337bd47329fd748b2539685abc3240c0632920c4669831d5 WHIRLPOOL 411fbf9185b517e7d6a548b2f026ca3564d2cb0cffa5a4cff2d26ca1f3f271833bacb220bc5c15d16ac55cd3e5e23da67cddd7ae0c54b97a729e19e35873aa54
 AUX e4rat-shared-build.patch 3453 SHA256 962b41e96fd2e698f038118cae325c17824f7e05f975775da9cfa30347a69374 SHA512 0a2a0cb7f94abd5e5bdd7d5faea5cffe5aa62f82b123cba0b29e7648adca912d8bea49efd90f6d6e794783a9ffe511ab9bafc6ca5ae6a79b2dd3f5979d25ff10 WHIRLPOOL 621382bece426a252977326fdb31f0f923de25a43494620f01c988b0f3538e5894a725126609b5d67fc78246d67cd99e44fca981d2931fe23896d5c25daa86eb
 DIST e4rat_0.2.1_src.tar.gz 71943 SHA256 c509f165eff317f80f5d13d7b370514c457df4542ff3b31bee4c26f97ce89769
-DIST e4rat_0.2.2_src.tar.gz 72257 SHA256 ec40740ac05fb0470edd682232fb6c7be0bb57420b70f6c39d1df234753f3ec9
+DIST e4rat_0.2.2_src.tar.gz 72257 SHA256 ec40740ac05fb0470edd682232fb6c7be0bb57420b70f6c39d1df234753f3ec9 SHA512 f8b8e7465ec3237b205081daa6f8a9ccd21f77743834decf1513745c59bde47ce6e7ce6da4daeb7504e7854f7e6487cafd9ea635e68c4026e5cd9c8b830a3d62 WHIRLPOOL 86f1b96d0df7244d7577e9bbbc3d81eee2ac0b0c65c257af51025102059423e4a9ea62a14b2a4c717949e7dd09a16ff9a1b7b56c2e56fd637337532482ba2d52
 DIST e4rat_0.2.3_src.tar.gz 72459 SHA256 f6feda9618eff0f9442baf771b4776b634e5a2f39e678c10e4c7946b2c6a96a0 SHA512 e1b78b7d84e17f0ded494217f2eb5912401d365844bc966d649682979e1d3deaceab6e9d820fb7fbec819e15133aa2af61131325204620d9b16a3c7638d7fdb7 WHIRLPOOL 912632a516bcefe2171bd1bc207394396ecec9cc74351b2afa511258cb1dfdbb38d2e5fe41a7af747addb92a5f8ff8b2b2321dee8f51d8e8bf7f919183e80c8c
 EBUILD e4rat-0.2.1-r2.ebuild 1440 SHA256 6335c1781313f73cca44b968c4f9de6745f5cb8dfccea9fb387681488d4be3d7 SHA512 09e0ae0ac172f18e920834baa02fe0bfeb48290e4b6d2d789d3d163438905375f90475101d47fa587a1c661dd8feb9701afdf38dc0c40f12db072b54e1b9b0ed WHIRLPOOL d7e623f3316a93e6cbbf5b246ea5b29ac8fd925941b98fc5ed5891e8a4735b607702580729c0cf8ce3d0a01020e294cfe5333c03c55b7a952c89bcd7f909b4cb
 EBUILD e4rat-0.2.2.ebuild 1435 SHA256 dcae482ce596ddc52c066cdbbc22351ebdc60043e24134c0cf6ff4000f2278dd SHA512 0f4e79784c4330b35bfa17a311a130ab6213614128b26d5c2f869bc76a93b8f87e2a1bfebaa4171b1c91c9c739a72b0b1d62784e31120ba4da922dfda6fda0e1 WHIRLPOOL f2ca5e7ac4f6fff6bb8e537ea33033dfcd839cfc73b713486444f7a6019561d4465b54794a00b0d5e0dafa62218a1e5e9902b6cade315d607da294557be9591f
+EBUILD e4rat-0.2.3-r1.ebuild 1488 SHA256 65666a10751a9a37ec7fa209244e9755a7bf6a07f24b2bd82cfff10b7450c764 SHA512 8044220ad9da139eeb4212c66ff0e903a225e990305668a12fbbea6a92cfe82b62d08c3d17541878f311ecde5ddd4dea27b084446932cbc1d24210a1a38bea4d WHIRLPOOL c2bf7a4db31042cc5d5e1ff57dd222d1ff61df873a0d675c20048ca4a5c1a1632e41f6616038cd2d80f08aa751313a778936cedbf7bebc63dbad63caefa78d20
 EBUILD e4rat-0.2.3.ebuild 1449 SHA256 834240e0ee788506b0d5b4aefc19f7381f00c63d493e4eb057ce07f629b4ff65 SHA512 3e363ce8fed59ce24004182c2046d31139bf49b6803b70124d2d2d68b7edf35452b5814de30ff285ce21ceb85c5cf62f642de7652e15fad13e6bae3f0c8d9b0f WHIRLPOOL 3212fafc236e958291540feca2a66a6fb1874b10f992acafc422ae799453c484a3bda01e1f010fa4f2a142bbccaa0f310be02a5a58526a6fa6f6eb890584b5f5
-MISC ChangeLog 1630 SHA256 a6c6b93f2ff004fadb4a5119c090ff7e2e4607cb15a6717ab2c0b714b7b01a9c SHA512 147d4198d467070409177a7c04392294f0afe62b236bd2d61f1671d88d58ad5dec8353b1d88a826590c1d1c0549e6917fe69513dc8fbe0879bb9d423b4003bec WHIRLPOOL a1816b1e86a0cb2571b9eaace52557301cecf44ddd4877a6181266a1d3e177e203782ad91d24462137895bddb6c527140bd57ee5e51d6061f2619030e4d72534
+MISC ChangeLog 1885 SHA256 73dd61747a1b15008c61f036ea68c758639d91fd53c1da830763143fa3c80bef SHA512 f649f640e570e934219e170c151ef7694cd2ab026bf2a04ba20514ef2c06a2cfb587bbc85cd7998c3da7e39038a79547d7ef6acb9878212d1a00d6a4008acff0 WHIRLPOOL 58c1e63f0636c71f3ec5b254637b95aa84532fa9f049d12a3bfddcf7844b7a4b7c6bcfd3862a8cdc94543fb1194b5ed2f011a482075e8d0243ddc2f747cc248b
 MISC metadata.xml 277 SHA256 83f0125076dc51822101f69dddff280682e643c4dff13762361d0901425fbb74 SHA512 60997066a6af5e2f27dec7a4167c6aec37b8054b9512412ea5acaf64392892ad5fd93f89b8cd186b83d3d12e248c7941df015fd02de4d999b438adc19a6ebe9e WHIRLPOOL 2224e84fc75b480364f4efdfe958fa9d1e341973072f04412cd34306bbe75ec71dad1e114b02af79f2bdcb1392a24dfe191ea2a6004eb20cbd0be18bbcabb161
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB+KrIACgkQuUQtlDBCeQIRLACdH2y6bY2UBZzZmNYzmxgdJeTB
-f80AnAmd2ec4y+c+bqFhhhrUUNljwu+t
-=cvTY
+iQIcBAEBCAAGBQJQmXlEAAoJEPqDWhW0r/LCrwsP+wQX5Y9PBGgMIcjBvknN+iQ6
+YgHzSRG54tTpO/dFP8Gk9bokmQS6hbu4pgAayIQqLYuntS0CkZCHvNlps11QHgee
++t+uLZTSfTt8MGJXHQef3TzfpGa2vf56SZ2W4/nBXK6gwijaMc/Zyt1ChhTfiier
+pbFUACHTHX8iz8pZ2a3QkAXcft7r5ptkALL9AQxbWMp4ZnXbVSzciiadOdJf6ddF
+5H2th0UMHRwkJuixTts0giUauem7AtQgQjWD7Oc9ckxmBCWCj+OF0mONSYYpYjXd
+7bJuecNaA9PDIe+UfhkulqKx8hIRDry8IhDZce8dj/mtACJyWvk+JXXGrYAYeV9z
+yCJI7usPBMTfE22+PSuslo1zfJE3V2WX3CSjEGsonoR+MnZv8dB/2LD4x/opbyjY
+Uhu2p10aCSKHrCzesrsJfk6MC12Tl3TMVtkJxNrxgitBh2YLcABBB6c9CeW2MzDQ
+84A5tMT8207w4AdwaZkMerDOeN89gv0ujjsacwztcPVHXQay4V/ZxxVAgMwpesUW
+YEyxRf5oXn6ioveu04AHMW9JiylRFmm5ygVbxmZZW2pbXcXN4/Hyy0xuDGHcRzmT
++nQGVa4uczjPtb7GmOyYhCJZm4v7hqzIt1Y/ZUAnyJ66ZT35+Hb9viGSuq4Y4ZvG
+23W1jAjKP6MD+cEa7BWW
+=ET4Q
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e4rat/e4rat-0.2.3-r1.ebuild b/sys-fs/e4rat/e4rat-0.2.3-r1.ebuild
new file mode 100644
index 000000000000..79d6f14ce903
--- /dev/null
+++ b/sys-fs/e4rat/e4rat-0.2.3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e4rat/e4rat-0.2.3-r1.ebuild,v 1.1 2012/11/06 20:55:32 hwoarang Exp $
+
+EAPI=4
+
+inherit cmake-utils linux-info
+
+DESCRIPTION="Toolset to accelerate the boot process and application startup"
+HOMEPAGE="http://e4rat.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	>=dev-libs/boost-1.42
+	sys-fs/e2fsprogs
+	sys-process/audit"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~AUDITSYSCALL"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.2-shared-build.patch
+	"${FILESDIR}"/${PN}-0.2.2-libdir.patch
+	"${FILESDIR}"/${P}-boostfsv3.patch
+)
+
+pkg_setup() {
+	check_extra_config
+}
+
+src_install() {
+	cmake-utils_src_install
+	# relocate binaries to /sbin. If someone knows of a better way to do it
+	# please do tell me
+	dodir sbin
+	find "${D}"/usr/sbin -type f -exec mv {} "${D}"/sbin/. \; \
+		|| die
+}
+
+pkg_postinst() {
+	elog
+	elog "Please consult the upstream wiki if you need help"
+	elog "configuring your system"
+	elog "http://e4rat.sourceforge.net/wiki/index.php/Main_Page"
+	elog
+	if has_version sys-apps/preload; then
+		elog "It appears you have sys-apps/preload installed. This may"
+		elog "has negative effects on ${PN}. You may want to disable preload"
+		elog "when using ${PN}."
+		elog "http://e4rat.sourceforge.net/wiki/index.php/Main_Page#Debian.2FUbuntu"
+	fi
+}
diff --git a/sys-fs/e4rat/files/e4rat-0.2.3-boostfsv3.patch b/sys-fs/e4rat/files/e4rat-0.2.3-boostfsv3.patch
new file mode 100644
index 000000000000..5450af1c2aa9
--- /dev/null
+++ b/sys-fs/e4rat/files/e4rat-0.2.3-boostfsv3.patch
@@ -0,0 +1,86 @@
+Bug #425422
+Fixes building against boost-1.50
+Port to boost FS v3
+
+--- CMakeLists.txt.orig	2012-09-07 03:17:55.515017487 +0200
++++ CMakeLists.txt	2012-09-13 19:54:18.160054076 +0200
+@@ -15,7 +15,6 @@
+ ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ 
+ set(Boost_USE_MULTITHREADED OFF)
+-add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
+ find_package(Boost 1.41 COMPONENTS system filesystem regex REQUIRED)
+ set(${PROJECT_NAME}_LIBRARIES   ${${PROJECT_NAME}_LIBRARIES}
+     ${Boost_LIBRARIES})
+--- src/config.cc.orig	2012-09-13 19:50:32.829871091 +0200
++++ src/config.cc	2012-09-13 19:55:37.023068153 +0200
+@@ -71,7 +71,7 @@
+         return;
+     }
+     
+-    tool_name = fs::path(argv[0]).filename();
++    tool_name = fs::path(argv[0]).filename().string();
+     found = tool_name.find_last_of("-");
+     if(found)
+         defaultSection = tool_name.substr(found+1);
+--- src/common.cc.orig	2012-09-13 19:58:06.187203344 +0200
++++ src/common.cc	2012-09-13 19:59:34.752096130 +0200
+@@ -157,7 +157,7 @@
+         p /= filesearch;
+     }
+     // Initialize regex filter - use * as default if nothing is given in filesearch
+-    std::string f( p.has_filename() ? p.filename() : "*");
++    std::string f( p.has_filename() ? p.filename().string() : "*");
+ 
+     fs::path dir(system_complete(p).parent_path());
+     if( is_directory(dir) )
+@@ -166,8 +166,8 @@
+              it!=boost::filesystem::directory_iterator();
+              ++it )
+         {
+-            if( boost::regex_match( it->leaf(), path2regex(f) ) )
+-                fileset.push_back(it->string());
++            if( boost::regex_match( it->path().filename().string(), path2regex(f) ) )
++                fileset.push_back(it->path().filename().string());
+         }
+     return fileset;
+ }
+--- src/e4rat-collect.cc.orig	2012-09-13 20:03:40.185027797 +0200
++++ src/e4rat-collect.cc	2012-09-13 20:03:54.404850024 +0200
+@@ -396,7 +396,7 @@
+          * Parse application list given as arguments
+          */
+         for ( ; optind < argc; optind++)
+-            project.observeApp(fs::path(argv[optind]).filename());
++            project.observeApp(fs::path(argv[optind]).filename().string());
+ 
+         /*
+          * Parse application list on stdin
+--- src/device.cc.orig	2012-09-13 20:00:40.232277516 +0200
++++ src/device.cc	2012-09-13 20:03:11.026392331 +0200
+@@ -196,13 +196,13 @@
+         it != end_itr;
+         ++it )
+     {
+-        if(it->filename() == "root")
++        if(it->path().filename().string() == "root")
+             continue;
+-        if(lstat(it->string().c_str(), &st))
++        if(lstat(it->path().filename().c_str(), &st))
+             continue;
+         if(st.st_rdev == get()->devno)
+         {
+-            get()->deviceName = it->filename();
++            get()->deviceName = it->path().filename().string();
+             get()->devicePath = "/dev/" + get()->deviceName;
+             return 0;
+         }
+@@ -225,7 +225,7 @@
+             // the minor number of virtual filesystems are allocated dynamically in function set_anon_super() in fs/super.c
+             // for convenience set deviceName and devicePath to a common name
+             get()->deviceName = "virtual file system";
+-            get()->devicePath = get()->mount_point.filename();
++            get()->devicePath = get()->mount_point.filename().string();
+             return 0;
+         case 2:
+             ss << "fd";