Gentoo Archives: gentoo-commits

From: Slawek Lis <slis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/wimlib/files/, app-arch/wimlib/
Date: Sat, 03 Nov 2018 17:50:21
Message-Id: 1541267385.f6b790694c60881945587cb540e793bc9a431236.slis@gentoo
1 commit: f6b790694c60881945587cb540e793bc9a431236
2 Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 3 17:49:45 2018 +0000
4 Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 3 17:49:45 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6b79069
7
8 app-arch/wimlib: add correct gentoo path to syslinux files
9
10 Closes: https://bugs.gentoo.org/669370
11 Signed-off-by: Slawek Lis <slis <AT> gentoo.org>
12 Package-Manager: Portage-2.3.51, Repoman-2.3.11
13
14 app-arch/wimlib/files/syslinux-path.patch | 25 +++++++++++++++++++++++++
15 app-arch/wimlib/wimlib-1.12.0.ebuild | 4 +++-
16 2 files changed, 28 insertions(+), 1 deletion(-)
17
18 diff --git a/app-arch/wimlib/files/syslinux-path.patch b/app-arch/wimlib/files/syslinux-path.patch
19 new file mode 100644
20 index 00000000000..6fd5bcd726c
21 --- /dev/null
22 +++ b/app-arch/wimlib/files/syslinux-path.patch
23 @@ -0,0 +1,25 @@
24 +--- a/programs/mkwinpeimg 2017-07-29 13:52:09.000000000 -0700
25 ++++ b/programs/mkwinpeimg 2018-10-22 19:14:35.170566559 -0700
26 +@@ -488,7 +488,8 @@
27 + for biosdir in \
28 + /usr/lib/syslinux/modules/bios \
29 + /usr/lib/syslinux/bios \
30 +- /usr/lib/syslinux
31 ++ /usr/lib/syslinux \
32 ++ /usr/share/syslinux
33 + do
34 + if [ -e "$biosdir/chain.c32" ]; then
35 + break
36 +--- a/programs/mkwinpeimg.in 2017-07-15 13:49:06.000000000 -0700
37 ++++ b/programs/mkwinpeimg.in 2018-10-22 19:16:59.323070604 -0700
38 +@@ -488,7 +488,8 @@
39 + for biosdir in \
40 + /usr/lib/syslinux/modules/bios \
41 + /usr/lib/syslinux/bios \
42 +- /usr/lib/syslinux
43 ++ /usr/lib/syslinux \
44 ++ /usr/share/syslinux
45 + do
46 + if [ -e "$biosdir/chain.c32" ]; then
47 + break
48 +
49
50 diff --git a/app-arch/wimlib/wimlib-1.12.0.ebuild b/app-arch/wimlib/wimlib-1.12.0.ebuild
51 index efc6d34190b..77b9c95e275 100644
52 --- a/app-arch/wimlib/wimlib-1.12.0.ebuild
53 +++ b/app-arch/wimlib/wimlib-1.12.0.ebuild
54 @@ -1,4 +1,4 @@
55 -# Copyright 1999-2018 Gentoo Foundation
56 +# Copyright 1999-2018 Gentoo Authors
57 # Distributed under the terms of the GNU General Public License v2
58
59 EAPI=6
60 @@ -24,6 +24,8 @@ SLOT="0"
61 IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl threads yasm"
62 REQUIRED_USE="cpu_flags_x86_ssse3? ( !openssl )"
63
64 +PATCHES=( "${FILESDIR}/syslinux-path.patch" )
65 +
66 RDEPEND="
67 dev-libs/libxml2:2
68 ntfs? ( sys-fs/ntfs3g )