Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/e4rat/, sys-fs/e4rat/files/
Date: Sat, 04 Feb 2017 15:40:28
Message-Id: 1486222785.da1f2e1db822b2e107135686fb5f09110582a47d.pacho@gentoo
1 commit: da1f2e1db822b2e107135686fb5f09110582a47d
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 4 15:37:20 2017 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 4 15:39:45 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da1f2e1d
7
8 sys-fs/e4rat: Drop old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 sys-fs/e4rat/Manifest | 1 -
13 sys-fs/e4rat/e4rat-0.2.3-r1.ebuild | 61 ----------------
14 sys-fs/e4rat/files/e4rat-0.2.3-boostfsv3.patch | 86 -----------------------
15 sys-fs/e4rat/files/e4rat-libdir.patch | 26 -------
16 sys-fs/e4rat/files/e4rat-shared-build.patch | 96 --------------------------
17 5 files changed, 270 deletions(-)
18
19 diff --git a/sys-fs/e4rat/Manifest b/sys-fs/e4rat/Manifest
20 index f057cb6..3300b86 100644
21 --- a/sys-fs/e4rat/Manifest
22 +++ b/sys-fs/e4rat/Manifest
23 @@ -1,2 +1 @@
24 DIST e4rat-0.2.4_pre20141201.tar.xz 60408 SHA256 757d9d76b395a8b5092205bf623ba73860546f5f13efdf6b6347217b4ebe9e4b SHA512 61a53f6ac420392df5894d3f76de28c5d2e33fd3a6548cf8c9de52818bf937ba8bf8629db1b89103faa73b660548d7e467e17d7f2794a4100ca07971ded0cfb9 WHIRLPOOL 6c33956a6a601fd05d89325a2d2fa96ddf00c7e8130ac599c39e59e1ee3d3c21fc5ce712421969d96e96cfadd91fdbe6acc24d31d7acf413632fb49a575edeae
25 -DIST e4rat_0.2.3_src.tar.gz 72459 SHA256 f6feda9618eff0f9442baf771b4776b634e5a2f39e678c10e4c7946b2c6a96a0 SHA512 e1b78b7d84e17f0ded494217f2eb5912401d365844bc966d649682979e1d3deaceab6e9d820fb7fbec819e15133aa2af61131325204620d9b16a3c7638d7fdb7 WHIRLPOOL 912632a516bcefe2171bd1bc207394396ecec9cc74351b2afa511258cb1dfdbb38d2e5fe41a7af747addb92a5f8ff8b2b2321dee8f51d8e8bf7f919183e80c8c
26
27 diff --git a/sys-fs/e4rat/e4rat-0.2.3-r1.ebuild b/sys-fs/e4rat/e4rat-0.2.3-r1.ebuild
28 deleted file mode 100644
29 index d6c7a2d..00000000
30 --- a/sys-fs/e4rat/e4rat-0.2.3-r1.ebuild
31 +++ /dev/null
32 @@ -1,61 +0,0 @@
33 -# Copyright 1999-2013 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -# $Id$
36 -
37 -EAPI=5
38 -
39 -inherit cmake-utils linux-info readme.gentoo
40 -
41 -DESCRIPTION="Toolset to accelerate the boot process and application startup"
42 -HOMEPAGE="http://e4rat.sourceforge.net/"
43 -SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
44 -
45 -LICENSE="GPL-3"
46 -SLOT="0"
47 -KEYWORDS="amd64 x86"
48 -IUSE=""
49 -
50 -DEPEND="dev-lang/perl:=
51 - >=dev-libs/boost-1.42:=
52 - sys-fs/e2fsprogs
53 - sys-process/audit
54 - sys-process/lsof"
55 -RDEPEND="${DEPEND}"
56 -
57 -CONFIG_CHECK="~AUDITSYSCALL"
58 -
59 -PATCHES=(
60 - "${FILESDIR}"/${PN}-0.2.2-shared-build.patch
61 - "${FILESDIR}"/${PN}-0.2.2-libdir.patch
62 - "${FILESDIR}"/${P}-boostfsv3.patch
63 -)
64 -
65 -pkg_setup() {
66 - check_extra_config
67 - DOC_CONTENTS="
68 - To launch systemd from e4rat you simply need to edit /etc/e4rat.conf
69 - and set:\n
70 - ; path to init process binary (DEFAULT: /sbin/init)\n
71 - init /usr/lib/systemd/systemd"
72 -}
73 -
74 -src_install() {
75 - cmake-utils_src_install
76 - # relocate binaries to /sbin. If someone knows of a better way to do it
77 - # please do tell me
78 - dodir sbin
79 - find "${D}"/usr/sbin -type f -exec mv {} "${D}"/sbin/. \; \
80 - || die
81 -
82 - dodoc README
83 - readme.gentoo_create_doc
84 -}
85 -
86 -pkg_postinst() {
87 - readme.gentoo_print_elog
88 - if has_version sys-apps/preload; then
89 - elog "It appears you have sys-apps/preload installed. This may"
90 - elog "has negative effects on ${PN}. You may want to disable preload"
91 - elog "when using ${PN}."
92 - fi
93 -}
94
95 diff --git a/sys-fs/e4rat/files/e4rat-0.2.3-boostfsv3.patch b/sys-fs/e4rat/files/e4rat-0.2.3-boostfsv3.patch
96 deleted file mode 100644
97 index 5450af1..00000000
98 --- a/sys-fs/e4rat/files/e4rat-0.2.3-boostfsv3.patch
99 +++ /dev/null
100 @@ -1,86 +0,0 @@
101 -Bug #425422
102 -Fixes building against boost-1.50
103 -Port to boost FS v3
104 -
105 ---- CMakeLists.txt.orig 2012-09-07 03:17:55.515017487 +0200
106 -+++ CMakeLists.txt 2012-09-13 19:54:18.160054076 +0200
107 -@@ -15,7 +15,6 @@
108 - ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
109 -
110 - set(Boost_USE_MULTITHREADED OFF)
111 --add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
112 - find_package(Boost 1.41 COMPONENTS system filesystem regex REQUIRED)
113 - set(${PROJECT_NAME}_LIBRARIES ${${PROJECT_NAME}_LIBRARIES}
114 - ${Boost_LIBRARIES})
115 ---- src/config.cc.orig 2012-09-13 19:50:32.829871091 +0200
116 -+++ src/config.cc 2012-09-13 19:55:37.023068153 +0200
117 -@@ -71,7 +71,7 @@
118 - return;
119 - }
120 -
121 -- tool_name = fs::path(argv[0]).filename();
122 -+ tool_name = fs::path(argv[0]).filename().string();
123 - found = tool_name.find_last_of("-");
124 - if(found)
125 - defaultSection = tool_name.substr(found+1);
126 ---- src/common.cc.orig 2012-09-13 19:58:06.187203344 +0200
127 -+++ src/common.cc 2012-09-13 19:59:34.752096130 +0200
128 -@@ -157,7 +157,7 @@
129 - p /= filesearch;
130 - }
131 - // Initialize regex filter - use * as default if nothing is given in filesearch
132 -- std::string f( p.has_filename() ? p.filename() : "*");
133 -+ std::string f( p.has_filename() ? p.filename().string() : "*");
134 -
135 - fs::path dir(system_complete(p).parent_path());
136 - if( is_directory(dir) )
137 -@@ -166,8 +166,8 @@
138 - it!=boost::filesystem::directory_iterator();
139 - ++it )
140 - {
141 -- if( boost::regex_match( it->leaf(), path2regex(f) ) )
142 -- fileset.push_back(it->string());
143 -+ if( boost::regex_match( it->path().filename().string(), path2regex(f) ) )
144 -+ fileset.push_back(it->path().filename().string());
145 - }
146 - return fileset;
147 - }
148 ---- src/e4rat-collect.cc.orig 2012-09-13 20:03:40.185027797 +0200
149 -+++ src/e4rat-collect.cc 2012-09-13 20:03:54.404850024 +0200
150 -@@ -396,7 +396,7 @@
151 - * Parse application list given as arguments
152 - */
153 - for ( ; optind < argc; optind++)
154 -- project.observeApp(fs::path(argv[optind]).filename());
155 -+ project.observeApp(fs::path(argv[optind]).filename().string());
156 -
157 - /*
158 - * Parse application list on stdin
159 ---- src/device.cc.orig 2012-09-13 20:00:40.232277516 +0200
160 -+++ src/device.cc 2012-09-13 20:03:11.026392331 +0200
161 -@@ -196,13 +196,13 @@
162 - it != end_itr;
163 - ++it )
164 - {
165 -- if(it->filename() == "root")
166 -+ if(it->path().filename().string() == "root")
167 - continue;
168 -- if(lstat(it->string().c_str(), &st))
169 -+ if(lstat(it->path().filename().c_str(), &st))
170 - continue;
171 - if(st.st_rdev == get()->devno)
172 - {
173 -- get()->deviceName = it->filename();
174 -+ get()->deviceName = it->path().filename().string();
175 - get()->devicePath = "/dev/" + get()->deviceName;
176 - return 0;
177 - }
178 -@@ -225,7 +225,7 @@
179 - // the minor number of virtual filesystems are allocated dynamically in function set_anon_super() in fs/super.c
180 - // for convenience set deviceName and devicePath to a common name
181 - get()->deviceName = "virtual file system";
182 -- get()->devicePath = get()->mount_point.filename();
183 -+ get()->devicePath = get()->mount_point.filename().string();
184 - return 0;
185 - case 2:
186 - ss << "fd";
187
188 diff --git a/sys-fs/e4rat/files/e4rat-libdir.patch b/sys-fs/e4rat/files/e4rat-libdir.patch
189 deleted file mode 100644
190 index 885e616..00000000
191 --- a/sys-fs/e4rat/files/e4rat-libdir.patch
192 +++ /dev/null
193 @@ -1,26 +0,0 @@
194 -From b2413a77f3f11c6722ea7e83aafbaa3fc5c73376 Mon Sep 17 00:00:00 2001
195 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@××××××××××.pl>
196 -Date: Sun, 11 Dec 2011 18:39:59 +0100
197 -Subject: [PATCH] Fix installing into libdir.
198 -
199 ----
200 - e4rat-0.2.1/src/CMakeLists.txt | 2 --
201 - 1 files changed, 0 insertions(+), 2 deletions(-)
202 -
203 -diff --git a/e4rat-0.2.1/src/CMakeLists.txt b/e4rat-0.2.1/src/CMakeLists.txt
204 -index d379ec6..9fc7492 100644
205 ---- a/e4rat-0.2.1/src/CMakeLists.txt
206 -+++ b/e4rat-0.2.1/src/CMakeLists.txt
207 -@@ -163,8 +163,7 @@ endif(NOT HAVE_64_BIT)
208 -
209 - INSTALL(TARGETS ${${PROJECT_NAME}_TARGETS}
210 - RUNTIME DESTINATION "sbin"
211 -- LIBRARY DESTINATION "lib"
212 -+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
213 -- ARCHIVE DESTINATION "lib"
214 - )
215 -
216 - INSTALL(DIRECTORY DESTINATION "/var/lib/${PROJECT_NAME}")
217 ---
218 -1.7.8.110.g4cb5d1.dirty
219 -
220
221 diff --git a/sys-fs/e4rat/files/e4rat-shared-build.patch b/sys-fs/e4rat/files/e4rat-shared-build.patch
222 deleted file mode 100644
223 index 2e322e2..00000000
224 --- a/sys-fs/e4rat/files/e4rat-shared-build.patch
225 +++ /dev/null
226 @@ -1,96 +0,0 @@
227 -From d9114b018b79afdcedb59621dfc13a0423c65fae Mon Sep 17 00:00:00 2001
228 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
229 -Date: Sat, 10 Dec 2011 23:00:35 +0100
230 -Subject: [PATCH] Link with and install shared libraries.
231 -
232 ----
233 - e4rat-0.2.1/CMakeLists.txt | 1 -
234 - e4rat-0.2.1/src/CMakeLists.txt | 13 +------------
235 - e4rat-0.2.1/src/cmake/Findaudit.cmake | 2 +-
236 - e4rat-0.2.1/src/cmake/Findauparse.cmake | 2 +-
237 - 4 files changed, 3 insertions(+), 15 deletions(-)
238 -
239 -diff --git a/e4rat-0.2.1/CMakeLists.txt b/e4rat-0.2.1/CMakeLists.txt
240 -index 72b0681..e5e64cf 100644
241 ---- a/e4rat-0.2.1/CMakeLists.txt
242 -+++ b/e4rat-0.2.1/CMakeLists.txt
243 -@@ -14,7 +14,6 @@ IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
244 - set(CMAKE_INSTALL_PREFIX "/" CACHE PATH "e4rat install prefix" FORCE)
245 - ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
246 -
247 --set(Boost_USE_STATIC_LIBS ON)
248 - set(Boost_USE_MULTITHREADED OFF)
249 - add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
250 - find_package(Boost 1.41 COMPONENTS system filesystem regex REQUIRED)
251 -diff --git a/e4rat-0.2.1/src/CMakeLists.txt b/e4rat-0.2.1/src/CMakeLists.txt
252 -index d379ec6..4f8c12e 100644
253 ---- a/e4rat-0.2.1/src/CMakeLists.txt
254 -+++ b/e4rat-0.2.1/src/CMakeLists.txt
255 -@@ -113,21 +113,12 @@ IF(CMAKE_BUILD_TYPE STREQUAL "debug")
256 - )
257 - ENDIF(CMAKE_BUILD_TYPE STREQUAL "debug")
258 -
259 --# On 64 bit architecture you cannot link a static to a shared library
260 --# Therefore -static-libstdc++ will fail.
261 --if(HAVE_64_BIT)
262 -- add_library(${PROJECT_NAME}-core STATIC
263 -- ${${PROJECT_NAME}-core_SRC}
264 -- )
265 --else(HAVE_64_BIT)
266 - add_library(${PROJECT_NAME}-core SHARED
267 - ${${PROJECT_NAME}-core_SRC}
268 - )
269 - set_target_properties(${PROJECT_NAME}-core PROPERTIES
270 - SOVERSION 0
271 -- LINK_FLAGS "-static-libgcc -static-libstdc++"
272 - )
273 --endif(HAVE_64_BIT)
274 -
275 - target_link_libraries(${PROJECT_NAME}-core
276 - ${${PROJECT_NAME}_LIBRARIES}
277 -@@ -140,15 +131,13 @@ foreach( EXE ${PROJECT_NAME}-collect
278 - TARGET_LINK_LIBRARIES(${EXE}
279 - ${PROJECT_NAME}-core
280 - )
281 -- set_target_properties(${EXE} PROPERTIES
282 -- LINK_FLAGS "-static-libgcc -static-libstdc++"
283 -- )
284 - endforeach( EXE )
285 -
286 - ###
287 - # install project targets
288 - ###
289 - set(${PROJECT_NAME}_TARGETS
290 -+ ${PROJECT_NAME}-core
291 - ${PROJECT_NAME}-collect
292 - ${PROJECT_NAME}-preload
293 - ${PROJECT_NAME}-realloc
294 -diff --git a/e4rat-0.2.1/src/cmake/Findaudit.cmake b/e4rat-0.2.1/src/cmake/Findaudit.cmake
295 -index 32ac636..d8de45a 100644
296 ---- a/e4rat-0.2.1/src/cmake/Findaudit.cmake
297 -+++ b/e4rat-0.2.1/src/cmake/Findaudit.cmake
298 -@@ -1,7 +1,7 @@
299 - FIND_PATH(AUDIT_INCLUDE_DIR libaudit.h /usr/include
300 - /usr/local/include)
301 -
302 --FIND_LIBRARY(AUDIT_LIBRARY NAMES libaudit.a PATH /usr/lib /usr/local/lib)
303 -+FIND_LIBRARY(AUDIT_LIBRARY NAMES audit PATH /usr/lib /usr/local/lib)
304 -
305 - IF (AUDIT_INCLUDE_DIR AND AUDIT_LIBRARY)
306 - SET(AUDIT_FOUND TRUE)
307 -diff --git a/e4rat-0.2.1/src/cmake/Findauparse.cmake b/e4rat-0.2.1/src/cmake/Findauparse.cmake
308 -index 7db0511..3771cd5 100644
309 ---- a/e4rat-0.2.1/src/cmake/Findauparse.cmake
310 -+++ b/e4rat-0.2.1/src/cmake/Findauparse.cmake
311 -@@ -1,7 +1,7 @@
312 - FIND_PATH(AUPARSE_INCLUDE_DIR auparse.h /usr/include
313 - /usr/local/include)
314 -
315 --FIND_LIBRARY(AUPARSE_LIBRARY NAMES libauparse.a PATH /usr/lib /usr/local/lib)
316 -+FIND_LIBRARY(AUPARSE_LIBRARY NAMES auparse PATH /usr/lib /usr/local/lib)
317 -
318 - IF (AUPARSE_INCLUDE_DIR AND AUPARSE_LIBRARY)
319 - SET(AUPARSE_FOUND TRUE)
320 ---
321 -1.7.8.110.g4cb5d1.dirty
322 -