From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 88EB213989D for ; Wed, 26 Aug 2015 05:15:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5D081418A; Wed, 26 Aug 2015 05:15:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 476801418A for ; Wed, 26 Aug 2015 05:15:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DD571340A78 for ; Wed, 26 Aug 2015 05:15:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 61658162 for ; Wed, 26 Aug 2015 05:15:49 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1440566088.1c5ce3b9f9d90010f9941cabfaafdbdb6f9e72ad.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/refind/refind-0.9.0.ebuild sys-boot/refind/thiisthing X-VCS-Directories: sys-boot/refind/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: 1c5ce3b9f9d90010f9941cabfaafdbdb6f9e72ad X-VCS-Branch: master Date: Wed, 26 Aug 2015 05:15:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d58d5fc3-4ec0-4701-b643-8916312fd915 X-Archives-Hash: 1fcc0cddad101221de93295738729aaa commit: 1c5ce3b9f9d90010f9941cabfaafdbdb6f9e72ad Author: Ian Delaney gentoo org> AuthorDate: Wed Aug 26 05:14:48 2015 +0000 Commit: Ian Delaney gentoo org> CommitDate: Wed Aug 26 05:14:48 2015 +0000 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..0000000