Version bump.

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

3 files changed, 251 insertions, 5 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 3c72892e6dab..fcca743675d2 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.701 2015/02/25 16:26:02 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.702 2015/03/03 18:19:07 graaff Exp $
+
+*ruby-2.2.1 (03 Mar 2015)
+
+  03 Mar 2015; Hans de Graaff <graaff@gentoo.org> +ruby-2.2.1.ebuild:
+  Version bump.
 
 *ruby-2.0.0_p643 (25 Feb 2015)
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 36ff78c1d0ab..e84d78011f8a 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -6,23 +6,26 @@ DIST ruby-2.0.0-p598.tar.xz 8316092 SHA256 9dccf4c30e1bb004b18cb1129d9daac3c0ec5
 DIST ruby-2.0.0-p643.tar.xz 8318532 SHA256 73f6d939beda8865e12069689ddabd2658b3f637a9adebeee5e374388715c432 SHA512 edcff2154eec9c8a84d4c5eac8ffb370e273a5e949923009756cbc069a7ef52de5c91981bd726ae5043bc2784d8ff5080444bc29d0693abc08ff66a8783a7cbc WHIRLPOOL 973d53a1e357714776159016a792cb24d34b48194547e1f30124003df20221775fd385b16e09aac6a2cab3954c3a2416d65b0c1bc2c12e4f49609d653ea7fbe8
 DIST ruby-2.1.5.tar.xz 9371780 SHA256 22ba1eb8d475c9ed7e0541418d86044c1ea4c093ab79c300c38fc0f721afe9a3 SHA512 8a257da64158d49bc2810695baf4b5849ef83e3dde452bf1e4823e52e8261225427d729fce2fb4e9b53d6d17ca9c96d491f242535c2f963738b74f90944e2a0b WHIRLPOOL 7dab5db91e56ba95a221c456fbcebfb86aff038a084b7638f504e91e4c9b45a0ad7ee0296d6531281c33d75a31ee4f5ad05af6567a93034316f3992ebc5d6bf3
 DIST ruby-2.2.0.tar.xz 10304244 SHA256 848714e280fc5fb44dbac3b060b206e56c1947006324ee68a174d68b483ef8ca SHA512 cd7e52faa464df8aca7ccfa23a5f06248e1ad82bc8c9f1829aa1b51ff37b15973b8caaa68e914d837325b8d59427fda4f3cad82c50925e1c84e688324a2a155d WHIRLPOOL 6d06101015b6dee7f0f4409597b481d3ad08679237ad884866e513bbad2d851afc09ac414c60871d2ceeb9221013497f0c482c481c95c3e8f20a4664e95148fa
+DIST ruby-2.2.1.tar.xz 10320352 SHA256 3b2852c07fdc12d0ba2b5698c7587ae2b46141539a526d143da5860b55a626c0 SHA512 853517426cd4735bab42298a13cef6f4864b6f8787c3985eaa39a4d1efb40e121bdb51e874b567f0ec339fe001920bcd165067633992b2be30e7804191559151 WHIRLPOOL fdf6c064470172f366902c6d0896f25dfeea2690c0b184cc42ef65f8389a531ec8209551757cc3654fd4da54cb2055c687d3aca0a9716955586f50446ad0f26d
 DIST ruby-patches-1.9.3_p551.tar.bz2 2154 SHA256 c1c40f2b1f186a05774fd15c3566d722a5ab1af5b93a7c73f2d3c247d604fd73 SHA512 fdb07393439dfcc97e5d4ecd12059ef69983b23588079e1292cec1c93544524a67265e4f61f75d20ac540ee9f9ace730a584462f94bea4919124a3264e6f0ae1 WHIRLPOOL 422b7bfcbdb564fd89ae9536c15d78442ad5597c7728f84f2523a751a862807a92a77779cfdd42fcdd20569726f401e391e33c1666b0455432ddff228ea674fc
 DIST ruby-patches-2.0.0_p598.tar.bz2 2947 SHA256 dc173fe94af215fd2c1823f46140e4f11892dec59ce55b10ffad26b622bb6e4e SHA512 423a4fddfc8d7fd4f5b041989da343bc96ce0c3f22a448cab8cec47d4c458f4deeb83b167a0a3ae71d3be57df9b41151d1cafadd191bd3d3e9b08b32732e36cd WHIRLPOOL 9c728e95cf01abdb48afc2ff008dc73d341096b253c664297b6780b32821c1ec406c388ce5860b5dd2ce2de862fb80b2ae45d03750045aaf13c371743f97c92e
 DIST ruby-patches-2.0.0_p643.tar.bz2 2947 SHA256 dc173fe94af215fd2c1823f46140e4f11892dec59ce55b10ffad26b622bb6e4e SHA512 423a4fddfc8d7fd4f5b041989da343bc96ce0c3f22a448cab8cec47d4c458f4deeb83b167a0a3ae71d3be57df9b41151d1cafadd191bd3d3e9b08b32732e36cd WHIRLPOOL 9c728e95cf01abdb48afc2ff008dc73d341096b253c664297b6780b32821c1ec406c388ce5860b5dd2ce2de862fb80b2ae45d03750045aaf13c371743f97c92e
 DIST ruby-patches-2.1.5.tar.bz2 2310 SHA256 1743dc0cec0adc1a0b5d90b0ed7908f888b8251b7a414049a57e6e32e01e4ad6 SHA512 b695621d210a7afc6704dd480bf3e7fc559174ebf240d2287338d60537ba45e5bf0f5defac6b254064d4b28077e2b97ef23b7eadc1bfa1a6bf2c616e828f937c WHIRLPOOL e9fde062fc04e4e22aec2dc55250f9007c64b07c7d03875b4073c19af9cfb0ae735d6dcb2b65bd1465a457cf0ff0602866600b5af1d520df3efc8a418763ab5b
 DIST ruby-patches-2.2.0-r1.tar.bz2 2195 SHA256 c7acb19428dd1d5b59bff37e7705549e6e369504a99c171acc4d78b156ef1632 SHA512 ee438dd791a44778bb3da4afe96bac11cacb408cd859dcf057d12e3cc6d5e989b3b5f9c8662ede5229cc8d477126bfe46e1a02048a10e62b67abe22c0ecf4ab4 WHIRLPOOL 8e40576f1087ecc7a41ee9414857eac58e163895ffad3f4c4bb629bda38c8063b3eec608117251812fd8353b44dc58766e12f893cb37a6da7b277979b4da12db
+DIST ruby-patches-2.2.1.tar.bz2 2267 SHA256 0ad98acf3d3f9128c2471e360d4cef0c8967ef2feb59c18f8a781a94c13f349f SHA512 af533ae77b0149bceb04d544b2a6f6c0bd4bcbef53912b233452a7eeda1ecb9cd53aed1631ba9414e76eb0f960e9248fb82525ce5caf843aaad2ebf654cf74ce WHIRLPOOL c495f4e95c1709da1c91b5f7b42b9bc03dfed3849fb7b51ac120fbaae1dabdc99e631e60455f86f91f64eb113c9b24cbeb857efc84c128406350938e01bdb291
 EBUILD ruby-1.9.3_p551.ebuild 6174 SHA256 59d120ad59634d7b30160cd8f6c50d06f767d6250fefddf7bc24c5749a388327 SHA512 ebcbc9a738ddf15ee25e9ead6d0582802e149b07cac5c9e8560525a388aa34fa23f362a26b04bace5c47b0b92a66b060a8f76bad57eb06091f91065ad8196b77 WHIRLPOOL 7065873cd0c935a7cde4170adcd2b521958aab44a994f9e90d7b504dc3117923eecc0c2bce89fd67a12718898ac2072494b33ee48da71225abb0392882f939f0
 EBUILD ruby-2.0.0_p598.ebuild 6515 SHA256 8757f1a5bfc2d71f3a91b5dbc36f8a4944f18fc65d4f131cd5ba883c84b62bc8 SHA512 80b540600cba0245ccf67544243ce44e0980f82a88f5443d611f25f6f9debfcf1ecbf4376fd227d1b827f1f8b75a3f2198353124ad43fb8cabad23de6de41a71 WHIRLPOOL 7122d74e5ea58810a27691d25f0c7f79d6c7f9804610a7e20f30538d5ee7357a3469fc1d82a29c9b4ede9db5edb04f65d4bf759ec87ba0c608b3ff703cc85973
 EBUILD ruby-2.0.0_p643.ebuild 6523 SHA256 afbba1dc63155471e2cc0ced093c599f6d7205186af4082dee56e22657e8bb16 SHA512 16cb6e5c874665a59a29383b1e2f1a3ec82679d0edf67e243052b7422f77a3fa60af5dcadb72cd8e6b71e10b024a357ec1bf2ddf40d77d2e0241ed82c46bdcbb WHIRLPOOL d8b0a40da38162fb005403e87cdceeed6a3ea73ed1a4edc17d5d6be631c72ec820588802524f9b365dddd2e8a002004faeec328a7a5e85c598d98203d68b8717
 EBUILD ruby-2.1.5.ebuild 6567 SHA256 8007fde9e07aadc9b7908eef8b76503531d694a665832fc4885506b03a6a19ac SHA512 4ea916b7a9e9042acecba9ea4f82c242caba4f3e34b623402ea5c3254e291e960e6b97cf3dcbba9773f14ed18030c3827757bf3494d31a632f18c8f6d5626533 WHIRLPOOL c55e9ecf2f059fdbd6293e8c3c35cb52f02eb22cdc6638355c4a46527e88cadf956ab3ee2cac872476fab7740b4c5e52ee3a179c8f0df04079e3e944601b9d0d
 EBUILD ruby-2.2.0-r1.ebuild 6844 SHA256 c7290ae801f062871e558351d89ae3ef9d79a3c728372f32df2c8195bd9fa237 SHA512 a5865bde9348a660cbedefb29f2d700a7fd5847f173c939ff06e124718055f04ca8a5f7fd3d83ff49a1c1d3d51db061c556746db3cd6cd7e89ab21147c07c6a9 WHIRLPOOL 3af93df7810dcbc90d189dd19da84ef9ac8981bc24caaeddb44fbc56d662048588a9c938efa870fa0e80a8bd2ce6c945e9a3e6fcea8ebb5e1373e42d67f80b6d
-MISC ChangeLog 1338 SHA256 39ea6a83a853ac18a3c3de1bd9ffb20c6edec34c9e91a3d40d79c7540dd4c07c SHA512 bd12bad6286c697a045e6d6818ff05d368f2e8722ecf5d3d247df3859b0c320fe382bf8b0ba1119f47ab4a6a135ad0b8ac5614beb7a207ae99b78624c38df079 WHIRLPOOL ca268662b8c6dd5ff193eac0893e05d614e473ab416fd03eef00b610d5cf8b3ca9b77394c324cc50b3d45fc6ace295b0e57ec8b3c68393cfa6dec689a560c029
+EBUILD ruby-2.2.1.ebuild 6841 SHA256 ee42d92d0a5277f589a102387a7d06a6b8e274076e1b1db28d50f218619a5741 SHA512 cc84e5e84fbc34d3d62da39064db5af4e4799c153829d76ab50ef2dd9c49750b281d4d0fdb1104f0a6aea3aa303394e294f7eb256161a271cb7829156cf85622 WHIRLPOOL 7eca7014006387edb51ecc179fe6581934eb3c89bd48095e01256a91c6fcc470fdacb7ef67136c18609f1e0f992fe9db3658e67a570ad3df12b0574db198793d
+MISC ChangeLog 1452 SHA256 99f3e28f083db46f5861c402c4feb59ec7ae1794c6a93a66dded21aa1b627257 SHA512 4d227d097707ec9761b9823d51857db2878f6db1f92112c873ed022cac6b412e1a1860aaa1f2e99e6cb591aed99e621caaba98bbbdc006280bf4b55419107866 WHIRLPOOL 3d0f61502f87a2bca986a6d575f425d5fefd811bb0dc8d28d33a6b405340427c136dc7fe02b2dd47df0fd69684817f9cfc04157acbae7cb1bd12d277167d7053
 MISC ChangeLog-2014 104250 SHA256 6587f8f101dc832a9f0c01b77a9d448b6a7b1c3c7befd1368e297bbe3dc41f1c SHA512 89ffec2164a619bbb418ecf43ecb0893a3f6a4846ff1ac403980e68d85efa7d502fa2f7338c80f8fcf12b56a1ed791c7d6d1bfc607f80fa88c1a88c3c6f93a85 WHIRLPOOL 47ced91b8df722e42d33773a243f89e57ca49f8942418d19321a1ed041fd9dabad747ff640fbb1f0de73220c23cd37778eedc44a14b8883b8220ee512089a823
 MISC metadata.xml 1084 SHA256 77b5afe4fc85576b9f4758b1cc1e9ad7021e40bdc341ca8a7932f54dba63a77b SHA512 3341c4c2bac3f5088827470ffaa842196c190d8732425fc0876cace29878602f62b4e0857e1eb52e8a2370df283735ed54da8d72802f8d09c9a513fe97e3e6ba WHIRLPOOL 481ca1b6f1bed13b2cdafe644f5478af62d29aa66374b5f2be55f5474a044d15894708dc1226f612c748d165cd1a26be5b0d307f290b74bca6a3c564a12e162a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlTt96IACgkQiIP6VqMIqNeQTQD+Obovu6UiZBy/KKcIkEITF91S
-fN6UCINoVyxTojegNPAA/A183G4bL1sxm73LYbfkHCiD8bK442Estwlpm0JZI/oY
-=NQmI
+iF4EAREIAAYFAlT1+y8ACgkQiIP6VqMIqNcDoQD/crcTUvR/aQjLt0ljT6g4Py0/
+Mxdi9HrNBLPnUqeDT7oA/RqJu65MMhJMhx8f4925jdA2ghGBLFHnOfcU6FOtJDAM
+=ybKN
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-2.2.1.ebuild b/dev-lang/ruby/ruby-2.2.1.ebuild
new file mode 100644
index 000000000000..3413336924b3
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.2.1.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.2.1.ebuild,v 1.1 2015/03/03 18:19:07 graaff Exp $
+
+EAPI=5
+
+#PATCHSET=1
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+MY_P="${PN}-$(get_version_component_range 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(get_version_component_range 1-2)
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+RUBYVERSION=2.2.0
+
+if [[ -n ${PATCHSET} ]]; then
+	if [[ ${PVR} == ${PV} ]]; then
+		PATCHSET="${PV}-r0.${PATCHSET}"
+	else
+		PATCHSET="${PVR}.${PATCHSET}"
+	fi
+else
+	PATCHSET="${PVR}"
+fi
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
+		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc +rdoc rubytests socks5 ssl xemacs ncurses +readline"
+
+RDEPEND="
+	berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	jemalloc? ( dev-libs/jemalloc )
+	ssl? ( dev-libs/openssl )
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	ncurses? ( sys-libs/ncurses )
+	readline?  ( sys-libs/readline )
+	dev-libs/libyaml
+	virtual/libffi
+	sys-libs/zlib
+	>=app-admin/eselect-ruby-20141227
+	!<dev-ruby/rdoc-3.9.4
+	!<dev-ruby/rubygems-1.8.10-r1"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/minitest-5.4.3[ruby_targets_ruby22]
+	>=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22]
+	>=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby22]
+	>=dev-ruby/json-1.8.1[ruby_targets_ruby22]
+	>=dev-ruby/rake-0.9.6[ruby_targets_ruby22]
+	rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/patches"
+
+	# We can no longer unbundle all of rake because rubygems now depends
+	# on this. We leave the actual rake code around to bootstrap
+	# rubygems, but remove the bits that would cause a file collision.
+	einfo "Unbundling gems..."
+	cd "$S"
+	rm -r \
+		{bin,lib}/rake lib/rake.rb man/rake.1 \
+		bin/gem || die "removal failed"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700. Use explicit version numbers to ensure rm fails when they
+	# change so we can update dependencies accordingly.
+	rm gems/{minitest-5.4.3,power_assert-0.2.2,test-unit-3.0.8}.gem || die
+
+	# Fix a hardcoded lib path in configure script
+	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
+		configure.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=
+
+	# The Tk module can no longer be built because the module code is no
+	# longer compatible with newer stable versions.
+	# https://bugs.gentoo.org/show_bug.cgi?id=500894
+	local modules="tk"
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+	# SuperH needs this
+	use sh && append-flags -mieee
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use readline ; then
+		modules="${modules},readline"
+	fi
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use ncurses ; then
+		modules="${modules},curses"
+	fi
+
+	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--docdir=${EPREFIX}/usr/share/doc/${P} \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_enable jemalloc jemalloc) \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_test() {
+	emake -j1 V=1 test || die "make test failed"
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	rm -rf ext/json || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	emake V=1 DESTDIR="${D}" install || die "make install failed"
+
+	# Remove installed rubygems copy
+	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		make DESTDIR="${D}" install-doc || die "make install-doc failed"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r sample
+	fi
+
+	dodoc ChangeLog NEWS doc/NEWS* README* || die
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(19|20|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}