Remove masked Rails 3.1.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 9 insertions, 62 deletions

diff --git a/dev-ruby/mail/ChangeLog b/dev-ruby/mail/ChangeLog
index bc788c0ae6bd..0536491ad620 100644
--- a/dev-ruby/mail/ChangeLog
+++ b/dev-ruby/mail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/mail
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mail/ChangeLog,v 1.29 2013/05/14 06:08:51 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mail/ChangeLog,v 1.30 2013/11/29 14:56:10 graaff Exp $
+
+  29 Nov 2013; Hans de Graaff <graaff@gentoo.org> -mail-2.3.3.ebuild:
+  Remove masked Rails 3.1.
 
 *mail-2.5.4 (14 May 2013)
 
diff --git a/dev-ruby/mail/Manifest b/dev-ruby/mail/Manifest
index 48ce85b85940..d3fa5c039251 100644
--- a/dev-ruby/mail/Manifest
+++ b/dev-ruby/mail/Manifest
@@ -2,20 +2,18 @@
 Hash: SHA256
 
 AUX mail-2.5.3-utf8-ruby18.patch 634 SHA256 eec6eae758b8db499a4c88ab8bef3d26e0c3187a433c07b65fc5d5e7ca7d7682 SHA512 995b394096f31f30886cfcb86f53cb811a6b75311569b18811fe7582ac8923a45e1ca1b25ebc59fa884223156e6e9d374e2e2ac5e5255f6de5a1386610213ec6 WHIRLPOOL 127214cd7cce10c44452038618c5f344a0d5ff58f0c6b8fae067a538638d75b155c6899beb2f40864d88b596310c58966210be8de69ce490b5e2449c7a8e5d91
-DIST mail-2.3.3-git.tar.gz 668618 SHA256 1adb276d2de312bd95fbe5552b9df2c3b802eedbdaaf25dbbbcd4cf45b5951e0 SHA512 b6478f9b63fe6855ff857443aab718ff9a66b6b603aa203f6cf6cc2a32ccd3c3b52d0ce8697c84285a209fd2cf30c31e12addffe1b7eb5326c806553817f0523 WHIRLPOOL 7a8f020c89d38343ce6305a6f926f709298093198a285dd5d7ae1d9f7bd728e19c3119abc293ede81aee63dde254cfa387972cffdc5df48c887fe7102a0585e1
 DIST mail-2.4.4.tar.gz 677102 SHA256 2195c789c5178388f3ed5094ddad93683bac601fe3d9ecb13a3a9f9e7d97ba87 SHA512 aeb0075950d5938e1a972c9195ec836160c6c9f600aaa2c0e78c715aabf4000074bde311cc0c87a1f3edf237e5a6835299c23f3b903541a043134139472eae82 WHIRLPOOL e75e9e62602ca13658e16d096cc48921307c9035e1b42700eaee77d38c4f10891731d34e0984c8eb98d2d30320ac87fb64b5cf03bc1c88eeb11be5d172a594d8
 DIST mail-2.5.3-git.tar.gz 828104 SHA256 6608c1c5dd9fc58f8a167c834d14d272dfb721eac7356983cb9f64ce934048ab SHA512 210e8eb7c10b8636747980fbaef09a444a80fdba38fced326e6f9fcab6dc41e99a685c3a1472f887f22d875f4a5691364246e4975efe2a608cec657e3ad67bcf WHIRLPOOL 38ebe1ed453c2e01d22e170bf24f527aab65ef6a65c74448e6d9888d0b49a10bde406a1f9824806b42569c118b9efcc1f1a2ab598c4517f665ca21fb40de725f
 DIST mail-2.5.4-git.tar.gz 833881 SHA256 d618fab11e0f4d308535a21bd6c59c2ab81a4ac864db830cc1817ad131512bb9 SHA512 5e042b9bff41e75af76b7d21275488f79b4c5e1821827b114bfc0d09b12b8c487189e4732e58a642621609fad48af381ae7cd5507f4fc5cb620f54a2288a6dda WHIRLPOOL 5013a057fd1cadd2f3ef5b1c4f8c62e476f36309ca6de935041b03986525a42969d4a7d57907eba4c6a5622d96cca269c3dfc37c14e1a45e4167a9b3d9d6ab50
-EBUILD mail-2.3.3.ebuild 1631 SHA256 98d960c34750071828c5a26a1822e1c813c2a01f7a312c20b985a477e18a9421 SHA512 04d47d8b9006d3722ff606e85e9f9e35fcc9b322fb4f9cc0c4dd2ad2154d31fc505d322f543ce16b72990473f271d69831081cf491bc2883c250d9d11294cc31 WHIRLPOOL e3ce659ea7c47b0af839c196e34bea6052e919fdd618cb1b1ba8e5df297124fabd426b9d650a50407550418201c182c6f0f334e7207d1119f1a8a19de15fbc12
 EBUILD mail-2.4.4.ebuild 1273 SHA256 9fbab6d220fa4d3c6435309aaf90bf49fbb25f991534bf3f001ca18ce84012dd SHA512 c318dd18d49e9dc3e8d8e9e23f62f727c17ff33fb3f2b8811868b2a0036c6e325d025bebbd011700c0d100547e259be6694764cb379b84c6780e5ad62e38cab8 WHIRLPOOL 45d3ba4b8a9b1761e01ffd6c9ea83f921e405846fb77069b8c406c7afb85925afd9ef003bb21fcae0d0007ba90dfd73eb080888cb219eca814420f273a53295b
 EBUILD mail-2.5.3.ebuild 1291 SHA256 3dafddfc4474e93b87f41a441ffa351b5563785282e13ee77daec1aa716512ff SHA512 d0c82e948cdd7c3420f1e7488cac0e2c6e4ef4b0679ea47ac067f5bf25f2504ec79cb420ebc929c5620bde14a66089034bf5a53115e36e02ca37d5cea76de467 WHIRLPOOL fe6019fbe5061de9abccf3408652be605ed38c037c5127a943480ceb19f28320863c392b8cb9fe1c28d5bcab5ba105b7d2a69dc45ddf0a7c1f2b3fe5eac38e0c
 EBUILD mail-2.5.4.ebuild 1219 SHA256 53aeac47d5389b5febcc0299d3a7942b3fe4bb10119efa49738964f1aceaf380 SHA512 c09746ab0981ac34d8e400a654816191f515654889c53704ff7269efd506f15aed7b5fc6aa69061bd0c52d3bde593cb20a6b6cea71719c3e461ccc315d53b0a6 WHIRLPOOL d03de25604da4a03bc54021cf9a7cd18e0e764df92ac1720f6263f22732a085152b90d0ac611418a74553ed37cfaa4ae6608d6eac3dab8bce44accd0f40ca847
-MISC ChangeLog 3847 SHA256 2f13f014cff62815169f70e7edc97d8ee3ca79eb4a42534307abf84fd8092908 SHA512 10fdb10009416007df01f8e2c154235deefbdc54626e7ae7cfb5b0d758271a8278a27d80d2e68a00d468e8647ca2df60776842063643db21df6a25572b318f93 WHIRLPOOL 27037d8c1701790a0a439a874a5b546c3cd2487172b735ceabe2c359ed0babd751e3e6d2c721f9df165a4551dafc1bc9a61bbb44946dd3bdd3943b201114d6ec
+MISC ChangeLog 3945 SHA256 291a091f326df74e94885dbf9a83eab93784ef50919e71fa012d9873056364d8 SHA512 9031cbe052c29c6154fb0dd0aae9b9e6f371e217d3aab1a633dc7edc0d4bf64763b91070a70b6321d724e0d627117ae60176a989ccc59a941b122a8511b7f5a2 WHIRLPOOL 9006dc3c60c493c6eda4d4ed40df604f7e1e2f7d2582f40534efc498e86660c62c0db4b5f7cb7883df95c185f40e75a29d9af4bbe1551fe94f8378760f9e86f7
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlGR1PoACgkQiIP6VqMIqNc4DgD+O1WM7j7kRRYFwY1rsBRX3woI
-CQaTR68x1Hs+RcAbCFQA/RxDgT2motgfMASSx3tBgCcsC4GGursuTW/Sijq+lK+j
-=nMRX
+iF4EAREIAAYFAlKYqwsACgkQiIP6VqMIqNfOBgD/dbViEB06Wizym9SxbCNU8wAk
+0QWLAUoFQXUZ1h1Zgv0A/1EEbxDVS3VA+RfXmTnuASHgBJdWAfJc7ZVf6rQszOMc
+=5ZWa
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/mail/mail-2.3.3.ebuild b/dev-ruby/mail/mail-2.3.3.ebuild
deleted file mode 100644
index 8ba1a00c509c..000000000000
--- a/dev-ruby/mail/mail-2.3.3.ebuild
+++ /dev/null
@@ -1,54 +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/mail/mail-2.3.3.ebuild,v 1.4 2013/01/16 00:21:20 zerochaos Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc TODO.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="mail.gemspec"
-
-inherit ruby-fakegem
-
-GITHUB_USER="mikel"
-
-DESCRIPTION="An email handling library"
-HOMEPAGE="https://github.com/mikel/mail"
-SRC_URI="https://github.com/${GITHUB_USER}/mail/tarball/${PV} -> ${P}-git.tar.gz"
-
-LICENSE="MIT"
-SLOT="2.3"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="${GITHUB_USER}-${PN}-*"
-
-ruby_add_rdepend "
-	>=dev-ruby/activesupport-2.3.6
-	>=dev-ruby/i18n-0.4.0
-	>=dev-ruby/mime-types-1.16
-	>=dev-ruby/treetop-1.4.8"
-
-ruby_add_bdepend "doc? ( dev-ruby/rspec:0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undle/d' -e '6d' Rakefile || die "Unable to remove Bundler code."
-
-	# Fix up dependencies to match our own.
-	sed -i -e 's/~>/>=/' mail.gemspec || die "Unable to fix up dependencies."
-}
-
-each_ruby_prepare() {
-	# Comment out failing specs on ruby19. Reported upstream:
-	# https://github.com/mikel/mail/issues/318
-	case ${RUBY} in
-		*ruby19)
-			sed -i -e '/should return itself on sort/,/end/ s:^:#:' spec/mail/parts_list_spec.rb || die
-			sed -i -e '/should encode a non us-ascii filename/,/^    end/ s:^:#:' spec/mail/fields/content_type_field_spec.rb || die
-			;;
-	esac
-}