diff --git a/app-forensics/make-pdf/Manifest b/app-forensics/make-pdf/Manifest
index e2aae5bab..6b82b4368 100644
--- a/app-forensics/make-pdf/Manifest
+++ b/app-forensics/make-pdf/Manifest
@@ -1,2 +1 @@
-DIST make-pdf_V0_1_4.zip 5217 SHA256 11578a938f9ffcc16456519375af8817c1f8f0d9c41c68bbf78882bfb36b8058 SHA512 a7d1dc1669aca98b081089ef7f0a2fb24a23a281b63f50ccd2721390c4a69b31f03ddfdca57df2842e059a948916dd7b8a2777b497a9dc10701d83fa6f2d5a67 WHIRLPOOL c73173396e990c968a6c0b95637a1e00d52fff5c638f286fe6ef77a8c75acfc3464124c844c3a57bdd77a4becaf7746cdcf2594f9f06adb370ecd7d5f6746999
-DIST make-pdf_V0_1_7.zip 9731 SHA256 dcea54c2c260152a01278c6262d82255b5944ed616663b83dc158f74f27f509e SHA512 b1019e81c6d28c62c89b823f425235401855699e79e5ac1ccc8830047cb7665286ff0f91219664d7b30ae4241c5b04ea840b477bec07dbdcd8c96f96b3a54c6d WHIRLPOOL 75108fe79291477b162e1c3797bd87253cf4db501a8f263318d73a905d1351403ccdf22d0077e0b6b81dfc4decab37d5709568b8a5fbf67aae539775d7192631
+DIST make-pdf_V0_1_7.zip 9731 BLAKE2B e63df9b196a882e5d80fa677b295dd340fee214998cc40663c5035ea43553a4da814ce68db9897429399c0b56f787834849f8b422c42b43d2a7412c194a4dcf4 SHA512 b1019e81c6d28c62c89b823f425235401855699e79e5ac1ccc8830047cb7665286ff0f91219664d7b30ae4241c5b04ea840b477bec07dbdcd8c96f96b3a54c6d
diff --git a/app-forensics/make-pdf/make-pdf-0.1.4-r2.ebuild b/app-forensics/make-pdf/make-pdf-0.1.4-r2.ebuild
deleted file mode 100644
index 290329915..000000000
--- a/app-forensics/make-pdf/make-pdf-0.1.4-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 eutils
-#python-utils-r1
-
-MY_P="${PN}_V${PV//./_}"
-SRC_URI="http://www.didierstevens.com/files/software/${MY_P}.zip"
-DESCRIPTION="This tool will embed javascript inside a PDF document"
-HOMEPAGE="http://blog.didierstevens.com/programs/pdf-tools/"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_install() {
-	edos2unix mPDF.py "${PN}-javascript.py"
-	insinto "$(python_get_sitedir)"
-	doins mPDF.py
-	python_fix_shebang "${PN}-javascript.py" "${PN}-embedded.py"
-	newbin "${PN}-javascript.py" "${PN}-javascript"
-	newbin "${PN}-embedded.py" "${PN}-embedded"
-}
diff --git a/app-forensics/make-pdf/make-pdf-0.1.7-r1.ebuild b/app-forensics/make-pdf/make-pdf-0.1.7-r1.ebuild
new file mode 100644
index 000000000..69a639951
--- /dev/null
+++ b/app-forensics/make-pdf/make-pdf-0.1.7-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1 unpacker
+
+DESCRIPTION="This tool will embed javascript inside a PDF document"
+HOMEPAGE="https://blog.didierstevens.com/programs/pdf-tools/"
+
+MY_P="${PN}_V$(ver_rs 1- '_')"
+SRC_URI="http://www.didierstevens.com/files/software/${MY_P}.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${PYTHON_DEPS}
+	$(unpacker_src_uri_depends)"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	sed -e "1i #!\/usr\/bin\/python\\n" \
+		-i make-pdf-helloworld.py || die
+
+	default
+}
+
+src_install() {
+	python_foreach_impl python_domodule mPDF.py
+
+	for x in make-pdf-*.py; do
+		python_foreach_impl python_newscript $x ${x%.py}
+	done
+}
diff --git a/app-forensics/make-pdf/make-pdf-0.1.7.ebuild b/app-forensics/make-pdf/make-pdf-0.1.7.ebuild
deleted file mode 100644
index 290329915..000000000
--- a/app-forensics/make-pdf/make-pdf-0.1.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 eutils
-#python-utils-r1
-
-MY_P="${PN}_V${PV//./_}"
-SRC_URI="http://www.didierstevens.com/files/software/${MY_P}.zip"
-DESCRIPTION="This tool will embed javascript inside a PDF document"
-HOMEPAGE="http://blog.didierstevens.com/programs/pdf-tools/"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_install() {
-	edos2unix mPDF.py "${PN}-javascript.py"
-	insinto "$(python_get_sitedir)"
-	doins mPDF.py
-	python_fix_shebang "${PN}-javascript.py" "${PN}-embedded.py"
-	newbin "${PN}-javascript.py" "${PN}-javascript"
-	newbin "${PN}-embedded.py" "${PN}-embedded"
-}
diff --git a/app-forensics/make-pdf/metadata.xml b/app-forensics/make-pdf/metadata.xml
new file mode 100644
index 000000000..4fa8ff351
--- /dev/null
+++ b/app-forensics/make-pdf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-forensics/pdf-parser/pdf-parser-0.7.3.ebuild b/app-forensics/pdf-parser/pdf-parser-0.7.3.ebuild
index ed3040dba..379d01448 100644
--- a/app-forensics/pdf-parser/pdf-parser-0.7.3.ebuild
+++ b/app-forensics/pdf-parser/pdf-parser-0.7.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit python-r1 unpacker
 
 DESCRIPTION="This tool will parse a PDF document to identify the fundamental elements used"
-HOMEPAGE="http://blog.didierstevens.com/programs/pdf-tools/"
+HOMEPAGE="https://blog.didierstevens.com/programs/pdf-tools/"
 
 MY_P="${PN}_V$(ver_rs 1- '_')"
 SRC_URI="http://www.didierstevens.com/files/software/${MY_P}.zip"