Version bumped, bug #159542.

(Portage version: 2.1.2.4)

7 files changed, 44 insertions, 39 deletions

diff --git a/app-admin/lsat/ChangeLog b/app-admin/lsat/ChangeLog
index 9146c387234d..c97a66970acb 100644
--- a/app-admin/lsat/ChangeLog
+++ b/app-admin/lsat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/lsat
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lsat/ChangeLog,v 1.16 2007/02/04 01:48:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lsat/ChangeLog,v 1.17 2007/04/28 01:28:27 matsuu Exp $
+
+*lsat-0.9.5 (28 Apr 2007)
+
+  28 Apr 2007; MATSUU Takuto <matsuu@gentoo.org>
+  +files/lsat-0.9.5-gentoo.patch, -lsat-0.8.8.ebuild, -lsat-0.9.0.ebuild,
+  +lsat-0.9.5.ebuild:
+  Version bumped, bug #159542.
+  Removed old versions.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/app-admin/lsat/files/digest-lsat-0.8.8 b/app-admin/lsat/files/digest-lsat-0.8.8
deleted file mode 100644
index 8d82a867377e..000000000000
--- a/app-admin/lsat/files/digest-lsat-0.8.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aae23fb04f1b9d9f2d78f033ddf49c2b lsat-0.8.8.tgz 65603
-RMD160 a044bf4defc821f09fb0d83c4f2c68561ef1b349 lsat-0.8.8.tgz 65603
-SHA256 0509db8e892c3a996558f92d0020c74c42ffda2a1c65e77d19b406a57cba6664 lsat-0.8.8.tgz 65603
diff --git a/app-admin/lsat/files/digest-lsat-0.9.0 b/app-admin/lsat/files/digest-lsat-0.9.0
deleted file mode 100644
index 81040dfca69b..000000000000
--- a/app-admin/lsat/files/digest-lsat-0.9.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5ad46f15cff30f875a966b3aba3479f7 lsat-0.9.0.tgz 71128
-RMD160 8c476a8344b5c901e1400cdde06203dba44b8737 lsat-0.9.0.tgz 71128
-SHA256 a3619325353e59302d9fb76c05aa50823df9118063e62672dd02b58dc128bda9 lsat-0.9.0.tgz 71128
diff --git a/app-admin/lsat/files/digest-lsat-0.9.5 b/app-admin/lsat/files/digest-lsat-0.9.5
new file mode 100644
index 000000000000..70c71f956ac1
--- /dev/null
+++ b/app-admin/lsat/files/digest-lsat-0.9.5
@@ -0,0 +1,3 @@
+MD5 b674a4854d3360b0b657c57515db29a9 lsat-0.9.5.tgz 71529
+RMD160 5c954e064a47fd0f7c3f35235635b3036f139f46 lsat-0.9.5.tgz 71529
+SHA256 7f979a1c76c375fdef7d0c8ccb732ab832cd6a85d9c1dad6265f7b409f5d4e12 lsat-0.9.5.tgz 71529
diff --git a/app-admin/lsat/files/lsat-0.9.5-gentoo.patch b/app-admin/lsat/files/lsat-0.9.5-gentoo.patch
new file mode 100644
index 000000000000..cf164e567035
--- /dev/null
+++ b/app-admin/lsat/files/lsat-0.9.5-gentoo.patch
@@ -0,0 +1,20 @@
+diff -Naur lsat-0.9.5.orig/checkpkgs.c lsat-0.9.5/checkpkgs.c
+--- lsat-0.9.5.orig/checkpkgs.c	2007-04-27 00:48:31.000000000 +0900
++++ lsat-0.9.5/checkpkgs.c	2007-04-28 10:11:17.000000000 +0900
+@@ -113,14 +113,14 @@
+     }
+ 
+ 
+-    /* if distro = gentoo, use pkglist */
++    /* if distro = gentoo, use qpkg */
+     if (distribution == 4)
+     {
+         if (verbose > 0)
+         {
+             printf(" Generating list of pkgs on system.\n");
+         }
+-        shellcode = "/usr/lib/portage/bin/pkglist 2>/dev/null >>/tmp/lsat1.lsat";
++        shellcode = "/usr/bin/qpkg -I -nc 2>/dev/null >>/tmp/lsat1.lsat";
+         if ((dostuff(tempfile, 0, shellcode, 0, html)) < 0)
+         {
+             /* rhut-rho...something bad happened */
diff --git a/app-admin/lsat/lsat-0.9.0.ebuild b/app-admin/lsat/lsat-0.9.0.ebuild
deleted file mode 100644
index c5ac08bd5df1..000000000000
--- a/app-admin/lsat/lsat-0.9.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lsat/lsat-0.9.0.ebuild,v 1.8 2005/01/01 11:09:52 eradicator Exp $
-
-DESCRIPTION="The Linux Security Auditing Tool"
-HOMEPAGE="http://usat.sourceforge.net/"
-SRC_URI="http://usat.sourceforge.net/code/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc amd64"
-IUSE=""
-
-RDEPEND="virtual/libc
-	dev-libs/popt"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-src_compile() {
-	econf || die
-	emake CFLAGS="${CFLAGS}" SLIBS="-lpopt" all manpage || die
-}
-
-src_install() {
-	dobin lsat || die
-	doman lsat.1
-	dodoc INSTALL README* *.txt
-	dohtml modules.html changelog/changelog.html
-}
diff --git a/app-admin/lsat/lsat-0.8.8.ebuild b/app-admin/lsat/lsat-0.9.5.ebuild
index a10d81c1037d..00ded5bd4d09 100644
--- a/app-admin/lsat/lsat-0.8.8.ebuild
+++ b/app-admin/lsat/lsat-0.9.5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lsat/lsat-0.8.8.ebuild,v 1.7 2005/01/01 11:09:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lsat/lsat-0.9.5.ebuild,v 1.1 2007/04/28 01:28:27 matsuu Exp $
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="The Linux Security Auditing Tool"
 HOMEPAGE="http://usat.sourceforge.net/"
@@ -8,7 +10,7 @@ SRC_URI="http://usat.sourceforge.net/code/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="virtual/libc
@@ -16,7 +18,14 @@ RDEPEND="virtual/libc
 DEPEND="${RDEPEND}
 	dev-lang/perl"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
 src_compile() {
+	tc-export CC
 	econf || die
 	emake CFLAGS="${CFLAGS}" SLIBS="-lpopt" all manpage || die
 }