Updated fetch URI, bug 211428. Thank Muelli for report. Removed unused.

(Portage version: 2.1.4.4)

3 files changed, 7 insertions, 73 deletions

diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index f7711ec24494..c2b716d632d5 100644
--- a/net-analyzer/metasploit/ChangeLog
+++ b/net-analyzer/metasploit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/metasploit
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.26 2008/02/25 16:10:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.27 2008/02/25 20:13:58 pva Exp $
+
+  25 Feb 2008; <pva@gentoo.org> -metasploit-3.0-r1.ebuild,
+  metasploit-3.1.ebuild:
+  Updated fetch URI, bug 211428. Thank Muelli for report. Removed unused.
 
   25 Feb 2008; <pva@gentoo.org> metasploit-3.1.ebuild:
   Fixed typo, thank Anton Bolshakov for report in bug #142778.
diff --git a/net-analyzer/metasploit/metasploit-3.0-r1.ebuild b/net-analyzer/metasploit/metasploit-3.0-r1.ebuild
deleted file mode 100644
index 22a4125d73be..000000000000
--- a/net-analyzer/metasploit/metasploit-3.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.0-r1.ebuild,v 1.2 2008/01/30 15:39:59 pva Exp $
-
-inherit eutils
-
-MY_P="${PN/metasploit/framework}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="The Metasploit Framework is an advanced open-source platform for developing, testing, and using vulnerability exploit code."
-HOMEPAGE="http://www.metasploit.org/"
-SRC_URI="${MY_P}.tar.gz"
-
-LICENSE="MSF-1.2"
-SLOT="3"
-KEYWORDS="~amd64 ~ppc ~x86"
-RESTRICT="fetch"
-IUSE="gtk sqlite sqlite3 postgres httpd"
-
-RDEPEND="dev-lang/ruby
-	gtk? ( dev-ruby/ruby-libglade2 )
-	httpd? ( =dev-ruby/rails-1.2* )
-	sqlite? ( dev-ruby/sqlite-ruby
-		dev-ruby/activerecord )
-	sqlite3? ( dev-ruby/sqlite3-ruby
-		 dev-ruby/activerecord )
-	postgres? ( dev-ruby/ruby-postgres
-		dev-ruby/activerecord )"
-DEPEND=""
-
-pkg_nofetch() {
-	# Fetch restricted due to license acceptation
-	einfo "Please download the framework from:"
-	einfo "http://metasploit.com/projects/Framework/msf3/download.html?Release=${MY_P}.tar.gz"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_compile() {
-	epatch "${FILESDIR}"/${P}.patch
-
-	sed -i \
-		-e "s/RAILS_GEM_VERSION = '1.2.2'/RAILS_GEM_VERSION = '1.2'/" \
-		data/msfweb/config/environment.rb || die "sed failed"
-}
-
-src_install() {
-	dodir /usr/lib/
-	dodir /usr/bin/
-
-	# remove the subversion directories
-	find "${S}" -type d -name ".svn" | xargs rm -R
-
-	# should be as simple as copying everything into the target...
-	dodir /usr/lib/metasploit${SLOT}
-	cp -R "${S}"/* "${D}"/usr/lib/metasploit${SLOT} || die "Copy files failed"
-	rm -Rf "${D}"/usr/lib/metasploit${SLOT}/documentation "${D}"/README
-
-	for file in `ls msf*`; do
-		dosym /usr/lib/metasploit${SLOT}/${file} /usr/bin/${file}${SLOT}
-	done
-
-	chown -R root:0 "${D}"
-
-	if use httpd; then
-		newinitd "${FILESDIR}"/msfweb${SLOT}.initd msfweb${SLOT} \
-			|| die "newinitd failed"
-		newconfd "${FILESDIR}"/msfweb${SLOT}.confd msfweb${SLOT} \
-			|| die "newconfd failed"
-	fi
-}
diff --git a/net-analyzer/metasploit/metasploit-3.1.ebuild b/net-analyzer/metasploit/metasploit-3.1.ebuild
index 4c10925e89dc..e9e6b91df846 100644
--- a/net-analyzer/metasploit/metasploit-3.1.ebuild
+++ b/net-analyzer/metasploit/metasploit-3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.1.ebuild,v 1.2 2008/02/25 16:10:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.1.ebuild,v 1.3 2008/02/25 20:13:58 pva Exp $
 
 MY_P=${PN/metasploit/framework}-${PV}
 S=${WORKDIR}/${MY_P}
@@ -29,7 +29,7 @@ DEPEND=""
 pkg_nofetch() {
 	# Fetch restricted due to license acceptation
 	einfo "Please download the framework from:"
-	einfo "http://metasploit.com/projects/Framework/msf3/download.html?Release=${MY_P}.tar.gz"
+	einfo "http://metasploit.com/framework/downloader/?id=${MY_P}.tar.gz"
 	einfo "and move it to ${DISTDIR}"
 }