diff --git a/app-exploits/packetstormexploits/metadata.xml b/app-exploits/packetstormexploits/metadata.xml
new file mode 100644
index 000000000..7fdcfbb3f
--- /dev/null
+++ b/app-exploits/packetstormexploits/metadata.xml
@@ -0,0 +1,24 @@
+<?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>
+	<use>
+		<flag name="1999">Use 1999 archivers</flag>
+		<flag name="2000">Use 2000 archivers</flag>
+		<flag name="2001">Use 2001 archivers</flag>
+		<flag name="2002">Use 2002 archivers</flag>
+		<flag name="2003">Use 2003 archivers</flag>
+		<flag name="2004">Use 2004 archivers</flag>
+		<flag name="2005">Use 2005 archivers</flag>
+		<flag name="2006">Use 2006 archivers</flag>
+		<flag name="2007">Use 2007 archivers</flag>
+		<flag name="2008">Use 2008 archivers</flag>
+		<flag name="2009">Use 2009 archivers</flag>
+		<flag name="2010">Use 2010 archivers</flag>
+		<flag name="2011">Use 2011 archivers</flag>
+		<flag name="2012">Use 2012 archivers</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-exploits/packetstormexploits/packetstormexploits-2012.12.ebuild b/app-exploits/packetstormexploits/packetstormexploits-2012.12.ebuild
index 583dcd056..be5f709fb 100644
--- a/app-exploits/packetstormexploits/packetstormexploits-2012.12.ebuild
+++ b/app-exploits/packetstormexploits/packetstormexploits-2012.12.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Archive of packetstorm exploits"
-HOMEPAGE="http://packetstormsecurity.net"
+HOMEPAGE="https://packetstormsecurity.com/"
 IUSE="1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +2010 +2011 +2012"
 
 #Use yearly archivers
@@ -27,9 +27,6 @@ LICENSE="HPND"
 SLOT="2012"
 KEYWORDS="amd64 arm x86"
 
-DEPEND=""
-RDEPEND="!app-exploits/packetstormexploits:0"
-
 QA_PREBUILT="/usr/share/exploits/packetstormexploits/0001-exploits/bnc246
 		/usr/share/exploits/packetstormexploits/0212-exploits/kadmin
 		/usr/share/exploits/packetstormexploits/9902-exploits/SDI-lsof
diff --git a/app-exploits/packetstormexploits/packetstormexploits-2013.12.ebuild b/app-exploits/packetstormexploits/packetstormexploits-2013.12.ebuild
index 86e648b3e..8e7bab3e1 100644
--- a/app-exploits/packetstormexploits/packetstormexploits-2013.12.ebuild
+++ b/app-exploits/packetstormexploits/packetstormexploits-2013.12.ebuild
@@ -1,18 +1,15 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit versionator
-
-AVC=( $(get_version_components) )
+AVC=( $(ver_rs 1- ' ') )
 MY_PV_YYYY="${AVC[0]}"
 MY_PV_YY="${AVC[0]:2:4}"
 MY_PV_MM="${AVC[1]}"
 
 DESCRIPTION="Archive of packetstorm exploits"
-HOMEPAGE="http://packetstormsecurity.net"
-IUSE=""
+HOMEPAGE="https://packetstormsecurity.com/"
 
 if [[ ${MY_PV_MM} == "12" ]]; then
 	#Use yearly archives
@@ -24,14 +21,10 @@ else
 	done
 fi
 
+KEYWORDS="amd64 arm x86"
 LICENSE="HPND"
 SLOT="${MY_PV_YYYY}"
 
-KEYWORDS="amd64 arm x86"
-
-DEPEND=""
-RDEPEND="!app-exploits/packetstormexploits:0"
-
 S="${WORKDIR}"
 
 src_install() {