Remove ruby18 support. Cleanup old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64

15 files changed, 33 insertions, 237 deletions

diff --git a/dev-ruby/domain_name/ChangeLog b/dev-ruby/domain_name/ChangeLog
index 8ae09c013f0f..195d8121d946 100644
--- a/dev-ruby/domain_name/ChangeLog
+++ b/dev-ruby/domain_name/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/domain_name
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/domain_name/ChangeLog,v 1.19 2014/03/28 06:59:30 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/domain_name/ChangeLog,v 1.20 2014/04/24 20:26:56 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -domain_name-0.5.16.ebuild,
+  -domain_name-0.5.17.ebuild, domain_name-0.5.13.ebuild,
+  domain_name-0.5.18.ebuild:
+  Remove ruby18 support. Cleanup old.
 
 *domain_name-0.5.18 (28 Mar 2014)
 
diff --git a/dev-ruby/domain_name/Manifest b/dev-ruby/domain_name/Manifest
index ba30aadfd079..461c4810e4ab 100644
--- a/dev-ruby/domain_name/Manifest
+++ b/dev-ruby/domain_name/Manifest
@@ -1,20 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST domain_name-0.5.13.gem 81408 SHA256 bbafaaf2d663a9985d99d7b35b92bd0dbff2bfa35e3e92c075ad2e2199daa754 SHA512 a9d89fd90a195402bf4c14a7bc53a6478b958877af2e4e3f0651b36adda5fef74dd54f9afb19709dabdc6997e6bd1a7220e4baa6ff42d9531fc30d41ec8a6860 WHIRLPOOL 3dd254689730cb908313f16b2f9530c8b4cd4837579018841ec7502333519200062873a7eb415195ef2aed8d0ea89a6d783ed6b894157e2a2bb7f1138be85767
-DIST domain_name-0.5.16.gem 87040 SHA256 ac0a58faac65a33dad514a4dc7ae40d0b7a391d99fdf96ca9f1b8f887a3f1011 SHA512 a3b78269a706083331f4a6dfa2f3a72153cf1c6ace64c4321137a3728e151be5795e27ccea8fde7b3ae331861af583a85e8255e84f2c09b7b0f1d01008a6096b WHIRLPOOL 525d161e13355c9581888e96da9993c7b131e9d4a50f72939305f2db2ed4711b58f423f2c9d8151d75874f8221c5476b1cfe72f3fef3bcfa7ce3a13b3b33354f
-DIST domain_name-0.5.17.gem 89600 SHA256 10905b25c882b2b3930047d56c7b398511ca054f2fe11ec9c0f349be5f6dcce7 SHA512 7aa78189ef8e81b70e3c32d660cd711283bbb06e63b6cd7af19a295884838395bebeadc96469f139afd173d8b5a7319f690ac185f5a5b810b020250eec053bb3 WHIRLPOOL dafa44ed372d5320d23bfff353d2e80293d706e9c54f603349dd1ef343291495ca80e8c126d5da9c2a2058d3e4a8bbec8d110ab86c261048a1373915fc2dc877
 DIST domain_name-0.5.18.gem 89600 SHA256 d8c4110c2bd2bb6f35e173147171aa2e8a0c8bf7eb249d6b0a47e5eea163e0c0 SHA512 5642b006d275b645e48de344df9e028f906bc5509950b7e011ca4ab91e8b40bd771307933893c077dabce53f0b04308cd6354e1bc22bc7fe600bbffed918cf57 WHIRLPOOL a1fb7b5b3d6c1be454ad0a935e27ecc6986c6a39cc78b296c9333210230a1d396f65c4c383c9cd66955dd426498141bc4553be12e96d5384a0ca43f2f3a07661
-EBUILD domain_name-0.5.13.ebuild 1190 SHA256 9510727dd4c5384baf7d64b1f63ea1ff5a08d1b0f27ddf1d415d2c6826b1b5da SHA512 70ce122731d045c13252f3c115e9c4b3b6f24923dbb9e74e56832fa260e96e69538939eb92d46a1123efd3d788d8b497fcc065e55e845d06e3c8c4d61d78948b WHIRLPOOL a9c861f63adca99dfabdc2112949563d20fe4b57383425178e8b3325d73fd9feb544b50718556300edae758a6b6d71bf9f4fc1feee8e200bb957c4ddb0154d3e
-EBUILD domain_name-0.5.16.ebuild 1201 SHA256 a5fec49addace4b700da5a6cd319f941f5a6eac9953c635aec8408e0648ddb7f SHA512 e94a4490ad7abc0e87dc1a8c46245cf35f482fe615d8a93ff9d8eb87ef6f018c589a572a0a061c46db5648ed2ee323f32d85080585380afea1e78adbe8c1874e WHIRLPOOL b76d0a2737ca44ddf848e72f690dc792cd0fbc654dd5d3217caa999cb688cd36b1291462ee89ae628084fb0aeb7d26b879f45e413cf50209340b15d3158087ad
-EBUILD domain_name-0.5.17.ebuild 1194 SHA256 3064a409fc78c54d97ca18333202c29c178d11223234618e39ababcdfc7ba046 SHA512 cc8ed5288ee14c81070c42836b15f08466c56c132c34fc822414a9ae007f5d4fbd8104145357fb51aaab4c9158520ce266459340bba8518b9933989d2a48da35 WHIRLPOOL bf3688b31208f7063685a1ab18f3cbaf98a89846b25af6af66c7fa7ec52cc5a5d1693c12957248289664af892bf7f09c6e3adad6fa90eb2ba7cf60fd9581e000
+EBUILD domain_name-0.5.13.ebuild 1185 SHA256 63a77a2c38b8177d0a1734fba414d2dc9dcb2782946f4dc289360941b768d71b SHA512 ee713d1041c99283e862dd3065abd7e8c3fb2096b9ba180820fd431bec9e857aa1ae22f76fd499750396f08331982901edabbc5cb1d75d6d22efc3592d4d8bd3 WHIRLPOOL 511aa3adaacd26e4caac0707fda59c239b7f046b96b6cf87229f9b550bc0a767fab9563aadd533ad913f6fe61be0aa596c9e38146441060a6f12cdc4c2cfced1
 EBUILD domain_name-0.5.18.ebuild 1195 SHA256 9a9035b4898ac734dce87d4627e4812f0127091e4f9545b17412ecdf62316bd2 SHA512 7258a1729fda3f43b88ee4a075eb333d549ad3268152d5aaff8024da2842226f778cf7c7f61e16abc2abdb88080ede3c1afa398c4318c5a87e5560e580139d54 WHIRLPOOL e2658b8e650a0e056a3ee2bc7fa728204349060dd2c6b14deadc913190590303c09f05eebc5fb82bb06699319cffa24db25e7478f8364e112dc81d252ab69698
-MISC ChangeLog 2782 SHA256 e38bf857b0f64be02960cb224a9b9758e2357d45e66165528ffcacd54fa07998 SHA512 c51f1767d59d8009b34cbc8c921951ec1c33bba1c23bfeff76f528347c13098c19207747d2e420ca2a66245b3511ebfbb20ea01e5cf133e1c55523bb7e438167 WHIRLPOOL e12e9b152efd1f32fa23cc34f8517cd0795ccd815e1add68107a766f2a75a57f1c2bc87a332ce95c50f586eb648ceeb48aebae144395af99e03e89790d9ed093
+MISC ChangeLog 2982 SHA256 d28ece9a17d58f45d4db668704e4c059d61cab90ad7ef24495e899eb3f2e81c9 SHA512 fcb17e5cd72a7cbfd4688d1b20e898e9850cfd2dd5457b5dfab8c29b424dc7ea0e6c92c5e3686b4d4ef8809d7ee90012d68c88b876c12b2b92cf66770ca541b2 WHIRLPOOL 0b2e4878a94468cfc3e351fc7b0e32db00ae4e5156c05381e81064814d2b2e26994e6c0f75bbabb73508426c8fe3d4cc29d9c5948fc8d3b42febc65113fd9a58
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlM1HdcACgkQiIP6VqMIqNe8mwD7BZUzWixLwxkDYtg00U0GmBwZ
-n18dgvOAaM+Ag74R9I4A/RCDG8CQg7mPbCOPOqUzJOtEU9ju2XHJykUPXZZWR/E1
-=P6R8
------END PGP SIGNATURE-----
diff --git a/dev-ruby/domain_name/domain_name-0.5.13.ebuild b/dev-ruby/domain_name/domain_name-0.5.13.ebuild
index acb16804cbb8..62bd207e6bfb 100644
--- a/dev-ruby/domain_name/domain_name-0.5.13.ebuild
+++ b/dev-ruby/domain_name/domain_name-0.5.13.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/domain_name/domain_name-0.5.13.ebuild,v 1.3 2013/09/15 09:30:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/domain_name/domain_name-0.5.13.ebuild,v 1.4 2014/04/24 20:26:56 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 jruby"
+USE_RUBY="ruby19 jruby"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/domain_name/domain_name-0.5.16.ebuild b/dev-ruby/domain_name/domain_name-0.5.16.ebuild
deleted file mode 100644
index 7488bc4210a4..000000000000
--- a/dev-ruby/domain_name/domain_name-0.5.16.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/domain_name/domain_name-0.5.16.ebuild,v 1.1 2014/02/13 21:23:09 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Domain Name manipulation library for Ruby"
-HOMEPAGE="https://github.com/knu/ruby-domain_name"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.1-r1
-		dev-ruby/shoulda
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ d; i gem "unf"' test/helper.rb || die
-	rm Gemfile* || die
-
-	# Remove development dependencies
-	sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rdoc\)/d' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on git.
-	sed -i -e 's/`git ls-files`/""/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib:test test/test_*.rb
-}
diff --git a/dev-ruby/domain_name/domain_name-0.5.17.ebuild b/dev-ruby/domain_name/domain_name-0.5.17.ebuild
deleted file mode 100644
index ab3093437209..000000000000
--- a/dev-ruby/domain_name/domain_name-0.5.17.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/domain_name/domain_name-0.5.17.ebuild,v 1.1 2014/03/25 14:53:48 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Domain Name manipulation library for Ruby"
-HOMEPAGE="https://github.com/knu/ruby-domain_name"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.1-r1
-		dev-ruby/shoulda
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ d; i gem "unf"' test/helper.rb || die
-	rm Gemfile* || die
-
-	# Remove development dependencies
-	sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rdoc\)/d' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on git.
-	sed -i -e 's/`git ls-files`/""/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib:test test/test_*.rb
-}
diff --git a/dev-ruby/ox/ChangeLog b/dev-ruby/ox/ChangeLog
index 9e679801d538..62ad074deea7 100644
--- a/dev-ruby/ox/ChangeLog
+++ b/dev-ruby/ox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/ox
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ox/ChangeLog,v 1.6 2014/02/13 21:29:23 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ox/ChangeLog,v 1.7 2014/04/24 20:23:25 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -ox-2.0.12.ebuild,
+  -ox-2.1.0.ebuild, ox-2.1.1.ebuild:
+  Remove ruby18 support. Cleanup old.
 
 *ox-2.1.1 (13 Feb 2014)
 
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index 66e5aba4189c..cc5ade5eab64 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,8 +1,4 @@
-DIST ox-2.0.12.tar.gz 173455 SHA256 d5ef021fcd50f8a6f09a04525390b8cd6572a92683ea6b3b020f0b42ffc5ca87 SHA512 c511b7c293494134758c6639e70add4edbf4717354e74e6fafbb7514e572735914644c81a1558e63ef2d08f2d0f8edbcf88833f90fd3720a3847f697202e1699 WHIRLPOOL fb63012e38197f106874df5baa807c25e1b5c3bcc75cb4d9edcf43764ce43ea0d332dac1f3002d7495e3855c7ea841258004a2dd7bff1a86f8a0b917f2ef8021
-DIST ox-2.1.0.tar.gz 173773 SHA256 226747fcfbf4f0294ad6347547d7d445f0c6e552e2230647f0b0c9f36b0a7678 SHA512 ab81e691c15033e6e6d8a3da5308fe6483d2659702b0c25a20b553bdbceb2de0dbf61b1a00f010e60ee49dbf2533af8fdef7a125abea13a52d1487d24bccff26 WHIRLPOOL cf5ebd90bd91d7f88169fe1e14cac5fe7459a350f7f42be97e216637c6dcfe95f61155fbe8a8bdfc10434b8f722e4a4de7132d7a390264427812eba9965900c1
 DIST ox-2.1.1.tar.gz 173877 SHA256 02b5477608b3581a3194def31f6e41f0b94ea249e21422944b74441fb26b7320 SHA512 3b4ba892660c201a659d3efb97d54263483634c1274745faab9b408676b93783c4aab371ce095bd7d9cabb6ce2f98a9e8df0e0dd89253d90b8408047aaf8cc25 WHIRLPOOL 222a64d6628e286e0ec1ad580508efa82a1ceae378bc909d3cfbbe71c17aeaa18e4248ce7211d83f06a294f0dcd6ceaf177717c02d373ab88295763bfc3f6ded
-EBUILD ox-2.0.12.ebuild 783 SHA256 35cdf5df896296015e51309d920201752734d185790aeff63849fcf328d09d70 SHA512 df9a053058c09f9e932b247dabaa155e408935abf59fd8b195464236ffbc1cf1ef5695209c86d43ac2e11aac9ae3a7a7d720cb2d9224b371cf858e469112e843 WHIRLPOOL a0dbafe1b0a3d1f5d6b25af76540d7d6afbc63359398d22e19305c0874d6ffac20fb5bc688f83bc8143e1b9b5338fd84d866016dea4e89479fde3d4769a5be1f
-EBUILD ox-2.1.0.ebuild 789 SHA256 eb35ff4ba92aa1e98c784d004f0a3916b7901229931c6ce23102da891ec73220 SHA512 2b6be623fa9309ac78ae9dc1f2bbc94bb7caf759781ac09f7b23747262353c388922e83ef0b479be89294e175ec7340f236f1db9e2da28a058ebc9b81da164c1 WHIRLPOOL 78977c9be52516a634ed57c83d032c98a418bc683f761fdc8baf420ab6afd080b82438121cc0f33f69460d5ce133aee087e057b9b7f4425f88883c3bb2ce47bf
-EBUILD ox-2.1.1.ebuild 789 SHA256 23a102e0a9eb58c7713a0b212b2bfdbaeb815d3829b747bf2ef25e2f72a7facd SHA512 eb7a14a0af089f4bf4cbe19f47087037678a03e1cce76c6fd1062e639c704a6f6b4acfb77b0c185924a2c9b4375deed656d5888045c41e4dc689bb6e9e782832 WHIRLPOOL 9b3ce3fe7f5a5efcf1697bce957218a6b870c8f0727b4b78a2a0fdf81c767cdfaf96952ce0f0dd39aab3af87c8485c4a0d3d3b8b2ee0e6447b5a3b3eaf052d96
-MISC ChangeLog 992 SHA256 5a957877814f98968aa5a8f090fe458722c1e648ebe3d0411d8ebce759daf843 SHA512 3a196fb9c4984da51cdce3b0ab982316cbb0aa30b9ac2979f8328dfb7b26433028c0f4ec4a155c631bb8624b995fc31737feaa9a43ba4051a8ae088e8b089345 WHIRLPOOL 0c07e65e1493e0ff9f6bd03d78037b391ca6fea3e2c812b1917dda3d05d77fc989f14fefa183bbb5517295a4e63ffc5f51b7db818353b2666b47d784439c76a3
+EBUILD ox-2.1.1.ebuild 781 SHA256 4dc8613d5c913fd13f91b70f4eaa590a47c8788e2ac1d16944cb1905e222b3a9 SHA512 7c014e34302b82cf8e4ed83e9e31ef2f2a572f0d3bb7c042a6109efaa716feac8c9ba045ec5db6df541eebef5227c7adca7de0bd092852b5a2d2e531ef216ca7 WHIRLPOOL 07a926b7b78bf37407e7dcae1a322ae197674db09481fde82624b78215e074918a4506fad03a18426fe9438b36eb006d90fd03d7e7ecc4d1f8416ea30f70caa2
+MISC ChangeLog 1135 SHA256 3210c61f224ffb4c01c67b60a9e497bf35484e7e78b1192677b39a061bafb7dd SHA512 2993a805cec891aa96cc622dc63db3d68bd7937fe4813841e1d2ce571ac67048e043869cc73f1ffefb02e0e3b44d37fd2bdc920fc5d59af3d33343025b2bfa1d WHIRLPOOL 8fabfbedb6bf1ec52f512dffb8d2ceb98573d37690079459c65d40bb9d027840910fb25c9f14d555a00d739f77ab4cb36a97f46bbb7ac983bb37a5a3b7bbc4dd
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/ox/ox-2.0.12.ebuild b/dev-ruby/ox/ox-2.0.12.ebuild
deleted file mode 100644
index cebf2b88aa16..000000000000
--- a/dev-ruby/ox/ox-2.0.12.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ox/ox-2.0.12.ebuild,v 1.1 2013/12/02 12:06:06 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast XML parser and Object marshaller"
-HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
-SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/ox extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1  -Cext/ox
-	cp ext/ox/ox$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} test/tests.rb || die
-}
diff --git a/dev-ruby/ox/ox-2.1.0.ebuild b/dev-ruby/ox/ox-2.1.0.ebuild
deleted file mode 100644
index 10c7239baba5..000000000000
--- a/dev-ruby/ox/ox-2.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ox/ox-2.1.0.ebuild,v 1.1 2014/02/05 00:13:30 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast XML parser and Object marshaller"
-HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
-SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/ox extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1  -Cext/ox
-	cp ext/ox/ox$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} test/tests.rb || die
-}
diff --git a/dev-ruby/ox/ox-2.1.1.ebuild b/dev-ruby/ox/ox-2.1.1.ebuild
index c0fbf19a5d72..3d13f994e9c0 100644
--- a/dev-ruby/ox/ox-2.1.1.ebuild
+++ b/dev-ruby/ox/ox-2.1.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ox/ox-2.1.1.ebuild,v 1.1 2014/02/13 21:29:23 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ox/ox-2.1.1.ebuild,v 1.2 2014/04/24 20:23:25 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_TASK_DOC=""
@@ -24,7 +24,7 @@ each_ruby_configure() {
 }
 
 each_ruby_compile() {
-	emake V=1  -Cext/ox
+	emake V=1 -Cext/ox
 	cp ext/ox/ox$(get_modname) lib/ || die
 }
 
diff --git a/dev-ruby/shoulda/ChangeLog b/dev-ruby/shoulda/ChangeLog
index cf0ba1feac19..dda76829ec66 100644
--- a/dev-ruby/shoulda/ChangeLog
+++ b/dev-ruby/shoulda/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/shoulda
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shoulda/ChangeLog,v 1.29 2014/03/05 21:20:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shoulda/ChangeLog,v 1.30 2014/04/24 20:22:26 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -shoulda-3.5.0.ebuild,
+  shoulda-2.11.3-r1.ebuild, shoulda-2.11.3-r2.ebuild:
+  Remove ruby18 support. Cleanup old.
 
   05 Mar 2014; Markus Meier <maekke@gentoo.org> shoulda-3.5.0-r1.ebuild:
   add ~arm to latest version too... bug #501968
diff --git a/dev-ruby/shoulda/Manifest b/dev-ruby/shoulda/Manifest
index 008e8c6a720e..ae330e68bb13 100644
--- a/dev-ruby/shoulda/Manifest
+++ b/dev-ruby/shoulda/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST shoulda-2.11.3.tar.gz 145068 SHA256 8ab7e93f93d75c72cd5b8e84805b5c5b2e5f66e0b1cff933f8890ea203fff614 SHA512 0b347c4a8be177b5806364114c25dc786ca2ac95a11c93a723dbc9ea1f6d8ae62df7fb420a52d477cd1e10e8d894074072a040eef36ee8a43440e5256c8427e4 WHIRLPOOL 84d6cde1b3dc47d6a536b3125219432d4e7ece6d4cf3904adacbbc4866de9357f45fde44d7738820ca2a14dc4291322f98c8153029d288a77a9221c9e92b2ce7
 DIST shoulda-3.5.0.tar.gz 7149 SHA256 79adabf8f57b9b2fd890039b2f85a93a8d8cd2119cfa49611b1798f27d54b0a3 SHA512 41fe41ab1fcd3dd1b2ebde1163cb0712f4cd2615fea9cd2ad6fbd6de46cca8039db94fb91ce1850e84632dbfc299692a728ec91e7c0fbf2d9050fa2c1ee98933 WHIRLPOOL 434654a74290d6f1c44bd7ea980aa539582ac0368a844e20b4f333f2669f41e8e9e039e72c594e4bc20d49bf20b339b11e92a03419aee07b255d2ab161baf238
-EBUILD shoulda-2.11.3-r1.ebuild 942 SHA256 59784915b7e9dd5e7a5b663e400af97e51193430964e3a9ba35689121a419383 SHA512 07333422a9e14e255060e24db75962322d0a22d6d39a12f0f89b5bfdf32bea6a0c907ebbf82edf1f92ef36efa31e1f2e8b698126e4a2234782973f2c5f7333a9 WHIRLPOOL 1cc35b53f6775651575c028ab194a72b0676b2dcd9a989fb8d5e7cb9dae25445ae7109be3a0d730b3ec136396981b275254a463b43d9212ab270ed709ecc0e25
-EBUILD shoulda-2.11.3-r2.ebuild 1005 SHA256 c7e2744ce7b509654912d484d52a9a66d16b0e6e021d36b5a6c2cb0531bbb0ea SHA512 a955229fc7028637401e66b5d490a1d2038e22a8ac84e924fb8a88b6d27dea3d2da45eaa2313ad9b756353415111bcf522889b68b1fb7c36b3823c7ba8edf62f WHIRLPOOL 1c5ca90843ac4965a22de1ed2fcf605dec43188f8d16c0cf547b7f693f42d0f7ac3e430a4b70c8fbd29e5ebcd739c39230980de3491ae6750ee5416c119929ac
+EBUILD shoulda-2.11.3-r1.ebuild 937 SHA256 dde40afbb5e9e5cc616eead4aa49aabc2bc7ee6b3b45acff5a8015342236a7d2 SHA512 bf4d9f1c213e109ebfb5a80b51a3eeaafcdb6b5dbb90cdcf229ab8ebade5591f26e7c87afa00837056a171d48c7170acfc85ba0fb5914a4a9dcf210dc14384f9 WHIRLPOOL 9799e1c1444d86dc0b2464c60965ba1ef4e61945d840eaaba7858d66ebba4e24c681b7df5160375aa7a0ec181cfb9c152cb62378872a36023a4d5c85a05e2cee
+EBUILD shoulda-2.11.3-r2.ebuild 997 SHA256 e897a39159d5de52829e338b8460069a7451f96b64315f637570ae35362f017c SHA512 182c94ca66217a25db57fcb6d780ad18dcfa9ddf26ed2149ba0bd4e199435b4630bbd3860c2d93a930fb9a2fc1ce6d756e9bd96f28d6d5630c8b5e4b2b4425b3 WHIRLPOOL 8d320d7467337ae7684354d84a7e6e4e1e08c5c8f1c5257091e0134e43afe1e0ef6930dba0892bc827f55a7b744e3bc04ddcaf8353e96f855a45cde7c76a904b
 EBUILD shoulda-3.5.0-r1.ebuild 858 SHA256 ad9a2b4f92c9681b165de8d92a7b7c5a3fc9ed1355a57c4495a301cbc2920c86 SHA512 d057a67ce0bc4405ff3a86a5011cd910e83ed2131e9be745b023b40297a470bd2b8ca34d7336cb09aa56a1f59fabc29407258daec1a80e8644db8378c664563b WHIRLPOOL d06b2fb536ff6560f341abdce517e69ba0ce23d6df9f2fb70245afa1dd9b537734215d4259f89d526bc4148e1ae9d6591b21b6f15c63b2c975321a59bc2ffdea
-EBUILD shoulda-3.5.0.ebuild 817 SHA256 108c6b424859269fb2ef94d00023a457a765222f361a374059b5486e75942bb9 SHA512 91dbd134995b5a72cc09e1b4ab4243b93b16090c54655170c795dadf8f5e31b870fee25ce59faf21ca67c7e470bd2042a39335b324302f0b49e440e89eff69d3 WHIRLPOOL 995712ff6a43e3b955dec46a4e9f11fe4bb147ba28d086244e7f1a090d8c253d8c3d8fc871e26e27c3351699c215e2ad899941159565c70e63810aef0ef8c032
-MISC ChangeLog 3675 SHA256 2767bb06a6998ffd1ec06d0cad52ec03874d30f497f1a99e38b57f13b0561e57 SHA512 95d63220de6fb4f2baea2fd1e456899047dcbf5df8cf2a0faf128c78d3f452bf1963dbd6868175aeb500b5c1039d919ca9d0dd909a5ffece5d5de95a52d02a48 WHIRLPOOL 8f3b8a25472135495f485aa50c471e0377bbb0a64cac7ace03c382b5f66f0e49ca4b8612b708cd333a78da2ed7ab379de6f0428eb407ce08dd6603a65664e4a3
+MISC ChangeLog 3838 SHA256 80015ae436ff09d406f7bd41fe7c6d2da2b9208c83c4630080de97a4fb6e1804 SHA512 0b4b2bee3118cd004160321a834986f81656782bde8844c7a4da9114802d24736453a37709f7d63ba969b313c0099d19086dda42063ae205adf685b0978ead31 WHIRLPOOL e6790946cbd405c0d3c0bea4a08c6e50a89791d65a2e915411ea7735f519f07e20d59563c38aa9c1cd9a06c4e59db1773b835d02e4ab4ca5353344525aeff35b
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlMXlv0ACgkQkKaRLQcq0GJZrgCfTudRzRJlF7DsKAz2fKSqHRg4
-L9sAmwfp8yKSV0BCkp5qCQ1xJRCw5Tib
-=p/Rp
------END PGP SIGNATURE-----
diff --git a/dev-ruby/shoulda/shoulda-2.11.3-r1.ebuild b/dev-ruby/shoulda/shoulda-2.11.3-r1.ebuild
index 9c6b7f614ec1..1c1857734192 100644
--- a/dev-ruby/shoulda/shoulda-2.11.3-r1.ebuild
+++ b/dev-ruby/shoulda/shoulda-2.11.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shoulda/shoulda-2.11.3-r1.ebuild,v 1.4 2014/01/14 15:08:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shoulda/shoulda-2.11.3-r1.ebuild,v 1.5 2014/04/24 20:22:26 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="CONTRIBUTION_GUIDELINES.rdoc README.rdoc"
diff --git a/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild b/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
index 20e83a76ba3a..c34c98cc3d8f 100644
--- a/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
+++ b/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild,v 1.1 2014/01/10 11:42:48 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild,v 1.2 2014/04/24 20:22:26 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
 
 # Use rdoc recipe to avoid obsolete Rakefile
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/shoulda/shoulda-3.5.0.ebuild b/dev-ruby/shoulda/shoulda-3.5.0.ebuild
deleted file mode 100644
index 06a701f226cd..000000000000
--- a/dev-ruby/shoulda/shoulda-3.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shoulda/shoulda-3.5.0.ebuild,v 1.2 2014/03/05 21:19:06 maekke Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="http://thoughtbot.com/projects/shoulda"
-SRC_URI="https://github.com/thoughtbot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm"
-IUSE=""
-
-# This now more or less a meta-gem and it only contains features for
-# integration tests using Appraisals, which we don't currently package.
-RESTRICT=test
-
-ruby_add_rdepend ">=dev-ruby/shoulda-context-1.0.1
-	>=dev-ruby/shoulda-matchers-1.4.1"