removal of package as per bugs #106497 and #176738

11 files changed, 58 insertions, 537 deletions

diff --git a/sys-apps/mindi/ChangeLog b/sys-apps/mindi/ChangeLog
index 92bf938e2799..8204f5d0468c 100644
--- a/sys-apps/mindi/ChangeLog
+++ b/sys-apps/mindi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/mindi
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/ChangeLog,v 1.24 2007/07/02 03:04:52 peper Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/ChangeLog,v 1.25 2008/03/13 11:04:01 wschlich Exp $
+
+*mindi-2.0.0 (13 Mar 2008)
+
+  13 Mar 2008; Wolfram Schlich <wschlich@gentoo.org>
+  -files/mindi-0.86-security.patch, metadata.xml, -mindi-0.85.ebuild,
+  -mindi-0.86.ebuild, -mindi-1.03.ebuild, -mindi-1.04.ebuild,
+  -mindi-1.10.ebuild, -mindi-1.11.ebuild, +mindi-2.0.0.ebuild:
+  re-activation of package as per bugs #106497 and #176738
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> mindi-0.85.ebuild,
   mindi-0.86.ebuild:
diff --git a/sys-apps/mindi/Manifest b/sys-apps/mindi/Manifest
index 508900207a3c..45cee302f6fd 100644
--- a/sys-apps/mindi/Manifest
+++ b/sys-apps/mindi/Manifest
@@ -1,15 +1,4 @@
-AUX mindi-0.86-security.patch 7683 RMD160 dc1209c87b1ca5bf3e7da6021fa4f356fb6d9449 SHA1 192ad83c393160a4e5c55812ccdb42b9b7913c87 SHA256 9bd7894160e9dc2edb832834100c926910e4898d18b2a3c403e709c07ba2c986
-DIST mindi-0.85.tgz 921210 RMD160 21e49698abb11de358a738f8155631a9a64aa8ca SHA1 8d3b788056c628b50c915e0f4b77fc2659343cd4 SHA256 fa06528d3b583a5bb5985cb5645ca0b3d4dc87d8215ef53f869a85319a6b6625
-DIST mindi-0.86.tgz 909289 RMD160 c39a44d9608bb716ce86127d44438938d9f204f1 SHA1 7801228aefe2682c9cc18ae6d54c46ca93d55f1b SHA256 106b5c7fec1860e021b1a781d82774bf5aa4a0e7031b3685276925e31e3fa4ec
-DIST mindi-1.03.tgz 2130855 RMD160 f0b7b4b031f624a4edbb32311d8a2dedab8057f3 SHA1 82a29a14550dddfa444e9354e099a9f299097be7 SHA256 a07b8f7e1e4f624937bf072a758224f14f91e5d20503030331f46d6b36b47834
-DIST mindi-1.04.tgz 2823392 RMD160 60ff552b7988fdd62aa86265e36e1614c36f8a34 SHA1 cdd252eb135738a8457c453d641ba94efa99ecdd SHA256 4cbdfb1824793e648fc7b5e1ddbcbc1ef7fb2186a57c46f0d80471696938b83a
-DIST mindi-1.10.tgz 2130907 RMD160 1ad9264d0415417cace258395c5067d5263c7aa2 SHA1 908117de3c52d5ff2ae224927fb881e7bfac0c7e SHA256 cd18fb48eb9f7590bc030329a3b206d6271e30ef5a1ffe6d0f0940514ed387db
-DIST mindi-1.11.tgz 4057301 RMD160 21ee1285714c7963dd84a76510b4ea29cb77d6df SHA1 5eab81512d78e483eaa64d2b84551d17ec99c7c8 SHA256 d6d9ed4c368e8580128d5d2cd0da86c7f3f9a02aa2c9e20b366d8d4ef4010228
-EBUILD mindi-0.85.ebuild 1188 RMD160 97e70429f3bf37f76b6ee6e2365bb2b6cbd0b9cc SHA1 fab3535d2ae471d7f185cd61c74c9c6b2f254b02 SHA256 877c782b014275585716a7924eab30a5946f1f676f3527a3f2e5c3c6b6f5b163
-EBUILD mindi-0.86.ebuild 1353 RMD160 8d49c204a244bcac62624dbe78be360965cf1e2e SHA1 f9f5c2f72c0f8cb00fd36af08914cd8140434fd7 SHA256 503a5af444d0635f7fbca0efbd207bcf38fa3aa4385375cf2b9c3cb784d85c82
-EBUILD mindi-1.03.ebuild 1849 RMD160 55a0911b89c81a9aa3590135f0bbfbde5d928b2d SHA1 2e34affec0b837880e3466be714a5be005f0da7f SHA256 4002be7707a14beba871950a4e1ee85017f3d2163b4a5fea8ca807994252ef84
-EBUILD mindi-1.04.ebuild 1844 RMD160 1cbd63eef0d638118b6cc6e74d199e9dfad1de9b SHA1 867570cd34cb44fd5f2321e1bb709a581613103f SHA256 04fc24ea5cdc0e3e18be7f6d29791412d69eb0a52f660de667e6a90132b7680f
-EBUILD mindi-1.10.ebuild 1849 RMD160 4852d83676553826014503a1b104299c85e26c5d SHA1 f845022bc25f25815bcb42a97e0f9cca5c365df2 SHA256 13594177dcf8aac90cd44d37bcb0d9734cdf33329dfd386ce023564f9e30fc08
-EBUILD mindi-1.11.ebuild 1847 RMD160 f29aa216ff1b964153ceb2ddf5f52149d253bea1 SHA1 064af8bfdaf1b7921624e07026573aadc6f5128e SHA256 e451783e2ce22012bc2f8ad0a436e299ab51101382d838a112275b4e2beac4a1
-MISC ChangeLog 3436 RMD160 19d5c0507a5dabfb3fde6d35e9d4dde998395c18 SHA1 d8a63db95f91389c97fddf3406af4fd163c9ef63 SHA256 40ace869a723c9bc908725612d56f97015f71d61f05236c8d2e248a8bd669a88
-MISC metadata.xml 306 RMD160 1c96fafec74a2937ca70ad4c2990a7291b50d08d SHA1 d11e4b507837edb7728c0190c35a3ecb2e961b22 SHA256 63995835d2dd6754f2a1d85fa73608185ee91b1d7b4c918e7c6928e288ab7cec
+DIST mindi-2.0.0.tar.gz 834636 RMD160 b60779b15e653d3a1dc71362e94349a9d27a6f7e SHA1 bc6b90357b924c84b23555afad9725890ce34fcb SHA256 c2ffe312422d9055e738a9648d3e33832d4677a4b099747595cc453708dd0904
+EBUILD mindi-2.0.0.ebuild 1204 RMD160 da7d6d399ba610c522c7f61e2e54bf841d95f77c SHA1 8cf91e06607c9a4d1b8f24943ede2a09cc26a544 SHA256 62ba5d9e79a6c406dfe2adb2ec65abf6d259ed0c3162586ba1357ef41a97a7e3
+MISC ChangeLog 3772 RMD160 ffb83f9eff9a29412deb38c844ed34391d3b9f99 SHA1 42f37aed9b2b9581c4a63dcb76a7d56474769a09 SHA256 b056154483595af5658792329bb140b2f4e2780161b0035182c1365196b4d15c
+MISC metadata.xml 326 RMD160 c2baedda18a14b6f173d074f026e0dab2a6bf074 SHA1 a4c681ae5681477bd510bffe71c886e9e6d771a4 SHA256 a591a03e94ca36f9e992798a125106cb60c583ed3c5a9d33d1f79778062dd5eb
diff --git a/sys-apps/mindi/files/mindi-0.86-security.patch b/sys-apps/mindi/files/mindi-0.86-security.patch
deleted file mode 100644
index 4ba63f85af26..000000000000
--- a/sys-apps/mindi/files/mindi-0.86-security.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-diff -Naur mindi-0.81/mindi mindi-0.81-patched/mindi
---- mindi-0.81/mindi	2003-08-19 14:53:28.000000000 +0200
-+++ mindi-0.81-patched/mindi	2003-08-19 14:58:52.000000000 +0200
-@@ -13,7 +13,7 @@
- 
- MINDI_VERSION=0.81_20021219
- EXTRA_SPACE=16384          ; # increase if you run out of ramdisk space
--TMP_ROOT=/tmp
-+TMP_ROOT=`mktemp -d`
- WRITE_BOOT_FLOPPIES="yes" ; # do you want to be propted to write floppy images
- PROMPT_WRITE_BOOT_FLOPPIES="yes"
-     # do you want to be prompted to write
-@@ -357,9 +357,9 @@
-     mountpoint=$TMP_ROOT/mountpoint.$$
-     mkdir -p $mountpoint
-     dd if=/dev/zero of=$imagefile bs=1k count=1440 > /dev/null 2> /dev/null || LogIt "Cannot dd (CODI)\n"
--    mke2fs -N 12 -F $imagefile > /tmp/mke2fs.$$ 2>> /tmp/mke2fs.$$
--    [ "$?" -ne "0" ] && cat /tmp/mke2fs.$$
--    rm -f /tmp/mke2fs.$$
-+    mke2fs -N 12 -F $imagefile > $TMP_ROOT/mke2fs.$$ 2>> $TMP_ROOT/mke2fs.$$
-+    [ "$?" -ne "0" ] && cat $TMP_ROOT/mke2fs.$$
-+    rm -f $TMP_ROOT/mke2fs.$$
-     mount -t ext2 -o loop $imagefile $mountpoint || Die "Can't loopmount $mountpoint; does your kernel support loopfs? If not, please recompile your kernel. Your Linux distro is broken."
-     mv $tarball $mountpoint/
-     if [ "$?" -ne "0" ] ; then
-@@ -399,16 +399,16 @@
-     my_partitions=`mount | fgrep $$ | cut -f1 -d' '`
-     [ "$my_partitions" != "" ] && umount $my_partitions
-     [ "$TMP_ROOT" != "/tmp" ] && rm -Rf $TMP_ROOT
--    cd /tmp
-+    cd $TMP_ROOT
-     mkdir -p mindi.err
--    for i in /tmp/mindi-needlist.txt /etc/fstab /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log /tmp/mountlist.txt.$$ ; do
-+    for i in $TMP_ROOT/mindi-needlist.txt /etc/fstab /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log $TMP_ROOT/mountlist.txt.$$ ; do
- 	[ -e "$i" ] && cp -f $i mindi.err/
-     done
-     rm -f mindi.err.*.tgz
-     tar -c mindi.err -f- | gzip -9 > mindi.err.$$.tgz
-     cd /
--    rm -Rf mindi.err /tmp/mountlist.txt.$$
--    LogIt "Please e-mail a copy of /tmp/mindi.err.$$.tgz to the mailing list."
-+    rm -Rf mindi.err $TMP_ROOT/mountlist.txt.$$
-+    LogIt "Please e-mail a copy of $TMP_ROOT/mindi.err.$$.tgz to the mailing list."
-     LogIt "See http://www.mondorescue.com for more information."
-     LogIt "WE CANNOT HELP unless you enclose that file."
-     exit 1
-@@ -673,7 +673,7 @@
-     progress=0
-     noof_lines=`cat $tempfile | wc -l`
-     for fname in `cat $tempfile` ; do
--        tempdepfile=`mktemp /tmp/mindilinux/tempdepfile.XXXXXX`
-+        tempdepfile=`mktemp $TMP_ROOT/mindilinux/tempdepfile.XXXXXX`
-         LocateDeps $fname > $tempdepfile
- 	echo "$fname" >> $outfile.pre
-         cat $tempdepfile >> $outfile.pre
-@@ -984,7 +984,7 @@
- 
- 
- 
--# Called by TurnTgzIntoRdz, to make /tmp/mondo-restore.cfg
-+# Called by TurnTgzIntoRdz, to make $TMP_ROOT/mondo-restore.cfg
- 
- MakeMondoConfigFile() {
-     local outfile use_lzo use_comp
-@@ -1327,17 +1327,17 @@
-     if [ -d "/home/MondoCD" ] ; then
- 	cp -pRdu /home/MondoCD/* . || Die "Cannot do kung pow"
-     fi
--    mkisofs -U -J -r -o $imagesdir/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> /tmp/$$.mk
-+    mkisofs -U -J -r -o $imagesdir/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $TMP_ROOT/$$.mk
-     if [ "$?" -ne "0" ] ; then
- 	echo "----------- mkisofs's errors --------------" >> $LOGFILE
--	cat /tmp/$$.mk >> $LOGFILE
-+	cat $TMP_ROOT/$$.mk >> $LOGFILE
- 	echo "mkisofs returned the following errors:-"
--	cat /tmp/$$.mk
-+	cat $TMP_ROOT/$$.mk
- 	LogIt "Failed to create ISO image.\n"
-     else
- 	echo "Created bootable ISO image at $imagesdir/mindi.iso\n" >> $LOGFILE
-     fi
--    rm -f /tmp/$$.mk
-+    rm -f $TMP_ROOT/$$.mk
-     cd $old_pwd
- }
- 
-@@ -1366,9 +1366,9 @@
-     mountpoint=$TMP_ROOT/mountpoint.$$
-     mkdir -p $mountpoint
-     dd if=/dev/zero of=$imagefile bs=1k count=$disksize > /dev/null 2> /dev/null || Die "Cannot dd blank file"
--    mke2fs -N 26 -m 0 -F $imagefile > /tmp/mke2fs.$$ 2>> /tmp/mke2fs.$$
--    [ "$?" -ne "0" ] && cat /tmp/mke2fs.$$
--    rm -f /tmp/mke2fs.$$
-+    mke2fs -N 26 -m 0 -F $imagefile > $TMP_ROOT/mke2fs.$$ 2>> $TMP_ROOT/mke2fs.$$
-+    [ "$?" -ne "0" ] && cat $TMP_ROOT/mke2fs.$$
-+    rm -f $TMP_ROOT/mke2fs.$$
-     mount -t ext2 -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)\n\n"
- # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
-     mkdir -p $mountpoint/etc
-@@ -1501,15 +1501,15 @@
- 	$LILO_EXE -r $mountpoint >> $LOGFILE 2>> $LOGFILE
-     fi
-     if [ $? -ne "0" ] ; then
--	if [ "`cat $LOGFILE | fgrep "/tmp/dev.0"`" ] ; then
--	    LogIt "The '/tmp/dev.0' error is NOT Mindi's fault. It is LILO's.\n"
-+	if [ "`cat $LOGFILE | fgrep "$TMP_ROOT/dev.0"`" ] ; then
-+	    LogIt "The '$TMP_ROOT/dev.0' error is NOT Mindi's fault. It is LILO's.\n"
- 	    LogIt "Please reboot your PC as a workaround.\n"
- 	    Die "LILO sneezed and Mindo caught a cold. Please read the README / FAQ.\n"
- 	fi
- 	LogIt "Cannot run lilo on $mountpoint\nPlease upgrade/downgrade your version of LILO. It has a bug.\n"
- 	retval=$(($retval+1))
-     fi
--    cp -f $liloconf /tmp/lilo.conf
-+    cp -f $liloconf $TMP_ROOT/lilo.conf
-     umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
-     echo -en "..."
-     rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)\n"
-@@ -1671,7 +1671,7 @@
- 	ListKernelModulePaths >> $needlist
-     fi
-     if [ "$res" -ne "0" ] ; then
--	rm -f /tmp/mindi-needlist.txt
-+	rm -f $TMP_ROOT/mindi-needlist.txt
- 	Die "You have $res file`PluralOrNot $res` present in dependency list\nbut absent from filesystem."
-     fi
-     FindAndAddUserKeyboardMappingFile
-@@ -2104,9 +2104,6 @@
-     dd if=/dev/zero of=$tempfile bs=1k count=$ramdisk_size > /dev/null 2> /dev/null || Die "Not enough room for temporary ramdisk (TurnTgzIntoRdz)"
-     echo -en "..."
-     mke2fs -b 1024 -N 65536 -m 0 -F $tempfile >> $LOGFILE 2>> $LOGFILE
--
--    [ "$?" -ne "0" ] && cat /tmp/mke2fs.$$
--    rm -f /tmp/mke2fs.$$
-     echo -en "..."
-     mkdir -p $mountpoint
-     mount -t ext2 -o loop $tempfile $mountpoint || Die "Cannot loopmount $tempfile to $mountpoint"
-@@ -2252,8 +2249,8 @@
- AbortIfMkfsVfatMissing
- FindIsolinuxBinary
- FindLiloBinary
--cat /proc/mounts | fgrep " $TMP_ROOT " | fgrep tmpfs > /dev/null 2> /dev/null && TMP_ROOT=/home && LogIt "Changing TMP_ROOT to $TMP_ROOT because you're using tmpfs for /tmp" ; # tmpfs doesn't like Mindi and /tmp, for some reason
--rm -f /tmp/mindi_lo
-+cat /proc/mounts | fgrep " $TMP_ROOT " | fgrep tmpfs > /dev/null 2> /dev/null && TMP_ROOT=`mktemp -d -p /var/tmp` && LogIt "Changing TMP_ROOT to $TMP_ROOT because you're using tmpfs for /tmp" ; # tmpfs doesn't like Mindi and /tmp, for some reason
-+rm -f $TMP_ROOT/mindi_lo
- trap "Aborted" SIGTERM
- DONE="\r\t\t\t\t\t\t\t\t\tDone.         "
- CHOPSIZE=160
-@@ -2262,7 +2259,7 @@
- imagesdir=/root/images/mindi
- mkdir -p $imagesdir
- kernelpath=""
--MONDO_ROOT=/tmp/mindilinux/mondo-root
-+MONDO_ROOT="$TMP_ROOT/mindilinux/mondo-root"
- mkdir -p $MONDO_ROOT
- 
- if [ "$#" -ne "0" ] ; then
-@@ -2405,7 +2402,7 @@
- fi
- echo -e "Mindi's temp dir = $TMP_ROOT \nMindi's output dir=$imagesdir" >> $LOGFILE
- [ "$(($RANDOM%64))" -eq "0" ] && LogIt "Dude, I've looked inside your computer and it's really dusty..."
--rm -f /tmp/mindi.err.*.tgz
-+rm -f $TMP_ROOT/mindi.err.*.tgz
- 
- PrepareDataDiskImages $imagesdir
- noof_disks=$?
-@@ -2450,7 +2447,7 @@
-     done
- fi
- [ "$TMP_ROOT" != "/tmp" ] && rm -Rf $TMP_ROOT
--rm -Rf /tmp/mindi-needlist.txt /tmp/mountlist.txt.$$
-+rm -Rf $TMP_ROOT/mindi-needlist.txt $TMP_ROOT/mountlist.txt.$$
- LogIt "$FRIENDLY_OUTSTRING"
- echo "Mindi is exiting" >> $LOGFILE
- exit 0
diff --git a/sys-apps/mindi/metadata.xml b/sys-apps/mindi/metadata.xml
index d81c74af836c..8ed92969ca32 100644
--- a/sys-apps/mindi/metadata.xml
+++ b/sys-apps/mindi/metadata.xml
@@ -5,6 +5,6 @@
 <maintainer>
 	<email>wschlich@gentoo.org</email>
 	<name>Wolfram Schlich</name>
-	<description>Secondary maintainer</description>
+	<description>Proxy maintainer for Bruno.Cornec@hp.com</description>
 </maintainer>
 </pkgmetadata>
diff --git a/sys-apps/mindi/mindi-0.85.ebuild b/sys-apps/mindi/mindi-0.85.ebuild
deleted file mode 100644
index e79bf0e66591..000000000000
--- a/sys-apps/mindi/mindi-0.85.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-0.85.ebuild,v 1.13 2007/07/02 03:04:52 peper Exp $
-
-DESCRIPTION="Mindi builds boot/root disk images using your existing kernel, modules, tools and libraries"
-HOMEPAGE="http://www.microwerks.net/~hugo/mindi/"
-SRC_URI="http://www.microwerks.net/~hugo/download/stable/final/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-RESTRICT="userpriv"
-
-DEPEND=">=app-arch/bzip2-1.0.1
-		>=app-cdr/cdrtools-1.11
-		>=sys-libs/ncurses-5
-		>=sys-devel/binutils-2
-		>=sys-boot/syslinux-1.7
-		>=sys-boot/lilo-22
-		>=sys-fs/dosfstools-2.8
-		>=sys-apps/mindi-kernel-1"
-
-src_unpack() {
-	for i in ${FEATURES} ; do
-		if [ "${i}" = "userpriv" ] ; then
-			echo
-			ewarn "mindi cannot be installed if userpriv"
-			ewarn "is set within FEATURES."
-			ewarn "Please emerge mindi as follows:"
-			echo
-			ewarn "# FEATURES=\"-userpriv\" emerge mindi"
-			die "userpriv failure"
-		fi
-	done
-	unpack ${A}
-}
-
-src_install() {
-	dodir /usr/share/mindi
-	dodir /usr/sbin
-	cp * --parents -rdf ${D}/usr/share/mindi/
-	dosym /usr/share/mindi/mindi /usr/sbin/
-}
diff --git a/sys-apps/mindi/mindi-0.86.ebuild b/sys-apps/mindi/mindi-0.86.ebuild
deleted file mode 100644
index 9bca3beeac13..000000000000
--- a/sys-apps/mindi/mindi-0.86.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-0.86.ebuild,v 1.13 2007/07/02 03:04:52 peper Exp $
-
-inherit eutils
-
-DESCRIPTION="Mindi builds boot/root disk images using your existing kernel, modules, tools and libraries"
-HOMEPAGE="http://www.microwerks.net/~hugo/mindi/"
-SRC_URI="http://www.microwerks.net/~hugo/download/stable/final/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-RESTRICT="userpriv"
-
-DEPEND=">=app-arch/bzip2-1.0.1
-		>=app-cdr/cdrtools-1.11
-		>=sys-libs/ncurses-5
-		>=sys-devel/binutils-2
-		>=sys-boot/syslinux-1.7
-		>=sys-boot/lilo-22
-		>=sys-fs/dosfstools-2.8
-		>=sys-apps/mindi-kernel-1"
-
-src_unpack() {
-	for i in ${FEATURES} ; do
-		if [ "${i}" = "userpriv" ] ; then
-			echo
-			ewarn "mindi cannot be installed if userpriv"
-			ewarn "is set within FEATURES."
-			ewarn "Please emerge mindi as follows:"
-			echo
-			ewarn "# FEATURES=\"-userpriv\" emerge mindi"
-			die "userpriv failure"
-		fi
-	done
-	unpack ${A} ; cd ${S}
-	epatch ${FILESDIR}/${P}-security.patch
-}
-
-src_install() {
-	dodir /usr/share/mindi /usr/sbin
-	cp * --parents -rdf ${D}/usr/share/mindi/
-	rm ${D}/usr/share/mindi/{CHANGES,INSTALL,LICENSE,README,TODO}
-	dodoc CHANGES INSTALL LICENSE README TODO
-	dosym /usr/share/mindi/mindi /usr/sbin/
-}
diff --git a/sys-apps/mindi/mindi-1.03.ebuild b/sys-apps/mindi/mindi-1.03.ebuild
deleted file mode 100644
index e74c4c75672f..000000000000
--- a/sys-apps/mindi/mindi-1.03.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-1.03.ebuild,v 1.4 2005/01/22 10:24:42 wschlich Exp $
-
-DESCRIPTION="A program that creates emergency boot disks/CDs using your kernel, tools and modules."
-HOMEPAGE="http://www.mondorescue.org/"
-SRC_URI="http://www.microwerks.net/~hugo/download/MondoCD/TGZS/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 -*"
-IUSE=""
-
-DEPEND="virtual/libc"
-RDEPEND=">=app-arch/bzip2-0.9
-		>=sys-apps/mindi-kernel-1.0-r1
-		app-cdr/cdrtools
-		sys-libs/ncurses
-		sys-devel/binutils
-		sys-fs/dosfstools
-		sys-apps/gawk"
-
-src_unpack() {
-	unpack ${A} || die "Failed to unpack ${A}"
-	cd ${S}/rootfs || die
-	tar xzf symlinks.tgz || die "Failed to unpack symlinks.tgz"
-
-	# This will need to change when IA64 is tested. Onviously.
-	rm -f bin/busybox-ia64 sbin/parted2fdisk-ia64
-	mv bin/busybox-i386 bin/busybox
-}
-
-src_install() {
-	dodir /usr/sbin
-
-	dodir /usr/share/mindi
-	exeinto /usr/share/mindi
-	doexe analyze-my-lvm mindi parted2fdisk.pl
-
-	dosym /usr/share/mindi/mindi /usr/sbin/
-	dosym /usr/share/mindi/analyze-my-lvm /usr/sbin/
-	dosym /usr/share/mindi/parted2fdisk.pl /usr/sbin/
-
-	insinto /usr/share/mindi
-	doins deplist.txt dev.tgz isolinux-H.cfg isolinux.cfg \
-	msg-txt sys-disk.raw.gz syslinux-H.cfg syslinux.cfg
-
-	cp -a Mindi/ aux-tools/ rootfs/ ${D}/usr/share/mindi/
-
-	dodoc CHANGES INSTALL README TODO
-}
-
-pkg_postinst() {
-	einfo "${P} was successfully installed."
-	einfo "Please read the associated docs for help."
-	einfo "Or visit the website @ ${HOMEPAGE}"
-	echo
-	ewarn "This package is still in unstable."
-	ewarn "Please report bugs to http://bugs.gentoo.org/"
-	ewarn "However, please do an advanced query to search for bugs"
-	ewarn "before reporting. This will keep down on duplicates."
-	echo
-}
diff --git a/sys-apps/mindi/mindi-1.04.ebuild b/sys-apps/mindi/mindi-1.04.ebuild
deleted file mode 100644
index b30a77f1204d..000000000000
--- a/sys-apps/mindi/mindi-1.04.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-1.04.ebuild,v 1.1 2005/01/22 10:29:25 wschlich Exp $
-
-DESCRIPTION="A program that creates emergency boot disks/CDs using your kernel, tools and modules."
-HOMEPAGE="http://www.mondorescue.org/"
-SRC_URI="http://www.mondorescue.org/download/MondoCD/TGZS/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 -*"
-IUSE=""
-
-DEPEND="virtual/libc"
-RDEPEND=">=app-arch/bzip2-0.9
-		>=sys-apps/mindi-kernel-1.0-r1
-		app-cdr/cdrtools
-		sys-libs/ncurses
-		sys-devel/binutils
-		sys-fs/dosfstools
-		sys-apps/gawk"
-
-src_unpack() {
-	unpack ${A} || die "Failed to unpack ${A}"
-	cd ${S}/rootfs || die
-	tar xzf symlinks.tgz || die "Failed to unpack symlinks.tgz"
-
-	# This will need to change when IA64 is tested. Onviously.
-	rm -f bin/busybox-ia64 sbin/parted2fdisk-ia64
-	mv bin/busybox-i386 bin/busybox
-}
-
-src_install() {
-	dodir /usr/sbin
-
-	dodir /usr/share/mindi
-	exeinto /usr/share/mindi
-	doexe analyze-my-lvm mindi parted2fdisk.pl
-
-	dosym /usr/share/mindi/mindi /usr/sbin/
-	dosym /usr/share/mindi/analyze-my-lvm /usr/sbin/
-	dosym /usr/share/mindi/parted2fdisk.pl /usr/sbin/
-
-	insinto /usr/share/mindi
-	doins deplist.txt dev.tgz isolinux-H.cfg isolinux.cfg \
-	msg-txt sys-disk.raw.gz syslinux-H.cfg syslinux.cfg
-
-	cp -a Mindi/ aux-tools/ rootfs/ ${D}/usr/share/mindi/
-
-	dodoc CHANGES INSTALL README TODO
-}
-
-pkg_postinst() {
-	einfo "${P} was successfully installed."
-	einfo "Please read the associated docs for help."
-	einfo "Or visit the website @ ${HOMEPAGE}"
-	echo
-	ewarn "This package is still in unstable."
-	ewarn "Please report bugs to http://bugs.gentoo.org/"
-	ewarn "However, please do an advanced query to search for bugs"
-	ewarn "before reporting. This will keep down on duplicates."
-	echo
-}
diff --git a/sys-apps/mindi/mindi-1.10.ebuild b/sys-apps/mindi/mindi-1.10.ebuild
deleted file mode 100644
index a0ca1d56d336..000000000000
--- a/sys-apps/mindi/mindi-1.10.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-1.10.ebuild,v 1.4 2005/01/22 10:24:42 wschlich Exp $
-
-DESCRIPTION="A program that creates emergency boot disks/CDs using your kernel, tools and modules."
-HOMEPAGE="http://www.mondorescue.org/"
-SRC_URI="http://www.microwerks.net/~hugo/download/MondoCD/TGZS/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 -*"
-IUSE=""
-
-DEPEND="virtual/libc"
-RDEPEND=">=app-arch/bzip2-0.9
-		>=sys-apps/mindi-kernel-1.0-r1
-		app-cdr/cdrtools
-		sys-libs/ncurses
-		sys-devel/binutils
-		sys-fs/dosfstools
-		sys-apps/gawk"
-
-src_unpack() {
-	unpack ${A} || die "Failed to unpack ${A}"
-	cd ${S}/rootfs || die
-	tar xzf symlinks.tgz || die "Failed to unpack symlinks.tgz"
-
-	# This will need to change when IA64 is tested. Onviously.
-	rm -f bin/busybox-ia64 sbin/parted2fdisk-ia64
-	mv bin/busybox-i386 bin/busybox
-}
-
-src_install() {
-	dodir /usr/sbin
-
-	dodir /usr/share/mindi
-	exeinto /usr/share/mindi
-	doexe analyze-my-lvm mindi parted2fdisk.pl
-
-	dosym /usr/share/mindi/mindi /usr/sbin/
-	dosym /usr/share/mindi/analyze-my-lvm /usr/sbin/
-	dosym /usr/share/mindi/parted2fdisk.pl /usr/sbin/
-
-	insinto /usr/share/mindi
-	doins deplist.txt dev.tgz isolinux-H.cfg isolinux.cfg \
-	msg-txt sys-disk.raw.gz syslinux-H.cfg syslinux.cfg
-
-	cp -a Mindi/ aux-tools/ rootfs/ ${D}/usr/share/mindi/
-
-	dodoc CHANGES INSTALL README TODO
-}
-
-pkg_postinst() {
-	einfo "${P} was successfully installed."
-	einfo "Please read the associated docs for help."
-	einfo "Or visit the website @ ${HOMEPAGE}"
-	echo
-	ewarn "This package is still in unstable."
-	ewarn "Please report bugs to http://bugs.gentoo.org/"
-	ewarn "However, please do an advanced query to search for bugs"
-	ewarn "before reporting. This will keep down on duplicates."
-	echo
-}
diff --git a/sys-apps/mindi/mindi-1.11.ebuild b/sys-apps/mindi/mindi-1.11.ebuild
deleted file mode 100644
index cee057127e6a..000000000000
--- a/sys-apps/mindi/mindi-1.11.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-1.11.ebuild,v 1.2 2005/12/16 11:43:37 flameeyes Exp $
-
-DESCRIPTION="A program that creates emergency boot disks/CDs using your kernel, tools and modules."
-HOMEPAGE="http://www.mondorescue.org/"
-SRC_URI="http://www.mondorescue.org/download/MondoCD/TGZS/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 -*"
-IUSE=""
-
-DEPEND="virtual/libc"
-RDEPEND=">=app-arch/bzip2-0.9
-		>=sys-apps/mindi-kernel-1.0-r1
-		app-cdr/cdrtools
-		sys-libs/ncurses
-		sys-devel/binutils
-		sys-fs/dosfstools
-		sys-apps/gawk"
-
-src_unpack() {
-	unpack ${A} || die "Failed to unpack ${A}"
-	cd ${S}/rootfs || die
-	tar xzf symlinks.tgz || die "Failed to unpack symlinks.tgz"
-
-	# This will need to change when IA64 is tested. Onviously.
-	rm -f bin/busybox-ia64 sbin/parted2fdisk-ia64
-	mv bin/busybox-i386 bin/busybox
-}
-
-src_install() {
-	dodir /usr/sbin
-
-	dodir /usr/share/mindi
-	exeinto /usr/share/mindi
-	doexe analyze-my-lvm mindi parted2fdisk.pl
-
-	dosym /usr/share/mindi/mindi /usr/sbin/
-	dosym /usr/share/mindi/analyze-my-lvm /usr/sbin/
-	dosym /usr/share/mindi/parted2fdisk.pl /usr/sbin/
-
-	insinto /usr/share/mindi
-	doins deplist.txt dev.tgz isolinux-H.cfg isolinux.cfg \
-	msg-txt sys-disk.raw.gz syslinux-H.cfg syslinux.cfg
-
-	cp -pPR Mindi/ aux-tools/ rootfs/ ${D}/usr/share/mindi/
-
-	dodoc CHANGES INSTALL README TODO
-}
-
-pkg_postinst() {
-	einfo "${P} was successfully installed."
-	einfo "Please read the associated docs for help."
-	einfo "Or visit the website @ ${HOMEPAGE}"
-	echo
-	ewarn "This package is still in unstable."
-	ewarn "Please report bugs to http://bugs.gentoo.org/"
-	ewarn "However, please do an advanced query to search for bugs"
-	ewarn "before reporting. This will keep down on duplicates."
-	echo
-}
diff --git a/sys-apps/mindi/mindi-2.0.0.ebuild b/sys-apps/mindi/mindi-2.0.0.ebuild
new file mode 100644
index 000000000000..ed7e88bcacc5
--- /dev/null
+++ b/sys-apps/mindi/mindi-2.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-2.0.0.ebuild,v 1.1 2008/03/13 11:04:01 wschlich Exp $
+
+DESCRIPTION="A program that creates emergency boot disks/CDs using your kernel, tools and modules."
+HOMEPAGE="http://www.mondorescue.org"
+SRC_URI="ftp://ftp.mondorescue.org/src/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ia64 ~amd64"
+IUSE=""
+DEPEND="virtual/libc"
+RDEPEND=">=app-arch/bzip2-0.9
+		sys-libs/ncurses
+		sys-devel/binutils
+		sys-fs/dosfstools
+		sys-apps/mindi-busybox
+		sys-apps/parted
+		sys-apps/gawk"
+
+src_install() {
+	export HEAD="${D}"
+	export PREFIX="/usr"
+	export CONFDIR="/etc"
+	export CACHEDIR="/var/cache/mindi"
+	export MANDIR="${PREFIX}/share/man"
+	export DOCDIR="${PREFIX}/share/doc"
+	export LIBDIR="${PREFIX}/lib"
+	export DONT_RELINK=1
+	export PKGBUILDMINDI="true"
+	"${WORKDIR}"/"${P}"/install.sh
+}
+
+pkg_postinst() {
+	einfo "${P} was successfully installed."
+	einfo "Please read the associated docs for help."
+	einfo "Or visit the website @ ${HOMEPAGE}"
+	echo
+	ewarn "Please report bugs to http://bugs.gentoo.org/"
+	ewarn "However, please do an advanced query to search for bugs"
+	ewarn "before reporting. This will keep down on duplicates."
+	echo
+}