Cleanup

Package-Manager: portage-2.1.3.7

5 files changed, 10 insertions, 93 deletions

diff --git a/net-analyzer/sonar/ChangeLog b/net-analyzer/sonar/ChangeLog
index d1d2f4a362ab..f37bc7566a10 100644
--- a/net-analyzer/sonar/ChangeLog
+++ b/net-analyzer/sonar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/sonar
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sonar/ChangeLog,v 1.16 2007/07/02 14:41:27 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sonar/ChangeLog,v 1.17 2007/09/06 18:22:10 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -files/1.2.1-libtool.patch,
+  -sonar-1.2.1.ebuild, sonar-1.2.2-r1.ebuild:
+  Cleanup
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> sonar-1.2.1.ebuild,
   sonar-1.2.2-r1.ebuild:
diff --git a/net-analyzer/sonar/files/1.2.1-libtool.patch b/net-analyzer/sonar/files/1.2.1-libtool.patch
deleted file mode 100644
index 77c8b09ef4a2..000000000000
--- a/net-analyzer/sonar/files/1.2.1-libtool.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-*** libltdl/configure.old	Sat Dec  6 14:03:58 2003
---- libltdl/configure	Sat Dec  6 14:10:26 2003
-*************** build=NONE
-*** 197,202 ****
---- 197,203 ----
-  cache_file=./config.cache
-  exec_prefix=NONE
-  host=NONE
-+ host_alias=NONE
-  no_create=
-  nonopt=NONE
-  no_recursion=
-*************** EOF
-*** 368,374 ****
-      ac_prev=host ;;
-    -host=* | --host=* | --hos=* | --ho=*)
-      host="$ac_optarg" ;;
-! 
-    -includedir | --includedir | --includedi | --included | --include \
-    | --includ | --inclu | --incl | --inc)
-      ac_prev=includedir ;;
---- 369,376 ----
-      ac_prev=host ;;
-    -host=* | --host=* | --hos=* | --ho=*)
-      host="$ac_optarg" ;;
-!   -host_alias=* | --host_alias=* )
-!     host_alias="$ac_optarg" ;;
-    -includedir | --includedir | --includedi | --included | --include \
-    | --includ | --inclu | --incl | --inc)
-      ac_prev=includedir ;;
-*************** EOF
-*** 556,562 ****
-  
-    -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-      ;;
-! 
-    *)
-      if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-        echo "configure: warning: $ac_option: invalid host type" 1>&2
---- 558,565 ----
-  
-    -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-      ;;
-!   CC* | CFLAGS* | CXXFLAGS*)
-!     ;;
-    *)
-      if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-        echo "configure: warning: $ac_option: invalid host type" 1>&2
diff --git a/net-analyzer/sonar/files/digest-sonar-1.2.1 b/net-analyzer/sonar/files/digest-sonar-1.2.1
deleted file mode 100644
index a4b16b2ed90b..000000000000
--- a/net-analyzer/sonar/files/digest-sonar-1.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ed95b5f44b7bdf43e867d799dc8bf615 sonar-1.2.1.tar.bz2 302203
-RMD160 fd3e6e5590a645b23f99187341674021abd57131 sonar-1.2.1.tar.bz2 302203
-SHA256 83cb100adc2846cd3c68d5a3d3a4986a3f188d35e38bd1ec9292a4e4de93ebb1 sonar-1.2.1.tar.bz2 302203
diff --git a/net-analyzer/sonar/sonar-1.2.1.ebuild b/net-analyzer/sonar/sonar-1.2.1.ebuild
deleted file mode 100644
index 191686257612..000000000000
--- a/net-analyzer/sonar/sonar-1.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sonar/sonar-1.2.1.ebuild,v 1.6 2007/07/02 14:41:27 peper Exp $
-
-inherit toolchain-funcs eutils
-
-IUSE=""
-DESCRIPTION="network reconnaissance utility"
-HOMEPAGE="http://autosec.sourceforge.net/"
-SRC_URI="mirror://sourceforge/autosec/${P}.tar.bz2"
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-
-DEPEND="virtual/libc
-	>=dev-libs/popt-1.7-r1
-	>=app-doc/doxygen-1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-libtool.patch
-}
-
-src_install() {
-	make install DESTDIR=${D} || die
-	dodoc ChangeLog README AUTHORS CONTRIB NEWS
-	dohtml doc/html/*
-	rm -rf ${D}/usr/share/sonar
-}
diff --git a/net-analyzer/sonar/sonar-1.2.2-r1.ebuild b/net-analyzer/sonar/sonar-1.2.2-r1.ebuild
index 055634702b2b..2c9763547af4 100644
--- a/net-analyzer/sonar/sonar-1.2.2-r1.ebuild
+++ b/net-analyzer/sonar/sonar-1.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sonar/sonar-1.2.2-r1.ebuild,v 1.7 2007/07/02 14:41:27 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sonar/sonar-1.2.2-r1.ebuild,v 1.8 2007/09/06 18:22:10 jokey Exp $
 
 DESCRIPTION="network reconnaissance utility"
 HOMEPAGE="http://autosec.sourceforge.net/"
@@ -19,17 +19,13 @@ DEPEND="virtual/libc
 	doc? ( >=app-doc/doxygen-1.3 )"
 
 src_compile() {
-
-	econf || die
-	emake || die
-
+	econf || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-
-	make install DESTDIR=${D} || die
+	make install DESTDIR="${D}" || die "emake install failed"
 	dodoc ChangeLog README AUTHORS CONTRIB NEWS
 	use doc && dohtml doc/html/*
-	rm -rf ${D}/usr/share/sonar
-
+	rm -rf "${D}"/usr/share/sonar
 }