gentoo resync : 12.08.2018

4 files changed, 38 insertions, 114 deletions

diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest
index 4b2ebf3b2099..b3d30eb40b8d 100644
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@@ -4,17 +4,17 @@ AUX crystal-0.24.0-verbose-LDFLAGS.patch 703 BLAKE2B 3395a7c4bf98280ebef331ec99f
 AUX crystal-0.24.2-gentoo-tests-network-sandbox.patch 1148 BLAKE2B e7b18492381a746b188f4c33cf637a0c40379bc073c3504e10aae06dc62cdaea02e6510078d277f9ec5ffe160a460a3dbab600b2dfd4e22bc253626d9d53384f SHA512 9545fd7555f7e216a654c85b0af0806727644e9dd8e6b716caa13a0f3c3f939eb20e93f97cafb9d3c33b1c1880d7ffb9e10dea3d29195342174849e9e7432d95
 AUX crystal-0.24.2-gentoo-tests-sandbox.patch 1252 BLAKE2B 4f1e41af633cd9bf943a9c016cdf4038e68ec093a1d455fb562cf361774ea8382c853effc65bf4ed57522b270fb2751aa5ec52bab905a7face0509ea505febfb SHA512 57011a0c360a9cf438d0a7da36c48be109279448df0e65fa9cdd61a565436730f71a52c2823468a5ddf17813a3df470d07c58ec4f56c931ffc036111770bb901
 AUX crystal-0.25.0-verbose.patch 764 BLAKE2B 9df527f86c2bc2d02c205aa3673dacfb9f9fc6d9178968399d851c9578f8004409750a9867817338d4ae7722180c0e6c3ff5846adcc89b54a8a630d08434b81d SHA512 94ba8ebff0b14d360e1cc3e00f38a58d7e9cb1e20a3b170ad75d5dcec24778f92b4e17f4e865f48b603a56434c057a1d803a433a59b6c5a0a3f666db9861179c
+AUX crystal-0.26.0-gentoo-tests-network-sandbox-2.patch 905 BLAKE2B 8e70f71a7a2b7ba78fe4b1d89fe747356384de5f1f9d56c5e9877def5f803491a2065788ede3b77e692abbd0ead74f00166561b961d3696bd3e629dc58656bbf SHA512 399d70e81a3a12d58b01678d63dfa71c27d60b612ba6f1b2ed5e9333e8b4fb030ce7a54cd067f6ae1a3ddfa1e0c48dfd605a1bec60869fe105d51da38f1a9872
 DIST crystal-0.23.0-1-linux-i686.tar.gz 18498501 BLAKE2B 7a8e4e5a2b1425b6effe0a634b74b28c340c4d23c4bfccc0abac4e5d47473e10421d025e68e1fb1fa5b0ba8296108e36cd17d393fb143b8012168d595e5852f9 SHA512 8745114c4824d2859c569ed1bd1057d6d649d57b10d41d22c17627f623704eb98ec2e3ab2bf06622de624906f53e053975a6b9d852aeaafeae4f43585609de28
 DIST crystal-0.23.0-1-linux-x86_64.tar.gz 18729061 BLAKE2B bfca07702b2f7c7d6b11aac864475316cabe86bdba90b1819ecd5cb45769b2b7fd9fb4c9f80e46301785209cc5b35fe39bf689163b9376a32b24f8a685a6281b SHA512 6a4e427b4ab3c3be6efcfaee5c1a19eff04eaf00db949d1e1ba8f29c3277affe96a7aba4273d93fd05251453d5b5b937aa792bc448ff2f6d6aa7f2b17d175f75
-DIST crystal-0.23.1-patchset.tar.bz2 7268 BLAKE2B 135990ac9f1a225f169dbc5bb6034d2194d9fc917954764564d68afec09af703382743965a801c9ce54a5866af60847b4c4fc0b9daf2cf5ea99052fbeb771b2a SHA512 68896fc5d1772eeb3dd263f1615fc8031a63d0f3eebca1feb35165adf14a610157302541c84cbc9031a3070fd5566ffe88ad03a8c523f55980520e5614b00b89
-DIST crystal-0.23.1.tar.gz 1646650 BLAKE2B 3105a683e61835d1e514d5d403b00d3dfae01100a9862d6346c45201c5fb6cba879255469652463719998e976afc495ee9fd4f14f829a709f832cd323cfc2b3b SHA512 06ee0d45cc79cc343d04c346e9cd47b6e4ebc79bf21833662f268f9604f7d2080f7696824e1959de341539f801ae8f898fe1d7b18e4c75378d4eb191878668d5
-DIST crystal-0.24.1.tar.gz 1744210 BLAKE2B e3a49a75f42e734753b369f1ad22db011b3af055acb0886b74151281480015c19b079cfc7246070c96e45942e51ed47d183606906bef8f2a0e6786ec7b39dbc8 SHA512 f27b64922eaff45228d9cc16bb229528e523500b8f64a3b4a5ed0584445bebf7812457e17952d0eabac2869ee259949bb12fbc80d60a6aa717307a80932345b8
 DIST crystal-0.24.2-1-linux-i686.tar.gz 17667007 BLAKE2B 73104ce088e161f03a7b4a191bb6dcdd86d0c65fe4058bb81f1177c6b7162aa48ca7732fbb410de8d3c9ca58830774913acdad9a89d8420a62e6526ecd309a2a SHA512 af0019fa1d140e653812a5d8a4fbb129ccf5d66ae55aa1a4e94ec3166058eb47abd2dd429a9d72a4baad4a6032abdaafc07bc22ca6380ac85e9d1c7168d7bf5d
 DIST crystal-0.24.2-1-linux-x86_64.tar.gz 35022853 BLAKE2B 5b101a27fef0dfbbf61920d826689a45f400c28afe7383320b69f8887512bcab65cbfe8a2cf35b0c598b06083d1ea5e338f4e2b910db03226ba05195483e4c89 SHA512 21d8e7fc34fc24ccb7e8e2c7aade0c3d6fe17e385f0f00534bb91e886788da0b27ff8276b634f7ae13d6342c7e22c6acd609562bcf1af8fddfdee5e256e1bcf0
 DIST crystal-0.24.2.tar.gz 1745462 BLAKE2B 8f3d5cf9e274558a5622aae44c6f7d54d0b3042d08810ddc650f181b91a536a3d0cc2d8fa726b677cce1f8a946319a55b803823596cef0d4d3e63832bfcea720 SHA512 db9fb973eeb2bc72ef91bb894b7c5aea73e727ff46e739aa431d68e556238f346a688a7a43de284afb4667b49366afce3ca423a523bea521180fa8f19ba6862d
 DIST crystal-0.25.0.tar.gz 1957613 BLAKE2B 4c2467e39a9bc6745b74c00f755490a2f726e775c2a0d15562af27d2a6771c95c44f79e6b59ad45f61a59566529854d75c980c55a6886538fa98663879477258 SHA512 20f2864919c7710e5aee8112e1c6ab54a2e50b244ac63d374edfed41ab659b11c062f76dbfc38e763a08bdbea9e0a39f3b5cac5e00bf453be3a31d3b0a023917
-EBUILD crystal-0.23.1.ebuild 2338 BLAKE2B bb9f07465783a19ffaec8b8aca29a3a85e4b272ac7b43e7c4a1fe61e110d04e1d513e671637cbd08b7974027c6663d302dd9c423880a65703bc58b550eca267d SHA512 df371dd8c31178279ef4ec8e65f160006aa895160b21864fb9194d7a1ad265c764ed240daec0a7b642452818d3fadc8a18e3cd6d3a5fe3be41a8c076d15b03e4
-EBUILD crystal-0.24.1-r1.ebuild 2256 BLAKE2B e929ff42f48ae8d6a726779864cd60efc19232d737b8f2b58ee0a534614b0b7053a445f74cb08719c1e8ec70e23872cc5c92f19296ecc1d6c5409b19a6fdabf1 SHA512 cd3be21c5a55e1ce0d8755d4fdf70b99bc40e44767aae1912bf1b408b7e52b5b545de9ecc0d34172fd3ff604bd9c3c49a860bbe83d160fe5f26b19c7b536d556
+DIST crystal-0.25.1-1-linux-i686.tar.gz 39882213 BLAKE2B 35d0045a72ced6ba7348105c9b88e564f85b075af78decd52c40b47b338cd1c7c1b01565430f9aa21251cfd1266041268e037eb616a24475acfa22b1b8ae1448 SHA512 79601b6c586184e064798c4daca3de77f7c81fbc4d0062a558824533f9272f04899c0041b17dce072757f20f7940c99303c6ff1143448b6452e8216ca4bb43dd
+DIST crystal-0.25.1-1-linux-x86_64.tar.gz 38004788 BLAKE2B 580ccad2227e6467c4c61ce9adf4aeb99c55f694c71a02b9d959c31deba66e428f5c5e7d920dd42d01524ccaef04b9eae3b068f2c6ff16414fa3fd36f462414f SHA512 ec33781b767f8f9f0a6d00f73109fbe9d683a23fca9cc8b462acda3eb024fc970d0daf8c36fb2239297f77510d2e3f544f58ec1cf53d08ea856bc6307f81d1dd
+DIST crystal-0.26.0.tar.gz 1992091 BLAKE2B dfc96e3e9a71dbec07235a982bbb34ea81bb3adbb39f6c8f8c9bb855ac97e5faf4d47d4a78901317798941b84117399aeee6af53c6c06ae21b9504ca617a2899 SHA512 45a62a2496d477cd72666e98b36bdcbfff958a8f5f0e71f04101f2ba72fc87117d53c8c098a72edb55e9be192b68b73529d5f76e4c660033332ed6e88a372519
 EBUILD crystal-0.24.2.ebuild 2374 BLAKE2B 62f5e228fc38ad340d2e77ee1817410a5ef418405a09ba42c52f6067e5d303cb6836694ecb5b2d59b2cc00022ead788109a98ac6a124356d72783f926526c2fc SHA512 5812f5e4174c3320601684f3ac2ef235eb4aca4dee5632fc243839e8c61fa1c738086db17f840b68300887244ea6232d5d990725c1d85021d1a934c8a0560e92
 EBUILD crystal-0.25.0.ebuild 2369 BLAKE2B 2146aba6dedff0c3fcbcd8d018c8c15906eb7050e9cea358fe2c70de8f1a76242de583e798c39769e6a89832403a6c5eda8b50bfd882889c9a80a638919482e9 SHA512 48a19dd3c5bd501dbb00b44f4eb2e3d934e835bac4361f2f1dab9aab2812aa40a8e19b6838db006ee4735cdf09d720206120b730fcd7af79e1745866a7422ff7
+EBUILD crystal-0.26.0.ebuild 2434 BLAKE2B e3dc10d452e82279ce21f504bd616e7a2b352f0aad03cbdab67cd0a98f92613446a2865f819765931f589ea4b17293caf7e8fb961a1aa65e126258fc5f2e1e80 SHA512 52977e194f5ba82fceee1625a62fa0d0589aba436b4edf11b7631e87ec958dfd77844a4081ad1785a1a5d9180fc9db5e576a8af12c8c9511c69279052295ea19
 MISC metadata.xml 995 BLAKE2B 00f6cfc63cec16ab8c6f983316f5872e63573f2d680da810b9b97d88c2ff6e21c15327a1508d62234e324f7145ca248a9ce1aa7286b0e34d9ee3dcba1481ff25 SHA512 da6a6f834b0d961477b95045756c539df7a968fe240f9f0c1c8183eef3052dddefb8d20547d668b07fece74c96b94bbf18baaac59e7328ff322355227d1adf02
diff --git a/dev-lang/crystal/crystal-0.23.1.ebuild b/dev-lang/crystal/crystal-0.23.1.ebuild
deleted file mode 100644
index c1b0b8859244..000000000000
--- a/dev-lang/crystal/crystal-0.23.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 multiprocessing toolchain-funcs
-
-BV=0.23.0-1
-BV_AMD64=${BV}-linux-x86_64
-BV_X86=${BV}-linux-i686
-
-DESCRIPTION="The Crystal Programming Language"
-HOMEPAGE="https://crystal-lang.org"
-SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2
-	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_AMD64}.tar.gz )
-	x86? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_X86}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc debug examples blocking-stdio-hack +xml +yaml"
-
-# dev-libs/boehm-gc[static-libs] dependency problem,  check the issue: https://github.com/manastech/crystal/issues/1382
-DEPEND="
-	>=sys-devel/llvm-3.9.0:*
-	dev-libs/boehm-gc[static-libs,threads]
-	dev-libs/libatomic_ops
-	dev-libs/libevent
-	dev-libs/libpcre
-	sys-libs/libunwind
-	dev-libs/pcl
-	dev-libs/gmp:0
-"
-RDEPEND="${DEPEND}
-	xml? ( dev-libs/libxml2 )
-	yaml? ( dev-libs/libyaml )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.23.0-verbose-LDFLAGS.patch
-	"${WORKDIR}"/${P}-patchset/${PN}-0.23.1-llvm-5.patch
-)
-
-src_prepare() {
-	default
-
-	use blocking-stdio-hack && eapply "${FILESDIR}"/"${PN}"-0.22.0-blocking-stdio-hack.patch
-}
-
-src_compile() {
-	emake \
-		$(usex debug "" release=1) \
-		progress=true \
-		stats=1 \
-		threads=$(makeopts_jobs) \
-		verbose=1 \
-		\
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		\
-		PATH="${WORKDIR}"/${PN}-${BV}/bin:"${PATH}" \
-		CRYSTAL_PATH=src \
-		CRYSTAL_CONFIG_VERSION=${PV} \
-		CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
-	use doc && emake doc
-}
-
-src_test() {
-	emake spec \
-		$(usex debug "" release=1) \
-		progress=true \
-		stats=1 \
-		threads=$(makeopts_jobs) \
-		verbose=1 \
-		\
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		\
-		CRYSTAL_PATH=src \
-		CRYSTAL_CONFIG_VERSION=${PV}
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/crystal
-	doins -r src/.
-	dobin .build/crystal
-
-	insinto /usr/share/zsh/site-functions
-	newins etc/completion.zsh _crystal
-
-	use examples && dodoc -r samples
-
-	if use doc ; then
-		docinto api
-		dodoc -r doc/.
-	fi
-
-	newbashcomp etc/completion.bash ${PN}
-}
diff --git a/dev-lang/crystal/crystal-0.24.1-r1.ebuild b/dev-lang/crystal/crystal-0.26.0.ebuild
index 4a403f10264a..033b3eb6c940 100644
--- a/dev-lang/crystal/crystal-0.24.1-r1.ebuild
+++ b/dev-lang/crystal/crystal-0.26.0.ebuild
@@ -5,22 +5,22 @@ EAPI=6
 
 inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
 
-BV=0.23.0-1
-BV_AMD64=${BV}-linux-x86_64
-BV_X86=${BV}-linux-i686
+BV=0.25.1
+BV_AMD64=${BV}-1-linux-x86_64
+BV_X86=${BV}-1-linux-i686
 
 DESCRIPTION="The Crystal Programming Language"
 HOMEPAGE="https://crystal-lang.org"
 SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
-	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_AMD64}.tar.gz )
-	x86? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_X86}.tar.gz )"
+	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/}/crystal-${BV_AMD64}.tar.gz )
+	x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV}/crystal-${BV_X86}.tar.gz )"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc debug examples blocking-stdio-hack +xml +yaml"
 
-LLVM_MAX_SLOT=5
+LLVM_MAX_SLOT=6
 
 # dev-libs/boehm-gc[static-libs] dependency problem,  check the issue: https://github.com/manastech/crystal/issues/1382
 DEPEND="
@@ -39,7 +39,10 @@ RDEPEND="${DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.24.0-verbose-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-0.25.0-verbose.patch
+	"${FILESDIR}"/${PN}-0.24.2-gentoo-tests-sandbox.patch
+	"${FILESDIR}"/${PN}-0.24.2-gentoo-tests-network-sandbox.patch
+	"${FILESDIR}"/${PN}-0.26.0-gentoo-tests-network-sandbox-2.patch
 )
 
 src_prepare() {
diff --git a/dev-lang/crystal/files/crystal-0.26.0-gentoo-tests-network-sandbox-2.patch b/dev-lang/crystal/files/crystal-0.26.0-gentoo-tests-network-sandbox-2.patch
new file mode 100644
index 000000000000..bfe23f9ade8e
--- /dev/null
+++ b/dev-lang/crystal/files/crystal-0.26.0-gentoo-tests-network-sandbox-2.patch
@@ -0,0 +1,23 @@
+--- a/spec/std/http/server/server_spec.cr
++++ b/spec/std/http/server/server_spec.cr
+@@ -381,7 +381,9 @@ module HTTP
+     end
+ 
+     describe "#bind_ssl" do
+-      it "binds SSL server context" do
++      # gentoo's FEATURES=network-sandbox blocks external network:
++      #   connect: Connection timed out (Errno)
++      pending "binds SSL server context" do
+         server = Server.new do |context|
+           context.response.puts "Test Server (#{context.request.headers["Host"]?})"
+           context.response.close
+--- a/spec/std/http/web_socket_spec.cr
++++ b/spec/std/http/web_socket_spec.cr
+@@ -335,4 +335,6 @@ describe HTTP::WebSocket do
+   end
+ 
+-  it "negotiates over HTTPS correctly" do
++  # gentoo's FEATURES=network-sandbox blocks external network:
++  #   connect: Connection timed out (Errno)
++  pending "negotiates over HTTPS correctly" do
+     address_chan = Channel(Socket::IPAddress).new