Revert "gentoo resync : 13.09.2019"

This reverts commit a1392efe64137262023d92492396ca9156d22396.

4 files changed, 59 insertions, 8 deletions

diff --git a/dev-ruby/maxitest/Manifest b/dev-ruby/maxitest/Manifest
index 0fa4e4e331c1..a8e8e8440da0 100644
--- a/dev-ruby/maxitest/Manifest
+++ b/dev-ruby/maxitest/Manifest
@@ -1,7 +1,9 @@
+DIST maxitest-2.8.0.tar.gz 60742 BLAKE2B 313e7efeca866961f3ee4c43279557bf628bd5d6d75e119fc9723b16a4dc7d38784a34078a9c6c6c5893f4bd28723757658122794deeca70f1abf54187819acf SHA512 cf05087052bb9162d20cca5180808edc00606d0125d461968c033cc4ee44a193d45a337fa2d61f34e8c2097d71bad5eba16da6cf10166ee8afaacda29654ab89
+DIST maxitest-3.0.1.tar.gz 60926 BLAKE2B 9ef03af6e55e7565acfa89d64e04aab40ef11445f0266ee85e68daa7224000922b8107c72cf77e75c4ba630ec19207cab3f5b0ce08f42270756deabfa5124b28 SHA512 c71e8af37387a8dd8f73aa01cde1c5baf772a7fe6125df5962ffb1aaf07515ebcd6d0f8530f306cc60927a289f21e4c75e0fece674230d8cdab82f5bfecfb899
 DIST maxitest-3.1.0.tar.gz 60956 BLAKE2B 5819137a548dfe1ae1c641ea3ddb4fbdf522e08b35eddbeb5dd4f3cfe2f320d16779d48166be820215e3dedecbe1f77d2db475403d476e53d5019631a0972d09 SHA512 37fdba5658cd640de311efaaa50ca32b9415c0819b9adc919d6471ae9317f9a60eb5004afa29d67386b6b9524bda06791054b1d34e31ccbe160a56c315f44b76
 DIST maxitest-3.2.0.tar.gz 61272 BLAKE2B e67404333329cd32604a7bc064a7aaaa876b41dd47d0488c7ced107bcec16b127a8e29bd6129d2897efd49d446011d3c70a8b9c5f1c0d4e91f677f4a0bfa24f2 SHA512 9cf787067bed8db16148eca20494ca718a2bc6b034fb5d9c824022af4a8dbfd69cf4b605fddcd3a9ca09d18a699753738a50921befdf6134ec6c41ccc5170f91
-DIST maxitest-3.3.0.tar.gz 61303 BLAKE2B a44cf342f4b221d4f9d93313c81b73cd0bbc95e727b4f6fcd532fb23278a3d2a120ea46d4b811ce930f8583563b068e0d9ddca8f552bfdacb506e78966f8e17a SHA512 0c6dc8418b98166da3bd8c530669bab1e1fa3d2af9444b448327913fa637bf8b6a0c9d059c3854501c6633daa48efa980c1742e11468f354019d2f3ce2ea44db
+EBUILD maxitest-2.8.0.ebuild 1320 BLAKE2B dfc9156672e8da6105f8b0ffe97c99b144b785e7638e3d31c80a58c8f9e8d158c55e160b6bba4933145f0402334d533fb60ec249726d47e7c8afdb82693d25a5 SHA512 326bd8314fd511ed80684b55996cadcd745344163169a1f5a025682b538679b9f31e4f3b5bf6f6bea4c04427285c6292f03518c28f5b1112659b5be7fe2a7618
+EBUILD maxitest-3.0.1.ebuild 1314 BLAKE2B df8c3bc52a80394b51af34f412e419e715b2d40fb13a43f660c125eb78553a675948abe6928c96b7db7488508be3e22240038fe2cff42e28a741ff80e1153f56 SHA512 cfc7e19b333dcf409c7166ad7dc72364e16c7fa5e61d806010712342aea824805a4cbd0bd72d21bff50137ac9c63fd2b8cf9e9d54becaa0a8d6070a8f0f32d11
 EBUILD maxitest-3.1.0.ebuild 1317 BLAKE2B 31f2c30ac027d4b8a2966b40af4a061aca7185cde8d3a47ef45c67d608d580ace8c436cbd31930719bb9691756b1b61774542f037e38099d35f2769a4ee3b228 SHA512 a90f668aa6699358133c128548a8a1dccd8d738f88d4ed1c3a64bbfe0dce07b977fb4ed907565061d64f62997eb81975ff62b41c08aebbe1342502ad1358b8a2
-EBUILD maxitest-3.2.0.ebuild 1298 BLAKE2B 512e4121a9237d0f68c4f824fad26447c6d839c011040b6106cbecdee2f1241a3977d02aa61ad8a9bfd65364dcf1823a23e551a0a63ddfb93e35fc3a328e662d SHA512 5c2969bac7c1530ab1b7ea030f0e14e8314dcc71be333e6279d2e315f2a4801e655546185b516f705f06a1949807f2ad9018b99bd045f972a69388b046e59c14
-EBUILD maxitest-3.3.0.ebuild 1268 BLAKE2B 40d09a07fe1aaf0774ebea90abe306b2e683bb4ee6af7a568a904caef0696617b087f0a12ed742850b8638821129e7a5c1ef8dccb4f021288b30e344a7a01ac9 SHA512 ea822abd3bcbd12611ebbb43be5359ca7754deb9b5285d4baecd143c23eb89bd16bb88e7d9728f1c09fec307813f8d1c76883fd7a2773a4e6482c211fed28854
+EBUILD maxitest-3.2.0.ebuild 1299 BLAKE2B 8c7ca90a316d9d20138e2b3a1cf7fe494fda958694789c54cef641316e1ac4910599f46bb5a298f4c19efc5dd35b71801e80688840a256e8886e7dee6128497e SHA512 a23b6265a4710bc768fcbbd942afe234abd3a10198b2d07663024a72330fb8ed006c2388b7e01e5612261bc418367571f2c80ccb3bab59c1d40d5781c79add62
 MISC metadata.xml 332 BLAKE2B cdef4488ce14b1d8addc2b3f23fa74aa64022d4ed2dfea7a84c85122e357806dd3a466ec2f4fb0fd486373055a78ae579c0f68c90a22b8940499e1ae29c29ded SHA512 ad86da72b8bc8895b0e09bc9e435eefec9ca1738e8b34aceaa959b2431b35c2732c704bd68a02d02c3c88912c20395f8601e2d42ec26f5d15c064893c0ceff0e
diff --git a/dev-ruby/maxitest/maxitest-2.8.0.ebuild b/dev-ruby/maxitest/maxitest-2.8.0.ebuild
new file mode 100644
index 000000000000..5cae59d39770
--- /dev/null
+++ b/dev-ruby/maxitest/maxitest-2.8.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit versionator ruby-fakegem
+
+DESCRIPTION="Minitest + all the features you always wanted"
+HOMEPAGE="https://github.com/grosser/maxitest"
+SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "<dev-ruby/minitest-5.12:5"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	# Remove developer-only gems from the gemspec and avoid git issues
+	sed -i -e '/\(bump\|wwtd\)/ s:^:#:' \
+		-e 's/git ls-files/find/' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/byebug/ s:^:#:' Gemfile || die
+
+}
+
+each_ruby_prepare() {
+	# Use the correct target
+	sed -i -e '/sh/ s:ruby:'${RUBY}':' \
+		-e '/sh/ s:mtest:'${RUBY}' -S mtest:' \
+		spec/maxitest_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RSPEC_VERSION=3 ruby-ng_rspec spec
+}
diff --git a/dev-ruby/maxitest/maxitest-3.3.0.ebuild b/dev-ruby/maxitest/maxitest-3.0.1.ebuild
index 55dcc6eb545a..e82293c8bdc0 100644
--- a/dev-ruby/maxitest/maxitest-3.3.0.ebuild
+++ b/dev-ruby/maxitest/maxitest-3.0.1.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
 
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="Readme.md"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
-inherit ruby-fakegem
+inherit versionator ruby-fakegem
 
 DESCRIPTION="Minitest + all the features you always wanted"
 HOMEPAGE="https://github.com/grosser/maxitest"
diff --git a/dev-ruby/maxitest/maxitest-3.2.0.ebuild b/dev-ruby/maxitest/maxitest-3.2.0.ebuild
index 4b2d8b77ff9f..bef598a11796 100644
--- a/dev-ruby/maxitest/maxitest-3.2.0.ebuild
+++ b/dev-ruby/maxitest/maxitest-3.2.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "<dev-ruby/minitest-5.12:5"