summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-08-23 02:48:37 +0000
committerMike Gilbert <floppym@gentoo.org>2013-08-23 02:48:37 +0000
commit23643d93479822bd89b88e9bcb438ce12bd8009e (patch)
tree175ae67b74486c8e6be8b14accba89faa321cb9d /www-client
parentBump. (diff)
downloadhistorical-23643d93479822bd89b88e9bcb438ce12bd8009e.tar.gz
historical-23643d93479822bd89b88e9bcb438ce12bd8009e.tar.bz2
historical-23643d93479822bd89b88e9bcb438ce12bd8009e.zip
Bump.
Package-Manager: portage-2.2.0_p8/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog8
-rw-r--r--www-client/chromium/Manifest28
-rw-r--r--www-client/chromium/chromium-30.0.1599.15.ebuild (renamed from www-client/chromium/chromium-30.0.1588.0.ebuild)52
3 files changed, 39 insertions, 49 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index d8c3b850ec31..bb9c20416908 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.936 2013/08/21 21:39:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.937 2013/08/23 02:48:35 floppym Exp $
+
+*chromium-30.0.1599.15 (23 Aug 2013)
+
+ 23 Aug 2013; Mike Gilbert <floppym@gentoo.org> +chromium-30.0.1599.15.ebuild,
+ -chromium-30.0.1588.0.ebuild:
+ Bump.
21 Aug 2013; Agostino Sarubbo <ago@gentoo.org> chromium-29.0.1547.57.ebuild:
Stable for x86, wrt bug #481990
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index eaf09843438c..5aba83ac1b2f 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
AUX chromium-browser.xml 407 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca WHIRLPOOL be37cd2e7d02c510e84c484f32ab6ab2e1f38a2a03c0cdbc9b6b485d64feaf79944d8ce097f0838ae9bc71c42401b633350b847ad316b8e23cf5614e3913e7ec
AUX chromium-bug471198.patch 1774 SHA256 e1bce3b82147702faf8f0f5bcfadcccb831247b27904b89d9b17403004839f1c SHA512 2785752ab74d59b3248dc3ec7e49b307de71d357b339364261a254a938f8560074bb5d21d51fb28c3b0e85d037eccd5a5f9f84af895e7211eea5b5541e22773a WHIRLPOOL ca5741478ad245cba10fa75168de07a656e73921fb9474ef04ff645f12ea7da0f8bcc297fb6f1b39e257ea5d51626fc1d331f9b5980afbe9d68918698beb61b8
@@ -30,34 +30,24 @@ DIST chromium-29.0.1547.41-lite.tar.xz 124466740 SHA256 6af345b129b9b96c8035c464
DIST chromium-29.0.1547.41-testdata.tar.xz 108867764 SHA256 9238dcf62ebcfd81f179915909be947d9ebda1ab623eabdb0d2f29258a1e7ac5 SHA512 ce9feeb7197a9e2369ab93595f9181f522da9b4d9929187b552f4fcdee743e726c8ab0b4dbb8ec804eb4d5ddc546fcd5693a064c354270e77d4cc0b8f6820d51 WHIRLPOOL d653a0c4ee579e6eeef0e990ad05510748a9332ce846c2b52b60010f5d749262c35b99791ee21ca362a89dbfcf3e73696f80a7597ae80435a967624b9b3b1b3f
DIST chromium-29.0.1547.57-lite.tar.xz 124488252 SHA256 30c949120f7fb2e1d020b4a9d755baf139cebc9a1dbcc32cb06db2314c917805 SHA512 5b697d106013132cf12daf7f8c636637ca2b42ba3fd7bd6e1cf7bc29958e9009ae66b1232f19021f6e6314004a75061d18c752150399a5c274e63291c8e5af27 WHIRLPOOL e8c62ea0816032786f875b909f18f20f884fe25ac94a7e99d11b4e28ad30431754a56918baac32da063fbc3c6dcdb700154882bec77fa870afc1b5bf50b0b6f8
DIST chromium-29.0.1547.57-testdata.tar.xz 108866300 SHA256 76f73b00cfe8de9453a34f5b874761b55ceaab8a13501c2c630bfc4b38bdeb42 SHA512 7911b20072e22a7279d473d4b13f2d5fdffdec77dde4edcf1deb025d7cc63d3d28e72281ac76c4f2afea780ef69eeb7934de31aa29c7af94c038fd82fbc226fc WHIRLPOOL 0bc2119dc72a6cf4fb783d21da83cdbe2cc170b5d680b50533042c7ace431817414e01e952db9ccbcbaf17c1fb162b437f345631fa68837d02eeb8192d3d40fd
-DIST chromium-30.0.1588.0-testdata.tar.xz 108831920 SHA256 ef3106c7c2c6592cb682c53634460ec55fd7752de78373125ef631780dff8dd6 SHA512 4b77180836b1706b509b3d0885a84e75fb206c6a2efe3775fc26fc35dc78924f05945a774466c44e0116c4d0bb06d794176e6f431e59a54d8a7bf808cc011747 WHIRLPOOL c03e0a8e5576064b7387cc71ec6c9341be3878a5de1e22180c77d7a029aab630a7aadc6ef8b172668873925f295c25a2b689528be3ed8459e9f63b4ba08682d9
-DIST chromium-30.0.1588.0.tar.xz 190423912 SHA256 235cc44e3dc6fb7212548bad21697e341afa2f84ea732437eaea95d3e6158ccb SHA512 eb5cd9d524860b8fb805b56b2e96f4957d25bae6ad78d705d311fc05d7f7ceb7c6e062f21f1857c6dc3245e38844933657b9c926e00c7f00697c141c2e0a792b WHIRLPOOL e9c0960b823e725e9bdf27c8d6ed4e71a076f8915f2badc86007157772776f181adcdad6b0be38dcfc251e1b4f3b02b0bc295f58e807fe6dc9721db1499dc490
DIST chromium-30.0.1599.0-testdata.tar.xz 108831056 SHA256 278bb78826abfa60732648d980dba0f90f4507d1c89f5443617e072d7ede73d2 SHA512 e589de95fd65f6b3d78f6c63b2b189fd511a1a5c1c198877d83ba1eda431b1696e21f8f9077a76bf50bc5da8530dd4631a48b7fc5cf19f960532cb20b608cd32 WHIRLPOOL 014917313ec86ccd485316eab7496a8cf1c9140511dff7b27153a6b912c438e8d9bb24e722a559a3726766795f7bd318e005e6c0d1f5e328df95205aea6290c3
DIST chromium-30.0.1599.0.tar.xz 158879916 SHA256 b32fa87680cb3123d95aa72bcafe68d42b9af71012a269be93d4bb6e570ba25d SHA512 970d0d9b73f83fe154e2ee1ccd70b75edec1dc5f07c83f9f94064d72478d477986c32d6188d82b135c49e26b128f717014015f7d4dec7fddf3f1e92116e88145 WHIRLPOOL e5354449d7f6384c06b548eab9948979e48fabda1169a7db8d63b10f62602795ebf3b5518bc17a4b4d2f85f2b630d1f3e94da7a3dbc82c2066944c7b043b6f92
+DIST chromium-30.0.1599.15-testdata.tar.xz 108827492 SHA256 a1a81a5cd7c1e35f124c73aed2b4151bbd81054adfef4b8ff1bd32967fc33c1d SHA512 9a5f1d4464bb5da41f3587beced21ad71696752700d046b32c9424ed9f3504bfb79d4b19dfbdbc119ca23e84011327d617e2bdc09796c7f25464d73f98769577 WHIRLPOOL cd24fe866fbf85300a5f6bd709987094d219fe06f3eaf0cb049db94177066b54537a8e05184d62216264441e51bcc2c4cde878200f6487c595989a9f5824a0fd
+DIST chromium-30.0.1599.15.tar.xz 158886744 SHA256 1dcc84266606cf12fdfee5d14f06d4aa02f4cdd082ee448062a5ca6a9d1d88a2 SHA512 de7877ac0b801b39ad525e1c4c06d61038a435dc8e08569875c74b0fab4886d52465b1c001ae02a8ec49f0f11a14471440aaf135f209c536f780683d416d99e3 WHIRLPOOL f892e33caa9776420a2f95d82bdc9571125d8e42b6b577d1ebe08073002c5bc817ebdef7e70145f084d96ccbeb3aed644c295f6c0e3b66977191ef2bae03ed12
EBUILD chromium-28.0.1500.95.ebuild 17322 SHA256 12a30ca6db6ea0d9a5d2e2f2d004d235d5994261aea9bb980224ccf8c1d0d0b9 SHA512 45c68c81a6534c0a06f56302ca0715e88be1581de4b31c7989226d64bf85faffca70fc8f45dfe41d1f96d647e212f23c853a6af4f301a0af2380430c9049577b WHIRLPOOL dbada70a3f8bf6f0b852f31d0e7fc9f51d0eec52ef31cf6b36c2b3511cc8b9785f18caa8dac14d0c4ea5c06137710ea5496fc00c4d94b14770ddd9a162d7add1
EBUILD chromium-29.0.1547.32.ebuild 17505 SHA256 ee6c483f2a9655843ffca5c078b960ab2c9034eced6cc892b600f692f4346a90 SHA512 468b19585764c1a25700bd77e343b606deb8ad46c6efc82b66a8638769afd9a7fdb44c07a41cb8b4091286c81e1edcc758c80b208854d5b31c0fc709b0b30f80 WHIRLPOOL 219806308173146a74a7ca82db549f182de1b304d5eb510b80bc5df358e2f85762db60ae8470c85642962d639df9b3189207daf6122d6f4464e44a46859b24c6
EBUILD chromium-29.0.1547.41.ebuild 17327 SHA256 fc34fb433edea59df1dedb21ff28d9808e073146b8ef4b2ec3f2b7ee68e957b2 SHA512 77d6b0e8571877d1bbf6af78058dbc906854432722e18705525635762ab2f83bb858aa0a8240fbb30a4788b97a5045b54ca308b43ec3a3d1d4cea04670ee81d7 WHIRLPOOL a2a00568e54625ee23ebc4745c11f782de8c7f4456c09fa29447834fdef1f38069e17b7c9a4c29eb7a40a6dbea7511b37360cde19cd0a387f55b4d2ddba95f6b
EBUILD chromium-29.0.1547.57.ebuild 17318 SHA256 9752b28fb54bc748fafdb9d1cd91dfc44d9b203ee18c02b5312cb7848d32fac8 SHA512 d97f15043883bb9285a5e9444ec5c89ba30d3201045f2fce3241eb15d60d45f0949dee8155728857d0a443bee0c64a3d55c33f5a65cf7005b19339167d81e205 WHIRLPOOL ff57e9c23813318d1236c854820b0a89c029b118654e94f020b372e90c70b48c45a67fc664e27e3ecc4fc212f9523b722d595adb6ddc296969f4a410d261495c
-EBUILD chromium-30.0.1588.0.ebuild 17856 SHA256 a46ad330a1e370988b2cc71744a45d58dd0b893302d1c9a4af4d9c3de09a26e1 SHA512 927409341a82b69b9fb3d461b520f54d0e69f3dc0d4ec9d13b03e1c10f7d3bfef3351d8a012e096ca008e52f1a1b822601029b07120aae852f22f07128d549e6 WHIRLPOOL 2ace6cff3eaadc26b65ea1c53a563c56ea5b43b82f816fd02e74885cb743476742a72694a849a68dc7ac0e7acbe4a796bfb8444b5f082b382b2927607db17f94
EBUILD chromium-30.0.1599.0-r1.ebuild 17766 SHA256 d9b61be532ce3c66efd63abade1475bb0901757aedf80286b1cad05367c1afe6 SHA512 9c7d074a44097aafcb50f36ed8f9cff6a344938d83391636fd6204c43a4f9c32f29e271d7144e7c3bbc4795fe2a26190b2512ef1adca8b8bc7a6c23c73f54c64 WHIRLPOOL 8ba9fbffe6c0dbf14ce2eec1ec7ea9375ca0453e13a98047b06233709cf158dc6e617f6e5373b72d8491e2637301cb1b8792cedcc2940ce152d3d12717508ef1
+EBUILD chromium-30.0.1599.15.ebuild 17764 SHA256 fb6ab6673f206e64dc0a886711f22df49d73f8962f1f695c0b657a2f1ba1b9d5 SHA512 b8720cac2c9b868798e4cb252752e685a89d20bf1ba7c9158c0d170611c18166c5467478b7190add7b307870c57b1ee95d16e76a4ebdb0adbb24046e1b935a32 WHIRLPOOL 87e34b0084247d23fe0670677ad71de9066ddaf4bbe42c0dadb2136836c3f87d5a65f75ec07545b195e5a6155bfef0d9c165036fc5a30f209a27dd094e6cd187
EBUILD chromium-9999-r1.ebuild 19802 SHA256 e6dea266f90450409e66bdbb8b37a08ad37181ddfc805464d207a9771eed518b SHA512 c2368c5e3451c3fe52e394cafcd18bcfe8768dc77469365c690c03fd413954d92d623ec50f4e1d0747acdd4620d4a4d1759e55fbafd7002d5ed75ff2002faa24 WHIRLPOOL 64ca308301b86dec313058fbadf301dfc0d8b4c927a4c82191cdf953b8a325c8dcf565438eb3e034a0a5a46de89d682387d2536a912eda934f6d8f4b51c971ed
-MISC ChangeLog 79866 SHA256 3efe1ca8af6cc44bdf022198fd79fdd2137642904bbf314494db0745ba561a8c SHA512 b8ccc8c10531cc4c67fbe526bf71cd09468f0e651373e3fa6c16f5963983994e602dbaafa81cc110078c0165b3e61ad03275a19aaa63cd91410f46d24b0f2fcd WHIRLPOOL 663891e7086de9c52fc9ae61dae025ce79caaf67da93929a29cc161060c61c72d60407e3d1159f5c2171d0fb4745d6f57f285ed9696ad7fe1e3b8cbf3b4f59fb
+MISC ChangeLog 80029 SHA256 c3846cb5e1b8bbe04d804bb9371fc431fd459d3e9a2c9f608ceb41c217240edd SHA512 e02bd6d99f3453a03aaa52c0e5863d49b607a8b8a6c83b07dafbd98ac17292d2ddda83adfa639ee5ff6301c11f37ca5c60728d6b9f390ea470ae4c33078aa634 WHIRLPOOL 6e9934a19905e63192911652867526f995ab1955b46a0f394782dea1eb33c56405b85f33a2a9e55135eefa92e0b1c23a6422171d34fa822b2d150e93ecd5696d
MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
MISC metadata.xml 703 SHA256 ab48e17b94dc6a8e77b4ef786b60e1518ec079a6b79a733586ac4f39c316ea7e SHA512 4e96d1190cc6d3f1bba5dfcae6bd5699cf9710b8c4c75a1ce66974824cb4f86fe0917f81838c9fb254f0be064e07ce9060d4677938a3a819cff7d1b24e33df1f WHIRLPOOL 4705ddaaecaf5dfd1c611ceabb905991495105078afcacf71b6f389cd3a0649ce46f954ce600ab9e6f66f05d55b4727f856e6c469b0995c2457c8c3715eba8b8
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
-iQIcBAEBCgAGBQJSFTOYAAoJELp701BxlEWfuwAP/26efcBAFM+MI5Ma/HgNhzaP
-cA0XYdYaS2simut8YtTS3FvRrH7T09U7HmmqFS7CygROemIfcXnk8xhPGJfO0Y9/
-Jh7jEC4Fqmg7G3ewYCO9nO6WmJrrZNUAEOb4ofd8pV6yQApQ++AS0G5jrHAugAFt
-DEqfUTv+qnSoSXxGVVLDEAQG8usCmbdeviPeRatZUGj9v67olBo4tGxlSYXE/dnh
-9pzuUKFcc1ODJ567tupOLz77P106aGfJtqI3e+n78ZbIXSbz+YDMTw364x2TJ+LW
-fxXqyBfdI7pukuCo0frscLYXlVCrTTT5k7GNOaIIf4Bhkyr4vF+oUKOvXkiB9S/n
-EFCh7yKpueQwXyNkFuuSujU9gZ1jemns0H1VCgRLYseEQC8JdhYHIe61zDQdzMzQ
-xztVEcCph7pm9TDdsPpgOBlcXbsp4CucP8uaA0XMxJd2VPhbbv7URLvhnjfrnx2M
-3zv7E3KGIvUA0Fq58UuyruWwAsIQagipP5BjuGi8xB0QI0l+51eQP+YlCTpxJhtD
-uykYSMpDwifKIPO3J64niITpseRNeiOXK7IgwS84Bhun9R6m9/jXaYb7qmKvpyYx
-2qLw36O3JckN4+/57clN6Fv2QPzrik9OH9Z/WRiK2HQ3GsqpG6BO2AeSSzonGz0S
-GcT9qZzDI5EGVL05xaAm
-=daJy
+iF4EAREIAAYFAlIWzYQACgkQC77qH+pIQ6Tc7AD+PtyGlY/LEs1/sKeG6x+DqI8+
+9r4e6vKmM3FxugkUXWUA/22ogKYbDz8KDbk8fEEjVazNFlrCxdZ0egS5PdKFHjr5
+=4gvX
-----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-30.0.1588.0.ebuild b/www-client/chromium/chromium-30.0.1599.15.ebuild
index 5ddfe899a651..a9b322519e0d 100644
--- a/www-client/chromium/chromium-30.0.1588.0.ebuild
+++ b/www-client/chromium/chromium-30.0.1599.15.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-30.0.1588.0.ebuild,v 1.1 2013/08/13 16:17:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-30.0.1599.15.ebuild,v 1.1 2013/08/23 02:48:35 floppym Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -63,10 +63,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
media-libs/opus:=
media-libs/speex:=
pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? ( || (
- >=media-video/ffmpeg-1.0:0=[opus]
- >=media-video/libav-9.5:=[opus]
- ) )
+ system-ffmpeg? ( >=media-video/ffmpeg-2.0.1:0=[opus] )
sys-apps/dbus:=
sys-apps/pciutils:=
sys-libs/zlib:=[minizip]
@@ -80,7 +77,6 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
DEPEND="${RDEPEND}
${PYTHON_DEPS}
!arm? (
- >=dev-lang/nacl-toolchain-newlib-0_p11846
dev-lang/yasm
)
dev-lang/perl
@@ -126,13 +122,13 @@ pkg_setup() {
}
src_prepare() {
- if ! use arm; then
- mkdir -p out/Release/gen/sdk/toolchain || die
- # Do not preserve SELinux context, bug #460892 .
- cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
- out/Release/gen/sdk/toolchain/linux_x86_newlib || die
- touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
- fi
+ # if ! use arm; then
+ # mkdir -p out/Release/gen/sdk/toolchain || die
+ # # Do not preserve SELinux context, bug #460892 .
+ # cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
+ # out/Release/gen/sdk/toolchain/linux_x86_newlib || die
+ # touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+ # fi
epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
epatch "${FILESDIR}/${PN}-system-ffmpeg-r7.patch"
@@ -203,15 +199,18 @@ src_configure() {
# drivers, bug #413637.
myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)"
+ # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+ myconf+=" -Ddisable_nacl=1"
+
# Disable glibc Native Client toolchain, we don't need it (bug #417019).
- myconf+=" -Ddisable_glibc=1"
+ # myconf+=" -Ddisable_glibc=1"
# TODO: also build with pnacl
- myconf+=" -Ddisable_pnacl=1"
+ # myconf+=" -Ddisable_pnacl=1"
# It would be awkward for us to tar the toolchain and get it untarred again
# during the build.
- myconf+=" -Ddisable_newlib_untar=1"
+ # myconf+=" -Ddisable_newlib_untar=1"
# Make it possible to remove third_party/adobe.
echo > "${T}/flapper_version.h" || die
@@ -295,11 +294,6 @@ src_configure() {
myconf+="
-Dlogging_like_official_build=1"
- # Enable SUID sandbox.
- myconf+="
- -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
- -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-
# Never use bundled gold binary. Disable gold linker flags for now.
myconf+="
-Dlinux_use_gold_binary=0
@@ -493,17 +487,17 @@ src_install() {
exeinto "${CHROMIUM_HOME}"
doexe out/Release/chrome || die
- doexe out/Release/chrome_sandbox || die
- fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
+ newexe out/Release/chrome_sandbox chrome-sandbox || die
+ fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
doexe out/Release/chromedriver || die
- if ! use arm; then
- doexe out/Release/nacl_helper{,_bootstrap} || die
- insinto "${CHROMIUM_HOME}"
- doins out/Release/nacl_irt_*.nexe || die
- doins out/Release/libppGoogleNaClPluginChrome.so || die
- fi
+ # if ! use arm; then
+ # doexe out/Release/nacl_helper{,_bootstrap} || die
+ # insinto "${CHROMIUM_HOME}"
+ # doins out/Release/nacl_irt_*.nexe || die
+ # doins out/Release/libppGoogleNaClPluginChrome.so || die
+ # fi
local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
if [[ -n ${CHROMIUM_SUFFIX} ]]; then