gentoo resync : 21.07.2018

3 files changed, 6 insertions, 48 deletions

diff --git a/dev-ruby/sass/Manifest b/dev-ruby/sass/Manifest
index 0f5767f5a9f0..a73a1ef0efca 100644
--- a/dev-ruby/sass/Manifest
+++ b/dev-ruby/sass/Manifest
@@ -1,12 +1,10 @@
 DIST sass-3.4.24.gem 351232 BLAKE2B e22953cdfa28461d7f0952dd746a4390bfdd59c78aa52f9284ab0c2ef8ba4f1ad6745bdb181fcbb9dc865213761255a47fa588d150bdb4724436c116c91b92d5 SHA512 8435005234e5e734894f39fbfaccb83ae8f077f91604e59b4c4bcf9bc92be0bced4544b7e1ce0fefc6b382590407915d438e7f99828735e5eed7ba76f3ffb7d9
 DIST sass-3.4.25.gem 352768 BLAKE2B f3c725ee75f0d5b3a30cfbfdbf5dd949fc2b6d99878039a073c3b369753609f9b202ea6f756016783b251877831d1480dad4032db8338dff453b088b219b799a SHA512 5ff4bd47857425832c6a39b963ae4465dd91d63774eb35196ec28075082ad231254babe507d7071304ddb73cdfc1168a547bf231225afaeb3b7ddd677c0bd712
-DIST sass-3.5.4.gem 319488 BLAKE2B 1cbf4972fac0252e6d54b44f586fcdb4698e58ef29e780bdb1ca1c18cea8237a03f8b25a6c047f4e7d75957ea0d94cfb05a54ed511582f5ec9d6379cd6a9c655 SHA512 3fd3001b326f8a31e6b0c5e7fbd06acb4a4ee8213d86c65d325198b50115996ffa728d0a482333b2b4eeafdceecf28fad49db58521c2d059d69ecbff418c0315
-DIST sass-3.5.5.gem 320000 BLAKE2B 8120373a68e8808a4d716d45e979ab3fdb18225622fa9399220f9ef76874f99ecf5d798de254607f295dfbd238541e5a016ba9117fe07bc9393de251b096f7ab SHA512 e8d6951f1310b05fc978546afafa8ba0dbe11b02ae8d3ba8d3a28802c874d951859b35f5adcb45f56497dd72706e8b70283b8def4a4c4614e649412deedd2a42
 DIST sass-3.5.6.gem 320000 BLAKE2B 5379e70c3882e422db63d46ec1dddb057fbcf64a4298b51de33a3f1057ac5f16bd1b673c871d21d98a330835182182e529a137f25d4a21b5f9df2ba5cfc62254 SHA512 de7ac9598a36e60cdb440b6c8b36fed638ce3384ff078000c4d59eccb76b65d1c944aad8568ee078d6f2ca228d4f4c512143065bc20c5f91d28c2f0a170de96e
+DIST sass-3.5.7.gem 320000 BLAKE2B aeae548d1005b9f420c82f4efc96b2428d3025395b49784917c298fa48228d8052f758c1f851fb6e4e8024c63d48a9880f6c2e88411cd2125e76ad291e469bc0 SHA512 a72b499cfca4862fb4bfeb5201fda788339bb57d97b467c427e9c8365b03088b886a0f3cb3a6d87b1426e1497032b8394a948eb4a2f45004be80c03070304f95
 EBUILD sass-3.4.24.ebuild 1025 BLAKE2B f5516d95ad1027b599595b6d21460b96db749df3c92aa6bad54946528c5494e5dbf7a1001c609c2fc3b5a9f7eb4ea31731b7272d7ee8f9e92d831ffe3e328b96 SHA512 df5a4bb3a6b858c95a8afb067728c3625cd35be9ed6a5fe91bf6937017ca08f95402d659d082acc1fc3ec15c40621fa65a88894039fa42a42a0c45e118542ae9
 EBUILD sass-3.4.25-r1.ebuild 1089 BLAKE2B 95ebe33839bb530d8186c5f571ccc7b8ad4892299c71c0baef51c2955600d90ed5e15f6bc2f5eda0d30b32004c613b1f9478587c9b19c3949c393acdf7e76b73 SHA512 f3ad8048b996b105d1051d53e2162576628d88f23594be88e1e24d5569da929e4f6963604189d2cb8608f8417b72410eccd1c0833970f1edd6c5b0bdb4ac218d
 EBUILD sass-3.4.25.ebuild 1023 BLAKE2B 3629e417c266a743fa0bcf9db5b697f0ec0fd8fae29d547af9a513b0133a528a9f43ca213c38dd722e1d87e6923b1d6eeb9332bfea3a6ab436b7d0015d3600f8 SHA512 3621477d6585689856a21930d866f93b9d09a75a142a914b1866652663e8aeceff8f2a84cb07ce621a8c55e083e6a9ea19ba385f60e5c47aa6dde2d3db04f083
-EBUILD sass-3.5.4.ebuild 976 BLAKE2B 1852e9a8ce4db55eac9728a29795b35d3f257e6c3d640de65ac4c9611f75542485c16e873da21e1fc1fd210636960f4600c280088c0f63fbc6695c4463cad597 SHA512 201b8c54f1bdd012f15c6d7fd85a9f8cc7641b45f2d4dabac6ee6fb7d652a9e0c452c332d7bfcef19d09470b1e07240e2258ba7908323174fc0d5137cdea7eab
-EBUILD sass-3.5.5.ebuild 1100 BLAKE2B 68c441766e40a91e66ba41ab7340f0c6f633acc998380ca05345be75035b2e69ec8fccb13d7ee45c3942bd45513aa2c50a4ac52adaf838810c7d1815a94f07d0 SHA512 67f4967e491b505608648525e6584ed0481876a6ecd2771b258c150df9fd16f6c203ad5223660afebc793e731881ebf5f0500dc3fe2b05ba8f9116297fa1a0ba
 EBUILD sass-3.5.6.ebuild 1110 BLAKE2B 1b2b23d52f9f1261403df5e997fa553a48c06e704bd8c7eac7708bd9888787d6b1d657795bf3784e91c50be361e17336ca2b49f8db97e99a0d63f8b1fba2782b SHA512 6998ec05d8ec6425cb214224dbb30a47f408718c28ed514e8f2a63b536622a836e6435af242cbf945e5502fe224b280a136fa32a3ad8793813e7e6874cd68fe8
+EBUILD sass-3.5.7.ebuild 1088 BLAKE2B 0a290f2cb3cf4091d796fef7b6c855b402202b3dcaeb1f8284e3d6bc4b6cbc762cbf94e536f70ae30f0f1763bf4339cd46a1976e30d79cb83b5d770271ebe4a4 SHA512 1a46a0f5b1253c56ad785a7f178db05fcde96fdc49f1b6230c0b147868567a1fd91e3c421678701994997ef89f6e1a10629260c72c196c8974429b96e03edf4a
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sass/sass-3.5.4.ebuild b/dev-ruby/sass/sass-3.5.4.ebuild
deleted file mode 100644
index 6f2e5e6057c2..000000000000
--- a/dev-ruby/sass/sass-3.5.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="rails init.rb VERSION VERSION_DATE VERSION_NAME"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, and more"
-HOMEPAGE="http://sass-lang.com/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
-SLOT="$(get_version_component_range 1-2)"
-IUSE=""
-
-ruby_add_bdepend "doc? ( >=dev-ruby/yard-0.5.3 )"
-
-ruby_add_rdepend "
-	!!<dev-ruby/sass-3.2.19-r1:0
-	!!<dev-ruby/sass-3.4.25-r1:3.4
-	dev-ruby/sass-listen:4"
-
-# tests could use `less` if we had it
-
-all_ruby_prepare() {
-	# Don't require maruku as markdown provider but let yard decide.
-	sed -i -e '/maruku/d' .yardopts || die
-}
-
-each_ruby_test() {
-	RUBOCOP=false ${RUBY} -S rake test:ruby || die
-}
diff --git a/dev-ruby/sass/sass-3.5.5.ebuild b/dev-ruby/sass/sass-3.5.7.ebuild
index 7c50b0d97ec2..980f085d81c5 100644
--- a/dev-ruby/sass/sass-3.5.5.ebuild
+++ b/dev-ruby/sass/sass-3.5.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -11,14 +11,14 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 
 RUBY_FAKEGEM_EXTRAINSTALL="rails init.rb VERSION VERSION_DATE VERSION_NAME"
 
-inherit ruby-fakegem versionator
+inherit ruby-fakegem eapi7-ver
 
 DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, and more"
 HOMEPAGE="https://sass-lang.com/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~amd64-linux"
-SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+SLOT="$(ver_cut 1-2)"
 IUSE=""
 
 ruby_add_bdepend "doc? ( >=dev-ruby/yard-0.5.3 )"