diff --git a/app-forensics/samhain/Manifest b/app-forensics/samhain/Manifest
index e347c5db0..9528611b0 100644
--- a/app-forensics/samhain/Manifest
+++ b/app-forensics/samhain/Manifest
@@ -1 +1 @@
-DIST samhain_signed-4.1.2.tar.gz 2165891 SHA256 bb32321b3dc8450351d99e90d25182a029bef1e46b9a0439ade1ca0a744eadb8 SHA512 0dcb89b7a11b0aaef7b306360857c64b505651b526f7c3030ac7186f1c334c745df7b544e16fa9edac260156b1fa32d44e2276cf2476807d0ea0c011d05c9e4f WHIRLPOOL 09be99572c31d76dc58ccb5963e615ea87faf689858cd4372883df5905d1fff792807641adb85c9719269577ae81e679936d0488a27cdb055724c6ed6eaa3d5b
+DIST samhain_signed-4.1.4.tar.gz 2206332 SHA256 32ee7477af11d9f2f64f30b9cb316c351897c1c994c7b98b0ef17fc0ca5e1d1a SHA512 72e75e7a34705fa61d48c82e4c0ab1ac523c9bd5480c9335e305230e04d7c6295094ef616d9fca05b091d99659982d130812be36e9676ede68d743a4a1c46013 WHIRLPOOL 515e5d2c297e2ca2e0d69d0bad200eb4bc81449a907346c9976124381a9ab910a6fca6024853ce76d21928d12281aa236b5ed76ac3df511cef3b4f5766a865fc
diff --git a/app-forensics/samhain/samhain-4.1.2.ebuild b/app-forensics/samhain/samhain-4.1.4.ebuild
similarity index 100%
rename from app-forensics/samhain/samhain-4.1.2.ebuild
rename to app-forensics/samhain/samhain-4.1.4.ebuild
diff --git a/app-fuzz/ohrwurm/Manifest b/app-fuzz/ohrwurm/Manifest
index d16a2541f..31896bd2f 100644
--- a/app-fuzz/ohrwurm/Manifest
+++ b/app-fuzz/ohrwurm/Manifest
@@ -1 +1 @@
-DIST ohrwurm-0.1.tar.bz2 6281 SHA256 c94bfe52cfd2e9ff52f4360cb6153a665bb2b4251c889c7a1a5a3bf75f346165
+DIST ohrwurm-0.1.tar.bz2 6281 SHA256 c94bfe52cfd2e9ff52f4360cb6153a665bb2b4251c889c7a1a5a3bf75f346165 SHA512 55a1999c981113a97eeec401b59cae5067f92e364e1f7827f774a941105a71b27e775ea6ff69af41c62fae2eb7df500629f3162cfebe60edda09ca9be4efda80 WHIRLPOOL 7e57f341db00d30358a6a13677c78b81c4ddc857a8c8638461abdd70cc29c4e11bc46ae41e3fd8debe3762b71761545f8cf82d733414ea64598032e062f7b87c
diff --git a/app-fuzz/ohrwurm/files/digest-ohrwurm-0.1 b/app-fuzz/ohrwurm/files/digest-ohrwurm-0.1
deleted file mode 100644
index 8f05d4195..000000000
--- a/app-fuzz/ohrwurm/files/digest-ohrwurm-0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 210977dfe239bb4e6d4d35c4a00bea48 ohrwurm-0.1.tar.bz2 6281
-RMD160 de6e2081cb6419ac458b10e203f53b79081fe636 ohrwurm-0.1.tar.bz2 6281
-SHA256 c94bfe52cfd2e9ff52f4360cb6153a665bb2b4251c889c7a1a5a3bf75f346165 ohrwurm-0.1.tar.bz2 6281
diff --git a/app-fuzz/ohrwurm/ohrwurm-0.1.ebuild b/app-fuzz/ohrwurm/ohrwurm-0.1.ebuild
index d9add680f..d21b8d7eb 100644
--- a/app-fuzz/ohrwurm/ohrwurm-0.1.ebuild
+++ b/app-fuzz/ohrwurm/ohrwurm-0.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI=2
+EAPI=5
 
 DESCRIPTION="Ohrwurm is a small and simple RTP fuzzer"
 HOMEPAGE="http://mazzoo.de/blog/2006/08/25"
-SRC_URI="http://packetstorm.wowhacker.com/fuzzer/${P}.tar.bz2"
+SRC_URI="http://mazzoo.de/d/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-db/sqlmap/Manifest b/dev-db/sqlmap/Manifest
new file mode 100644
index 000000000..e2fa2dcd7
--- /dev/null
+++ b/dev-db/sqlmap/Manifest
@@ -0,0 +1 @@
+DIST sqlmap-1.0.6.tar.gz 6708702 SHA256 5a8b9c722df2227cbcbfde27e7ac820bd4b63eab712b0140f9ce8955fe0a738d SHA512 16764980b1adcc80a68034d7998f4b3feb505fc9eb91ed666ecb2fd9201075a9f9704f9805bbf02d21356c0bc2fb2a32e0323c9cf3216e09c054977b834bfbc7 WHIRLPOOL ff29f52eddbbd990d04143c6ceba6ae4b50ea436e1ac1c7e7a747bc5d29518ae4eade5a123d977e2db62ee7d2ff48b755208f1dc442c12bc0d833ba33791278a
diff --git a/dev-db/sqlmap/sqlmap-1.0.6.ebuild b/dev-db/sqlmap/sqlmap-1.0.6.ebuild
new file mode 100644
index 000000000..f114930a8
--- /dev/null
+++ b/dev-db/sqlmap/sqlmap-1.0.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Automatic SQL injection and database takeover tool "
+HOMEPAGE="http://sqlmap.org"
+SRC_URI="https://github.com/sqlmapproject/sqlmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
+#EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap.git"
+#EGIT_COMMIT="e7aaea2b8eac8680a737416b5df059a4ac9a4630"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ntlm"
+
+DEPEND=""
+RDEPEND="ntlm? ( dev-python/python-ntlm )"
+
+QA_PREBUILT="
+	usr/share/${PN}/udf/mysql/linux/32/lib_mysqludf_sys.so
+	usr/share/${PN}/udf/mysql/linux/64/lib_mysqludf_sys.so
+	usr/share/${PN}/udf/postgresql/linux/32/8.2/lib_postgresqludf_sys.so
+	usr/share/${PN}/udf/postgresql/linux/32/8.3/lib_postgresqludf_sys.so
+	usr/share/${PN}/udf/postgresql/linux/32/8.4/lib_postgresqludf_sys.so
+	usr/share/${PN}/udf/postgresql/linux/32/9.0/lib_postgresqludf_sys.so
+	usr/share/${PN}/udf/postgresql/linux/32/9.1/lib_postgresqludf_sys.so
+	usr/share/${PN}/udf/postgresql/linux/64/8.2/lib_postgresqludf_sys.so
+	usr/share/${PN}/udf/postgresql/linux/64/8.3/lib_postgresqludf_sys.so
+	usr/share/${PN}/udf/postgresql/linux/64/8.4/lib_postgresqludf_sys.so
+	usr/share/${PN}/udf/postgresql/linux/64/9.0/lib_postgresqludf_sys.so"
+
+src_install () {
+	# fix broken tarball
+	find ./ -name .git | xargs rm -rf
+	# Don't forget to disable the revision check since we removed the SVN files
+	sed -i -e 's/= getRevisionNumber()/= "Unknown revision"/' lib/core/settings.py
+
+	dodoc -r doc/*
+	rm -rf doc/
+	dodir /usr/share/${PN}/
+
+	cp -R * "${ED}"/usr/share/${PN}/
+	python_fix_shebang "${ED}"/usr/share/${PN}
+	dosym /usr/share/${PN}/sqlmap.py /usr/bin/${PN}
+}
diff --git a/dev-python/impacket/impacket-0.9.15_pre20160604.ebuild b/dev-python/impacket/impacket-0.9.15_pre20160604.ebuild
new file mode 100644
index 000000000..1ff013c51
--- /dev/null
+++ b/dev-python/impacket/impacket-0.9.15_pre20160604.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="A collection of Python classes focused on providing access to network packets"
+HOMEPAGE="https://github.com/CoreSecurity/impacket"
+SRC_URI=""
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/CoreSecurity/impacket.git"
+	KEYWORDS=""
+elif [[ ${PVR} == "0.9.15_pre20160604" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/CoreSecurity/impacket.git"
+	EGIT_COMMIT="04c66e588083dbcff855c1b476f0cdad98141435"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI="https://github.com/CoreSecurity/impacket/archive/impacket_${PV//./_}.tar.gz -> ${P}.tar.gz"
+	inherit versionator
+	S="${WORKDIR}"/${PN}-${PN}_$(replace_all_version_separators _)
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	pushd impacket/testcases/dot11
+	for test in $(ls *.py); do
+		${PYTHON} ${test} || die "Tests fail with ${EPYTHON}"
+	done
+	popd
+	pushd impacket/testcases/ImpactPacket
+	for test in $(ls *.py); do
+		${PYTHON} ${test} || die "Tests fail with ${EPYTHON}"
+	done
+	popd
+}
diff --git a/dev-ruby/metasploit-concern/Manifest b/dev-ruby/metasploit-concern/Manifest
new file mode 100644
index 000000000..b4cd3d4bf
--- /dev/null
+++ b/dev-ruby/metasploit-concern/Manifest
@@ -0,0 +1 @@
+DIST metasploit-concern-2.0.1.gem 19456 SHA256 ef42d34726f294712710c9efbd6229733877051eab77bfd1369e83df39a0c2a9 SHA512 759b1d96a3339f2396fe98ae979e0d3188fc75ff7374069b90e8cd98145d18c5d77d863d580aa1481aef91f8b8eb3d12e6fc1dc67354e1b52be33fad28741003 WHIRLPOOL 31243cd6b167c1766785e918515234e17f6ac47d764e00eb5e6e0782bd14ab8c053cf2c9b03ebd25e7a5dc35e9b439ab4bf03d1a4be6af6507bb91c266382491
diff --git a/dev-ruby/metasploit-concern/metasploit-concern-2.0.1.ebuild b/dev-ruby/metasploit-concern/metasploit-concern-2.0.1.ebuild
new file mode 100644
index 000000000..a8046b5a3
--- /dev/null
+++ b/dev-ruby/metasploit-concern/metasploit-concern-2.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app spec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Metasploit concern allows you to define concerns in app/concerns. "
+HOMEPAGE="https://github.com/rapid7/metasploit-concern"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="BSD"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+#IUSE="development test"
+RESTRICT=test
+IUSE=""
+
+RDEPEND="${RDEPEND} !dev-ruby/metasploit-concern:0"
+
+ruby_add_rdepend ">=dev-ruby/railties-4.2.6:4.2
+		  >=dev-ruby/activemodel-4.2.6:4.2
+		  >=dev-ruby/activesupport-4.2.6:4.2"
diff --git a/dev-ruby/metasploit-credential/Manifest b/dev-ruby/metasploit-credential/Manifest
new file mode 100644
index 000000000..a69954646
--- /dev/null
+++ b/dev-ruby/metasploit-credential/Manifest
@@ -0,0 +1 @@
+DIST metasploit-credential-2.0.3.gem 108032 SHA256 ce275e0d61aa3fba1e19b6b8bedc8c1ce655d44d58a1ca36f798c8762e08ee33 SHA512 df3289756fa26931ae8cdbbfa94efbbd370ac4f6e7acdb3188e6fdcbbe89d4a894cdeb673c0a4608764b1916691f2522bd3e658d97b7742ca7637e17c299ad3a WHIRLPOOL 9d1ba8ed612635b57e5147202823220748583b64abe3c1f1050d134cf2a2e1658e4dddc20174253c53d77d336d3ce11c6b1e8d1ef2de784ec9072a0f232bf150
diff --git a/dev-ruby/metasploit-credential/metasploit-credential-2.0.3.ebuild b/dev-ruby/metasploit-credential/metasploit-credential-2.0.3.ebuild
new file mode 100644
index 000000000..13458747c
--- /dev/null
+++ b/dev-ruby/metasploit-credential/metasploit-credential-2.0.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db spec"
+
+DESCRIPTION="Code for modeling and managing credentials in Metasploit"
+HOMEPAGE="https://github.com/rapid7/metasploit-credential"
+
+LICENSE="BSD"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/metasploit-concern:2.0
+	dev-ruby/metasploit_data_models:2.0.0
+	dev-ruby/metasploit-model:2.0
+	dev-ruby/rubyzip:1
+	dev-ruby/rubyntlm
+	dev-ruby/railties:4.2
+	dev-ruby/pg"
diff --git a/dev-ruby/metasploit-model/Manifest b/dev-ruby/metasploit-model/Manifest
new file mode 100644
index 000000000..7cd872aef
--- /dev/null
+++ b/dev-ruby/metasploit-model/Manifest
@@ -0,0 +1 @@
+DIST metasploit-model-2.0.0.gem 81408 SHA256 c40fa0c5160ea99de81c475e5d1b852155f8080f66b47683f2cb4c19faa91788 SHA512 42c73b34104a94b5352e64199d2edf98ccc53c3e169f6799ecb7433588ed918d6483fe24cbfeab32b0a8859bcbfb42504054f013cdff2f03bac489e97edfe8ff WHIRLPOOL b739f5d1e465c06f6d1c4e4ba49ddf9f1e49e229b570f11cbfa0ea587a7a2b863f4e6a9a7c9df26b23e9e04e33ce72e99843b6c77a4b8cad34dd82449f41c8c7
diff --git a/dev-ruby/metasploit-model/metasploit-model-2.0.0.ebuild b/dev-ruby/metasploit-model/metasploit-model-2.0.0.ebuild
new file mode 100644
index 000000000..2561e535b
--- /dev/null
+++ b/dev-ruby/metasploit-model/metasploit-model-2.0.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+inherit ruby-fakegem versionator
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config script spec"
+
+DESCRIPTION="Common code, such as validators and mixins"
+HOMEPAGE="https://github.com/rapid7/metasploit-model"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="BSD"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+#IUSE="development test"
+RESTRICT=test
+IUSE=""
+
+RDEPEND="${RDEPEND} !dev-ruby/metasploit-model:0"
+
+ruby_add_rdepend ">=dev-ruby/railties-4.2.6:4.2
+			>=dev-ruby/activesupport-4.2.6:4.2
+			>=dev-ruby/activemodel-4.2.6:4.2"
+#		development? (	dev-ruby/bundler
+#			dev-ruby/rake
+#			dev-ruby/i18n
+#			dev-ruby/multi_json
+#			dev-ruby/builder
+#			dev-ruby/erubis
+#			dev-ruby/journey
+#			dev-ruby/rack
+#			dev-ruby/rack-cache
+#			dev-ruby/rack-test
+#			dev-ruby/hike
+#			dev-ruby/tilt
+#			dev-ruby/sprockets:*
+#			dev-ruby/actionpack:4.0
+#			dev-ruby/json
+#			dev-ruby/rack-ssl:*
+#			dev-ruby/rdoc
+#			dev-ruby/thor
+#			dev-ruby/redcarpet
+#			<dev-ruby/yard-0.8.7.4 )"
+
+ruby_add_bdepend "dev-ruby/bundler"
+
+all_ruby_prepare() {
+	[ -f Gemfile.lock ] && rm Gemfile.lock
+	#For now, we don't support development or testing at all
+	#if ! use development; then
+		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
+		sed -i -e "/spec.add_development_dependency/d" "${PN}".gemspec || die
+	#fi
+	#if ! use test; then
+		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
+	#fi
+	#if ! use test && ! use development; then
+		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
+	#fi
+}
+
+each_ruby_prepare() {
+	if [ -f Gemfile ]
+	then
+			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+	fi
+}
diff --git a/dev-ruby/metasploit-payloads/Manifest b/dev-ruby/metasploit-payloads/Manifest
new file mode 100644
index 000000000..9e96b4148
--- /dev/null
+++ b/dev-ruby/metasploit-payloads/Manifest
@@ -0,0 +1 @@
+DIST metasploit-payloads-1.1.11.gem 11979264 SHA256 d239ffe29f36bf15aa7c7b26a8632f0f246b20a0c221044eb3f1cf2180ceb4c0 SHA512 b04d59f119c85ad24e4e628eb29b5173019503c674a51421daf6a85d3642fde2ac098bbcf3c405eb25da8d93dcb9f30567ee9bd941d236efc5e385a28e21994d WHIRLPOOL 63b751602152c50625f4fbc097cc2dd07a81e8b187398238f36129466046a181bd854be6a1b977243cf30e2bc144778d4e494ac82ce963b966e7f8281f193814
diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-1.1.11.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-1.1.11.ebuild
new file mode 100644
index 000000000..60318ee4c
--- /dev/null
+++ b/dev-ruby/metasploit-payloads/metasploit-payloads-1.1.11.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Compiled binaries for Metasploit's Meterpreter"
+HOMEPAGE="https://rubygems.org/gems/metasploit-payloads"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+#no tests
+RESTRICT="test strip"
+
+QA_PREBUILT="
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so
+	"
+
+src_install() {
+	ruby-ng_src_install
+	#tell revdep-rebuild to ignore binaries meant for the target
+	dodir /etc/revdep-rebuild
+	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT} || die
+		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
+		SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs"
+	EOF
+}
diff --git a/dev-ruby/metasploit_data_models/Manifest b/dev-ruby/metasploit_data_models/Manifest
new file mode 100644
index 000000000..dc933c0cd
--- /dev/null
+++ b/dev-ruby/metasploit_data_models/Manifest
@@ -0,0 +1 @@
+DIST metasploit_data_models-2.0.0.gem 177152 SHA256 b5f32aeb00cab511c94212b7fa1b42631278d4766ab7b05f1c4fdf8e3c3655bb SHA512 4ff18ba09fe58e5846b745152739a6602fc144ca68240901f18791f7c6ffacc0a1d621fda222c86960ca59cd3034ef2fda4fc85dead669837e3c0a7c2ddc3f1d WHIRLPOOL 407460ac990f257a80c89c56463aef91ea48070d52225fc2116500ce822d5c5eb2880bd1fb21cb65a3ea3a0a725906dbe525cce5d18527030294ace776265a91
diff --git a/dev-ruby/metasploit_data_models/metasploit_data_models-2.0.0.ebuild b/dev-ruby/metasploit_data_models/metasploit_data_models-2.0.0.ebuild
new file mode 100644
index 000000000..abdf48a45
--- /dev/null
+++ b/dev-ruby/metasploit_data_models/metasploit_data_models-2.0.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db script spec"
+
+DESCRIPTION="The database layer for Metasploit"
+HOMEPAGE="https://github.com/rapid7/metasploit_data_models"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+RESTRICT=test
+#IUSE="development test"
+IUSE=""
+
+RDEPEND="${RDEPEND} !dev-ruby/metasploit_data_models:0"
+
+ruby_add_rdepend "
+		>=dev-ruby/activerecord-4.2.6:4.2[postgres]
+		>=dev-ruby/activesupport-4.2.6:4.2
+		dev-ruby/pg
+		dev-ruby/postgres_ext
+		>=dev-ruby/railties-4.2.6:4.2
+		dev-ruby/recog:*
+		dev-ruby/arel-helpers
+		dev-ruby/metasploit-concern:2.0
+		dev-ruby/metasploit-model:2.0
+		<dev-ruby/thor-2.0"
+
+ruby_add_bdepend "dev-ruby/bundler"
+
+all_ruby_prepare() {
+	[ -f Gemfile.lock ] && rm Gemfile.lock
+	#if ! use development; then
+		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
+	#fi
+	#if ! use test; then
+		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
+	#fi
+	#if ! use test && ! use development; then
+		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
+	#fi
+}
+
+each_ruby_prepare() {
+	if [ -f Gemfile ]
+	then
+		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+	fi
+}
+
+all_ruby_install() {
+	ruby_fakegem_binwrapper mdm_console mdm_console-${SLOT}
+}
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
new file mode 100644
index 000000000..6081e618d
--- /dev/null
+++ b/dev-ruby/octokit/Manifest
@@ -0,0 +1 @@
+DIST octokit-4.3.0.tar.gz 2760618 SHA256 76ca1d4289f393c88556bc0c7518621db2d6371cb4c7ec68aa61d07327849fcc SHA512 2a0e680ef8b182722e4a7f489d69fc1d9e81864b29a7fddc4b1ab68a77deee7383ffac153662ceb9e55d7425a4f9e29f7303f0d8d0d821156ef1946734e197a6 WHIRLPOOL ab27fd63737604500a747496a3d040482de2532cfe5dd169d7144ba13476a6c14bf1d667385cd7f4b925030be8c9933e98ebfe72498e3be978574f1b206c7120
diff --git a/dev-ruby/octokit/octokit-4.3.0-r1.ebuild b/dev-ruby/octokit/octokit-4.3.0-r1.ebuild
new file mode 100644
index 000000000..b9cd7d87a
--- /dev/null
+++ b/dev-ruby/octokit/octokit-4.3.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby toolkit for the Github API"
+HOMEPAGE="https://github.com//octokit/octokit.rb"
+SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RUBY_S=octokit.rb-${PV}
+
+ruby_add_rdepend ">=dev-ruby/sawyer-0.5.3"
+ruby_add_bdepend "test? ( >=dev-ruby/netrc-0.7.7
+	dev-ruby/vcr:2
+	>=dev-ruby/webmock-1.9 )"
+
+all_ruby_prepare() {
+	sed -i -e "1,10d" -e "/require 'vcr'/i\gem 'vcr', '~> 2.9.2'" spec/helper.rb || die
+}
diff --git a/dev-ruby/patch_finder/Manifest b/dev-ruby/patch_finder/Manifest
new file mode 100644
index 000000000..8e8f6f216
--- /dev/null
+++ b/dev-ruby/patch_finder/Manifest
@@ -0,0 +1 @@
+DIST patch_finder-1.0.2.gem 14848 SHA256 b5908359281b620e0004d48cfcbc6b6860a9c054816f2378ccc196a229d3a9d5 SHA512 24b269fcf9d379ca07aaecb8a9282086767eed0dfa9a12cd2523eda488621a81e90c4cb386600f3120bd503e0de1887f6826da33df4e77c5c8eb3fae61e7ca8f WHIRLPOOL 83bd90046f401f23ae0f9f8f0dddd4de8e5a31a9cd135edb76f3f369cb271c22b0de9ad0c21dd27419b5de0d06b5af33af989c4063c15272f2aaafce6c6f5a00
diff --git a/dev-ruby/patch_finder/patch_finder-1.0.2.ebuild b/dev-ruby/patch_finder/patch_finder-1.0.2.ebuild
new file mode 100644
index 000000000..2e37509e5
--- /dev/null
+++ b/dev-ruby/patch_finder/patch_finder-1.0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Generic Patch Finder"
+HOMEPAGE="https://github.com/wchen-r7/patch-finder"
+
+LICENSE="BSD-3-Clause"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
diff --git a/dev-ruby/tzinfo-data/Manifest b/dev-ruby/tzinfo-data/Manifest
new file mode 100644
index 000000000..6fb1cb974
--- /dev/null
+++ b/dev-ruby/tzinfo-data/Manifest
@@ -0,0 +1 @@
+DIST tzinfo-data-1.2016.4.gem 315392 SHA256 63dc172c54e7e0900b4002d407eededa4ddfda508416268f4ee89d589aa4aeaf SHA512 4bb19bc2dd601b820f3ea54880bd819a781a61ac0be8714859d9f614b3c9b1a7d62d9658ced9a899cf7c54fd2cb54dec5b054d64272d57fb8723fc64c5801f00 WHIRLPOOL 6bcb472925d1012cd1a6d1f77d6c95583534c9ac8889506346b67cf433dbc75dc479ed0550e2226e981f86ed913b57d6767c2a9ecbd907ba91872de34ebd5774
diff --git a/dev-ruby/tzinfo-data/tzinfo-data-1.2016.4.ebuild b/dev-ruby/tzinfo-data/tzinfo-data-1.2016.4.ebuild
new file mode 100644
index 000000000..01ad5071c
--- /dev/null
+++ b/dev-ruby/tzinfo-data/tzinfo-data-1.2016.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Contains a set of Ruby modules generated from the IANA Time Zone Database"
+HOMEPAGE="http://tzinfo.github.io"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1)"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/tzinfo-1.0.0"
diff --git a/net-analyzer/crackmapexec/Manifest b/net-analyzer/crackmapexec/Manifest
index 0311362a3..c1a2932f5 100644
--- a/net-analyzer/crackmapexec/Manifest
+++ b/net-analyzer/crackmapexec/Manifest
@@ -1,2 +1,2 @@
 DIST crackmapexec-2.3.tar.gz 846765 SHA256 8958c73a1ad753f0519b3117e441662e57a6c4f5ee1827ef78f18c376c010240 SHA512 865ab679b0e35d08d848882e270054e509b2e7ce3818eb3fc5ad8c781473e12119dcac70d8861fc607f38ef82d6391ae13251bbf3a6226599a2d7fb4cc51500b WHIRLPOOL 6c1d62c7e8f6d4bbeb6c0cf5d4bf277fe4800ad7198424e05950165a0b79f9e2ea565b907e50289a856ee5135ade962f59106b220449e4eaaa43ed99a614a653
-DIST crackmapexec-3.0.tar.gz 52272 SHA256 8db3a5054fa8713181ab78e400b24838ba57ca6a925873b5bc6f51da46876cbd SHA512 36187c339b78a8515d9f267f657e0db97f50c80751135b20738839c2924567764e6f712a2e0baa155e02d058f7fb2bead050dbe01dc51a63477bbc8d90ddd106 WHIRLPOOL db42d99b7c65fcb3d9d5c478b7d3003ce57338148db54d06b69c41de05eb2fc0a0a9a8b04da4030a93baccd05c50cefef71e551e9bede4f7e31b8ff177fede8e
+DIST crackmapexec-3.1.tar.gz 59669 SHA256 794a64edf482bb5118f2c59c9410024dee3ca442fa173bd59847a01714024620 SHA512 e1c56eb8bcef7da1ebfae5277eb86069229d5b7595a660a36efa7e83bf79121dd2b2f2762ed3aa4d03d17ab7c2485f0636362d32db6898dace1e628780788fff WHIRLPOOL 9d5b9aae1269324bd7fe003d5e705cdd234989129c6b11563706aa8edd71247bc2fa97ce6e270a4acd44cf4f4f06b6b1bcd8b55225e8580efa9f32403ca6589c
diff --git a/net-analyzer/crackmapexec/crackmapexec-3.0.ebuild b/net-analyzer/crackmapexec/crackmapexec-3.1.ebuild
similarity index 60%
rename from net-analyzer/crackmapexec/crackmapexec-3.0.ebuild
rename to net-analyzer/crackmapexec/crackmapexec-3.1.ebuild
index c6d7c4256..aba50c635 100644
--- a/net-analyzer/crackmapexec/crackmapexec-3.0.ebuild
+++ b/net-analyzer/crackmapexec/crackmapexec-3.1.ebuild
@@ -5,7 +5,8 @@
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 multilib
+#inherit python-single-r1 multilib
+inherit distutils-r1 eutils
 
 DESCRIPTION="A swiss army knife for pentesting Windows/Active Directory environments"
 HOMEPAGE="https://github.com/byt3bl33d3r/CrackMapExec/releases"
@@ -16,27 +17,27 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 SLOT="0"
 
-RDEPEND=">=dev-python/impacket-0.9.14
+RDEPEND=">dev-python/impacket-0.9.14
 	dev-python/gevent
 	dev-python/netaddr
 	dev-python/pycrypto
 	dev-python/pyasn1
 	dev-python/termcolor
-	dev-python/colorama
+	dev-python/requests
 	dev-python/pyopenssl"
 
 S="${WORKDIR}/CrackMapExec-${PV}"
 
 src_prepare() {
-	cd setup
-	python2 ./setup_database.py
-	cd ..
+	epatch "${FILESDIR}/${P}-leftovers.patch"
+#	cd setup
+#	python2 ./setup_database.py
+#	cd ..
 }
 
-src_install() {
-	fperms +x crackmapexec.py
-	dodir /usr/$(get_libdir)/${PN}
-	cp -pPR "${S}"/* "${ED}"/usr/$(get_libdir)/"${PN}" || die
-#	python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}
-	dosym /usr/$(get_libdir)/${PN}/${PN}.py /usr/sbin/${PN}
-}
+#src_install() {
+#	fperms +x crackmapexec.py
+#	dodir /usr/$(get_libdir)/${PN}
+#	cp -pPR "${S}"/* "${ED}"/usr/$(get_libdir)/"${PN}" || die
+#	dosym /usr/$(get_libdir)/${PN}/${PN}.py /usr/sbin/${PN}
+#}
diff --git a/net-analyzer/crackmapexec/files/crackmapexec-3.1-leftovers.patch b/net-analyzer/crackmapexec/files/crackmapexec-3.1-leftovers.patch
new file mode 100644
index 000000000..e5d5ca304
--- /dev/null
+++ b/net-analyzer/crackmapexec/files/crackmapexec-3.1-leftovers.patch
@@ -0,0 +1,31 @@
+From 1e281bd638a27e9da024a31a3cabb87ef9f7202b Mon Sep 17 00:00:00 2001
+From: byt3bl33d3r <byt3bl33d3r@gmail.com>
+Date: Sat, 4 Jun 2016 02:18:17 -0600
+Subject: [PATCH] Got rid of some left over merger cruft
+
+---
+ cme/cmeserver.py | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/cme/cmeserver.py b/cme/cmeserver.py
+index 4549095..5bc336b 100644
+--- a/cme/cmeserver.py
++++ b/cme/cmeserver.py
+@@ -1,17 +1,9 @@
+ import BaseHTTPServer
+ import threading
+ import ssl
+-<<<<<<< HEAD:cme/cmeserver.py
+-<<<<<<< 23d8a6517fb1a36bac9b09e3923201ee291d00ac:cme/cmeserver.py
+ import os
+ import sys
+ from getpass import getuser
+-=======
+-import sys
+->>>>>>> Added error handling for CME server in case the port is already in use.:core/cmeserver.py
+-=======
+-import sys
+->>>>>>> da4e55380a1d1ad46d3176c513b829bd4a7099f4:core/cmeserver.py
+ from BaseHTTPServer import BaseHTTPRequestHandler
+ from logging import getLogger
+ from gevent import sleep
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
new file mode 100644
index 000000000..5f23f355d
--- /dev/null
+++ b/net-analyzer/metasploit/Manifest
@@ -0,0 +1 @@
+DIST metasploit-4.12.5.tar.gz 23309813 SHA256 9b33718c63b33f0d7d64fcb7dd9f1e18dc268203da736a54d35ade7c3bd49377 SHA512 560eace5da966c9cd8e423dbbf46914c638e62f0ce636a5dcc14b425c69346e9493f20f7000d10a718b88e2404a828808f8c46244ec72f5d1192613ddee940d0 WHIRLPOOL 14762846f61c973f3f72b8ec9f393fd1dabefb3cae7717f77bb4c7835a68b179b1d7df13225ff6020a569e3c0a566ee2a52b2758f784ebb1742ea8cd5cbc9f87
diff --git a/net-analyzer/metasploit/files/database.yml b/net-analyzer/metasploit/files/database.yml
new file mode 100644
index 000000000..403191669
--- /dev/null
+++ b/net-analyzer/metasploit/files/database.yml
@@ -0,0 +1,34 @@
+#
+# The tests currently use the development user
+# https://dev.metasploit.com/redmine/issues/8418
+#
+
+development:
+  adapter: "postgresql"
+  database: "msf_test_database"
+  username: "msf_test_user"
+  password: "secure"
+  port: 5432
+  host: "localhost"
+  pool: 256
+  timeout: 5
+
+production:
+  adapter: "postgresql"
+  database: "msf_database"
+  username: "msf_user"
+  password: "secure"
+  port: 5432
+  host: "localhost"
+  pool: 256
+  timeout: 5
+
+test:
+  adapter: "postgresql"
+  database: "msf_test_database"
+  username: "msf_test_user"
+  password: "secure"
+  port: 5432
+  host: "localhost"
+  pool: 256
+  timeout: 5
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.11-conf b/net-analyzer/metasploit/files/msfrpcd-4.11-conf
new file mode 100644
index 000000000..dc56a9d96
--- /dev/null
+++ b/net-analyzer/metasploit/files/msfrpcd-4.11-conf
@@ -0,0 +1,25 @@
+# Config file for /etc/init.d/msfrpcd
+
+# msfrpcd -h for more info
+
+# Bind to the following IP instead of 0.0.0.0
+MSF_OPTS="-a 127.0.0.1"
+
+# Bind to the following TCP port instead of default 55553
+#MSF_OPTS="${MSF_OPTS} -p 55553"
+
+# Specify the username to access msfrpcd
+MSF_OPTS="${MSF_OPTS} -U msf"
+
+# Specify the password to access msfrpcd
+MSF_OPTS="${MSF_OPTS} -P secret"
+
+# Server type, [Basic|Web]
+#MSF_OPTS="${MSF_OPTS} -t Basic"
+
+# URI for Web server
+#MSF_OPTS="${MSF_OPTS} -u "
+
+# Disable SSL on the XMLRPC socket
+# JAVA GUI doesn't support SSL as of Nov 6, 2010
+MSF_OPTS="${MSF_OPTS} -S"
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.11-initd b/net-analyzer/metasploit/files/msfrpcd-4.11-initd
new file mode 100644
index 000000000..3e40b71ab
--- /dev/null
+++ b/net-analyzer/metasploit/files/msfrpcd-4.11-initd
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION=4.11
+PIDFILE=/var/run/msfrpcd${VERSION}.pid
+
+start() {
+	ebegin "Starting msfrpcd${VERSION}"
+	start-stop-daemon --start --quiet --background \
+		--exec /usr/lib/metasploit${VERSION}/msfrpcd \
+		--pidfile ${PIDFILE} \
+		--make-pidfile -- -f ${MSF_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping msfrpcd${VERSION}"
+	start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
+	eend $?
+}
diff --git a/net-analyzer/metasploit/metasploit-4.12.5.ebuild b/net-analyzer/metasploit/metasploit-4.12.5.ebuild
new file mode 100644
index 000000000..65e549c6b
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-4.12.5.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+#never ever ever have more than one ruby in here
+USE_RUBY="ruby21"
+inherit eutils ruby-ng
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
+	inherit git-r3
+	KEYWORDS=""
+	SLOT="9999"
+else
+	##Tags https://github.com/rapid7/metasploit-framework/releases
+	##Releases https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
+	#SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	##Snapshots
+	MY_PV=${PV/_p/-}
+	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	RUBY_S="${PN}-framework-${MY_PV}"
+	inherit versionator
+	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
+fi
+
+DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
+HOMEPAGE="http://www.metasploit.org/"
+LICENSE="BSD"
+IUSE="development +java oracle +pcap test"
+
+#multiple known bugs with tests reported upstream and ignored
+#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
+RESTRICT="test"
+
+RUBY_COMMON_DEPEND="virtual/ruby-ssl
+	>=dev-ruby/activesupport-4.2.6:4.2
+	>=dev-ruby/actionpack-4.2.6:4.2
+	>=dev-ruby/activerecord-4.2.6:4.2
+	dev-ruby/bcrypt-ruby
+	dev-ruby/builder:3
+	dev-ruby/bundler
+	dev-ruby/filesize
+	dev-ruby/jsobfu:0.3.0
+	dev-ruby/json
+	dev-ruby/kissfft
+	dev-ruby/metasm:1.0.2
+	dev-ruby/metasploit_data_models:2.0.0
+	dev-ruby/meterpreter_bins:0.0.22
+	dev-ruby/metasploit-payloads:1.1.11
+	dev-ruby/metasploit-credential:2.0
+	dev-ruby/metasploit-concern:2.0
+	dev-ruby/metasploit-model:2.0
+	dev-ruby/msgpack
+	dev-ruby/nokogiri
+	dev-ruby/openssl-ccm:1.2.1
+	dev-ruby/octokit
+	dev-ruby/patch_finder
+	dev-ruby/recog:2.0.14
+	dev-ruby/redcarpet
+	=dev-ruby/rkelly-remix-0.0.6
+	dev-ruby/sqlite3
+	>=dev-ruby/pg-0.11
+	dev-ruby/packetfu:1.1.11
+	>=dev-ruby/rubyzip-1.1
+	dev-ruby/rb-readline-r7
+	dev-ruby/robots
+	dev-ruby/tzinfo-data
+	java? ( dev-ruby/rjb )
+	oracle? ( dev-ruby/ruby-oci8 )
+	pcap? ( dev-ruby/pcaprub:*
+		dev-ruby/network_interface )
+	development? ( dev-ruby/fivemat
+			dev-ruby/pry
+			dev-ruby/redcarpet
+			dev-ruby/yard
+			>=dev-ruby/rake-10.0.0
+			>=dev-ruby/factory_girl-4.1.0 )"
+	#lorcon doesn't support ruby21
+	#lorcon? ( net-wireless/lorcon[ruby] )
+ruby_add_bdepend "${RUBY_COMMON_DEPEND}
+		test? ( >=dev-ruby/factory_girl-4.1.0
+			dev-ruby/fivemat
+			dev-ruby/database_cleaner
+			>=dev-ruby/rspec-2.12
+			dev-ruby/shoulda-matchers
+			dev-ruby/timecop
+			>=dev-ruby/rake-10.0.0 )"
+ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
+
+COMMON_DEPEND="dev-db/postgresql[server]
+	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	net-analyzer/nmap"
+RDEPEND+=" ${COMMON_DEPEND}
+	>=app-eselect/eselect-metasploit-0.16"
+
+RESTRICT="strip"
+
+QA_PREBUILT="
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+	"
+
+pkg_setup() {
+	if use test; then
+		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
+		su postgres -c "createuser msf_test_user -d -S -R"
+		if [ $? -ne 0 ]; then
+			su postgres -c "dropuser msf_test_user" || die
+			su postgres -c "createuser msf_test_user -d -S -R" || die
+		fi
+		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
+	fi
+	ruby-ng_pkg_setup
+}
+
+all_ruby_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+	else
+		default_src_unpack
+#		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
+#		rm -r msf3
+		#msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
+		#msf_version=${msf_version#*=}
+	fi
+}
+
+all_ruby_prepare() {
+	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
+	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
+	epatch_user
+
+	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
+	rm -r data/cpuinfo
+
+	#remove random oudated collected garbage
+	rm -r external
+
+	#remove unneeded ruby bundler versioning files
+	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
+	#we regen this file in each_ruby_prepare
+	rm Gemfile.lock
+	#The Gemfile contains real known deps
+	#add our dep on upstream rb-readline instead of bundled one
+	#and then they broke it...
+	#sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die
+	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
+	#remove the bundled readline
+	#https://github.com/rapid7/metasploit-framework/pull/3105
+	#this PR was closed due to numerous changes to their local fork, almost entirely for non-linux
+	#but now we have to go back to bundled readline because otherwise it's broken
+	#rm lib/rbreadline.rb
+	#now we edit the Gemfile based on use flags
+	#even if we pass --without=blah bundler still calculates the deps and messes us up
+	if ! use pcap; then
+		sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die
+	fi
+	if ! use development; then
+		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+	fi
+	if ! use test; then
+		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
+	fi
+	if ! use test && ! use development; then
+		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
+	fi
+	#We don't need simplecov
+	sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
+	sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
+
+	#we need to edit the gemspec too, since it tries to call git instead of anything sane
+	#probably a better way to fix this... if I care at some point
+	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
+
+	#let's bogart msfupdate
+	rm msfupdate
+	echo "#!/bin/sh" > msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"\"" >> msfupdate
+	if [[ ${PV} == "9999" ]] ; then
+		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
+		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
+		echo "else" >> msfupdate
+		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
+		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
+		echo "fi" >> msfupdate
+	else
+		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
+		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
+		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
+	fi
+	#this is set executable in src_install
+
+	#install our database.yml file before tests are run
+	cp "${FILESDIR}"/database.yml config/
+
+}
+
+each_ruby_prepare() {
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+
+	#force all metasploit executables to use desired ruby version
+	#https://dev.metasploit.com/redmine/issues/8357
+	for file in $(ls -1 msf*)
+	do
+		#poorly adapted from python.eclass
+		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
+	done
+}
+
+each_ruby_test() {
+	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
+
+	#we bogart msfupdate so no point in trying to test it
+	rm spec/msfupdate_spec.rb || die
+	#we don't really want to be uploading to virustotal during the tests
+	rm spec/tools/virustotal_spec.rb || die
+
+	# https://dev.metasploit.com/redmine/issues/8425
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
+
+	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
+	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
+}
+
+each_ruby_install() {
+	#Tests have already been run, we don't need this stuff
+	rm -r spec || die
+	rm -r test || die
+	rm Gemfile.lock || die
+
+	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
+	# should be as simple as copying everything into the target...
+	dodir /usr/$(get_libdir)/${PN}${SLOT}
+	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
+	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
+	fowners -R root:0 /
+
+}
+
+all_ruby_install() {
+	# do not remove LICENSE, bug #238137
+	dodir /usr/share/doc/${PF}
+	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
+	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
+
+	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
+
+	#tell revdep-rebuild to ignore binaries meant for the target
+	dodir /etc/revdep-rebuild
+	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
+		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
+	EOF
+}
+
+pkg_postinst() {
+	elog "Before use you should run 'env-update' and '. /etc/profile'"
+	elog "otherwise you may be missing important environmental variables."
+
+	elog "You need to prepare the database by running:"
+	elog "emerge --config postgresql"
+	elog "/etc/init.d/postgresql-<version> start"
+	elog "emerge --config =metasploit-${PV}"
+
+	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
+
+	einfo
+	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
+}
+
+pkg_config() {
+	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
+	su postgres -c "createuser msf_user -D -S -R"
+	su postgres -c "createdb --owner=msf_user msf_database"
+}
diff --git a/net-analyzer/ppscan/Manifest b/net-analyzer/ppscan/Manifest
index e00ab9ee2..fac475805 100644
--- a/net-analyzer/ppscan/Manifest
+++ b/net-analyzer/ppscan/Manifest
@@ -1 +1 @@
-DIST ppscan-0.3.tar.gz 8046 SHA256 662c1cf506bf0d8bb74216f8ea2f0047e7c33238eb1860284b5d9c9fbb2ccc27
+DIST ppscan-0.3.tar.gz 8046 SHA256 662c1cf506bf0d8bb74216f8ea2f0047e7c33238eb1860284b5d9c9fbb2ccc27 SHA512 473087933b585affb8f50da56d86bf76ffffe169a47607aaa2093768d404204105fa7011509aac3bde4c430923958cf47813c2dbcf7923747b7a1b098f734872 WHIRLPOOL 358436ad4297ebcc09282207c67454432d5e85c37c297f6b081a52ab52aac574616bb1c062a9734acf20574864beb2e7ff7f9edf11bb98fe21f54718032bcae2
diff --git a/net-analyzer/ppscan/ppscan-0.3.ebuild b/net-analyzer/ppscan/ppscan-0.3.ebuild
index 04f5c8b29..feb59b43a 100644
--- a/net-analyzer/ppscan/ppscan-0.3.ebuild
+++ b/net-analyzer/ppscan/ppscan-0.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI=2
+EAPI=5
 
-DESCRIPTION="port scanner with HTTP and FTP tunneling support"
-HOMEPAGE="http://aconole.brad-x.com/programs/"
-SRC_URI="http://packetstorm.wowhacker.com/UNIX/scanners/ppscan-0.3.tar.gz"
+DESCRIPTION="Port scanner with HTTP and FTP tunneling support"
+HOMEPAGE="https://packetstormsecurity.com/files/82897/PPScan-Portscanner-0.3.html"
+SRC_URI="https://dl.packetstormsecurity.net/UNIX/scanners/ppscan-0.3.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-python b/profiles/pentoo/base/package.accept_keywords/dev-python
index 288bcd99e..339ffd134 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-python
+++ b/profiles/pentoo/base/package.accept_keywords/dev-python
@@ -9,6 +9,7 @@
 
 #required by net-analyzer/crackmapexec-2.2
 ~dev-python/impacket-0.9.14
+=dev-python/impacket-0.9.15*
 
 ~dev-python/nltk-2.0.1_rc1
 =dev-python/pyqwt-5.2.0
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-ruby b/profiles/pentoo/base/package.accept_keywords/dev-ruby
index 571683f9f..3509833d9 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-ruby
+++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby
@@ -42,26 +42,35 @@ dev-ruby/http_configuration
 ~dev-ruby/arel-3.0.2-r1
 ~dev-ruby/arel-4.0.2
 dev-ruby/activerecord:3.2
-dev-ruby/activerecord:4.0
+dev-ruby/activerecord:4.2
 ~dev-ruby/activerecord-deprecated_finders-1.0.4
 dev-ruby/activesupport:3.2
-dev-ruby/activesupport:4.0
-dev-ruby/actionpack:4.0
+dev-ruby/activesupport:4.2
+dev-ruby/actionpack:4.2
 ~dev-ruby/thread_safe-0.3.5
 dev-ruby/activemodel:3.2
-dev-ruby/activemodel:4.0
+dev-ruby/activemodel:4.2
 dev-ruby/builder:3
 dev-ruby/builder:3.1
 =dev-ruby/bcrypt-ruby-3.1*
-~dev-ruby/i18n-0.6.9
+dev-ruby/i18n:0.7
 ~dev-ruby/memcache-client-1.8.5
 ~dev-ruby/mime-types-1.19
 
 #required by metasploit-9999
+=dev-ruby/bundler-1.11*
+=dev-ruby/jsobfu-0.2*
+=dev-ruby/jsobfu-0.3*
+=dev-ruby/minitest-5.3*
+=dev-ruby/msgpack-0.7*
+=dev-ruby/rake-10.5*
+=dev-ruby/rkelly-remix-0.0.6
+dev-ruby/actionpack:3.2
+dev-ruby/actionview:4.2
+dev-ruby/arel:6.0
 dev-ruby/filesize
 dev-ruby/metasm
 dev-ruby/net-ssh
-=dev-ruby/bundler-1.11*
 =dev-ruby/bundler-1.12*
 dev-ruby/rb-readline-r7
 ~dev-ruby/yard-0.8.7.6
@@ -83,51 +92,75 @@ dev-ruby/method_source
 dev-ruby/metasploit_data_models
 dev-ruby/postgres_ext
 dev-ruby/pg_array_parser
+dev-ruby/metasploit-concern
 dev-ruby/metasploit-credential
 dev-ruby/metasploit-model
-dev-ruby/metasploit-concern
-=dev-ruby/rkelly-remix-0.0.6
-=dev-ruby/msgpack-0.7*
-~dev-ruby/network_interface-0.0.1
-=dev-ruby/rake-10.5*
-~dev-ruby/hoe-3.13.0
-=dev-ruby/minitest-5.3*
-~dev-ruby/minitest-4.7.5
-dev-ruby/meterpreter_bins
 dev-ruby/metasploit-payloads
-~dev-ruby/fivemat-1.3.2
-~dev-ruby/shoulda-matchers-2.6.0
-~dev-ruby/rexical-1.0.5
-dev-ruby/rjb
-~dev-ruby/robots-0.10.1
+dev-ruby/metasploit_data_models
+dev-ruby/meterpreter_bins
+dev-ruby/method_source
+dev-ruby/net-ssh
+dev-ruby/openssl-ccm:1.2.1
+dev-ruby/octokit
+~dev-ruby/sawyer-0.7.0
+dev-ruby/patch_finder
 dev-ruby/packetfu
 dev-ruby/pcaprub
-~dev-ruby/sdoc-0.3.20
-~dev-ruby/factory_girl-4.5.0
-~dev-ruby/shoulda-matchers-2.3.0
-~dev-ruby/database_cleaner-1.1.1
-~dev-ruby/redcarpet-3.2.3
-~dev-ruby/rack-1.4.6
-~dev-ruby/pg-0.17.1
-~dev-ruby/tzinfo-0.3.43
-dev-ruby/recog
-dev-ruby/openssl-ccm:1.2.1
-
-~dev-ruby/journey-1.0.4
-dev-ruby/actionpack:3.2
+dev-ruby/pg_array_parser
+dev-ruby/postgres_ext
+dev-ruby/pry
+dev-ruby/rails-dom-testing:1
 dev-ruby/railties:3.2
 dev-ruby/railties:4.0
-~app-eselect/eselect-rails-0.21
-~dev-ruby/hike-1.2.3
+dev-ruby/railties:4.2
+dev-ruby/rb-readline-r7
+dev-ruby/recog
+dev-ruby/redcarpet
+dev-ruby/rjb
+dev-ruby/slop
 dev-ruby/sprockets:2.2
-~dev-ruby/rack-ssl-1.3.4
-~dev-ruby/arel-helpers-2.1.1
-~dev-ruby/tilt-1.4.1
-~dev-ruby/rubyntlm-0.5.3
-=dev-ruby/jsobfu-0.2*
-=dev-ruby/jsobfu-0.3*
+dev-ruby/tzinfo:1
+dev-ruby/tzinfo-data
+~app-eselect/eselect-rails-0.21
+~dev-ruby/abstract-1.0.0
+~dev-ruby/arel-helpers-2.3.0
+~dev-ruby/coveralls-0.7.1
+~dev-ruby/database_cleaner-1.1.1
+~dev-ruby/em-http-request-0.3.0
+~dev-ruby/erubis-2.7.0
+~dev-ruby/factory_girl-4.5.0
+~dev-ruby/fivemat-1.3.2
+~dev-ruby/hike-1.2.3
+~dev-ruby/hoe-3.13.0
+~dev-ruby/journey-1.0.4
+~dev-ruby/linecache-0.43
+~dev-ruby/minitest-4.7.5
+~dev-ruby/mongrel-1.2.0
+~dev-ruby/multipart-post-2.0.0
+~dev-ruby/network_interface-0.0.1
+~dev-ruby/pg-0.17.1
+~dev-ruby/rack-1.4.6
 ~dev-ruby/rack-cache-1.2
+~dev-ruby/rack-ssl-1.3.4
+~dev-ruby/rails-deprecated_sanitizer-1.0.3
+~dev-ruby/rails-html-sanitizer-1.0.3
+~dev-ruby/redcarpet-3.2.3
+~dev-ruby/rexical-1.0.5
+~dev-ruby/robots-0.10.1
+~dev-ruby/rubinius-coverage-2.0.3
+~dev-ruby/rubinius-debugger-2.0.3
+~dev-ruby/rubinius-developer_tools-2.0.0
+~dev-ruby/rubinius-profiler-2.0.1
+~dev-ruby/rubyntlm-0.5.3
+~dev-ruby/sdoc-0.3.20
+~dev-ruby/shoulda-matchers-2.3.0
+~dev-ruby/shoulda-matchers-2.6.0
+~dev-ruby/sqlite3-1.3.10
 ~dev-ruby/thor-0.19.1
+~dev-ruby/tilt-1.4.1
+~dev-ruby/tzinfo-0.3.43
+~dev-ruby/vcr-1.11.3
+~dev-ruby/yard-0.8.7.6
 
 #wpscan
 ~dev-ruby/ruby-progressbar-1.1.0
@@ -135,6 +168,7 @@ dev-ruby/sprockets:2.2
 ~dev-ruby/ethon-0.7.0
 ~dev-ruby/ethon-0.7.4 **
 ~dev-ruby/ethon-0.8.1 **
+~dev-ruby/ethon-0.9.0 **
 ~virtual/ruby-ffi-1
 ~dev-ruby/ffi-1.3.1
 ~dev-ruby/webmock-1.9.3
diff --git a/profiles/pentoo/base/package.accept_keywords/net-analyzer b/profiles/pentoo/base/package.accept_keywords/net-analyzer
index 9910e1768..2089ab690 100644
--- a/profiles/pentoo/base/package.accept_keywords/net-analyzer
+++ b/profiles/pentoo/base/package.accept_keywords/net-analyzer
@@ -30,7 +30,7 @@ net-analyzer/multimon-ng
 =net-analyzer/bettercap-1.5*
 ~net-analyzer/chaosreader-0.94
 net-analyzer/cloudshark
-~net-analyzer/crackmapexec-2.3
+~net-analyzer/crackmapexec-3.1
 ~net-analyzer/davtest-1.0
 ~net-analyzer/dnsa-0.5
 ~net-analyzer/dnsrecon-0.8.9
diff --git a/sys-kernel/pentoo-sources/Manifest b/sys-kernel/pentoo-sources/Manifest
index ed1d40bd0..6841a7ffc 100644
--- a/sys-kernel/pentoo-sources/Manifest
+++ b/sys-kernel/pentoo-sources/Manifest
@@ -4,9 +4,12 @@ DIST deblob-check-4.0 670921 SHA256 042b511913187672d9a0512765e662ba5d4283812ebe
 DIST deblob-check-4.4 694225 SHA256 e142bafdd5a05280d5280fbf109aadab3af9ce71152ab2d27ad41e96766e0c3e SHA512 6554ae567566da4d30e94a37622f88343b8e96ab39a9204fee34de4ddb5dac8c4906b25843b63c2388d03a4441821c25d395b3c39fc875c498a69e677a4f0cb5 WHIRLPOOL 414f60a64a2c14f01eedebc84f5adfabf0562bcf76545a57e757cb6ac914ffc49c90c329eedd1aafb1ee752bfc082fd4f6af173774f4f853ddd637525fbeeb9b
 DIST genpatches-4.0-9.base.tar.xz 193344 SHA256 9d7c65367c1d2f24c6e4c8f8b4b9170a7ddeaa24d6563c5ba5dc41201a7b6e17 SHA512 646814e63b3b1d78adc172c6f8c0c2605cc9f368bb368be72e169049938617c5c6e738ddcfcbe1e10b58ccd3f9fa09984b03f70076ce0b15137f376594b9066a WHIRLPOOL 0eecbfe1b2b02f00edcab0c975b06bd69a5ff1032fe0c4249d79de555f92f2375d337b2417bddb566e9a1fc66859918b6cbfff6c2c73aea02818434213b0cda1
 DIST genpatches-4.4-3.base.tar.xz 26508 SHA256 76f5685698b02b81643d6b2edcd53217e0f6fa00e068a138f2eb3bc596dec2e5 SHA512 255e2ef79c56699e5b032fa392b2748570ce96c74f1172f4a4c1b4d22f8b8b0a9462c388028a0cad92e821815d39cfa6450f171d81fed5f274dce03979c39322 WHIRLPOOL 6da9edc7936f8857b929e589b2adcb17363a76ec5d85b3406fcb8308d6cb2da924f1f9af5062f85ddf4d415ca9d9524b731e8c4e0cde756e14ccc122a6e75c74
+DIST genpatches-4.4-9.base.tar.xz 304360 SHA256 e9ba25000126256be414a273b154accc51ef523d236c35e2214ee75e243aa71f SHA512 ef239c362defeafc92eae84ede7a07820ddf0c01002f52a58d39d7b0dcdfd83af2d5fa4d2ee3d2c57e4c89a30d4fbf05dc5519886b8f55bf148ce4197b85d465 WHIRLPOOL 88963d0eac645d453ccf1cfe0e30777090240f18f20ccf735b7551a57365c2505849b13c8cd4092542f6baf6d251eb0e9c44fbba118d9677f9cd334e0ef10861
 DIST hardened-patches-4.0.8-1.extras.tar.bz2 1366743 SHA256 765a06197afb4b7f268778b5ba2a6ca438b20bf900ca97cbc17b47570cf1dd0e SHA512 782a7883e055173a1cf6be76e8d99a56757f5576c09fb80c295e6bc926d7dd8e6fbfc4fd09c38e0e95d4f0317808b68a9fbb0e9b59a9a3f27b89f906f375e619 WHIRLPOOL ea95c5d29801759d2ed247885095c914ee07c4b800cb9a2f5f1c4b7b79347d2853ae56f64ad732c6aa8972a43e8993fdcfabf5e244d5994fa7998a382faebfe7
 DIST hardened-patches-4.4.2-1.extras.tar.bz2 1721230 SHA256 81f1417d210e0a6d9f5e180b9f828beb87ddc27571a16c40552d0fa1979982ec SHA512 599dedbef6fa26efc2a62c19e0536accedff6c60968294e9a7246c9844b26491b4414b1b40106eee9bb7540f8cd4ae74ab3720029b0730ce5541e005ba60cb9b WHIRLPOOL 84e22467a6dcc738043e47274ab2476b69f1796f1f23e3ca4ed8e244dd73a7e4998de683c1d93baccdd41eb232327d4ef1eb07d01b8a790510b8690334032f02
+DIST hardened-patches-4.4.8-2.extras.tar.bz2 1743408 SHA256 5cde9a96f6a47ebe3c8abeb5d5add60480490fd365d4c31da2d7ac1973a4c258 SHA512 cfb52ee6aee76b125a5a833cd9facc92ea1dff17129a488b66e976e94699cea8109e6f5df90835e818af1ea6e59e12cecc95159601d544f5b008560a1190b530 WHIRLPOOL 56facf79d5556aaac3bf08fa3b4be21b7fef561c8d3fd41943ce51c4d15b71e114be2e33914f5bf7e3d981abcebeffb95fb99aedde8d72231edcef72123ea9fa
 DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001
 DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
 DIST penpatches-4.0.8-1.tar.xz 229820 SHA256 f04eade339e847c1b586938f7746e215f3ee2c703d1a754276bb80f5ee5f708c SHA512 fdf32089428998fe3e97dddf3c2d9b6f9456f287f3f1a4153fcb9061b0cbeeb0dac96f055e02877831db57bbb6e8c0b09062b3403f04f5f396ce5cc53c407cd8 WHIRLPOOL 7df95c9e02a382b94d3bc18dcd17501a70d06dc99f6d60a537f7ed1988d02d097e9fbb383427807ac6a89824d05490f9c00ae7501f508e37c1db583a6e8592e0
 DIST penpatches-4.4.2-1.tar.xz 232652 SHA256 3d701032147a8f6720837df248ee43001c72c916c7ac0e3438ef16b735dd5b45 SHA512 31c47a6294b6ea49237bbe914f69a1675f790c234d3ab75c8ddcf019dac03708a4e21dc66bec95da82182a2753930554bde446f2b2bd66f2ed3b4bcc2e798c6d WHIRLPOOL cfa25047493b61cf8c0374e59b37012052374e3fed0299e8b42be35928b3f451709c48978ea1b5a164c88a11505b38c27bae940882cdd40fdaa0e9c2b82ec10e
+DIST penpatches-4.4.8-1.tar.xz 232652 SHA256 3d701032147a8f6720837df248ee43001c72c916c7ac0e3438ef16b735dd5b45 SHA512 31c47a6294b6ea49237bbe914f69a1675f790c234d3ab75c8ddcf019dac03708a4e21dc66bec95da82182a2753930554bde446f2b2bd66f2ed3b4bcc2e798c6d WHIRLPOOL cfa25047493b61cf8c0374e59b37012052374e3fed0299e8b42be35928b3f451709c48978ea1b5a164c88a11505b38c27bae940882cdd40fdaa0e9c2b82ec10e
diff --git a/sys-kernel/pentoo-sources/pentoo-sources-4.4.8-r1.ebuild b/sys-kernel/pentoo-sources/pentoo-sources-4.4.8-r1.ebuild
new file mode 100644
index 000000000..904ce251d
--- /dev/null
+++ b/sys-kernel/pentoo-sources/pentoo-sources-4.4.8-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="9"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+PENPATCHES_VER="1"
+#PENPATCHES="penpatches-${PV}-${PENPATCHES_VER}.tar.xz"
+PENPATCHES="penpatches-4.4.2-${PENPATCHES_VER}.tar.xz"
+PENPATCHES_URI="http://dev.pentoo.ch/~zero/distfiles/${PENPATCHES}"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI} ${PENPATCHES_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2 ${DISTDIR}/${PENPATCHES}"
+
+DESCRIPTION="Pentoo kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="https://github.com/pentoo/pentoo-livecd/tree/master/kernel/${PV}"
+#IUSE="aufs deblob injection openfile_log pax_kernel"
+IUSE="aufs deblob injection pax_kernel"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=sys-devel/gcc-4.5"
+PDEPEND="=sys-apps/gradm-3.1*"
+
+pkg_setup() {
+	# We are proud of it, let's show it
+	UNIPATCH_EXCLUDE="4421_grsec-remove-localversion-grsec.patch"
+	if ! use pax_kernel; then
+		UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} \
+		4427_force_XATTR_PAX_tmpfs.patch \
+		4440_selinux-avc_audit-log-curr_ip.patch \
+		4475_emutramp_default_on.patch \
+		44??-grsec* \
+		44??_grsec* \
+		4445_disable-compat_vdso.patch \
+		4420_grsecurity-* \
+		4465_selinux-avc_audit-log-curr_ip.patch \
+		4470_disable-compat_vdso.patch \
+		4508_aufs4-mmap-pax.patch \
+		4511_pax-4.4.2.patch"
+	else
+		UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} \
+				1500_XATTR_USER_PREFIX.patch \
+				2900_dev-root-proc-mount-fix.patch \
+				4508_aufs4-mmap.patch \
+				4400_logo_larry_the_cow.patch"
+	fi
+	if ! use aufs ; then
+		UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} \
+			4506_aufs4-kbuild.patch \
+			4507_aufs4-base.patch \
+			4508_aufs4-mmap.patch \
+			4508_aufs4-mmap-pax.patch \
+			4509_aufs4-standalone.patch \
+			4510_aufs4-files.patch \
+			4511_pax-4.4.2.patch"
+	fi
+	if ! use injection ; then
+		UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} \
+			4002_mac80211-2.6.29-fix-tx-ctl-no-ack-retry-count.patch \
+			4004_zd1211rw-inject+dbi-fix-4.4ish.patch \
+			4005_ipw2200-inject.3.4.6.patch"
+	fi
+	#use openfile_log && UNIPATCH_LIST="${UNIPATCH_LIST} ${FILESDIR}/openfile_log-36.patch"
+	UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 4500-new-dect-stack.patch"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	ewarn "It may be desired to download the official pentoo kernel config from here:"
+	if use amd64; then
+		if use pax_kernel; then
+			ewarn "https://github.com/pentoo/pentoo-livecd/tree/master/livecd/amd64/kernel/config-${PV}"
+		else
+			ewarn "https://github.com/pentoo/pentoo-livecd/tree/master/livecd/amd64/kernel/config-${PV}-soft"
+		fi
+	fi
+	if use x86; then
+		if use pax_kernel; then
+			ewarn "https://github.com/pentoo/pentoo-livecd/tree/master/livecd/x86/kernel/config-${PV}"
+		else
+			ewarn "https://github.com/pentoo/pentoo-livecd/tree/master/livecd/x86/kernel/config-${PV}-soft"
+		fi
+	fi
+}