From 763b442af6e8ac0b1f176c3d6723f41ffc942812 Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Thu, 2 Apr 2020 10:12:41 +0800
Subject: [PATCH] rda: cleanup

---
 www-apps/rda/rda-2.3.ebuild | 39 -------------------------------------
 www-apps/rda/rda-2.4.ebuild |  9 +++++----
 2 files changed, 5 insertions(+), 43 deletions(-)
 delete mode 100644 www-apps/rda/rda-2.3.ebuild

diff --git a/www-apps/rda/rda-2.3.ebuild b/www-apps/rda/rda-2.3.ebuild
deleted file mode 100644
index d22831797..000000000
--- a/www-apps/rda/rda-2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24"
-
-inherit ruby-ng
-
-DESCRIPTION="Web-based application for effective reporting writing"
-HOMEPAGE="https://www.itdefence.asia"
-
-LICENSE="none"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+mysql"
-
-RDEPEND="mysql? ( virtual/mysql )"
-
-ruby_add_rdepend "dev-ruby/rake
-	dev-ruby/rails:4.2
-	dev-ruby/rack:1.6
-	dev-ruby/rubygems
-	dev-ruby/will_paginate
-	dev-ruby/jquery-rails:4
-	dev-ruby/ckeditor_rails
-	dev-ruby/activerecord-session_store
-	dev-ruby/similar_text
-	dev-ruby/sablon
-	mysql? ( dev-ruby/mysql2:0.5 )"
-
-#	dev-ruby/coffee-rails:4.2
-
-each_ruby_prepare() {
-	if [ -f Gemfile ]; then
-		MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-		MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-	fi
-}
diff --git a/www-apps/rda/rda-2.4.ebuild b/www-apps/rda/rda-2.4.ebuild
index 73b8626c8..a068f19df 100644
--- a/www-apps/rda/rda-2.4.ebuild
+++ b/www-apps/rda/rda-2.4.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25"
+USE_RUBY="ruby25 ruby26"
 
-inherit ruby-ng
+inherit ruby-single
 
 DESCRIPTION="Web-based application for effective reporting writing"
 HOMEPAGE="https://www.itdefence.asia"
@@ -15,9 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+mysql"
 
-RDEPEND="mysql? ( virtual/mysql )"
+#ruby_add_rdepend "dev-ruby/rake
 
-ruby_add_rdepend "dev-ruby/rake
+RDEPEND="mysql? ( virtual/mysql )
+	dev-ruby/rake
 	dev-ruby/rails:5.2
 	dev-ruby/activerecord:5.2[mysql?]
 	dev-ruby/rack:2.0