Version bump. Fixes bug #528038. Remove old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64

4 files changed, 25 insertions, 97 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/Manifest b/sys-boot/os-prober/Manifest
index 28704123b963..33801855bd32 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,31 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST os-prober_1.53.tar.gz 26132 SHA256 58c47274b8e531fdc8b525fa5903885b92dbc3ee39bf13dd87e40336703a58c2 SHA512 4e983d6774cb85df9bec1e8e7ca53d9eec6605bf7308b141d1ee1f118b11534e440a19c0aae17c38f717f433c1ef853ad5879feac1ba4ee10774b3f85bb544ad WHIRLPOOL b555c053fd0d2b934c3e894971744f0a11298695730d8f5b4b344ad175938c8f4e877da20031d6c89ae6a286894f52d18b64b6a8f63136814019b73754298def
-DIST os-prober_1.56.tar.gz 25738 SHA256 88a79a04617f4ecbeb9c4d318cd9cf8fcb4ae7a724bd503942354011c7da5719 SHA512 8bdb158e546b51658ef170171a623693aac0939e10e9ddf0df834d751dd1c97a902a0b43f0eca1ce53069ac42e0f42f8b824e216f04b036cb3100698d625ab7a WHIRLPOOL d8bea4a31473ff31ada1592fd1423fbb0423a105f087887f06b43ade0736ceb1a5e36f89fe73323b216d5b321fc7002c21a83d9c024de5d214206072b066ccb3
 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
 EBUILD os-prober-1.53.ebuild 1597 SHA256 fff1fa3bec8a22e105f34fe5a012c840666952b96706bb722796089ff4dcf11c SHA512 3b1de8254af24cbb030b57002e628a75ae332003b519e74e7d26afba81103e0df276aff6d0f6f695984363f92565144fb762f9732b348229effc65a30f8074fc WHIRLPOOL 40ab451b6493e6df9d437fc3090d55e04b366299567e09d095d9215f8b56d423ecf44d57e373082ffaa246549ae04c775529f8a886adf0172dc373fcecfa593d
-EBUILD os-prober-1.56.ebuild 1594 SHA256 e8b104447032aa637f3812fe1ed9c4c9577c9462da75f91628d59db29f681f29 SHA512 6c780e4d5439628438f2f6b5d5dcf1b93c8621fe293409ec45260391537f6d57d1c295b76ae9fc1b111669fef983ba3caeca7f50fff62a0969128e9fa7078416 WHIRLPOOL 6e0933d3c72c789bcac9ad24b51495ed57c87b5c88928479b55c1ce5535483e1ea5540512fb2789f32f7996079ee04d7be7944dcc88749bad8e33ff652849afc
 EBUILD os-prober-1.57-r1.ebuild 1793 SHA256 fdf5b1bb9e908cf070afdcb368d505fa3e224953d1139fcec868821c8ec27da1 SHA512 58ea0261926b2138e9f74ffe0d91c1b1d2bc5086ab518e3b52ce6a609cf9c24ad770f6c1204953b1223d589fb41be23cb0f250e9cfd079e17bd0bfbab718cb3a WHIRLPOOL 44de32c26cf0a1d65a9acac046aa0c3f976ddc2ab9a61f1eae55f6a3c71c12020844e149288ec8f4152ffb0f8b9c84114fd9632a709951628dd2c638bf98010e
-EBUILD os-prober-1.57.ebuild 1626 SHA256 9e9dafe76fe15326b4cd15aaf04549fe6f9e176e1efc91e9628d2e94f505a242 SHA512 5c3c1efcb7c4a67cfc9d3f6646c019eea35e4882c0e215f9cb0cf8fd1428ac0261f4a5a7ac272efc84f2ec57230ea10a3a7aeb6d09eec2b2b228cbf80c298c57 WHIRLPOOL e1426c5733a64a5bbe51e7801b3abc5d7b596e7fbae7c378d88339a9b2cf41daeea285d0a9b97c23f6b41f5ba27e66f8fe65c541ad84d187d3f67c311f5ce7a2
 EBUILD os-prober-1.62.ebuild 1896 SHA256 f98c2a72cfc6b4ea1a3b3959d2efd2a280382d54f5f2c0e4162d38036ccc8fa4 SHA512 250b47e7925a50c8feb4c67d1c05918ee840bd6a9fa789f9afd9b15f632a819057fc60841231681c277a20607208eeadcd07d665b75354be8bbe0c90ef7d0c3d WHIRLPOOL 84eac83b65aa8ff4ca1156be841cffa05d3a1e186d36cd101ed5e2c9b44fae8d9752ea591a1871c8187aceb4de67586058571c466521aab52265ff2bed3dbc5a
-MISC ChangeLog 3421 SHA256 d8845327d95303b3cd4a0b5b82129bc8fd174a3c3f91a1d60002c61a54a87513 SHA512 e709d86f26561e1791580fe4b9717766fbfb0bb6387b3b5b6528b5c5824a4388af22fa2ea2b24736c0219441cb76f166c817e18582c99368e8fb47ed03831daf WHIRLPOOL ba6f1a92ce7dec8e37474c348e89f56c45aee094b4448280d568555d911b8592f63ab04f79494f332b5cebcefd32c5b81913fefd6d203a7b9d289bfb0a0dc087
+EBUILD os-prober-1.65.ebuild 1912 SHA256 2915f04d6f80c8766536bcd59167039953f6ec7ad32f57ed646e12c06686a07b SHA512 6735eaccb86af55613f156461aff9e87011389578032285a54b7aafe977f73f28f529afae758683a8d69f39f7e96e43cfa37e680d41722df9c31984c4f4dda3f WHIRLPOOL 4d380e6b5f153aef828905e24c5ab97c1ef7dd1c24008424174a4729c0a166fa478efa1271f6c3161edebd7b9e0e76c717434181ec49d8d79a50771d98767ed5
+MISC ChangeLog 3620 SHA256 e62f57be683214b1432a8f8caa8b3182ba72f47363b9e15c3966d05590f9a06d SHA512 70682e4cf3191276664e7fa7cab6e82db217d197510b042ddaa4a112e8ad76d1872b5684b7f4e5e8323df621d2e69500e0d6638213cf48909087681194982d5a WHIRLPOOL 1fd4a5e81746fdb13092e7d6216052ba8d0e1fa08997da2a77094e93e127409f0c3e8df7c241954554ac199947a01421c569bd1ffe4cac9013bfd71be27ffa90
 MISC metadata.xml 414 SHA256 a850364aaddb4ddcf542ebb13d92c4326ab8379ee6cb3ea811eba02a2cee783e SHA512 96974e37c3ab1a57f3a0f74914700846d1eb378dcea769c4beea32ca7fee6d9a0cad5fed0f110e39d06e3ef9f1dcd6d3901fe5e884571325a265dff6e3094cee WHIRLPOOL 6e246754d275728d4fd425cc048f03bf658cd617c7468575bb4b9b3f66ae062b167a04b0514f14665c23c9a52e23fb0a1a593decc86cf7b8d9da2e66fef60406
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCAAGBQJR82aDAAoJELHSF2kinlg4bWIP/3+QbCM6WxQXLWO4an3368DG
-heUjPgrOxqzoGUC9o5+t+xRpH5vByHap1FwshkqTK/5n3SAwZGhdqynJmBqCu7Dv
-ZAT/N81o1DBzvsex+T0R/DN/KijVlvKQ4B+VUdEtHejs0pQajo+lMpgTLBt9DnsN
-/SnjL290GRfVWuRqkEQYItCD6768fqAh3XuCculpge7mz/pqZxLiTKebEvEUtQ4i
-AAwKp+eEFxMOfFmtB8IzoGo9hhcYS3zAI0jxUAdTDRjPzfkRTPSN6aysiCzcr02z
-CN7RUtO+TS7w8vhYCY/zv5MFlyJzlzfoZojGiR41k1HNN/Yr8WKmua6wRNDu7K81
-xaahpc+YRE/nKJ1xd0/FZ33EZWGfKjsJlPBF2JcwMpfZBftJZWFhbLN3UthHx3QP
-xIEkD888P1+HhCG3vbV9IujBXTHvU9D/K0Rm95VVVnYWasy5uEzlGd6FX+598gA+
-K0GpTLTx1fzrhiLlk0SouahyRvp7DNu47tCn/qBJW+5IhOCO++YaMuoUT5CV6Axx
-nwFzgDAEu/EyTpti/wXwXd/DQM4KkIifN58Dvy61lsENmWFkaySASRSuD0eYgSrT
-rPDdUL7Lb6p+6IwSviGC8FUDN+zQ9IGQxB2B3k9JlEkA2tSTTIXtnUj215YYFkxO
-hEM5faG01OK82SXFMe0R
-=xQAJ
------END PGP SIGNATURE-----
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