dff: fixes and moved src due to upstream unplesantness. 1.3 added but doesn't work yet per multilib-strict

app-forensics/dff/Manifest

@@ -1,8 +1,7 @@
-AUX dff-1.1.0-disable-qtassistant.patch 1657 SHA256 c4f17f4f3d65987802953683bce3f966d4f149c5deefc465354e63e8a090e5cf SHA512 3fd1c6695cce68989e2cc622474c09f87a5ee1502369524d1b6b4c5f25a2fcb5f4ef55fa399184aa069d6d3f7d139188a80848f922fc0e8d8f4726d3911eaca3 WHIRLPOOL 4a1eb01ee66956649aa4892dfa07c3a149317a6c1ddb5b6125c0324494d759e13ab8d25588830146946a512c81eae06e292931c25789db71d6f84896ac295c4e
-AUX dff-1.1.0-libpff-libbfio.patch 1579 SHA256 c5710ed7c45b14496ce998e464db0aced4f5ed95644bb7c43d90e8c5a0714406 SHA512 4fe0fccc58cb9a62860a10d2e73b525bee56daff8f89a16efcbc51d9387cadfa556860e60150276b4a224eaeee337e0d6b89755b0b5fb54bd632d7950ec275e1 WHIRLPOOL 1b14fc377536fc67c6d01c16b584af61bcca0b2989028b8a84b19d5e81a3881c700a59385d4583b9c088c8bd9218e8a60e298fdc2afc5cd5ec213e974516e643
 AUX dff-1.2.0-disable-qtassistant.patch 1709 SHA256 bbe3cb05c43273d50e7d45cced48f9df8c376b3079eeb963b92fad417f3f97e8 SHA512 603fc308e4ba4cfbe2d34d79a3336f6067e363d3a56ab0f06758066cecb0b96df4cc86eda93c0ce4408675b778434ad34ac6462f39cec79007287d187ceaccd4 WHIRLPOOL 419cc87ba1868dcf99222b229db5a3823c417af0c27cbf11e79b4bb35fb508c3f1e59c8f6da36a13097ccfe1a10a6491c0354c9a6bb7ffe9db60ea5d06f67f9b
 AUX dff-1.2.0-libpff-0.0.20120513.patch 9453 SHA256 8f28a4fc1d4ca0904db82492dd0cecd29898aaebab772af3f20011f2a42098ce SHA512 9608c6f22fc2997d7bc6100ba95a1702a73892c861dbb26c3b9d1d24dfd3c7a1b2384ef301b53476dfdc5b279969afe1f70aef9e0d406aac6d0fc541e04c6faf WHIRLPOOL a6b2410020fb56cf37e168aa7e3e38dcc0bbc1f7f8c9b9e530319cb337fe162d8309b8f004ae363d6e433bc9ad381e348b02a107e2a98353ae703e59af2fbcdc
+DIST dff-1.3.0.tar.gz 3905813 SHA256 6ab0a6854ff81bc5ccf891131291dc73a42c21e4382b2c9c3e2fc00376edbc0f SHA512 a77aa517a4b87939cc584b88f3ab60c625ed36eab5ba58ba56a34a4cc426f1bc69465febe76e4f0ea5682f6078ac7c9e5d5a3e27f66f957770b07cd8e800da03 WHIRLPOOL 3c02124ea592bad05ece5ed69c1cc9683f2a4298cdc3a4679c4500446b25551da3be7e1593b2c7a42eab0ae9cf8e3cfab0e78a18b2d6160418b3462a07291e64
 DIST dff-src-1.2.0.tar.gz 9925178 SHA256 e6342f1b105fa9077d4b859e1dba0214e5e899ce152b9d26342a9f14659c6de6 SHA512 761145570955214dec86704967e16ca202dc94765c0feb123556d2521f88b0083d5e5368641e352cb51dfd46264aa79977bbd654ea940e5668703f9d27931c93 WHIRLPOOL fe908b13270d3a05cbe58223eef06d6cf84279ddcfa3c5b7c7bdd499069cd52efba2cc6fdd0d365aa267e719ef81cfe96a4333126ffae6251f4a6fcf5f4e8e83
-EBUILD dff-1.2.0-r1.ebuild 1104 SHA256 eb179a48e5990ad49d2495a9a322652c6535467bee3b16ae1d6ce5366cb78258 SHA512 c0ef8616c96022efa2067bde0a98160d00eb1360ecc6e890ca4307cb1c996c83fd19799c6af38a58e8a7b4423054237c83627d24b53dcdee1148fa90f952f5fd WHIRLPOOL 5e43c250878f043110c77d9e83f78f16309d74130069b8117321f37dd0a6ccc3cc619864e870e780490473d87b1cc11664c3421d528a2434ac2f7de527f15d2d
-EBUILD dff-1.2.0-r2.ebuild 1218 SHA256 d0addf9aa2f7e53708e1efbff7ebcab1611e8c0d4065cf70241ccf130c5cbc88 SHA512 53c42b7755dacb08ca4a5766505d2f8d4018f9f4f8a84cd674141b8b60e9a210f780eb54df5d37b05a9d55688578ea02dcf25a573fd1d3edf1e8a279cfa5b7b4 WHIRLPOOL 97507d937c84a7b2fed425cf780651d05e4f4e50adea1a3b73f0c641bfc0e9044c9d3105d3e9a71389f4fd4d1ff0d3a9bd4e7ffbb4f91021bca3013b56e67125
+EBUILD dff-1.2.0-r2.ebuild 1223 SHA256 9dd3e7fdad533cc1337c5aa1dda1599ba46fe620dcdea2f968567ad78d2275cb SHA512 9588a4573725b113ecb7c43ccbf272d9c130371cf1237f68fc6c544f640b98b9be311ccb73ad2a6d0eef6df65462cfc2908dfa6a11463fefbbb6a0f79957ad47 WHIRLPOOL 8a293b70435d187a57610c8f2851fe99873cd4a1b33b7043205b3e23d157f5cfe8242e1ae1f3e637b1f2d575d327fdc109ab5d8fc1a182d3696ed96cdc7cb191
+EBUILD dff-1.3.0.ebuild 1264 SHA256 b2ab74855fb15c070286fada9d3f0e1273b1d5c1b155d36ab26365f0db440a57 SHA512 c142cbb780486e9172d62cb7e9d85762cc67b57ddd7354e55dc431a4b955d5e9211a3844468cf481c1713376f76325aca564a85aae304cb09769634cf8c9629e WHIRLPOOL 0b9c9585c420e536203ae60469f30a47be8f63b07f37da2ea2717dd2afbe9dbc552a4a01f223a295e5c85889f588fdf05177a9df424ea490379345cf6f04d2e9
 MISC metadata.xml 394 SHA256 468d24a01d9970364c6953f3f5cd896ced22cd80c417b3fbd9bd040230c37753 SHA512 b8b092ea0d173b73ac16925755a26152f941a0726be774624e6e3f09b752476902b5be14d92da241827d3f46b290c3c490fbd48949668babf6f3e3c08d974aef WHIRLPOOL 9e00f39554e4f73decccb2a099b59373ca188327719045e09381008670103ee584f5a3ace35411221abf3f07d24ab48a7eb210c868811a953fee700e81c382df

app-forensics/dff/dff-1.2.0-r2.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 PYTHON_DEPEND="2:2.6"
 
 inherit cmake-utils python
@@ -10,7 +10,7 @@ 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"
+SRC_URI="http://dev.pentoo.ch/~zero/distfiles/${PN}-src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"

app-forensics/dff/dff-1.3.0.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 PYTHON_DEPEND="2:2.6"
 
 inherit cmake-utils python
@@ -10,12 +10,12 @@ 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"
+SRC_URI="http://dev.pentoo.ch/~zero/distfiles/${PN}-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc ewf +aff +pff"
+KEYWORDS=""
+IUSE="doc ewf +aff +dff +pff"
 
 DEPEND=">=dev-lang/swig-1.3.38
 		dev-python/sip
@@ -26,7 +26,8 @@ DEPEND=">=dev-lang/swig-1.3.38
 RDEPEND="${DEPEND}
 		 ewf? ( >=app-forensics/libewf-20100226 )
 		 aff? ( >=app-forensics/afflib-3.6.8 )
-		 pff? ( >=app-forensics/libpff-0.0.20120513_alpha )
+		 dff? ( >=app-forensics/libbfio-0.0.20120425 )
+		 pff? ( >=app-forensics/libpff-0.0.20120802_alpha )
 		 "
 
 pkg_setup() {
@@ -35,8 +36,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-disable-qtassistant.patch"
-	epatch "${FILESDIR}/${P}-libpff-0.0.20120513.patch"
+	#epatch "${FILESDIR}/${P}-disable-qtassistant.patch"
+	#epatch "${FILESDIR}/${P}-libpff-0.0.20120513.patch"
+
+	python_convert_shebangs -r 2 .
+	sed -i 's:^python:python2:' ressources/linux_launcher.sh || die "sed makefile"
+
 }
 
 src_configure() {

app-forensics/dff/files/dff-1.1.0-disable-qtassistant.patch

@@ -1,41 +0,0 @@
---- dff/ui/gui/mainwindow.py.orig	2011-03-22 13:18:45.000000000 +0800
-+++ dff/ui/gui/mainwindow.py	2011-03-22 13:19:49.000000000 +0800
-@@ -49,8 +49,11 @@
- from ui.gui.resources.ui_mainwindow import Ui_MainWindow
- 
- # Documentation
--from ui.gui.widget.help import Help
--
-+HELP = True
-+try:
-+    from ui.gui.widget.help import Help
-+except ImportError:
-+    HELP = False
- 
- class MainWindow(QMainWindow, Ui_MainWindow):
-     def __init__(self,  app, debug = False):
-@@ -97,8 +100,9 @@
-         self.connect(self.actionNodeBrowser, SIGNAL("triggered()"), self.addNodeBrowser)
-         self.connect(self.actionShell, SIGNAL("triggered()"), self.shellActions.create)
-         self.connect(self.actionPython_interpreter, SIGNAL("triggered()"), self.interpreterActions.create)        ## About menu
--        self.connect(self.actionHelp, SIGNAL("triggered()"), self.addHelpWidget)
-         self.connect(self.actionAbout, SIGNAL("triggered()"), self.dialog.about)
-+        if HELP:
-+            self.connect(self.actionHelp, SIGNAL("triggered()"), self.addHelpWidget)
- 
-         # list used to build toolbar
-         # None will be a separator
-@@ -109,11 +113,12 @@
-                             self.actionShell,
-                             self.actionPython_interpreter,
-                             self.actionIdeOpen,
--                            self.actionHelp,
-                             None,
-                             self.actionMaximize,
-                             self.actionFullscreen_mode,
-                             ]
-+        if HELP:
-+            self.toolbarList = [self.actionHelp]
- 
-         # Set up toolbar
-         self.setupToolBar()

app-forensics/dff/files/dff-1.1.0-libpff-libbfio.patch

@@ -1,40 +0,0 @@
-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)