[gentoo-commits] dev/ikelos:master commit in: app-forensics/libbfio/, app-forensics/libpff/, app-forensics/dff/files/, ...

[Mike Auty]

commit:     2ce8154e2741ad07ae69f76a9585df7f4c536adc
Author:     Mike Auty <ikelos <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 21:35:14 2011 +0000
Commit:     Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Mon May 30 21:35:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=2ce8154e

Bump dff to 1.1.0, along with auxiliary dependencies libpff and libbfio.

---
 app-forensics/dff/Manifest                         |    3 +
 app-forensics/dff/dff-1.1.0.ebuild                 |   41 ++++++++++++++++++++
 .../dff/files/dff-1.1.0-libpff-libbfio.patch       |   40 +++++++++++++++++++
 app-forensics/libbfio/Manifest                     |    2 +
 .../libbfio-0.0.20110312_alpha.ebuild}             |    4 +-
 app-forensics/libpff/Manifest                      |    2 +-
 .../libpff/libpff-0.0.20110413_alpha.ebuild        |    2 +-
 7 files changed, 90 insertions(+), 4 deletions(-)

diff --git a/app-forensics/dff/Manifest b/app-forensics/dff/Manifest
index 7595f0c..3951fa1 100644
--- a/app-forensics/dff/Manifest
+++ b/app-forensics/dff/Manifest
@@ -1,7 +1,10 @@
 AUX dff-0.9-disable-qtassistant.patch 2003 RMD160 cc8ab1c4b831c8d10a51924f741179cad0a6cd12 SHA1 956e91729adcb672b1ad4627f92ce73314a61d5b SHA256 74ba69e0de124a8b2df80db4aa496d45ce8675bd1e429989deca0e302e8329a2
 AUX dff-1.0.0-disable-qtassistant.patch 1657 RMD160 06b9679458b97f91c33eb74fa84d7c0d55b816eb SHA1 535d4e60cee04b53d044f273053cd69043472197 SHA256 c4f17f4f3d65987802953683bce3f966d4f149c5deefc465354e63e8a090e5cf
+AUX dff-1.1.0-libpff-libbfio.patch 1579 RMD160 78f3c0dde17e362fb2e394a934c6056378d5e8cf SHA1 73ac651c35566a2ed077fada9c3411eacd578aa6 SHA256 c5710ed7c45b14496ce998e464db0aced4f5ed95644bb7c43d90e8c5a0714406
 DIST dff-src-0.9.tar.gz 8855562 RMD160 217920495f5c88cc8767eba0cbaaf04094856422 SHA1 6289143384b4de85b540354d7b89c05d95faf1a9 SHA256 7456c948b4e8fcbf26174784df3f5815475dcacc68a70f76e3281751c2c35856
 DIST dff-src-1.0.0.tar.gz 9793438 RMD160 82dbf88845012ac12d57fafd9937adf5281a99a0 SHA1 b103026f3fa2d313f2c832274d361007f79a84ba SHA256 365bd6e662f7585846f8821e12c548ed405c36a4ecd57b8a98c759162d6b2444
+DIST dff-src-1.1.0.tar.gz 9751963 RMD160 59c62046e6f06766fdfe27ae4b1c7e8f811f5c13 SHA1 3eb0700b40a4bdc29ab9dbd3ecbae0441303b6b3 SHA256 0dab2e10f9c2cb2d1363b51284e9616725f85e84aea58719848f41626fa894d1
 EBUILD dff-0.9.ebuild 963 RMD160 5ada28efa9cf31f96908daff0e75babd722bae31 SHA1 16588e175829b559c04313227aa85c011151a2aa SHA256 1253256f26a7e1f2c9be80e24b6544591df2ae07087d1110a3691242397ef884
 EBUILD dff-1.0.0-r1.ebuild 896 RMD160 91441fbbb74192d4dce0116c98d6cc4f4a0ffcb4 SHA1 f1f0d54a6d78d20928a902b80a7a3c2d426d302a SHA256 c5531888c539204a2b4730c9605781df64d0bea9bfded3c40aa57e976953bb80
+EBUILD dff-1.1.0.ebuild 1039 RMD160 d0af5bbbd6133e8316f5d51749b17df776758a2e SHA1 4780b82710142d9616f2c58842b4a88121760161 SHA256 2f8abdf0aef44538098eb08e6a9d974d06cbb2155e28711ab8d219a947db0400
 MISC metadata.xml 394 RMD160 df210fb9ce05a23c5baec3b506f7767020600437 SHA1 aaaa68db4a9341176e4a4abf0191ef0eefca5588 SHA256 468d24a01d9970364c6953f3f5cd896ced22cd80c417b3fbd9bd040230c37753

diff --git a/app-forensics/dff/dff-1.1.0.ebuild b/app-forensics/dff/dff-1.1.0.ebuild
new file mode 100644
index 0000000..0bc1dc7
--- /dev/null
+++ b/app-forensics/dff/dff-1.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+PYTHON_DEPEND="2:2.6"
+
+inherit cmake-utils python
+
+DESCRIPTION="A digital forensics framework which aims to analyze and recover any
+kind of digital artifact."
+HOMEPAGE="http://tracker.digital-forensic.org/"
+SRC_URI="http://www.digital-forensic.org/${PN}-src-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="phonon doc ewf +aff +pff"
+
+DEPEND=">=dev-lang/swig-1.3.38
+		dev-python/sip
+		doc? ( >=dev-python/PyQt4-4.4.0[phonon?,webkit,assistant] )
+		!doc? ( >=dev-python/PyQt4-4.4.0[phonon?] )
+		>=sys-apps/file-4.26[python]
+		"
+RDEPEND="${DEPEND}
+		 ewf? ( >=app-forensics/libewf-20100226 )
+		 aff? ( >=app-forensics/afflib-3.6.8 )
+		 pff? ( app-forensics/libpff )
+		 "
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.0.0-disable-qtassistant.patch"
+	epatch "${FILESDIR}/${PN}-1.1.0-libpff-libbfio.patch"
+}
+
+src_configure() {
+	mycmakeargs+=( "-DINSTALL:BOOLEAN=ON" )
+	cmake-utils_src_configure
+}
+

diff --git a/app-forensics/dff/files/dff-1.1.0-libpff-libbfio.patch b/app-forensics/dff/files/dff-1.1.0-libpff-libbfio.patch
new file mode 100644
index 0000000..b69d73a
--- /dev/null
+++ b/app-forensics/dff/files/dff-1.1.0-libpff-libbfio.patch
@@ -0,0 +1,40 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1321a40..1f78be7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -225,19 +225,10 @@ endif(ENABLE_INDEXER)
+ # Need libbfio separate installation for DFF to be able to use PFF.
+ # To summarize, install http://libbfio.sf.net first, before http://libpff.sf.net .
+ if(UNIX)
+-  if(INSTALL)
+-    # Link with static version at install, until PFF be added to respective packages streams
+-    find_library(PFF_MAIN_LIBRARY NAMES libpff.a)
+-  else(INSTALL)
+-    find_library(PFF_MAIN_LIBRARY NAMES pff)
+-  endif(INSTALL)
++  find_library(PFF_MAIN_LIBRARY NAMES pff)
+   if(PFF_MAIN_LIBRARY)
+     message(STATUS "PFF library found: ${PFF_MAIN_LIBRARY}")
+-    if(INSTALL)
+-      find_library(PFF_BFIO_LIBRARY NAMES libbfio.a)
+-    else(INSTALL)
+-      find_library(PFF_BFIO_LIBRARY NAMES bfio)
+-    endif(INSTALL)
++    find_library(PFF_BFIO_LIBRARY NAMES bfio)
+     if(PFF_BFIO_LIBRARY)
+       message(STATUS "Separate PFF bfio library found: ${PFF_BFIO_LIBRARY}")
+     else(PFF_BFIO_LIBRARY)
+@@ -251,12 +242,7 @@ endif(UNIX)
+ ## AFFlib check for AFF connector, added separatly on windows
+ # TODO ; we need afflib >= 3.6, this have to be checked
+ if(UNIX)
+-  if(INSTALL)
+-    # Link with static version at install, until AFF >= 3.6 be added to respective packages streams
+-    find_library(AFF_LIBRARY NAMES libafflib.a)
+-  else(INSTALL)
+-    find_library(AFF_LIBRARY NAMES afflib)
+-  endif(INSTALL)
++  find_library(AFF_LIBRARY NAMES afflib)
+   if(AFF_LIBRARY)
+     message(STATUS "AFF library found: ${AFF_LIBRARY}")
+   else(AFF_LIBRARY)

diff --git a/app-forensics/libbfio/Manifest b/app-forensics/libbfio/Manifest
new file mode 100644
index 0000000..45edd22
--- /dev/null
+++ b/app-forensics/libbfio/Manifest
@@ -0,0 +1,2 @@
+DIST libbfio-alpha-20110312.tar.gz 560032 RMD160 a529d2e161c15798cc48ce70be3c4bcde6f9047d SHA1 5023eb6d842addc2dd8f864f4b9c484ea89fab0d SHA256 934a1f42e44f68a32db1206eeee21cc7bd040820068be12b926d0b153b2ec191
+EBUILD libbfio-0.0.20110312_alpha.ebuild 625 RMD160 0c41d245147fcba58e630558b8f812b3ac7293c7 SHA1 b81c48716e68f9ca1f1ad62c5a10b7e9a9736994 SHA256 5766dd91b833116397fd5b4885daea51e72889cc99f236e811b58a5d8fd25463

diff --git a/app-forensics/libpff/libpff-0.0.20110413_alpha.ebuild b/app-forensics/libbfio/libbfio-0.0.20110312_alpha.ebuild
similarity index 80%
copy from app-forensics/libpff/libpff-0.0.20110413_alpha.ebuild
copy to app-forensics/libbfio/libbfio-0.0.20110312_alpha.ebuild
index 4720aba..e098a96 100644
--- a/app-forensics/libpff/libpff-0.0.20110413_alpha.ebuild
+++ b/app-forensics/libbfio/libbfio-0.0.20110312_alpha.ebuild
@@ -8,8 +8,8 @@ inherit versionator
 
 MY_DATE="$(get_version_component_range 3)"
 
-DESCRIPTION="Library for accessing Personal Folder Files."
-HOMEPAGE="http://sf.net/projects/libpff"
+DESCRIPTION="Library for providing a basic file input/output abstraction layer."
+HOMEPAGE="http://sf.net/projects/libbfio"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}-alpha/${PN}-alpha-${MY_DATE}/${PN}-alpha-${MY_DATE}.tar.gz"
 
 LICENSE="LGPL-3"

diff --git a/app-forensics/libpff/Manifest b/app-forensics/libpff/Manifest
index f54b842..b3d5181 100644
--- a/app-forensics/libpff/Manifest
+++ b/app-forensics/libpff/Manifest
@@ -1,2 +1,2 @@
 DIST libpff-alpha-20110413.tar.gz 1103923 RMD160 1fc64d8d574364f9f208cb94a2d05aebb4ce2b2e SHA1 3071f0b7e767f9e71ce5d09d95988f7a6dc3a8e7 SHA256 9d2ec6778abc8228ada26e3fc41731c701976c11474668edf49d5f79d42fd62d
-EBUILD libpff-0.0.20110413_alpha.ebuild 619 RMD160 61a2ed88e29fc8043bbb0a8a79bfbc7210042df7 SHA1 ec4155a28d5f90b6c2eb2e373f3c3e03e313bc35 SHA256 51affbc8dc1c14763226b6008fbd4e42805a3e0ea3f73d286f4823eb9b600ea0
+EBUILD libpff-0.0.20110413_alpha.ebuild 623 RMD160 3dbdf1bbbab98a7d156538bebd316b6186a476f6 SHA1 0654345768674ce5e0143e49991a6d9a4fbb85fd SHA256 ef523effb25593eadb78e08820c1b7d4a2b912fd90c64dcfedbeb226e60f58f6

diff --git a/app-forensics/libpff/libpff-0.0.20110413_alpha.ebuild b/app-forensics/libpff/libpff-0.0.20110413_alpha.ebuild
index 4720aba..de23244 100644
--- a/app-forensics/libpff/libpff-0.0.20110413_alpha.ebuild
+++ b/app-forensics/libpff/libpff-0.0.20110413_alpha.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND=""
+DEPEND="app-forensics/libbfio"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${MY_DATE}"