cleanup

(Portage version: 2.1.2-r1)

3 files changed, 31 insertions, 32 deletions

diff --git a/net-analyzer/aimsniff/ChangeLog b/net-analyzer/aimsniff/ChangeLog
index 0a6f6ed0bbc6..b5c845210ef3 100644
--- a/net-analyzer/aimsniff/ChangeLog
+++ b/net-analyzer/aimsniff/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/aimsniff
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/ChangeLog,v 1.20 2006/11/23 19:43:25 vivo Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/ChangeLog,v 1.21 2007/02/01 21:03:56 jokey Exp $
+
+  01 Feb 2007; Markus Ullmann <jokey@gentoo.org> aimsniff-0.9-r1.ebuild,
+  aimsniff-0.9-r2.ebuild:
+  cleanup
 
   23 Nov 2006; Francesco Riosa <vivo@gentoo.org> aimsniff-0.9-r1.ebuild,
   aimsniff-0.9-r2.ebuild:
diff --git a/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild b/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild
index f919e6937bbb..47d9c26e504b 100644
--- a/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild
+++ b/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild
@@ -1,28 +1,22 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild,v 1.10 2006/11/23 19:43:25 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild,v 1.11 2007/02/01 21:03:55 jokey Exp $
 
-inherit webapp eutils
-
-IUSE="samba mysql apache2 http"
+inherit eutils webapp
 
 MY_P="${P}d"
 WAS_VER="0.1.2b"
-
 DESCRIPTION="Utility for monitoring and archiving AOL Instant Messenger messages across a network"
 HOMEPAGE="http://www.aimsniff.com/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
 	http? ( mirror://sourceforge/${PN}/was-${WAS_VER}.tar.gz )"
 
-RESTRICT="nomirror"
-
 LICENSE="GPL-2"
 KEYWORDS="~amd64 x86 ~ppc"
+#SLOT empty due to webapp
+IUSE="samba mysql apache2 http"
 
-S=${WORKDIR}/${MY_P}
-
-# We need >= perl-5.8.4 for GDBM_File
-DEPEND=">=dev-lang/perl-5.8.4
+DEPEND="dev-lang/perl
 	dev-perl/Net-Pcap
 	dev-perl/NetPacket
 	dev-perl/Unicode-String
@@ -34,6 +28,11 @@ DEPEND=">=dev-lang/perl-5.8.4
 	mysql? ( virtual/mysql dev-perl/DBD-mysql )
 	samba? ( net-fs/samba )
 	http? ( apache2? ( =net-www/apache-2* ) !apache2? ( =net-www/apache-1* ) )"
+RDEPEND=${DEPEND}
+
+RESTRICT="nomirror"
+
+S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
 	if use http
@@ -64,15 +63,15 @@ src_install() {
 		dodoc README.WAS
 
 		rm -rf ../was-${WAS_VER}/docs
-		mv ../was-${WAS_VER}/ ${D}${MY_HTDOCSDIR}/was
+		mv ../was-${WAS_VER}/ "${D}"${MY_HTDOCSDIR}/was
 
 		webapp_serverowned ${MY_HTDOCSDIR}/was
 
 		# This file needs to be serverowned as the server won't be able to write to it if it were
-		# webapp_configfile'ed. 
+		# webapp_configfile'ed.
 		webapp_serverowned ${MY_HTDOCSDIR}/was/.config.php
 
-		for phpfile in `ls -a ${D}${MY_HTDOCSDIR}/was/ | grep ".php$"`; do
+		for phpfile in `ls -a "${D}"${MY_HTDOCSDIR}/was/ | grep ".php$"`; do
 			webapp_runbycgibin php ${MY_HTDOCSDIR}/was/${phpfile}
 		done
 
@@ -81,7 +80,6 @@ src_install() {
 }
 
 pkg_postinst() {
-
 	if use mysql
 	then
 		echo
diff --git a/net-analyzer/aimsniff/aimsniff-0.9-r2.ebuild b/net-analyzer/aimsniff/aimsniff-0.9-r2.ebuild
index c68af11cdbee..64d16f1c944a 100644
--- a/net-analyzer/aimsniff/aimsniff-0.9-r2.ebuild
+++ b/net-analyzer/aimsniff/aimsniff-0.9-r2.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/aimsniff-0.9-r2.ebuild,v 1.2 2006/11/23 19:43:25 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/aimsniff-0.9-r2.ebuild,v 1.3 2007/02/01 21:03:55 jokey Exp $
 
-inherit webapp eutils
-
-IUSE="samba mysql apache2 http"
+inherit eutils webapp eutils
 
 MY_P="${P}d"
 WAS_VER="0.1.2b"
@@ -14,15 +12,12 @@ HOMEPAGE="http://www.aimsniff.com/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
 	http? ( mirror://sourceforge/${PN}/was-${WAS_VER}.tar.gz )"
 
-RESTRICT="nomirror"
-
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
+#SLOT empty due to webapp
+IUSE="samba mysql apache2 http"
 
-S="${WORKDIR}/${MY_P}"
-
-# We need >= perl-5.8.4 for GDBM_File
-DEPEND=">=dev-lang/perl-5.8.4
+DEPEND="dev-lang/perl
 	dev-perl/Net-Pcap
 	dev-perl/NetPacket
 	dev-perl/Unicode-String
@@ -35,6 +30,10 @@ DEPEND=">=dev-lang/perl-5.8.4
 	samba? ( net-fs/samba )
 	http? ( apache2? ( =net-www/apache-2* ) !apache2? ( =net-www/apache-1* ) )"
 
+RESTRICT="nomirror"
+
+S=${WORKDIR}/${MY_P}
+
 pkg_setup() {
 	if use http
 	then
@@ -69,7 +68,7 @@ src_install() {
 		webapp_serverowned ${MY_HTDOCSDIR}/was
 
 		# This file needs to be serverowned as the server won't be able to write to it if it were
-		# webapp_configfile'ed. 
+		# webapp_configfile'ed.
 		webapp_serverowned ${MY_HTDOCSDIR}/was/.config.php
 
 		for phpfile in `ls -a "${D}"${MY_HTDOCSDIR}/was/ | grep ".php$"`; do
@@ -83,7 +82,6 @@ src_install() {
 }
 
 pkg_postinst() {
-
 	if use mysql
 	then
 		echo
@@ -106,7 +104,6 @@ pkg_postinst() {
 		echo "Go to http://${HOSTNAME}/was/admin.php to configure WAS." > was-postinst
 		webapp_postinst_txt en was-postinst
 	fi
-
 }
 
 pkg_config() {