From c85a90f90521c7e11d618b527d6630cc64cecbd4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 26 Dec 2017 20:10:49 +0000 Subject: gentoo resync : 26.12.2017 --- sys-boot/Manifest.gz | Bin 7391 -> 7395 bytes sys-boot/os-prober/Manifest | 5 +- .../os-prober/files/os-prober-1.76-exherbo.patch | 26 +++++++ sys-boot/os-prober/os-prober-1.74.ebuild | 76 ------------------ sys-boot/os-prober/os-prober-1.76-r1.ebuild | 86 +++++++++++++++++++++ sys-boot/os-prober/os-prober-1.76.ebuild | 74 ------------------ 6 files changed, 114 insertions(+), 153 deletions(-) create mode 100644 sys-boot/os-prober/files/os-prober-1.76-exherbo.patch delete mode 100644 sys-boot/os-prober/os-prober-1.74.ebuild create mode 100644 sys-boot/os-prober/os-prober-1.76-r1.ebuild delete mode 100644 sys-boot/os-prober/os-prober-1.76.ebuild (limited to 'sys-boot') diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz index 5ddcd03e968f..a2086b1de8d0 100644 Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest index 5769af2f870b..e266d7033c24 100644 --- a/sys-boot/os-prober/Manifest +++ b/sys-boot/os-prober/Manifest @@ -1,7 +1,6 @@ +AUX os-prober-1.76-exherbo.patch 905 BLAKE2B e8d78b730d33b5760128eaf910f20ac01dc7db3e2b3a271279859869e3c8451e7c8dd72ed5b2784a0dfbf3f31747a81509445d3793a8ed8070a1a721b1b84186 SHA512 0c3c2e4cde868e186131b08268e6344841f0830be5bf4131e5a7ded93a222097599b0a011168e4b7bd0bc97b69ece194df1d46d98eac2c921f16b3e76d004cc8 DIST os-prober_1.71.tar.xz 25540 BLAKE2B 8b55b763fd859cc0a62f10d919a7188eeadfedcbfa45738b25f74a1d4651d0e656ecadbc84b8fd7aad97e75179b64a51e58382f2c8c0bb36acf309fea724470c SHA512 adb7b8cf54c6169510c7ce2bf40e4b659c97eecfb7c1dd149269520ef13cdc2b6587f221fcfcb95c18caf9dba8144bbba561abb158e986ab02f4e0d338317d04 -DIST os-prober_1.74.tar.xz 26692 BLAKE2B a5bb0e9ac7ced7abac38fef863c7d08d9809894a1073b64f209e77ab9a61c33f97ecfbe87151bc7725a84bb99b44ac209b776be33fcd7c0aaec4f02e8da60d3f SHA512 5407fb3c782ae0532120995d60cfc307028de9bea52ce5534baaf940a99269b735c1174ef0f7a5316be485a1e8bfd097108c2819eadf00e2e38595bfc2c22245 DIST os-prober_1.76.tar.xz 26432 BLAKE2B edefc2be0bb51fff3cc0cd582c46a50871228b2c94312e50320e717b9f218854a0682d0b4e66b4bef6455751fcf016fa290ab03923d89acc6965bbc9efcbaafd SHA512 64800c99e0959a35edb639f50d2467453c6f6a7d7fa7a8d74141be36e0ade96ce4f874ba6376adfd663585ce9f47b99038dc00c2f722e6236344047567ed14f3 EBUILD os-prober-1.71.ebuild 1664 BLAKE2B 54a42c4f2d32d5d44c369399b1a6cbb756708ba8f5b3ae4ec6dd0100150daa82c4e2a0c9ab47fc9046d0978a97d6e546eb360978c7d4075513f19f00e55ed99e SHA512 4f9666eb808183ea87ab457951e027a93c5046eab878845477af9f3c45e30fc5f9cc047308183c8e3df15c5f4954f39363373a1a4c2d25dd53f94acbdde02d0f -EBUILD os-prober-1.74.ebuild 1686 BLAKE2B 390a23ada5c05808193cbb89c56563c631ce7239c2a404b4d3748313517aaa9f5876a4d4862fb5e788c562c4ee267387dc4c45c3cae46a294029f8925d26657d SHA512 161a90a532d3824786b647978ec3652e00beee6fe8e1ff53aac565c6f6f22e5a0233d85cdec1dc4d844e77715c9cf1c71c2dfd80d3e020750d34b8c2cd972b64 -EBUILD os-prober-1.76.ebuild 1666 BLAKE2B 4c6e63c3a340810e8553d0e5d5a6e032dac1e11cb59db4b55443ae810d94f3920f24ca24c2504c4822db81f5900e49d9525ef421e664f6ca6d990bf48db178b8 SHA512 c3425dd7423564f03dea7eff3bb9f259563d9b713033607eb6272a2db073cba56c087142b640bbcb1831df106b87bfba409e68a72c0be2536a481f44a1563284 +EBUILD os-prober-1.76-r1.ebuild 1834 BLAKE2B d09f2fc6dd5fca784c999f3963ad3a86fb99367f96a5d543589bcac43fbeca0bc0986387761f48ce837415a843c0dfaa092f0d39d79539062a0f27d446fc2e66 SHA512 1dd7dcee958fc00a514d1758683ada5373d51773baba22b6d9aa376f38cd99ca2ba905932602b9518a6a35d7b80dba237d890970f5cae86b45a0c2145c1e72aa MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 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 000000000000..6ef83dca223f --- /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 +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.74.ebuild b/sys-boot/os-prober/os-prober-1.74.ebuild deleted file mode 100644 index 38529501daa0..000000000000 --- a/sys-boot/os-prober/os-prober-1.74.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -#inherit eutils multilib toolchain-funcs -inherit toolchain-funcs - -DESCRIPTION="Utility to detect other OSs on a set of drives" -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" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -S=${WORKDIR}/${PN} - -# bug 594250 -QA_MULTILIB_PATHS="usr/lib/os-prober/.*" - -src_prepare() { - # use default GNU rules - rm Makefile || die 'rm Makefile failed' -} - -src_compile() { - tc-export CC - emake newns -} - -src_install() { - dobin os-prober linux-boot-prober - - # Note: as no shared libraries are installed, /usr/lib is correct - exeinto /usr/lib/os-prober - doexe newns - - insinto /usr/share/os-prober - doins common.sh - - keepdir /var/lib/os-prober - - local debarch=${ARCH%-*} dir - - case ${debarch} in - amd64) debarch=x86 ;; - ppc|ppc64) debarch=powerpc ;; - esac - - for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do - exeinto /usr/lib/$dir - doexe $dir/common/* - if [[ -d $dir/$debarch ]]; then - doexe $dir/$debarch/* - fi - if [[ -d $dir/$debarch/efi ]]; then - exeinto /usr/lib/$dir/efi - doexe $dir/$debarch/efi/* - fi - done - - if use amd64 || use x86; then - exeinto /usr/lib/os-probes/mounted - doexe os-probes/mounted/powerpc/20macosx - fi - - dodoc README TODO debian/changelog -} - -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" -} diff --git a/sys-boot/os-prober/os-prober-1.76-r1.ebuild b/sys-boot/os-prober/os-prober-1.76-r1.ebuild new file mode 100644 index 000000000000..1baceb5af895 --- /dev/null +++ b/sys-boot/os-prober/os-prober-1.76-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit readme.gentoo-r1 toolchain-funcs + +DESCRIPTION="Utility to detect other OSs on a set of drives" +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" +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 ) + +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() { + default + # use default GNU rules + rm Makefile || die 'rm Makefile failed' +} + +src_compile() { + tc-export CC + emake newns +} + +src_install() { + dobin os-prober linux-boot-prober + + # Note: as no shared libraries are installed, /usr/lib is correct + exeinto /usr/lib/os-prober + doexe newns + + insinto /usr/share/os-prober + doins common.sh + + keepdir /var/lib/os-prober + + local debarch=${ARCH%-*} dir + + case ${debarch} in + amd64) debarch=x86 ;; + ppc|ppc64) debarch=powerpc ;; + esac + + for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do + exeinto /usr/lib/$dir + doexe $dir/common/* + if [[ -d $dir/$debarch ]]; then + doexe $dir/$debarch/* + fi + if [[ -d $dir/$debarch/efi ]]; then + exeinto /usr/lib/$dir/efi + doexe $dir/$debarch/efi/* + fi + done + + if use amd64 || use x86; then + exeinto /usr/lib/os-probes/mounted + doexe os-probes/mounted/powerpc/20macosx + fi + + einstalldocs + dodoc debian/changelog + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/sys-boot/os-prober/os-prober-1.76.ebuild b/sys-boot/os-prober/os-prober-1.76.ebuild deleted file mode 100644 index 0fcffc882527..000000000000 --- a/sys-boot/os-prober/os-prober-1.76.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -#inherit eutils multilib toolchain-funcs -inherit toolchain-funcs - -DESCRIPTION="Utility to detect other OSs on a set of drives" -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" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -# bug 594250 -QA_MULTILIB_PATHS="usr/lib/os-prober/.*" - -src_prepare() { - # use default GNU rules - rm Makefile || die 'rm Makefile failed' -} - -src_compile() { - tc-export CC - emake newns -} - -src_install() { - dobin os-prober linux-boot-prober - - # Note: as no shared libraries are installed, /usr/lib is correct - exeinto /usr/lib/os-prober - doexe newns - - insinto /usr/share/os-prober - doins common.sh - - keepdir /var/lib/os-prober - - local debarch=${ARCH%-*} dir - - case ${debarch} in - amd64) debarch=x86 ;; - ppc|ppc64) debarch=powerpc ;; - esac - - for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do - exeinto /usr/lib/$dir - doexe $dir/common/* - if [[ -d $dir/$debarch ]]; then - doexe $dir/$debarch/* - fi - if [[ -d $dir/$debarch/efi ]]; then - exeinto /usr/lib/$dir/efi - doexe $dir/$debarch/efi/* - fi - done - - if use amd64 || use x86; then - exeinto /usr/lib/os-probes/mounted - doexe os-probes/mounted/powerpc/20macosx - fi - - dodoc README TODO debian/changelog -} - -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" -} -- cgit v1.2.3