version bump and old version cleanout

(Portage version: 2.0.52-r1)

7 files changed, 19 insertions, 466 deletions

diff --git a/app-forensics/air/ChangeLog b/app-forensics/air/ChangeLog
index fb66132259e0..54865578c355 100644
--- a/app-forensics/air/ChangeLog
+++ b/app-forensics/air/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-forensics/air
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/air/ChangeLog,v 1.13 2005/08/24 14:05:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/air/ChangeLog,v 1.14 2005/09/28 21:42:54 dragonheart Exp $
+
+*air-1.2.8 (28 Sep 2005)
+
+  28 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/air-1.2.5-installfix.patch, -files/air-1.2.5-r1-installfix.patch,
+  -air-1.2.5-r1.ebuild, +air-1.2.8.ebuild:
+  version bump
 
   24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> air-1.2.7.ebuild:
   Changed root:root -> root:0 permissions and made sharutils and coreutils
diff --git a/app-forensics/air/Manifest b/app-forensics/air/Manifest
index 10f4e40cacbb..448ab11fa3e2 100644
--- a/app-forensics/air/Manifest
+++ b/app-forensics/air/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 98ca62ff4b1353ffa13062101ff252c4 air-1.2.8.ebuild 1566
+MD5 20ee07270b7eadc3659cd96a982e460f metadata.xml 230
 MD5 54b325bcd715e9b14f98136e4ef898ae ChangeLog 2887
 MD5 ef52314f83a8979fd3a5bc56416ceaa6 air-1.2.7.ebuild 1587
-MD5 20ee07270b7eadc3659cd96a982e460f metadata.xml 230
-MD5 122efd889cf876d7e2e22dc0453465d6 air-1.2.5-r1.ebuild 1657
-MD5 bfd76b7961c82552945d6ccffffd28dc files/air-1.2.5-r1-installfix.patch 9411
+MD5 77a44840c820d25ce30ccbf5915a4542 files/digest-air-1.2.8 60
 MD5 e57a11971a8230ba7ec6c7efa082fd93 files/digest-air-1.2.7 60
-MD5 119062acfec408661f896f96cd7c325c files/digest-air-1.2.5-r1 60
-MD5 b79d011ebc05acba20817235893211cd files/air-1.2.5-installfix.patch 6415
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDDH6oj5H05b2HAEkRAucUAKCIicV4Ph2/+MhjZ5hLFbPf0VY8sQCfZg0w
-J0HiIujM4BBT1V6fAwAVRp0=
-=Ernw
------END PGP SIGNATURE-----
diff --git a/app-forensics/air/air-1.2.5-r1.ebuild b/app-forensics/air/air-1.2.8.ebuild
index eb6e48f78c57..c10b7ce30464 100644
--- a/app-forensics/air/air-1.2.5-r1.ebuild
+++ b/app-forensics/air/air-1.2.8.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/air/air-1.2.5-r1.ebuild,v 1.5 2005/01/01 14:22:06 eradicator Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/air/air-1.2.8.ebuild,v 1.1 2005/09/28 21:42:54 dragonheart Exp $
 
 DESCRIPTION="A GUI front-end to dd/dcfldd"
 HOMEPAGE="http://air-imager.sourceforge.net/"
@@ -10,23 +8,17 @@ SRC_URI="mirror://sourceforge/air-imager/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 
 DEPEND=">=dev-perl/perl-tk-804.027
-	app-arch/sharutils
+	userland_GNU? ( app-arch/sharutils )
 	sys-apps/sed
 	dev-lang/perl"
 
 RDEPEND="app-arch/mt-st
 	dev-lang/perl
-	sys-apps/coreutils"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PF}-installfix.patch
-}
+	userland_GNU? ( sys-apps/coreutils )"
 
 src_compile() {
 	einfo "nothing to compile"
@@ -34,7 +26,7 @@ src_compile() {
 
 src_install() {
 
-	PERLTK_VER=`best_version dev-perl/perl-tk`
+	PERLTK_VER=$(best_version dev-perl/perl-tk)
 	export PERLTK_VER=${PERLTK_VER:17}
 
 	env INTERACTIVE=no INSTALL_DIR=${D}/usr TEMP_DIR=${T} \
@@ -46,9 +38,7 @@ src_install() {
 
 	dodoc ${T}/air-install.log
 
-	rm ${D}/usr/bin/split
-
-	chown -R root:root ${D}
+	chown -R root:0 ${D}
 	fowners root:users /usr/share/air/logs
 	fperms ug+rwx /usr/share/air/logs
 	if [ -p ${D}usr/share/air/air-fifo ]; then
@@ -64,5 +54,5 @@ pkg_postinst() {
 	einfo "net-analyzer/netcat"
 	einfo "net-analyzer/cryptcat"
 
-	einfo "The author, steve@unixgurus.com, would appreciate and email of the install file /usr/share/doc/${PF}/air=install.log"
+	einfo "The author, steve@unixgurus.com, would appreciate and email of the install file /usr/share/doc/${PF}/air-install.log"
 }
diff --git a/app-forensics/air/files/air-1.2.5-installfix.patch b/app-forensics/air/files/air-1.2.5-installfix.patch
deleted file mode 100644
index e479701d7128..000000000000
--- a/app-forensics/air/files/air-1.2.5-installfix.patch
+++ /dev/null
@@ -1,175 +0,0 @@
---- install-air-1.2.5.orig	2004-08-12 02:16:24.000000000 +0930
-+++ install-air-1.2.5	2004-09-12 19:29:45.843365848 +0930
-@@ -4,15 +4,16 @@
- PERLTK_VER="804.027"
- TK_SOURCE="http://www.cpan.org/modules/by-module/Tk"
- TK_FILE='Tk-804.027.tar.gz'
--TEMP_DIR="/tmp"
--TK_DIR=$TEMP_DIR/Tk-804.027
--ICON_DIR="/usr/local/share/air/bitmaps"
--LOG_DIR="/usr/local/share/air/logs"
--INSTALL_LOG="/tmp/air-install.log"
-+TEMP_DIR="${T}"
-+TK_DIR=${TEMP_DIR}/Tk-804.027
-+INSTALL_DIR="/usr"
-+ICON_DIR="${INSTALL_DIR}/share/air/bitmaps"
-+LOG_DIR="${INSTALL_DIR}/share/air/logs"
-+INSTALL_LOG="${TEMP_DIR}/air-install.log"
- 
- echo "Install Log for AIR Version $VERSION" > $INSTALL_LOG
- date >> $INSTALL_LOG
--cat /etc/redhat-release >> $INSTALL_LOG
-+cat /etc/gentoo-release >> $INSTALL_LOG
- cat /proc/cpuinfo >> $INSTALL_LOG
- free >> $INSTALL_LOG
- 
-@@ -76,13 +77,13 @@
- fi
- echo "Perl/Tk version: $TK_VER" >> $INSTALL_LOG
- 
--echo ""
--echo "If you are ready to proceed with the installation/upgrade,"
--echo "press ENTER."
--echo ""
--echo "To cancel, hit Control-C."
--
--read foo < /dev/tty  
-+#echo ""
-+#echo "If you are ready to proceed with the installation/upgrade,"
-+#echo "press ENTER."
-+#echo ""
-+#echo "To cancel, hit Control-C."
-+#
-+#read foo < /dev/tty  
- 
- if [ $UPGRADE = "no" ] ; then
- echo "Attempting to get the latest version of Perl/Tk..."
-@@ -90,7 +91,7 @@
- echo "Need to download Perl/Tk:" >> $INSTALL_LOG
- echo "decoding snarf..." >> $INSTALL_LOG
- 
--sed 's/^X//' << 'SHAR_EOF' | uudecode -o /tmp/snarf.gz 2>> $INSTALL_LOG
-+sed 's/^X//' << 'SHAR_EOF' | uudecode -o ${TEMP_DIR}/snarf.gz 2>> $INSTALL_LOG
- begin 755 snarf.gz
- M'XL("-BW"SL``W-N87)F`.U\?WQ35;;O29N64%(2H$B1XAQ'RP^AOZCR&RS$
- M%!`*(:&MOY@2VK2GM4U"<@*M6(RFG4L:,],WUW&\]SKO,N./R\SUSCAW'`='
-@@ -347,7 +348,7 @@
- fi
- 
- echo "decoding air-counter..." >> $INSTALL_LOG
--sed 's/^X//' << 'SHAR2_EOF' | uudecode -o /tmp/air-counter 2>> $INSTALL_LOG
-+sed 's/^X//' << 'SHAR2_EOF' | uudecode -o ${TEMP_DIR}/air-counter 2>> $INSTALL_LOG
- begin 755 air-counter
- M(R$O=7-R+V)I;B]P97)L"B,J*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
- M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
-@@ -399,7 +400,7 @@
- SHAR2_EOF
- 
- echo "decoding air..." >> $INSTALL_LOG
--sed 's/^X//' << 'SHAR3_EOF' | uudecode -o /tmp/air 2>> $INSTALL_LOG
-+sed 's/^X//' << 'SHAR3_EOF' | uudecode -o ${TEMP_DIR}/air 2>> $INSTALL_LOG
- begin 755 air
- M(R$O=7-R+V)I;B]P97)L(`HC*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
- M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
-@@ -2042,7 +2043,7 @@
- SHAR3_EOF
- 
- echo "decoding icons..." >> $INSTALL_LOG
--sed 's/^X//' << 'SHAR4_EOF' | uudecode -o /tmp/air-icons.tar.gz 2>> $INSTALL_LOG
-+sed 's/^X//' << 'SHAR4_EOF' | uudecode -o ${TEMP_DIR}/air-icons.tar.gz 2>> $INSTALL_LOG
- begin 664 air-icons.tar.gz
- M'XL("*3?P3T``V%I<BUI8V]N<RYT87(`[-T)4%/WO@?P!,(68HP8*6(,$%$B
- M8@PA+&I$-ME%1*[U*:6*:*GEJD6NM4@AA#TB"D:%@"P1$`($!(R0A&R$L`H(
-@@ -2336,7 +2337,7 @@
- SHAR4_EOF
- 
- echo "decodiing tailer..." >> $INSTALL_LOG
--sed 's/^X//' << 'SHAR5_EOF' | uudecode -o /usr/local/bin/tailer 2>> $INSTALL_LOG
-+sed 's/^X//' << 'SHAR5_EOF' | uudecode -o ${INSTALL_DIR}/bin/tailer 2>> $INSTALL_LOG
- begin 755 tailer
- M(R$O8FEN+W-H"B,J*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
- M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BH*(R`@
-@@ -2371,7 +2372,7 @@
- SHAR5_EOF
- 
- echo "decodiing split..." >> $INSTALL_LOG
--sed 's/^X//' << 'SHAR6_EOF' | uudecode -o /tmp/split.gz 2>> $INSTALL_LOG
-+sed 's/^X//' << 'SHAR6_EOF' | uudecode -o ${TEMP_DIR}/split.gz 2>> $INSTALL_LOG
- begin 755 split.gz
- M'XL("/.S$T$``W-P;&ET`.U\#WQ4Q;7PW;"$)03O@HN-)<I5@X"2D""TA$"!
- MP")4@I&P_BFL89-LV-5--MV]2T)+)+A9R>UM;%ZKKVJU)87VT7]*:Z4)*`2"
-@@ -2630,12 +2631,12 @@
- end
- SHAR6_EOF
- if [ $UPGRADE = "no" ] ; then
--	# unzip /tmp/snarf.gz
--	/bin/gunzip /tmp/snarf.gz 
-+	# unzip ${TEMP_DIR}/snarf.gz
-+	/bin/gunzip ${TEMP_DIR}/snarf.gz 
- 	
- 	# Use snarf to "snarf" the Perl/Tk package (It has a progress display)
- 	
--	/tmp/snarf -n $TK_SOURCE/$TK_FILE $TEMP_DIR/$TK_FILE
-+	${TEMP_DIR}/snarf -n $TK_SOURCE/$TK_FILE $TEMP_DIR/$TK_FILE
- 	
- 	
- 	if [ $? -ne 0 ] ; then
-@@ -2650,7 +2651,7 @@
- 		echo "If the installer failed with some other error message,"
- 		echo "please email steve@unixgurus.com for assistance."
- 		echo ""
--		rm -f /tmp/snarf*
-+		rm -f ${TEMP_DIR}/snarf*
- 		exit 1
- 	else
- 		echo "Download of Perl/Tk successful." | tee -a $INSTALL_LOG
-@@ -2690,27 +2691,27 @@
- 
- # install air-counter 
- echo "Unpacking and installing air-counter..." | tee -a $INSTALL_LOG
--mv -f /tmp/air-counter /usr/local/bin/air-counter 2>> $INSTALL_LOG
--chmod +x /usr/local/bin/air-counter 2>> $INSTALL_LOG
--rm -f /tmp/air-counter 2>> $INSTALL_LOG
-+mv -f ${TEMP_DIR}/air-counter ${INSTALL_DIR}/bin/air-counter 2>> $INSTALL_LOG
-+chmod +x ${INSTALL_DIR}/bin/air-counter 2>> $INSTALL_LOG
-+rm -f ${TEMP_DIR}/air-counter 2>> $INSTALL_LOG
- echo "Install of air-counter is complete." | tee -a $INSTALL_LOG
- echo ""
- 
- # unzip and install icons 
- echo "Unpacking and installing icons..." | tee -a $INSTALL_LOG
--/bin/tar -C $TEMP_DIR -zxf /tmp/air-icons.tar.gz 2>> $INSTALL_LOG
--mv -f /tmp/*.xbm $ICON_DIR 2>> $INSTALL_LOG
--mv -f /tmp/*.gif $ICON_DIR 2>> $INSTALL_LOG
--rm -f /tmp/air-icons.tar.gz 2>> $INSTALL_LOG
-+/bin/tar -C $TEMP_DIR -zxf ${TEMP_DIR}/air-icons.tar.gz 2>> $INSTALL_LOG
-+mv -f ${TEMP_DIR}/*.xbm $ICON_DIR 2>> $INSTALL_LOG
-+mv -f ${TEMP_DIR}/*.gif $ICON_DIR 2>> $INSTALL_LOG
-+rm -f ${TEMP_DIR}/air-icons.tar.gz 2>> $INSTALL_LOG
- echo "Install of icons is complete." | tee -a $INSTALL_LOG
- echo ""
- 
- #unzip and install split
- echo "Unpacking and installing split..." | tee -a $INSTALL_LOG
--/bin/gunzip /tmp/split.gz 2>> $INSTALL_LOG
--mv -f /tmp/split /usr/local/bin/split 2>> $INSTALL_LOG
--chmod +x /usr/local/bin/split 2>> $INSTALL_LOG
--rm -f /tmp/split 2>> $INSTALL_LOG
-+/bin/gunzip ${TEMP_DIR}/split.gz 2>> $INSTALL_LOG
-+mv -f ${TEMP_DIR}/split ${INSTALL_DIR}/bin/split 2>> $INSTALL_LOG
-+chmod +x  ${INSTALL_DIR}/bin/split 2>> $INSTALL_LOG
-+rm -f ${TEMP_DIR}/split 2>> $INSTALL_LOG
- echo "Install of split is complete." | tee -a $INSTALL_LOG
- echo ""
- 
-@@ -2719,8 +2720,8 @@
- else
- 	echo "Installing AIR $VERSION..." | tee -a $INSTALL_LOG
- fi
--mv -f /tmp/air /usr/local/bin/air 2>> $INSTALL_LOG
--rm -f /tmp/air 2>> $INSTALL_LOG
-+mv -f ${TEMP_DIR}/air ${INSTALL_DIR}/bin/air 2>> $INSTALL_LOG
-+rm -f ${TEMP_DIR}/air 2>> $INSTALL_LOG
- 
- if [ $UPGRADE = "yes" ]; then
- 	echo "Upgrade to AIR v$VERSION complete."
diff --git a/app-forensics/air/files/air-1.2.5-r1-installfix.patch b/app-forensics/air/files/air-1.2.5-r1-installfix.patch
deleted file mode 100644
index 22f4aa9365c4..000000000000
--- a/app-forensics/air/files/air-1.2.5-r1-installfix.patch
+++ /dev/null
@@ -1,257 +0,0 @@
---- air-1.2.5/install-air-1.2.5	2004-08-12 02:16:24.000000000 +0930
-+++ install-air-1.2.5	2004-09-16 22:58:01.859773960 +0930
-@@ -1,18 +1,33 @@
- #!/bin/sh
- 
- VERSION="1.2.5"
--PERLTK_VER="804.027"
-+if [ "$PERLTK_VERz" = "z" ] ; then
-+	PERLTK_VER="804.027"
-+fi
- TK_SOURCE="http://www.cpan.org/modules/by-module/Tk"
--TK_FILE='Tk-804.027.tar.gz'
--TEMP_DIR="/tmp"
--TK_DIR=$TEMP_DIR/Tk-804.027
--ICON_DIR="/usr/local/share/air/bitmaps"
--LOG_DIR="/usr/local/share/air/logs"
--INSTALL_LOG="/tmp/air-install.log"
-+TK_FILE=Tk-$PERLTK_VER.tar.gz
-+if [ "$TEMP_DIRz" = "z" ] ; then
-+	TEMP_DIR="/tmp"
-+fi
-+TK_DIR=$TEMP_DIR/Tk-$PERLTK_VER
-+if [ "$INSTALL_DIRz" = "z" ]; then
-+	INSTALL_DIR="/usr/local"
-+fi
-+if [ "$FINAL_INSTALL_DIRz" = "z" ]; then
-+	FINAL_INSTALL_DIR=$INSTALL_DIR
-+fi
-+ICON_DIR="$INSTALL_DIR/share/air/bitmaps"
-+LOG_DIR="$INSTALL_DIR/share/air/logs"
-+INSTALL_LOG="$TEMP_DIR/air-install.log"
- 
- echo "Install Log for AIR Version $VERSION" > $INSTALL_LOG
- date >> $INSTALL_LOG
--cat /etc/redhat-release >> $INSTALL_LOG
-+[ -f /etc/redhat-release ] && cat /etc/redhat-release >> $INSTALL_LOG
-+[ -f /etc/gentoo-release ] && cat /etc/gentoo-release >> $INSTALL_LOG
-+echo PERLTK_VER=$PERLTK_VER >> $INSTALL_LOG
-+echo TEMP_DIR=$TEMP_DIR >> $INSTALL_LOG
-+echo INSTALL_DIR=$INSTALL_DIR >> $INSTALL_LOG
-+echo FINAL_INSTALL_DIR=$FINAL_INSTALL_DIR >> $INSTALL_LOG
- cat /proc/cpuinfo >> $INSTALL_LOG
- free >> $INSTALL_LOG
- 
-@@ -59,7 +74,7 @@
- if [ $? -ne 0 ] ; then
- 	CUR_VER="0"
- fi
--if [ $CUR_VER == $PERLTK_VER ] ; then
-+if [ $CUR_VER = $PERLTK_VER ] ; then
- 	echo "Perl/Tk ($CUR_VER) is already installed on your system, so"
- 	echo "this installer will only update the other components of AIR."
- 	UPGRADE="yes"
-@@ -76,13 +91,15 @@
- fi
- echo "Perl/Tk version: $TK_VER" >> $INSTALL_LOG
- 
--echo ""
--echo "If you are ready to proceed with the installation/upgrade,"
--echo "press ENTER."
--echo ""
--echo "To cancel, hit Control-C."
-+if [ ! "$INTERACTIVE" = "no" ] ; then
-+	echo ""
-+	echo "If you are ready to proceed with the installation/upgrade,"
-+	echo "press ENTER."
-+	echo ""
-+	echo "To cancel, hit Control-C."
- 
--read foo < /dev/tty  
-+	read foo < /dev/tty  
-+fi
- 
- if [ $UPGRADE = "no" ] ; then
- echo "Attempting to get the latest version of Perl/Tk..."
-@@ -90,7 +107,7 @@
- echo "Need to download Perl/Tk:" >> $INSTALL_LOG
- echo "decoding snarf..." >> $INSTALL_LOG
- 
--sed 's/^X//' << 'SHAR_EOF' | uudecode -o /tmp/snarf.gz 2>> $INSTALL_LOG
-+sed 's/^X//' << 'SHAR_EOF' | uudecode -o $TEMP_DIR/snarf.gz 2>> $INSTALL_LOG
- begin 755 snarf.gz
- M'XL("-BW"SL``W-N87)F`.U\?WQ35;;O29N64%(2H$B1XAQ'RP^AOZCR&RS$
- M%!`*(:&MOY@2VK2GM4U"<@*M6(RFG4L:,],WUW&\]SKO,N./R\SUSCAW'`='
-@@ -347,7 +364,7 @@
- fi
- 
- echo "decoding air-counter..." >> $INSTALL_LOG
--sed 's/^X//' << 'SHAR2_EOF' | uudecode -o /tmp/air-counter 2>> $INSTALL_LOG
-+sed 's/^X//' << 'SHAR2_EOF' | uudecode -o $TEMP_DIR/air-counter 2>> $INSTALL_LOG
- begin 755 air-counter
- M(R$O=7-R+V)I;B]P97)L"B,J*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
- M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
-@@ -399,7 +416,7 @@
- SHAR2_EOF
- 
- echo "decoding air..." >> $INSTALL_LOG
--sed 's/^X//' << 'SHAR3_EOF' | uudecode -o /tmp/air 2>> $INSTALL_LOG
-+sed 's/^X//' << 'SHAR3_EOF' | uudecode -o $TEMP_DIR/air 2>> $INSTALL_LOG
- begin 755 air
- M(R$O=7-R+V)I;B]P97)L(`HC*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
- M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
-@@ -2041,8 +2058,16 @@
- end
- SHAR3_EOF
- 
-+if [ ! "$FINAL_INSTALL_DIR" = "/usr/local" ] ; then
-+	mv $TEMP_DIR/air $TEMP_DIR/air.orig
-+	echo "correcting installation directory in air to $FINAL_INSTALL_DIR" | tee -a $INSTALL_LOG
-+	sed -e "s:/usr/local:$FINAL_INSTALL_DIR:g" $TEMP_DIR/air.orig > $TEMP_DIR/air
-+	chmod a+x $TEMP_DIR/air
-+	rm -f $TEMP_DIR/air.orig | tee -a $INSTALL_LOG
-+fi
-+
- echo "decoding icons..." >> $INSTALL_LOG
--sed 's/^X//' << 'SHAR4_EOF' | uudecode -o /tmp/air-icons.tar.gz 2>> $INSTALL_LOG
-+sed 's/^X//' << 'SHAR4_EOF' | uudecode -o $TEMP_DIR/air-icons.tar.gz 2>> $INSTALL_LOG
- begin 664 air-icons.tar.gz
- M'XL("*3?P3T``V%I<BUI8V]N<RYT87(`[-T)4%/WO@?P!,(68HP8*6(,$%$B
- M8@PA+&I$-ME%1*[U*:6*:*GEJD6NM4@AA#TB"D:%@"P1$`($!(R0A&R$L`H(
-@@ -2335,8 +2360,8 @@
- end
- SHAR4_EOF
- 
--echo "decodiing tailer..." >> $INSTALL_LOG
--sed 's/^X//' << 'SHAR5_EOF' | uudecode -o /usr/local/bin/tailer 2>> $INSTALL_LOG
-+echo "decoding tailer..." >> $INSTALL_LOG
-+sed 's/^X//' << 'SHAR5_EOF' | uudecode -o $TEMP_DIR/tailer 2>> $INSTALL_LOG
- begin 755 tailer
- M(R$O8FEN+W-H"B,J*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
- M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BH*(R`@
-@@ -2370,8 +2395,8 @@
- end
- SHAR5_EOF
- 
--echo "decodiing split..." >> $INSTALL_LOG
--sed 's/^X//' << 'SHAR6_EOF' | uudecode -o /tmp/split.gz 2>> $INSTALL_LOG
-+echo "decoding split..." >> $INSTALL_LOG
-+sed 's/^X//' << 'SHAR6_EOF' | uudecode -o $TEMP_DIR/split.gz 2>> $INSTALL_LOG
- begin 755 split.gz
- M'XL("/.S$T$``W-P;&ET`.U\#WQ4Q;7PW;"$)03O@HN-)<I5@X"2D""TA$"!
- MP")4@I&P_BFL89-LV-5--MV]2T)+)+A9R>UM;%ZKKVJU)87VT7]*:Z4)*`2"
-@@ -2630,12 +2655,12 @@
- end
- SHAR6_EOF
- if [ $UPGRADE = "no" ] ; then
--	# unzip /tmp/snarf.gz
--	/bin/gunzip /tmp/snarf.gz 
-+	# unzip $TEMP_DIR/snarf.gz
-+	/bin/gunzip $TEMP_DIR/snarf.gz 
- 	
- 	# Use snarf to "snarf" the Perl/Tk package (It has a progress display)
- 	
--	/tmp/snarf -n $TK_SOURCE/$TK_FILE $TEMP_DIR/$TK_FILE
-+	$TEMP_DIR/snarf -n $TK_SOURCE/$TK_FILE $TEMP_DIR/$TK_FILE
- 	
- 	
- 	if [ $? -ne 0 ] ; then
-@@ -2650,7 +2675,7 @@
- 		echo "If the installer failed with some other error message,"
- 		echo "please email steve@unixgurus.com for assistance."
- 		echo ""
--		rm -f /tmp/snarf*
-+		rm -f $TEMP_DIR/snarf*
- 		exit 1
- 	else
- 		echo "Download of Perl/Tk successful." | tee -a $INSTALL_LOG
-@@ -2679,6 +2704,10 @@
- fi	
- 
- # create directories if they don't exist
-+if [ ! -d $INSTALL_DIR/bin ]; then
-+	echo "creating directory $INSTALL_DIR/bin..." | tee -a $INSTALL_LOG
-+	mkdir -p $INSTALL_DIR/bin 2>> $INSTALL_LOG
-+fi
- if [ ! -d $ICON_DIR ]; then
- 	echo "creating directory $ICON_DIR..." | tee -a $INSTALL_LOG
- 	mkdir -p $ICON_DIR 2>> $INSTALL_LOG
-@@ -2690,37 +2719,56 @@
- 
- # install air-counter 
- echo "Unpacking and installing air-counter..." | tee -a $INSTALL_LOG
--mv -f /tmp/air-counter /usr/local/bin/air-counter 2>> $INSTALL_LOG
--chmod +x /usr/local/bin/air-counter 2>> $INSTALL_LOG
--rm -f /tmp/air-counter 2>> $INSTALL_LOG
-+mv -f $TEMP_DIR/air-counter $INSTALL_DIR/bin/air-counter 2>> $INSTALL_LOG
-+chmod +x $INSTALL_DIR/bin/air-counter 2>> $INSTALL_LOG
-+rm -f $TEMP_DIR/air-counter 2>> $INSTALL_LOG
- echo "Install of air-counter is complete." | tee -a $INSTALL_LOG
- echo ""
- 
-+# install tailer
-+echo "Unpacking and installing tailer..." | tee -a $INSTALL_LOG
-+mv -f $TEMP_DIR/tailer $INSTALL_DIR/bin/tailer 2>> $INSTALL_LOG
-+chmod +x $INSTALL_DIR/bin/tailer 2>> $INSTALL_LOG
-+rm -f $TEMP_DIR/tailer 2>> $INSTALL_LOG
-+echo "Install of tailer is complete." | tee -a $INSTALL_LOG
-+echo ""
-+
- # unzip and install icons 
- echo "Unpacking and installing icons..." | tee -a $INSTALL_LOG
--/bin/tar -C $TEMP_DIR -zxf /tmp/air-icons.tar.gz 2>> $INSTALL_LOG
--mv -f /tmp/*.xbm $ICON_DIR 2>> $INSTALL_LOG
--mv -f /tmp/*.gif $ICON_DIR 2>> $INSTALL_LOG
--rm -f /tmp/air-icons.tar.gz 2>> $INSTALL_LOG
-+/bin/tar -C $TEMP_DIR -zxf $TEMP_DIR/air-icons.tar.gz 2>> $INSTALL_LOG
-+mv -f $TEMP_DIR/*.xbm $ICON_DIR 2>> $INSTALL_LOG
-+mv -f $TEMP_DIR/*.gif $ICON_DIR 2>> $INSTALL_LOG
-+rm -f $TEMP_DIR/air-icons.tar.gz 2>> $INSTALL_LOG
- echo "Install of icons is complete." | tee -a $INSTALL_LOG
- echo ""
- 
- #unzip and install split
--echo "Unpacking and installing split..." | tee -a $INSTALL_LOG
--/bin/gunzip /tmp/split.gz 2>> $INSTALL_LOG
--mv -f /tmp/split /usr/local/bin/split 2>> $INSTALL_LOG
--chmod +x /usr/local/bin/split 2>> $INSTALL_LOG
--rm -f /tmp/split 2>> $INSTALL_LOG
--echo "Install of split is complete." | tee -a $INSTALL_LOG
--echo ""
-+MY_ARCH=`uname -m`
-+
-+if [ "$MY_ARCH" = "i386" -o "$MY_ARCH" = "i486" -o "$MY_ARCH" = "i586" -o "$MY_ARCH" = "i686" ] && [ ! -x $FINAL_INSTALL_DIR/bin/split ] ; then
-+	echo "Unpacking and installing split..." | tee -a $INSTALL_LOG
-+	/bin/gunzip $TEMP_DIR/split.gz 2>> $INSTALL_LOG
-+	mv -f $TEMP_DIR/split $INSTALL_DIR/bin/split 2>> $INSTALL_LOG
-+	chmod +x  $INSTALL_DIR/bin/split 2>> $INSTALL_LOG
-+	rm -f $TEMP_DIR/split 2>> $INSTALL_LOG
-+	echo "Install of split is complete." | tee -a $INSTALL_LOG
-+	echo ""
-+else
-+	if [ -x $FINAL_INSTALL_DIR/bin/split ] ; then
-+		echo "$FINAL_INSTALL_DIR/bin/split already installed - not installing split." | tee -a $INSTALL_LOG
-+	else
-+		echo "Included $FINAL_INSTALL_DIR/split is a x86 architecture executable and current machine isn't." | tee -a $INSTALL_LOG
-+		echo "You need $FINAL_INSTALL_DIR/bin/split to run air-imager"  | tee -a $INSTALL_LOG
-+	fi
-+fi
- 
- if [ $UPGRADE = "yes" ] ; then
- 	echo "Updating AIR to version $VERSION..."
- else
- 	echo "Installing AIR $VERSION..." | tee -a $INSTALL_LOG
- fi
--mv -f /tmp/air /usr/local/bin/air 2>> $INSTALL_LOG
--rm -f /tmp/air 2>> $INSTALL_LOG
-+mv -f $TEMP_DIR/air $INSTALL_DIR/bin/air 2>> $INSTALL_LOG
-+rm -f $TEMP_DIR/air 2>> $INSTALL_LOG
- 
- if [ $UPGRADE = "yes" ]; then
- 	echo "Upgrade to AIR v$VERSION complete."
-@@ -2737,4 +2785,4 @@
- echo ""
- echo "All Done. Type 'air' on the command-line to begin." | tee -a $INSTALL_LOG
- echo ""
--cat $INSTALL_LOG | mail -s "AIR v$VERSION Install Log" steve@unixgurus.com
-+#cat $INSTALL_LOG | mail -s "AIR v$VERSION Install Log" steve@unixgurus.com
diff --git a/app-forensics/air/files/digest-air-1.2.5-r1 b/app-forensics/air/files/digest-air-1.2.5-r1
deleted file mode 100644
index b6c3f49e5017..000000000000
--- a/app-forensics/air/files/digest-air-1.2.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 173e5c2e9feca01a5afcea89a77aa901 air-1.2.5.tar.gz 80132
diff --git a/app-forensics/air/files/digest-air-1.2.8 b/app-forensics/air/files/digest-air-1.2.8
new file mode 100644
index 000000000000..141d3ba16092
--- /dev/null
+++ b/app-forensics/air/files/digest-air-1.2.8
@@ -0,0 +1 @@
+MD5 833387cf9e1d66b6932d2835df31823b air-1.2.8.tar.gz 82298