[gentoo-commits] repo/gentoo:master commit in: app-arch/wimlib/files/, app-arch/wimlib/

[gentoo-commits] repo/gentoo:master commit in: app-arch/wimlib/files/, app-arch/wimlib/

[Slawek Lis]

commit:     f6b790694c60881945587cb540e793bc9a431236
Author:     Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  3 17:49:45 2018 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Sat Nov  3 17:49:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6b79069

app-arch/wimlib: add correct gentoo path to syslinux files

Closes: https://bugs.gentoo.org/669370
Signed-off-by: Slawek Lis <slis <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-arch/wimlib/files/syslinux-path.patch | 25 +++++++++++++++++++++++++
 app-arch/wimlib/wimlib-1.12.0.ebuild      |  4 +++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/app-arch/wimlib/files/syslinux-path.patch b/app-arch/wimlib/files/syslinux-path.patch
new file mode 100644
index 00000000000..6fd5bcd726c
--- /dev/null
+++ b/app-arch/wimlib/files/syslinux-path.patch
@@ -0,0 +1,25 @@
+--- a/programs/mkwinpeimg	2017-07-29 13:52:09.000000000 -0700
++++ b/programs/mkwinpeimg	2018-10-22 19:14:35.170566559 -0700
+@@ -488,7 +488,8 @@
+ 	for biosdir in				\
+ 		/usr/lib/syslinux/modules/bios	\
+ 		/usr/lib/syslinux/bios		\
+-		/usr/lib/syslinux
++		/usr/lib/syslinux \
++		/usr/share/syslinux
+ 	do
+ 		if [ -e "$biosdir/chain.c32" ]; then
+ 			break
+--- a/programs/mkwinpeimg.in	2017-07-15 13:49:06.000000000 -0700
++++ b/programs/mkwinpeimg.in	2018-10-22 19:16:59.323070604 -0700
+@@ -488,7 +488,8 @@
+ 	for biosdir in				\
+ 		/usr/lib/syslinux/modules/bios	\
+ 		/usr/lib/syslinux/bios		\
+-		/usr/lib/syslinux
++		/usr/lib/syslinux \
++		/usr/share/syslinux
+ 	do
+ 		if [ -e "$biosdir/chain.c32" ]; then
+ 			break
+

diff --git a/app-arch/wimlib/wimlib-1.12.0.ebuild b/app-arch/wimlib/wimlib-1.12.0.ebuild
index efc6d34190b..77b9c95e275 100644
--- a/app-arch/wimlib/wimlib-1.12.0.ebuild
+++ b/app-arch/wimlib/wimlib-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,8 @@ SLOT="0"
 IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl threads yasm"
 REQUIRED_USE="cpu_flags_x86_ssse3? ( !openssl )"
 
+PATCHES=( "${FILESDIR}/syslinux-path.patch" )
+
 RDEPEND="
 	dev-libs/libxml2:2
 	ntfs? ( sys-fs/ntfs3g )