Version bump (bug #358031 by Pierre-Yves Bonnetain <expert-judiciaire@ba-consultants.fr>); remove unneeded AUX file (bug #341053 by jalan <jalanpalmer@gmail.com>); general cleanup: bump to EAPI 4, use canonical variables order, fix automagic deps.

(Portage version: 2.1.9.42/cvs/Linux i686)

4 files changed, 24 insertions, 71 deletions

diff --git a/app-forensics/sleuthkit/ChangeLog b/app-forensics/sleuthkit/ChangeLog
index dfc202ba0570..9b1e89e2965a 100644
--- a/app-forensics/sleuthkit/ChangeLog
+++ b/app-forensics/sleuthkit/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-forensics/sleuthkit
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/ChangeLog,v 1.44 2010/02/19 15:06:32 patrick Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/ChangeLog,v 1.45 2011/06/05 15:11:30 phajdan.jr Exp $
+
+*sleuthkit-3.2.1 (05 Jun 2011)
+
+  05 Jun 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -files/sleuthkit-2.01-include_fix.patch, -sleuthkit-3.0.0.ebuild,
+  -sleuthkit-3.0.1.ebuild, +sleuthkit-3.2.1.ebuild:
+  Version bump (bug #358031 by Pierre-Yves Bonnetain
+  <expert-judiciaire@ba-consultants.fr>); remove unneeded AUX file (bug #341053
+  by jalan <jalanpalmer@gmail.com>); general cleanup: bump to EAPI 4, use
+  canonical variables order, fix automagic deps.
 
 *sleuthkit-3.1.0 (19 Feb 2010)
 
diff --git a/app-forensics/sleuthkit/files/sleuthkit-2.01-include_fix.patch b/app-forensics/sleuthkit/files/sleuthkit-2.01-include_fix.patch
deleted file mode 100644
index 2574d76db8de..000000000000
--- a/app-forensics/sleuthkit/files/sleuthkit-2.01-include_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/misc/tsk_os.h.old	2005-04-28 23:12:56.000000000 +0000
-+++ src/misc/tsk_os.h	2005-04-28 23:11:34.000000000 +0000
-@@ -77,7 +77,7 @@
-   */
- #if defined(LINUX2)
- #define SUPPORTED
--#include <linux/types.h>
-+/* #include <linux/types.h> */ 
- #include <inttypes.h>
- #endif				/* LINUX */
- 
diff --git a/app-forensics/sleuthkit/sleuthkit-3.0.0.ebuild b/app-forensics/sleuthkit/sleuthkit-3.0.0.ebuild
deleted file mode 100644
index 97662cbf42d5..000000000000
--- a/app-forensics/sleuthkit/sleuthkit-3.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/sleuthkit-3.0.0.ebuild,v 1.3 2009/03/06 00:01:30 jer Exp $
-
-inherit eutils flag-o-matic autotools
-
-SLOT=0
-
-DESCRIPTION="A collection of file system and media management forensic analysis tools"
-HOMEPAGE="http://www.sleuthkit.org/sleuthkit/"
-SRC_URI="mirror://sourceforge/sleuthkit/${P}.tar.gz"
-
-LICENSE="GPL-2 IBM"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
-
-# disabling until imported into portage - patrick
-#DEPEND="ewf? ( app-forensics/libewf )
-#	aff? ( app-forensics/afflib )"
-RDEPEND="dev-perl/DateManip"
-
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# AC_FUNC_REALLOC in configure.ac that hasn't been propagated
-	eautoreconf
-}
-
-src_compile() {
-	econf	|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc docs/*.txt README.txt CHANGES.txt TODO.txt
-}
diff --git a/app-forensics/sleuthkit/sleuthkit-3.0.1.ebuild b/app-forensics/sleuthkit/sleuthkit-3.2.1.ebuild
index 7d2ac62ccb78..164a28120e83 100644
--- a/app-forensics/sleuthkit/sleuthkit-3.0.1.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-3.2.1.ebuild
@@ -1,38 +1,30 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/sleuthkit-3.0.1.ebuild,v 1.2 2009/05/01 19:08:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/sleuthkit-3.2.1.ebuild,v 1.1 2011/06/05 15:11:30 phajdan.jr Exp $
 
-inherit eutils flag-o-matic autotools
-
-SLOT=0
+EAPI="4"
 
 DESCRIPTION="A collection of file system and media management forensic analysis tools"
 HOMEPAGE="http://www.sleuthkit.org/sleuthkit/"
-SRC_URI="mirror://sourceforge/sleuthkit/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 IBM"
+SLOT=0
 KEYWORDS="~amd64 ~arm ~hppa ~s390 ~sparc ~x86"
+IUSE="aff ewf"
 
 DEPEND="ewf? ( app-forensics/libewf )
 	aff? ( app-forensics/afflib )"
 RDEPEND="${DEPEND}
 	dev-perl/DateManip"
 
-IUSE="aff ewf"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# AC_FUNC_REALLOC in configure.ac that hasn't been propagated
-	eautoreconf
-}
-
-src_compile() {
-	econf	|| die "configure failed"
-	emake || die "make failed"
+src_configure() {
+	econf \
+		$(use_with aff afflib) \
+		$(use_with ewf libewf)
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc docs/*.txt README.txt CHANGES.txt TODO.txt
+	default
+	dodoc docs/*.txt README.txt
 }