[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2024-09-30 Thread Sam James
commit: 6ee3a74ab5f47e260b0fe872203160f513904a2a
Author: Sam James  gentoo  org>
AuthorDate: Mon Sep 30 14:06:05 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 30 14:06:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ee3a74a

sys-boot/refind: Stabilize 0.14.2-r2 x86, #940522

Signed-off-by: Sam James  gentoo.org>

 sys-boot/refind/refind-0.14.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/refind/refind-0.14.2-r2.ebuild 
b/sys-boot/refind/refind-0.14.2-r2.ebuild
index cad032fc658b..fa000f8dbeb4 100644
--- a/sys-boot/refind/refind-0.14.2-r2.ebuild
+++ b/sys-boot/refind/refind-0.14.2-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${PN}-src-${PV}.t
 
 LICENSE="BSD CC-BY-SA-3.0 CC-BY-SA-4.0 FDL-1.3 GPL-2+ GPL-3+ LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} doc"
 



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2024-09-30 Thread Sam James
commit: 67a711359d7a5b6d3c4d1f2e7c3fb6bd6ce37707
Author: Sam James  gentoo  org>
AuthorDate: Mon Sep 30 14:06:06 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 30 14:06:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67a71135

sys-boot/refind: Stabilize 0.14.2-r2 amd64, #940522

Signed-off-by: Sam James  gentoo.org>

 sys-boot/refind/refind-0.14.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/refind/refind-0.14.2-r2.ebuild 
b/sys-boot/refind/refind-0.14.2-r2.ebuild
index fa000f8dbeb4..1ad48b3b6088 100644
--- a/sys-boot/refind/refind-0.14.2-r2.ebuild
+++ b/sys-boot/refind/refind-0.14.2-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${PN}-src-${PV}.t
 
 LICENSE="BSD CC-BY-SA-3.0 CC-BY-SA-4.0 FDL-1.3 GPL-2+ GPL-3+ LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} doc"
 



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2024-08-28 Thread Viorel Munteanu
commit: 08a69400ed7aa6f0b3d522f012924f547f31e4bb
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Wed Aug 28 15:07:24 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Wed Aug 28 15:14:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08a69400

sys-boot/refind: fix compilation on different locales

Bug: https://bugs.gentoo.org/938580
Signed-off-by: Viorel Munteanu  gentoo.org>

 sys-boot/refind/refind-0.14.2-r2.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-boot/refind/refind-0.14.2-r2.ebuild 
b/sys-boot/refind/refind-0.14.2-r2.ebuild
index 5755a725f1bf..cad032fc658b 100644
--- a/sys-boot/refind/refind-0.14.2-r2.ebuild
+++ b/sys-boot/refind/refind-0.14.2-r2.ebuild
@@ -41,7 +41,7 @@ checktools() {
# llvm-objcopy does not support EFI target, try to use binutils 
objcopy or fail
tc-export OBJCOPY
OBJCOPY="${OBJCOPY/llvm-/}"
-   LANG=C LC_ALL=C "${OBJCOPY}" --help | grep -q '\ 
/dev/null | grep ^install: | cut -f2 -d' ')/include
+   local -x CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-search-dirs 2> 
/dev/null | grep ^install: | cut -f2 -d' ')/include
elif tc-is-clang; then
-   local -x CPPINCLUDEDIR=$(LANG=C ${CC} -print-resource-dir 2> 
/dev/null)/include
+   local -x CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-resource-dir 2> 
/dev/null)/include
local -x EXTRACFLAGS=-D__DEFINED_wchar_t
fi
 



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/, sys-boot/refind/files/

2024-08-25 Thread Viorel Munteanu
commit: e0d73710476266df0532c7cbaae7da5404bd4eab
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Fri Aug 23 15:07:47 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Mon Aug 26 04:28:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0d73710

sys-boot/refind: fix build on musl

Bug: https://bugs.gentoo.org/938012
Closes: https://github.com/gentoo/gentoo/pull/38263
Signed-off-by: Viorel Munteanu  gentoo.org>

 .../refind-0.14.2-fix-freestanding-on-musl.patch   |  63 
 sys-boot/refind/refind-0.14.2-r2.ebuild| 172 +
 2 files changed, 235 insertions(+)

diff --git a/sys-boot/refind/files/refind-0.14.2-fix-freestanding-on-musl.patch 
b/sys-boot/refind/files/refind-0.14.2-fix-freestanding-on-musl.patch
new file mode 100644
index ..42f8d6b13a79
--- /dev/null
+++ b/sys-boot/refind/files/refind-0.14.2-fix-freestanding-on-musl.patch
@@ -0,0 +1,63 @@
+On amd64, musl typedefs wchar_t to int, conflicting with -fshort-wchar.
+Also, /usr/include is searched before the compiler provided include directory.
+As a workaround, use -nostdinc and switch them around.
+
+Add missing `#include ` where wchar_t was defined indirectly by
+other standard includefiles.
+
+We need and extra -D for clang, where wchar_t is defined in
+/usr/include/allbits.h and gets included by other headers, conflicting with
+wchar_t already defined in stddef.h.
+
+See also:  https://bugs.gentoo.org/938012
+   https://bugs.gentoo.org/881131
+   https://bugs.gentoo.org/832018
+
+--- a/Make.common
 b/Make.common
+@@ -79,7 +79,7 @@
+ #
+ 
+ # ...for both GNU-EFI and TianoCore
+-OPTIMFLAGS  = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns
++OPTIMFLAGS  = -Os -fno-strict-aliasing -ffreestanding -nostdinc -isystem 
$(CPPINCLUDEDIR) -isystem $(EPREFIX)/usr/include $(EXTRACFLAGS)
+ CFLAGS  = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall
+ 
+ # ...for GNU-EFI
+@@ -168,7 +168,7 @@
+   SUBSYSTEM_LDFLAG = -defsym=EFI_SUBSYSTEM=0xa
+   LDFLAGS += --warn-common --no-undefined --fatal-warnings
+ 
+-  ARCH_CFLAGS = -fno-merge-constants -ffreestanding -DEFIAARCH64
++  ARCH_CFLAGS = -fno-merge-constants -ffreestanding -DEFIAARCH64 -nostdinc 
-isystem $(CPPINCLUDEDIR) -isystem $(EPREFIX)/usr/include $(EXTRACFLAGS)
+   ifeq ($(MAKEWITH),TIANO)
+ ARCH_CFLAGS += -mcmodel=large -Wno-address -Wno-missing-braces 
-Wno-array-bounds -ffunction-sections -fdata-sections
+   endif
+--- a/libeg/lodepng.h
 b/libeg/lodepng.h
+@@ -32,6 +32,7 @@
+ #ifndef LODEPNG_H
+ #define LODEPNG_H
+ 
++#include 
+ #include  /*for size_t*/
+ 
+ // Below block of lines required for GNU-EFI and TianoCore (program hangs
+--- a/libeg/nanojpeg.c
 b/libeg/nanojpeg.c
+@@ -211,6 +211,7 @@
+ 
+ #ifdef  _NJ_EXAMPLE_PROGRAM
+ 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -275,6 +276,7 @@
+ #endif
+ 
+ #if NJ_USE_LIBC
++#include 
+ #include 
+ #include 
+ #define njAllocMem malloc

diff --git a/sys-boot/refind/refind-0.14.2-r2.ebuild 
b/sys-boot/refind/refind-0.14.2-r2.ebuild
new file mode 100644
index ..5755a725f1bf
--- /dev/null
+++ b/sys-boot/refind/refind-0.14.2-r2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature secureboot toolchain-funcs
+
+DESCRIPTION="The UEFI Boot Manager by Rod Smith"
+HOMEPAGE="https://www.rodsbooks.com/refind/";
+SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz";
+
+LICENSE="BSD CC-BY-SA-3.0 CC-BY-SA-4.0 FDL-1.3 GPL-2+ GPL-3+ LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} doc"
+
+DEPEND="sys-boot/gnu-efi"
+
+# for ld.bfd and objcopy
+BDEPEND="sys-devel/binutils"
+
+DOCS=( README.txt NEWS.txt )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.14.0.2-clang.patch
+   "${FILESDIR}"/${P}-fix-gnu-efi-3.0.18.patch
+   "${FILESDIR}"/${P}-fix-freestanding-on-musl.patch
+)
+
+checktools() {
+   if [[ ${MERGE_TYPE} != "binary" ]]; then
+   # bug #832018
+   tc-export LD
+   tc-ld-force-bfd
+   # the makefile calls LD directly, so try to fix LD too
+   LD="${LD/.lld/.bfd}"
+   tc-ld-is-lld "${LD}" && die "Linking with lld produces broken 
executables and may lead to unbootable system"
+
+   # bug #732256
+   # llvm-objcopy does not support EFI target, try to use binutils 
objcopy or fail
+   tc-export OBJCOPY
+   OBJCOPY="${OBJCOPY/llvm-/}"
+   LANG=C LC_ALL=C "${OBJCOPY}" --help | grep -q '\ 
/dev/null | grep ^install: | cut -f2 -d' ')/include
+   elif tc-is-clang; then
+   local -x CPPINCLUDEDIR=$(LANG=C ${CC} -print-resource-dir 2> 
/dev/null)/include
+   local -x E

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2024-08-25 Thread Arthur Zamarin
commit: 9a07739c8c6f41556b7df785968b3c3761ad4548
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 25 09:51:28 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 25 09:51:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a07739c

sys-boot/refind: Stabilize 0.14.2-r1 x86, #938484

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-boot/refind/refind-0.14.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/refind/refind-0.14.2-r1.ebuild 
b/sys-boot/refind/refind-0.14.2-r1.ebuild
index 1732d360c179..c740e9743943 100644
--- a/sys-boot/refind/refind-0.14.2-r1.ebuild
+++ b/sys-boot/refind/refind-0.14.2-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${PN}-src-${PV}.t
 
 LICENSE="BSD CC-BY-SA-3.0 CC-BY-SA-4.0 FDL-1.3 GPL-2+ GPL-3+ LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} doc"
 



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2024-08-25 Thread Arthur Zamarin
commit: f7f500fb6cb41b3c22b58c4023620e90b419a490
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 25 09:51:27 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 25 09:51:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7f500fb

sys-boot/refind: Stabilize 0.14.2-r1 amd64, #938484

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-boot/refind/refind-0.14.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/refind/refind-0.14.2-r1.ebuild 
b/sys-boot/refind/refind-0.14.2-r1.ebuild
index d3866389c5cb..1732d360c179 100644
--- a/sys-boot/refind/refind-0.14.2-r1.ebuild
+++ b/sys-boot/refind/refind-0.14.2-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${PN}-src-${PV}.t
 
 LICENSE="BSD CC-BY-SA-3.0 CC-BY-SA-4.0 FDL-1.3 GPL-2+ GPL-3+ LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} doc"
 



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/, sys-boot/refind/files/

2024-07-25 Thread Viorel Munteanu
commit: 7cea90df5543b29b629b40e12235e3cc864bc698
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Thu Jul 25 07:06:48 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Thu Jul 25 07:09:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cea90df

sys-boot/refind: add fix for gnu-efi 3.0.18

Closes: https://bugs.gentoo.org/934474
Closes: https://bugs.gentoo.org/934320
Signed-off-by: Viorel Munteanu  gentoo.org>

 .../files/refind-0.14.2-fix-gnu-efi-3.0.18.patch   | 77 ++
 ...efind-0.14.2.ebuild => refind-0.14.2-r1.ebuild} | 25 ++-
 2 files changed, 82 insertions(+), 20 deletions(-)

diff --git a/sys-boot/refind/files/refind-0.14.2-fix-gnu-efi-3.0.18.patch 
b/sys-boot/refind/files/refind-0.14.2-fix-gnu-efi-3.0.18.patch
new file mode 100644
index ..b5d9d2692883
--- /dev/null
+++ b/sys-boot/refind/files/refind-0.14.2-fix-gnu-efi-3.0.18.patch
@@ -0,0 +1,77 @@
+The same commit from gnu-efi that changed CopyMem in a way that broke refind 
also changed SetMem.
+This patch attempts to fix it in the same way upstream fixed CopyMem.
+
+The commit: 
https://sourceforge.net/p/gnu-efi/code/ci/deb8a7f267d96299b9aa41300539f617db54c2a9/
+The bug: https://bugs.gentoo.org/934474
+
+--- a/gptsync/gptsync.c
 b/gptsync/gptsync.c
+@@ -164,7 +164,7 @@ static UINTN write_mbr(VOID)
+ }
+ if (!have_bootcode) {
+ // no boot code found in the MBR, add the syslinux MBR code
+-SetMem(sector, MBR_BOOTCODE_SIZE, 0);
++refit_call3_wrapper(gBS->SetMem, sector, MBR_BOOTCODE_SIZE, 0);
+ refit_call3_wrapper(gBS->CopyMem, sector, syslinux_mbr, 
SYSLINUX_MBR_SIZE);
+ }
+ 
+--- a/libeg/lodepng_xtra.c
 b/libeg/lodepng_xtra.c
+@@ -87,7 +87,7 @@ int MyStrlen(const char *InString) {
+ } // int MyStrlen()
+ 
+ VOID *MyMemSet(VOID *s, int c, size_t n) {
+-SetMem(s, c, n);
++MySetMem(s, c, n);
+ return s;
+ }
+ 
+--- a/refind/config.c
 b/refind/config.c
+@@ -667,7 +667,7 @@ VOID ReadConfig(CHAR16 *FileName)
+ HandleStrings(TokenList, TokenCount, &(GlobalConfig.DriverDirs));
+ 
+ } else if (MyStriCmp(TokenList[0], L"showtools")) {
+-SetMem(GlobalConfig.ShowTools, NUM_TOOLS * sizeof(UINTN), 0);
++MySetMem(GlobalConfig.ShowTools, NUM_TOOLS * sizeof(UINTN), 0);
+ GlobalConfig.HiddenTags = FALSE;
+ for (i = 1; (i < TokenCount) && (i < NUM_TOOLS); i++) {
+ FlagName = TokenList[i];
+--- a/refind/launch_legacy.c
 b/refind/launch_legacy.c
+@@ -114,7 +114,7 @@ static EFI_STATUS ActivateMbrPartition(IN EFI_BLOCK_IO 
*BlockIO, IN UINTN Partit
+ }
+ if (!HaveBootCode) {
+ // no boot code found in the MBR, add the syslinux MBR code
+-SetMem(SectorBuffer, MBR_BOOTCODE_SIZE, 0);
++MySetMem(SectorBuffer, MBR_BOOTCODE_SIZE, 0);
+ MyCopyMem(SectorBuffer, syslinux_mbr, SYSLINUX_MBR_SIZE);
+ }
+ 
+--- a/refind/lib.c
 b/refind/lib.c
+@@ -651,7 +651,7 @@ static VOID SetFilesystemData(IN UINT8 *Buffer, IN UINTN 
BufferSize, IN OUT REFI
+ 
+ LOG(2, LOG_LINE_NORMAL, L"Identifying filesystem types");
+ if ((Buffer != NULL) && (Volume != NULL)) {
+-SetMem(&(Volume->VolUuid), sizeof(EFI_GUID), 0);
++MySetMem(&(Volume->VolUuid), sizeof(EFI_GUID), 0);
+ Volume->FSType = FS_TYPE_UNKNOWN;
+ 
+ if (BufferSize >= (1024 + 100)) {
+--- a/refind/lib.h
 b/refind/lib.h
+@@ -133,10 +133,13 @@ VOID MyFreePool(IN OUT VOID *Pointer);
+ 
+ // When using GNU-EFI, call the EFI's built-in gBS->CopyMem() function, 
because
+ // GNU-EFI 3.0.18 changed its CopyMem() definition in a way that broke rEFInd.
++// Same for SetMem
+ #ifdef __MAKEWITH_GNUEFI
+ #define MyCopyMem(Dest, Src, len) refit_call3_wrapper(gBS->CopyMem, Dest, 
Src, len)
++#define MySetMem(Dest, Src, len) refit_call3_wrapper(gBS->SetMem, Dest, Src, 
len)
+ #else
+ #define MyCopyMem(Dest, Src, len) CopyMem(Dest, Src, len)
++#define MySetMem(Dest, Src, len) SetMem(Dest, Src, len)
+ #endif
+ 
+ BOOLEAN EjectMedia(VOID);

diff --git a/sys-boot/refind/refind-0.14.2.ebuild 
b/sys-boot/refind/refind-0.14.2-r1.ebuild
similarity index 87%
rename from sys-boot/refind/refind-0.14.2.ebuild
rename to sys-boot/refind/refind-0.14.2-r1.ebuild
index f280380cf1c4..d3866389c5cb 100644
--- a/sys-boot/refind/refind-0.14.2.ebuild
+++ b/sys-boot/refind/refind-0.14.2-r1.ebuild
@@ -11,8 +11,7 @@ 
SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${PN}-src-${PV}.t
 
 LICENSE="BSD CC-BY-SA-3.0 CC-BY-SA-4.0 FDL-1.3 GPL-2+ GPL-3+ LGPL-3+"
 SLOT="0"
-# Unkeyworded for now because of bug #934474
-#KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} doc"
 
@@ -23,7 +22,10 @@ BDEPEND="sys-devel/binutils"
 
 DOCS=( README.txt NEWS.txt )
 
-PATCHES=( "${FILESDIR}"/${PN}-0.14.0.2-clang.patch )
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.14.0.2-clang.patch
+   "

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/files/

2024-06-22 Thread Conrad Kostecki
commit: b5f8a9830cd7ce69772b52d327c59cfce53051a7
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Jun 18 17:29:48 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Jun 22 18:50:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5f8a983

sys-boot/refind: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../refind/files/refind-0.13.2-gnuefi-3.0.14.patch | 51 --
 1 file changed, 51 deletions(-)

diff --git a/sys-boot/refind/files/refind-0.13.2-gnuefi-3.0.14.patch 
b/sys-boot/refind/files/refind-0.13.2-gnuefi-3.0.14.patch
deleted file mode 100644
index 751a8e838dfa..
--- a/sys-boot/refind/files/refind-0.13.2-gnuefi-3.0.14.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://bugs.gentoo.org/810907
-https://sources.debian.org/patches/refind/0.13.2-1/gnu-efi.patch/
-
-Origin: 
https://sourceforge.net/p/refind/code/ci/10f838a4cd132a5595acaf3c54c15782151a61df
-Applied-Upstream: 0.13.3
-From 10f838a4cd132a5595acaf3c54c15782151a61df Mon Sep 17 00:00:00 2001
-From: Rod Smith 
-Date: Sat, 23 Oct 2021 10:17:23 -0400
-Subject: [PATCH] Fix compile problems with recent GNU-EFI versions
-

- EfiLib/DevicePathUtilities.h | 13 -
- EfiLib/gnuefi-helper.c   |  1 -
- NEWS.txt |  3 +++
- include/version.h|  2 +-
- 4 files changed, 4 insertions(+), 15 deletions(-)
-
-diff --git a/EfiLib/DevicePathUtilities.h b/EfiLib/DevicePathUtilities.h
-index b559671..14ed797 100644
 a/EfiLib/DevicePathUtilities.h
-+++ b/EfiLib/DevicePathUtilities.h
-@@ -217,17 +217,4 @@ EFIAPI
- --*/
- ;
- 
--typedef struct {
--  EFI_DEVICE_PATH_UTILS_GET_DEVICE_PATH_SIZE GetDevicePathSize;
--  EFI_DEVICE_PATH_UTILS_DUP_DEVICE_PATH  DuplicateDevicePath;
--  EFI_DEVICE_PATH_UTILS_APPEND_PATH  AppendDevicePath;
--  EFI_DEVICE_PATH_UTILS_APPEND_NODE  AppendDeviceNode;
--  EFI_DEVICE_PATH_UTILS_APPEND_INSTANCE  AppendDevicePathInstance;
--  EFI_DEVICE_PATH_UTILS_GET_NEXT_INSTANCEGetNextDevicePathInstance;
--  EFI_DEVICE_PATH_UTILS_IS_MULTI_INSTANCEIsDevicePathMultiInstance;
--  EFI_DEVICE_PATH_UTILS_CREATE_NODE  CreateDeviceNode;
--} EFI_DEVICE_PATH_UTILITIES_PROTOCOL;
--
--extern EFI_GUID gEfiDevicePathUtilitiesProtocolGuid;
--
- #endif
-diff --git a/EfiLib/gnuefi-helper.c b/EfiLib/gnuefi-helper.c
-index 246c261..8730403 100644
 a/EfiLib/gnuefi-helper.c
-+++ b/EfiLib/gnuefi-helper.c
-@@ -20,7 +20,6 @@
- #include "refit_call_wrapper.h"
- #include "LegacyBios.h"
- 
--EFI_GUID gEfiDevicePathUtilitiesProtocolGuid = { 0x09576E91, 0x6D3F, 0x11D2, 
{ 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }};
- EFI_GUID gEfiLegacyBiosProtocolGuid = { 0xdb9a1e3d, 0x45cb, 0x4abb, { 0x85, 
0x3b, 0xe5, 0x38, 0x7f, 0xdb, 0x2e, 0x2d }};
- 
- /**



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2024-06-17 Thread Viorel Munteanu
commit: 312bb3bcffae9e7abb7bed8ae4c660c485ce053e
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Mon Jun 17 17:57:26 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Mon Jun 17 19:01:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=312bb3bc

sys-boot/refind: pin sys-boot/gnu-efi to an older version

sys-boot/refind-0.14.0.2 (stable) does not boot with
>=sys-boot/gnu-efi-3.0.18, so pin it to max 3.0.17.

Bug: https://bugs.gentoo.org/934320
Signed-off-by: Viorel Munteanu  gentoo.org>

 sys-boot/refind/refind-0.14.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/refind/refind-0.14.0.2-r1.ebuild 
b/sys-boot/refind/refind-0.14.0.2-r1.ebuild
index ae65b7eee2d1..9923ce1ba58a 100644
--- a/sys-boot/refind/refind-0.14.0.2-r1.ebuild
+++ b/sys-boot/refind/refind-0.14.0.2-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} doc"
 
-DEPEND="sys-boot/gnu-efi"
+DEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/files/, sys-boot/refind/

2024-06-17 Thread Viorel Munteanu
commit: 51b5ed3142c7572c7549c90684cc08ce494f027b
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Mon Jun 17 18:52:53 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Mon Jun 17 19:01:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51b5ed31

sys-boot/refind: add 0.14.2

Adding it unkeyworded for now because of bug #934474

Bug: https://bugs.gentoo.org/934320
Signed-off-by: Viorel Munteanu  gentoo.org>

 sys-boot/refind/Manifest   |   1 +
 .../refind/files/refind-sbat-gentoo-0.14.2.csv |   3 +
 sys-boot/refind/refind-0.14.2.ebuild   | 178 +
 3 files changed, 182 insertions(+)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index f0f404269fa8..e094b5aa4c3a 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1 +1,2 @@
 DIST refind-src-0.14.0.2.tar.gz 4648958 BLAKE2B 
02019ddb872ce44d2a2119902edebd633f925d49634e3bcc6bfb2c9dedb8ce213166909395a333d3a37e95c67720e31b1f5fcf25083801c17d645372aa54a06a
 SHA512 
41c120c1afec37c508aa5c0ec09a6563c3047ef84932308c91701795b950431dfad17d25cf664039b490a302d475add98441b75f90ff71cadce41febedc68a9e
+DIST refind-src-0.14.2.tar.gz 4628173 BLAKE2B 
987acb29d4d81c01db245cd8e1c9761072e34cf3dfaa3e4fa77e549ee2c1dc4c3f8cbd9218f42e4eb77478df3453095dba8b36324c289c6a10b81f1ecb202743
 SHA512 
76a52ed422ab3d431e6530fae4d13a51e8ed100568d4290207aaee87a84700b077bb79c4f4917027f5286de422954e1872fca288252ec756072d6c075b102e1e

diff --git a/sys-boot/refind/files/refind-sbat-gentoo-0.14.2.csv 
b/sys-boot/refind/files/refind-sbat-gentoo-0.14.2.csv
new file mode 100644
index ..2b1814c82c87
--- /dev/null
+++ b/sys-boot/refind/files/refind-sbat-gentoo-0.14.2.csv
@@ -0,0 +1,3 @@
+sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
+refind,1,Roderick W. Smith,refind,0.14.2,https://www.rodsbooks.com/refind
+refind.gentoo,1,Gentoo 
Linux,refind,0.14.2,https://packages.gentoo.org/packages/sys-boot/refind

diff --git a/sys-boot/refind/refind-0.14.2.ebuild 
b/sys-boot/refind/refind-0.14.2.ebuild
new file mode 100644
index ..f280380cf1c4
--- /dev/null
+++ b/sys-boot/refind/refind-0.14.2.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature secureboot toolchain-funcs
+
+DESCRIPTION="The UEFI Boot Manager by Rod Smith"
+HOMEPAGE="https://www.rodsbooks.com/refind/";
+SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz";
+
+LICENSE="BSD CC-BY-SA-3.0 CC-BY-SA-4.0 FDL-1.3 GPL-2+ GPL-3+ LGPL-3+"
+SLOT="0"
+# Unkeyworded for now because of bug #934474
+#KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} doc"
+
+DEPEND="sys-boot/gnu-efi"
+
+# for ld.bfd and objcopy
+BDEPEND="sys-devel/binutils"
+
+DOCS=( README.txt NEWS.txt )
+
+PATCHES=( "${FILESDIR}"/${PN}-0.14.0.2-clang.patch )
+
+checktools() {
+   if [[ ${MERGE_TYPE} != "binary" ]]; then
+   # bug #832018
+   tc-export LD
+   tc-ld-force-bfd
+   # the makefile calls LD directly, so try to fix LD too
+   LD="${LD/.lld/.bfd}"
+   tc-ld-is-lld "${LD}" && die "Linking with lld produces broken 
executables and may lead to unbootable system"
+
+   # bug #732256
+   # llvm-objcopy does not support EFI target, try to use binutils 
objcopy or fail
+   tc-export OBJCOPY
+   OBJCOPY="${OBJCOPY/llvm-/}"
+   LANG=C LC_ALL=C "${OBJCOPY}" --help | grep -q '\=${efi}-${broken}"; then
+   ewarn "This version of refind does not display jpegs 
correctly if compiled with >=${efi}-${broken} (bug #934474)"
+   fi
+   fi
+}
+
+pkg_pretend() {
+   check-gnu-efi
+   checktools
+}
+
+pkg_setup() {
+   check-gnu-efi
+
+   if use x86; then
+   export EFIARCH=ia32
+   export BUILDARCH=ia32
+   elif use amd64; then
+   export EFIARCH=x64
+   export BUILDARCH=x86_64
+   fi
+   secureboot_pkg_setup
+
+   # this does not only check, but also exports LD and OBJCOPY
+   checktools
+}
+
+src_prepare() {
+   default
+
+   # bug #598647 - PIE not supported
+   sed -e '/^CFLAGS/s/$/ -fno-PIE/' -i Make.common || die
+   sed -e '1 i\.NOTPARALLEL:' -i filesystems/Makefile || die
+
+   # bug #881131, bug #832018
+   sed -e 's/-fno-tree-loop-distribute-patterns/-ffreestanding/' -i 
Make.common || die
+
+   cp "${FILESDIR}"/refind-sbat-gentoo-${PV}.csv refind-sbat-gentoo.csv || 
die
+}
+
+src_compile() {
+   # Update fs targets depending on uses
+   local fs fs_names=()
+   for fs in ${FS_USE}; do
+   fs=${fs#+}
+   if use "${fs}"; then
+   fs_names+=( ${fs} )
+   fi
+   done
+ 

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2024-06-04 Thread Viorel Munteanu
commit: 4fa6261f08548c294649b1c142a2fe29154112d7
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Wed Jun  5 04:41:47 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Wed Jun  5 04:46:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fa6261f

sys-boot/refind: drop 0.14.0.2

Signed-off-by: Viorel Munteanu  gentoo.org>

 sys-boot/refind/refind-0.14.0.2.ebuild | 146 -
 1 file changed, 146 deletions(-)

diff --git a/sys-boot/refind/refind-0.14.0.2.ebuild 
b/sys-boot/refind/refind-0.14.0.2.ebuild
deleted file mode 100644
index d019f31c4acb..
--- a/sys-boot/refind/refind-0.14.0.2.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs secureboot
-
-DESCRIPTION="The UEFI Boot Manager by Rod Smith"
-HOMEPAGE="https://www.rodsbooks.com/refind/";
-SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz";
-
-LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
-IUSE="${FS_USE} custom-cflags doc"
-
-DEPEND="sys-boot/gnu-efi"
-
-DOCS=( README.txt )
-
-pkg_pretend() {
-   if use custom-cflags; then
-   ewarn
-   ewarn "You have enabled building with USE=custom-cflags. Be 
aware that"
-   ewarn "using this can result in EFI binaries that fail to run 
and may"
-   ewarn "fail to build at all. This is strongly advised against 
by upstream."
-   ewarn
-   ewarn "See https://bugs.gentoo.org/598587#c3 for more 
information"
-   ewarn
-   fi
-}
-
-pkg_setup() {
-   if use x86; then
-   export EFIARCH=ia32
-   export BUILDARCH=ia32
-   elif use amd64; then
-   export EFIARCH=x64
-   export BUILDARCH=x86_64
-   fi
-   secureboot_pkg_setup
-}
-
-src_prepare() {
-   default
-
-   # bug 598647 - PIE not supported
-   sed -e '/^CFLAGS/s/$/ -fno-PIE/' -i Make.common || die
-   sed -e '1 i\.NOTPARALLEL:' -i filesystems/Makefile || die
-
-   cp "${FILESDIR}"/refind-sbat-gentoo-${PV}.csv refind-sbat-gentoo.csv || 
die
-}
-
-src_compile() {
-   # Update fs targets depending on uses
-   local fs fs_names=()
-   for fs in ${FS_USE}; do
-   fs=${fs#+}
-   if use "${fs}"; then
-   fs_names+=(${fs})
-   fi
-   done
-   fs_names=("${fs_names[@]/%/_gnuefi}")
-
-   # Prepare flags
-   local make_flags=(
-   ARCH="${BUILDARCH}"
-   CC="$(tc-getCC)"
-   AS="$(tc-getAS)"
-   LD="$(tc-getLD)"
-   AR="$(tc-getAR)"
-   RANLIB="$(tc-getRANLIB)"
-   OBJCOPY="$(tc-getOBJCOPY)"
-   GNUEFILIB="/usr/$(get_libdir)"
-   EFILIB="/usr/$(get_libdir)"
-   EFICRT0="/usr/$(get_libdir)"
-   FILESYSTEMS="${fs_names[*]}"
-   FILESYSTEMS_GNUEFI="${fs_names[*]}"
-   REFIND_SBAT_CSV=refind-sbat-gentoo.csv
-   )
-   if use custom-cflags; then
-   make_flags=(CFLAGS="${CFLAGS} 
-fno-tree-loop-distribute-patterns" "${make_flags[@]}")
-   fi
-
-   emake "${make_flags[@]}" all_gnuefi
-}
-
-src_install() {
-   exeinto "/usr/$(get_libdir)/${PN}"
-   doexe refind-install
-   dosym "../$(get_libdir)/${PN}/refind-install" "/usr/sbin/refind-install"
-
-   if use doc; then
-   doman "docs/man/"*
-   DOCS+=(NEWS.txt docs/refind docs/Styles)
-   fi
-   einstalldocs
-
-   insinto "/usr/$(get_libdir)/${PN}/refind"
-   doins "refind/refind_${EFIARCH}.efi"
-   doins "refind.conf-sample"
-   doins -r images icons fonts banners
-
-   if [[ -d "drivers_${EFIARCH}" ]]; then
-   doins -r "drivers_${EFIARCH}"
-   fi
-
-   insinto "/usr/$(get_libdir)/${PN}/refind/tools_${EFIARCH}"
-   doins "gptsync/gptsync_${EFIARCH}.efi"
-
-   insinto "/etc/refind.d"
-   doins -r "keys"
-
-   dosbin "mkrlconf"
-   dosbin "mvrefind"
-   dosbin "refind-mkdefault"
-
-   secureboot_auto_sign --in-place
-}
-
-pkg_postinst() {
-   elog "rEFInd has been built and installed into 
${EROOT}/usr/$(get_libdir)/${PN}"
-   elog "You will need to use the command 'refind-install' to install"
-   elog "the binaries into your EFI System Partition"
-   elog ""
-   elog "refind-install requires additional packages to be fully 
functional:"
-   elog " app-crypt/sbsigntools for binary signing for use with SecureBoot"
-   elog " sys-boot/efibootmgr for writing to NVRAM"
-   elog " sys-apps/gptfdisk for ESP management"
-   elog ""
-   elog "refind-mkdefault requires >=dev-lang/python-3"
-   elog ""
-   if [[ -z "${REPL

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2024-06-04 Thread Viorel Munteanu
commit: f72213f83ca0980bdc867b3e522c842fb42d5f2c
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Wed Jun  5 04:41:40 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Wed Jun  5 04:46:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f72213f8

sys-boot/refind: drop 0.13.3.1

Signed-off-by: Viorel Munteanu  gentoo.org>

 sys-boot/refind/Manifest   |   1 -
 sys-boot/refind/refind-0.13.3.1.ebuild | 143 -
 2 files changed, 144 deletions(-)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 18ef4b85ed59..f0f404269fa8 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,2 +1 @@
-DIST refind-src-0.13.3.1.tar.gz 4550242 BLAKE2B 
ab8dd27f82954ea6f9831f827550f27b5ca426b7783e918311ba7e178fc3509698a0107f61d0394a7893318528cb3e0c8491f4522de0a4aca6a40e0749f5a6f9
 SHA512 
7966df5dd8dc66cc49a329ed722a567672da8e2fa3f2334d53db65357cea17cba5a4dc5459e358de1079a938da3c63dc626d096ce28b6bf1fa2964be7359dbd1
 DIST refind-src-0.14.0.2.tar.gz 4648958 BLAKE2B 
02019ddb872ce44d2a2119902edebd633f925d49634e3bcc6bfb2c9dedb8ce213166909395a333d3a37e95c67720e31b1f5fcf25083801c17d645372aa54a06a
 SHA512 
41c120c1afec37c508aa5c0ec09a6563c3047ef84932308c91701795b950431dfad17d25cf664039b490a302d475add98441b75f90ff71cadce41febedc68a9e

diff --git a/sys-boot/refind/refind-0.13.3.1.ebuild 
b/sys-boot/refind/refind-0.13.3.1.ebuild
deleted file mode 100644
index 1622d6196851..
--- a/sys-boot/refind/refind-0.13.3.1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs secureboot
-
-DESCRIPTION="The UEFI Boot Manager by Rod Smith"
-HOMEPAGE="https://www.rodsbooks.com/refind/";
-SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz";
-
-LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
-IUSE="${FS_USE} custom-cflags doc"
-
-DEPEND="sys-boot/gnu-efi"
-
-DOCS=( README.txt )
-
-pkg_pretend() {
-   if use custom-cflags; then
-   ewarn
-   ewarn "You have enabled building with USE=custom-cflags. Be 
aware that"
-   ewarn "using this can result in EFI binaries that fail to run 
and may"
-   ewarn "fail to build at all. This is strongly advised against 
by upstream."
-   ewarn
-   ewarn "See https://bugs.gentoo.org/598587#c3 for more 
information"
-   ewarn
-   fi
-}
-
-pkg_setup() {
-   if use x86; then
-   export EFIARCH=ia32
-   export BUILDARCH=ia32
-   elif use amd64; then
-   export EFIARCH=x64
-   export BUILDARCH=x86_64
-   fi
-   secureboot_pkg_setup
-}
-
-src_prepare() {
-   default
-
-   # bug 598647 - PIE not supported
-   sed -e '/^CFLAGS/s/$/ -fno-PIE/' -i Make.common || die
-   sed -e '1 i\.NOTPARALLEL:' -i filesystems/Makefile || die
-}
-
-src_compile() {
-   # Update fs targets depending on uses
-   local fs fs_names=()
-   for fs in ${FS_USE}; do
-   fs=${fs#+}
-   if use "${fs}"; then
-   fs_names+=(${fs})
-   fi
-   done
-   fs_names=("${fs_names[@]/%/_gnuefi}")
-
-   # Prepare flags
-   local make_flags=(
-   ARCH="${BUILDARCH}"
-   CC="$(tc-getCC)"
-   AS="$(tc-getAS)"
-   LD="$(tc-getLD)"
-   AR="$(tc-getAR)"
-   RANLIB="$(tc-getRANLIB)"
-   OBJCOPY="$(tc-getOBJCOPY)"
-   GNUEFILIB="/usr/$(get_libdir)"
-   EFILIB="/usr/$(get_libdir)"
-   EFICRT0="/usr/$(get_libdir)"
-   FILESYSTEMS="${fs_names[*]}"
-   FILESYSTEMS_GNUEFI="${fs_names[*]}"
-   )
-   if use custom-cflags; then
-   make_flags=(CFLAGS="${CFLAGS} 
-fno-tree-loop-distribute-patterns" "${make_flags[@]}")
-   fi
-
-   emake "${make_flags[@]}" all_gnuefi
-}
-
-src_install() {
-   exeinto "/usr/$(get_libdir)/${PN}"
-   doexe refind-install
-   dosym "../$(get_libdir)/${PN}/refind-install" "/usr/sbin/refind-install"
-
-   if use doc; then
-   doman "docs/man/"*
-   DOCS+=(NEWS.txt docs/refind docs/Styles)
-   fi
-   einstalldocs
-
-   insinto "/usr/$(get_libdir)/${PN}/refind"
-   doins "refind/refind_${EFIARCH}.efi"
-   doins "refind.conf-sample"
-   doins -r images icons fonts banners
-
-   if [[ -d "drivers_${EFIARCH}" ]]; then
-   doins -r "drivers_${EFIARCH}"
-   fi
-
-   insinto "/usr/$(get_libdir)/${PN}/refind/tools_${EFIARCH}"
-   doins "gptsync/gptsync_${EFIARCH}.efi"
-
-   insinto "/etc/refind.d"
-   doins -r "keys"
-
-   dosbin "mkrlconf"
-   dosbin "mvrefind"
-   d

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2024-06-04 Thread Viorel Munteanu
commit: 9a11ed61cde8c46fda4e5465427d8c23299bfc0e
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Wed Jun  5 04:41:29 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Wed Jun  5 04:46:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a11ed61

sys-boot/refind: drop 0.13.2

Signed-off-by: Viorel Munteanu  gentoo.org>

 sys-boot/refind/Manifest |   1 -
 sys-boot/refind/refind-0.13.2.ebuild | 144 ---
 2 files changed, 145 deletions(-)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index d538cc085ff8..18ef4b85ed59 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,3 +1,2 @@
-DIST refind-src-0.13.2.tar.gz 4554759 BLAKE2B 
2c3b1daf5fa100dcd4e1c801aa625e269ae9c1a99b567a271d7cdd30f95fa1e041e22984623b9a0e61f8af45966919f4b9f3a5b6c2026271d1bc37c6925f1e70
 SHA512 
e671d44385297295c143824dd95593f2e7bc8e282745d127b041a645aa27003467a3a23f368fd30297f33faa06bd914540d7bdc3c71ec42f6b7a38d7ee8e0ddb
 DIST refind-src-0.13.3.1.tar.gz 4550242 BLAKE2B 
ab8dd27f82954ea6f9831f827550f27b5ca426b7783e918311ba7e178fc3509698a0107f61d0394a7893318528cb3e0c8491f4522de0a4aca6a40e0749f5a6f9
 SHA512 
7966df5dd8dc66cc49a329ed722a567672da8e2fa3f2334d53db65357cea17cba5a4dc5459e358de1079a938da3c63dc626d096ce28b6bf1fa2964be7359dbd1
 DIST refind-src-0.14.0.2.tar.gz 4648958 BLAKE2B 
02019ddb872ce44d2a2119902edebd633f925d49634e3bcc6bfb2c9dedb8ce213166909395a333d3a37e95c67720e31b1f5fcf25083801c17d645372aa54a06a
 SHA512 
41c120c1afec37c508aa5c0ec09a6563c3047ef84932308c91701795b950431dfad17d25cf664039b490a302d475add98441b75f90ff71cadce41febedc68a9e

diff --git a/sys-boot/refind/refind-0.13.2.ebuild 
b/sys-boot/refind/refind-0.13.2.ebuild
deleted file mode 100644
index 43811be7c0ff..
--- a/sys-boot/refind/refind-0.13.2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing toolchain-funcs
-
-DESCRIPTION="The UEFI Boot Manager by Rod Smith"
-HOMEPAGE="https://www.rodsbooks.com/refind/";
-SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz";
-
-LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
-IUSE="${FS_USE} custom-cflags doc"
-
-DEPEND="sys-boot/gnu-efi"
-
-DOCS=( README.txt )
-
-PATCHES=(
-   "${FILESDIR}"/${P}-gnuefi-3.0.14.patch
-)
-
-pkg_pretend() {
-   if use custom-cflags; then
-   ewarn
-   ewarn "You have enabled building with USE=custom-cflags. Be 
aware that"
-   ewarn "using this can result in EFI binaries that fail to run 
and may"
-   ewarn "fail to build at all. This is strongly advised against 
by upstream."
-   ewarn
-   ewarn "See https://bugs.gentoo.org/598587#c3 for more 
information"
-   ewarn
-   fi
-}
-
-pkg_setup() {
-   if use x86; then
-   export EFIARCH=ia32
-   export BUILDARCH=ia32
-   elif use amd64; then
-   export EFIARCH=x64
-   export BUILDARCH=x86_64
-   fi
-}
-
-src_prepare() {
-   default
-
-   # bug 598647 - PIE not supported
-   sed -e '/^CFLAGS/s/$/ -fno-PIE/' -i Make.common || die
-   sed -e '1 i\.NOTPARALLEL:' -i filesystems/Makefile || die
-}
-
-src_compile() {
-   # Update fs targets depending on uses
-   local fs fs_names=()
-   for fs in ${FS_USE}; do
-   fs=${fs#+}
-   if use "${fs}"; then
-   fs_names+=(${fs})
-   fi
-   done
-   fs_names=("${fs_names[@]/%/_gnuefi}")
-
-   # Prepare flags
-   local make_flags=(
-   ARCH="${BUILDARCH}"
-   CC="$(tc-getCC)"
-   AS="$(tc-getAS)"
-   LD="$(tc-getLD)"
-   AR="$(tc-getAR)"
-   RANLIB="$(tc-getRANLIB)"
-   OBJCOPY="$(tc-getOBJCOPY)"
-   GNUEFILIB="/usr/$(get_libdir)"
-   EFILIB="/usr/$(get_libdir)"
-   EFICRT0="/usr/$(get_libdir)"
-   FILESYSTEMS="${fs_names[*]}"
-   FILESYSTEMS_GNUEFI="${fs_names[*]}"
-   )
-   if use custom-cflags; then
-   make_flags=(CFLAGS="${CFLAGS} 
-fno-tree-loop-distribute-patterns" "${make_flags[@]}")
-   fi
-
-   emake "${make_flags[@]}" all_gnuefi
-}
-
-src_install() {
-   exeinto "/usr/$(get_libdir)/${PN}"
-   doexe refind-install
-   dosym "../$(get_libdir)/${PN}/refind-install" "/usr/sbin/refind-install"
-
-   if use doc; then
-   doman "docs/man/"*
-   DOCS+=(NEWS.txt docs/refind docs/Styles)
-   fi
-   einstalldocs
-
-   insinto "/usr/$(get_libdir)/${PN}/refind"
-   doins "refind/refind_${EFIARCH}.efi"
-   doins "refind.conf-sample"
-   doins -r images icons fonts banners

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2023-10-16 Thread Joonas Niilola
commit: 2930feac31999cc2cbc7b97385dba8550837e542
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Oct 17 06:09:26 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Oct 17 06:09:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2930feac

sys-boot/refind: Stabilize 0.14.0.2-r1 x86, #915874

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-boot/refind/refind-0.14.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/refind/refind-0.14.0.2-r1.ebuild 
b/sys-boot/refind/refind-0.14.0.2-r1.ebuild
index c7dad8ce3707..701a7a330943 100644
--- a/sys-boot/refind/refind-0.14.0.2-r1.ebuild
+++ b/sys-boot/refind/refind-0.14.0.2-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
 
 LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} doc"
 



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2023-10-16 Thread Joonas Niilola
commit: 4e324383a11dc35d5d6942a638c210296bf77763
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Oct 17 06:09:45 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Oct 17 06:09:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e324383

sys-boot/refind: Stabilize 0.14.0.2-r1 amd64, #915874

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-boot/refind/refind-0.14.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/refind/refind-0.14.0.2-r1.ebuild 
b/sys-boot/refind/refind-0.14.0.2-r1.ebuild
index 701a7a330943..5a9f350b47e9 100644
--- a/sys-boot/refind/refind-0.14.0.2-r1.ebuild
+++ b/sys-boot/refind/refind-0.14.0.2-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
 
 LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} doc"
 



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/files/, sys-boot/refind/

2023-09-13 Thread Viorel Munteanu
commit: 797977a54c63876d010635d5d8431798396e9b15
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Sun Sep 10 12:29:17 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Thu Sep 14 04:39:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=797977a5

sys-boot/refind: fix compilation with clang

Compiling with clang works.
Linking with lld produces broken executables (including the drivers).
llvm-objcopy does not support the output format needed by refind.

Try to force ld.bfd and binutils objcopy.  Fail otherwise.

Bug: https://bugs.gentoo.org/732256
Bug: https://bugs.gentoo.org/832018
Bug: https://bugs.gentoo.org/881131
Closes: https://github.com/gentoo/gentoo/pull/32710
Signed-off-by: Viorel Munteanu  gentoo.org>

 sys-boot/refind/files/refind-0.14.0.2-clang.patch |  62 +
 sys-boot/refind/refind-0.14.0.2-r1.ebuild | 160 ++
 2 files changed, 222 insertions(+)

diff --git a/sys-boot/refind/files/refind-0.14.0.2-clang.patch 
b/sys-boot/refind/files/refind-0.14.0.2-clang.patch
new file mode 100644
index ..fe2323390355
--- /dev/null
+++ b/sys-boot/refind/files/refind-0.14.0.2-clang.patch
@@ -0,0 +1,62 @@
+Fix compilation with clang.
+
+Clang does not support nested functions (a gcc extension), so move it outside.
+
+Compiling with _FORTIFY_SOURCE and -ffreestanding results in
+nanojpeg.c:(.text+0xa28): undefined reference to `__memset_chk'
+
+See also: https://bugs.gentoo.org/881131
+
+--- a/filesystems/crc32c.c
 b/filesystems/crc32c.c
+@@ -22,25 +22,24 @@
+ 
+ static uint32_t crc32c_table [256];
+ 
+-static void
+-init_crc32c_table (void)
++uint32_t reflect (uint32_t ref, int len)
+ {
+-  auto uint32_t reflect (uint32_t ref, int len);
+-  uint32_t reflect (uint32_t ref, int len)
+-{
+-  uint32_t result = 0;
+-  int i;
++  uint32_t result = 0;
++  int i;
+ 
+-  for (i = 1; i <= len; i++)
+-{
+-  if (ref & 1)
+-result |= 1 << (len - i);
+-  ref >>= 1;
+-}
+-
+-  return result;
++  for (i = 1; i <= len; i++)
++{
++  if (ref & 1)
++result |= 1 << (len - i);
++  ref >>= 1;
+ }
+ 
++  return result;
++}
++
++static void
++init_crc32c_table (void)
++{
+   static int crc32c_table_inited;
+   if(crc32c_table_inited)
+ return;
+--- a/libeg/nanojpeg.c
 b/libeg/nanojpeg.c
+@@ -112,6 +112,8 @@
+ #ifndef _NANOJPEG_H
+ #define _NANOJPEG_H
+ 
++#undef _FORTIFY_SOURCE
++
+ // Modified: Map libc-style free() and malloc() to their EFI equivalents
+ #define free MyFreePool
+ #define malloc AllocatePool

diff --git a/sys-boot/refind/refind-0.14.0.2-r1.ebuild 
b/sys-boot/refind/refind-0.14.0.2-r1.ebuild
new file mode 100644
index ..c7dad8ce3707
--- /dev/null
+++ b/sys-boot/refind/refind-0.14.0.2-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature secureboot toolchain-funcs
+
+DESCRIPTION="The UEFI Boot Manager by Rod Smith"
+HOMEPAGE="https://www.rodsbooks.com/refind/";
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} doc"
+
+DEPEND="sys-boot/gnu-efi"
+
+# for ld.bfd and objcopy
+BDEPEND="sys-devel/binutils"
+
+DOCS=( README.txt NEWS.txt )
+
+PATCHES=( "${FILESDIR}"/${P}-clang.patch )
+
+checktools() {
+   if [[ ${MERGE_TYPE} != "binary" ]]; then
+   # bug #832018
+   tc-export LD
+   tc-ld-force-bfd
+   # the makefile calls LD directly, so try to fix LD too
+   LD="${LD/.lld/.bfd}"
+   tc-ld-is-lld "${LD}" && die "Linking with lld produces broken 
executables and may lead to unbootable system"
+
+   # bug #732256
+   # llvm-objcopy does not support EFI target, try to use binutils 
objcopy or fail
+   tc-export OBJCOPY
+   OBJCOPY="${OBJCOPY/llvm-/}"
+   LANG=C LC_ALL=C "${OBJCOPY}" --help | grep -q '\

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2023-09-07 Thread Viorel Munteanu
commit: 87b058f30310d2f0bd43e1ed0075209bf71c9df2
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Thu Sep  7 09:57:20 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Thu Sep  7 09:57:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87b058f3

sys-boot/refind: update maintainers

Signed-off-by: Viorel Munteanu  gentoo.org>

 sys-boot/refind/metadata.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-boot/refind/metadata.xml b/sys-boot/refind/metadata.xml
index 7a3d471b5fed..7d82e5d26db3 100644
--- a/sys-boot/refind/metadata.xml
+++ b/sys-boot/refind/metadata.xml
@@ -1,14 +1,14 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   svey...@gmail.com
-   Stéphane Veyret
-   

cea...@gentoo.org
Viorel Munteanu

+   
+   svey...@gmail.com
+   Stéphane Veyret
+   

proxy-ma...@gentoo.org
Proxy Maintainers



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/files/, sys-boot/refind/

2023-08-27 Thread Viorel Munteanu
commit: cca9476ec9f09c82613acfcc86b6baa150577c4a
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Sun Aug 27 09:17:42 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Aug 27 10:10:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cca9476e

sys-boot/refind: add 0.14.0.2

Closes: https://bugs.gentoo.org/910238
Signed-off-by: Viorel Munteanu  gentoo.org>

 sys-boot/refind/Manifest   |   1 +
 .../refind/files/refind-sbat-gentoo-0.14.0.2.csv   |   3 +
 sys-boot/refind/metadata.xml   |   4 +
 sys-boot/refind/refind-0.14.0.2.ebuild | 146 +
 4 files changed, 154 insertions(+)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 9d884c1c9c9d..d538cc085ff8 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,2 +1,3 @@
 DIST refind-src-0.13.2.tar.gz 4554759 BLAKE2B 
2c3b1daf5fa100dcd4e1c801aa625e269ae9c1a99b567a271d7cdd30f95fa1e041e22984623b9a0e61f8af45966919f4b9f3a5b6c2026271d1bc37c6925f1e70
 SHA512 
e671d44385297295c143824dd95593f2e7bc8e282745d127b041a645aa27003467a3a23f368fd30297f33faa06bd914540d7bdc3c71ec42f6b7a38d7ee8e0ddb
 DIST refind-src-0.13.3.1.tar.gz 4550242 BLAKE2B 
ab8dd27f82954ea6f9831f827550f27b5ca426b7783e918311ba7e178fc3509698a0107f61d0394a7893318528cb3e0c8491f4522de0a4aca6a40e0749f5a6f9
 SHA512 
7966df5dd8dc66cc49a329ed722a567672da8e2fa3f2334d53db65357cea17cba5a4dc5459e358de1079a938da3c63dc626d096ce28b6bf1fa2964be7359dbd1
+DIST refind-src-0.14.0.2.tar.gz 4648958 BLAKE2B 
02019ddb872ce44d2a2119902edebd633f925d49634e3bcc6bfb2c9dedb8ce213166909395a333d3a37e95c67720e31b1f5fcf25083801c17d645372aa54a06a
 SHA512 
41c120c1afec37c508aa5c0ec09a6563c3047ef84932308c91701795b950431dfad17d25cf664039b490a302d475add98441b75f90ff71cadce41febedc68a9e

diff --git a/sys-boot/refind/files/refind-sbat-gentoo-0.14.0.2.csv 
b/sys-boot/refind/files/refind-sbat-gentoo-0.14.0.2.csv
new file mode 100644
index ..1062bd271dd1
--- /dev/null
+++ b/sys-boot/refind/files/refind-sbat-gentoo-0.14.0.2.csv
@@ -0,0 +1,3 @@
+sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
+refind,1,Roderick W. Smith,refind,0.14.0,https://www.rodsbooks.com/refind
+refind.gentoo,1,Gentoo 
Linux,refind,0.14.0,https://packages.gentoo.org/packages/sys-boot/refind

diff --git a/sys-boot/refind/metadata.xml b/sys-boot/refind/metadata.xml
index c4b2438447a5..7a3d471b5fed 100644
--- a/sys-boot/refind/metadata.xml
+++ b/sys-boot/refind/metadata.xml
@@ -5,6 +5,10 @@
svey...@gmail.com
Stéphane Veyret

+   
+   cea...@gentoo.org
+   Viorel Munteanu
+   

proxy-ma...@gentoo.org
Proxy Maintainers

diff --git a/sys-boot/refind/refind-0.14.0.2.ebuild 
b/sys-boot/refind/refind-0.14.0.2.ebuild
new file mode 100644
index ..3193d0592d07
--- /dev/null
+++ b/sys-boot/refind/refind-0.14.0.2.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs secureboot
+
+DESCRIPTION="The UEFI Boot Manager by Rod Smith"
+HOMEPAGE="https://www.rodsbooks.com/refind/";
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} custom-cflags doc"
+
+DEPEND="sys-boot/gnu-efi"
+
+DOCS=( README.txt )
+
+pkg_pretend() {
+   if use custom-cflags; then
+   ewarn
+   ewarn "You have enabled building with USE=custom-cflags. Be 
aware that"
+   ewarn "using this can result in EFI binaries that fail to run 
and may"
+   ewarn "fail to build at all. This is strongly advised against 
by upstream."
+   ewarn
+   ewarn "See https://bugs.gentoo.org/598587#c3 for more 
information"
+   ewarn
+   fi
+}
+
+pkg_setup() {
+   if use x86; then
+   export EFIARCH=ia32
+   export BUILDARCH=ia32
+   elif use amd64; then
+   export EFIARCH=x64
+   export BUILDARCH=x86_64
+   fi
+   secureboot_pkg_setup
+}
+
+src_prepare() {
+   default
+
+   # bug 598647 - PIE not supported
+   sed -e '/^CFLAGS/s/$/ -fno-PIE/' -i Make.common || die
+   sed -e '1 i\.NOTPARALLEL:' -i filesystems/Makefile || die
+
+   cp "${FILESDIR}"/refind-sbat-gentoo-${PV}.csv refind-sbat-gentoo.csv || 
die
+}
+
+src_compile() {
+   # Update fs targets depending on uses
+   local fs fs_names=()
+   for fs in ${FS_USE}; do
+   fs=${fs#+}
+   if use "${fs}"; then
+   fs_names+=(${fs})
+   fi
+   done
+   fs_names=("${fs_names[@]/%/_gnuefi}")
+
+   # Prepare flags
+   local make_flags=(
+   A

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2023-07-20 Thread Andrew Ammerlaan
commit: b42e1af6cee762ebc65bcb3ef478615afa4cb0da
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Jul 11 18:12:01 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Jul 20 11:32:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b42e1af6

sys-boot/refind: use secureboot.eclass to sign efi files

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-boot/refind/refind-0.13.3.1.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sys-boot/refind/refind-0.13.3.1.ebuild 
b/sys-boot/refind/refind-0.13.3.1.ebuild
index 73f27787890e..327f17b7022b 100644
--- a/sys-boot/refind/refind-0.13.3.1.ebuild
+++ b/sys-boot/refind/refind-0.13.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit toolchain-funcs secureboot
 
 DESCRIPTION="The UEFI Boot Manager by Rod Smith"
 HOMEPAGE="https://www.rodsbooks.com/refind/";
@@ -39,6 +39,7 @@ pkg_setup() {
export EFIARCH=x64
export BUILDARCH=x86_64
fi
+   secureboot_pkg_setup
 }
 
 src_prepare() {
@@ -111,6 +112,8 @@ src_install() {
dosbin "mkrlconf"
dosbin "mvrefind"
dosbin "refind-mkdefault"
+
+   secureboot_auto_sign --in-place
 }
 
 pkg_postinst() {



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/files/

2022-05-23 Thread Conrad Kostecki
commit: 6321139bfa5257b0b0c21409f5543b44dd9143f4
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun May 22 11:20:35 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon May 23 11:58:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6321139b

sys-boot/refind: remove unused patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25598
Signed-off-by: Conrad Kostecki  gentoo.org>

 sys-boot/refind/files/makefile.patch | 27 ---
 1 file changed, 27 deletions(-)

diff --git a/sys-boot/refind/files/makefile.patch 
b/sys-boot/refind/files/makefile.patch
deleted file mode 100644
index 5db6f75b1919..
--- a/sys-boot/refind/files/makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/Makefile b/Makefile
 a/Makefile
-+++ b/Makefile
-@@ -161,8 +161,9 @@ fs_edk2: build_edk2
-   done
- 
- build_edk2: $(EDK2BASE)/RefindPkg
--  cd $(EDK2BASE) && \
--  . ./edksetup.sh BaseTools && \
-+  +cd $(EDK2BASE) && \
-+  . udk-workspace && \
-+  build -a $(UC_ARCH) -p MdePkg/MdePkg.dsc && \
-   build -a $(UC_ARCH) -p RefindPkg/RefindPkg.dsc
-   mkdir -p ./drivers_$(FILENAME_CODE)
- 
-diff --git a/filesystems/Makefile b/filesystems/Makefile
-index 99452ed..9bc984d 100644
 a/filesystems/Makefile
-+++ b/filesystems/Makefile
-@@ -5,6 +5,7 @@
- # name of the driver to be built. This is done because of a dependency
- # in the fsw_efi.c file on the filesystem type; this file must be
- # recompiled for each new filesystem built.
-+.NOTPARALLEL:
- 
- # This program is licensed under the terms of the GNU GPL, version 3,
- # or (at your option) any later version.



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/, sys-boot/refind/files/

2022-05-18 Thread Joonas Niilola
commit: 2a0355749f736752aad60ea630dedb87df09b3cc
Author: Matt Jolly  footclan  ninja>
AuthorDate: Fri May 13 12:20:27 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed May 18 15:29:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a035574

sys-boot/refind: drop 0.11.4, 0.12.0-r1

Signed-off-by: Matt Jolly  footclan.ninja>
Closes: https://github.com/gentoo/gentoo/pull/25463
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-boot/refind/Manifest|   2 -
 sys-boot/refind/files/refind-0.12.0-gcc10.patch |  11 --
 sys-boot/refind/refind-0.11.4.ebuild| 168 
 sys-boot/refind/refind-0.12.0-r1.ebuild | 146 
 4 files changed, 327 deletions(-)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 402f95579a42..9d884c1c9c9d 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,4 +1,2 @@
-DIST refind-src-0.11.4.tar.gz 3812192 BLAKE2B 
7219eeb63961a7ba8f7617546a12021cfe80df80a83c4dbd47cd40b0d8afbdc510abb44de3029ff15ed49372bd59e0b156f4c27eab3ef7bd6ccc3c7e02db
 SHA512 
529962ae432edaf1895ba98deb00a23c66bd742578e1a367f70f7ed22dd7be7daf1960df8af410fba79ca775169120499a4c10119331b2b12b55a002d4354de1
-DIST refind-src-0.12.0.tar.gz 3898337 BLAKE2B 
1197049fb7d91db64135dafda7488bdb1da4997ce6a6d49dfe635526240e3193d8c7c22597aee0f2d6754ce6061b4127d8aa21d43c9f061501de98e25de609d3
 SHA512 
3ade9642d7acf31097daa5308acb96a9fa3371314073b5a09601a886fc30444752efa08ed9fb35e421efb0b4eb9efbccd7b5c9bd6b3b9ed4af74c58f22a74729
 DIST refind-src-0.13.2.tar.gz 4554759 BLAKE2B 
2c3b1daf5fa100dcd4e1c801aa625e269ae9c1a99b567a271d7cdd30f95fa1e041e22984623b9a0e61f8af45966919f4b9f3a5b6c2026271d1bc37c6925f1e70
 SHA512 
e671d44385297295c143824dd95593f2e7bc8e282745d127b041a645aa27003467a3a23f368fd30297f33faa06bd914540d7bdc3c71ec42f6b7a38d7ee8e0ddb
 DIST refind-src-0.13.3.1.tar.gz 4550242 BLAKE2B 
ab8dd27f82954ea6f9831f827550f27b5ca426b7783e918311ba7e178fc3509698a0107f61d0394a7893318528cb3e0c8491f4522de0a4aca6a40e0749f5a6f9
 SHA512 
7966df5dd8dc66cc49a329ed722a567672da8e2fa3f2334d53db65357cea17cba5a4dc5459e358de1079a938da3c63dc626d096ce28b6bf1fa2964be7359dbd1

diff --git a/sys-boot/refind/files/refind-0.12.0-gcc10.patch 
b/sys-boot/refind/files/refind-0.12.0-gcc10.patch
deleted file mode 100644
index 1f2e2bc0a5de..
--- a/sys-boot/refind/files/refind-0.12.0-gcc10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/Make.common
-+++ b/Make.common
-@@ -60,7 +60,7 @@
- #
- 
- # ...for both GNU-EFI and TianoCore
--OPTIMFLAGS  = -Os -fno-strict-aliasing
-+OPTIMFLAGS  = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns
- CFLAGS  = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall
- 
- # ...for GNU-EFI

diff --git a/sys-boot/refind/refind-0.11.4.ebuild 
b/sys-boot/refind/refind-0.11.4.ebuild
deleted file mode 100644
index 37ad051eba4d..
--- a/sys-boot/refind/refind-0.11.4.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing toolchain-funcs
-
-DESCRIPTION="The UEFI Boot Manager by Rod Smith"
-HOMEPAGE="https://www.rodsbooks.com/refind/";
-SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
-IUSE="${FS_USE} custom-cflags doc gnuefi"
-
-DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-   !gnuefi? ( >=sys-boot/udk-2018-r1 )"
-
-DOCS=(README.txt)
-PATCHES=("${FILESDIR}/makefile.patch")
-UDK_WORKSPACE="${T}/udk"
-
-pkg_pretend() {
-   if use custom-cflags; then
-   ewarn
-   ewarn "You have enabled building with USE=custom-cflags. Be 
aware that"
-   ewarn "using this can result in EFI binaries that fail to run 
and may"
-   ewarn "fail to build at all. This is strongly advised against 
by upstream."
-   ewarn
-   ewarn "See https://bugs.gentoo.org/598587#c3 for more 
information"
-   ewarn
-   fi
-}
-
-pkg_setup() {
-   if use x86; then
-   export EFIARCH=ia32
-   export BUILDARCH=ia32
-   elif use amd64; then
-   export EFIARCH=x64
-   export BUILDARCH=x86_64
-   fi
-}
-
-src_prepare() {
-   default
-
-   # bug 598647 - PIE not supported
-   sed -e '/^CFLAGS/s:$: -fno-PIE:' -i Make.common || die
-
-   # Prepare UDK workspace
-   if ! use gnuefi; then
-   mkdir "${UDK_WORKSPACE}" || die
-   ln -s "${EPREFIX}/usr/lib/udk/"{Mde,IntelFramework}{,Module}Pkg 
\
-   "${UDK_WORKSPACE}" || die "Could not link UDK files"
-   fi
-}
-
-src_configure() {
-   if ! use gnuefi; then
-   # Use the side effect of the script which will create 
configur

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2022-05-18 Thread Joonas Niilola
commit: 2c31ec0df16b18a1032c0fe154a43da8b7bf54da
Author: Matt Jolly  footclan  ninja>
AuthorDate: Fri May 13 12:19:41 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed May 18 15:29:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c31ec0d

sys-boot/refind: add 0.13.3.1

Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-boot/refind/Manifest   |   1 +
 sys-boot/refind/metadata.xml   |  14 ++--
 sys-boot/refind/refind-0.13.3.1.ebuild | 140 +
 3 files changed, 147 insertions(+), 8 deletions(-)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 99f58f7bb053..402f95579a42 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,3 +1,4 @@
 DIST refind-src-0.11.4.tar.gz 3812192 BLAKE2B 
7219eeb63961a7ba8f7617546a12021cfe80df80a83c4dbd47cd40b0d8afbdc510abb44de3029ff15ed49372bd59e0b156f4c27eab3ef7bd6ccc3c7e02db
 SHA512 
529962ae432edaf1895ba98deb00a23c66bd742578e1a367f70f7ed22dd7be7daf1960df8af410fba79ca775169120499a4c10119331b2b12b55a002d4354de1
 DIST refind-src-0.12.0.tar.gz 3898337 BLAKE2B 
1197049fb7d91db64135dafda7488bdb1da4997ce6a6d49dfe635526240e3193d8c7c22597aee0f2d6754ce6061b4127d8aa21d43c9f061501de98e25de609d3
 SHA512 
3ade9642d7acf31097daa5308acb96a9fa3371314073b5a09601a886fc30444752efa08ed9fb35e421efb0b4eb9efbccd7b5c9bd6b3b9ed4af74c58f22a74729
 DIST refind-src-0.13.2.tar.gz 4554759 BLAKE2B 
2c3b1daf5fa100dcd4e1c801aa625e269ae9c1a99b567a271d7cdd30f95fa1e041e22984623b9a0e61f8af45966919f4b9f3a5b6c2026271d1bc37c6925f1e70
 SHA512 
e671d44385297295c143824dd95593f2e7bc8e282745d127b041a645aa27003467a3a23f368fd30297f33faa06bd914540d7bdc3c71ec42f6b7a38d7ee8e0ddb
+DIST refind-src-0.13.3.1.tar.gz 4550242 BLAKE2B 
ab8dd27f82954ea6f9831f827550f27b5ca426b7783e918311ba7e178fc3509698a0107f61d0394a7893318528cb3e0c8491f4522de0a4aca6a40e0749f5a6f9
 SHA512 
7966df5dd8dc66cc49a329ed722a567672da8e2fa3f2334d53db65357cea17cba5a4dc5459e358de1079a938da3c63dc626d096ce28b6bf1fa2964be7359dbd1

diff --git a/sys-boot/refind/metadata.xml b/sys-boot/refind/metadata.xml
index 39c685e1f5b5..c4b2438447a5 100644
--- a/sys-boot/refind/metadata.xml
+++ b/sys-boot/refind/metadata.xml
@@ -40,24 +40,22 @@ d'amorçage au moment de l'exécution le rend très facile à 
utiliser, en
 particulier associé à des noyau Linux qui fournissent un support EFI stub.


+   Builds the EFI binary btrfs filesystem 
driver
Builds the EFI binary ext2 filesystem 
driver
Builds the EFI binary ext4 filesystem 
driver
-   Builds the EFI binary reiserfs filesystem 
driver
-   Builds the EFI binary iso9660 filesystem 
driver
Builds the EFI binary hfs filesystem 
driver
-   Builds the EFI binary btrfs filesystem 
driver
+   Builds the EFI binary iso9660 filesystem 
driver
Builds the EFI binary ntfs filesystem 
driver
-   Compile using GNU-EFI instead of 
Tianocore
+   Builds the EFI binary reiserfs filesystem 
driver


+   Construire le gestionnaire EFI pour le 
système de fichier btrfs
Construire le gestionnaire EFI pour le 
système de fichier ext2
Construire le gestionnaire EFI pour le 
système de fichier ext4
-   Construire le gestionnaire EFI pour le 
système de fichier reiserfs
-   Construire le gestionnaire EFI pour le 
système de fichier iso9660
Construire le gestionnaire EFI pour le système 
de fichier hfs
-   Construire le gestionnaire EFI pour le 
système de fichier btrfs
+   Construire le gestionnaire EFI pour le 
système de fichier iso9660
Construire le gestionnaire EFI pour le 
système de fichier ntfs
-   Compiler en utilisant GNU-EFI au lieu de 
Tianocore
+   Construire le gestionnaire EFI pour le 
système de fichier reiserfs


refind

diff --git a/sys-boot/refind/refind-0.13.3.1.ebuild 
b/sys-boot/refind/refind-0.13.3.1.ebuild
new file mode 100644
index ..73f27787890e
--- /dev/null
+++ b/sys-boot/refind/refind-0.13.3.1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="The UEFI Boot Manager by Rod Smith"
+HOMEPAGE="https://www.rodsbooks.com/refind/";
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} custom-cflags doc"
+
+DEPEND="sys-boot/gnu-efi"
+
+DOCS=( README.txt )
+
+pkg_pretend() {
+   if use custom-cflags; then
+   ewarn
+   ewarn "You have enabled building with USE=custom-cfl

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2021-12-06 Thread Agostino Sarubbo
commit: 015afd59a96d6e8d827d4a33fbe3f5221c640baf
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Dec  7 06:25:28 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Dec  7 06:25:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=015afd59

sys-boot/refind: x86 stable wrt bug #824786

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-boot/refind/refind-0.13.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/refind/refind-0.13.2.ebuild 
b/sys-boot/refind/refind-0.13.2.ebuild
index 375df447651c..68c1950f9e8c 100644
--- a/sys-boot/refind/refind-0.13.2.ebuild
+++ b/sys-boot/refind/refind-0.13.2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
 
 LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} custom-cflags doc"
 



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2021-12-05 Thread Sam James
commit: 233ed6cb84e2e5ca7139127128d49d44a6a00370
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  5 22:03:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  5 22:03:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=233ed6cb

sys-boot/refind: Stabilize 0.13.2 amd64, #824786

Signed-off-by: Sam James  gentoo.org>

 sys-boot/refind/refind-0.13.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/refind/refind-0.13.2.ebuild 
b/sys-boot/refind/refind-0.13.2.ebuild
index ce3ba933229e..375df447651c 100644
--- a/sys-boot/refind/refind-0.13.2.ebuild
+++ b/sys-boot/refind/refind-0.13.2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
 
 LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} custom-cflags doc"
 



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/files/, sys-boot/refind/

2021-11-19 Thread Sam James
commit: a53c6c338d72c8ddd2e517c69bbd901afe5a367d
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 19 10:24:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 19 10:25:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a53c6c33

sys-boot/refind: fix build with gnu-efi-3.0.14

Seems to build fine with older versions too.

Closes: https://bugs.gentoo.org/810907
Signed-off-by: Sam James  gentoo.org>

 .../refind/files/refind-0.13.2-gnuefi-3.0.14.patch | 51 ++
 sys-boot/refind/refind-0.13.2.ebuild   |  4 ++
 2 files changed, 55 insertions(+)

diff --git a/sys-boot/refind/files/refind-0.13.2-gnuefi-3.0.14.patch 
b/sys-boot/refind/files/refind-0.13.2-gnuefi-3.0.14.patch
new file mode 100644
index ..751a8e838dfa
--- /dev/null
+++ b/sys-boot/refind/files/refind-0.13.2-gnuefi-3.0.14.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/810907
+https://sources.debian.org/patches/refind/0.13.2-1/gnu-efi.patch/
+
+Origin: 
https://sourceforge.net/p/refind/code/ci/10f838a4cd132a5595acaf3c54c15782151a61df
+Applied-Upstream: 0.13.3
+From 10f838a4cd132a5595acaf3c54c15782151a61df Mon Sep 17 00:00:00 2001
+From: Rod Smith 
+Date: Sat, 23 Oct 2021 10:17:23 -0400
+Subject: [PATCH] Fix compile problems with recent GNU-EFI versions
+
+---
+ EfiLib/DevicePathUtilities.h | 13 -
+ EfiLib/gnuefi-helper.c   |  1 -
+ NEWS.txt |  3 +++
+ include/version.h|  2 +-
+ 4 files changed, 4 insertions(+), 15 deletions(-)
+
+diff --git a/EfiLib/DevicePathUtilities.h b/EfiLib/DevicePathUtilities.h
+index b559671..14ed797 100644
+--- a/EfiLib/DevicePathUtilities.h
 b/EfiLib/DevicePathUtilities.h
+@@ -217,17 +217,4 @@ EFIAPI
+ --*/
+ ;
+ 
+-typedef struct {
+-  EFI_DEVICE_PATH_UTILS_GET_DEVICE_PATH_SIZE GetDevicePathSize;
+-  EFI_DEVICE_PATH_UTILS_DUP_DEVICE_PATH  DuplicateDevicePath;
+-  EFI_DEVICE_PATH_UTILS_APPEND_PATH  AppendDevicePath;
+-  EFI_DEVICE_PATH_UTILS_APPEND_NODE  AppendDeviceNode;
+-  EFI_DEVICE_PATH_UTILS_APPEND_INSTANCE  AppendDevicePathInstance;
+-  EFI_DEVICE_PATH_UTILS_GET_NEXT_INSTANCEGetNextDevicePathInstance;
+-  EFI_DEVICE_PATH_UTILS_IS_MULTI_INSTANCEIsDevicePathMultiInstance;
+-  EFI_DEVICE_PATH_UTILS_CREATE_NODE  CreateDeviceNode;
+-} EFI_DEVICE_PATH_UTILITIES_PROTOCOL;
+-
+-extern EFI_GUID gEfiDevicePathUtilitiesProtocolGuid;
+-
+ #endif
+diff --git a/EfiLib/gnuefi-helper.c b/EfiLib/gnuefi-helper.c
+index 246c261..8730403 100644
+--- a/EfiLib/gnuefi-helper.c
 b/EfiLib/gnuefi-helper.c
+@@ -20,7 +20,6 @@
+ #include "refit_call_wrapper.h"
+ #include "LegacyBios.h"
+ 
+-EFI_GUID gEfiDevicePathUtilitiesProtocolGuid = { 0x09576E91, 0x6D3F, 0x11D2, 
{ 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }};
+ EFI_GUID gEfiLegacyBiosProtocolGuid = { 0xdb9a1e3d, 0x45cb, 0x4abb, { 0x85, 
0x3b, 0xe5, 0x38, 0x7f, 0xdb, 0x2e, 0x2d }};
+ 
+ /**

diff --git a/sys-boot/refind/refind-0.13.2.ebuild 
b/sys-boot/refind/refind-0.13.2.ebuild
index 6ac73e61dca8..ce3ba933229e 100644
--- a/sys-boot/refind/refind-0.13.2.ebuild
+++ b/sys-boot/refind/refind-0.13.2.ebuild
@@ -19,6 +19,10 @@ DEPEND="sys-boot/gnu-efi"
 
 DOCS=( README.txt )
 
+PATCHES=(
+   "${FILESDIR}"/${P}-gnuefi-3.0.14.patch
+)
+
 pkg_pretend() {
if use custom-cflags; then
ewarn



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2021-03-23 Thread Joonas Niilola
commit: 1f1d9112eae5020999fec2a7d6a24491b1ba59e4
Author: Stéphane Veyret  neptura  org>
AuthorDate: Sun Mar 21 09:36:05 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Mar 23 09:21:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f1d9112

sys-boot/refind: version bump to 0.13.2

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Stéphane Veyret  neptura.org>
Closes: https://bugs.gentoo.org/771912
Closes: https://github.com/gentoo/gentoo/pull/20026
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-boot/refind/Manifest |   1 +
 sys-boot/refind/refind-0.13.2.ebuild | 140 +++
 2 files changed, 141 insertions(+)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 698924ad273..99f58f7bb05 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,2 +1,3 @@
 DIST refind-src-0.11.4.tar.gz 3812192 BLAKE2B 
7219eeb63961a7ba8f7617546a12021cfe80df80a83c4dbd47cd40b0d8afbdc510abb44de3029ff15ed49372bd59e0b156f4c27eab3ef7bd6ccc3c7e02db
 SHA512 
529962ae432edaf1895ba98deb00a23c66bd742578e1a367f70f7ed22dd7be7daf1960df8af410fba79ca775169120499a4c10119331b2b12b55a002d4354de1
 DIST refind-src-0.12.0.tar.gz 3898337 BLAKE2B 
1197049fb7d91db64135dafda7488bdb1da4997ce6a6d49dfe635526240e3193d8c7c22597aee0f2d6754ce6061b4127d8aa21d43c9f061501de98e25de609d3
 SHA512 
3ade9642d7acf31097daa5308acb96a9fa3371314073b5a09601a886fc30444752efa08ed9fb35e421efb0b4eb9efbccd7b5c9bd6b3b9ed4af74c58f22a74729
+DIST refind-src-0.13.2.tar.gz 4554759 BLAKE2B 
2c3b1daf5fa100dcd4e1c801aa625e269ae9c1a99b567a271d7cdd30f95fa1e041e22984623b9a0e61f8af45966919f4b9f3a5b6c2026271d1bc37c6925f1e70
 SHA512 
e671d44385297295c143824dd95593f2e7bc8e282745d127b041a645aa27003467a3a23f368fd30297f33faa06bd914540d7bdc3c71ec42f6b7a38d7ee8e0ddb

diff --git a/sys-boot/refind/refind-0.13.2.ebuild 
b/sys-boot/refind/refind-0.13.2.ebuild
new file mode 100644
index 000..6ac73e61dca
--- /dev/null
+++ b/sys-boot/refind/refind-0.13.2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing toolchain-funcs
+
+DESCRIPTION="The UEFI Boot Manager by Rod Smith"
+HOMEPAGE="https://www.rodsbooks.com/refind/";
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} custom-cflags doc"
+
+DEPEND="sys-boot/gnu-efi"
+
+DOCS=( README.txt )
+
+pkg_pretend() {
+   if use custom-cflags; then
+   ewarn
+   ewarn "You have enabled building with USE=custom-cflags. Be 
aware that"
+   ewarn "using this can result in EFI binaries that fail to run 
and may"
+   ewarn "fail to build at all. This is strongly advised against 
by upstream."
+   ewarn
+   ewarn "See https://bugs.gentoo.org/598587#c3 for more 
information"
+   ewarn
+   fi
+}
+
+pkg_setup() {
+   if use x86; then
+   export EFIARCH=ia32
+   export BUILDARCH=ia32
+   elif use amd64; then
+   export EFIARCH=x64
+   export BUILDARCH=x86_64
+   fi
+}
+
+src_prepare() {
+   default
+
+   # bug 598647 - PIE not supported
+   sed -e '/^CFLAGS/s/$/ -fno-PIE/' -i Make.common || die
+   sed -e '1 i\.NOTPARALLEL:' -i filesystems/Makefile || die
+}
+
+src_compile() {
+   # Update fs targets depending on uses
+   local fs fs_names=()
+   for fs in ${FS_USE}; do
+   fs=${fs#+}
+   if use "${fs}"; then
+   fs_names+=(${fs})
+   fi
+   done
+   fs_names=("${fs_names[@]/%/_gnuefi}")
+
+   # Prepare flags
+   local make_flags=(
+   ARCH="${BUILDARCH}"
+   CC="$(tc-getCC)"
+   AS="$(tc-getAS)"
+   LD="$(tc-getLD)"
+   AR="$(tc-getAR)"
+   RANLIB="$(tc-getRANLIB)"
+   OBJCOPY="$(tc-getOBJCOPY)"
+   GNUEFILIB="/usr/$(get_libdir)"
+   EFILIB="/usr/$(get_libdir)"
+   EFICRT0="/usr/$(get_libdir)"
+   FILESYSTEMS="${fs_names[*]}"
+   FILESYSTEMS_GNUEFI="${fs_names[*]}"
+   )
+   if use custom-cflags; then
+   make_flags=(CFLAGS="${CFLAGS} 
-fno-tree-loop-distribute-patterns" "${make_flags[@]}")
+   fi
+
+   emake "${make_flags[@]}" all_gnuefi
+}
+
+src_install() {
+   exeinto "/usr/$(get_libdir)/${PN}"
+   doexe refind-install
+   dosym "../$(get_libdir)/${PN}/refind-install" "/usr/sbin/refind-install"
+
+   if use doc; then
+   doman "docs/man/"*
+   DOCS+=(NEWS.txt docs/refind docs/Styles)
+   fi
+   einstalldocs
+
+   insinto "/usr/$(get_libdir)/${PN}/refind"
+   doins "r

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2021-01-20 Thread Sam James
commit: 3c42e42fdaceea2263e1bc92dc196068fa1e695b
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 20 09:28:57 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 20 09:28:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c42e42f

sys-boot/refind: Stabilize 0.12.0-r1 x86, #762913

Signed-off-by: Sam James  gentoo.org>

 sys-boot/refind/refind-0.12.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/refind/refind-0.12.0-r1.ebuild 
b/sys-boot/refind/refind-0.12.0-r1.ebuild
index 19bfa806fd5..39004c2d009 100644
--- a/sys-boot/refind/refind-0.12.0-r1.ebuild
+++ b/sys-boot/refind/refind-0.12.0-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
 
 LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} custom-cflags doc"
 



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2021-01-19 Thread Sam James
commit: f43d3f40ecc816a71760c870db3f900aed653864
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan 19 14:24:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 19 14:24:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f43d3f40

sys-boot/refind: Stabilize 0.12.0-r1 amd64, #762913

Signed-off-by: Sam James  gentoo.org>

 sys-boot/refind/refind-0.12.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/refind/refind-0.12.0-r1.ebuild 
b/sys-boot/refind/refind-0.12.0-r1.ebuild
index c1d166f0b4d..19bfa806fd5 100644
--- a/sys-boot/refind/refind-0.12.0-r1.ebuild
+++ b/sys-boot/refind/refind-0.12.0-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
 
 LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} custom-cflags doc"
 



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2021-01-10 Thread Sam James
commit: 8ea14599e99ef09450ea4abd40a1a4de598ce109
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 10 18:29:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 10 18:30:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ea14599

sys-boot/refind: fix build with Bash 5.1

Reported-by: Greg Turner  be-evil.net>
Closes: https://bugs.gentoo.org/762379
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 sys-boot/refind/refind-0.11.4.ebuild| 8 
 sys-boot/refind/refind-0.12.0-r1.ebuild | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys-boot/refind/refind-0.11.4.ebuild 
b/sys-boot/refind/refind-0.11.4.ebuild
index 139bf622501..37ad051eba4 100644
--- a/sys-boot/refind/refind-0.11.4.ebuild
+++ b/sys-boot/refind/refind-0.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -99,9 +99,9 @@ src_compile() {
EFILIB="/usr/$(get_libdir)"
EFICRT0="/usr/$(get_libdir)"
EDK2BASE="${UDK_WORKSPACE}"
-   EDK2_DRIVER_BASENAMES="${fs_names[@]}"
-   FILESYSTEMS="${fs_names[@]}"
-   FILESYSTEMS_GNUEFI="${fs_names[@]}"
+   EDK2_DRIVER_BASENAMES="${fs_names[*]}"
+   FILESYSTEMS="${fs_names[*]}"
+   FILESYSTEMS_GNUEFI="${fs_names[*]}"
)
if use custom-cflags; then
make_flags=(CFLAGS="${CFLAGS}" "${make_flags[@]}")

diff --git a/sys-boot/refind/refind-0.12.0-r1.ebuild 
b/sys-boot/refind/refind-0.12.0-r1.ebuild
index f63a0cbd324..c1d166f0b4d 100644
--- a/sys-boot/refind/refind-0.12.0-r1.ebuild
+++ b/sys-boot/refind/refind-0.12.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -77,9 +77,9 @@ src_compile() {
EFILIB="/usr/$(get_libdir)"
EFICRT0="/usr/$(get_libdir)"
EDK2BASE="${UDK_WORKSPACE}"
-   EDK2_DRIVER_BASENAMES="${fs_names[@]}"
-   FILESYSTEMS="${fs_names[@]}"
-   FILESYSTEMS_GNUEFI="${fs_names[@]}"
+   EDK2_DRIVER_BASENAMES="${fs_names[*]}"
+   FILESYSTEMS="${fs_names[*]}"
+   FILESYSTEMS_GNUEFI="${fs_names[*]}"
)
if use custom-cflags; then
make_flags=(CFLAGS="${CFLAGS} 
-fno-tree-loop-distribute-patterns" "${make_flags[@]}")



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2020-12-06 Thread Joonas Niilola
commit: dedfa2346704558dca52c69d65c96adecd932f85
Author: Theo Anderson  posteo  de>
AuthorDate: Fri Nov 27 10:51:25 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Dec  7 07:30:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dedfa234

sys-boot/refind: drop old

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Theo Anderson  posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/18426
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-boot/refind/refind-0.12.0.ebuild | 168 ---
 1 file changed, 168 deletions(-)

diff --git a/sys-boot/refind/refind-0.12.0.ebuild 
b/sys-boot/refind/refind-0.12.0.ebuild
deleted file mode 100644
index 9091a88cfcb..000
--- a/sys-boot/refind/refind-0.12.0.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing toolchain-funcs
-
-DESCRIPTION="The UEFI Boot Manager by Rod Smith"
-HOMEPAGE="https://www.rodsbooks.com/refind/";
-SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
-IUSE="${FS_USE} custom-cflags doc gnuefi"
-
-DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-   !gnuefi? ( >=sys-boot/udk-2018-r1 )"
-
-DOCS=(README.txt)
-PATCHES=("${FILESDIR}/makefile.patch")
-UDK_WORKSPACE="${T}/udk"
-
-pkg_pretend() {
-   if use custom-cflags; then
-   ewarn
-   ewarn "You have enabled building with USE=custom-cflags. Be 
aware that"
-   ewarn "using this can result in EFI binaries that fail to run 
and may"
-   ewarn "fail to build at all. This is strongly advised against 
by upstream."
-   ewarn
-   ewarn "See https://bugs.gentoo.org/598587#c3 for more 
information"
-   ewarn
-   fi
-}
-
-pkg_setup() {
-   if use x86; then
-   export EFIARCH=ia32
-   export BUILDARCH=ia32
-   elif use amd64; then
-   export EFIARCH=x64
-   export BUILDARCH=x86_64
-   fi
-}
-
-src_prepare() {
-   default
-
-   # bug 598647 - PIE not supported
-   sed -e '/^CFLAGS/s:$: -fno-PIE:' -i Make.common || die
-
-   # Prepare UDK workspace
-   if ! use gnuefi; then
-   mkdir "${UDK_WORKSPACE}" || die
-   ln -s "${EPREFIX}/usr/lib/udk/"{Mde,IntelFramework}{,Module}Pkg 
\
-   "${UDK_WORKSPACE}" || die "Could not link UDK files"
-   fi
-}
-
-src_configure() {
-   if ! use gnuefi; then
-   # Use the side effect of the script which will create 
configuration files
-   (. udk-workspace "${UDK_WORKSPACE}" || die)
-   sed -e "s:^#\?\s*\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$:\1 
$(makeopts_jobs):" \
-   -i "${UDK_WORKSPACE}/Conf/target.txt" || die "Failed to 
configure target file"
-   sed -e 
"s:\(_\(CC\|ASM\|PP\|VFRPP\|ASLCC\|ASLPP\|DLINK\)_PATH\s*=\).*$:\1 
$(tc-getCC):" \
-   -e "s:\(_ASLDLINK_PATH\s*=\).*$:\1 $(tc-getLD):" \
-   -e "s:\(_OBJCOPY_PATH\s*=\).*$:\1 $(tc-getOBJCOPY):" \
-   -e "s:\(_RC_PATH\s*=\).*$:\1 $(tc-getOBJCOPY):" \
-   -e "s:\(_SLINK_PATH\s*=\).*$:\1 $(tc-getAR):" \
-   -e "s:-Werror::" \
-   -i "${UDK_WORKSPACE}/Conf/tools_def.txt" \
-   || die "Failed to prepare tools definition file"
-   fi
-}
-
-src_compile() {
-   # Update fs targets depending on uses
-   local fs fs_names=()
-   for fs in ${FS_USE}; do
-   fs=${fs#+}
-   if use "${fs}"; then
-   fs_names+=(${fs})
-   fi
-   done
-   use gnuefi && fs_names=("${fs_names[@]/%/_gnuefi}")
-
-   # Prepare flags
-   local make_flags=(
-   ARCH="${BUILDARCH}"
-   CC="$(tc-getCC)"
-   AS="$(tc-getAS)"
-   LD="$(tc-getLD)"
-   AR="$(tc-getAR)"
-   RANLIB="$(tc-getRANLIB)"
-   OBJCOPY="$(tc-getOBJCOPY)"
-   GNUEFILIB="/usr/$(get_libdir)"
-   EFILIB="/usr/$(get_libdir)"
-   EFICRT0="/usr/$(get_libdir)"
-   EDK2BASE="${UDK_WORKSPACE}"
-   EDK2_DRIVER_BASENAMES="${fs_names[@]}"
-   FILESYSTEMS="${fs_names[@]}"
-   FILESYSTEMS_GNUEFI="${fs_names[@]}"
-   )
-   if use custom-cflags; then
-   make_flags=(CFLAGS="${CFLAGS}" "${make_flags[@]}")
-   fi
-
-   emake "${make_flags[@]}" all_$(usex gnuefi gnuefi edk2)
-}
-
-src_install() {
-   exeinto "/usr/lib/${PN}"
-   doexe refind-install
-   dosym "../lib/${PN}/refind-install" "/usr/sbin/refind-install"
-
-   if 

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/files/, sys-boot/refind/

2020-12-06 Thread Joonas Niilola
commit: 1aa0c940ee1fc5a5efc5800ee69f676e3710d24a
Author: Theo Anderson  posteo  de>
AuthorDate: Fri Nov 27 10:51:00 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Dec  7 07:30:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aa0c940

sys-boot/refind: add GCC 10 patch / custom-cflags fix

Closes: https://bugs.gentoo.org/723244
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Theo Anderson  posteo.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-boot/refind/files/refind-0.12.0-gcc10.patch | 11 +++
 sys-boot/refind/refind-0.12.0-r1.ebuild | 12 
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/sys-boot/refind/files/refind-0.12.0-gcc10.patch 
b/sys-boot/refind/files/refind-0.12.0-gcc10.patch
new file mode 100644
index 000..1f2e2bc0a5d
--- /dev/null
+++ b/sys-boot/refind/files/refind-0.12.0-gcc10.patch
@@ -0,0 +1,11 @@
+--- a/Make.common
 b/Make.common
+@@ -60,7 +60,7 @@
+ #
+ 
+ # ...for both GNU-EFI and TianoCore
+-OPTIMFLAGS  = -Os -fno-strict-aliasing
++OPTIMFLAGS  = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns
+ CFLAGS  = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall
+ 
+ # ...for GNU-EFI

diff --git a/sys-boot/refind/refind-0.12.0-r1.ebuild 
b/sys-boot/refind/refind-0.12.0-r1.ebuild
index b595a111e7e..f63a0cbd324 100644
--- a/sys-boot/refind/refind-0.12.0-r1.ebuild
+++ b/sys-boot/refind/refind-0.12.0-r1.ebuild
@@ -15,10 +15,14 @@ KEYWORDS="~amd64 ~x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} custom-cflags doc"
 
-DEPEND=">=sys-boot/gnu-efi-3.0.2"
+DEPEND="sys-boot/gnu-efi"
 
-DOCS=(README.txt)
-PATCHES=("${FILESDIR}/makefile.patch")
+PATCHES=(
+   "${FILESDIR}/makefile.patch"
+   "${FILESDIR}/${P}-gcc10.patch" # Bug 723244
+)
+
+DOCS=( README.txt )
 
 pkg_pretend() {
if use custom-cflags; then
@@ -78,7 +82,7 @@ src_compile() {
FILESYSTEMS_GNUEFI="${fs_names[@]}"
)
if use custom-cflags; then
-   make_flags=(CFLAGS="${CFLAGS}" "${make_flags[@]}")
+   make_flags=(CFLAGS="${CFLAGS} 
-fno-tree-loop-distribute-patterns" "${make_flags[@]}")
fi
 
emake "${make_flags[@]}" all_gnuefi



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2020-07-30 Thread Marek Szuba
commit: a940ef1ee145a02b22243b17eb02f79f6eaa484c
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Jul 30 20:54:20 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Jul 30 21:11:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a940ef1e

sys-boot/refind: remove dependency on sys-boot/udk

UDK is py2-only and will likely be removed from Gentoo soon. In fact, it
already got temporarily last-rited earlier on this week - and rEFInd
along with it. Given we have been forcing USE=gnuefi for sys-boot/refind
for years anyway, just make the gnu-efi dependency mandatory.

Note that the use.force entry for USE=gnuefi is still there due to the
fact most rEFInd versions in the tree still honour that flag, plus I
want to make this change as minimally intrusive as possible.

With apologies to the current maintainer should they get upset about
this change having been made without them having okayed it, it's about
making sure sys-boot/refind does not get last-rited again.

Signed-off-by: Marek Szuba  gentoo.org>

 sys-boot/refind/refind-0.12.0-r1.ebuild | 142 
 1 file changed, 142 insertions(+)

diff --git a/sys-boot/refind/refind-0.12.0-r1.ebuild 
b/sys-boot/refind/refind-0.12.0-r1.ebuild
new file mode 100644
index 000..b595a111e7e
--- /dev/null
+++ b/sys-boot/refind/refind-0.12.0-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing toolchain-funcs
+
+DESCRIPTION="The UEFI Boot Manager by Rod Smith"
+HOMEPAGE="https://www.rodsbooks.com/refind/";
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} custom-cflags doc"
+
+DEPEND=">=sys-boot/gnu-efi-3.0.2"
+
+DOCS=(README.txt)
+PATCHES=("${FILESDIR}/makefile.patch")
+
+pkg_pretend() {
+   if use custom-cflags; then
+   ewarn
+   ewarn "You have enabled building with USE=custom-cflags. Be 
aware that"
+   ewarn "using this can result in EFI binaries that fail to run 
and may"
+   ewarn "fail to build at all. This is strongly advised against 
by upstream."
+   ewarn
+   ewarn "See https://bugs.gentoo.org/598587#c3 for more 
information"
+   ewarn
+   fi
+}
+
+pkg_setup() {
+   if use x86; then
+   export EFIARCH=ia32
+   export BUILDARCH=ia32
+   elif use amd64; then
+   export EFIARCH=x64
+   export BUILDARCH=x86_64
+   fi
+}
+
+src_prepare() {
+   default
+
+   # bug 598647 - PIE not supported
+   sed -e '/^CFLAGS/s:$: -fno-PIE:' -i Make.common || die
+}
+
+src_compile() {
+   # Update fs targets depending on uses
+   local fs fs_names=()
+   for fs in ${FS_USE}; do
+   fs=${fs#+}
+   if use "${fs}"; then
+   fs_names+=(${fs})
+   fi
+   done
+   fs_names=("${fs_names[@]/%/_gnuefi}")
+
+   # Prepare flags
+   local make_flags=(
+   ARCH="${BUILDARCH}"
+   CC="$(tc-getCC)"
+   AS="$(tc-getAS)"
+   LD="$(tc-getLD)"
+   AR="$(tc-getAR)"
+   RANLIB="$(tc-getRANLIB)"
+   OBJCOPY="$(tc-getOBJCOPY)"
+   GNUEFILIB="/usr/$(get_libdir)"
+   EFILIB="/usr/$(get_libdir)"
+   EFICRT0="/usr/$(get_libdir)"
+   EDK2BASE="${UDK_WORKSPACE}"
+   EDK2_DRIVER_BASENAMES="${fs_names[@]}"
+   FILESYSTEMS="${fs_names[@]}"
+   FILESYSTEMS_GNUEFI="${fs_names[@]}"
+   )
+   if use custom-cflags; then
+   make_flags=(CFLAGS="${CFLAGS}" "${make_flags[@]}")
+   fi
+
+   emake "${make_flags[@]}" all_gnuefi
+}
+
+src_install() {
+   exeinto "/usr/lib/${PN}"
+   doexe refind-install
+   dosym "../lib/${PN}/refind-install" "/usr/sbin/refind-install"
+
+   if use doc; then
+   doman "docs/man/"*
+   DOCS+=(NEWS.txt docs/refind docs/Styles)
+   fi
+   einstalldocs
+
+   insinto "/usr/lib/${PN}/refind"
+   doins "refind/refind_${EFIARCH}.efi"
+   doins "refind.conf-sample"
+   doins -r images icons fonts banners
+
+   if [[ -d "drivers_${EFIARCH}" ]]; then
+   doins -r "drivers_${EFIARCH}"
+   fi
+
+   insinto "/usr/lib/${PN}/refind/tools_${EFIARCH}"
+   doins "gptsync/gptsync_${EFIARCH}.efi"
+
+   insinto "/etc/refind.d"
+   doins -r "keys"
+
+   dosbin "mkrlconf"
+   dosbin "mvrefind"
+   dosbin "refind-mkdefault"
+}
+
+pkg_postinst() {
+   elog "rEFInd has been built and installed into ${EROOT}/usr/lib/${PN}"
+   elog "You will need to use the command 'refind-install' to install"
+   elo

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2020-04-30 Thread Joonas Niilola
commit: d55a469ceb7854008f9b9a5c9f49b71c604a7f8e
Author: Stéphane Veyret  neptura  org>
AuthorDate: Wed Apr 29 19:21:54 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Apr 30 11:59:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d55a469c

sys-boot/refind: Remove old versions

Signed-off-by: Stéphane Veyret  neptura.org>
Closes: https://github.com/gentoo/gentoo/pull/15570
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-boot/refind/Manifest|   3 -
 sys-boot/refind/refind-0.10.4-r2.ebuild | 197 ---
 sys-boot/refind/refind-0.11.2.ebuild| 200 
 sys-boot/refind/refind-0.11.3.ebuild| 200 
 4 files changed, 600 deletions(-)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index bf2e5d87e50..698924ad273 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,5 +1,2 @@
-DIST refind-src-0.10.4.tar.gz 3970380 BLAKE2B 
0d14c005d3e93a1f0008b6c65e34eb6391c4a4a488b4fa7842c8f0b68eb2cc5be150c8718f01a65454db7b86ffa5873a3d1a96429eaed0cb92c1d29c8d2f7dcd
 SHA512 
a75a6210ee51427c474e69c2de8c719545b2599c19f1c7541048b77ab1996a0e4b4b5fd4840f6240cd6704e5f5338cbaff432d7dc5ec4042854e26d6df18bed5
-DIST refind-src-0.11.2.tar.gz 4533034 BLAKE2B 
fa05781fc1d87d314677f8e670bd7282b591fd3b6f4a5863e81cb962fdb773c774faabb6c45544b0659c8d5c4ef7ce1dba8d798a4caa97364ad7aa2532a42050
 SHA512 
796d86f05152d93340773c2dfbae0ca50ab036373ebed60fcc80404ee269ef4bc100df4b141d555d3363b820c3e9234fc0cf637791061281c86329958dca3479
-DIST refind-src-0.11.3.tar.gz 3792206 BLAKE2B 
369b25dbc97d83f9143ccbe19e89b5975f0796f1e4a2decfc124e4b45c5ef1db8f3e2bb83413f596ca28e82e67b0b9c5682b557a5422e3146780cec151d2a36e
 SHA512 
96907b79e1c9c8199c62058bb6851fa5d6f158802f3777ba19a62c6c0d7d5b49132754bcafa925510fd21c8bafe8ce393117070a628baf4c277fa5f8f536b797
 DIST refind-src-0.11.4.tar.gz 3812192 BLAKE2B 
7219eeb63961a7ba8f7617546a12021cfe80df80a83c4dbd47cd40b0d8afbdc510abb44de3029ff15ed49372bd59e0b156f4c27eab3ef7bd6ccc3c7e02db
 SHA512 
529962ae432edaf1895ba98deb00a23c66bd742578e1a367f70f7ed22dd7be7daf1960df8af410fba79ca775169120499a4c10119331b2b12b55a002d4354de1
 DIST refind-src-0.12.0.tar.gz 3898337 BLAKE2B 
1197049fb7d91db64135dafda7488bdb1da4997ce6a6d49dfe635526240e3193d8c7c22597aee0f2d6754ce6061b4127d8aa21d43c9f061501de98e25de609d3
 SHA512 
3ade9642d7acf31097daa5308acb96a9fa3371314073b5a09601a886fc30444752efa08ed9fb35e421efb0b4eb9efbccd7b5c9bd6b3b9ed4af74c58f22a74729

diff --git a/sys-boot/refind/refind-0.10.4-r2.ebuild 
b/sys-boot/refind/refind-0.10.4-r2.ebuild
deleted file mode 100644
index 349f17cfc64..000
--- a/sys-boot/refind/refind-0.10.4-r2.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic versionator
-
-DESCRIPTION="The UEFI Boot Manager by Rod Smith"
-HOMEPAGE="https://www.rodsbooks.com/refind/";
-
-SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
-IUSE="${FS_USE} -gnuefi doc -custom-cflags"
-
-DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-   !gnuefi? ( >=sys-boot/udk-2015 )"
-
-DOCS="NEWS.txt README.txt docs/refind docs/Styles"
-
-pkg_pretend() {
-   if use custom-cflags; then
-   ewarn
-   ewarn "You have enabled building with USE=custom-cflags. Be 
aware that"
-   ewarn "using this can result in EFI binaries that fail to run 
and may"
-   ewarn "fail to build at all. This is strongly advised against 
by upstream."
-   ewarn
-   ewarn "See https://bugs.gentoo.org/598587#c3 for more 
information"
-   ewarn
-   fi
-}
-
-pkg_setup() {
-   if use x86 ; then
-   export EFIARCH=ia32
-   export BUILDARCH=ia32
-   elif use amd64; then
-   export EFIARCH=x64
-   export BUILDARCH=x86_64
-   else
-   # Try to support anyway
-   export BUILDARCH=$( uname -m | sed s,i[3456789]86,ia32, )
-   if [[ ${BUILDARCH} == "x86_64" ]] ; then
-   export EFIARCH=x64
-   else
-   export EFIARCH=${ARCH}
-   fi
-   fi
-}
-
-src_prepare() {
-   default
-
-   # bug 598647 - PIE not supported
-   sed -e 's:CFLAGS  =:& -fno-PIE:' -i "${S}/Make.common" || die
-
-   local f
-   for f in "${S}"/*/Make.tiano "${S}"/Make.common; do
-   sed -i -e 's/^\(include .*target.txt.*\)$/#\1/' \
-   -e 
's@^\(TIANO_INCLUDE_DIRS\s*=\s*-I\s*\).*$@\1/usr/include/udk \\@' \
-   -e '/^\s*-I \$(EDK2BASE).*$/d' \
-   "${f}" || die "Failed to patch Tianoc

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2020-04-30 Thread Joonas Niilola
commit: 6ea0ac9d85b3d9360e28420cc4bb01552d18208c
Author: Stéphane Veyret  neptura  org>
AuthorDate: Wed Apr 29 19:19:10 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Apr 30 11:59:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea0ac9d

sys-boot/refind: Bump to version 0.12.0

Closes: https://bugs.gentoo.org/711832
Closes: https://bugs.gentoo.org/720034
Signed-off-by: Stéphane Veyret  neptura.org>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-boot/refind/Manifest |   1 +
 sys-boot/refind/refind-0.12.0.ebuild | 168 +++
 2 files changed, 169 insertions(+)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index a294c06247e..bf2e5d87e50 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -2,3 +2,4 @@ DIST refind-src-0.10.4.tar.gz 3970380 BLAKE2B 
0d14c005d3e93a1f0008b6c65e34eb6391
 DIST refind-src-0.11.2.tar.gz 4533034 BLAKE2B 
fa05781fc1d87d314677f8e670bd7282b591fd3b6f4a5863e81cb962fdb773c774faabb6c45544b0659c8d5c4ef7ce1dba8d798a4caa97364ad7aa2532a42050
 SHA512 
796d86f05152d93340773c2dfbae0ca50ab036373ebed60fcc80404ee269ef4bc100df4b141d555d3363b820c3e9234fc0cf637791061281c86329958dca3479
 DIST refind-src-0.11.3.tar.gz 3792206 BLAKE2B 
369b25dbc97d83f9143ccbe19e89b5975f0796f1e4a2decfc124e4b45c5ef1db8f3e2bb83413f596ca28e82e67b0b9c5682b557a5422e3146780cec151d2a36e
 SHA512 
96907b79e1c9c8199c62058bb6851fa5d6f158802f3777ba19a62c6c0d7d5b49132754bcafa925510fd21c8bafe8ce393117070a628baf4c277fa5f8f536b797
 DIST refind-src-0.11.4.tar.gz 3812192 BLAKE2B 
7219eeb63961a7ba8f7617546a12021cfe80df80a83c4dbd47cd40b0d8afbdc510abb44de3029ff15ed49372bd59e0b156f4c27eab3ef7bd6ccc3c7e02db
 SHA512 
529962ae432edaf1895ba98deb00a23c66bd742578e1a367f70f7ed22dd7be7daf1960df8af410fba79ca775169120499a4c10119331b2b12b55a002d4354de1
+DIST refind-src-0.12.0.tar.gz 3898337 BLAKE2B 
1197049fb7d91db64135dafda7488bdb1da4997ce6a6d49dfe635526240e3193d8c7c22597aee0f2d6754ce6061b4127d8aa21d43c9f061501de98e25de609d3
 SHA512 
3ade9642d7acf31097daa5308acb96a9fa3371314073b5a09601a886fc30444752efa08ed9fb35e421efb0b4eb9efbccd7b5c9bd6b3b9ed4af74c58f22a74729

diff --git a/sys-boot/refind/refind-0.12.0.ebuild 
b/sys-boot/refind/refind-0.12.0.ebuild
new file mode 100644
index 000..9091a88cfcb
--- /dev/null
+++ b/sys-boot/refind/refind-0.12.0.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing toolchain-funcs
+
+DESCRIPTION="The UEFI Boot Manager by Rod Smith"
+HOMEPAGE="https://www.rodsbooks.com/refind/";
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} custom-cflags doc gnuefi"
+
+DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+   !gnuefi? ( >=sys-boot/udk-2018-r1 )"
+
+DOCS=(README.txt)
+PATCHES=("${FILESDIR}/makefile.patch")
+UDK_WORKSPACE="${T}/udk"
+
+pkg_pretend() {
+   if use custom-cflags; then
+   ewarn
+   ewarn "You have enabled building with USE=custom-cflags. Be 
aware that"
+   ewarn "using this can result in EFI binaries that fail to run 
and may"
+   ewarn "fail to build at all. This is strongly advised against 
by upstream."
+   ewarn
+   ewarn "See https://bugs.gentoo.org/598587#c3 for more 
information"
+   ewarn
+   fi
+}
+
+pkg_setup() {
+   if use x86; then
+   export EFIARCH=ia32
+   export BUILDARCH=ia32
+   elif use amd64; then
+   export EFIARCH=x64
+   export BUILDARCH=x86_64
+   fi
+}
+
+src_prepare() {
+   default
+
+   # bug 598647 - PIE not supported
+   sed -e '/^CFLAGS/s:$: -fno-PIE:' -i Make.common || die
+
+   # Prepare UDK workspace
+   if ! use gnuefi; then
+   mkdir "${UDK_WORKSPACE}" || die
+   ln -s "${EPREFIX}/usr/lib/udk/"{Mde,IntelFramework}{,Module}Pkg 
\
+   "${UDK_WORKSPACE}" || die "Could not link UDK files"
+   fi
+}
+
+src_configure() {
+   if ! use gnuefi; then
+   # Use the side effect of the script which will create 
configuration files
+   (. udk-workspace "${UDK_WORKSPACE}" || die)
+   sed -e "s:^#\?\s*\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$:\1 
$(makeopts_jobs):" \
+   -i "${UDK_WORKSPACE}/Conf/target.txt" || die "Failed to 
configure target file"
+   sed -e 
"s:\(_\(CC\|ASM\|PP\|VFRPP\|ASLCC\|ASLPP\|DLINK\)_PATH\s*=\).*$:\1 
$(tc-getCC):" \
+   -e "s:\(_ASLDLINK_PATH\s*=\).*$:\1 $(tc-getLD):" \
+   -e "s:\(_OBJCOPY_PATH\s*=\).*$:\1 $(tc-getOBJCOPY):" \
+   -e "s:\(_RC_PATH\s*=\).*$:\1 $(tc-getOBJCOPY):" \
+ 

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2019-11-12 Thread Agostino Sarubbo
commit: 07dfa7c518fff97a55c6444dff5e764573d86361
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 12 10:44:27 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 12 10:44:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07dfa7c5

sys-boot/refind: amd64 stable wrt bug #687258

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-boot/refind/refind-0.11.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/refind/refind-0.11.4.ebuild 
b/sys-boot/refind/refind-0.11.4.ebuild
index 10a9279c42e..139bf622501 100644
--- a/sys-boot/refind/refind-0.11.4.ebuild
+++ b/sys-boot/refind/refind-0.11.4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
 
 LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} custom-cflags doc gnuefi"
 



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2019-11-12 Thread Agostino Sarubbo
commit: e382b7410a8ced55a4679178668c50922a1780a9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 12 10:03:33 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 12 10:03:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e382b741

sys-boot/refind: x86 stable wrt bug #687258

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-boot/refind/refind-0.11.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/refind/refind-0.11.4.ebuild 
b/sys-boot/refind/refind-0.11.4.ebuild
index a45929a31c9..10a9279c42e 100644
--- a/sys-boot/refind/refind-0.11.4.ebuild
+++ b/sys-boot/refind/refind-0.11.4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
 
 LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} custom-cflags doc gnuefi"
 



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/, profiles/base/, sys-boot/refind/files/

2019-07-05 Thread Michał Górny
commit: 6c0eea48a98798c7185ca4de951ca8c8bcf92c5e
Author: Stéphane Veyret  gmail  com>
AuthorDate: Sun Jun  2 18:26:27 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jul  5 20:31:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c0eea48

sys-boot/refind: Bump to version 0.11.4

Signed-off-by: Stéphane VEYRET  gmail.com>
Closes: https://bugs.gentoo.org/684914
Package-Manager: Portage-2.3.66, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/12172
Signed-off-by: Michał Górny  gentoo.org>

 profiles/base/package.use.force  |   3 +-
 sys-boot/refind/Manifest |   1 +
 sys-boot/refind/files/makefile.patch |  27 ++
 sys-boot/refind/refind-0.11.4.ebuild | 168 +++
 4 files changed, 198 insertions(+), 1 deletion(-)

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 8b269fd7c32..dce695a7b77 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -37,7 +37,8 @@ media-tv/kodi system-ffmpeg
 
 # Sam Jorna  (2016-12-15)
 # Known to build unbootable EFI binaries on some systems when built with
-# UDK. Forcing use of gnu-efi until it's more stable.
+# UDK. Forcing use of gnu-efi until it's more stable
+# (probably after stabilization of refind-0.11.4).
 sys-boot/refind gnuefi
 
 # Mike Gilbert  (2016-10-13)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index c1bfe87d3f8..a294c06247e 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,3 +1,4 @@
 DIST refind-src-0.10.4.tar.gz 3970380 BLAKE2B 
0d14c005d3e93a1f0008b6c65e34eb6391c4a4a488b4fa7842c8f0b68eb2cc5be150c8718f01a65454db7b86ffa5873a3d1a96429eaed0cb92c1d29c8d2f7dcd
 SHA512 
a75a6210ee51427c474e69c2de8c719545b2599c19f1c7541048b77ab1996a0e4b4b5fd4840f6240cd6704e5f5338cbaff432d7dc5ec4042854e26d6df18bed5
 DIST refind-src-0.11.2.tar.gz 4533034 BLAKE2B 
fa05781fc1d87d314677f8e670bd7282b591fd3b6f4a5863e81cb962fdb773c774faabb6c45544b0659c8d5c4ef7ce1dba8d798a4caa97364ad7aa2532a42050
 SHA512 
796d86f05152d93340773c2dfbae0ca50ab036373ebed60fcc80404ee269ef4bc100df4b141d555d3363b820c3e9234fc0cf637791061281c86329958dca3479
 DIST refind-src-0.11.3.tar.gz 3792206 BLAKE2B 
369b25dbc97d83f9143ccbe19e89b5975f0796f1e4a2decfc124e4b45c5ef1db8f3e2bb83413f596ca28e82e67b0b9c5682b557a5422e3146780cec151d2a36e
 SHA512 
96907b79e1c9c8199c62058bb6851fa5d6f158802f3777ba19a62c6c0d7d5b49132754bcafa925510fd21c8bafe8ce393117070a628baf4c277fa5f8f536b797
+DIST refind-src-0.11.4.tar.gz 3812192 BLAKE2B 
7219eeb63961a7ba8f7617546a12021cfe80df80a83c4dbd47cd40b0d8afbdc510abb44de3029ff15ed49372bd59e0b156f4c27eab3ef7bd6ccc3c7e02db
 SHA512 
529962ae432edaf1895ba98deb00a23c66bd742578e1a367f70f7ed22dd7be7daf1960df8af410fba79ca775169120499a4c10119331b2b12b55a002d4354de1

diff --git a/sys-boot/refind/files/makefile.patch 
b/sys-boot/refind/files/makefile.patch
new file mode 100644
index 000..5db6f75b191
--- /dev/null
+++ b/sys-boot/refind/files/makefile.patch
@@ -0,0 +1,27 @@
+diff --git a/Makefile b/Makefile
+--- a/Makefile
 b/Makefile
+@@ -161,8 +161,9 @@ fs_edk2: build_edk2
+   done
+ 
+ build_edk2: $(EDK2BASE)/RefindPkg
+-  cd $(EDK2BASE) && \
+-  . ./edksetup.sh BaseTools && \
++  +cd $(EDK2BASE) && \
++  . udk-workspace && \
++  build -a $(UC_ARCH) -p MdePkg/MdePkg.dsc && \
+   build -a $(UC_ARCH) -p RefindPkg/RefindPkg.dsc
+   mkdir -p ./drivers_$(FILENAME_CODE)
+ 
+diff --git a/filesystems/Makefile b/filesystems/Makefile
+index 99452ed..9bc984d 100644
+--- a/filesystems/Makefile
 b/filesystems/Makefile
+@@ -5,6 +5,7 @@
+ # name of the driver to be built. This is done because of a dependency
+ # in the fsw_efi.c file on the filesystem type; this file must be
+ # recompiled for each new filesystem built.
++.NOTPARALLEL:
+ 
+ # This program is licensed under the terms of the GNU GPL, version 3,
+ # or (at your option) any later version.

diff --git a/sys-boot/refind/refind-0.11.4.ebuild 
b/sys-boot/refind/refind-0.11.4.ebuild
new file mode 100644
index 000..a45929a31c9
--- /dev/null
+++ b/sys-boot/refind/refind-0.11.4.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing toolchain-funcs
+
+DESCRIPTION="The UEFI Boot Manager by Rod Smith"
+HOMEPAGE="https://www.rodsbooks.com/refind/";
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} custom-cflags doc gnuefi"
+
+DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+   !gnuefi? ( >=sys-boot/udk-2018-r1 )"
+
+DOCS=(README.txt)
+PATCHES=("${FILESDIR}/makefile.patch")
+UDK_WORKSPACE="${T}/udk"
+
+pkg_pretend() {
+   if use custom-cflags; then
+   ewarn
+   ewarn "You have enabled buildin

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2018-09-01 Thread Sam Jorna
commit: b6d2187e9c3ba35adeb83431485df503178244c6
Author: Sam Jorna  gentoo  org>
AuthorDate: Sun Sep  2 00:44:21 2018 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Sun Sep  2 00:44:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6d2187e

sys-boot/refind: fix SIMLINK_LIB=no

Bug: https://bugs.gentoo.org/627744
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 sys-boot/refind/refind-0.11.3.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-boot/refind/refind-0.11.3.ebuild 
b/sys-boot/refind/refind-0.11.3.ebuild
index 511e74dce7a..61fa6812831 100644
--- a/sys-boot/refind/refind-0.11.3.ebuild
+++ b/sys-boot/refind/refind-0.11.3.ebuild
@@ -101,6 +101,9 @@ src_compile() {
AS="$(tc-getAS)"
LD="$(tc-getLD)"
AR="$(tc-getAR)"
+   GNUEFILIB="/usr/$(get_libdir)"
+   EFILIB="/usr/$(get_libdir)"
+   EFICRT0="/usr/$(get_libdir)"
RANLIB="$(tc-getRANLIB)"
OBJCOPY="$(tc-getOBJCOPY)"
GNUEFI_LDFLAGS="-T \$(GNUEFI_LDSCRIPT) -shared -nostdlib 
-Bsymbolic \
@@ -177,7 +180,7 @@ pkg_postinst() {
elog ""
if [[ -z "${REPLACING_VERSIONS}" ]]; then
elog "refind-install requires additional packages to be fully 
functional:"
-   elog " app-crypt/sbsigntool for binary signing for use with 
SecureBoot"
+   elog " app-crypt/sbsigntools for binary signing for use with 
SecureBoot"
elog " sys-boot/efibootmgr for writing to NVRAM"
elog " sys-block/parted for automatic ESP location and mount"
elog ""



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2018-08-30 Thread Sam Jorna
commit: 231fac686e1f7a78435194132c15c22738834f0e
Author: Sam Jorna  gentoo  org>
AuthorDate: Thu Aug 30 09:11:14 2018 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Thu Aug 30 09:12:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=231fac68

sys-boot/refind: remove old

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 sys-boot/refind/Manifest |   1 -
 sys-boot/refind/refind-0.10.8.ebuild | 197 ---
 2 files changed, 198 deletions(-)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index a2943776067..c1bfe87d3f8 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,4 +1,3 @@
 DIST refind-src-0.10.4.tar.gz 3970380 BLAKE2B 
0d14c005d3e93a1f0008b6c65e34eb6391c4a4a488b4fa7842c8f0b68eb2cc5be150c8718f01a65454db7b86ffa5873a3d1a96429eaed0cb92c1d29c8d2f7dcd
 SHA512 
a75a6210ee51427c474e69c2de8c719545b2599c19f1c7541048b77ab1996a0e4b4b5fd4840f6240cd6704e5f5338cbaff432d7dc5ec4042854e26d6df18bed5
-DIST refind-src-0.10.8.tar.gz 4059265 BLAKE2B 
597d8df1cb74f6f686c5b702c02eb2712adb2076934f1ffc746ca9aaf3d349d6384c8aa09d17fe440b656cc054ee928131f8ecbc059fe0b654e9c32799e54e86
 SHA512 
a4576920dd68a9436ee6d008787104842e192c6a5eb52cc580258bc8e13daadf170c21270e8cfd86f27733e3e86b050af9102d35c939677b1f1c3627aeeafb32
 DIST refind-src-0.11.2.tar.gz 4533034 BLAKE2B 
fa05781fc1d87d314677f8e670bd7282b591fd3b6f4a5863e81cb962fdb773c774faabb6c45544b0659c8d5c4ef7ce1dba8d798a4caa97364ad7aa2532a42050
 SHA512 
796d86f05152d93340773c2dfbae0ca50ab036373ebed60fcc80404ee269ef4bc100df4b141d555d3363b820c3e9234fc0cf637791061281c86329958dca3479
 DIST refind-src-0.11.3.tar.gz 3792206 BLAKE2B 
369b25dbc97d83f9143ccbe19e89b5975f0796f1e4a2decfc124e4b45c5ef1db8f3e2bb83413f596ca28e82e67b0b9c5682b557a5422e3146780cec151d2a36e
 SHA512 
96907b79e1c9c8199c62058bb6851fa5d6f158802f3777ba19a62c6c0d7d5b49132754bcafa925510fd21c8bafe8ce393117070a628baf4c277fa5f8f536b797

diff --git a/sys-boot/refind/refind-0.10.8.ebuild 
b/sys-boot/refind/refind-0.10.8.ebuild
deleted file mode 100644
index 9978fe0dbf0..000
--- a/sys-boot/refind/refind-0.10.8.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic versionator
-
-DESCRIPTION="The UEFI Boot Manager by Rod Smith"
-HOMEPAGE="https://www.rodsbooks.com/refind/";
-
-SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
-IUSE="${FS_USE} -gnuefi doc -custom-cflags"
-
-DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-   !gnuefi? ( >=sys-boot/udk-2015 )"
-
-DOCS="NEWS.txt README.txt docs/refind docs/Styles"
-
-pkg_pretend() {
-   if use custom-cflags; then
-   ewarn
-   ewarn "You have enabled building with USE=custom-cflags. Be 
aware that"
-   ewarn "using this can result in EFI binaries that fail to run 
and may"
-   ewarn "fail to build at all. This is strongly advised against 
by upstream."
-   ewarn
-   ewarn "See https://bugs.gentoo.org/598587#c3 for more 
information"
-   ewarn
-   fi
-}
-
-pkg_setup() {
-   if use x86 ; then
-   export EFIARCH=ia32
-   export BUILDARCH=ia32
-   elif use amd64; then
-   export EFIARCH=x64
-   export BUILDARCH=x86_64
-   else
-   # Try to support anyway
-   export BUILDARCH=$( uname -m | sed s,i[3456789]86,ia32, )
-   if [[ ${BUILDARCH} == "x86_64" ]] ; then
-   export EFIARCH=x64
-   else
-   export EFIARCH=${ARCH}
-   fi
-   fi
-}
-
-src_prepare() {
-   default
-
-   # bug 598647 - PIE not supported
-   sed -e 's:CFLAGS  =:& -fno-PIE:' -i "${S}/Make.common" || die
-
-   local f
-   for f in "${S}"/*/Make.tiano "${S}"/Make.common; do
-   sed -i -e 's/^\(include .*target.txt.*\)$/#\1/' \
-   -e 
's@^\(TIANO_INCLUDE_DIRS\s*=\s*-I\s*\).*$@\1/usr/include/udk \\@' \
-   -e '/^\s*-I \$(EDK2BASE).*$/d' \
-   "${f}" || die "Failed to patch Tianocore make file in" \
-   $(basename $(dirname ${f}))
-   done
-   for f in "${S}"/*/Make.tiano; do
-   sed -i -e 's@^\(EFILIB\s*=\s*\).*$@\1/usr/lib@' \
-   -e 's@\$(EFILIB).*/\([^/]*\).lib@-l\1@' \
-   -e 's/\(--start-group\s*\$(ALL_EFILIBS)\)/-L \$(EFILIB) 
\1/' \
-   "${f}" || die "Failed to patch Tianocore make file in" \
-   $(basename $(dirname ${f}))
-   done
-   sed -i -e '/Guids/i#include "AutoGen.h"\n' "${S}/filesystems/AutoGen.c" 
\
-   || die

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2018-08-30 Thread Sam Jorna
commit: e5799b6c5b6762f7559b79e546038b86d62e2441
Author: Sam Jorna  gentoo  org>
AuthorDate: Thu Aug 30 09:10:25 2018 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Thu Aug 30 09:12:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5799b6c

sys-boot/refind: bump to 0.11.3

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 sys-boot/refind/Manifest |   1 +
 sys-boot/refind/refind-0.11.3.ebuild | 197 +++
 2 files changed, 198 insertions(+)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 41f5916b6de..a2943776067 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,3 +1,4 @@
 DIST refind-src-0.10.4.tar.gz 3970380 BLAKE2B 
0d14c005d3e93a1f0008b6c65e34eb6391c4a4a488b4fa7842c8f0b68eb2cc5be150c8718f01a65454db7b86ffa5873a3d1a96429eaed0cb92c1d29c8d2f7dcd
 SHA512 
a75a6210ee51427c474e69c2de8c719545b2599c19f1c7541048b77ab1996a0e4b4b5fd4840f6240cd6704e5f5338cbaff432d7dc5ec4042854e26d6df18bed5
 DIST refind-src-0.10.8.tar.gz 4059265 BLAKE2B 
597d8df1cb74f6f686c5b702c02eb2712adb2076934f1ffc746ca9aaf3d349d6384c8aa09d17fe440b656cc054ee928131f8ecbc059fe0b654e9c32799e54e86
 SHA512 
a4576920dd68a9436ee6d008787104842e192c6a5eb52cc580258bc8e13daadf170c21270e8cfd86f27733e3e86b050af9102d35c939677b1f1c3627aeeafb32
 DIST refind-src-0.11.2.tar.gz 4533034 BLAKE2B 
fa05781fc1d87d314677f8e670bd7282b591fd3b6f4a5863e81cb962fdb773c774faabb6c45544b0659c8d5c4ef7ce1dba8d798a4caa97364ad7aa2532a42050
 SHA512 
796d86f05152d93340773c2dfbae0ca50ab036373ebed60fcc80404ee269ef4bc100df4b141d555d3363b820c3e9234fc0cf637791061281c86329958dca3479
+DIST refind-src-0.11.3.tar.gz 3792206 BLAKE2B 
369b25dbc97d83f9143ccbe19e89b5975f0796f1e4a2decfc124e4b45c5ef1db8f3e2bb83413f596ca28e82e67b0b9c5682b557a5422e3146780cec151d2a36e
 SHA512 
96907b79e1c9c8199c62058bb6851fa5d6f158802f3777ba19a62c6c0d7d5b49132754bcafa925510fd21c8bafe8ce393117070a628baf4c277fa5f8f536b797

diff --git a/sys-boot/refind/refind-0.11.3.ebuild 
b/sys-boot/refind/refind-0.11.3.ebuild
new file mode 100644
index 000..511e74dce7a
--- /dev/null
+++ b/sys-boot/refind/refind-0.11.3.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic eapi7-ver
+
+DESCRIPTION="The UEFI Boot Manager by Rod Smith"
+HOMEPAGE="https://www.rodsbooks.com/refind/";
+
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} -gnuefi doc -custom-cflags"
+
+DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+   !gnuefi? ( >=sys-boot/udk-2015 )"
+
+DOCS="NEWS.txt README.txt docs/refind docs/Styles"
+
+pkg_pretend() {
+   if use custom-cflags; then
+   ewarn
+   ewarn "You have enabled building with USE=custom-cflags. Be 
aware that"
+   ewarn "using this can result in EFI binaries that fail to run 
and may"
+   ewarn "fail to build at all. This is strongly advised against 
by upstream."
+   ewarn
+   ewarn "See https://bugs.gentoo.org/598587#c3 for more 
information"
+   ewarn
+   fi
+}
+
+pkg_setup() {
+   if use x86 ; then
+   export EFIARCH=ia32
+   export BUILDARCH=ia32
+   elif use amd64; then
+   export EFIARCH=x64
+   export BUILDARCH=x86_64
+   else
+   # Try to support anyway
+   export BUILDARCH=$( uname -m | sed s,i[3456789]86,ia32, )
+   if [[ ${BUILDARCH} == "x86_64" ]] ; then
+   export EFIARCH=x64
+   else
+   export EFIARCH=${ARCH}
+   fi
+   fi
+}
+
+src_prepare() {
+   default
+
+   # bug 598647 - PIE not supported
+   sed -e 's:CFLAGS  =:& -fno-PIE:' -i "${S}/Make.common" || die
+
+   local f
+   for f in "${S}"/*/Make.tiano "${S}"/Make.common; do
+   sed -i -e 's/^\(include .*target.txt.*\)$/#\1/' \
+   -e 
's@^\(TIANO_INCLUDE_DIRS\s*=\s*-I\s*\).*$@\1/usr/include/udk \\@' \
+   -e '/^\s*-I \$(EDK2BASE).*$/d' \
+   "${f}" || die "Failed to patch Tianocore make file in" \
+   $(basename $(dirname ${f}))
+   done
+   for f in "${S}"/*/Make.tiano; do
+   sed -i -e 's@^\(EFILIB\s*=\s*\).*$@\1/usr/lib@' \
+   -e 's@\$(EFILIB).*/\([^/]*\).lib@-l\1@' \
+   -e 's/\(--start-group\s*\$(ALL_EFILIBS)\)/-L \$(EFILIB) 
\1/' \
+   "${f}" || die "Failed to patch Tianocore make file in" \
+   $(basename $(dirname ${f}))
+   done
+   sed -i -e '/Guids/i#include "AutoGen.h"\n' "${S}/filesystems/AutoGen.c" 
\
+   || die 

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/, app-crypt/efitools/, profiles/updates/, ...

2018-07-11 Thread Michał Górny
commit: c638678c995810739309b8582e90a3957bc98615
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Sat Jul  7 22:47:08 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jul 11 22:18:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c638678c

app-crypt/sbsigntool: renamed to app-crypt/sbsigntools

Also changed all required dependencies.

Package-Manager: Portage-2.3.41, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/9112

 app-crypt/efitools/efitools-1.7.0.ebuild  | 2 +-
 app-crypt/efitools/efitools-1.8.1.ebuild  | 2 +-
 app-crypt/{sbsigntool => sbsigntools}/Manifest| 2 +-
 .../files/0002-image.c-clear-image-variable.patch | 0
 .../files/0003-Fix-for-multi-sign.patch   | 0
 .../files/sbsigntools-0.9.1-openssl-1.1.0-compat.patch}   | 0
 app-crypt/{sbsigntool => sbsigntools}/metadata.xml| 0
 .../sbsigntools-0.6-r2.ebuild}| 6 +-
 .../sbsigntools-0.9.1-r1.ebuild}  | 8 
 profiles/updates/3Q-2018  | 1 +
 sys-boot/refind/refind-0.10.4-r2.ebuild   | 2 +-
 sys-boot/refind/refind-0.10.8.ebuild  | 2 +-
 sys-boot/refind/refind-0.11.2.ebuild  | 2 +-
 13 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app-crypt/efitools/efitools-1.7.0.ebuild 
b/app-crypt/efitools/efitools-1.7.0.ebuild
index 63c9fbec051..c47c9b03a9e 100644
--- a/app-crypt/efitools/efitools-1.7.0.ebuild
+++ b/app-crypt/efitools/efitools-1.7.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
sys-apps/help2man
>=sys-boot/gnu-efi-3.0u
-   app-crypt/sbsigntool
+   app-crypt/sbsigntools
virtual/pkgconfig
dev-perl/File-Slurp"
 

diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild 
b/app-crypt/efitools/efitools-1.8.1.ebuild
index 6ede95860eb..94d636eec26 100644
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
sys-apps/util-linux"
 
 DEPEND="${RDEPEND}
-   app-crypt/sbsigntool
+   app-crypt/sbsigntools
dev-perl/File-Slurp
static? ( ${LIB_DEPEND} )
sys-apps/help2man

diff --git a/app-crypt/sbsigntool/Manifest b/app-crypt/sbsigntools/Manifest
similarity index 66%
rename from app-crypt/sbsigntool/Manifest
rename to app-crypt/sbsigntools/Manifest
index 8df64ea7cc7..a054ddc31c9 100644
--- a/app-crypt/sbsigntool/Manifest
+++ b/app-crypt/sbsigntools/Manifest
@@ -1,3 +1,3 @@
 DIST sbsigntool-0.8-ccan.tar.gz 113537 BLAKE2B 
8fbf27463d30c1895930628a145be2d521ae4f6adb7af3299bf2f5f4319fd643df0a07347ef6851bd41d233af4c3fc5f77002771af1c43aa0f20665aef2390b8
 SHA512 
6857096879f116f1802eb6b44789cbea7bb24440bc0f16503aeadf5f276fa45943f322f844dbb9abee717655205d82b830143be3a7f4424fd4146b9360674a09
-DIST sbsigntool-0.9.1.tar.gz 56497 BLAKE2B 
22791bd4b490f36963a19e82da3ce7b93a56d948bf44d1ffdb62fa3291a3f815b2c19d68f9180b607c2b1438f656367ec1f9002f0b1225734d16a9aadc6d20ec
 SHA512 
ae16232327c098bbc60a9701185d856d851cb7fa8f62be64d3c8f75c8b274b8521fcc4212226189def05db980690878ee6ac9a9b418166c92442aaf35e790d29
 DIST sbsigntool_0.6.orig.tar.gz 212375 BLAKE2B 
fab9141c7fbfa01ec24f975503ac83be4ae0664251a1311afb3d95124fec3750ce20a5ffab35b6965d4ee4585ab4ee91f25ae49488214a983b6fc006071d0968
 SHA512 
ed314d1cb7278cf5f27d4c3cd17f2195678419a7f9e47770429b6f95df35f7df035331e60c45970183ddd9b150a9b752f876c777929598b0525872b3255af95c
+DIST sbsigntools-0.9.1.tar.gz 56497 BLAKE2B 
22791bd4b490f36963a19e82da3ce7b93a56d948bf44d1ffdb62fa3291a3f815b2c19d68f9180b607c2b1438f656367ec1f9002f0b1225734d16a9aadc6d20ec
 SHA512 
ae16232327c098bbc60a9701185d856d851cb7fa8f62be64d3c8f75c8b274b8521fcc4212226189def05db980690878ee6ac9a9b418166c92442aaf35e790d29

diff --git a/app-crypt/sbsigntool/files/0002-image.c-clear-image-variable.patch 
b/app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch
similarity index 100%
rename from app-crypt/sbsigntool/files/0002-image.c-clear-image-variable.patch
rename to app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch

diff --git a/app-crypt/sbsigntool/files/0003-Fix-for-multi-sign.patch 
b/app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch
similarity index 100%
rename from app-crypt/sbsigntool/files/0003-Fix-for-multi-sign.patch
rename to app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch

diff --git 
a/app-crypt/sbsigntool/files/sbsigntool-0.9.1-openssl-1.1.0-compat.patch 
b/app-crypt/sbsigntools/files/sbsigntools-0.9.1-openssl-1.1.0-compat.patch
similarity index 100%
rename from 
app-crypt/sbsigntool/files/sbsigntool-0.9.1-openssl-1.1.0-compat.patch
rename to 
app-crypt/sbsigntools/files/sbsigntools-0.9.1-openssl-1.1.0-compat.patch

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2018-04-27 Thread Sam Jorna
commit: 2086a46b5f2e37f49d6ba68a7a82a73a2abcb3b9
Author: Sam Jorna  gentoo  org>
AuthorDate: Fri Apr 27 09:20:09 2018 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Fri Apr 27 09:20:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2086a46b

sys-boot/refind: fix SYMLINK_LIB=no bug 627744

Bug: https://bugs.gentoo.org/627744
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 sys-boot/refind/refind-0.11.2.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-boot/refind/refind-0.11.2.ebuild 
b/sys-boot/refind/refind-0.11.2.ebuild
index 260ef1d80ae..6f050a747dc 100644
--- a/sys-boot/refind/refind-0.11.2.ebuild
+++ b/sys-boot/refind/refind-0.11.2.ebuild
@@ -101,6 +101,9 @@ src_compile() {
AS="$(tc-getAS)"
LD="$(tc-getLD)"
AR="$(tc-getAR)"
+   GNUEFILIB="/usr/$(get_libdir)"
+   EFILIB="/usr/$(get_libdir)"
+   EFICRT0="/usr/$(get_libdir)"
RANLIB="$(tc-getRANLIB)"
OBJCOPY="$(tc-getOBJCOPY)"
GNUEFI_LDFLAGS="-T \$(GNUEFI_LDSCRIPT) -shared -nostdlib 
-Bsymbolic \



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2018-04-23 Thread Sam Jorna
commit: 26800f62b105450602ea98e2018de1d06555e30a
Author: Sam Jorna  gentoo  org>
AuthorDate: Mon Apr 23 12:58:49 2018 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Mon Apr 23 12:59:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26800f62

sys-boot/refind: bump to 0.11.2

Bug: https://bugs.gentoo.org/628294
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 sys-boot/refind/Manifest |   1 +
 sys-boot/refind/refind-0.11.2.ebuild | 197 +++
 2 files changed, 198 insertions(+)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index bcd0703bdf0..41f5916b6de 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,2 +1,3 @@
 DIST refind-src-0.10.4.tar.gz 3970380 BLAKE2B 
0d14c005d3e93a1f0008b6c65e34eb6391c4a4a488b4fa7842c8f0b68eb2cc5be150c8718f01a65454db7b86ffa5873a3d1a96429eaed0cb92c1d29c8d2f7dcd
 SHA512 
a75a6210ee51427c474e69c2de8c719545b2599c19f1c7541048b77ab1996a0e4b4b5fd4840f6240cd6704e5f5338cbaff432d7dc5ec4042854e26d6df18bed5
 DIST refind-src-0.10.8.tar.gz 4059265 BLAKE2B 
597d8df1cb74f6f686c5b702c02eb2712adb2076934f1ffc746ca9aaf3d349d6384c8aa09d17fe440b656cc054ee928131f8ecbc059fe0b654e9c32799e54e86
 SHA512 
a4576920dd68a9436ee6d008787104842e192c6a5eb52cc580258bc8e13daadf170c21270e8cfd86f27733e3e86b050af9102d35c939677b1f1c3627aeeafb32
+DIST refind-src-0.11.2.tar.gz 4533034 BLAKE2B 
fa05781fc1d87d314677f8e670bd7282b591fd3b6f4a5863e81cb962fdb773c774faabb6c45544b0659c8d5c4ef7ce1dba8d798a4caa97364ad7aa2532a42050
 SHA512 
796d86f05152d93340773c2dfbae0ca50ab036373ebed60fcc80404ee269ef4bc100df4b141d555d3363b820c3e9234fc0cf637791061281c86329958dca3479

diff --git a/sys-boot/refind/refind-0.11.2.ebuild 
b/sys-boot/refind/refind-0.11.2.ebuild
new file mode 100644
index 000..260ef1d80ae
--- /dev/null
+++ b/sys-boot/refind/refind-0.11.2.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic versionator
+
+DESCRIPTION="The UEFI Boot Manager by Rod Smith"
+HOMEPAGE="https://www.rodsbooks.com/refind/";
+
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} -gnuefi doc -custom-cflags"
+
+DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+   !gnuefi? ( >=sys-boot/udk-2015 )"
+
+DOCS="NEWS.txt README.txt docs/refind docs/Styles"
+
+pkg_pretend() {
+   if use custom-cflags; then
+   ewarn
+   ewarn "You have enabled building with USE=custom-cflags. Be 
aware that"
+   ewarn "using this can result in EFI binaries that fail to run 
and may"
+   ewarn "fail to build at all. This is strongly advised against 
by upstream."
+   ewarn
+   ewarn "See https://bugs.gentoo.org/598587#c3 for more 
information"
+   ewarn
+   fi
+}
+
+pkg_setup() {
+   if use x86 ; then
+   export EFIARCH=ia32
+   export BUILDARCH=ia32
+   elif use amd64; then
+   export EFIARCH=x64
+   export BUILDARCH=x86_64
+   else
+   # Try to support anyway
+   export BUILDARCH=$( uname -m | sed s,i[3456789]86,ia32, )
+   if [[ ${BUILDARCH} == "x86_64" ]] ; then
+   export EFIARCH=x64
+   else
+   export EFIARCH=${ARCH}
+   fi
+   fi
+}
+
+src_prepare() {
+   default
+
+   # bug 598647 - PIE not supported
+   sed -e 's:CFLAGS  =:& -fno-PIE:' -i "${S}/Make.common" || die
+
+   local f
+   for f in "${S}"/*/Make.tiano "${S}"/Make.common; do
+   sed -i -e 's/^\(include .*target.txt.*\)$/#\1/' \
+   -e 
's@^\(TIANO_INCLUDE_DIRS\s*=\s*-I\s*\).*$@\1/usr/include/udk \\@' \
+   -e '/^\s*-I \$(EDK2BASE).*$/d' \
+   "${f}" || die "Failed to patch Tianocore make file in" \
+   $(basename $(dirname ${f}))
+   done
+   for f in "${S}"/*/Make.tiano; do
+   sed -i -e 's@^\(EFILIB\s*=\s*\).*$@\1/usr/lib@' \
+   -e 's@\$(EFILIB).*/\([^/]*\).lib@-l\1@' \
+   -e 's/\(--start-group\s*\$(ALL_EFILIBS)\)/-L \$(EFILIB) 
\1/' \
+   "${f}" || die "Failed to patch Tianocore make file in" \
+   $(basename $(dirname ${f}))
+   done
+   sed -i -e '/Guids/i#include "AutoGen.h"\n' "${S}/filesystems/AutoGen.c" 
\
+   || die "Failed to patch AutoGen.c"
+   for f in "${S}"/*/AutoGen.c; do
+   cat >>"${f}" <<-EOF || die "Failed to patch AutoGen.c"
+
+   #define _PCD_TOKEN_PcdFixedDebugPrintErrorLevel  11U
+   #define _PCD_SIZE_PcdFixedDebugPrint

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2018-03-25 Thread Mikle Kolyada
commit: 00e82919e62dbdefcf67653cfd0b880ac2b06851
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Mar 25 17:57:03 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Mar 25 17:57:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00e82919

sys-boot/refind: fix DESCRIPTION

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-boot/refind/refind-0.10.4-r2.ebuild | 2 +-
 sys-boot/refind/refind-0.10.8.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-boot/refind/refind-0.10.4-r2.ebuild 
b/sys-boot/refind/refind-0.10.4-r2.ebuild
index 60314749f2b..96ca6a4c75a 100644
--- a/sys-boot/refind/refind-0.10.4-r2.ebuild
+++ b/sys-boot/refind/refind-0.10.4-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit toolchain-funcs flag-o-matic versionator
 
-DESCRIPTION="The rEFInd UEFI Boot Manager by Rod Smith"
+DESCRIPTION="The UEFI Boot Manager by Rod Smith"
 HOMEPAGE="https://www.rodsbooks.com/refind/";
 
 SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"

diff --git a/sys-boot/refind/refind-0.10.8.ebuild 
b/sys-boot/refind/refind-0.10.8.ebuild
index 6c49cc43f2f..598fa7cd8dc 100644
--- a/sys-boot/refind/refind-0.10.8.ebuild
+++ b/sys-boot/refind/refind-0.10.8.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit toolchain-funcs flag-o-matic versionator
 
-DESCRIPTION="The rEFInd UEFI Boot Manager by Rod Smith"
+DESCRIPTION="The UEFI Boot Manager by Rod Smith"
 HOMEPAGE="https://www.rodsbooks.com/refind/";
 
 SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2018-01-03 Thread Patrice Clement
commit: afff02d2efec49545ad4a7a6e57b760115f845e9
Author: charIes17  arcor  de>
AuthorDate: Wed Jan  3 06:54:29 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Jan  3 13:43:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afff02d2

sys-boot/refind: HOMEPAGE to use https.

Package-Manager: Portage-2.3.13, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/6725

 sys-boot/refind/refind-0.10.4-r2.ebuild | 4 ++--
 sys-boot/refind/refind-0.10.8.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-boot/refind/refind-0.10.4-r2.ebuild 
b/sys-boot/refind/refind-0.10.4-r2.ebuild
index 4ce8cce2382..60314749f2b 100644
--- a/sys-boot/refind/refind-0.10.4-r2.ebuild
+++ b/sys-boot/refind/refind-0.10.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs flag-o-matic versionator
 
 DESCRIPTION="The rEFInd UEFI Boot Manager by Rod Smith"
-HOMEPAGE="http://www.rodsbooks.com/refind/";
+HOMEPAGE="https://www.rodsbooks.com/refind/";
 
 SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
 

diff --git a/sys-boot/refind/refind-0.10.8.ebuild 
b/sys-boot/refind/refind-0.10.8.ebuild
index 044b7ed7c12..6c49cc43f2f 100644
--- a/sys-boot/refind/refind-0.10.8.ebuild
+++ b/sys-boot/refind/refind-0.10.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs flag-o-matic versionator
 
 DESCRIPTION="The rEFInd UEFI Boot Manager by Rod Smith"
-HOMEPAGE="http://www.rodsbooks.com/refind/";
+HOMEPAGE="https://www.rodsbooks.com/refind/";
 
 SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
 



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2017-07-11 Thread Michael Palimaka
commit: 91391637ca1daf68f8ec910f023716f9168e59db
Author: Matthias Dahl  binary-island  eu>
AuthorDate: Tue Jul  4 08:16:54 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Jul 11 13:10:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91391637

sys-boot/refind: Bump to 1.0.8

rEFInd 1.0.8 fixes, amongst other things, compilation with gnu-efi >= 3.0.5
and thus no longer requires a custom patch.

 sys-boot/refind/Manifest  | 3 +--
 sys-boot/refind/{refind-0.10.7-r1.ebuild => refind-0.10.8.ebuild} | 6 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index c6f9278a867..1337265d5e6 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,3 +1,2 @@
-DIST refind-0.10.7-fix_build_gnuefi-3.0.5.patch.xz 9920 SHA256 
262af553bc782394d08fa208452e81ef0b8cbefd6ec3857bee0a7d7f862bd86f SHA512 
48ef45c7650347b82ee14a01459fd8f59d99623ae12f40f198d0d36d2471b3e93de85a4c3d39825e58e70c08b03fe00506fb71173deaef1889f5a806b103564d
 WHIRLPOOL 
e250f230221fd3920547c2684cffe258931d8a79c47bf458cc422551b1d5ee0a3930a8ba9353ae120cd87500ec478d13cf085933f41f78b4d2e5ed7d71dd3e4e
 DIST refind-src-0.10.4.tar.gz 3970380 SHA256 
c3e428b27a0d4c61ee052603aedea7118bf04a7917216b10bfde2a3d2a2442a5 SHA512 
a75a6210ee51427c474e69c2de8c719545b2599c19f1c7541048b77ab1996a0e4b4b5fd4840f6240cd6704e5f5338cbaff432d7dc5ec4042854e26d6df18bed5
 WHIRLPOOL 
a5d84831ea3c6282560fcc7491e7aabeb4a0598c34843a09b7baadf9398092a9495290180d05fbd935ad09207814a3fa4f72cfa3bf798f2422fecf07dc27037d
-DIST refind-src-0.10.7.tar.gz 4045026 SHA256 
32e9a1cb11a910a26f555792d287f1b26d677c6d15666c19814d2b67b78b4201 SHA512 
42830ac8c06221e2244426059add134afc6b63e5120c78fc6fed54eb3a6a1aee1b07da4833f53b3e5ed85689ab818d9bccdd7d1eb7e8fd326ea118ad0d3a542f
 WHIRLPOOL 
a8ac31f0fe3ee5726ecca56f339a1a63835ee608c947a0d86ed6995ad3fa09d66cce7bb4a5d878a6e20755d18b784822c6032ec7f67ea99a14ff3c9f44c49d88
+DIST refind-src-0.10.8.tar.gz 4059265 SHA256 
e4fc7f474fe4a13b70c7bc3611c13976dbc4edc7323f0f27f3b50147ab47f1e6 SHA512 
a4576920dd68a9436ee6d008787104842e192c6a5eb52cc580258bc8e13daadf170c21270e8cfd86f27733e3e86b050af9102d35c939677b1f1c3627aeeafb32
 WHIRLPOOL 
970ea1b6207c526288496f4ad04cf58d86fc8352bad673574bb06de64e4fd37c45b1f7b7b8b9dca2bd0bb5c61cec9e4eaaccf88e237dc515c42e950ec2a425c4

diff --git a/sys-boot/refind/refind-0.10.7-r1.ebuild 
b/sys-boot/refind/refind-0.10.8.ebuild
similarity index 96%
rename from sys-boot/refind/refind-0.10.7-r1.ebuild
rename to sys-boot/refind/refind-0.10.8.ebuild
index 7bbeb09e4d4..044b7ed7c12 100644
--- a/sys-boot/refind/refind-0.10.7-r1.ebuild
+++ b/sys-boot/refind/refind-0.10.8.ebuild
@@ -8,8 +8,7 @@ inherit toolchain-funcs flag-o-matic versionator
 DESCRIPTION="The rEFInd UEFI Boot Manager by Rod Smith"
 HOMEPAGE="http://www.rodsbooks.com/refind/";
 
-SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz
-   gnuefi? ( 
https://dev.gentoo.org/~wraeth/distfiles/${P}-fix_build_gnuefi-3.0.5.patch.xz )"
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
 
 LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
 SLOT="0"
@@ -55,9 +54,6 @@ pkg_setup() {
 src_prepare() {
default
 
-   # bug 616668 - build fails against gnu-efi-3.0.5
-   use gnuefi && eapply "${WORKDIR}"/"${P}"-fix_build_gnuefi-3.0.5.patch
-
# bug 598647 - PIE not supported
sed -e 's:CFLAGS  =:& -fno-PIE:' -i "${S}/Make.common" || die
 



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/, sys-boot/refind/files/

2017-06-03 Thread Sam Jorna
commit: daeac026af7e05b679a46dbb68cc9fdaec90437f
Author: Sam Jorna  gentoo  org>
AuthorDate: Sun Jun  4 04:37:56 2017 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Sun Jun  4 06:12:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daeac026

sys-boot/refind: move large patch to dev.g.o hosting

Uncompressed patch too large for QA constraints (50KB), moved to
hosting on dev.g.o.

Gentoo-Bug: 620632
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-boot/refind/Manifest   |1 +
 .../refind-0.10.7-fix_build_gnuefi-3.0.5.patch | 1387 
 sys-boot/refind/refind-0.10.7-r1.ebuild|5 +-
 3 files changed, 4 insertions(+), 1389 deletions(-)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 77b0cb5dfa7..c6f9278a867 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,2 +1,3 @@
+DIST refind-0.10.7-fix_build_gnuefi-3.0.5.patch.xz 9920 SHA256 
262af553bc782394d08fa208452e81ef0b8cbefd6ec3857bee0a7d7f862bd86f SHA512 
48ef45c7650347b82ee14a01459fd8f59d99623ae12f40f198d0d36d2471b3e93de85a4c3d39825e58e70c08b03fe00506fb71173deaef1889f5a806b103564d
 WHIRLPOOL 
e250f230221fd3920547c2684cffe258931d8a79c47bf458cc422551b1d5ee0a3930a8ba9353ae120cd87500ec478d13cf085933f41f78b4d2e5ed7d71dd3e4e
 DIST refind-src-0.10.4.tar.gz 3970380 SHA256 
c3e428b27a0d4c61ee052603aedea7118bf04a7917216b10bfde2a3d2a2442a5 SHA512 
a75a6210ee51427c474e69c2de8c719545b2599c19f1c7541048b77ab1996a0e4b4b5fd4840f6240cd6704e5f5338cbaff432d7dc5ec4042854e26d6df18bed5
 WHIRLPOOL 
a5d84831ea3c6282560fcc7491e7aabeb4a0598c34843a09b7baadf9398092a9495290180d05fbd935ad09207814a3fa4f72cfa3bf798f2422fecf07dc27037d
 DIST refind-src-0.10.7.tar.gz 4045026 SHA256 
32e9a1cb11a910a26f555792d287f1b26d677c6d15666c19814d2b67b78b4201 SHA512 
42830ac8c06221e2244426059add134afc6b63e5120c78fc6fed54eb3a6a1aee1b07da4833f53b3e5ed85689ab818d9bccdd7d1eb7e8fd326ea118ad0d3a542f
 WHIRLPOOL 
a8ac31f0fe3ee5726ecca56f339a1a63835ee608c947a0d86ed6995ad3fa09d66cce7bb4a5d878a6e20755d18b784822c6032ec7f67ea99a14ff3c9f44c49d88

diff --git a/sys-boot/refind/files/refind-0.10.7-fix_build_gnuefi-3.0.5.patch 
b/sys-boot/refind/files/refind-0.10.7-fix_build_gnuefi-3.0.5.patch
deleted file mode 100644
index 5320241acb0..000
--- a/sys-boot/refind/files/refind-0.10.7-fix_build_gnuefi-3.0.5.patch
+++ /dev/null
@@ -1,1387 +0,0 @@
-diff --git a/EfiLib/DevicePath.c b/EfiLib/DevicePath.c
-index bfaf1c6..023ea3f 100644
 a/EfiLib/DevicePath.c
-+++ b/EfiLib/DevicePath.c
-@@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER 
EXPRESS OR IMPLIED.
- 
- CHAR16 *
- EFIAPI
--CatPrint (
-+MyCatPrint (
-   IN OUT POOL_PRINT   *Str,
-   IN CHAR16   *Fmt,
-   ...
-@@ -94,7 +94,7 @@ DevPathPci (
-   PCI_DEVICE_PATH *Pci;
- 
-   Pci = DevPath;
--  CatPrint (Str, L"Pci(%x|%x)", (UINTN) Pci->Device, (UINTN) Pci->Function);
-+  MyCatPrint (Str, L"Pci(%x|%x)", (UINTN) Pci->Device, (UINTN) Pci->Function);
- }
- 
- /**
-@@ -116,7 +116,7 @@ DevPathPccard (
-   PCCARD_DEVICE_PATH  *Pccard;
- 
-   Pccard = DevPath;
--  CatPrint (Str, L"Pcmcia(Function%x)", (UINTN) Pccard->FunctionNumber);
-+  MyCatPrint (Str, L"Pcmcia(Function%x)", (UINTN) Pccard->FunctionNumber);
- }
- 
- /**
-@@ -138,7 +138,7 @@ DevPathMemMap (
-   MEMMAP_DEVICE_PATH  *MemMap;
- 
-   MemMap = DevPath;
--  CatPrint (
-+  MyCatPrint (
- Str,
- L"MemMap(%d:%lx-%lx)",
- (UINTN) MemMap->MemoryType,
-@@ -166,7 +166,7 @@ DevPathController (
-   CONTROLLER_DEVICE_PATH  *Controller;
- 
-   Controller = DevPath;
--  CatPrint (Str, L"Ctrl(%d)", (UINTN) Controller->ControllerNumber);
-+  MyCatPrint (Str, L"Ctrl(%d)", (UINTN) Controller->ControllerNumber);
- }
- 
- 
-@@ -202,30 +202,30 @@ DevPathVendor (
- Type = L"Msg";
- /*  
- if (CompareGuid (&Vendor->Guid, &gEfiPcAnsiGuid)) {
--  CatPrint (Str, L"VenPcAnsi()");
-+  MyCatPrint (Str, L"VenPcAnsi()");
-   return ;
- } else if (CompareGuid (&Vendor->Guid, &gEfiVT100Guid)) {
--  CatPrint (Str, L"VenVt100()");
-+  MyCatPrint (Str, L"VenVt100()");
-   return ;
- } else if (CompareGuid (&Vendor->Guid, &gEfiVT100PlusGuid)) {
--  CatPrint (Str, L"VenVt100Plus()");
-+  MyCatPrint (Str, L"VenVt100Plus()");
-   return ;
- } else if (CompareGuid (&Vendor->Guid, &gEfiVTUTF8Guid)) {
--  CatPrint (Str, L"VenUft8()");
-+  MyCatPrint (Str, L"VenUft8()");
-   return ;
- } else if (CompareGuid (&Vendor->Guid, &gEfiUartDevicePathGuid )) {
-   FlowControlMap = (((UART_FLOW_CONTROL_DEVICE_PATH *) 
Vendor)->FlowControlMap);
-   switch (FlowControlMap & 0x0003) {
-   case 0:
--CatPrint (Str, L"UartFlowCtrl(%s)", L"None");
-+MyCatPrint (Str, L"UartFlowCtrl(%s)", L"None");
- break;
- 
-   case 1:
--CatPrint (Str, L"UartFlowCtrl(%s)", L"Hardware");
-+MyCatPrint (Str, L"UartFlowCtrl(%s)", L"Hardware");
- 

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2017-05-15 Thread Sam Jorna
commit: fed31007dc4f3911bfb55bab5273de7f64388140
Author: Sam Jorna  gentoo  org>
AuthorDate: Mon May 15 11:02:09 2017 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Mon May 15 11:02:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed31007

sys-boot/refind: fix incorrect patch name

Gentoo-Bug: 618510
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-boot/refind/refind-0.10.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/refind/refind-0.10.7-r1.ebuild 
b/sys-boot/refind/refind-0.10.7-r1.ebuild
index b77f6fc42e8..a17a793c16f 100644
--- a/sys-boot/refind/refind-0.10.7-r1.ebuild
+++ b/sys-boot/refind/refind-0.10.7-r1.ebuild
@@ -55,7 +55,7 @@ src_prepare() {
default
 
# bug 616668 - build fails against gnu-efi-3.0.5
-   eapply "${FILESDIR}"/"${PF}"-fix_build_gnuefi-3.0.5.patch
+   eapply "${FILESDIR}"/"${P}"-fix_build_gnuefi-3.0.5.patch
 
# bug 598647 - PIE not supported
sed -e 's:CFLAGS  =:& -fno-PIE:' -i "${S}/Make.common" || die



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/, sys-boot/refind/files/

2017-05-14 Thread Sam Jorna
commit: 7c4e72babf0b6675281208334313aba4c40dd914
Author: Sam Jorna  gentoo  org>
AuthorDate: Mon May 15 05:11:28 2017 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Mon May 15 05:12:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c4e72ba

sys-boot/refind: fix build against gnu-efi-3.0.5

Adds upstream patch for building against gnu-efi-3.0.5 which added functions
causing namespace collisions.

Gentoo-Bug: 616668
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../refind-0.10.7-fix_build_gnuefi-3.0.5.patch | 1387 
 ...efind-0.10.7.ebuild => refind-0.10.7-r1.ebuild} |3 +
 2 files changed, 1390 insertions(+)

diff --git a/sys-boot/refind/files/refind-0.10.7-fix_build_gnuefi-3.0.5.patch 
b/sys-boot/refind/files/refind-0.10.7-fix_build_gnuefi-3.0.5.patch
new file mode 100644
index 000..5320241acb0
--- /dev/null
+++ b/sys-boot/refind/files/refind-0.10.7-fix_build_gnuefi-3.0.5.patch
@@ -0,0 +1,1387 @@
+diff --git a/EfiLib/DevicePath.c b/EfiLib/DevicePath.c
+index bfaf1c6..023ea3f 100644
+--- a/EfiLib/DevicePath.c
 b/EfiLib/DevicePath.c
+@@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER 
EXPRESS OR IMPLIED.
+ 
+ CHAR16 *
+ EFIAPI
+-CatPrint (
++MyCatPrint (
+   IN OUT POOL_PRINT   *Str,
+   IN CHAR16   *Fmt,
+   ...
+@@ -94,7 +94,7 @@ DevPathPci (
+   PCI_DEVICE_PATH *Pci;
+ 
+   Pci = DevPath;
+-  CatPrint (Str, L"Pci(%x|%x)", (UINTN) Pci->Device, (UINTN) Pci->Function);
++  MyCatPrint (Str, L"Pci(%x|%x)", (UINTN) Pci->Device, (UINTN) Pci->Function);
+ }
+ 
+ /**
+@@ -116,7 +116,7 @@ DevPathPccard (
+   PCCARD_DEVICE_PATH  *Pccard;
+ 
+   Pccard = DevPath;
+-  CatPrint (Str, L"Pcmcia(Function%x)", (UINTN) Pccard->FunctionNumber);
++  MyCatPrint (Str, L"Pcmcia(Function%x)", (UINTN) Pccard->FunctionNumber);
+ }
+ 
+ /**
+@@ -138,7 +138,7 @@ DevPathMemMap (
+   MEMMAP_DEVICE_PATH  *MemMap;
+ 
+   MemMap = DevPath;
+-  CatPrint (
++  MyCatPrint (
+ Str,
+ L"MemMap(%d:%lx-%lx)",
+ (UINTN) MemMap->MemoryType,
+@@ -166,7 +166,7 @@ DevPathController (
+   CONTROLLER_DEVICE_PATH  *Controller;
+ 
+   Controller = DevPath;
+-  CatPrint (Str, L"Ctrl(%d)", (UINTN) Controller->ControllerNumber);
++  MyCatPrint (Str, L"Ctrl(%d)", (UINTN) Controller->ControllerNumber);
+ }
+ 
+ 
+@@ -202,30 +202,30 @@ DevPathVendor (
+ Type = L"Msg";
+ /*  
+ if (CompareGuid (&Vendor->Guid, &gEfiPcAnsiGuid)) {
+-  CatPrint (Str, L"VenPcAnsi()");
++  MyCatPrint (Str, L"VenPcAnsi()");
+   return ;
+ } else if (CompareGuid (&Vendor->Guid, &gEfiVT100Guid)) {
+-  CatPrint (Str, L"VenVt100()");
++  MyCatPrint (Str, L"VenVt100()");
+   return ;
+ } else if (CompareGuid (&Vendor->Guid, &gEfiVT100PlusGuid)) {
+-  CatPrint (Str, L"VenVt100Plus()");
++  MyCatPrint (Str, L"VenVt100Plus()");
+   return ;
+ } else if (CompareGuid (&Vendor->Guid, &gEfiVTUTF8Guid)) {
+-  CatPrint (Str, L"VenUft8()");
++  MyCatPrint (Str, L"VenUft8()");
+   return ;
+ } else if (CompareGuid (&Vendor->Guid, &gEfiUartDevicePathGuid )) {
+   FlowControlMap = (((UART_FLOW_CONTROL_DEVICE_PATH *) 
Vendor)->FlowControlMap);
+   switch (FlowControlMap & 0x0003) {
+   case 0:
+-CatPrint (Str, L"UartFlowCtrl(%s)", L"None");
++MyCatPrint (Str, L"UartFlowCtrl(%s)", L"None");
+ break;
+ 
+   case 1:
+-CatPrint (Str, L"UartFlowCtrl(%s)", L"Hardware");
++MyCatPrint (Str, L"UartFlowCtrl(%s)", L"Hardware");
+ break;
+ 
+   case 2:
+-CatPrint (Str, L"UartFlowCtrl(%s)", L"XonXoff");
++MyCatPrint (Str, L"UartFlowCtrl(%s)", L"XonXoff");
+ break;
+ 
+   default:
+@@ -237,7 +237,7 @@ DevPathVendor (
+ } else
+  */
+ if (CompareGuid (&Vendor->Guid, &gEfiSasDevicePathGuid)) {
+-  CatPrint (
++  MyCatPrint (
+ Str,
+ L"SAS(%lx,%lx,%x,",
+ ((SAS_DEVICE_PATH *) Vendor)->SasAddress,
+@@ -246,9 +246,9 @@ DevPathVendor (
+ );
+   Info = (((SAS_DEVICE_PATH *) Vendor)->DeviceTopology);
+   if ((Info & 0x0f) == 0) {
+-CatPrint (Str, L"NoTopology,0,0,0,");
++MyCatPrint (Str, L"NoTopology,0,0,0,");
+   } else if (((Info & 0x0f) == 1) || ((Info & 0x0f) == 2)) {
+-CatPrint (
++MyCatPrint (
+   Str,
+   L"%s,%s,%s,",
+   ((Info & (0x1 << 4)) != 0) ? L"SATA" : L"SAS",
+@@ -256,19 +256,19 @@ DevPathVendor (
+   ((Info & (0x1 << 6)) != 0) ? L"Expanded" : L"Direct"
+   );
+ if ((Info & 0x0f) == 1) {
+-  CatPrint (Str, L"0,");
++  MyCatPrint (Str, L"0,");
+ } else {
+-  CatPrint (Str, L"%x,", (UINTN) ((Info >> 8) & 0xff));
++  MyCatPrint (Str, L"%x,", (UINTN) ((Info >> 8) & 0xff));
+ }
+   } else {
+-CatPrint (Str, L"0,0,0,0,");
++MyCatPrint (Str, L"0,0,0,0,");
+   }
+ 
+-  CatPrint (Str, L"%x)"

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2017-04-27 Thread Sam Jorna
commit: df0a2f61c3b96fb3516cc8df148ff4e33a33eea0
Author: Sam Jorna  gentoo  org>
AuthorDate: Fri Apr 28 00:36:35 2017 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Fri Apr 28 00:36:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df0a2f61

sys-boot/refind: reorder metadata.xml

Output from some tools (equery) prints first language rather than respecting
LANG (see bug 616800). Re-ordering as workaround for this.

Reported-by: Wes  sol1.com.au>
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-boot/refind/metadata.xml | 48 ++--
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/sys-boot/refind/metadata.xml b/sys-boot/refind/metadata.xml
index 3bcc4473f8e..a5f94e9e04e 100644
--- a/sys-boot/refind/metadata.xml
+++ b/sys-boot/refind/metadata.xml
@@ -13,6 +13,20 @@
proxy-ma...@gentoo.org
Proxy Maintainers

+   
+A graphical boot manager for EFI- and UEFI-based computers, such as all
+Intel-based Macs and recent (most 2011 and later) PCs. rEFInd presents a
+boot menu showing all the EFI boot loaders on the EFI-accessible
+partitions, and optionally BIOS-bootable partitions on Macs and BIOS boot
+entries on UEFI PCs with CSMs. EFI-compatbile OSes, including Linux,
+provide boot loaders that rEFInd can detect and launch. rEFInd can launch
+Linux EFI boot loaders such as ELILO, GRUB Legacy, GRUB 2, and 3.3.0 and
+later kernels with EFI stub support. EFI filesystem drivers for ext2/3/4fs,
+ReiserFS, Btrfs, NTFS, HFS+, and ISO-9660 enable rEFInd to read boot
+loaders from these filesystems, too. rEFInd's ability to detect boot
+loaders at runtime makes it very easy to use, particularly when paired with
+Linux kernels that provide EFI stub support.
+   

 Un gestionnaire d'amorçage pour ordinateur EFI ou UEFI tel que tous les Macs
 contenant un processeur Intel et les PC récents (2011 et après). rEFInd affiche
@@ -29,30 +43,6 @@ systèmes de fichiers. La capacité de rEFInd à détecter les 
gestionnaires
 d'amorçage au moment de l'exécution le rend très facile à utiliser, en
 particulier associé à des noyau Linux qui fournissent un support EFI stub.

-   
-A graphical boot manager for EFI- and UEFI-based computers, such as all
-Intel-based Macs and recent (most 2011 and later) PCs. rEFInd presents a
-boot menu showing all the EFI boot loaders on the EFI-accessible
-partitions, and optionally BIOS-bootable partitions on Macs and BIOS boot
-entries on UEFI PCs with CSMs. EFI-compatbile OSes, including Linux,
-provide boot loaders that rEFInd can detect and launch. rEFInd can launch
-Linux EFI boot loaders such as ELILO, GRUB Legacy, GRUB 2, and 3.3.0 and
-later kernels with EFI stub support. EFI filesystem drivers for ext2/3/4fs,
-ReiserFS, Btrfs, NTFS, HFS+, and ISO-9660 enable rEFInd to read boot
-loaders from these filesystems, too. rEFInd's ability to detect boot
-loaders at runtime makes it very easy to use, particularly when paired with
-Linux kernels that provide EFI stub support.
-   
-   
-   Construire le gestionnaire EFI pour le 
système de fichier ext2
-   Construire le gestionnaire EFI pour le 
système de fichier ext4
-   Construire le gestionnaire EFI pour le 
système de fichier reiserfs
-   Construire le gestionnaire EFI pour le 
système de fichier iso9660
-   Construire le gestionnaire EFI pour le système 
de fichier hfs
-   Construire le gestionnaire EFI pour le 
système de fichier btrfs
-   Construire le gestionnaire EFI pour le 
système de fichier ntfs
-   Compiler en utilisant GNU-EFI au lieu de 
Tianocore
-   

Builds the EFI binary ext2 filesystem 
driver
Builds the EFI binary ext4 filesystem 
driver
@@ -63,6 +53,16 @@ Linux kernels that provide EFI stub support.
Builds the EFI binary ntfs filesystem 
driver
Compile using GNU-EFI instead of 
Tianocore

+   
+   Construire le gestionnaire EFI pour le 
système de fichier ext2
+   Construire le gestionnaire EFI pour le 
système de fichier ext4
+   Construire le gestionnaire EFI pour le 
système de fichier reiserfs
+   Construire le gestionnaire EFI pour le 
système de fichier iso9660
+   Construire le gestionnaire EFI pour le système 
de fichier hfs
+   Construire le gestionnaire EFI pour le 
système de fichier btrfs
+   Construire le gestionnaire EFI pour le 
système de fichier ntfs
+   Compiler en utilisant GNU-EFI au lieu de 
Tianocore
+   

refind




[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2017-04-23 Thread Sam Jorna
commit: 6a2d104b5d08cb9c25f94db1dbf8af44455acfdc
Author: Sam Jorna  gentoo  org>
AuthorDate: Sun Apr 23 23:29:25 2017 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Sun Apr 23 23:29:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a2d104b

sys-boot/refind: bump to 0.10.7

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-boot/refind/Manifest |   1 +
 sys-boot/refind/refind-0.10.7.ebuild | 197 +++
 2 files changed, 198 insertions(+)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 50441a1fb85..77b0cb5dfa7 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1 +1,2 @@
 DIST refind-src-0.10.4.tar.gz 3970380 SHA256 
c3e428b27a0d4c61ee052603aedea7118bf04a7917216b10bfde2a3d2a2442a5 SHA512 
a75a6210ee51427c474e69c2de8c719545b2599c19f1c7541048b77ab1996a0e4b4b5fd4840f6240cd6704e5f5338cbaff432d7dc5ec4042854e26d6df18bed5
 WHIRLPOOL 
a5d84831ea3c6282560fcc7491e7aabeb4a0598c34843a09b7baadf9398092a9495290180d05fbd935ad09207814a3fa4f72cfa3bf798f2422fecf07dc27037d
+DIST refind-src-0.10.7.tar.gz 4045026 SHA256 
32e9a1cb11a910a26f555792d287f1b26d677c6d15666c19814d2b67b78b4201 SHA512 
42830ac8c06221e2244426059add134afc6b63e5120c78fc6fed54eb3a6a1aee1b07da4833f53b3e5ed85689ab818d9bccdd7d1eb7e8fd326ea118ad0d3a542f
 WHIRLPOOL 
a8ac31f0fe3ee5726ecca56f339a1a63835ee608c947a0d86ed6995ad3fa09d66cce7bb4a5d878a6e20755d18b784822c6032ec7f67ea99a14ff3c9f44c49d88

diff --git a/sys-boot/refind/refind-0.10.7.ebuild 
b/sys-boot/refind/refind-0.10.7.ebuild
new file mode 100644
index 000..044b7ed7c12
--- /dev/null
+++ b/sys-boot/refind/refind-0.10.7.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic versionator
+
+DESCRIPTION="The rEFInd UEFI Boot Manager by Rod Smith"
+HOMEPAGE="http://www.rodsbooks.com/refind/";
+
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} -gnuefi doc -custom-cflags"
+
+DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+   !gnuefi? ( >=sys-boot/udk-2015 )"
+
+DOCS="NEWS.txt README.txt docs/refind docs/Styles"
+
+pkg_pretend() {
+   if use custom-cflags; then
+   ewarn
+   ewarn "You have enabled building with USE=custom-cflags. Be 
aware that"
+   ewarn "using this can result in EFI binaries that fail to run 
and may"
+   ewarn "fail to build at all. This is strongly advised against 
by upstream."
+   ewarn
+   ewarn "See https://bugs.gentoo.org/598587#c3 for more 
information"
+   ewarn
+   fi
+}
+
+pkg_setup() {
+   if use x86 ; then
+   export EFIARCH=ia32
+   export BUILDARCH=ia32
+   elif use amd64; then
+   export EFIARCH=x64
+   export BUILDARCH=x86_64
+   else
+   # Try to support anyway
+   export BUILDARCH=$( uname -m | sed s,i[3456789]86,ia32, )
+   if [[ ${BUILDARCH} == "x86_64" ]] ; then
+   export EFIARCH=x64
+   else
+   export EFIARCH=${ARCH}
+   fi
+   fi
+}
+
+src_prepare() {
+   default
+
+   # bug 598647 - PIE not supported
+   sed -e 's:CFLAGS  =:& -fno-PIE:' -i "${S}/Make.common" || die
+
+   local f
+   for f in "${S}"/*/Make.tiano "${S}"/Make.common; do
+   sed -i -e 's/^\(include .*target.txt.*\)$/#\1/' \
+   -e 
's@^\(TIANO_INCLUDE_DIRS\s*=\s*-I\s*\).*$@\1/usr/include/udk \\@' \
+   -e '/^\s*-I \$(EDK2BASE).*$/d' \
+   "${f}" || die "Failed to patch Tianocore make file in" \
+   $(basename $(dirname ${f}))
+   done
+   for f in "${S}"/*/Make.tiano; do
+   sed -i -e 's@^\(EFILIB\s*=\s*\).*$@\1/usr/lib@' \
+   -e 's@\$(EFILIB).*/\([^/]*\).lib@-l\1@' \
+   -e 's/\(--start-group\s*\$(ALL_EFILIBS)\)/-L \$(EFILIB) 
\1/' \
+   "${f}" || die "Failed to patch Tianocore make file in" \
+   $(basename $(dirname ${f}))
+   done
+   sed -i -e '/Guids/i#include "AutoGen.h"\n' "${S}/filesystems/AutoGen.c" 
\
+   || die "Failed to patch AutoGen.c"
+   for f in "${S}"/*/AutoGen.c; do
+   cat >>"${f}" <<-EOF || die "Failed to patch AutoGen.c"
+
+   #define _PCD_TOKEN_PcdFixedDebugPrintErrorLevel  11U
+   #define _PCD_SIZE_PcdFixedDebugPrintErrorLevel 4
+   #define _PCD_GET_MODE_SIZE_PcdFixedDebugPrintErrorLevel 
 _PCD_SIZE_PcdFixedDebugPrintErrorLevel
+   #define _PCD_VALUE_PcdFixedDebugPrintErr

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/files/

2017-02-06 Thread Göktürk Yüksek
commit: f3be4bf57e5a1ea08191901c2cd17aca257d89cb
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Mon Feb  6 16:57:04 2017 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Mon Feb  6 20:14:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3be4bf5

sys-boot/refind: remove unused patch

 .../refind/files/0.10.0-refind-install-symlink.patch  | 19 ---
 1 file changed, 19 deletions(-)

diff --git a/sys-boot/refind/files/0.10.0-refind-install-symlink.patch 
b/sys-boot/refind/files/0.10.0-refind-install-symlink.patch
deleted file mode 100644
index 868bc86..
--- a/sys-boot/refind/files/0.10.0-refind-install-symlink.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/refind-install b/refind-install
-index 0f4accd..07f2b35 100755
 a/refind-install
-+++ b/refind-install
-@@ -1168,7 +1168,13 @@ InstallOnLinux() {
- # install under OS X or Linux, depending on the detected platform.
- #
- GetParams "$@"
--ThisDir="$( cd -P "${BASH_SOURCE%/*}" && pwd )"
-+ThisScript="${BASH_SOURCE[0]}"
-+while [ -h "$ThisScript" ]; do
-+   ThisDir="$( cd -P "$( dirname "$ThisScript" )" && pwd )"
-+   ThisScript="$(readlink "$ThisScript")"
-+   [[ $ThisScript != /* ]] && ThisScript="$ThisDir/$ThisScript"
-+done
-+ThisDir="$( cd -P "$( dirname "$ThisScript" )" && pwd )"
- RefindDir="$ThisDir/refind"
- if [[ $UID != 0 ]] ; then
-echo "Not running as root; attempting to elevate privileges via sudo"



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2016-12-21 Thread Aaron Bauman
commit: e9c3fd6daa443d8bf99ffb88b15491a3317cf87e
Author: Aaron Bauman  gentoo  org>
AuthorDate: Thu Dec 22 05:10:20 2016 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu Dec 22 05:10:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9c3fd6d

sys-boot/refind: amd64 stable wrt bug #563226

 sys-boot/refind/refind-0.10.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/refind/refind-0.10.4-r2.ebuild 
b/sys-boot/refind/refind-0.10.4-r2.ebuild
index b427764..a23f381 100644
--- a/sys-boot/refind/refind-0.10.4-r2.ebuild
+++ b/sys-boot/refind/refind-0.10.4-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
 
 LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} -gnuefi doc -custom-cflags"
 



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2016-12-14 Thread Sam Jorna
commit: 636e954d1e3931cfea387c984fa38a883fc7e8ae
Author: Sam Jorna  gentoo  org>
AuthorDate: Wed Dec 14 02:22:26 2016 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Wed Dec 14 22:28:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=636e954d

sys-boot/refind: fix building with custom-cflags

Gentoo-bug: 598587
Acked-by: Stéphane Veyret  gmail.com>
Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-boot/refind/refind-0.10.4-r1.ebuild | 26 +++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/sys-boot/refind/refind-0.10.4-r1.ebuild 
b/sys-boot/refind/refind-0.10.4-r1.ebuild
index 2bc85ce..af45a99 100644
--- a/sys-boot/refind/refind-0.10.4-r1.ebuild
+++ b/sys-boot/refind/refind-0.10.4-r1.ebuild
@@ -22,6 +22,18 @@ DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
 
 DOCS="NEWS.txt README.txt docs/refind docs/Styles"
 
+pkg_pretend() {
+   if use custom-cflags; then
+   ewarn
+   ewarn "You have enabled building with USE=custom-cflags. Be 
aware that"
+   ewarn "using this can result in EFI binaries that fail to run 
and may"
+   ewarn "fail to build at all. This is strongly advised against 
by upstream."
+   ewarn
+   ewarn "See https://bugs.gentoo.org/598587#c3 for more 
information"
+   ewarn
+   fi
+}
+
 pkg_setup() {
if use x86 ; then
export EFIARCH=ia32
@@ -96,12 +108,16 @@ src_compile() {
--defsym=PECOFF_HEADER_SIZE=${pecoff_header_size} \
--entry \$(ENTRYPOINT) -u \$(ENTRYPOINT) -m \$(LD_CODE)"
)
-   use custom-cflags && make_flags[CFLAGS]="${CFLAGS}"
 
# Make main EFI
local all_target
use gnuefi && all_target="gnuefi" || all_target="tiano"
-   emake "${make_flags[@]}" ${all_target}
+
+   if use custom-cflags; then
+   emake CFLAGS="${CFLAGS}" "${make_flags[@]}" ${all_target}
+   else
+   emake "${make_flags[@]}" ${all_target}
+   fi
 
# Make filesystem drivers
local gnuefi_target
@@ -111,7 +127,11 @@ src_compile() {
fs=${fs#+}
if use "${fs}"; then
einfo "Building ${fs} filesystem driver"
-   emake "${make_flags[@]}" -C "${S}/filesystems" 
${fs}${gnuefi_target}
+   if use custom-cflags; then
+   emake CFLAGS="${CFLAGS}" "${make_flags[@]}" -C 
"${S}/filesystems" ${fs}${gnuefi_target}
+   else
+   emake "${make_flags[@]}" -C "${S}/filesystems" 
${fs}${gnuefi_target}
+   fi
fi
done
 }



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2016-12-14 Thread Sam Jorna
commit: e18eb3c31f350a35f1043decea2a220094bbce18
Author: Sam Jorna  gentoo  org>
AuthorDate: Wed Dec 14 02:25:54 2016 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Wed Dec 14 22:28:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e18eb3c3

sys-boot/refind: revbump, disable build with PIE

Gentoo-bug: 598647
Acked-by: Stéphane Veyret  gmail.com>
Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-boot/refind/{refind-0.10.4-r1.ebuild => refind-0.10.4-r2.ebuild} | 4 
 1 file changed, 4 insertions(+)

diff --git a/sys-boot/refind/refind-0.10.4-r1.ebuild 
b/sys-boot/refind/refind-0.10.4-r2.ebuild
similarity index 98%
rename from sys-boot/refind/refind-0.10.4-r1.ebuild
rename to sys-boot/refind/refind-0.10.4-r2.ebuild
index af45a99..b427764 100644
--- a/sys-boot/refind/refind-0.10.4-r1.ebuild
+++ b/sys-boot/refind/refind-0.10.4-r2.ebuild
@@ -54,6 +54,10 @@ pkg_setup() {
 
 src_prepare() {
default
+
+   # bug 598647 - PIE not supported
+   sed -e 's:CFLAGS  =:& -fno-PIE:' -i "${S}/Make.common" || die
+
local f
for f in "${S}"/*/Make.tiano "${S}"/Make.common; do
sed -i -e 's/^\(include .*target.txt.*\)$/#\1/' \



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2016-12-14 Thread Sam Jorna
commit: 3ef8c35acdbbe0d77dab622259b1ee978ac5c17b
Author: Sam Jorna  gentoo  org>
AuthorDate: Wed Dec 14 00:34:48 2016 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Wed Dec 14 22:28:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ef8c35a

sys-boot/refind: remove old

Acked-by: Stéphane Veyret  gmail.com>
Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-boot/refind/Manifest|   5 -
 sys-boot/refind/refind-0.10.0.ebuild| 108 ---
 sys-boot/refind/refind-0.10.2-r1.ebuild | 175 --
 sys-boot/refind/refind-0.10.2-r2.ebuild | 166 -
 sys-boot/refind/refind-0.10.2.ebuild| 106 --
 sys-boot/refind/refind-0.10.3-r1.ebuild | 174 --
 sys-boot/refind/refind-0.10.3.ebuild| 183 
 sys-boot/refind/refind-0.10.4.ebuild| 183 
 sys-boot/refind/refind-0.9.0-r1.ebuild  |  93 
 sys-boot/refind/refind-0.9.2.ebuild | 101 --
 10 files changed, 1294 deletions(-)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 497d93a..50441a1 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,6 +1 @@
-DIST refind-src-0.10.0.tar.gz 3336917 SHA256 
845dc3a18d4c82c1e29d4dbef14a53f4de1401c5bb3ea10f3f39442efa870e2e SHA512 
111caea0c1dbd9dde50e7b3cf47c7ad0d5e7f3bec3bb784397171950865cffd8cf589c6a1b821fabd6ed4be191a322757bf94255bfd449ee4a647ad597c3d7ab
 WHIRLPOOL 
8e9070c89b83ff7e49b34c45f5f7d3ecd90824f8ba95eae4105636125500eafc29a7ae34a602cb268bd7bd4e90fe2a7e2a8bad4a9b68baa283a59d0a34ae1d1f
-DIST refind-src-0.10.2.tar.gz 2949593 SHA256 
ef6aa17e911ea899c0d5e9482bfe657bc63b425976b0e2f936e67cbec3f1c34c SHA512 
7f74109a2f2a8dd5889834c0d9cf9b186ed5487a737b442caed5ce2df06de13efc2553d264792e5f72e4bb281926a772aeca96187209d856a8b9abe9f831580c
 WHIRLPOOL 
224c168b1eb980c850b008f0a6e2148b8bbc0ed1d591c4bdfb1c182af9430e5eb9ac8a58ec8f83a50320d30a946b1feeda12eb02a36450e7912462c6058cc7fc
-DIST refind-src-0.10.3.tar.gz 3967340 SHA256 
652be9a25a026b4d4a6a3e73e8765fe31c948a88a2f413cde814815f93b858e4 SHA512 
2a2274f508c66fa62352b34daab7faf9c7ff33f197b0ec125c0d025ab7c0ecb3e4cc2925f5e6888f06dc3a4fb4008a353d8b59e96d0a047695b0efb989f9f72d
 WHIRLPOOL 
8a417cc1da124967618b379cb71737b83b9f4cfd3dd22f6896ed8720945c456b4785fe18fb2b51bb5b10c808e660341c2e86656195a24e5d39fcd13d24f97e8d
 DIST refind-src-0.10.4.tar.gz 3970380 SHA256 
c3e428b27a0d4c61ee052603aedea7118bf04a7917216b10bfde2a3d2a2442a5 SHA512 
a75a6210ee51427c474e69c2de8c719545b2599c19f1c7541048b77ab1996a0e4b4b5fd4840f6240cd6704e5f5338cbaff432d7dc5ec4042854e26d6df18bed5
 WHIRLPOOL 
a5d84831ea3c6282560fcc7491e7aabeb4a0598c34843a09b7baadf9398092a9495290180d05fbd935ad09207814a3fa4f72cfa3bf798f2422fecf07dc27037d
-DIST refind-src-0.9.0.zip 2939724 SHA256 
842a01d7964bc8c8000a66e6d08f6fadb4c257d251b1277cebff0bf731e024aa SHA512 
c49e3110e6b9f8d44dadae1ab828d3bf59bbce2da9170efed73db961135144ae9963b57d4cc39af2b15ecdf1f289359bda56c3d3e8f72d05be165ae5a3e2654d
 WHIRLPOOL 
225a6b84ea7044e8fe0bab5e268c8c46a4523ab6f408d1bb2a94adfe54afe80c9c83ec0dc104945b332ae6c375c9d041972dee39baa43665588eb0dfc1fe4362
-DIST refind-src-0.9.2.zip 2941986 SHA256 
9022da3d46493395c273e2d2fc555d1c786fb1b9c11b2912751a88fe3328212a SHA512 
6636cf02bb69ffe699d5f9717d09b80db0e4330aa52c14949e8612caed11f032370db17700c15d285173729271d2434fd0fbc39f5b445a3c05255ee14d125d47
 WHIRLPOOL 
2d81427bf6cc9cf021a4ffc7238bcf914e380fea091cbefaa601e391cf28f43f7c3ef1181744e4aab3d71d2535d88ba633b13cdae696f0baddd26d3c2511a88d

diff --git a/sys-boot/refind/refind-0.10.0.ebuild 
b/sys-boot/refind/refind-0.10.0.ebuild
deleted file mode 100644
index 21a6b01..
--- a/sys-boot/refind/refind-0.10.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="The rEFInd UEFI Boot Manager by Rod Smith"
-HOMEPAGE="http://www.rodsbooks.com/refind/";
-
-SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
-IUSE="${FS_USE} doc"
-
-DEPEND=">=sys-boot/gnu-efi-3.0.2"
-
-DOCS="NEWS.txt README.txt docs/refind docs/Styles"
-
-pkg_setup() {
-   if use x86 ; then
-   export EFIARCH=ia32
-   export BUILDARCH=ia32
-   elif use amd64; then
-   export EFIARCH=x64
-   export BUILDARCH=x86_64
-   else
-   # Try to support anyway
-   export BUILDARCH=$( uname -m | sed s,i[3456789]86,ia32, )
-   if [[ ${BUILDARCH} == "x86_64" ]] ; then
-   export EFIARCH=x64
-   else
-   export EFIARCH=${ARCH}
-   fi
-   fi
-}
-
-src_prepare() {
-   

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2016-11-06 Thread Göktürk Yüksek
commit: b2a111b7db0784f57894abdea13febc300f4d235
Author: Göktürk Yüksek  gentoo  org>
AuthorDate: Sun Nov  6 16:15:42 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Sun Nov  6 16:23:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2a111b7

sys-boot/refind: add missing EROOT in postinst

Package-Manager: portage-2.2.28

 sys-boot/refind/refind-0.10.2-r2.ebuild | 4 ++--
 sys-boot/refind/refind-0.10.3-r1.ebuild | 4 ++--
 sys-boot/refind/refind-0.10.4-r1.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-boot/refind/refind-0.10.2-r2.ebuild 
b/sys-boot/refind/refind-0.10.2-r2.ebuild
index 1d50296..8f0fe22 100644
--- a/sys-boot/refind/refind-0.10.2-r2.ebuild
+++ b/sys-boot/refind/refind-0.10.2-r2.ebuild
@@ -147,7 +147,7 @@ src_install() {
 }
 
 pkg_postinst() {
-   elog "rEFInd has been built and installed into /usr/share/${P}"
+   elog "rEFInd has been built and installed into 
${EROOT%/}/usr/share/${P}"
elog "You will need to use the command 'refind-install' to install"
elog "the binaries into your EFI System Partition"
if [[ -z "${REPLACING_VERSIONS}" ]]; then
@@ -158,7 +158,7 @@ pkg_postinst() {
elog " sys-block/parted for automatic ESP location and mount"
elog ""
elog "A sample configuration can be found at"
-   elog "/usr/share/${P}/refind/refind.conf-sample"
+   elog "${EROOT%/}/usr/share/${P}/refind/refind.conf-sample"
else
ewarn "Note that this will not update any EFI binaries on your 
EFI"
ewarn "System Partition - this needs to be done manually."

diff --git a/sys-boot/refind/refind-0.10.3-r1.ebuild 
b/sys-boot/refind/refind-0.10.3-r1.ebuild
index fcf8d9d..a5556a3 100644
--- a/sys-boot/refind/refind-0.10.3-r1.ebuild
+++ b/sys-boot/refind/refind-0.10.3-r1.ebuild
@@ -148,7 +148,7 @@ src_install() {
 }
 
 pkg_postinst() {
-   elog "rEFInd has been built and installed into /usr/share/${P}"
+   elog "rEFInd has been built and installed into 
${EROOT%/}/usr/share/${P}"
elog "You will need to use the command 'refind-install' to install"
elog "the binaries into your EFI System Partition"
elog ""
@@ -161,7 +161,7 @@ pkg_postinst() {
elog "refind-mkdefault requires >=dev-lang/python-3"
elog ""
elog "A sample configuration can be found at"
-   elog "/usr/share/${P}/refind/refind.conf-sample"
+   elog "${EROOT%/}/usr/share/${P}/refind/refind.conf-sample"
else
if ! version_is_at_least "0.10.3" "${REPLACING_VERSIONS}"; then
elog "The new refind-mkdefault script requires 
>=dev-lang/python-3"

diff --git a/sys-boot/refind/refind-0.10.4-r1.ebuild 
b/sys-boot/refind/refind-0.10.4-r1.ebuild
index fcf8d9d..2bc85ce 100644
--- a/sys-boot/refind/refind-0.10.4-r1.ebuild
+++ b/sys-boot/refind/refind-0.10.4-r1.ebuild
@@ -148,7 +148,7 @@ src_install() {
 }
 
 pkg_postinst() {
-   elog "rEFInd has been built and installed into /usr/share/${P}"
+   elog "rEFInd has been built and installed into 
${EROOT%/}/usr/share/${P}"
elog "You will need to use the command 'refind-install' to install"
elog "the binaries into your EFI System Partition"
elog ""
@@ -161,7 +161,7 @@ pkg_postinst() {
elog "refind-mkdefault requires >=dev-lang/python-3"
elog ""
elog "A sample configuration can be found at"
-   elog "/usr/share/${P}/refind/refind.conf-sample"
+   elog "${EROOT%}/usr/share/${P}/refind/refind.conf-sample"
else
if ! version_is_at_least "0.10.3" "${REPLACING_VERSIONS}"; then
elog "The new refind-mkdefault script requires 
>=dev-lang/python-3"



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2016-11-06 Thread Göktürk Yüksek
commit: 60da91883d6e820c0b6e6709d0b76d6e6d44fdde
Author: Stéphane Veyret  neptura  org>
AuthorDate: Sun Nov  6 15:47:46 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Sun Nov  6 16:23:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60da9188

sys-boot/refind: prevent from using user's CFLAGS for EFI compilation, bug 
#598587

Package-Manager: portage-2.3.0

 sys-boot/refind/refind-0.10.2-r2.ebuild | 166 ++
 sys-boot/refind/refind-0.10.3-r1.ebuild | 174 
 sys-boot/refind/refind-0.10.4-r1.ebuild | 174 
 3 files changed, 514 insertions(+)

diff --git a/sys-boot/refind/refind-0.10.2-r2.ebuild 
b/sys-boot/refind/refind-0.10.2-r2.ebuild
new file mode 100644
index ..1d50296
--- /dev/null
+++ b/sys-boot/refind/refind-0.10.2-r2.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="The rEFInd UEFI Boot Manager by Rod Smith"
+HOMEPAGE="http://www.rodsbooks.com/refind/";
+
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} -gnuefi doc -custom-cflags"
+
+DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+   !gnuefi? ( >=sys-boot/udk-2015 )"
+
+DOCS="NEWS.txt README.txt docs/refind docs/Styles"
+
+pkg_setup() {
+   if use x86 ; then
+   export EFIARCH=ia32
+   export BUILDARCH=ia32
+   elif use amd64; then
+   export EFIARCH=x64
+   export BUILDARCH=x86_64
+   else
+   # Try to support anyway
+   export BUILDARCH=$( uname -m | sed s,i[3456789]86,ia32, )
+   if [[ ${BUILDARCH} == "x86_64" ]] ; then
+   export EFIARCH=x64
+   else
+   export EFIARCH=${ARCH}
+   fi
+   fi
+}
+
+src_prepare() {
+   default
+   local f
+   for f in "${S}"/*/Make.tiano "${S}"/Make.common; do
+   sed -i -e 's/^\(include .*target.txt.*\)$/#\1/' \
+   -e 
's@^\(TIANO_INCLUDE_DIRS\s*=\s*-I\s*\).*$@\1/usr/include/udk \\@' \
+   -e '/^\s*-I \$(EDK2BASE).*$/d' \
+   "${f}" || die "Failed to patch Tianocore make file in" \
+   $(basename $(dirname ${f}))
+   done
+   for f in "${S}"/*/Make.tiano; do
+   sed -i -e 's@^\(EFILIB\s*=\s*\).*$@\1/usr/lib@' \
+   -e 's@\$(EFILIB).*/\([^/]*\).lib@-l\1@' \
+   -e 's/\(--start-group\s*\$(ALL_EFILIBS)\)/-L \$(EFILIB) 
\1/' \
+   "${f}" || die "Failed to patch Tianocore make file in" \
+   $(basename $(dirname ${f}))
+   done
+   sed -i -e '/Guids/i#include "AutoGen.h"\n' "${S}/filesystems/AutoGen.c" 
\
+   || die "Failed to patch AutoGen.c"
+   for f in "${S}"/*/AutoGen.c; do
+   cat >>"${f}" <<-EOF || die "Failed to patch AutoGen.c"
+
+   #define _PCD_TOKEN_PcdFixedDebugPrintErrorLevel  11U
+   #define _PCD_SIZE_PcdFixedDebugPrintErrorLevel 4
+   #define _PCD_GET_MODE_SIZE_PcdFixedDebugPrintErrorLevel 
 _PCD_SIZE_PcdFixedDebugPrintErrorLevel
+   #define _PCD_VALUE_PcdFixedDebugPrintErrorLevel  
0xU
+   GLOBAL_REMOVE_IF_UNREFERENCED const UINT32 
_gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel = 
_PCD_VALUE_PcdFixedDebugPrintErrorLevel;
+   extern const  UINT32  
_gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel;
+   #define _PCD_GET_MODE_32_PcdFixedDebugPrintErrorLevel  
_gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel
+   //#define _PCD_SET_MODE_32_PcdFixedDebugPrintErrorLevel 
 ASSERT(FALSE)  // It is not allowed to set value for a FIXED_AT_BUILD PCD
+   EOF
+   done
+}
+
+src_compile() {
+   # Prepare flags
+   local pecoff_header_size
+   [[ $EFIARCH == x64 ]] && pecoff_header_size='0x228' \
+   || pecoff_header_size='0x220'
+   local make_flags=(
+   ARCH="${BUILDARCH}"
+   GENFW="/usr/bin/GenFw"
+   CC="$(tc-getCC)"
+   AS="$(tc-getAS)"
+   LD="$(tc-getLD)"
+   AR="$(tc-getAR)"
+   RANLIB="$(tc-getRANLIB)"
+   OBJCOPY="$(tc-getOBJCOPY)"
+   GNUEFI_LDFLAGS="-T \$(GNUEFI_LDSCRIPT) -shared -nostdlib 
-Bsymbolic \
+   -L\$(EFILIB) -L\$(GNUEFILIB) \$(CRTOBJS) -znocombreloc 
-zdefs"
+   TIANO_LDSCRIPT="/usr/lib/GccBase.lds"
+   TIANO_LDFLAGS="-n -q --gc-sections -nostdlib \
+   

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2016-11-06 Thread Göktürk Yüksek
commit: 6122936ded63cb14471f0402aa75ad96405f7e04
Author: Stéphane Veyret  neptura  org>
AuthorDate: Sun Nov  6 15:33:15 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Sun Nov  6 16:23:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6122936d

sys-boot/refind: Put French first as temporary workaround, bug #599060

Portage local use flag creation is buggy and using the last seen language, so 
keep english last.

Package-Manager: portage-2.3.0

 sys-boot/refind/metadata.xml | 54 +---
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/sys-boot/refind/metadata.xml b/sys-boot/refind/metadata.xml
index 99f8fd6..3bcc447 100644
--- a/sys-boot/refind/metadata.xml
+++ b/sys-boot/refind/metadata.xml
@@ -13,6 +13,22 @@
proxy-ma...@gentoo.org
Proxy Maintainers

+   
+Un gestionnaire d'amorçage pour ordinateur EFI ou UEFI tel que tous les Macs
+contenant un processeur Intel et les PC récents (2011 et après). rEFInd affiche
+un menu d'amorçage montrant tous les gestionnaires d'amorçage sur les
+partitions EFI accessibles et optionnellement les partitions amorçable en BIOS
+sur Macs et les entrées BIOS sur les PC UEFI avec CSM. Les systèmes
+d'exploitation compatibles EFI, incluant Linux, fournissent des gestionnaires
+d'amorçage que rEFInd détecte et démarre. rEFInd peut démarrer les
+gestionnaires d'amorçage EFI Linux tel que ELILO, GRUB Legacy, GRUB 2 ainsi que
+les noyaux 3.3.0 et suivants avec le support EFI stub. Les pilotes EFI pour les
+sytèmes de fichiers ext2/3/4fs, ReiserFS, Btrfs, NTFS, HFS+ et ISO-9660
+permettent à rEFInd de lire les gestionnaires d'amorçage également depuis ces
+systèmes de fichiers. La capacité de rEFInd à détecter les gestionnaires
+d'amorçage au moment de l'exécution le rend très facile à utiliser, en
+particulier associé à des noyau Linux qui fournissent un support EFI stub.
+   

 A graphical boot manager for EFI- and UEFI-based computers, such as all
 Intel-based Macs and recent (most 2011 and later) PCs. rEFInd presents a
@@ -27,33 +43,6 @@ loaders from these filesystems, too. rEFInd's ability to 
detect boot
 loaders at runtime makes it very easy to use, particularly when paired with
 Linux kernels that provide EFI stub support.

-   
-Un gestionnaire d'amorçage pour ordinateur EFI ou UEFI tel que tous les Macs
-contenant un processeur Intel et les PC récents (2011 et après). rEFInd affiche
-un menu d'amorçage montrant tous les gestionnaires d'amorçage sur les
-partitions EFI accessibles et optionnellement les partitions démarrable en BIOS
-sur Macs et les entrées BIOS sur les PC UEFI avec CSM. Les systèmes
-d'exploitation compatibles EFI, incluant Linux, fournissent des gestionnaires
-d'amorçage que rEFInd détect et démarre. rEFInd peut démarrer les gestionnaires
-d'amorçage EFI Linux tel que ELILO, GRUB Legacy, GRUB 2 ainsi que les noyaux
-3.3.0 et suivants avec le support EFI stub. Les pilotes EFI pour les sytèmes de
-fichiers ext2/3/4fs, ReiserFS, Btrfs, NTFS, HFS+ et ISO-9660 permettent à
-rEFInd de lire les gestionnaires d'amorçage également depuis ces systèmes de
-fichiers. La capacité de rEFInd à détecter les gestionnaires d'amorçage au
-moment de l'exécution le rend très facile à utiliser, en particulier associé à
-des noyau Linux qui fournissent un support EFI stub.
-   
-   
-   Builds the EFI binary ext2 filesystem 
driver
-   Builds the EFI binary ext4 filesystem 
driver
-   Builds the EFI binary reiserfs filesystem 
driver
-   Builds the EFI binary iso9660 filesystem 
driver
-   Builds the EFI binary hfs filesystem 
driver
-   Builds the EFI binary btrfs filesystem 
driver
-   Builds the EFI binary ntfs filesystem 
driver
-   Compile using GNU-EFI instead of 
Tianocore
-   Install document files
-   

Construire le gestionnaire EFI pour le 
système de fichier ext2
Construire le gestionnaire EFI pour le 
système de fichier ext4
@@ -63,7 +52,16 @@ des noyau Linux qui fournissent un support EFI stub.
Construire le gestionnaire EFI pour le 
système de fichier btrfs
Construire le gestionnaire EFI pour le 
système de fichier ntfs
Compiler en utilisant GNU-EFI au lieu de 
Tianocore
-   Installer les fichiers de documentation
+   
+   
+   Builds the EFI binary ext2 filesystem 
driver
+   Builds the EFI binary ext4 filesystem 
driver
+   Builds the EFI binary reiserfs filesystem 
driver
+   Builds the EFI binary iso9660 filesystem 
driver
+   Builds the EFI binary hfs filesystem 
driver
+   Builds the EFI binary btrfs filesystem 
driver
+   Builds the EFI binary ntfs filesystem 
driver
+   

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2016-10-24 Thread Göktürk Yüksek
commit: c8d241849779484956fba16744a1df046ad05739
Author: Stéphane Veyret  neptura  org>
AuthorDate: Sat Aug 20 08:19:06 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Tue Oct 25 02:46:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d24184

sys-boot/refind: improve metadata

 sys-boot/refind/metadata.xml | 45 +++-
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/sys-boot/refind/metadata.xml b/sys-boot/refind/metadata.xml
index f9342b6..99f8fd6 100644
--- a/sys-boot/refind/metadata.xml
+++ b/sys-boot/refind/metadata.xml
@@ -1,4 +1,4 @@
-
+
 http://www.gentoo.org/dtd/metadata.dtd";>
 

@@ -6,16 +6,43 @@
Sam Jorna


-svey...@gmail.com
-Stephane Veyret
-   Proxy - Maintainer.CC on bugs
-
+   svey...@gmail.com
+   Stéphane Veyret
+   

-proxy-ma...@gentoo.org
-Proxy Maintainers
+   proxy-ma...@gentoo.org
+   Proxy Maintainers

-   EFI Boot Manager
-   Gestionnaire d'amorçage EFI
+   
+A graphical boot manager for EFI- and UEFI-based computers, such as all
+Intel-based Macs and recent (most 2011 and later) PCs. rEFInd presents a
+boot menu showing all the EFI boot loaders on the EFI-accessible
+partitions, and optionally BIOS-bootable partitions on Macs and BIOS boot
+entries on UEFI PCs with CSMs. EFI-compatbile OSes, including Linux,
+provide boot loaders that rEFInd can detect and launch. rEFInd can launch
+Linux EFI boot loaders such as ELILO, GRUB Legacy, GRUB 2, and 3.3.0 and
+later kernels with EFI stub support. EFI filesystem drivers for ext2/3/4fs,
+ReiserFS, Btrfs, NTFS, HFS+, and ISO-9660 enable rEFInd to read boot
+loaders from these filesystems, too. rEFInd's ability to detect boot
+loaders at runtime makes it very easy to use, particularly when paired with
+Linux kernels that provide EFI stub support.
+   
+   
+Un gestionnaire d'amorçage pour ordinateur EFI ou UEFI tel que tous les Macs
+contenant un processeur Intel et les PC récents (2011 et après). rEFInd affiche
+un menu d'amorçage montrant tous les gestionnaires d'amorçage sur les
+partitions EFI accessibles et optionnellement les partitions démarrable en BIOS
+sur Macs et les entrées BIOS sur les PC UEFI avec CSM. Les systèmes
+d'exploitation compatibles EFI, incluant Linux, fournissent des gestionnaires
+d'amorçage que rEFInd détect et démarre. rEFInd peut démarrer les gestionnaires
+d'amorçage EFI Linux tel que ELILO, GRUB Legacy, GRUB 2 ainsi que les noyaux
+3.3.0 et suivants avec le support EFI stub. Les pilotes EFI pour les sytèmes de
+fichiers ext2/3/4fs, ReiserFS, Btrfs, NTFS, HFS+ et ISO-9660 permettent à
+rEFInd de lire les gestionnaires d'amorçage également depuis ces systèmes de
+fichiers. La capacité de rEFInd à détecter les gestionnaires d'amorçage au
+moment de l'exécution le rend très facile à utiliser, en particulier associé à
+des noyau Linux qui fournissent un support EFI stub.
+   

Builds the EFI binary ext2 filesystem 
driver
Builds the EFI binary ext4 filesystem 
driver



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2016-10-24 Thread Göktürk Yüksek
commit: 431a8c34984840855a1a1ba023bfe77cb8c3694a
Author: Stéphane Veyret  neptura  org>
AuthorDate: Mon Oct 24 15:15:35 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Tue Oct 25 02:46:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=431a8c34

sys-boot/refind: version bump, bug #597812

 sys-boot/refind/Manifest |   1 +
 sys-boot/refind/refind-0.10.4.ebuild | 183 +++
 2 files changed, 184 insertions(+)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 566c555..497d93a 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,5 +1,6 @@
 DIST refind-src-0.10.0.tar.gz 3336917 SHA256 
845dc3a18d4c82c1e29d4dbef14a53f4de1401c5bb3ea10f3f39442efa870e2e SHA512 
111caea0c1dbd9dde50e7b3cf47c7ad0d5e7f3bec3bb784397171950865cffd8cf589c6a1b821fabd6ed4be191a322757bf94255bfd449ee4a647ad597c3d7ab
 WHIRLPOOL 
8e9070c89b83ff7e49b34c45f5f7d3ecd90824f8ba95eae4105636125500eafc29a7ae34a602cb268bd7bd4e90fe2a7e2a8bad4a9b68baa283a59d0a34ae1d1f
 DIST refind-src-0.10.2.tar.gz 2949593 SHA256 
ef6aa17e911ea899c0d5e9482bfe657bc63b425976b0e2f936e67cbec3f1c34c SHA512 
7f74109a2f2a8dd5889834c0d9cf9b186ed5487a737b442caed5ce2df06de13efc2553d264792e5f72e4bb281926a772aeca96187209d856a8b9abe9f831580c
 WHIRLPOOL 
224c168b1eb980c850b008f0a6e2148b8bbc0ed1d591c4bdfb1c182af9430e5eb9ac8a58ec8f83a50320d30a946b1feeda12eb02a36450e7912462c6058cc7fc
 DIST refind-src-0.10.3.tar.gz 3967340 SHA256 
652be9a25a026b4d4a6a3e73e8765fe31c948a88a2f413cde814815f93b858e4 SHA512 
2a2274f508c66fa62352b34daab7faf9c7ff33f197b0ec125c0d025ab7c0ecb3e4cc2925f5e6888f06dc3a4fb4008a353d8b59e96d0a047695b0efb989f9f72d
 WHIRLPOOL 
8a417cc1da124967618b379cb71737b83b9f4cfd3dd22f6896ed8720945c456b4785fe18fb2b51bb5b10c808e660341c2e86656195a24e5d39fcd13d24f97e8d
+DIST refind-src-0.10.4.tar.gz 3970380 SHA256 
c3e428b27a0d4c61ee052603aedea7118bf04a7917216b10bfde2a3d2a2442a5 SHA512 
a75a6210ee51427c474e69c2de8c719545b2599c19f1c7541048b77ab1996a0e4b4b5fd4840f6240cd6704e5f5338cbaff432d7dc5ec4042854e26d6df18bed5
 WHIRLPOOL 
a5d84831ea3c6282560fcc7491e7aabeb4a0598c34843a09b7baadf9398092a9495290180d05fbd935ad09207814a3fa4f72cfa3bf798f2422fecf07dc27037d
 DIST refind-src-0.9.0.zip 2939724 SHA256 
842a01d7964bc8c8000a66e6d08f6fadb4c257d251b1277cebff0bf731e024aa SHA512 
c49e3110e6b9f8d44dadae1ab828d3bf59bbce2da9170efed73db961135144ae9963b57d4cc39af2b15ecdf1f289359bda56c3d3e8f72d05be165ae5a3e2654d
 WHIRLPOOL 
225a6b84ea7044e8fe0bab5e268c8c46a4523ab6f408d1bb2a94adfe54afe80c9c83ec0dc104945b332ae6c375c9d041972dee39baa43665588eb0dfc1fe4362
 DIST refind-src-0.9.2.zip 2941986 SHA256 
9022da3d46493395c273e2d2fc555d1c786fb1b9c11b2912751a88fe3328212a SHA512 
6636cf02bb69ffe699d5f9717d09b80db0e4330aa52c14949e8612caed11f032370db17700c15d285173729271d2434fd0fbc39f5b445a3c05255ee14d125d47
 WHIRLPOOL 
2d81427bf6cc9cf021a4ffc7238bcf914e380fea091cbefaa601e391cf28f43f7c3ef1181744e4aab3d71d2535d88ba633b13cdae696f0baddd26d3c2511a88d

diff --git a/sys-boot/refind/refind-0.10.4.ebuild 
b/sys-boot/refind/refind-0.10.4.ebuild
new file mode 100644
index ..1ce9c8d
--- /dev/null
+++ b/sys-boot/refind/refind-0.10.4.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic versionator
+
+DESCRIPTION="The rEFInd UEFI Boot Manager by Rod Smith"
+HOMEPAGE="http://www.rodsbooks.com/refind/";
+
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} -gnuefi doc"
+
+DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+   !gnuefi? ( >=sys-boot/udk-2015 )"
+
+DOCS="NEWS.txt README.txt docs/refind docs/Styles"
+
+pkg_setup() {
+   if use x86 ; then
+   export EFIARCH=ia32
+   export BUILDARCH=ia32
+   elif use amd64; then
+   export EFIARCH=x64
+   export BUILDARCH=x86_64
+   else
+   # Try to support anyway
+   export BUILDARCH=$( uname -m | sed s,i[3456789]86,ia32, )
+   if [[ ${BUILDARCH} == "x86_64" ]] ; then
+   export EFIARCH=x64
+   else
+   export EFIARCH=${ARCH}
+   fi
+   fi
+}
+
+src_prepare() {
+   default
+   local f
+   for f in "${S}"/*/Make.tiano "${S}"/Make.common; do
+   sed -i -e 's/^\(include .*target.txt.*\)$/#\1/' \
+   -e 
's@^\(TIANO_INCLUDE_DIRS\s*=\s*-I\s*\).*$@\1/usr/include/udk \\@' \
+   -e '/^\s*-I \$(EDK2BASE).*$/d' \
+   "${f}" || die "Failed to patch Tianocore make file in" \
+   $(basename $(dirname ${f}))
+   done
+   for f in "${S}"/*/Make.tiano; do
+   sed -i -e 's@^\(EFILIB\s*=\s*\).*$@

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2016-10-24 Thread Göktürk Yüksek
commit: 1244bd61402c6de3d791eed2f018c906758c00fc
Author: Stéphane Veyret  neptura  org>
AuthorDate: Mon Oct 24 19:52:49 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Tue Oct 25 02:46:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1244bd61

sys-boot/refind: use flags and udk for rEFInd, bug #566930

This new release has 2 major changes:
* it is now using user defined flags, if possible,
* it is now able to compile against udk (default compilation).

 sys-boot/refind/metadata.xml|   2 +
 sys-boot/refind/refind-0.10.2-r1.ebuild | 175 
 2 files changed, 177 insertions(+)

diff --git a/sys-boot/refind/metadata.xml b/sys-boot/refind/metadata.xml
index a5bf904..f9342b6 100644
--- a/sys-boot/refind/metadata.xml
+++ b/sys-boot/refind/metadata.xml
@@ -24,6 +24,7 @@
Builds the EFI binary hfs filesystem 
driver
Builds the EFI binary btrfs filesystem 
driver
Builds the EFI binary ntfs filesystem 
driver
+   Compile using GNU-EFI instead of 
Tianocore
Install document files


@@ -34,6 +35,7 @@
Construire le gestionnaire EFI pour le système 
de fichier hfs
Construire le gestionnaire EFI pour le 
système de fichier btrfs
Construire le gestionnaire EFI pour le 
système de fichier ntfs
+   Compiler en utilisant GNU-EFI au lieu de 
Tianocore
Installer les fichiers de documentation



diff --git a/sys-boot/refind/refind-0.10.2-r1.ebuild 
b/sys-boot/refind/refind-0.10.2-r1.ebuild
new file mode 100644
index ..5ef91b1
--- /dev/null
+++ b/sys-boot/refind/refind-0.10.2-r1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="The rEFInd UEFI Boot Manager by Rod Smith"
+HOMEPAGE="http://www.rodsbooks.com/refind/";
+
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} -gnuefi doc"
+
+DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+   !gnuefi? ( >=sys-boot/udk-2015 )"
+
+DOCS="NEWS.txt README.txt docs/refind docs/Styles"
+
+pkg_setup() {
+   if use x86 ; then
+   export EFIARCH=ia32
+   export BUILDARCH=ia32
+   elif use amd64; then
+   export EFIARCH=x64
+   export BUILDARCH=x86_64
+   else
+   # Try to support anyway
+   export BUILDARCH=$( uname -m | sed s,i[3456789]86,ia32, )
+   if [[ ${BUILDARCH} == "x86_64" ]] ; then
+   export EFIARCH=x64
+   else
+   export EFIARCH=${ARCH}
+   fi
+   fi
+}
+
+src_prepare() {
+   default
+   local f
+   for f in "${S}"/*/Make.tiano "${S}"/Make.common; do
+   sed -i -e 's/^\(include .*target.txt.*\)$/#\1/' \
+   -e 
's@^\(TIANO_INCLUDE_DIRS\s*=\s*-I\s*\).*$@\1/usr/include/udk \\@' \
+   -e '/^\s*-I \$(EDK2BASE).*$/d' \
+   "${f}" || die "Failed to patch Tianocore make file in" \
+   $(basename $(dirname ${f}))
+   done
+   for f in "${S}"/*/Make.tiano; do
+   sed -i -e 's@^\(EFILIB\s*=\s*\).*$@\1/usr/lib@' \
+   -e 's@\$(EFILIB).*/\([^/]*\).lib@-l\1@' \
+   -e 's/\(--start-group\s*\$(ALL_EFILIBS)\)/-L \$(EFILIB) 
\1/' \
+   "${f}" || die "Failed to patch Tianocore make file in" \
+   $(basename $(dirname ${f}))
+   done
+   sed -i -e '/Guids/i#include "AutoGen.h"\n' "${S}/filesystems/AutoGen.c" 
\
+   || die "Failed to patch AutoGen.c"
+   for f in "${S}"/*/AutoGen.c; do
+   cat >>"${f}" <<-EOF || die "Failed to patch AutoGen.c"
+
+   #define _PCD_TOKEN_PcdFixedDebugPrintErrorLevel  11U
+   #define _PCD_SIZE_PcdFixedDebugPrintErrorLevel 4
+   #define _PCD_GET_MODE_SIZE_PcdFixedDebugPrintErrorLevel 
 _PCD_SIZE_PcdFixedDebugPrintErrorLevel
+   #define _PCD_VALUE_PcdFixedDebugPrintErrorLevel  
0xU
+   GLOBAL_REMOVE_IF_UNREFERENCED const UINT32 
_gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel = 
_PCD_VALUE_PcdFixedDebugPrintErrorLevel;
+   extern const  UINT32  
_gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel;
+   #define _PCD_GET_MODE_32_PcdFixedDebugPrintErrorLevel  
_gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel
+   //#define _PCD_SET_MODE_32_PcdFixedDebugPrintErrorLevel 
 ASSERT(FALSE)  // It is not allowed to set value for a FI

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2016-10-24 Thread Göktürk Yüksek
commit: dbf034440f700f0978be911053efeda098e5d280
Author: Stéphane Veyret  neptura  org>
AuthorDate: Sun Jul 17 17:28:58 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Tue Oct 25 02:46:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbf03444

sys-boot/refind: version bump, bug #582716

 sys-boot/refind/Manifest |   1 +
 sys-boot/refind/refind-0.10.3.ebuild | 183 +++
 2 files changed, 184 insertions(+)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index a023872..566c555 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,4 +1,5 @@
 DIST refind-src-0.10.0.tar.gz 3336917 SHA256 
845dc3a18d4c82c1e29d4dbef14a53f4de1401c5bb3ea10f3f39442efa870e2e SHA512 
111caea0c1dbd9dde50e7b3cf47c7ad0d5e7f3bec3bb784397171950865cffd8cf589c6a1b821fabd6ed4be191a322757bf94255bfd449ee4a647ad597c3d7ab
 WHIRLPOOL 
8e9070c89b83ff7e49b34c45f5f7d3ecd90824f8ba95eae4105636125500eafc29a7ae34a602cb268bd7bd4e90fe2a7e2a8bad4a9b68baa283a59d0a34ae1d1f
 DIST refind-src-0.10.2.tar.gz 2949593 SHA256 
ef6aa17e911ea899c0d5e9482bfe657bc63b425976b0e2f936e67cbec3f1c34c SHA512 
7f74109a2f2a8dd5889834c0d9cf9b186ed5487a737b442caed5ce2df06de13efc2553d264792e5f72e4bb281926a772aeca96187209d856a8b9abe9f831580c
 WHIRLPOOL 
224c168b1eb980c850b008f0a6e2148b8bbc0ed1d591c4bdfb1c182af9430e5eb9ac8a58ec8f83a50320d30a946b1feeda12eb02a36450e7912462c6058cc7fc
+DIST refind-src-0.10.3.tar.gz 3967340 SHA256 
652be9a25a026b4d4a6a3e73e8765fe31c948a88a2f413cde814815f93b858e4 SHA512 
2a2274f508c66fa62352b34daab7faf9c7ff33f197b0ec125c0d025ab7c0ecb3e4cc2925f5e6888f06dc3a4fb4008a353d8b59e96d0a047695b0efb989f9f72d
 WHIRLPOOL 
8a417cc1da124967618b379cb71737b83b9f4cfd3dd22f6896ed8720945c456b4785fe18fb2b51bb5b10c808e660341c2e86656195a24e5d39fcd13d24f97e8d
 DIST refind-src-0.9.0.zip 2939724 SHA256 
842a01d7964bc8c8000a66e6d08f6fadb4c257d251b1277cebff0bf731e024aa SHA512 
c49e3110e6b9f8d44dadae1ab828d3bf59bbce2da9170efed73db961135144ae9963b57d4cc39af2b15ecdf1f289359bda56c3d3e8f72d05be165ae5a3e2654d
 WHIRLPOOL 
225a6b84ea7044e8fe0bab5e268c8c46a4523ab6f408d1bb2a94adfe54afe80c9c83ec0dc104945b332ae6c375c9d041972dee39baa43665588eb0dfc1fe4362
 DIST refind-src-0.9.2.zip 2941986 SHA256 
9022da3d46493395c273e2d2fc555d1c786fb1b9c11b2912751a88fe3328212a SHA512 
6636cf02bb69ffe699d5f9717d09b80db0e4330aa52c14949e8612caed11f032370db17700c15d285173729271d2434fd0fbc39f5b445a3c05255ee14d125d47
 WHIRLPOOL 
2d81427bf6cc9cf021a4ffc7238bcf914e380fea091cbefaa601e391cf28f43f7c3ef1181744e4aab3d71d2535d88ba633b13cdae696f0baddd26d3c2511a88d

diff --git a/sys-boot/refind/refind-0.10.3.ebuild 
b/sys-boot/refind/refind-0.10.3.ebuild
new file mode 100644
index ..1ce9c8d
--- /dev/null
+++ b/sys-boot/refind/refind-0.10.3.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic versionator
+
+DESCRIPTION="The rEFInd UEFI Boot Manager by Rod Smith"
+HOMEPAGE="http://www.rodsbooks.com/refind/";
+
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} -gnuefi doc"
+
+DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+   !gnuefi? ( >=sys-boot/udk-2015 )"
+
+DOCS="NEWS.txt README.txt docs/refind docs/Styles"
+
+pkg_setup() {
+   if use x86 ; then
+   export EFIARCH=ia32
+   export BUILDARCH=ia32
+   elif use amd64; then
+   export EFIARCH=x64
+   export BUILDARCH=x86_64
+   else
+   # Try to support anyway
+   export BUILDARCH=$( uname -m | sed s,i[3456789]86,ia32, )
+   if [[ ${BUILDARCH} == "x86_64" ]] ; then
+   export EFIARCH=x64
+   else
+   export EFIARCH=${ARCH}
+   fi
+   fi
+}
+
+src_prepare() {
+   default
+   local f
+   for f in "${S}"/*/Make.tiano "${S}"/Make.common; do
+   sed -i -e 's/^\(include .*target.txt.*\)$/#\1/' \
+   -e 
's@^\(TIANO_INCLUDE_DIRS\s*=\s*-I\s*\).*$@\1/usr/include/udk \\@' \
+   -e '/^\s*-I \$(EDK2BASE).*$/d' \
+   "${f}" || die "Failed to patch Tianocore make file in" \
+   $(basename $(dirname ${f}))
+   done
+   for f in "${S}"/*/Make.tiano; do
+   sed -i -e 's@^\(EFILIB\s*=\s*\).*$@\1/usr/lib@' \
+   -e 's@\$(EFILIB).*/\([^/]*\).lib@-l\1@' \
+   -e 's/\(--start-group\s*\$(ALL_EFILIBS)\)/-L \$(EFILIB) 
\1/' \
+   "${f}" || die "Failed to patch Tianocore make file in" \
+   $(basename $(dirname ${f}))
+   done
+   sed -i -e '/Guids/i#include "AutoGen.h"\n' "${S}/filesystems/AutoGe

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2016-03-15 Thread Sam Jorna
commit: b4a6925bdf241cfb20e5272835598efbaaac96d4
Author: Sam Jorna  gentoo  org>
AuthorDate: Tue Mar 15 08:46:21 2016 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Tue Mar 15 08:53:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4a6925b

sys-boot/refind: bump to 0.10.2

Gentoo-bug: 569806
Package-Manager: portage-2.2.28

 sys-boot/refind/Manifest |   1 +
 sys-boot/refind/refind-0.10.2.ebuild | 106 +++
 2 files changed, 107 insertions(+)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index c65dff5..a023872 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,3 +1,4 @@
 DIST refind-src-0.10.0.tar.gz 3336917 SHA256 
845dc3a18d4c82c1e29d4dbef14a53f4de1401c5bb3ea10f3f39442efa870e2e SHA512 
111caea0c1dbd9dde50e7b3cf47c7ad0d5e7f3bec3bb784397171950865cffd8cf589c6a1b821fabd6ed4be191a322757bf94255bfd449ee4a647ad597c3d7ab
 WHIRLPOOL 
8e9070c89b83ff7e49b34c45f5f7d3ecd90824f8ba95eae4105636125500eafc29a7ae34a602cb268bd7bd4e90fe2a7e2a8bad4a9b68baa283a59d0a34ae1d1f
+DIST refind-src-0.10.2.tar.gz 2949593 SHA256 
ef6aa17e911ea899c0d5e9482bfe657bc63b425976b0e2f936e67cbec3f1c34c SHA512 
7f74109a2f2a8dd5889834c0d9cf9b186ed5487a737b442caed5ce2df06de13efc2553d264792e5f72e4bb281926a772aeca96187209d856a8b9abe9f831580c
 WHIRLPOOL 
224c168b1eb980c850b008f0a6e2148b8bbc0ed1d591c4bdfb1c182af9430e5eb9ac8a58ec8f83a50320d30a946b1feeda12eb02a36450e7912462c6058cc7fc
 DIST refind-src-0.9.0.zip 2939724 SHA256 
842a01d7964bc8c8000a66e6d08f6fadb4c257d251b1277cebff0bf731e024aa SHA512 
c49e3110e6b9f8d44dadae1ab828d3bf59bbce2da9170efed73db961135144ae9963b57d4cc39af2b15ecdf1f289359bda56c3d3e8f72d05be165ae5a3e2654d
 WHIRLPOOL 
225a6b84ea7044e8fe0bab5e268c8c46a4523ab6f408d1bb2a94adfe54afe80c9c83ec0dc104945b332ae6c375c9d041972dee39baa43665588eb0dfc1fe4362
 DIST refind-src-0.9.2.zip 2941986 SHA256 
9022da3d46493395c273e2d2fc555d1c786fb1b9c11b2912751a88fe3328212a SHA512 
6636cf02bb69ffe699d5f9717d09b80db0e4330aa52c14949e8612caed11f032370db17700c15d285173729271d2434fd0fbc39f5b445a3c05255ee14d125d47
 WHIRLPOOL 
2d81427bf6cc9cf021a4ffc7238bcf914e380fea091cbefaa601e391cf28f43f7c3ef1181744e4aab3d71d2535d88ba633b13cdae696f0baddd26d3c2511a88d

diff --git a/sys-boot/refind/refind-0.10.2.ebuild 
b/sys-boot/refind/refind-0.10.2.ebuild
new file mode 100644
index 000..db4455b
--- /dev/null
+++ b/sys-boot/refind/refind-0.10.2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="The rEFInd UEFI Boot Manager by Rod Smith"
+HOMEPAGE="http://www.rodsbooks.com/refind/";
+
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} doc"
+
+DEPEND=">=sys-boot/gnu-efi-3.0.2"
+
+DOCS="NEWS.txt README.txt docs/refind docs/Styles"
+
+pkg_setup() {
+   if use x86 ; then
+   export EFIARCH=ia32
+   export BUILDARCH=ia32
+   elif use amd64; then
+   export EFIARCH=x64
+   export BUILDARCH=x86_64
+   else
+   # Try to support anyway
+   export BUILDARCH=$( uname -m | sed s,i[3456789]86,ia32, )
+   if [[ ${BUILDARCH} == "x86_64" ]] ; then
+   export EFIARCH=x64
+   else
+   export EFIARCH=${ARCH}
+   fi
+   fi
+}
+
+src_compile() {
+   # Make main EFI
+   all_target=gnuefi
+   emake ARCH=${BUILDARCH} ${all_target}
+
+   # Make filesystem drivers
+   export gnuefi_target="_gnuefi"
+   for fs in ${FS_USE}; do
+   fs=${fs#+}
+   if use "${fs}"; then
+   einfo "Building ${fs} filesystem driver"
+   rm -f "${S}/filesystems/fsw_efi.o"
+   emake -C "${S}/filesystems" ARCH=${BUILDARCH} 
${fs}${gnuefi_target}
+   fi
+   done
+}
+
+src_install() {
+   exeinto "/usr/share/${P}"
+   doexe refind-install
+   dosym "/usr/share/${P}/refind-install" "/usr/sbin/refind-install"
+
+   dodoc "${S}"/{COPYING.txt,LICENSE.txt,CREDITS.txt}
+   if use doc; then
+   doman "${S}/docs/man/"*
+   dodoc -r ${DOCS}
+   fi
+
+   insinto "/usr/share/${P}/refind"
+   doins "${S}/refind/refind_${EFIARCH}.efi"
+   doins "${S}/refind.conf-sample"
+   doins -r images icons fonts banners
+
+   if [[ -d "${S}/drivers_${EFIARCH}" ]]; then
+   doins -r "${S}/drivers_${EFIARCH}"
+   fi
+
+   insinto "/usr/share/${P}/refind/tools_${EFIARCH}"
+   doins "${S}/gptsync/gptsync_${EFIARCH}.efi"
+
+   insinto "/etc/refind.d"
+   doins -r "${S}/keys"
+
+   dosbin "${S}/mkrlconf"
+   dosbin "${S}/mvrefind"
+}
+
+pkg_postinst(

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2016-03-14 Thread Sam Jorna
commit: 8cd364a8f3b411654a5d551540902a34c7f8caeb
Author: Sam Jorna  gentoo  org>
AuthorDate: Mon Mar 14 23:28:07 2016 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Mon Mar 14 23:28:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cd364a8

sys-boot/refind: update metadata

Package-Manager: portage-2.2.28

 sys-boot/refind/metadata.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys-boot/refind/metadata.xml b/sys-boot/refind/metadata.xml
index 8a2da9e..a5bf904 100644
--- a/sys-boot/refind/metadata.xml
+++ b/sys-boot/refind/metadata.xml
@@ -2,9 +2,8 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 

-   wra...@wraeth.id.au
+   wra...@gentoo.org
Sam Jorna
-   Proxy - Maintainer. Assign bugs to 
him


 svey...@gmail.com



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/, sys-boot/refind/files/

2015-11-21 Thread Amy Winston
commit: c234da4aefefbd328315e5b3ed8b65450e378cf3
Author: Amy Winston  gentoo  org>
AuthorDate: Sat Nov 21 16:39:43 2015 +
Commit: Amy Winston  gentoo  org>
CommitDate: Sat Nov 21 16:39:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c234da4a

sys-boot/refind: version bump bug #566056 add sveyret to maintainers. By 
sveyret.

Package-Manager: portage-2.2.20.1

 sys-boot/refind/Manifest   |   1 +
 .../files/0.10.0-refind-install-symlink.patch  |  19 
 sys-boot/refind/metadata.xml   |  23 -
 sys-boot/refind/refind-0.10.0.ebuild   | 108 +
 4 files changed, 148 insertions(+), 3 deletions(-)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 01fdfe6..c65dff5 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,2 +1,3 @@
+DIST refind-src-0.10.0.tar.gz 3336917 SHA256 
845dc3a18d4c82c1e29d4dbef14a53f4de1401c5bb3ea10f3f39442efa870e2e SHA512 
111caea0c1dbd9dde50e7b3cf47c7ad0d5e7f3bec3bb784397171950865cffd8cf589c6a1b821fabd6ed4be191a322757bf94255bfd449ee4a647ad597c3d7ab
 WHIRLPOOL 
8e9070c89b83ff7e49b34c45f5f7d3ecd90824f8ba95eae4105636125500eafc29a7ae34a602cb268bd7bd4e90fe2a7e2a8bad4a9b68baa283a59d0a34ae1d1f
 DIST refind-src-0.9.0.zip 2939724 SHA256 
842a01d7964bc8c8000a66e6d08f6fadb4c257d251b1277cebff0bf731e024aa SHA512 
c49e3110e6b9f8d44dadae1ab828d3bf59bbce2da9170efed73db961135144ae9963b57d4cc39af2b15ecdf1f289359bda56c3d3e8f72d05be165ae5a3e2654d
 WHIRLPOOL 
225a6b84ea7044e8fe0bab5e268c8c46a4523ab6f408d1bb2a94adfe54afe80c9c83ec0dc104945b332ae6c375c9d041972dee39baa43665588eb0dfc1fe4362
 DIST refind-src-0.9.2.zip 2941986 SHA256 
9022da3d46493395c273e2d2fc555d1c786fb1b9c11b2912751a88fe3328212a SHA512 
6636cf02bb69ffe699d5f9717d09b80db0e4330aa52c14949e8612caed11f032370db17700c15d285173729271d2434fd0fbc39f5b445a3c05255ee14d125d47
 WHIRLPOOL 
2d81427bf6cc9cf021a4ffc7238bcf914e380fea091cbefaa601e391cf28f43f7c3ef1181744e4aab3d71d2535d88ba633b13cdae696f0baddd26d3c2511a88d

diff --git a/sys-boot/refind/files/0.10.0-refind-install-symlink.patch 
b/sys-boot/refind/files/0.10.0-refind-install-symlink.patch
new file mode 100644
index 000..868bc86
--- /dev/null
+++ b/sys-boot/refind/files/0.10.0-refind-install-symlink.patch
@@ -0,0 +1,19 @@
+diff --git a/refind-install b/refind-install
+index 0f4accd..07f2b35 100755
+--- a/refind-install
 b/refind-install
+@@ -1168,7 +1168,13 @@ InstallOnLinux() {
+ # install under OS X or Linux, depending on the detected platform.
+ #
+ GetParams "$@"
+-ThisDir="$( cd -P "${BASH_SOURCE%/*}" && pwd )"
++ThisScript="${BASH_SOURCE[0]}"
++while [ -h "$ThisScript" ]; do
++   ThisDir="$( cd -P "$( dirname "$ThisScript" )" && pwd )"
++   ThisScript="$(readlink "$ThisScript")"
++   [[ $ThisScript != /* ]] && ThisScript="$ThisDir/$ThisScript"
++done
++ThisDir="$( cd -P "$( dirname "$ThisScript" )" && pwd )"
+ RefindDir="$ThisDir/refind"
+ if [[ $UID != 0 ]] ; then
+echo "Not running as root; attempting to elevate privileges via sudo"

diff --git a/sys-boot/refind/metadata.xml b/sys-boot/refind/metadata.xml
index dc440c1..2f602d1 100644
--- a/sys-boot/refind/metadata.xml
+++ b/sys-boot/refind/metadata.xml
@@ -7,15 +7,32 @@
Sam Jorna
Proxy - Maintainer. Assign bugs to 
him

-   EFI Boot Manager
-   
+   
+svey...@gmail.com
+Stephane Veyret
+   Proxy - Maintainer.CC on bugs
+
+   EFI Boot Manager
+   Gestionnaire d'amorçage EFI
+   
Builds the EFI binary ext2 filesystem 
driver
Builds the EFI binary ext4 filesystem 
driver
Builds the EFI binary reiserfs filesystem 
driver
Builds the EFI binary iso9660 filesystem 
driver
Builds the EFI binary hfs filesystem 
driver
-Builds the EFI binary btrfs filesystem 
driver
+   Builds the EFI binary btrfs filesystem 
driver
Builds the EFI binary ntfs filesystem 
driver
+   Install document files
+   
+   
+   Construire le gestionnaire EFI pour le 
système de fichier ext2
+   Construire le gestionnaire EFI pour le 
système de fichier ext4
+   Construire le gestionnaire EFI pour le 
système de fichier reiserfs
+   Construire le gestionnaire EFI pour le 
système de fichier iso9660
+   Construire le gestionnaire EFI pour le système 
de fichier hfs
+   Construire le gestionnaire EFI pour le 
système de fichier btrfs
+   Construire le gestionnaire EFI pour le 
système de fichier ntfs
+   Installer les fichiers de documentation


refind

diff --git a/sys-boot/refind/refind-0.10.0.ebuild 
b/sys-boot/refind/refind-0.10.0.ebuild
new file mode 100644
index 000..21a6b01
--- /dev/null
+++ b/sys-boot/refind/r

[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2015-09-20 Thread Ian Delaney
commit: 7cf329c650af9be1178a6df6f950a9e64aebea69
Author: Ian Delaney  gentoo  org>
AuthorDate: Mon Sep 21 03:53:38 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Mon Sep 21 03:53:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cf329c6

sys-boot/refind: bump to -0.9.2, ebuild a live / versioned combo

sourced fron, and closes, bug #560962

Package-Manager: portage-2.2.20.1

 sys-boot/refind/Manifest|   1 +
 sys-boot/refind/refind-0.9.2.ebuild | 101 
 2 files changed, 102 insertions(+)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index d2c33c7..01fdfe6 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1 +1,2 @@
 DIST refind-src-0.9.0.zip 2939724 SHA256 
842a01d7964bc8c8000a66e6d08f6fadb4c257d251b1277cebff0bf731e024aa SHA512 
c49e3110e6b9f8d44dadae1ab828d3bf59bbce2da9170efed73db961135144ae9963b57d4cc39af2b15ecdf1f289359bda56c3d3e8f72d05be165ae5a3e2654d
 WHIRLPOOL 
225a6b84ea7044e8fe0bab5e268c8c46a4523ab6f408d1bb2a94adfe54afe80c9c83ec0dc104945b332ae6c375c9d041972dee39baa43665588eb0dfc1fe4362
+DIST refind-src-0.9.2.zip 2941986 SHA256 
9022da3d46493395c273e2d2fc555d1c786fb1b9c11b2912751a88fe3328212a SHA512 
6636cf02bb69ffe699d5f9717d09b80db0e4330aa52c14949e8612caed11f032370db17700c15d285173729271d2434fd0fbc39f5b445a3c05255ee14d125d47
 WHIRLPOOL 
2d81427bf6cc9cf021a4ffc7238bcf914e380fea091cbefaa601e391cf28f43f7c3ef1181744e4aab3d71d2535d88ba633b13cdae696f0baddd26d3c2511a88d

diff --git a/sys-boot/refind/refind-0.9.2.ebuild 
b/sys-boot/refind/refind-0.9.2.ebuild
new file mode 100644
index 000..7520444
--- /dev/null
+++ b/sys-boot/refind/refind-0.9.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="git://git.code.sf.net/p/refind/code"
+else
+   SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"
+   KEYWORDS="~x86 ~amd64"
+fi
+
+DESCRIPTION="The rEFInd UEFI Boot Manager by Rod Smith"
+HOMEPAGE="http://www.rodsbooks.com/refind/index.html";
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+
+DOCS="NEWS.txt README.txt docs/refind docs/Styles"
+
+DEPEND=">=sys-boot/gnu-efi-3.0u"
+
+src_prepare() {
+   # bug 560280: Relocate the install location of refind.conf-sample
+   local oldstring="\$RefindDir\/refind.conf-sample"
+   local newstring="\/usr\/share\/doc\/${PF}\/refind.conf-sample"
+   sed -e "s/$oldstring/$newstring/" -i install.sh || die
+
+   epatch_user
+}
+
+src_compile() {
+   emake gnuefi
+
+   pushd "${S}/filesystems" > /dev/null
+   for fs in ${IUSE}; do
+   fs=${fs#+}
+   if use "${fs}"; then
+   einfo "Building ${fs} filesystem driver"
+   rm -f fsw_efi.o
+
+   # ARCH detection in the Makefile not working
+   use x86 && buildarch=ia32
+   use amd64 && buildarch=x86_64
+   emake DRIVERNAME=${fs} ARCH=${buildarch} -f Make.gnuefi
+   fi
+   done
+   popd > /dev/null
+}
+
+src_install() {
+   exeinto "/usr/share/${P}"
+   doexe install.sh
+
+   dodoc -r ${DOCS}
+
+   dodoc refind.conf-sample
+   docompress -x /usr/share/doc/${PF}/refind.conf-sample
+
+   insinto "/usr/share/${P}/refind"
+   use x86 && doins refind/refind_ia32.efi
+   use amd64 && doins refind/refind_x64.efi
+
+   use x86 && filearch=ia32
+   use amd64 && filearch=x64
+   insinto "/usr/share/${P}/refind/drivers_${filearch}"
+   for fs in ${IUSE}; do
+   fs=${fs#+}
+   if use "${fs}"; then
+   doins "drivers_${filearch}/${fs}_${filearch}.efi"
+   fi
+   done
+
+   insinto "/usr/share/${P}/refind"
+   doins -r images icons fonts banners
+
+   insinto "/usr/share/${P}/keys"
+   doins keys/*
+}
+
+pkg_postinst() {
+   elog "EFI executables have been built and installed into 
/usr/share/${P}"
+   elog "You will need to use the provided install script 'install.sh' or"
+   elog "manually install the binaries into your EFI System Partition"
+   if [[ -z "${REPLACING_VERSIONS}" ]]; then
+   elog ""
+   elog "For key generation and binary signing for use with 
SecureBoot, the"
+   elog "package app-crypt/sbsigntool can be installed"
+   elog ""
+   elog "A sample configration can be found at"
+   elog "/usr/share/doc/${PF}/refind.conf-sample"
+   else
+   ewarn "Note that this will not update any EFI binaries on your 
EFI"
+   ewarn "System Partition - this needs to be done manually."
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2015-09-17 Thread Ian Delaney
commit: 38e32a781985174b5a8d095086f9e3ed1e4bd59a
Author: Ian Delaney  gentoo  org>
AuthorDate: Thu Sep 17 14:45:56 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Thu Sep 17 14:45:56 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38e32a78

sys-boot/refind: revbump to -0.9.0-r1

patch to ebuild sourced from bug #560280, rm inital ebuild

Package-Manager: portage-2.2.20.1

 .../{refind-0.9.0.ebuild => refind-0.9.0-r1.ebuild}| 18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/sys-boot/refind/refind-0.9.0.ebuild 
b/sys-boot/refind/refind-0.9.0-r1.ebuild
similarity index 79%
rename from sys-boot/refind/refind-0.9.0.ebuild
rename to sys-boot/refind/refind-0.9.0-r1.ebuild
index d3b517b..9f616d5 100644
--- a/sys-boot/refind/refind-0.9.0.ebuild
+++ b/sys-boot/refind/refind-0.9.0-r1.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=5
 
+inherit eutils
+
 DESCRIPTION="The rEFInd UEFI Boot Manager by Rod Smith"
 HOMEPAGE="http://www.rodsbooks.com/refind/index.html";
 SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"
@@ -13,11 +15,20 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 
-DOCS="NEWS.txt README.txt refind.conf-sample docs/refind docs/Styles"
+DOCS="NEWS.txt README.txt docs/refind docs/Styles"
 
 DEPEND=">=sys-boot/gnu-efi-3.0u"
 RDEPEND=""
 
+src_prepare() {
+   # bug 560280: Relocate the install location of refind.conf-sample
+   local oldstring="\$RefindDir\/refind.conf-sample"
+   local newstring="\/usr\/share\/doc\/${PF}\/refind.conf-sample"
+   sed -e "s/$oldstring/$newstring/" -i install.sh || die
+
+   epatch_user
+}
+
 src_compile() {
emake gnuefi
 
@@ -43,6 +54,9 @@ src_install() {
 
dodoc -r ${DOCS}
 
+   dodoc refind.conf-sample
+   docompress -x /usr/share/doc/${PF}/refind.conf-sample
+
insinto "/usr/share/${P}/refind"
use x86 && doins refind/refind_ia32.efi
use amd64 && doins refind/refind_x64.efi
@@ -74,6 +88,6 @@ pkg_postinst() {
einfo "package app-crypt/sbsigntool can be installed"
einfo ""
einfo "A sample configration can be found at"
-   einfo "/usr/share/doc/${P}/refind.conf-sample.bz2"
+   einfo "/usr/share/doc/${PF}/refind.conf-sample"
einfo ""
 }



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2015-08-25 Thread Ian Delaney
commit: 1c5ce3b9f9d90010f9941cabfaafdbdb6f9e72ad
Author: Ian Delaney  gentoo  org>
AuthorDate: Wed Aug 26 05:14:48 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Wed Aug 26 05:14:48 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c5ce3b9

sys-boot/refind: substitute with final ebuild, rm bogus file

Package-Manager: portage-2.2.20

 sys-boot/refind/refind-0.9.0.ebuild | 31 +--
 sys-boot/refind/thiisthing  |  0
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/sys-boot/refind/refind-0.9.0.ebuild 
b/sys-boot/refind/refind-0.9.0.ebuild
index 2b763a7..d3b517b 100644
--- a/sys-boot/refind/refind-0.9.0.ebuild
+++ b/sys-boot/refind/refind-0.9.0.ebuild
@@ -13,26 +13,28 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 
-DOCS="BUILDING.txt NEWS.txt README.txt refind.conf-sample {refind,Styles}"
+DOCS="NEWS.txt README.txt refind.conf-sample docs/refind docs/Styles"
 
 DEPEND=">=sys-boot/gnu-efi-3.0u"
 RDEPEND=""
 
 src_compile() {
-   emake gnuefi || die "Failed to build refind EFI binary"
+   emake gnuefi
 
-   cd "${S}/filesystems"
-   for fs in ext2 ext4 reiserfs iso9660 hfs btrfs ; do
-   if use "${fs}" ; then
+   pushd "${S}/filesystems" > /dev/null
+   for fs in ${IUSE}; do
+   fs=${fs#+}
+   if use "${fs}"; then
einfo "Building ${fs} filesystem driver"
rm -f fsw_efi.o
 
# ARCH detection in the Makefile not working
use x86 && buildarch=ia32
use amd64 && buildarch=x86_64
-   emake DRIVERNAME=${fs} ARCH=${buildarch} -f Make.gnuefi 
|| die "Failed building ${fs} filesystem EFI binary"
+   emake DRIVERNAME=${fs} ARCH=${buildarch} -f Make.gnuefi
fi
done
+   popd > /dev/null
 }
 
 src_install() {
@@ -48,14 +50,15 @@ src_install() {
use x86 && filearch=ia32
use amd64 && filearch=x64
insinto "/usr/share/${P}/refind/drivers_${filearch}"
-   for fs in ext2 ext4 reiserfs iso9660 hfs btrfs ; do
-   if use "${fs}" ; then doins 
"drivers_${filearch}/${fs}_${filearch}.efi" ; fi
+   for fs in ${IUSE}; do
+   fs=${fs#+}
+   if use "${fs}"; then
+   doins "drivers_${filearch}/${fs}_${filearch}.efi"
+   fi
done
 
-   for dir in images icons fonts banners ; do
-   insinto "/usr/share/${P}/refind/${dir}"
-   doins -r "${dir}"
-   done
+   insinto "/usr/share/${P}/refind"
+   doins -r images icons fonts banners
 
insinto "/usr/share/${P}/keys"
doins keys/*
@@ -65,10 +68,10 @@ pkg_postinst() {
einfo ""
einfo "EFI executables have been built and installed into 
/usr/share/${P}"
einfo "You will need to use the provided install script 'install.sh' or"
-   einfo "manually install the binaries into your EFI System Partition."
+   einfo "manually install the binaries into your EFI System Partition"
einfo ""
einfo "For key generation and binary signing for use with SecureBoot, 
the"
-   einfo "package app-crypt/sbsigntool can be installed."
+   einfo "package app-crypt/sbsigntool can be installed"
einfo ""
einfo "A sample configration can be found at"
einfo "/usr/share/doc/${P}/refind.conf-sample.bz2"

diff --git a/sys-boot/refind/thiisthing b/sys-boot/refind/thiisthing
deleted file mode 100644
index e69de29..000



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2015-08-25 Thread Ian Delaney
commit: 5ff4b13a46f5c8f2ea70aa227cb95b22b7a89d24
Author: Ian Delaney  gentoo  org>
AuthorDate: Wed Aug 26 03:44:16 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Wed Aug 26 03:46:03 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ff4b13a

sys-boot/refind: new package added by new proxy maintainer 'wraeth'

Source of ebuild and metadata from bug #435960, closes said bug.
Added under the proxy-maint herd.

Package-Manager: portage-2.2.20

 sys-boot/refind/Manifest|  1 +
 sys-boot/refind/metadata.xml| 20 ++
 sys-boot/refind/refind-0.9.0.ebuild | 76 +
 sys-boot/refind/thiisthing  |  0
 4 files changed, 97 insertions(+)

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
new file mode 100644
index 000..d2c33c7
--- /dev/null
+++ b/sys-boot/refind/Manifest
@@ -0,0 +1 @@
+DIST refind-src-0.9.0.zip 2939724 SHA256 
842a01d7964bc8c8000a66e6d08f6fadb4c257d251b1277cebff0bf731e024aa SHA512 
c49e3110e6b9f8d44dadae1ab828d3bf59bbce2da9170efed73db961135144ae9963b57d4cc39af2b15ecdf1f289359bda56c3d3e8f72d05be165ae5a3e2654d
 WHIRLPOOL 
225a6b84ea7044e8fe0bab5e268c8c46a4523ab6f408d1bb2a94adfe54afe80c9c83ec0dc104945b332ae6c375c9d041972dee39baa43665588eb0dfc1fe4362

diff --git a/sys-boot/refind/metadata.xml b/sys-boot/refind/metadata.xml
new file mode 100644
index 000..3af998e
--- /dev/null
+++ b/sys-boot/refind/metadata.xml
@@ -0,0 +1,20 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   proxy-maintainers
+   
+   wra...@wraeth.id.au
+   Sam Jorna
+   Proxy - Maintainer. Assign bugs to 
him
+   
+   EFI Boot Manager
+   
+   Builds the EFI binary ext2 filesystem 
driver
+   Builds the EFI binary ext4 filesystem 
driver
+   Builds the EFI binary reiserfs filesystem 
driver
+   Builds the EFI binary iso9660 filesystem 
driver
+   Builds the EFI binary hfs filesystem 
driver
+Builds the EFI binary btrfs filesystem 
driver
+   Builds the EFI binary ntfs filesystem 
driver
+   
+

diff --git a/sys-boot/refind/refind-0.9.0.ebuild 
b/sys-boot/refind/refind-0.9.0.ebuild
new file mode 100644
index 000..2b763a7
--- /dev/null
+++ b/sys-boot/refind/refind-0.9.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="The rEFInd UEFI Boot Manager by Rod Smith"
+HOMEPAGE="http://www.rodsbooks.com/refind/index.html";
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+
+DOCS="BUILDING.txt NEWS.txt README.txt refind.conf-sample {refind,Styles}"
+
+DEPEND=">=sys-boot/gnu-efi-3.0u"
+RDEPEND=""
+
+src_compile() {
+   emake gnuefi || die "Failed to build refind EFI binary"
+
+   cd "${S}/filesystems"
+   for fs in ext2 ext4 reiserfs iso9660 hfs btrfs ; do
+   if use "${fs}" ; then
+   einfo "Building ${fs} filesystem driver"
+   rm -f fsw_efi.o
+
+   # ARCH detection in the Makefile not working
+   use x86 && buildarch=ia32
+   use amd64 && buildarch=x86_64
+   emake DRIVERNAME=${fs} ARCH=${buildarch} -f Make.gnuefi 
|| die "Failed building ${fs} filesystem EFI binary"
+   fi
+   done
+}
+
+src_install() {
+   exeinto "/usr/share/${P}"
+   doexe install.sh
+
+   dodoc -r ${DOCS}
+
+   insinto "/usr/share/${P}/refind"
+   use x86 && doins refind/refind_ia32.efi
+   use amd64 && doins refind/refind_x64.efi
+
+   use x86 && filearch=ia32
+   use amd64 && filearch=x64
+   insinto "/usr/share/${P}/refind/drivers_${filearch}"
+   for fs in ext2 ext4 reiserfs iso9660 hfs btrfs ; do
+   if use "${fs}" ; then doins 
"drivers_${filearch}/${fs}_${filearch}.efi" ; fi
+   done
+
+   for dir in images icons fonts banners ; do
+   insinto "/usr/share/${P}/refind/${dir}"
+   doins -r "${dir}"
+   done
+
+   insinto "/usr/share/${P}/keys"
+   doins keys/*
+}
+
+pkg_postinst() {
+   einfo ""
+   einfo "EFI executables have been built and installed into 
/usr/share/${P}"
+   einfo "You will need to use the provided install script 'install.sh' or"
+   einfo "manually install the binaries into your EFI System Partition."
+   einfo ""
+   einfo "For key generation and binary signing for use with SecureBoot, 
the"
+   einfo "package app-crypt/sbsigntool can be installed."
+   einfo ""
+   einfo "A sample configration can be found at"
+   einfo "/usr/share/doc/${P}/refind.conf-sample.bz2"
+   einfo ""
+}

diff --git a/sys-boot/refind/thiisthing b/sys-boot/refind/th