diff options
| -rw-r--r-- | sys-boot/os-prober/Manifest | 2 | ||||
| -rw-r--r-- | sys-boot/os-prober/files/os-prober-1.76-exherbo.patch | 26 | ||||
| -rw-r--r-- | sys-boot/os-prober/os-prober-1.76-r2.ebuild (renamed from sys-boot/os-prober/os-prober-1.71-r1.ebuild) | 43 |
3 files changed, 53 insertions, 18 deletions
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest index 25dc49d4..6308e693 100644 --- a/sys-boot/os-prober/Manifest +++ b/sys-boot/os-prober/Manifest @@ -1 +1 @@ -DIST os-prober_1.71.tar.xz 25540 BLAKE2B 8b55b763fd859cc0a62f10d919a7188eeadfedcbfa45738b25f74a1d4651d0e656ecadbc84b8fd7aad97e75179b64a51e58382f2c8c0bb36acf309fea724470c SHA512 adb7b8cf54c6169510c7ce2bf40e4b659c97eecfb7c1dd149269520ef13cdc2b6587f221fcfcb95c18caf9dba8144bbba561abb158e986ab02f4e0d338317d04 +DIST os-prober_1.76.tar.xz 26432 BLAKE2B edefc2be0bb51fff3cc0cd582c46a50871228b2c94312e50320e717b9f218854a0682d0b4e66b4bef6455751fcf016fa290ab03923d89acc6965bbc9efcbaafd SHA512 64800c99e0959a35edb639f50d2467453c6f6a7d7fa7a8d74141be36e0ade96ce4f874ba6376adfd663585ce9f47b99038dc00c2f722e6236344047567ed14f3 diff --git a/sys-boot/os-prober/files/os-prober-1.76-exherbo.patch b/sys-boot/os-prober/files/os-prober-1.76-exherbo.patch new file mode 100644 index 00000000..6ef83dca --- /dev/null +++ b/sys-boot/os-prober/files/os-prober-1.76-exherbo.patch @@ -0,0 +1,26 @@ +From 09fefdb360b69c2de03a2f1c881db87f924d3c76 Mon Sep 17 00:00:00 2001 +From: Timo Gurr <timo.gurr@gmail.com> +Date: Mon, 20 Feb 2017 17:33:14 +0100 +Subject: [PATCH] Add Exherbo Linux detection + +--- + os-probes/mounted/common/90linux-distro | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/os-probes/mounted/common/90linux-distro b/os-probes/mounted/common/90linux-distro +index badfbb1..41a5553 100755 +--- a/os-probes/mounted/common/90linux-distro ++++ b/os-probes/mounted/common/90linux-distro +@@ -137,6 +137,9 @@ if (ls "$dir"/lib*/ld*.so* && [ -d "$dir/boot" ] || ls "$dir"/usr/lib*/ld*.so*) + elif [ -e "$dir/etc/devuan_version" ]; then + short="Devuan" + long="$(printf "Devuan GNU/Linux (%s)\n" "$(cat "$dir/etc/devuan_version")")" ++ elif [ -e "$dir/etc/exherbo-release" ]; then ++ short="Exherbo" ++ long="Exherbo Linux" + else + short="Linux" + long="unknown Linux distribution" +-- +2.11.1 + diff --git a/sys-boot/os-prober/os-prober-1.71-r1.ebuild b/sys-boot/os-prober/os-prober-1.76-r2.ebuild index b3751337..325adc46 100644 --- a/sys-boot/os-prober/os-prober-1.71-r1.ebuild +++ b/sys-boot/os-prober/os-prober-1.76-r2.ebuild @@ -1,14 +1,11 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 - -#inherit eutils multilib toolchain-funcs -inherit eutils toolchain-funcs +EAPI=6 +inherit readme.gentoo-r1 toolchain-funcs DESCRIPTION="Utility to detect other OSs on a set of drives" -HOMEPAGE="http://packages.debian.org/source/sid/os-prober" +HOMEPAGE="https://packages.debian.org/source/sid/os-prober" SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz" LICENSE="GPL-3" @@ -16,15 +13,26 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="" +# grub-mount needed per bug #607518 +RDEPEND="sys-boot/grub:2[mount]" +DEPEND="" + +# bug 594250 +QA_MULTILIB_PATHS="usr/lib/os-prober/.*" + +PATCHES=( "${FILESDIR}"/${PN}-1.76-exherbo.patch + "${FILESDIR}"/${PN}-redcore.patch ) + +DOC_CONTENTS=" + If you intend for os-prober to detect versions of Windows installed on + NTFS-formatted partitions, your system must be capable of reading the + NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g +" + src_prepare() { - epatch "${FILESDIR}"/${PN}-redcore.patch + default # use default GNU rules rm Makefile || die 'rm Makefile failed' - # Fix references to grub-mount - sed -i -e 's:grub-mount:grub2-mount:g' \ - common.sh \ - linux-boot-probes/common/50mounted-tests \ - os-probes/common/50mounted-tests } src_compile() { @@ -68,11 +76,12 @@ src_install() { doexe os-probes/mounted/powerpc/20macosx fi - dodoc README TODO debian/changelog + einstalldocs + dodoc debian/changelog + + readme.gentoo_create_doc } pkg_postinst() { - elog "If you intend for os-prober to detect versions of Windows installed on" - elog "NTFS-formatted partitions, your system must be capable of reading the" - elog "NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g" + readme.gentoo_print_elog } |