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.

Package-Manager: portage-2.1.9.42/cvs/Linux i686

5 files changed, 37 insertions, 76 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/Manifest b/app-forensics/sleuthkit/Manifest
index 31e25d845898..f817df483e2f 100644
--- a/app-forensics/sleuthkit/Manifest
+++ b/app-forensics/sleuthkit/Manifest
@@ -1,15 +1,23 @@
-AUX sleuthkit-2.01-include_fix.patch 291 RMD160 7fe44a7d4440045a688197f1866791b74405c3e1 SHA1 f0d72a58242d595ba0d0a03af0ef165aaf195620 SHA256 138582488fe95ce602974c11b00e1ebbef8a45fd5713b2a2ffaf2c7a007dcaae
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX sleuthkit-fscheck.c_fix.patch 2866 RMD160 cb0f7b3074df2a009dc6a213555a583deae5abfe SHA1 45697778aaf36c4c5c0fc7740b85266cd4de44c6 SHA256 3115ebcbc6d39bce88448c7c624f855c0a7fb0fd83f2d6dc1e02828b631e13dd
 AUX sleuthkit-makefiles_fix.patch 4069 RMD160 ab25ef83d21215789d56803b0689f05e798c84ea SHA1 f1247415930133509a1ad0a620c480c17c6b7656 SHA256 9ee0451f194b4e434b70720b568549b09e078a514617f82123db6214401d6448
 DIST sleuthkit-2.09.tar.gz 2027006 RMD160 0d7247c533f35f0cb7d11ead8d2242533d89fda4 SHA1 9d2db6868026d887a83b0becb4d95a69527df457 SHA256 43c62d9c2767a0acee4e9aab895c743c2ecdc758ebfab2d0062ddf353ebf2803
 DIST sleuthkit-2.09_dbtool.patch.bz2 9049 RMD160 e88c225929a2286d223e44d4ecf26abf2d6456ff SHA1 46f57860e77ddbc4c4c0c055639b6ab4852abb7c SHA256 7cdf4611634c318731b686059e2114f5b418d45ed5eefdcea90847ce0386d6e3
 DIST sleuthkit-3.0.0.tar.gz 814597 RMD160 971213ab039ebe3c7020ab890e43d17a2f89bc4c SHA1 0993bf745579cac48654d0b2efc0d8c548f44273 SHA256 372b72ef90f6e25864780ac9423d47a56c60a1cab3566c4ea27907deff1f2f39
-DIST sleuthkit-3.0.1.tar.gz 814032 RMD160 966613ef87a5523134b2d6482ee834fffb98b1ee SHA1 a578d02c026ccb4389fd463445d9e7d329aeeaf9 SHA256 70fac54c39f8631a6ecedc44b39395ddb3d17f9236d71d50bcbfabf5e8b60ddd
 DIST sleuthkit-3.1.0.tar.gz 842104 RMD160 543f7fae08a289bf11d2caa8c0d0c091cb909038 SHA1 60a597d394841360c2130a9060333ad7a6482e17 SHA256 f6f5b9d0206aa057e83a3dee3be6ebea59843c5ae44af39f415ccac28e1c4dc5
+DIST sleuthkit-3.2.1.tar.gz 2033920 RMD160 d20a6e46da9aef30117f93a24701a18c5d513626 SHA1 07966f3b95e00569d0df826fa713b8272b272bf6 SHA256 e0f257d2c6856dc1c1cd2a704c6cb8906ca688f0cdbb1d0665fd7a5a2f83ad37
 EBUILD sleuthkit-2.09.ebuild 2144 RMD160 5a0620db7cf5edcc449ba57f1d797aa16faa84f0 SHA1 579f51f592f961e918b26d3867e90063638a4935 SHA256 48bdd743ae9dd9f27ecef406e0929f75b37926c417f1887c3e37a2f2f2af8c5e
 EBUILD sleuthkit-3.0.0-r1.ebuild 971 RMD160 476981c2cc3e35e021f250b46ec0d8edd375e653 SHA1 bf518feec69ce2f424f3662c0d57d782042c546d SHA256 4b8c31872e714a0004ddc91ff0f9e3191c031089fc6ff0b91b8829da8c45a118
-EBUILD sleuthkit-3.0.0.ebuild 998 RMD160 adfbfadfc524ac1012d48748403b95b3e8aa4b6f SHA1 5fe117a2b017be24a3c5c4b0491ab1e4434fda1b SHA256 b3913013145246b970775b8ab20bb7a182e619284654c421c7089b7bb52b567d
-EBUILD sleuthkit-3.0.1.ebuild 963 RMD160 0fe8c75f2d2524b5cdec1b73eaf4cc8a23bcaec4 SHA1 9de5755d40bf5eb1fb3ca96580b23ef1f052f30b SHA256 62064195f600a9c485ae016b69d5004f1d73882a530ca9089e7e02b885f3a868
 EBUILD sleuthkit-3.1.0.ebuild 963 RMD160 9aa3f81c87b3d04244f59a12d843dd73f8d73e17 SHA1 487bf31f7cdde7f411d4b2c7b636dc3f63a888b5 SHA256 407d427f54eaa72337fc504bba4a2e7f0f626b0a5c5d979763da00029e1a24bd
-MISC ChangeLog 7471 RMD160 e540b8a57705214304cd0809881418fceb2f88b2 SHA1 c1b0ad63e573bef57d9838bbd2d20fd6a058d2dd SHA256 9963b9127420414724030a08bbdbe70fefb68edd7cdb2734cf94ad01e60ae296
+EBUILD sleuthkit-3.2.1.ebuild 766 RMD160 b2ead7917fd2dca1821167b6fd1c17aa9bc91b78 SHA1 1683489ae1303827381ec86abbc59bb1ace48ab2 SHA256 55d446039f1bbb465f6a6cec6c122df2c75f80a89d600ad99e29307096d1b511
+MISC ChangeLog 7938 RMD160 bee7eb512e028ddbe16fb64a15eee1b3a6d11b71 SHA1 3154f54e985a93130b81c0efd79b5168c6328781 SHA256 8cc013620487b1747ebc5a4af6199d903fde516e83f30b6737c575c2e80104cb
 MISC metadata.xml 411 RMD160 80696a4e5d3c78ad879a2269e2cec28f8502d9df SHA1 e114e5a12d6c1fcd095d973d7bdf233a208af01a SHA256 9838db9fe7a909fb1e04e3b8ab5b762adf3fad4d78d4355ba523b589326a451a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3rnKsACgkQuUQtlDBCeQIBnwCcCZrcFIDABk/df6NP5oDW5yLW
+lcMAnRfXJNIBBD0DnbQwgS4cP1dn5FDL
+=9FR9
+-----END PGP SIGNATURE-----
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
 }