Version bump and cleanup.

Package-Manager: portage-2.2.18

4 files changed, 14 insertions, 49 deletions

diff --git a/app-forensics/brakeman/ChangeLog b/app-forensics/brakeman/ChangeLog
index c6a9be61..da31fc74 100644
--- a/app-forensics/brakeman/ChangeLog
+++ b/app-forensics/brakeman/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Jun 2015; Hans de Graaff <graaff@gentoo.org> -brakeman-2.6.3-r1.ebuild,
+  -brakeman-3.0.3.ebuild, +brakeman-3.0.4.ebuild:
+  Version bump and cleanup.
+
+*brakeman-3.0.4 (19 Jun 2015)
+
+  19 Jun 2015; Hans de Graaff <graaff@gentoo.org> +brakeman-3.0.4.ebuild:
+  Version bump.
+
   05 Jun 2015; Hans de Graaff <graaff@gentoo.org> brakeman-3.0.3.ebuild:
   Add ruby21.
 
diff --git a/app-forensics/brakeman/Manifest b/app-forensics/brakeman/Manifest
index fb592b11..ef931b75 100644
--- a/app-forensics/brakeman/Manifest
+++ b/app-forensics/brakeman/Manifest
@@ -1,2 +1 @@
-DIST brakeman-2.6.3.tar.gz 508761 SHA256 46f3202614b1a6e12eb0d16c4121adff5ae68e644ecd048982cb079cff28ffd9 SHA512 da54bd366df193bd1cc926e28a39a4901f8055be6a772fadf620a9efa639523e5a5314da3e19a4f2de0dce6c8cc7149308f09d4bfade794329ad455acd9d907f WHIRLPOOL 757930cbf9758095e072802db623afb726033b7d8ea7c5e7375dd15dabe2ae2146009ba9567182c051df28633b7da8727caf65067e69717f71bf7932fff39d8a
-DIST brakeman-3.0.3.tar.gz 529784 SHA256 ba3da9af47d6277c9c5f2b887e7899063eb74b57f25cb883e7f7f9b8cb70d828 SHA512 ec93252cdc46c3842f9e75a9c390303a1feaeaf95daf6f618c9adbad9ccea7d3115e0ced570bb68824f38b039fc717cb7b136283458bcba5463960ebaf463664 WHIRLPOOL 1d9f5bdd8ba3f02ff1ec196db6bd7e1d6c0c1e15ad8db0f3a5814331f0ec8223b992fe27beb78c8522c73351663690ad7ce255a9a47361535bbc9bc0a029a724
+DIST brakeman-3.0.4.tar.gz 532012 SHA256 ebf9aa79f0c36f77d349b6016f54f2ee3d48bc9d8054717b47b87b565315cf54 SHA512 1848794171075447aec17e11da251de0b583db82d3928ec88873b1e88187277d6207b8e5971534ab9ab372ca23082907af53f089d5a7d454772c19345f7e10ef WHIRLPOOL e26ae7e983de934fea0839b0170f32f159d3d1522f700a429ecb9870bb93104dd7c7e8c09dd0d0048d9f396fb5089e84bf122abd4630f9647d9648ac044bc6cf
diff --git a/app-forensics/brakeman/brakeman-2.6.3-r1.ebuild b/app-forensics/brakeman/brakeman-2.6.3-r1.ebuild
deleted file mode 100644
index 0af00087..00000000
--- a/app-forensics/brakeman/brakeman-2.6.3-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES FEATURES README.md WARNING_TYPES"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_GEMSPEC="brakeman.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a static analysis tool which checks Ruby on Rails applications for security vulnerabilities"
-HOMEPAGE="http://brakemanscanner.org/"
-SRC_URI="https://github.com/presidentbeef/brakeman/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/erubis-2.6
-	>=dev-ruby/haml-3.0  <dev-ruby/haml-5
-	>=dev-ruby/highline-1.6.20 =dev-ruby/highline-1*
-	>=dev-ruby/multi_json-1.2 =dev-ruby/multi_json-1*
-	>=dev-ruby/ruby2ruby-2.1.1 =dev-ruby/ruby2ruby-2.1*
-	>=dev-ruby/ruby_parser-3.5.0 =dev-ruby/ruby_parser-3*
-	>=dev-ruby/sass-3.0 =dev-ruby/sass-3*
-	>=dev-ruby/slim-1.3.6 <dev-ruby/slim-3
-	>=dev-ruby/terminal-table-1.4 =dev-ruby/terminal-table-1*"
-
-all_ruby_prepare() {
-	# Remove fastercsv since it's a no-op on ruby19.
-	sed -i -e '/fastercsv/d' \
-		-e '/ruby_parser/ s/3.5.0/3.5/' \
-		-e '/highline/ s/1.6.20/1.6/' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/app-forensics/brakeman/brakeman-3.0.3.ebuild b/app-forensics/brakeman/brakeman-3.0.4.ebuild
index 4dc5fdba..0709a824 100644
--- a/app-forensics/brakeman/brakeman-3.0.3.ebuild
+++ b/app-forensics/brakeman/brakeman-3.0.4.ebuild
@@ -28,16 +28,16 @@ ruby_add_rdepend "
 	>=dev-ruby/haml-3.0:*  <dev-ruby/haml-5:*
 	>=dev-ruby/highline-1.6.20 =dev-ruby/highline-1*
 	>=dev-ruby/multi_json-1.2 =dev-ruby/multi_json-1*
-	>=dev-ruby/ruby2ruby-2.1.1 =dev-ruby/ruby2ruby-2.1*
-	>=dev-ruby/ruby_parser-3.6.2 =dev-ruby/ruby_parser-3*
+	>=dev-ruby/ruby2ruby-2.1.1 =dev-ruby/ruby2ruby-2*
+	>=dev-ruby/ruby_parser-3.7.0 =dev-ruby/ruby_parser-3*
 	>=dev-ruby/sass-3.0:* =dev-ruby/sass-3*:*
-	>=dev-ruby/slim-1.3.6 <dev-ruby/slim-3
 	>=dev-ruby/terminal-table-1.4 =dev-ruby/terminal-table-1*"
 
 all_ruby_prepare() {
 	# Remove fastercsv since it's a no-op on ruby19.
 	sed -i -e '/fastercsv/d' \
-		-e '/ruby_parser/ s/3.6.2/3.6/' \
+		-e '/ruby2ruby/ s/2.1.1/2.1/' \
+		-e '/ruby_parser/ s/3.7.0/3.7/' \
 		-e '/highline/ s/1.6.20/1.6/' \
 		${RUBY_FAKEGEM_GEMSPEC} || die
 }