QA: Cleanup

(Portage version: 2.2_rc23/cvs/Linux x86_64)

6 files changed, 16 insertions, 73 deletions

diff --git a/dev-util/flawfinder/ChangeLog b/dev-util/flawfinder/ChangeLog
index 6ef376ff8bb5..f9d16cf32d75 100644
--- a/dev-util/flawfinder/ChangeLog
+++ b/dev-util/flawfinder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/flawfinder
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/flawfinder/ChangeLog,v 1.11 2008/04/21 17:22:10 phreak Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/flawfinder/ChangeLog,v 1.12 2009/01/25 23:21:01 angelos Exp $
+
+  25 Jan 2009; Christoph Mende <angelos@gentoo.org>
+  -files/flawfinder-1.26-linenumbers.patch, -flawfinder-1.23.ebuild,
+  flawfinder-1.24.ebuild, -flawfinder-1.26-r1.ebuild,
+  flawfinder-1.27.ebuild:
+  QA: Cleanup
 
   21 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Fix up metadata.xml. If there's no maintainer for the package, the metadata
diff --git a/dev-util/flawfinder/files/flawfinder-1.26-linenumbers.patch b/dev-util/flawfinder/files/flawfinder-1.26-linenumbers.patch
deleted file mode 100644
index 9a67f62e7938..000000000000
--- a/dev-util/flawfinder/files/flawfinder-1.26-linenumbers.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- flawfinder-1.26/flawfinder
-+++ flawfinder-1.26/flawfinder
-@@ -1157,7 +1157,7 @@
-            i = i + 1
-            incomment = 0
-     elif instring:
--       if c == '\\': i = i + 1
-+       if c == '\\' and nextc != '\n': i = i + 1
-        elif c == '"' and instring == 1: instring = 0
-        elif c == "'" and instring == 2: instring = 0
-     else:
diff --git a/dev-util/flawfinder/flawfinder-1.23.ebuild b/dev-util/flawfinder/flawfinder-1.23.ebuild
deleted file mode 100644
index b72d89805d08..000000000000
--- a/dev-util/flawfinder/flawfinder-1.23.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/flawfinder/flawfinder-1.23.ebuild,v 1.3 2004/07/14 23:27:40 agriffis Exp $
-
-DESCRIPTION="Examines C/C++ source code for security flaws"
-HOMEPAGE="http://www.dwheeler.com/flawfinder/"
-SRC_URI="http://www.dwheeler.com/flawfinder/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/python"
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc ChangeLog INSTALL.txt README announcement
-	dodoc flawfinder.pdf
-}
diff --git a/dev-util/flawfinder/flawfinder-1.24.ebuild b/dev-util/flawfinder/flawfinder-1.24.ebuild
index 53406aa217c6..6ca0efddf48c 100644
--- a/dev-util/flawfinder/flawfinder-1.24.ebuild
+++ b/dev-util/flawfinder/flawfinder-1.24.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/flawfinder/flawfinder-1.24.ebuild,v 1.5 2004/07/15 23:40:23 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/flawfinder/flawfinder-1.24.ebuild,v 1.6 2009/01/25 23:21:01 angelos Exp $
 
 DESCRIPTION="Examines C/C++ source code for security flaws"
 HOMEPAGE="http://www.dwheeler.com/flawfinder/"
-SRC_URI="http://www.dwheeler.com/flawfinder/${P}.tar.gz"
+SRC_URI="http://www.dwheeler.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~sparc ~mips"
+KEYWORDS="~mips ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/flawfinder/flawfinder-1.26-r1.ebuild b/dev-util/flawfinder/flawfinder-1.26-r1.ebuild
deleted file mode 100644
index 34ac2ddf5e66..000000000000
--- a/dev-util/flawfinder/flawfinder-1.26-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/flawfinder/flawfinder-1.26-r1.ebuild,v 1.1 2006/02/06 10:09:21 truedfx Exp $
-
-inherit eutils
-
-DESCRIPTION="Examines C/C++ source code for security flaws"
-HOMEPAGE="http://www.dwheeler.com/flawfinder/"
-SRC_URI="http://www.dwheeler.com/flawfinder/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~mips ~amd64 ~ppc"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/python"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-linenumbers.patch
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc ChangeLog INSTALL.txt README announcement
-	dodoc flawfinder.pdf
-}
diff --git a/dev-util/flawfinder/flawfinder-1.27.ebuild b/dev-util/flawfinder/flawfinder-1.27.ebuild
index f40aac8e7bdb..6bcb78390b31 100644
--- a/dev-util/flawfinder/flawfinder-1.27.ebuild
+++ b/dev-util/flawfinder/flawfinder-1.27.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/flawfinder/flawfinder-1.27.ebuild,v 1.1 2007/06/27 12:09:37 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/flawfinder/flawfinder-1.27.ebuild,v 1.2 2009/01/25 23:21:01 angelos Exp $
 
 DESCRIPTION="Examines C/C++ source code for security flaws"
 HOMEPAGE="http://www.dwheeler.com/flawfinder/"
-SRC_URI="http://www.dwheeler.com/flawfinder/${P}.tar.gz"
+SRC_URI="http://www.dwheeler.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~mips ~amd64 ~ppc"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=""