Version bump to latest. Drop older.

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

7 files changed, 12 insertions, 412 deletions

diff --git a/sys-boot/os-prober/ChangeLog b/sys-boot/os-prober/ChangeLog
index 803bfedafe6c..37bfd37449e5 100644
--- a/sys-boot/os-prober/ChangeLog
+++ b/sys-boot/os-prober/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-boot/os-prober
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/os-prober/ChangeLog,v 1.7 2011/04/16 15:37:45 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/os-prober/ChangeLog,v 1.8 2011/05/05 00:30:51 scarabeus Exp $
+
+*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)
diff --git a/sys-boot/os-prober/files/os-prober-1.35-multilib.patch b/sys-boot/os-prober/files/os-prober-1.35-multilib.patch
deleted file mode 100644
index 8f10676462c4..000000000000
--- a/sys-boot/os-prober/files/os-prober-1.35-multilib.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- os-prober.orig/common.sh
-+++ os-prober/common.sh
-@@ -1,5 +1,5 @@
- newns () {
--  [ "$OS_PROBER_NEWNS" ] || exec /usr/lib/os-prober/newns "$0" "$@"
-+  [ "$OS_PROBER_NEWNS" ] || exec /usr/libexec/os-prober/newns "$0" "$@"
- }
- 
- require_tmpdir() {
---- os-prober.orig/linux-boot-prober
-+++ os-prober/linux-boot-prober
-@@ -15,7 +15,7 @@ if ! mapped="$(mapdevfs "$partition")"; 
- fi
- 
- if ! grep -q "^$mapped " "$OS_PROBER_TMP/mounted-map"; then
--	for test in /usr/lib/linux-boot-probes/*; do
-+	for test in /usr/libexec/linux-boot-probes/*; do
- 		debug "running $test"
- 		if [ -x $test ] && [ -f $test ]; then
- 			if $test "$partition"; then
-@@ -37,7 +37,7 @@ else
- 			bootpart="$partition"
- 			bootmounted=0
- 		fi
--		for test in /usr/lib/linux-boot-probes/mounted/*; do
-+		for test in /usr/libexec/linux-boot-probes/mounted/*; do
- 			if [ -f $test ] && [ -x $test ]; then
- 				debug "running $test on mounted $partition"
- 				if $test "$partition" "$bootpart" "$mpoint" "$type"; then
---- os-prober.orig/linux-boot-probes/common/50mounted-tests
-+++ os-prober/linux-boot-probes/common/50mounted-tests
-@@ -39,7 +39,7 @@ for type in $types; do
- 		bootpart="${mountboot%% *}"
- 		mounted="${mountboot#* }"
- 		
--		for test in /usr/lib/linux-boot-probes/mounted/*; do
-+		for test in /usr/libexec/linux-boot-probes/mounted/*; do
- 			if [ -f $test ] && [ -x $test ]; then
- 				debug "running $test $partition $bootpart $tmpmnt $type"
- 				if $test "$partition" "$bootpart" "$tmpmnt" "$type"; then
---- os-prober.orig/os-prober
-+++ os-prober/os-prober
-@@ -88,7 +88,7 @@ parse_proc_mdstat () {
- # Needed for idempotency
- rm -f /var/lib/os-prober/labels
- 
--for prog in /usr/lib/os-probes/init/*; do
-+for prog in /usr/libexec/os-probes/init/*; do
- 	if [ -x $prog ] && [ -f $prog ]; then
- 		$prog || true
- 	fi
-@@ -115,7 +115,7 @@ for partition in $(partitions); do
- 	fi
- 
- 	if ! grep -q "^$mapped " "$OS_PROBER_TMP/mounted-map" ; then
--		for test in /usr/lib/os-probes/*; do
-+		for test in /usr/libexec/os-probes/*; do
- 			if [ -f $test ] && [ -x $test ]; then
- 				debug "running $test on $partition"
- 				if $test "$partition"; then
-@@ -129,7 +129,7 @@ for partition in $(partitions); do
- 		mpoint="$(unescape_mount "$mpoint")"
- 		if [ "$mpoint" != "/target/boot" ] && [ "$mpoint" != "/target" ] && [ "$mpoint" != "/" ]; then
- 			type=$(grep "^$mapped " "$OS_PROBER_TMP/mounted-map" | head -n1 | cut -d " " -f 3)
--			for test in /usr/lib/os-probes/mounted/*; do
-+			for test in /usr/libexec/os-probes/mounted/*; do
- 				if [ -f $test ] && [ -x $test ]; then
- 					debug "running $test on mounted $partition"
- 					if $test "$partition" "$mpoint" "$type"; then
---- os-prober.orig/os-probes/common/50mounted-tests
-+++ os-prober/os-probes/common/50mounted-tests
-@@ -48,7 +48,7 @@ fi
- for type in $types $delaytypes; do
- 	if mount -o ro -t "$type" "$partition" "$tmpmnt" 2>/dev/null; then
- 		debug "mounted as $type filesystem"
--		for test in /usr/lib/os-probes/mounted/*; do
-+		for test in /usr/libexec/os-probes/mounted/*; do
- 			debug "running subtest $test"
- 			if [ -f $test ] && [ -x $test ]; then
- 				if $test "$partition" "$tmpmnt" "$type"; then
---- os-prober.orig/os-probes/mounted/common/90linux-distro
-+++ os-prober/os-probes/mounted/common/90linux-distro
-@@ -13,7 +13,7 @@ type="$3"
- # better. Make sure this test has a high number so that more accurate tests
- # can come first.
- # TODO: look for ld-linux.so on arches that have it
--if ls $dir/lib/ld*.so* >/dev/null 2>/dev/null; then
-+if ls $dir/lib*/ld*.so* >/dev/null 2>/dev/null; then
- 	if [ -e "$dir/etc/debian_version" ]; then
- 		short="Debian"
- 		long=$(printf "Debian GNU/Linux (%s)\n" "$(cat $dir/etc/debian_version)")
---- os-prober.orig/README
-+++ os-prober/README
-@@ -18,7 +18,7 @@ such as:
-                                     a chain one for other partitions
-                                     with their own boot sectors.
- 
--Tests are executable programs in the directory /usr/lib/os-probes/. Each
-+Tests are executable programs in the directory /usr/libexec/os-probes/. Each
- test is called once per partition, with the partiton to check as its
- parameter, and may output a string as described above, or nothing if it does
- not recognise an OS on that partition. Tests return an exit code of 0
-@@ -27,7 +27,7 @@ partition; or return an exit code of 1 t
- and let the next test run.
- 
- Tests that require the partition to be mounted can be placed in
--/usr/lib/os-probes/mounted/. These tests are passed the following
-+/usr/libexec/os-probes/mounted/. These tests are passed the following
- parameters: partition, mount point, filesystem.
- 
- Bootloader installer packages will then have to process this output (fairly
-@@ -62,7 +62,7 @@ short (or nonexistent), and may be inacc
- TODO for other limitations.
- 
- The tests used by linux-boot-prober are in the directory
--/usr/lib/linux-boot-probes/ and also in /usr/lib/linux-boot-probes/mounted,
-+/usr/libexec/linux-boot-probes/ and also in /usr/libexec/linux-boot-probes/mounted,
- and they are called in a similar way as the os-probes described above.
- The mounted probes are passed parameters for the root partition, the boot
- partition, and the directory the filesystems are mounted in.
diff --git a/sys-boot/os-prober/os-prober-1.35.ebuild b/sys-boot/os-prober/os-prober-1.35.ebuild
deleted file mode 100644
index 3fc6c663667e..000000000000
--- a/sys-boot/os-prober/os-prober-1.35.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2009 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.35.ebuild,v 1.2 2009/12/15 21:37:03 abcd Exp $
-
-EAPI="2"
-
-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=""
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-multilib.patch
-
-	sed -i -e "s:/lib/udev:/$(get_libdir)/udev:g" common.sh || die "sed failed on common.sh"
-
-	# Just use the default rules provided by GNU Make
-	rm Makefile
-}
-
-src_compile() {
-	tc-export CC
-	emake newns || die "emake failed"
-}
-
-src_install() {
-	dobin os-prober linux-boot-prober || die "dobin failed"
-
-	exeinto /usr/libexec/os-prober
-	doexe newns || die "doexe newns failed"
-
-	insinto /usr/share/os-prober
-	doins common.sh || die "doins common.sh failed"
-
-	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/* || die "doexe failed in $dir/common"
-		if [[ -d $dir/$debarch ]]; then
-			doexe $dir/$debarch/* || die "doexe failed in $dir/$debarch"
-		fi
-	done
-
-	if use amd64 || use x86; then
-		exeinto /usr/libexec/os-probes/mounted
-		doexe os-probes/mounted/powerpc/20macosx || die "doexe failed on 20macosx"
-	fi
-
-	dodoc README TODO debian/changelog || die "dodoc failed"
-}
-
-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.36.ebuild b/sys-boot/os-prober/os-prober-1.36.ebuild
deleted file mode 100644
index 4a353a0a7fc2..000000000000
--- a/sys-boot/os-prober/os-prober-1.36.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2010 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.36.ebuild,v 1.1 2010/03/06 21:25:32 abcd Exp $
-
-EAPI="2"
-
-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=""
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	sed -i -e "s:/lib/udev:/$(get_libdir)/udev:g" common.sh || die "sed failed on common.sh"
-	find "${S}" -type f -exec sed -i -e "s:/usr/lib/:/usr/libexec/:g" {} + || die "failed on find and sed lib->libexec"
-	sed -i -e "s:/lib/ld\*\.so\*:/lib*/ld*.so*:g" os-probes/mounted/common/90linux-distro  || die "sed failed on 90linux-distro"
-
-	# Just use the default rules provided by GNU Make
-	rm Makefile
-}
-
-src_compile() {
-	tc-export CC
-	emake newns || die "emake failed"
-}
-
-src_install() {
-	dobin os-prober linux-boot-prober || die "dobin failed"
-
-	exeinto /usr/libexec/os-prober
-	doexe newns || die "doexe newns failed"
-
-	insinto /usr/share/os-prober
-	doins common.sh || die "doins common.sh failed"
-
-	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/* || die "doexe failed in $dir/common"
-		if [[ -d $dir/$debarch ]]; then
-			doexe $dir/$debarch/* || die "doexe failed in $dir/$debarch"
-		fi
-	done
-
-	if use amd64 || use x86; then
-		exeinto /usr/libexec/os-probes/mounted
-		doexe os-probes/mounted/powerpc/20macosx || die "doexe failed on 20macosx"
-	fi
-
-	dodoc README TODO debian/changelog || die "dodoc failed"
-}
-
-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.38.ebuild b/sys-boot/os-prober/os-prober-1.38.ebuild
deleted file mode 100644
index 8194b88791bd..000000000000
--- a/sys-boot/os-prober/os-prober-1.38.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2010 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.38.ebuild,v 1.1 2010/06/04 02:31:38 beandog Exp $
-
-EAPI="2"
-
-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=""
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	sed -i -e "s:/lib/udev:/$(get_libdir)/udev:g" common.sh || die "sed failed on common.sh"
-	find "${S}" -type f -exec sed -i -e "s:/usr/lib/:/usr/libexec/:g" {} + || die "failed on find and sed lib->libexec"
-	sed -i -e "s:/lib/ld\*\.so\*:/lib*/ld*.so*:g" os-probes/mounted/common/90linux-distro  || die "sed failed on 90linux-distro"
-
-	# Just use the default rules provided by GNU Make
-	rm Makefile
-}
-
-src_compile() {
-	tc-export CC
-	emake newns || die "emake failed"
-}
-
-src_install() {
-	dobin os-prober linux-boot-prober || die "dobin failed"
-
-	exeinto /usr/libexec/os-prober
-	doexe newns || die "doexe newns failed"
-
-	insinto /usr/share/os-prober
-	doins common.sh || die "doins common.sh failed"
-
-	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/* || die "doexe failed in $dir/common"
-		if [[ -d $dir/$debarch ]]; then
-			doexe $dir/$debarch/* || die "doexe failed in $dir/$debarch"
-		fi
-	done
-
-	if use amd64 || use x86; then
-		exeinto /usr/libexec/os-probes/mounted
-		doexe os-probes/mounted/powerpc/20macosx || die "doexe failed on 20macosx"
-	fi
-
-	dodoc README TODO debian/changelog || die "dodoc failed"
-}
-
-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.39.ebuild b/sys-boot/os-prober/os-prober-1.39.ebuild
deleted file mode 100644
index 9b0452c27bf3..000000000000
--- a/sys-boot/os-prober/os-prober-1.39.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2010 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.39.ebuild,v 1.1 2010/07/26 11:00:51 lxnay Exp $
-
-EAPI="2"
-
-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=""
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	sed -i -e "s:/lib/udev:/$(get_libdir)/udev:g" common.sh || die "sed failed on common.sh"
-	find "${S}" -type f -exec sed -i -e "s:/usr/lib/:/usr/libexec/:g" {} + || die "failed on find and sed lib->libexec"
-	sed -i -e "s:/lib/ld\*\.so\*:/lib*/ld*.so*:g" os-probes/mounted/common/90linux-distro  || die "sed failed on 90linux-distro"
-
-	# Just use the default rules provided by GNU Make
-	rm Makefile
-}
-
-src_compile() {
-	tc-export CC
-	emake newns || die "emake failed"
-}
-
-src_install() {
-	dobin os-prober linux-boot-prober || die "dobin failed"
-
-	exeinto /usr/libexec/os-prober
-	doexe newns || die "doexe newns failed"
-
-	insinto /usr/share/os-prober
-	doins common.sh || die "doins common.sh failed"
-
-	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/* || die "doexe failed in $dir/common"
-		if [[ -d $dir/$debarch ]]; then
-			doexe $dir/$debarch/* || die "doexe failed in $dir/$debarch"
-		fi
-	done
-
-	if use amd64 || use x86; then
-		exeinto /usr/libexec/os-probes/mounted
-		doexe os-probes/mounted/powerpc/20macosx || die "doexe failed on 20macosx"
-	fi
-
-	dodoc README TODO debian/changelog || die "dodoc failed"
-}
-
-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.44.ebuild b/sys-boot/os-prober/os-prober-1.46.ebuild
index abdffffb0c86..cd5bbf605211 100644
--- a/sys-boot/os-prober/os-prober-1.44.ebuild
+++ b/sys-boot/os-prober/os-prober-1.46.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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.44.ebuild,v 1.2 2011/04/16 15:37:45 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/os-prober/os-prober-1.46.ebuild,v 1.1 2011/05/05 00:30:51 scarabeus Exp $
 
-EAPI="4"
+EAPI=4
 
 inherit eutils multilib toolchain-funcs
 
@@ -20,7 +20,7 @@ src_prepare() {
 	find "${S}" -type f -exec sed -i -e "s:/usr/lib/:/usr/libexec/:g" {} + || die "failed on find and sed lib->libexec"
 	sed -i -e "s:/lib/ld\*\.so\*:/lib*/ld*.so*:g" os-probes/mounted/common/90linux-distro  || die "sed failed on 90linux-distro"
 
-	# Just use the default rules provided by GNU Make
+	# use default GNU rules
 	rm Makefile
 }