version bump. keywords x86 and ppc to air-1.2.5-r1.

10 files changed, 85 insertions, 276 deletions

diff --git a/app-forensics/air/ChangeLog b/app-forensics/air/ChangeLog
index a14bae2dfce3..a4f7387aa4be 100644
--- a/app-forensics/air/ChangeLog
+++ b/app-forensics/air/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-forensics/air
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/air/ChangeLog,v 1.8 2004/10/14 20:01:22 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/air/ChangeLog,v 1.9 2004/12/04 06:27:54 dragonheart Exp $
+
+*air-1.2.7 (04 Dec 2004)
+
+  04 Dec 2004; Daniel Black <dragonheart@gentoo.org>
+  -files/air-1.2.3_beta3-installfix.patch, -air-1.2.3_beta3.ebuild,
+  air-1.2.5-r1.ebuild, -air-1.2.5.ebuild, +air-1.2.7.ebuild:
+  version bump. keywords x86 and ppc to air-1.2.5-r1.
 
   14 Oct 2004; David Holm <dholm@gentoo.org> air-1.2.5-r1.ebuild:
   Added to ~ppc.
diff --git a/app-forensics/air/Manifest b/app-forensics/air/Manifest
index 2e431832d28d..392edcbe5ff3 100644
--- a/app-forensics/air/Manifest
+++ b/app-forensics/air/Manifest
@@ -1,11 +1,18 @@
-MD5 d65b0d6d51afdef46b8ff62878c3e28b ChangeLog 2259
-MD5 abf4dac9e97fdbe7b1aecd7e907010c0 air-1.2.3_beta3.ebuild 1394
-MD5 166359dba0367f15b78ddd5f81cfe50e air-1.2.5-r1.ebuild 1654
-MD5 ae48e97cccc4c40c705f83dcc9231bde air-1.2.5.ebuild 1382
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 20ee07270b7eadc3659cd96a982e460f metadata.xml 230
-MD5 ef2381a8147873ad21c5d638d5cde8d1 files/air-1.2.3_beta3-installfix.patch 5335
+MD5 a72d0ed4a3f5f4455b10909962cda90f ChangeLog 2528
+MD5 c46d18d27f020e2da51b2d928c62e5ab air-1.2.5-r1.ebuild 1658
+MD5 4a1238388c585e2b782acd322d80d17e air-1.2.7.ebuild 1558
 MD5 b79d011ebc05acba20817235893211cd files/air-1.2.5-installfix.patch 6415
 MD5 bfd76b7961c82552945d6ccffffd28dc files/air-1.2.5-r1-installfix.patch 9411
-MD5 5e2c9543b3ba5b7ad85af0c87c767029 files/digest-air-1.2.3_beta3 66
-MD5 119062acfec408661f896f96cd7c325c files/digest-air-1.2.5 60
 MD5 119062acfec408661f896f96cd7c325c files/digest-air-1.2.5-r1 60
+MD5 e57a11971a8230ba7ec6c7efa082fd93 files/digest-air-1.2.7 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBsVjwmdTrptrqvGERAs7gAKCbu/bOHPED8dm0pLNbBzfjSxlm/wCcCEJP
+PWJP+xnvYcq/NNZ7Con8Jfk=
+=G+J9
+-----END PGP SIGNATURE-----
diff --git a/app-forensics/air/air-1.2.3_beta3.ebuild b/app-forensics/air/air-1.2.3_beta3.ebuild
deleted file mode 100644
index 4c46f26704f1..000000000000
--- a/app-forensics/air/air-1.2.3_beta3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/air/air-1.2.3_beta3.ebuild,v 1.1 2004/09/12 06:53:08 dragonheart Exp $
-
-inherit eutils
-
-DESCRIPTION="A GUI front-end to dd/dcfldd"
-HOMEPAGE="http://air-imager.sourceforge.net/"
-MY_P=${P/_/-}
-SRC_URI="mirror://sourceforge/air-imager/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="dev-perl/perl-tk
-	app-arch/sharutils
-	>=sys-apps/sed-4"
-RDEPEND="app-arch/mt-st
-	dev-lang/perl"
-
-src_unpack() {
-	#The tarball doesn't have a directory
-	mkdir ${S}
-	cd ${S}
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-installfix.patch
-
-	#sandbox installer
-	sed -i -e "s!INSTALL_DIR=\"/usr\"!INSTALL_DIR=\"${D}/usr\"!" \
-		-e "s!TEMP_DIR=\"/tmp\"!TEMP_DIR=\"${T}\"!" \
-		install-${MY_P}
-}
-
-src_install() {
-	dodir "/usr/bin"
-	cd ${S}
-	/bin/sh install-${MY_P}
-	dodoc README
-
-	cd ${D}/usr/bin
-	#/usr/bin/air has hardcoded paths we need to fix
-	sed -i -e "s!bitmap_dir=\"/usr/local!bitmap_dir=\"/usr!" \
-		-e "s!air_log_dir = \"/usr/local!air_log_dir = \"/usr!" \
-		-e "s!air_fifo = \"/usr/local!air_fifo = \"/usr!" \
-	  	-e "s!-col !-column !" \
-		-e "s!-col=!-column=!" \
-		air
-
-	mkfifo ${D}/usr/share/air/air-fifo
-	chown -R root:root ${D}
-	fowners root:users /usr/share/air/logs/
-	fperms ug+rwx /usr/share/air/logs/ /usr/share/air/air-fifo
-}
diff --git a/app-forensics/air/air-1.2.5-r1.ebuild b/app-forensics/air/air-1.2.5-r1.ebuild
index 2dcee672aad9..39a3fc42b64b 100644
--- a/app-forensics/air/air-1.2.5-r1.ebuild
+++ b/app-forensics/air/air-1.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.3 2004/10/14 20:01:22 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/air/air-1.2.5-r1.ebuild,v 1.4 2004/12/04 06:27:54 dragonheart Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/air-imager/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE=""
 
 DEPEND=">=dev-perl/perl-tk-804.027
diff --git a/app-forensics/air/air-1.2.5.ebuild b/app-forensics/air/air-1.2.5.ebuild
deleted file mode 100644
index 22cb4d9105be..000000000000
--- a/app-forensics/air/air-1.2.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2004 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.ebuild,v 1.2 2004/09/12 10:49:11 dragonheart Exp $
-
-inherit eutils
-
-DESCRIPTION="A GUI front-end to dd/dcfldd"
-HOMEPAGE="http://air-imager.sourceforge.net/"
-SRC_URI="mirror://sourceforge/air-imager/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="dev-perl/perl-tk
-	app-arch/sharutils
-	>=sys-apps/sed-4"
-RDEPEND="app-arch/mt-st
-	dev-lang/perl
-	sys-apps/coreutils"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-installfix.patch
-
-	#sandbox installer
-	sed -i -e "s!^INSTALL_DIR=.*!INSTALL_DIR=\"${D}/usr\"!" \
-		install-${P}
-}
-
-src_compile() {
-	einfo "nothing to compile"
-}
-
-src_install() {
-	dodir /usr/bin
-	./install-${P}
-
-	# remove binary installed with coreutils
-	rm -f ${D}/usr/bin/split
-	dodoc README
-
-	cd ${D}/usr/bin
-	#/usr/bin/air has hardcoded paths we need to fix
-	sed -i -e "s!/usr/local!/usr!g" air
-
-	mkfifo ${D}/usr/share/air/air-fifo
-	chown -R root:root ${D}
-	fowners root:users /usr/share/air/logs /usr/share/air/air-fifo
-	fperms ug+rwx /usr/share/air/logs /usr/share/air/air-fifo
-}
-
-pkg_postinst() {
-	einfo "This will use programs from the following packages if installed:"
-	einfo "sys-apps/dcfldd"
-	einfo "net-analyzer/netcat"
-	einfo "net-analyzer/cryptcat"
-}
diff --git a/app-forensics/air/air-1.2.7.ebuild b/app-forensics/air/air-1.2.7.ebuild
new file mode 100644
index 000000000000..a48c3b837a94
--- /dev/null
+++ b/app-forensics/air/air-1.2.7.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/air/air-1.2.7.ebuild,v 1.1 2004/12/04 06:27:54 dragonheart Exp $
+
+DESCRIPTION="A GUI front-end to dd/dcfldd"
+HOMEPAGE="http://air-imager.sourceforge.net/"
+SRC_URI="mirror://sourceforge/air-imager/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND=">=dev-perl/perl-tk-804.027
+	app-arch/sharutils
+	sys-apps/sed
+	dev-lang/perl"
+
+RDEPEND="app-arch/mt-st
+	dev-lang/perl
+	sys-apps/coreutils"
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+src_install() {
+
+	PERLTK_VER=`best_version dev-perl/perl-tk`
+	export PERLTK_VER=${PERLTK_VER:17}
+
+	env INTERACTIVE=no INSTALL_DIR=${D}/usr TEMP_DIR=${T} \
+		FINAL_INSTALL_DIR=/usr \
+		./install-${P} \
+		|| die "failed to install - please attach ${T}/air-install.log to a bug report at http://bugs.gentoo.org"
+
+	dodoc README
+
+	dodoc ${T}/air-install.log
+
+	rm ${D}/usr/bin/split
+
+	chown -R root:root ${D}
+	fowners root:users /usr/share/air/logs
+	fperms ug+rwx /usr/share/air/logs
+	if [ -p ${D}usr/share/air/air-fifo ]; then
+		fperms ug+rw /usr/share/air/air-fifo
+		fowners root:users /usr/share/air/air-fifo
+	fi
+	fperms a+x /usr/bin/air
+}
+
+pkg_postinst() {
+	einfo "This will use programs from the following packages if installed:"
+	einfo "sys-apps/dcfldd"
+	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"
+}
diff --git a/app-forensics/air/files/air-1.2.3_beta3-installfix.patch b/app-forensics/air/files/air-1.2.3_beta3-installfix.patch
deleted file mode 100644
index d86284224724..000000000000
--- a/app-forensics/air/files/air-1.2.3_beta3-installfix.patch
+++ /dev/null
@@ -1,149 +0,0 @@
---- install-air-1.2.3-beta3-vanilla	2004-04-19 21:15:57.164847384 -0700
-+++ install-air-1.2.3-beta3	2004-04-19 21:16:34.710139632 -0700
-@@ -5,13 +5,14 @@
- TK_FILE='Tk-800.024.tar.gz'
- TEMP_DIR="/tmp"
- TK_DIR=$TEMP_DIR/Tk800.024
--ICON_DIR="/usr/local/share/air/bitmaps"
--LOG_DIR="/usr/local/share/air/logs"
--INSTALL_LOG="/tmp/air-install.log"
-+INSTALL_LOG="${TEMP_DIR}/air-install.log"
-+INSTALL_DIR="/usr"
-+ICON_DIR="${INSTALL_DIR}/share/air/bitmaps"
-+LOG_DIR="${INSTALL_DIR}/share/air/logs"
- 
- 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
- 
-@@ -53,13 +54,13 @@
- 	UPGRADE="no"
- fi
- 
--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..."
-@@ -67,7 +68,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'`='
-@@ -324,7 +325,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
-@@ -376,7 +377,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 775 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
-@@ -1940,7 +1941,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(
-@@ -2234,7 +2235,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`@
-@@ -2269,12 +2270,12 @@
- SHAR5_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
-@@ -2289,7 +2290,7 @@
- 		echo "If the installer failed with some other error message,"
- 		echo "please email stephengibson@kpmg.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
-@@ -2329,18 +2330,18 @@
- 
- # 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 ""
- 
-@@ -2349,8 +2350,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/digest-air-1.2.3_beta3 b/app-forensics/air/files/digest-air-1.2.3_beta3
deleted file mode 100644
index b620fb44756a..000000000000
--- a/app-forensics/air/files/digest-air-1.2.3_beta3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef8f9fa84efa87fcb150282cdf99f10b air-1.2.3-beta3.tar.gz 60782
diff --git a/app-forensics/air/files/digest-air-1.2.5 b/app-forensics/air/files/digest-air-1.2.5
deleted file mode 100644
index b6c3f49e5017..000000000000
--- a/app-forensics/air/files/digest-air-1.2.5
+++ /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.7 b/app-forensics/air/files/digest-air-1.2.7
new file mode 100644
index 000000000000..ca8f68ec6543
--- /dev/null
+++ b/app-forensics/air/files/digest-air-1.2.7
@@ -0,0 +1 @@
+MD5 826679ae1fc1e38c17ee7cbbdcb9ea6b air-1.2.7.tar.gz 81661