From f81ac96edfad95367dbc4174ee6cd701008ee211 Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Fri, 6 Jul 2018 01:54:55 +0800
Subject: [PATCH] armitage: cleanup

---
 net-analyzer/armitage/Manifest                |  1 +
 .../armitage/armitage-20141129.ebuild         | 53 -------------------
 .../armitage/armitage-20150813.ebuild         | 41 +++++++-------
 net-analyzer/armitage/armitage-9999.ebuild    |  6 +--
 4 files changed, 25 insertions(+), 76 deletions(-)
 create mode 100644 net-analyzer/armitage/Manifest
 delete mode 100644 net-analyzer/armitage/armitage-20141129.ebuild

diff --git a/net-analyzer/armitage/Manifest b/net-analyzer/armitage/Manifest
new file mode 100644
index 000000000..9bdea1e65
--- /dev/null
+++ b/net-analyzer/armitage/Manifest
@@ -0,0 +1 @@
+DIST armitage-20150813.zip 16746184 BLAKE2B 4f30f0b0e3548797046b66d9143db71f6f687fb9aa30114711e014151e468da6b1ba82d481a8d287346a91d5d185ffcecbcd778308b8390d6076b01a78d39849 SHA512 42d92e2505ac56758d3ecc565c2d8571fecb6c920b48617c3d67470d03b7c93d6948d9b1e0f74edc250d9a8f94bedb0c5dd95707a1c796da4d81c2777a26be3e
diff --git a/net-analyzer/armitage/armitage-20141129.ebuild b/net-analyzer/armitage/armitage-20141129.ebuild
deleted file mode 100644
index afafa86c5..000000000
--- a/net-analyzer/armitage/armitage-20141129.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils subversion java-pkg-2 java-ant-2
-
-DESCRIPTION="Cyber Attack Management for Metasploit"
-HOMEPAGE="http://www.fastandeasyhacking.com/"
-ESVN_REPO_URI="http://armitage.googlecode.com/svn/trunk/"
-ESVN_REVISION="1239"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-CDEPEND="net-analyzer/metasploit
-	net-analyzer/nmap"
-
-JGRAPHX_SLOT="1.4"
-MSGPACK_SLOT="5.1"
-
-DEPEND="${CDEPEND}
-	!net-analyzer/armitage-bin
-	dev-java/jgraphx:${JGRAPHX_SLOT}
-	dev-java/sleep
-	dev-java/msgpack:${MSGPACK_SLOT}
-	dev-java/jdbc-postgresql
-		>=virtual/jdk-1.6"
-
-RDEPEND="${CDEPEND}
-		 >=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	find . -name '*.jar' -delete
-	cd "${S}"/lib
-	java-pkg_jar-from sleep
-	java-pkg_jar-from jgraphx-${JGRAPHX_SLOT}
-	java-pkg_jar-from msgpack-${MSGPACK_SLOT} msgpack.jar msgpack-0.5.1-devel.jar
-	java-pkg_jar-from jdbc-postgresql jdbc-postgresql.jar postgresql-9.1-901.jdbc4.jar
-}
-
-src_install() {
-	java-pkg_newjar ${PN}.jar
-	java-pkg_dolauncher ${PN}
-	dosbin release/armitage-unix/teamserver
-	doicon release/armitage-unix/${PN}-logo.png
-	dodoc release/armitage-unix/readme.txt
-}
diff --git a/net-analyzer/armitage/armitage-20150813.ebuild b/net-analyzer/armitage/armitage-20150813.ebuild
index 63a55bfcd..4af4a91ea 100644
--- a/net-analyzer/armitage/armitage-20150813.ebuild
+++ b/net-analyzer/armitage/armitage-20150813.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
+EAPI=6
 
-inherit eutils git-2 java-pkg-2 java-ant-2
+inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Cyber Attack Management for Metasploit"
 HOMEPAGE="http://www.fastandeasyhacking.com/"
-EGIT_REPO_URI="https://github.com/rsmudge/armitage.git"
-EGIT_COMMIT="b2d5b4fc80895bd5196215b39c2bec2be0b7304e"
+MY_COMMIT="b2d5b4fc80895bd5196215b39c2bec2be0b7304e"
+SRC_URI="https://github.com/rsmudge/${PN}/archive/${MY_COMMIT}.zip -> ${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-CDEPEND="net-analyzer/metasploit
+CDEPEND="net-analyzer/metasploit:*
 	net-analyzer/nmap"
 
 JGRAPHX_SLOT="1.4"
@@ -30,21 +29,23 @@ DEPEND="${CDEPEND}
 	dev-java/javassist:3
 	dev-java/jdbc-postgresql:0
 		>=virtual/jdk-1.6"
-
 RDEPEND="${CDEPEND}
-		 >=virtual/jre-1.6"
+		>=virtual/jre-1.6"
 
-S="${WORKDIR}"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
-src_prepare() {
-	find . -name '*.jar' -delete
-	cd "${S}"/lib
-	java-pkg_jar-from sleep
-	java-pkg_jar-from jgraphx-${JGRAPHX_SLOT}
-	java-pkg_jar-from msgpack-${MSGPACK_SLOT} msgpack.jar msgpack-0.6.12-devel.jar
-	java-pkg_jar-from jdbc-postgresql jdbc-postgresql.jar postgresql-9.1-901.jdbc4.jar
-	java-pkg_jar-from javassist-3 javassist.jar javassist-3.15.0-GA.jar
-}
+JAVA_GENTOO_CLASSPATH="sleep,jgraphx-${JGRAPHX_SLOT},msgpack-${MSGPACK_SLOT},jdbc-postgresql,javassist-3"
+
+#src_prepare() {
+#	find . -name '*.jar' -delete
+#	cd "${S}"/lib
+#	java-pkg_jar-from sleep
+#	java-pkg_jar-from jgraphx-${JGRAPHX_SLOT}
+#	java-pkg_jar-from msgpack-${MSGPACK_SLOT} msgpack.jar msgpack-0.6.12-devel.jar
+#	java-pkg_jar-from jdbc-postgresql jdbc-postgresql.jar postgresql-9.1-901.jdbc4.jar
+#	java-pkg_jar-from javassist-3 javassist.jar javassist-3.15.0-GA.jar
+#	eapply_user
+#}
 
 src_install() {
 	java-pkg_newjar ${PN}.jar
diff --git a/net-analyzer/armitage/armitage-9999.ebuild b/net-analyzer/armitage/armitage-9999.ebuild
index 278a07c02..946e74101 100644
--- a/net-analyzer/armitage/armitage-9999.ebuild
+++ b/net-analyzer/armitage/armitage-9999.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
@@ -8,6 +7,7 @@ inherit eutils subversion java-pkg-2 java-ant-2
 
 DESCRIPTION="Cyber Attack Management for Metasploit"
 HOMEPAGE="http://www.fastandeasyhacking.com/"
+#FIXME: https://github.com/rsmudge/armitage.git
 ESVN_REPO_URI="http://armitage.googlecode.com/svn/trunk/"
 
 LICENSE="BSD"
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-CDEPEND="net-analyzer/metasploit
+CDEPEND="net-analyzer/metasploit:*
 	net-analyzer/nmap"
 
 JGRAPHX_SLOT="1.4"