Bump to 4.0, includes lots of nice ebuild improvements from #342013

Package-Manager: portage-2.2.0_alpha49/cvs/Linux x86_64

8 files changed, 483 insertions, 3 deletions

diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index 38f43fb47fd8..8802b5c6eef2 100644
--- a/net-analyzer/metasploit/ChangeLog
+++ b/net-analyzer/metasploit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/metasploit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.55 2011/05/07 17:01:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.56 2011/08/03 05:56:15 patrick Exp $
+
+*metasploit-9999 (03 Aug 2011)
+*metasploit-4.0.0 (03 Aug 2011)
+
+  03 Aug 2011; Patrick Lauer <patrick@gentoo.org> +metasploit-4.0.0.ebuild,
+  +files/msfrpcd-4.0-conf, +files/msfrpcd-4.0-initd, +metasploit-9999.ebuild,
+  +files/metasploit.icon, metadata.xml:
+  Bump to 4.0, includes lots of nice ebuild improvements from #342013
 
 *metasploit-3.7.0 (07 May 2011)
 
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index ef1cb3b493f3..6a311749ff35 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,3 +1,6 @@
+AUX metasploit.icon 7630 RMD160 4289bddb6b240c8ab94f309cd32dfdd23fc4aa99 SHA1 3bab78d9b905d32ead2e3be13f8fd6553d097dd3 SHA256 d197dd3b939c35d951c2cd5c19b51200ada7f8f92d90775a9eaebdccf18e3949
+AUX msfrpcd-4.0-conf 598 RMD160 2c9564cb3422deb4b46254a574f55323896c110c SHA1 0ac1235ecba0d22fc03b2f5adea359a55370a043 SHA256 3ad3e837061fd2b8b28d5afede50fc1965b0df083a8e4b743f39398a344eb6e1
+AUX msfrpcd-4.0-initd 636 RMD160 7d5c93935ce73646635e4748c12e3680854bdcf2 SHA1 3b1cc660ddfca643dad93ede1e326b082443a026 SHA256 18804548c2c869addc72a9c003c35c6d25b8144a9a0f841df602834c27c5fd52
 AUX msfweb.confd 273 RMD160 35c10406c74e431aa592c7af6d14f813ad18b984 SHA1 66cff0fe0423baa89ffdd3745b7195ae0f0bf273 SHA256 006040ecd27dc0279c2bea6d69365fe1f0d66f507c039ae43720662abe9f4460
 AUX msfweb.initd 533 RMD160 44f94381ae9488fb2e3c6f700458798b692971d7 SHA1 9b62d7d85af34430dda55a192460caae258ba978 SHA256 4fd9668e4b467ecfa5160e2c108ac8ace71fbeaefaf829d2f7bfb566d44bb13c
 AUX msfweb3.2.confd 234 RMD160 2cad154dc7ac4e836e8b4dd8c4366521742f90b3 SHA1 c3bac2879f00f56ff0a0737eea6a4d200f5761c9 SHA256 bc911b32a2c81d337135c7614e0982e102056fb174d274177cc2b8aca717e97f
@@ -15,6 +18,7 @@ DIST framework-3.4.1.tar.bz2 32779137 RMD160 30200656cfd0907b1ff60cf115695e02143
 DIST framework-3.5.0.tar.bz2 42254784 RMD160 090d557574b8e98e461f9de2bb95f604d74cf645 SHA1 15e72afdfdc374f74a6eb07969174855b6d02361 SHA256 bb1cd6e70547b039672d2087a580fe4a29199098a78030a6e50779687dccbed7
 DIST framework-3.6.0.tar.bz2 47125266 RMD160 afdbce02626ac994d8351d69846a5033758c2783 SHA1 1c78cd774204d6edd6e795ef1dff36d49836f530 SHA256 a113cf9e1a499377807990e506acad83afee18845a148a02747087132fac39a7
 DIST framework-3.7.0.tar.bz2 49488660 RMD160 56c76a7d24372f48f5d84da1713acbc7f54590af SHA1 8ca60e75b90da4555274b5fb3a20a152c581aa02 SHA256 1e39a0de7e4b6cc4144b5ea47b3598e6edf27ac00abac5d84e1fec04b7f95dc5
+DIST framework-4.0.0.tar.bz2 79515768 RMD160 f8eedb9d68f30b245217b4ed40308dcd351d37c5 SHA1 f1768564be92abcea3ea34fde14acb1af4d52f1d SHA256 45c3c379ea82e46d8efef9cbbe0afa8ae8df98e50f2642afcea84a86c83c5a50
 EBUILD metasploit-2.7.ebuild 1451 RMD160 86b02866587de2829a1905ab274cbe4abdd41991 SHA1 e7cc8fb826d55a9be1125dd63ea16798dea1c393 SHA256 fc61998068bf093cf4a68f1563130bed0c1c05c6db7fee51669e49de9460cc96
 EBUILD metasploit-3.3.3.ebuild 2919 RMD160 69d867f0c6e7448da1953fe157a28d57718e8235 SHA1 a7344a0baa68cd6a8717b94ef998066f90158e17 SHA256 d65d28b77e8326f9fde85225bef7f7a37e2327fd3f69075653bd13b440e3711b
 EBUILD metasploit-3.4.0.ebuild 2919 RMD160 0ea84526740db98f902db71e87aaaf73ac0db5ef SHA1 e2a5b180f53844ef927e4412296aaa1d0575fd2a SHA256 75eb237471c8d9cce33d1d48eda9ff0dfee316c1d8e954225e70243109ca0c47
@@ -22,5 +26,7 @@ EBUILD metasploit-3.4.1.ebuild 2919 RMD160 a76cfa206a4fa634137d37291cb4b9aa9e7a0
 EBUILD metasploit-3.5.0.ebuild 2745 RMD160 4c520154549bd47c14cd22651fb4f39e320e395a SHA1 76fc5dc05e8ed3dddb966643a9d5cd5335acc92e SHA256 fa0a936f9a8d032b7f8ce8440ed77672e5b869ea710c34945886393e0ae1cc42
 EBUILD metasploit-3.6.0.ebuild 2754 RMD160 cc4d8b91773057649ab5ad6ca858a98def25ba5f SHA1 6d33c16a45214df02a297ea8b1192fc52ed5c7c6 SHA256 7d3809310e145c8a6e1cd928f469012e4efa34db968733fdd3c93b9569e3d356
 EBUILD metasploit-3.7.0.ebuild 2754 RMD160 ba32c35b85473387b07df523944a00c19cdf8b30 SHA1 c6c718c9d7a0aeaa8361ea018449716ed7897148 SHA256 07ce498669f9b2f7d701c76ca3543d2f7f1b747739ec7b6bde0636baab6ac21a
-MISC ChangeLog 9398 RMD160 54faa19e16759858a33616cedc53c6dedb6d1699 SHA1 ed0d6f2a64b43d9194ba2959d420644274203958 SHA256 d8a27248811408bcf6c71b170a840638e10c30a43d0cab1afc86d83b7fd467f0
-MISC metadata.xml 864 RMD160 0843a578171a49e091f29d1b1c700bf45df48961 SHA1 024eeb7d6cf06fac61952e51af1e17f091e26e46 SHA256 8af2db5b683a4de1f16cf076ba1baa9ffc1c04897ca5c0f8c9e47ad64e85f0f7
+EBUILD metasploit-4.0.0.ebuild 2403 RMD160 1c0f3d769e04d660e8d5f626251c867362875398 SHA1 08edc42c42d1120ba006a0c40b2fbe4f17150790 SHA256 8dab06afd96651a3536804e8d36708686f6c9c889a08cc36cf0e693d2cf42221
+EBUILD metasploit-9999.ebuild 3475 RMD160 a4f5b34ba451ebd9bdc049c0fa8dc35bb22da853 SHA1 e3d90752bfcaa5bced62671ec47ed4340caa17f1 SHA256 660c8839a36a3331c8d2a55fb12c1c0d5b8a366990fe34417b80460eb797a385
+MISC ChangeLog 9727 RMD160 5363560d98979d59dda5274bdbad068aef04c50f SHA1 cbdc12acaf35eb918038c78e0773491cf7308aa8 SHA256 6e68851c08685ded1d0568ce4d628fe421aefa876727249c779e8be8cdea12a4
+MISC metadata.xml 921 RMD160 921434e10f300e7c3ad351a78009e44a712bf6d2 SHA1 1060d47deb200ba7fcdf4c2b6a0ce864a0adecc1 SHA256 9a88142f22ae111d23f70b42bb41e42301dd5f4c918cc5e0ef585236c1439b22
diff --git a/net-analyzer/metasploit/files/metasploit.icon b/net-analyzer/metasploit/files/metasploit.icon
new file mode 100644
index 000000000000..87af020fdf0d
--- /dev/null
+++ b/net-analyzer/metasploit/files/metasploit.icon
@@ -0,0 +1,224 @@
+/* XPM */
+static char *metasploit[] = {
+/* columns rows colors chars-per-pixel */
+"48 48 170 2 ",
+"   c #000000",
+".  c #0B0B0B",
+"X  c #131313",
+"o  c #1C1C1C",
+"O  c #251B0D",
+"+  c #2C2112",
+"@  c #2C241C",
+"#  c #081933",
+"$  c #061F3B",
+"%  c #07203C",
+"&  c #09223C",
+"*  c #232323",
+"=  c #2D2D2D",
+"-  c #353535",
+";  c #383838",
+":  c #0C2141",
+">  c #0F264C",
+",  c #0F284D",
+"<  c #072755",
+"1  c #082754",
+"2  c #062855",
+"3  c #0E2C57",
+"4  c #072858",
+"5  c #0D2F5C",
+"6  c #033A6E",
+"7  c #1A3166",
+"8  c #043C72",
+"9  c #2F456F",
+"0  c #2A4174",
+"q  c #314774",
+"w  c #314A75",
+"e  c #424242",
+"r  c #444A5F",
+"t  c #545454",
+"y  c #5B5B5B",
+"u  c #414B60",
+"i  c #515A6F",
+"p  c #4B6975",
+"a  c #416679",
+"s  c #46697B",
+"d  c #4D6D7C",
+"f  c #636363",
+"g  c #686868",
+"h  c #727272",
+"j  c #7B7B7B",
+"k  c #B37777",
+"l  c #C76852",
+"z  c #F26E40",
+"x  c #C77A6F",
+"c  c #DA8D75",
+"v  c #023986",
+"b  c #002F99",
+"n  c #043296",
+"m  c #043898",
+"M  c #0038A0",
+"N  c #094089",
+"B  c #1C4583",
+"V  c #194997",
+"C  c #1E4E9F",
+"Z  c #215192",
+"A  c #225A9F",
+"S  c #3D5C98",
+"D  c #3B6F8A",
+"F  c #0D43AD",
+"G  c #1F4EA2",
+"H  c #1F4EAA",
+"J  c #1753BB",
+"K  c #1852B9",
+"L  c #224FA8",
+"P  c #2450A4",
+"I  c #2E55A0",
+"U  c #2755AD",
+"Y  c #2956AE",
+"T  c #3464A5",
+"R  c #2963BC",
+"E  c #466E81",
+"W  c #447082",
+"Q  c #6C739A",
+"!  c #4471B1",
+"~  c #4873B6",
+"^  c #4870BB",
+"/  c #4D78BA",
+"(  c #0D53C3",
+")  c #1866C9",
+"_  c #046EDB",
+"`  c #126FD4",
+"'  c #0C73DD",
+"]  c #3767C7",
+"[  c #326AC2",
+"{  c #3D75C4",
+"}  c #3574C8",
+"|  c #3B74C9",
+" . c #3E79CC",
+".. c #2F74D3",
+"X. c #3B7BD0",
+"o. c #006EE5",
+"O. c #0479E5",
+"+. c #0074E9",
+"@. c #087EEC",
+"#. c #1479E1",
+"$. c #497AC7",
+"%. c #447BCD",
+"&. c #487FD2",
+"*. c #5B84A8",
+"=. c #3B82DA",
+"-. c #0C86EF",
+";. c #1F80E5",
+":. c #1393F9",
+">. c #1C99FB",
+",. c #348FEC",
+"<. c #3290E5",
+"1. c #3491EB",
+"2. c #2490F3",
+"3. c #279EFD",
+"4. c #3CA8FF",
+"5. c #5394D2",
+"6. c #758FC3",
+"7. c #689AD3",
+"8. c #7399D1",
+"9. c #4090E6",
+"0. c #4990E4",
+"q. c #4694EB",
+"w. c #559BED",
+"e. c #4B9BF1",
+"r. c #539FF3",
+"t. c #45A4FD",
+"y. c #47AAFA",
+"u. c #56A0F4",
+"i. c #5AA4F5",
+"p. c #5CA6F8",
+"a. c #56B5FD",
+"s. c #71A3E1",
+"d. c #65AFFB",
+"f. c #66B7FF",
+"g. c #68B7FF",
+"h. c #6CC2FF",
+"j. c #70C9FF",
+"k. c #7CD7FF",
+"l. c #7ED9FF",
+"z. c #838383",
+"x. c #8B8B8B",
+"c. c #939393",
+"v. c #9D9D9D",
+"b. c #B18A8B",
+"n. c #9193AB",
+"m. c #A3A3A3",
+"M. c #AEAEAE",
+"N. c #B2B2B2",
+"B. c #BDBDBD",
+"V. c #8299C5",
+"C. c #8899C3",
+"Z. c #81C2FF",
+"A. c #8BCEFF",
+"S. c #86D7FF",
+"D. c #8BD1FF",
+"F. c #84DCFF",
+"G. c #8ADFFF",
+"H. c #94D6FF",
+"J. c #9DDAFE",
+"K. c #8DE1FF",
+"L. c #97E0FF",
+"P. c #C3C3C3",
+"I. c #CBCBCB",
+"U. c #D3D3D3",
+"Y. c #DCDCDC",
+"T. c #E3E3E3",
+"R. c #ECECEC",
+"E. c #F4F4F4",
+"W. c #FFFFFF",
+"Q. c None",
+/* pixels */
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.8 V P G G G G G G G G G P G G G G G G G G G G G G G G G G G G G G G G G G L V 6 Q.Q.Q.Q.Q.",
+"Q.v N A | &.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.| }  .%. .} | %. .=.} A Z B Q.Q.Q.",
+"Q.F K ..q.u.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.i.p.u.e.u.p.p.w.w.s.8.$.] P 5 Q.Q.",
+"Q.R ) _ ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' #.d.Z.u.;.,.j.g.1./ k x ~ ( n 4 : Q.",
+"Q.` ' +.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.f.D.t.@.2.A.g.1.! l z Q J b 2 % Q.",
+"Q.O.-.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.>.h.D.a.3.4.D.j.y.5.b.c n.[ M 2 & Q.",
+"Q.<.a.F.l.k.k.k.k.k.l.l.k.k.k.k.k.k.k.k.k.l.k.k.k.k.k.k.k.k.l.K.K.G.l.F.L.K.F.S.H.J.L.0.m 1 & Q.",
+"Q.7.*.p d d d d d d d d d d d d d d d d d d d d d d d d d d d s a s d s a s s E D D W T G 3 $ Q.",
+"Q.C.r                                                                                 7 Y 3 $ Q.",
+"Q.V.u                                                                                 7 Y 3 $ Q.",
+"Q.V.u                                                                                 7 Y 3 $ Q.",
+"Q.V.u                                                                                 7 Y 3 % Q.",
+"Q.V.u                                                   c.R.W.Y.                      7 Y 3 $ Q.",
+"Q.V.u                                                 g W.W.W.Y.                      7 Y 3 $ Q.",
+"Q.V.u                                                 M.W.W.R.X                       7 Y 3 $ Q.",
+"Q.V.u   T.W.W.E.m.R.E.B.m.W.E.I.-   . j U.E.W.P.e   h E.W.W.W.c.  .                   7 Y 3 $ Q.",
+"Q.V.u   W.W.W.W.W.W.W.W.W.W.W.W.R.X v.W.W.W.W.W.R.  E.W.W.W.W.E.  E.c.*               7 Y 3 $ Q.",
+"Q.V.u   W.W.W.W.W.W.W.W.W.W.W.W.W.f E.W.W.R.X P.f   h W.W.W.E.y   W.W.W.N.e           7 Y 3 $ Q.",
+"Q.V.u   W.W.W.E.= W.W.W.U.- W.W.W.v.P.W.W.W.U.-       W.W.W.Y.    o x.R.W.W.I.f .     7 Y 3 $ Q.",
+"Q.V.u   W.W.W.Y.  W.W.W.I.  W.W.W.B.* Y.W.W.W.W.j     W.W.W.Y.        . f U.W.W.R.z.  7 Y 3 $ Q.",
+"Q.V.u   W.W.W.Y.  W.W.W.Y.  W.W.W.U.g . f T.W.W.W.g   W.W.W.Y.              y W.W.W.  7 Y 3 & Q.",
+"Q.V.u   W.W.W.Y.  W.W.W.Y.. W.W.W.R.W.t   ; W.W.W.M.  W.W.W.Y.          e N.W.W.W.m.  7 Y 3 $ Q.",
+"Q.V.u   W.W.W.Y.  W.W.W.Y.- W.W.W.Y.E.W.U.T.W.W.W.c.  W.W.W.Y.    . g U.W.W.R.z.o     7 Y 3 $ Q.",
+"Q.V.u   W.W.W.Y.  W.W.W.U.m.W.W.W.P.c.W.W.W.W.W.E.*   W.W.W.R.    R.W.W.U.f .         7 Y 3 $ Q.",
+"Q.V.u   U.W.W.U.  W.W.W.m.T.W.W.W.x.. c.R.W.E.N.=     U.W.W.T.    W.N.e               7 Y 3 $ Q.",
+"Q.V.u                                                             *                   7 Y 3 $ Q.",
+"Q.V.u                                                                                 7 Y 3 $ Q.",
+"Q.V.u                                                                                 7 Y 3 $ Q.",
+"Q.V.u                                                                                 7 Y 3 $ Q.",
+"Q.V.u                                                                                 7 Y 3 $ Q.",
+"Q.V.u                                                                                 7 Y 3 $ Q.",
+"Q.V.u                                                                                 7 Y 3 $ Q.",
+"Q.V.u       .   .   .       .     .   .   .           . .   .         . .   .         7 Y 3 $ Q.",
+"Q.6.i O @ @ @ @ + @ @ @ @ @ + @ @ @ @ @ @ @ @ @ @ @ @ @ + @ @ @ @ @ @ @ + @ @ @ @ @ + 0 H 3 & Q.",
+"Q.^ S 9 w w w w q w w w w w w w w w w w w w w w w w w w w w w w w w w w w w w w w w q I G 3 $ Q.",
+"Q.V V P C G C C C C P C C C C C P C C C C C C C C C C C C C C C C C C C C C C P A C P A B > $ Q.",
+"Q.3 1 > , > > > > > > > > > > > > > > > > > > > > > > > > > , , > > > > > > > > > > > > > & : Q.",
+"Q.Q.Q.Q.Q.# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q."
+};
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.0-conf b/net-analyzer/metasploit/files/msfrpcd-4.0-conf
new file mode 100644
index 000000000000..dc56a9d966a6
--- /dev/null
+++ b/net-analyzer/metasploit/files/msfrpcd-4.0-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.0-initd b/net-analyzer/metasploit/files/msfrpcd-4.0-initd
new file mode 100644
index 000000000000..935e0c92a888
--- /dev/null
+++ b/net-analyzer/metasploit/files/msfrpcd-4.0-initd
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfrpcd-4.0-initd,v 1.1 2011/08/03 05:56:15 patrick Exp $
+
+VERSION=4.0
+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/metadata.xml b/net-analyzer/metasploit/metadata.xml
index ea1684cc23e1..eb8bf365ee11 100644
--- a/net-analyzer/metasploit/metadata.xml
+++ b/net-analyzer/metasploit/metadata.xml
@@ -14,4 +14,7 @@
 		Framework was designed to facilitate research and experimentation with
 		new technologies.
 	</longdescription>
+	<use>
+		<flag name='gui'>Enable Java GUI</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-analyzer/metasploit/metasploit-4.0.0.ebuild b/net-analyzer/metasploit/metasploit-4.0.0.ebuild
new file mode 100644
index 000000000000..03e806921e4c
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-4.0.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-4.0.0.ebuild,v 1.1 2011/08/03 05:56:15 patrick Exp $
+
+EAPI="3"
+inherit eutils
+
+SRC_URI="http://updates.metasploit.com/data/releases/framework-${PV}.tar.bz2"
+
+DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
+HOMEPAGE="http://www.metasploit.org/"
+
+LICENSE="BSD"
+SLOT="4.0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="gui mysql postgres"
+
+# Note we use bundled gems (see data/msfweb/vendor/rails/) as upstream voted for
+# such solution, bug #247787
+RDEPEND="dev-lang/ruby
+	dev-ruby/rubygems
+	gui? ( virtual/jre )
+	mysql? ( dev-ruby/mysql-ruby
+		dev-ruby/activerecord[mysql] )
+	postgres? ( dev-ruby/ruby-postgres
+		dev-ruby/activerecord[postgres] )"
+DEPEND=""
+
+QA_PRESTRIPPED="
+	usr/lib/${PN}${SLOT}/data/msflinker_linux_x86.bin
+	usr/lib/${PN}${SLOT}/data/templates/template_armle_linux.bin
+	usr/lib/${PN}${SLOT}/data/templates/template_x86_linux.bin"
+
+QA_EXECSTACK="
+	usr/lib/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin"
+QA_WX_LOAD="
+	usr/lib/${PN}${SLOT}/data/templates/template_*_linux.bin"
+
+S=${WORKDIR}/msf3
+
+src_configure() {
+	rm "${S}"/msfupdate
+	chmod +x "${S}"/msf*
+
+	use gui || rm msfgui
+}
+
+src_install() {
+	# should be as simple as copying everything into the target...
+	dodir /usr/lib/${PN}${SLOT}
+	cp -R "${S}"/* "${D}"/usr/lib/${PN}${SLOT}
+	chown -R root:0 "${D}"
+
+	# do not remove LICENSE, bug #238137
+	dodir /usr/share/doc/${PF}
+	cp "${S}"/{README,HACKING} "${D}"/usr/share/doc/${PF}
+	dosym /usr/lib/${PN}${SLOT}/documentation /usr/share/doc/${PF}/documentation
+
+	dodir /usr/bin/
+	for file in msf*; do
+		dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
+	done
+
+	newinitd "${FILESDIR}"/msfrpcd-${SLOT}-initd msfrpcd${SLOT} || die
+	newconfd "${FILESDIR}"/msfrpcd-${SLOT}-conf msfrpcd${SLOT} || die
+
+	use gui &&	make_desktop_entry msfgui${SLOT} \
+			"Metasploit Framework" \
+			metasploit \
+			'GNOME;System;Network;' &&
+		doicon "${FILESDIR}"/metasploit.xpm
+}
+
+pkg_postinst() {
+	if use gui; then
+		elog "You will need to create a /usr/bin/msfrpcd symlink pointing to"
+		elog "the version of msfrpcd if you want to be able to start msfrpcd"
+		elog "from the java gui."
+		elog
+		elog "ln /usr/bin/msfrpcd${SLOT} /usr/bin/msfrpcd"
+		elog
+	fi
+}
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
new file mode 100644
index 000000000000..77f39d2b1384
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild,v 1.1 2011/08/03 05:56:15 patrick Exp $
+
+EAPI="3"
+inherit eutils subversion
+
+ESVN_REPO_URI="https://metasploit.com/svn/framework3/trunk"
+
+DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
+HOMEPAGE="http://www.metasploit.org/"
+
+LICENSE="BSD"
+SLOT="4.0"
+KEYWORDS=""
+IUSE="gui mysql postgres"
+
+# Note we use bundled gems (see data/msfweb/vendor/rails/) as upstream voted for
+# such solution, bug #247787
+RDEPEND="dev-lang/ruby
+	dev-ruby/rubygems
+	gui? ( virtual/jre )
+	mysql? ( dev-ruby/mysql-ruby
+		dev-ruby/activerecord[mysql] )
+	postgres? ( dev-ruby/ruby-postgres
+		dev-ruby/activerecord[postgres] )"
+DEPEND=""
+
+QA_PRESTRIPPED="
+	usr/lib/${PN}${SLOT}/data/msflinker_linux_x86.bin
+	usr/lib/${PN}${SLOT}/data/templates/template_armle_linux.bin
+	usr/lib/${PN}${SLOT}/data/templates/template_x86_linux.bin"
+
+QA_EXECSTACK="
+	usr/lib/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin"
+QA_WX_LOAD="
+	usr/lib/${PN}${SLOT}/data/templates/template_*_linux.bin"
+
+S=${WORKDIR}/msf3
+
+src_unpack() {
+	subversion_fetch
+}
+
+src_configure() {
+	[[ "${ESVN_REVISION}" == "" ]] \
+		&& find "${S}" -type d -name ".svn" -print0 | xargs -0 -n1 rm -R
+
+	rm "${S}"/msfupdate
+	chmod +x "${S}"/msf*
+
+	use gui || rm msfgui
+}
+
+src_install() {
+	# should be as simple as copying everything into the target...
+	dodir /usr/lib/${PN}${SLOT}
+	cp -R "${S}"/* "${D}"/usr/lib/${PN}${SLOT}
+	chown -R root:0 "${D}"
+
+	# do not remove LICENSE, bug #238137
+	dodir /usr/share/doc/${PF}
+	cp "${S}"/{README,HACKING} "${D}"/usr/share/doc/${PF}
+	dosym /usr/lib/${PN}${SLOT}/documentation /usr/share/doc/${PF}/documentation
+
+	dodir /usr/bin/
+	for file in msf*; do
+		dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
+	done
+
+	newinitd "${FILESDIR}"/msfrpcd-${SLOT}-initd msfrpcd${SLOT} || die
+	newconfd "${FILESDIR}"/msfrpcd-${SLOT}-conf msfrpcd${SLOT} || die
+
+	use gui &&	make_desktop_entry msfgui${SLOT} \
+			"Metasploit Framework" \
+			metasploit \
+			'GNOME;System;Network;' &&
+		doicon "${FILESDIR}"/metasploit.xpm
+}
+
+pkg_postinst() {
+	if use gui; then
+		elog "You will need to create a /usr/bin/msfrpcd symlink pointing to"
+		elog "the version of msfrpcd if you want to be able to start msfrpcd"
+		elog "from the java gui."
+		elog
+		elog "ln /usr/bin/msfrpcd${SLOT} /usr/bin/msfrpcd"
+		elog
+	fi
+
+	elog "If you wish to update ${PN} manually simply run:"
+	elog
+	elog "ESVN_REVISION=<rev> emerge =${PF}"
+	elog
+	elog "where <rev> is either HEAD (in case you wish to get all updates)"
+	elog "or specific revision number. But NOTE, this update will vanish"
+	elog "next time you reemerge ${PN}. To make update permanent either"
+	elog "create ebuild with specific revision number inside your overlay"
+	elog "or report revision bump bug at http://bugs.gentoo.org ."
+	elog
+	elog "In case you use portage it's also possible to create"
+	elog "/etc/portage/env/${CATEGORY}/${PN} file with ESVN_REVISION=<rev>"
+	elog "content. Then each time you run emerge ${PN} you'll have said"
+	elog "<rev> installed. For example, if you run"
+	elog " # mkdir -p /etc/portage/env/${CATEGORY}"
+	elog " # echo ESVN_REVISION=HEAD >> /etc/portage/env/${CATEGORY}/${PN}"
+	elog "each time you reemerge ${PN} it'll be updated to get all possible"
+	elog "updates for framework-${PV%_p*} branch."
+}