os-prober done

8 files changed, 8 insertions, 348 deletions

diff --git a/sys-boot/os-prober/ChangeLog b/sys-boot/os-prober/ChangeLog
deleted file mode 100644
index 89695ba7..00000000
--- a/sys-boot/os-prober/ChangeLog
+++ /dev/null
@@ -1,104 +0,0 @@
-# ChangeLog for sys-boot/os-prober
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/os-prober/ChangeLog,v 1.21 2015/03/29 04:51:39 mrueg Exp $
-
-*os-prober-1.65 (29 Mar 2015)
-
-  29 Mar 2015; Manuel Rüger <mrueg@gentoo.org> +os-prober-1.65.ebuild,
-  -os-prober-1.56.ebuild, -os-prober-1.57.ebuild:
-  Version bump. Fixes bug #528038. Remove old.
-
-  27 Jul 2013; Jonathan Callen <jcallen@gentoo.org> metadata.xml:
-  Update metadata.xml to reflect new email address
-
-*os-prober-1.62 (18 Jul 2013)
-
-  18 Jul 2013;  <maks@gentoo.org> +os-prober-1.62.ebuild:
-  Bump to 1.62, adding support for EFI. Thanks to Ben Kohler, bug #477312.
-
-*os-prober-1.57-r1 (07 Apr 2013)
-
-  07 Apr 2013; Jonathan Callen <abcd@gentoo.org> +os-prober-1.57-r1.ebuild:
-  Replace calls to grub-mount with grub2-mount, as we rename it in Gentoo (to
-  allow parallel installation of grub:0)
-
-  17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
-  Add proxy-maintainers to metadata.xml
-
-*os-prober-1.57 (05 Jan 2013)
-
-  05 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> +os-prober-1.57.ebuild:
-  Version bump, wrt bug #415617
-
-*os-prober-1.56 (14 Oct 2012)
-
-  14 Oct 2012; Jonathan Callen <abcd@gentoo.org> +os-prober-1.56.ebuild:
-  Update to latest upstream, use upstream's installation directories
-
-*os-prober-1.53 (29 Jun 2012)
-
-  29 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> -os-prober-1.47.ebuild,
-  -os-prober-1.51.ebuild, +os-prober-1.53.ebuild:
-  Version bump to version from wheezy. Drop older and stable the
-  to-be-stable-debian version.
-
-*os-prober-1.51 (30 Mar 2012)
-
-  30 Mar 2012; Mike Gilbert <floppym@gentoo.org> +os-prober-1.51.ebuild:
-  Version bump.
-
-  14 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org> os-prober-1.47.ebuild:
-  Stable on amd64 and x86, works fine and usefull for grub2.
-
-  26 May 2011; Jonathan Callen <abcd@gentoo.org> os-prober-1.47.ebuild:
-  Fix unpacking (upstream changed the top-level dir *again*)
-
-*os-prober-1.47 (26 May 2011)
-
-  26 May 2011; Jonathan Callen <abcd@gentoo.org> -os-prober-1.46.ebuild,
-  +os-prober-1.47.ebuild:
-  Bump to new upstream version, remove old.
-
-  07 May 2011; Jonathan Callen <abcd@gentoo.org> os-prober-1.46.ebuild:
-  udev now installs to /lib/udev, so remove sed adjusting its path
-
-*os-prober-1.46 (05 May 2011)
-
-  05 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> -os-prober-1.35.ebuild,
-  -files/os-prober-1.35-multilib.patch, -os-prober-1.36.ebuild,
-  -os-prober-1.38.ebuild, -os-prober-1.39.ebuild, -os-prober-1.44.ebuild,
-  +os-prober-1.46.ebuild:
-  Version bump to latest. Drop older.
-
-  16 Apr 2011; Jonathan Callen <abcd@gentoo.org> os-prober-1.44.ebuild:
-  Fix build (upstream changed where the tarball unpacks)
-
-*os-prober-1.44 (16 Apr 2011)
-
-  16 Apr 2011; Jonathan Callen <abcd@gentoo.org> +os-prober-1.44.ebuild:
-  Version bump, bump EAPI
-
-*os-prober-1.39 (26 Jul 2010)
-
-  26 Jul 2010; Fabio Erculiani <lxnay@gentoo.org> +os-prober-1.39.ebuild:
-  Version bump
-
-*os-prober-1.38 (04 Jun 2010)
-
-  04 Jun 2010; Steve Dibb <beandog@gentoo.org> +os-prober-1.38.ebuild:
-  Version bump
-
-*os-prober-1.36 (06 Mar 2010)
-
-  06 Mar 2010; Jonathan Callen <abcd@gentoo.org> +os-prober-1.36.ebuild,
-  metadata.xml:
-  Version bump; update metadata.xml
-
-  15 Dec 2009; Jonathan Callen <abcd@gentoo.org> os-prober-1.35.ebuild:
-  Add elog about NTFS to postinst
-
-*os-prober-1.35 (15 Dec 2009)
-
-  15 Dec 2009; Jonathan Callen <abcd@gentoo.org> +os-prober-1.35.ebuild,
-  +files/os-prober-1.35-multilib.patch, +metadata.xml:
-  New ebuild. Thanks to Wizzelby <wizzleby@gmail.com> for initial ebuild.
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index a4a0a46a..a1c78b18 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,4 +1 @@
-DIST os-prober_1.53.tar.gz 26132 SHA256 58c47274b8e531fdc8b525fa5903885b92dbc3ee39bf13dd87e40336703a58c2 SHA512 4e983d6774cb85df9bec1e8e7ca53d9eec6605bf7308b141d1ee1f118b11534e440a19c0aae17c38f717f433c1ef853ad5879feac1ba4ee10774b3f85bb544ad WHIRLPOOL b555c053fd0d2b934c3e894971744f0a11298695730d8f5b4b344ad175938c8f4e877da20031d6c89ae6a286894f52d18b64b6a8f63136814019b73754298def
-DIST os-prober_1.57.tar.gz 26717 SHA256 d63c6cbb825a7e411aac5e4805edc6db2fbf77a59282b71c10bd29723b8d860c SHA512 b5c2af89e3a69688d3585ea52fd57e48fe85844a9ad5372735f57b9a780027e2f96cc86b1307be7e24b9e141ecea3d4c26316c0cc043eb7a97d24ee46bb07665 WHIRLPOOL 918015a67a3b6530788c093e866cfaa0ae0cd717f869677270b6c6f401d3c891378312f58c9e5f3ec9c22b566f09c33eeb3b0e71839b8a0ca47f530f900c974c
-DIST os-prober_1.62.tar.gz 28592 SHA256 5f25decfef22318c4c705594c9c2049e8d1e662fc8817a4a8e5b114cd26ee1c1 SHA512 6d888de867b5420767491ba66e3ebc0796320bfea5c7efc9a1eabf9bb8290b25e5292fc9b22ffc24101a9faf0e846c85fb1ba73fa1ec44a2c0c0c198c89ea49a WHIRLPOOL e98b54c769fa9a199b1f64b37ccca801499ed3e6e0dbe1189a63220cbbfdca1b1e8411a8d4b4cb6a15b48a83cde39c887288d2f40c3b69d276ddfdaf4e178b96
 DIST os-prober_1.65.tar.xz 24712 SHA256 c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84 SHA512 64dd9042a26dc859d9186bb48545d85b1a369d00a93b5045c420eac0c4b672ab32cb6028eada5f1cc21c8ab9386c35b8eedb79bc7975faf7b0a7b2841b284f53 WHIRLPOOL 397a92312b018fa08b2e838bc6b85fa4d55502dfb8e8725c79f4a0ae397e3bd258a7bb302f74b2293cd85f4ddabf4cba75ff2b4b57fa9904094c3a50e1ace36e
diff --git a/sys-boot/os-prober/files/os-prober-kogaion.patch b/sys-boot/os-prober/files/os-prober-redcore.patch
index b8466873..5ce141bd 100644
--- a/sys-boot/os-prober/files/os-prober-kogaion.patch
+++ b/sys-boot/os-prober/files/os-prober-redcore.patch
@@ -1,9 +1,13 @@
---- os-prober-1.53/os-probes/mounted/common/90linux-distro	2011-07-23 04:01:00.000000000 +0300
-+++ os-prober-1.53.new/os-probes/mounted/common/90linux-distro	2015-04-21 23:22:57.835424199 +0300
-@@ -85,6 +85,12 @@
+diff -Nur a/os-probes/mounted/common/90linux-distro b/os-probes/mounted/common/90linux-distro
+--- a/os-probes/mounted/common/90linux-distro	2014-09-28 22:04:17.000000000 +0100
++++ b/os-probes/mounted/common/90linux-distro	2016-11-06 12:16:59.285765508 +0000
+@@ -89,6 +89,15 @@
  	elif [ -e "$dir/etc/gentoo-release" ]; then
  		short="Gentoo"
  		long="$(cat "$dir/etc/gentoo-release")"
++	elif [ -e "$dir/etc/redcore-release" ]; then
++		short="Redcore"
++		long="$(cat "$dir/etc/redcore-release")"
 +	elif [ -e "$dir/etc/kogaion-release" ]; then
 +		short="Kogaion"
 +		long="$(cat "$dir/etc/kogaion-release")"
diff --git a/sys-boot/os-prober/metadata.xml b/sys-boot/os-prober/metadata.xml
deleted file mode 100644
index b61c946e..00000000
--- a/sys-boot/os-prober/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
-  <email>wizzleby@gmail.com</email>
-  <name>Locke Shinseiko</name>
-</maintainer>
-<maintainer>
-  <email>jcallen@gentoo.org</email>
-  <name>Jonathan Callen</name>
-  <description>Proxy maintainer (CC bugs)</description>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-boot/os-prober/os-prober-1.53.ebuild b/sys-boot/os-prober/os-prober-1.53.ebuild
deleted file mode 100644
index 9e6cf9d3..00000000
--- a/sys-boot/os-prober/os-prober-1.53.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/os-prober/os-prober-1.53.ebuild,v 1.1 2012/06/29 16:25:49 scarabeus Exp $
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="http://packages.debian.org/source/sid/os-prober"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_prepare() {
-	find "${S}" -type f -exec sed -i -e "s:/usr/lib/:/usr/libexec/:g" {} + || die
-
-	# compile with kogaion recognition patch
-	epatch "${FILESDIR}"/os-prober-kogaion.patch
-
-	# use default GNU rules
-	rm Makefile
-}
-
-src_compile() {
-	tc-export CC
-	emake newns
-}
-
-src_install() {
-	dobin os-prober linux-boot-prober
-
-	exeinto /usr/libexec/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/libexec/$dir
-		doexe $dir/common/*
-		if [[ -d $dir/$debarch ]]; then
-			doexe $dir/$debarch/*
-		fi
-	done
-
-	if use amd64 || use x86; then
-		exeinto /usr/libexec/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.57-r1.ebuild b/sys-boot/os-prober/os-prober-1.57-r1.ebuild
deleted file mode 100644
index f2bff94f..00000000
--- a/sys-boot/os-prober/os-prober-1.57-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/os-prober/os-prober-1.57-r1.ebuild,v 1.1 2013/04/07 08:42:42 abcd Exp $
-
-EAPI=5
-
-#inherit eutils multilib toolchain-funcs
-inherit toolchain-funcs
-
-DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="http://packages.debian.org/source/sid/os-prober"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/os-prober-kogaion.patch
-	# 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() {
-	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
-	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.62.ebuild b/sys-boot/os-prober/os-prober-1.62.ebuild
deleted file mode 100644
index 572c23fd..00000000
--- a/sys-boot/os-prober/os-prober-1.62.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/os-prober/os-prober-1.62.ebuild,v 1.1 2013/07/18 16:33:42 maksbotan Exp $
-
-EAPI=5
-
-#inherit eutils multilib toolchain-funcs
-inherit toolchain-funcs
-
-DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="http://packages.debian.org/source/sid/os-prober"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/os-prober-kogaion.patch
-	# 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() {
-	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.65.ebuild b/sys-boot/os-prober/os-prober-1.65.ebuild
index 423c11b2..427a63f6 100644
--- a/sys-boot/os-prober/os-prober-1.65.ebuild
+++ b/sys-boot/os-prober/os-prober-1.65.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 S=${WORKDIR}/${PN}
 
 src_prepare() {
-	epatch "${FILESDIR}"/os-prober-kogaion.patch
+	epatch "${FILESDIR}"/os-prober-redcore.patch
 	# use default GNU rules
 	rm Makefile || die 'rm Makefile failed'
 	# Fix references to grub-mount