QA: Use the user-chosen ar/cc instead of just running ar/gcc directly, quoted ${S} and removed broken versions

(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)

4 files changed, 27 insertions, 125 deletions

diff --git a/app-admin/integrit/ChangeLog b/app-admin/integrit/ChangeLog
index 8c3b2497f7c9..d48ccc9ff861 100644
--- a/app-admin/integrit/ChangeLog
+++ b/app-admin/integrit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/integrit
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/integrit/ChangeLog,v 1.21 2008/03/12 09:46:42 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/integrit/ChangeLog,v 1.22 2008/12/30 17:17:24 angelos Exp $
+
+  30 Dec 2008; Christoph Mende <angelos@gentoo.org>
+  -integrit-3.02.00.ebuild, -integrit-3.05.ebuild, integrit-4.0.ebuild:
+  QA: Use the user-chosen ar/cc instead of just running ar/gcc directly,
+  quoted ${S} and removed broken versions
 
   12 Mar 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Robert Clark (hyakuhei, #154737) from metadata.xml.
diff --git a/app-admin/integrit/integrit-3.02.00.ebuild b/app-admin/integrit/integrit-3.02.00.ebuild
deleted file mode 100644
index a07b32ab805e..000000000000
--- a/app-admin/integrit/integrit-3.02.00.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/integrit/integrit-3.02.00.ebuild,v 1.16 2007/01/24 14:28:16 genone Exp $
-
-DESCRIPTION="file integrity verification program"
-HOMEPAGE="http://integrit.sourceforge.net/"
-SRC_URI="http://www.noserose.net/e/integrit/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-S=${WORKDIR}/${PN}-3.02
-
-src_compile() {
-	econf --prefix=/usr || die
-	emake || die
-	emake utils || die
-	cd ${S}/doc
-	emake || die
-	cd ${S}/hashtbl
-	emake hashtest || die
-	mv README README.hashtbl
-}
-
-src_install() {
-	dosbin integrit || die
-	dolib libintegrit.a
-	dodoc Changes HACKING README todo.txt
-
-	cd ${S}/utils
-	dosbin i-viewdb
-	dobin i-ls
-
-	cd ${S}/hashtbl
-	dolib libhashtbl.a
-	insinto /usr/include
-	doins hashtbl.h
-	dobin hashtest
-	dodoc README.hashtbl
-
-	cd ${S}/doc
-	doman i-ls.1 i-viewdb.1 integrit.1
-	doinfo integrit.info
-
-	cd ${S}/examples
-	docinto examples
-	dodoc *
-}
-
-pkg_postinst() {
-	elog "It is recommended that the integrit binary is copied to a secure"
-	elog "location and re-copied at runtime or run from a secure medium."
-	elog "You should also create a configuration file (see examples)."
-}
diff --git a/app-admin/integrit/integrit-3.05.ebuild b/app-admin/integrit/integrit-3.05.ebuild
deleted file mode 100644
index 48e3c77b35fa..000000000000
--- a/app-admin/integrit/integrit-3.05.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/integrit/integrit-3.05.ebuild,v 1.3 2007/01/24 14:28:16 genone Exp $
-
-DESCRIPTION="file integrity verification program"
-HOMEPAGE="http://integrit.sourceforge.net/"
-SRC_URI="http://www.noserose.net/e/integrit/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	econf --prefix=/usr || die
-	emake || die
-	emake utils || die
-	cd ${S}/doc
-	emake || die
-	cd ${S}/hashtbl
-	emake hashtest || die
-	mv README README.hashtbl
-}
-
-src_install() {
-	dosbin integrit || die
-	dolib libintegrit.a
-	dodoc Changes HACKING README todo.txt
-
-	cd ${S}/utils
-	dosbin i-viewdb
-	dobin i-ls
-
-	cd ${S}/hashtbl
-	dolib libhashtbl.a
-	insinto /usr/include
-	doins hashtbl.h
-	dobin hashtest
-	dodoc README.hashtbl
-
-	cd ${S}/doc
-	doman i-ls.1 i-viewdb.1 integrit.1
-	doinfo integrit.info
-
-	cd ${S}/examples
-	docinto examples
-	dodoc *
-}
-
-pkg_postinst() {
-	elog "It is recommended that the integrit binary is copied to a secure"
-	elog "location and re-copied at runtime or run from a secure medium."
-	elog "You should also create a configuration file (see examples)."
-}
diff --git a/app-admin/integrit/integrit-4.0.ebuild b/app-admin/integrit/integrit-4.0.ebuild
index 8efd2ca4f091..674fb9c1312c 100644
--- a/app-admin/integrit/integrit-4.0.ebuild
+++ b/app-admin/integrit/integrit-4.0.ebuild
@@ -1,24 +1,35 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/integrit/integrit-4.0.ebuild,v 1.4 2008/01/14 19:51:28 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/integrit/integrit-4.0.ebuild,v 1.5 2008/12/30 17:17:24 angelos Exp $
+
+inherit autotools toolchain-funcs
 
 DESCRIPTION="file integrity verification program"
 HOMEPAGE="http://integrit.sourceforge.net/"
-SRC_URI="mirror://sourceforge/integrit/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
-DEPEND="virtual/libc"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i -e "/^CC/d" configure.in hashtbl/configure.in || die
+	sed -i -e "/^AC_PROGRAM_PATH/d" configure.in hashtbl/configure.in || die
+
+	eautoreconf
+}
 
 src_compile() {
-	econf --prefix=/usr || die
+	tc-export AR
+	econf
 	emake || die
 	emake utils || die
-	cd ${S}/doc
+	cd "${S}"/doc
 	emake || die
-	cd ${S}/hashtbl
+	cd "${S}"/hashtbl
 	emake hashtest || die
 	mv README README.hashtbl
 }
@@ -28,22 +39,22 @@ src_install() {
 	dolib libintegrit.a
 	dodoc Changes HACKING README todo.txt
 
-	cd ${S}/utils
+	cd "${S}"/utils
 	dosbin i-viewdb
 	dobin i-ls
 
-	cd ${S}/hashtbl
+	cd "${S}"/hashtbl
 	dolib libhashtbl.a
 	insinto /usr/include
 	doins hashtbl.h
 	dobin hashtest
 	dodoc README.hashtbl
 
-	cd ${S}/doc
+	cd "${S}"/doc
 	doman i-ls.1 i-viewdb.1 integrit.1
 	doinfo integrit.info
 
-	cd ${S}/examples
+	cd "${S}"/examples
 	docinto examples
 	dodoc *
 }