Version bump. Fixes bug #528038. Remove old.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key )

3 files changed, 22 insertions, 73 deletions

diff --git a/sys-boot/os-prober/ChangeLog b/sys-boot/os-prober/ChangeLog
index c5a4aa648e4e..89695ba7e20f 100644
--- a/sys-boot/os-prober/ChangeLog
+++ b/sys-boot/os-prober/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/os-prober
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/os-prober/ChangeLog,v 1.20 2013/07/27 06:19:46 jcallen Exp $
+# 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
diff --git a/sys-boot/os-prober/os-prober-1.56.ebuild b/sys-boot/os-prober/os-prober-1.56.ebuild
deleted file mode 100644
index c011313ab69f..000000000000
--- a/sys-boot/os-prober/os-prober-1.56.ebuild
+++ /dev/null
@@ -1,68 +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.56.ebuild,v 1.1 2012/10/14 19:10:30 abcd Exp $
-
-EAPI=4
-
-#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() {
-	# use default GNU rules
-	rm Makefile
-}
-
-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.57.ebuild b/sys-boot/os-prober/os-prober-1.65.ebuild
index 2a2018de03f1..26df4e8f72eb 100644
--- a/sys-boot/os-prober/os-prober-1.57.ebuild
+++ b/sys-boot/os-prober/os-prober-1.65.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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.ebuild,v 1.1 2013/01/05 22:52:56 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/os-prober/os-prober-1.65.ebuild,v 1.1 2015/03/29 04:51:39 mrueg Exp $
 
 EAPI=5
 
@@ -9,16 +9,23 @@ 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"
+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}
+
 src_prepare() {
 	# 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() {
@@ -51,6 +58,10 @@ src_install() {
 		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