From e6fdb9145749f6361af880c13a14ecf37b6a7932 Mon Sep 17 00:00:00 2001
From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
Date: Mon, 30 Jan 2017 15:20:00 -0500
Subject: [PATCH] libpff: update, dff: cleanup, metadata fixes

---
 ...ff-1.3.0-r6.ebuild => dff-1.3.0-r7.ebuild} | 11 +++++---
 app-forensics/libpff/Manifest                 |  5 +---
 .../libpff/libpff-0.0.20110413_alpha.ebuild   | 27 -------------------
 .../libpff/libpff-0.0.20120513_alpha.ebuild   | 27 -------------------
 .../libpff/libpff-0.0.20120611_alpha.ebuild   | 27 -------------------
 ...build => libpff-0.0.20161119_alpha.ebuild} | 14 ++++------
 metadata/layout.conf                          |  4 +--
 .../package.accept_keywords/app-forensics     |  2 +-
 8 files changed, 16 insertions(+), 101 deletions(-)
 rename app-forensics/dff/{dff-1.3.0-r6.ebuild => dff-1.3.0-r7.ebuild} (97%)
 delete mode 100644 app-forensics/libpff/libpff-0.0.20110413_alpha.ebuild
 delete mode 100644 app-forensics/libpff/libpff-0.0.20120513_alpha.ebuild
 delete mode 100644 app-forensics/libpff/libpff-0.0.20120611_alpha.ebuild
 rename app-forensics/libpff/{libpff-0.0.20120802_alpha.ebuild => libpff-0.0.20161119_alpha.ebuild} (53%)

diff --git a/app-forensics/dff/dff-1.3.0-r6.ebuild b/app-forensics/dff/dff-1.3.0-r7.ebuild
similarity index 97%
rename from app-forensics/dff/dff-1.3.0-r6.ebuild
rename to app-forensics/dff/dff-1.3.0-r7.ebuild
index fe56c1402..ee723a113 100644
--- a/app-forensics/dff/dff-1.3.0-r6.ebuild
+++ b/app-forensics/dff/dff-1.3.0-r7.ebuild
@@ -24,16 +24,19 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-python/PyQt4-4.4.0[${PYTHON_USEDEP}]
 	dev-python/python-magic[${PYTHON_USEDEP}]
 	dev-python/apsw[${PYTHON_USEDEP}]
+	virtual/udev
+	virtual/ffmpeg
+	dev-libs/tre[python]
+	sys-fs/fuse
+	aff? ( >=app-forensics/afflib-3.6.8 )
+	ewf? ( >=app-forensics/libewf-20100226 )
+	dev-libs/icu
 	"
 
 DEPEND="${RDEPEND}
-	virtual/ffmpeg
-	ewf? ( >=app-forensics/libewf-20100226 )
-	aff? ( >=app-forensics/afflib-3.6.8 )
 	bfio? ( >=app-forensics/libbfio-0.0.20120425 )
 	pff? ( >=app-forensics/libpff-0.0.20120802_alpha )
 	>=dev-lang/swig-1.3.38
-	dev-libs/tre[python]
 	app-forensics/reglookup"
 
 pkg_setup() {
diff --git a/app-forensics/libpff/Manifest b/app-forensics/libpff/Manifest
index e09e53c6b..369972ea5 100644
--- a/app-forensics/libpff/Manifest
+++ b/app-forensics/libpff/Manifest
@@ -1,4 +1 @@
-DIST libpff-alpha-20110413.tar.gz 1103923 SHA256 9d2ec6778abc8228ada26e3fc41731c701976c11474668edf49d5f79d42fd62d
-DIST libpff-alpha-20120513.tar.gz 1381565 SHA256 6a8137291678a94342198f78290e9af8f4975ae54bfc5c3aabfc30b0e45ca7bb
-DIST libpff-alpha-20120611.tar.gz 1393795 SHA256 3155b27cf4758bff71dc6d3a15db3258ff3e843d9fe3a165e03c32e0d8ff42a2
-DIST libpff-alpha-20120802.tar.gz 1665471 SHA256 4b78464200d04c77e182e09dc2af8d6f6c5519af12994e1ce96cd3b0e7a2ea62 SHA512 ea9d994c97fbcc95b268e4bf032391a1bf7ce7009c89692166c0ad821de61657c56c40c294926167da5816fb8ca6ea9d3f8c1da85c8c14f8d9611fa502c5bdfc WHIRLPOOL a320639b615b021c726516c0d77f06da474b2f12d839b2bc3d6cc7053a911eeb202b60e32c8810ccb4510cd4291cef952578946800471791924515f4d9ab7789
+DIST libpff-0.0.20161119_alpha.tar.gz 735781 SHA256 6503a2c89169a62165d72006d6e27cdd2c210d6c2ac5b40e471431d52851705a SHA512 191bc9b87f750cde2bf17ae3b4679139d94fbf690fc561337fff6fc767e2c10de785fb0ffda961271f8fc323022f5a8288f6b5ea5493c0cc6e83960c2f95065b WHIRLPOOL 6a449aa22698bcc5f3a981b4f432f1a65c0de9f3ffef1c8522c6e0c86edc42a432bb7c399e7dc745a6657b7c4e565f841d66e74a651c707ad4f6d2fa1bfee033
diff --git a/app-forensics/libpff/libpff-0.0.20110413_alpha.ebuild b/app-forensics/libpff/libpff-0.0.20110413_alpha.ebuild
deleted file mode 100644
index de232445c..000000000
--- a/app-forensics/libpff/libpff-0.0.20110413_alpha.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit versionator
-
-MY_DATE="$(get_version_component_range 3)"
-
-DESCRIPTION="Library for accessing Personal Folder Files."
-HOMEPAGE="http://sf.net/projects/libpff"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-alpha/${PN}-alpha-${MY_DATE}/${PN}-alpha-${MY_DATE}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="app-forensics/libbfio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_DATE}"
-
-src_install() {
-	emake install DESTDIR="${D}" || die "Failed to install"
-}
diff --git a/app-forensics/libpff/libpff-0.0.20120513_alpha.ebuild b/app-forensics/libpff/libpff-0.0.20120513_alpha.ebuild
deleted file mode 100644
index de232445c..000000000
--- a/app-forensics/libpff/libpff-0.0.20120513_alpha.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit versionator
-
-MY_DATE="$(get_version_component_range 3)"
-
-DESCRIPTION="Library for accessing Personal Folder Files."
-HOMEPAGE="http://sf.net/projects/libpff"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-alpha/${PN}-alpha-${MY_DATE}/${PN}-alpha-${MY_DATE}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="app-forensics/libbfio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_DATE}"
-
-src_install() {
-	emake install DESTDIR="${D}" || die "Failed to install"
-}
diff --git a/app-forensics/libpff/libpff-0.0.20120611_alpha.ebuild b/app-forensics/libpff/libpff-0.0.20120611_alpha.ebuild
deleted file mode 100644
index de232445c..000000000
--- a/app-forensics/libpff/libpff-0.0.20120611_alpha.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit versionator
-
-MY_DATE="$(get_version_component_range 3)"
-
-DESCRIPTION="Library for accessing Personal Folder Files."
-HOMEPAGE="http://sf.net/projects/libpff"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-alpha/${PN}-alpha-${MY_DATE}/${PN}-alpha-${MY_DATE}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="app-forensics/libbfio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_DATE}"
-
-src_install() {
-	emake install DESTDIR="${D}" || die "Failed to install"
-}
diff --git a/app-forensics/libpff/libpff-0.0.20120802_alpha.ebuild b/app-forensics/libpff/libpff-0.0.20161119_alpha.ebuild
similarity index 53%
rename from app-forensics/libpff/libpff-0.0.20120802_alpha.ebuild
rename to app-forensics/libpff/libpff-0.0.20161119_alpha.ebuild
index 350b0e057..52f0ac8b6 100644
--- a/app-forensics/libpff/libpff-0.0.20120802_alpha.ebuild
+++ b/app-forensics/libpff/libpff-0.0.20161119_alpha.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=6
 
 inherit versionator
 
 MY_DATE="$(get_version_component_range 3)"
 
 DESCRIPTION="Library for accessing Personal Folder Files."
-HOMEPAGE="http://code.google.com/p/libpff/"
-SRC_URI="http://dev.pentoo.ch/~blshkv/distfiles/${PN}-alpha-${MY_DATE}.tar.gz"
+HOMEPAGE="https://github.com/libyal/libpff"
+SRC_URI="https://github.com/libyal/libpff/archive/20161119.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
@@ -20,8 +20,4 @@ IUSE=""
 DEPEND="app-forensics/libbfio"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-${MY_DATE}"
-
-src_install() {
-	emake install DESTDIR="${D}" || die "Failed to install"
-}
+S="${WORKDIR}/${PN}-20161119"
diff --git a/metadata/layout.conf b/metadata/layout.conf
index 850f3f564..60bc60bc0 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -8,5 +8,5 @@ sign-commits = true
 sign-manifests = false
 
 # indicate that ebuilds with the specified EAPIs are deprecated
-eapis-deprecated = 0 1 2 3 4
-eapis-banned = 0 1 3
+eapis-deprecated = 0 1 2 3 4 5
+eapis-banned = 0 1 2 3 4
diff --git a/profiles/pentoo/base/package.accept_keywords/app-forensics b/profiles/pentoo/base/package.accept_keywords/app-forensics
index d76363d52..8a27c893a 100644
--- a/profiles/pentoo/base/package.accept_keywords/app-forensics
+++ b/profiles/pentoo/base/package.accept_keywords/app-forensics
@@ -7,7 +7,7 @@ app-forensics/volatility
 
 app-forensics/dff
 app-forensics/libbfio
-~app-forensics/libpff-0.0.20120802_alpha
+app-forensics/libpff
 ~app-forensics/reglookup-1.0.1
 
 ~app-forensics/inception-0.4.1