Bump to 1.62, adding support for EFI. Thanks to Ben Kohler, bug #477312.

Package-Manager: portage-2.1.12.13/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

3 files changed, 94 insertions, 16 deletions

diff --git a/sys-boot/os-prober/ChangeLog b/sys-boot/os-prober/ChangeLog
index fa1a4a184236..391b3bc3904a 100644
--- a/sys-boot/os-prober/ChangeLog
+++ b/sys-boot/os-prober/ChangeLog
@@ -1,6 +1,11 @@
 # 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.18 2013/04/07 08:42:42 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/os-prober/ChangeLog,v 1.19 2013/07/18 16:33:42 maksbotan Exp $
+
+*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)
 
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 39d87d7bec57..6681eab01b9f 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -4,26 +4,22 @@ 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
 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
-MISC ChangeLog 3135 SHA256 32fb6f7da1f29c6cdca22e41587b26cbd5b8f0a25c288e3d7b2d8a9f34f181a8 SHA512 df0699c321c9a4efee1fb5336972b141c6f9fdee5300607155244bd18d3d1095047726cfe594fced617e46756bfd6ba7e3d655528cd7baf7bbd2c7dfb1eb847c WHIRLPOOL fe24bd7ccc14e803eb2b563bd4c9ba3b29bcf68953eeff5c3068d15675ac031b3dcea39e72bcaac27d0727f551e5917a8e9cc99b3c3342ca658bffc051e57b22
+EBUILD os-prober-1.62.ebuild 1896 SHA256 f98c2a72cfc6b4ea1a3b3959d2efd2a280382d54f5f2c0e4162d38036ccc8fa4 SHA512 250b47e7925a50c8feb4c67d1c05918ee840bd6a9fa789f9afd9b15f632a819057fc60841231681c277a20607208eeadcd07d665b75354be8bbe0c90ef7d0c3d WHIRLPOOL 84eac83b65aa8ff4ca1156be841cffa05d3a1e186d36cd101ed5e2c9b44fae8d9752ea591a1871c8187aceb4de67586058571c466521aab52265ff2bed3dbc5a
+MISC ChangeLog 3305 SHA256 e622ea5ce28b4984fffdbaa446ad2e6e90c140e3c797a5699e6649da12e874f7 SHA512 0c9bdacb7502d83172fba02882ce075cf6cfc3c23a63fd0dffb17c7263e8c74150813f9de61cdfa1cc88747bfe091a48fd5f9ca14096f2a6d955d556f9d6d821 WHIRLPOOL c22f3d66621c30d069af4a71f710d0d3b0d958c875905feb415f598d75d8a89d4972763ccd1553d3daefed5d75890489b826994038c3656ae48abbb0ca25243a
 MISC metadata.xml 411 SHA256 3a193ce2a55900aca4d12112c8c2cebd98a28c9f3da636fba8251ca26b1f3703 SHA512 bb8665840c44348edd13ebd59ef469dac3e8fe875ad7958c1fcf40b80d0813d43f43100d781a7fe453045aa04318d39ffadc23f908e92d0ac069b3674710f654 WHIRLPOOL ffc55ce10c7bf8d3541d7ad767ccd000e1683898717c4bfb214944466ae7ed59dac80055c79017c17eb0a4c2dde401b563360d6f0af59963f59971de5e2112a0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRYTGGAAoJELHSF2kinlg45YYP/2EOwhA3i9GYN9kjkGXw+iLz
-OPa6FeqajQO3Kyionz5MUbb/l2I1RgDDt2YxiGDl/cm41VaacwufSpVrIWvBy4sW
-Zb/j4oV6rEWXNAvkPHAg54TAZQ84nE9/xAqw8q6Aq5eMxMDpyJYpB7+YfLuwAIIR
-+CLY5FpHMdeuPXUch2GDDNPzS0gUID6H9daadZSWjAPIhwj57/6mB2Ym8kxQ8Rpb
-ve6RBKG2U0GdFBBWZScQQEhbdPhdrsx+tf3m2vU+aCiQlAtmx0Jf2ixPnq6HP0Pd
-YHAXRidRwclXzD9sFwcy0zHz3iiYaBCP2mJCci29YzXwygQ39zSNQqDLBG1vYErH
-5MjpW7JtOQxk3StQpNMi1H2G6SGDBdIW+YbySKFjto56+2ZOl9dpuP9H5HO4z+M1
-9Nho562qJitXUWMj2nN9bkpcpSw8O2qvwk+8tv5xMiBA7lOAhLfUjnURib/Tz8qX
-Kv8F5gM/rGycz2AvGeL8YSD4NSYhRyVbxPqqvMPrSN5yawH6j3Bm/Q5W0BAJAtYm
-VZL3mfOiQJsVzPgfx7OYKDhaxKb3L09tsjD3fVE8Mmr24vbTuE/4IJ5qEWtUCdNZ
-DN21fabJG/YWbXtcDia3Sc6uJiU0SOVbTRu0Vphfx65uvtfQ9UGA+BW0r4t2qaXP
-KN5KP054vb5BQTC5V5k9
-=WSeW
+iQEcBAEBCAAGBQJR6BjQAAoJEAmJmMX429reSYYIAI0YE3gF8teiQkqIj1ffuT+7
+4XmNr+HMe3YuUw7dZcTZu+ER0Q5x+FL85iqgft4ceDvizOyrdzfhUPMSU7hDJuBy
+54gdLyaiLXQXgQFjRBrg9l/virW3fPQMKmdIN6aZn7T9Y4Pw7WxLEINhIDqfjdmY
+NOGJquo2vNPlFmBICoqRYnhFWI7RS+dw7WdpBqXRkZ+RMiS3QDtP0pmLxR+CPuD7
+9Nlrr/SfQhHWe6hW7NS34GorfBOknN9oLsJrRgzpcxO5JkayiYzvhK5NArReWvUH
+dI/uO1CNW5QaG+oqb190AL/MKHpM5Fua67ivTw2nTmVLPOIG+femzsIHuvw8F9Q=
+=NA8m
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/os-prober/os-prober-1.62.ebuild b/sys-boot/os-prober/os-prober-1.62.ebuild
new file mode 100644
index 000000000000..b3fbc4582f6d
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.62.ebuild
@@ -0,0 +1,77 @@
+# 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() {
+	# 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"
+}