summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2012-04-11 14:06:50 +0000
committerJeroen Roovers <jer@gentoo.org>2012-04-11 14:06:50 +0000
commit9776d02d33046a162fbac4e0d3dd2c27a6065651 (patch)
tree02eea00c233227ffbad1d1a77c17efeb243edb8e /www-client
parentFix some more -Werror=uninitialized errors - bug #410431. Thanks to Alexande... (diff)
downloadhistorical-9776d02d33046a162fbac4e0d3dd2c27a6065651.tar.gz
historical-9776d02d33046a162fbac4e0d3dd2c27a6065651.tar.bz2
historical-9776d02d33046a162fbac4e0d3dd2c27a6065651.zip
http://my.opera.com/desktopteam/blog/2012/04/10/next-address-field-adjustments
Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64
Diffstat (limited to 'www-client')
-rw-r--r--www-client/opera-next/ChangeLog10
-rw-r--r--www-client/opera-next/Manifest13
-rw-r--r--www-client/opera-next/opera-next-12.00.1360.ebuild219
-rw-r--r--www-client/opera-next/opera-next-12.00.1362.ebuild218
4 files changed, 455 insertions, 5 deletions
diff --git a/www-client/opera-next/ChangeLog b/www-client/opera-next/ChangeLog
index bdea07013935..16174156edd6 100644
--- a/www-client/opera-next/ChangeLog
+++ b/www-client/opera-next/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for www-client/opera-next
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.72 2012/04/03 20:55:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.73 2012/04/11 14:06:50 jer Exp $
+
+*opera-next-12.00.1362 (11 Apr 2012)
+*opera-next-12.00.1360 (11 Apr 2012)
+
+ 11 Apr 2012; Jeroen Roovers <jer@gentoo.org> +opera-next-12.00.1360.ebuild,
+ +opera-next-12.00.1362.ebuild:
+ http://my.opera.com/desktopteam/blog/2012/04/10/next-address-field-adjustment
+ s
*opera-next-12.00.1359 (03 Apr 2012)
diff --git a/www-client/opera-next/Manifest b/www-client/opera-next/Manifest
index 1c9a8a0f288a..7b83515ba06c 100644
--- a/www-client/opera-next/Manifest
+++ b/www-client/opera-next/Manifest
@@ -4,13 +4,18 @@ Hash: SHA1
DIST opera-next-12.00-1359.i386.freebsd.tar.xz 12034264 RMD160 d28bdbcb02e0a1a7dfff0987e8998a680e083d00 SHA1 18e50885372fd673f6a2e8dabc7349fab2ebd531 SHA256 1407584b7d6caa96c1a766babd4d74bbff6942af7bbfcb6eaf19a73a7b727c5a
DIST opera-next-12.00-1359.i386.linux.tar.xz 12128608 RMD160 6b3dfb68343f63ed238688747f4cbb014f87f5c6 SHA1 61d6f80fede2d53992353934d98c39e4874ec12e SHA256 9d9818f3b847851587e12f7dcf7d737aff57299c2277a232293a883e4dd701d4
DIST opera-next-12.00-1359.x86_64.linux.tar.xz 13219452 RMD160 e9d6c95e1a2592cf6a6a4dc3dfa53c2b22cc6e4c SHA1 47dfcc45784fff60c3df25398f9606513d11a873 SHA256 b6076409db10e246199e7d937ab2d80c6cd12a7e06b28a7097b7d800455a2edf
+DIST opera-next-12.00-1360.i386.freebsd.tar.xz 12022772 RMD160 366d79afe498e7e53b73d84ae99c5ea0984d3133 SHA1 8a712fe36108d4eb8e519248b73ad84bf2eb03fc SHA256 eef9ed3473f016672c9aaada2c27a307f4844484c804728fac280b7dbc9f0cd9
+DIST opera-next-12.00-1360.i386.linux.tar.xz 12132884 RMD160 c0d2f11b26b1fcb44bfc787e08954b9126a7f1c8 SHA1 a0dd6894e43b33043a75a4ab4fbd1b7b90850ee8 SHA256 17eb7c291b4f4c416c180e76cc8bc786bb51143997b54b5a89e704d6b89dff36
+DIST opera-next-12.00-1362.x86_64.linux.tar.xz 13220900 RMD160 3c01196bf2813bafedfd4eb9b4cd2f5b658e8915 SHA1 130bdef6976632d813eb508bbec227ed76ec1bd3 SHA256 d2edeb6d9b2d1b4633e73f1d2906f1b70d9954ca523cbf030bf76d5454f667de
EBUILD opera-next-12.00.1359.ebuild 5452 RMD160 07e24550de555e03e09310aa94ba7be0441e8fcd SHA1 4ff042ecc14fd5c3276d6b3248fe5ab19808bafc SHA256 6c047730840c4653be35e8d781d3c449dab86aa4748fd5f3b40bc5705890b64a
-MISC ChangeLog 14817 RMD160 8848c7e8114e661b6a508d30d50275891d4f806a SHA1 3bc5964f8776a740385fe95a03e1df1bc98f1fa4 SHA256 3b60d8d728e32f21bfb43ae640b9e55868887e6b048ef3be64f12267e5d43f46
+EBUILD opera-next-12.00.1360.ebuild 5394 RMD160 ca1da494116bea586b974faeb6c58c94470534fc SHA1 7e32b211a8782ee6f1b5651abe7e19c6aeff73ff SHA256 92ea2664448cafe2d3d1dcee780ed72d56467c895782cf143978366fba61b0a8
+EBUILD opera-next-12.00.1362.ebuild 5333 RMD160 4b542a6c1f598cc4f6dee2c16ec328bb9594caa4 SHA1 3a522dc2694386b1dfcfdd5d8cfdb2e10ef2f590 SHA256 ab460bfca25a0b1a77c110dcb06a100d680aa7cc4c521d772a38fa6c1b03d0ec
+MISC ChangeLog 15088 RMD160 aae39f899689dd80b6a549147616a2052dc1a94a SHA1 ec4bca06f3dcb69ae95a636b3cd465f0ae51d483 SHA256 5655f9a2c2bae3a67e75afb3b588453be014943eb0e031bbe477222bac7c5220
MISC metadata.xml 1638 RMD160 17ef00f7f0515dd445244bda48ddb4f3a8829597 SHA1 32894ca5e0efb115e4f98f27e46f547199e3dd74 SHA256 1479bc1f748e8186b8141d8a0eb7d45930c67f3fafd746527215e2ef1070be8a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk97Y9EACgkQVWmRsqeSphOSKQCfbJEMlSAYRBFK7uBk0AQ7YDfS
-iQ8An1TZZHGVt7d1EnbeIMO8aMKL1QrU
-=6WLZ
+iEYEARECAAYFAk+FkAAACgkQVWmRsqeSphN8RwCbBNjS3QmfxuVORa9J43zdOHeP
+HnQAn3gRN9mWSox+lb5bv70tNlcuGDLZ
+=yGYh
-----END PGP SIGNATURE-----
diff --git a/www-client/opera-next/opera-next-12.00.1360.ebuild b/www-client/opera-next/opera-next-12.00.1360.ebuild
new file mode 100644
index 000000000000..ddccc7965742
--- /dev/null
+++ b/www-client/opera-next/opera-next-12.00.1360.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1360.ebuild,v 1.1 2012/04/11 14:06:50 jer Exp $
+
+EAPI="4"
+
+inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
+
+DESCRIPTION="A fast and secure web browser and Internet suite"
+HOMEPAGE="http://www.opera.com/"
+
+SLOT="0"
+LICENSE="OPERA-11 LGPL-2 LGPL-3"
+KEYWORDS="~x86 ~x86-fbsd"
+IUSE="elibc_FreeBSD gtk gtk3 kde +gstreamer"
+
+O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
+O_B="$(get_version_component_range 3)" # Build version, i.e. 1156
+
+O_D="4949_${O_V}-${O_B}"
+O_P="${PN}-${O_V}-${O_B}"
+O_U="http://snapshot.opera.com/unix/"
+
+SRC_URI="
+ x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
+ x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
+"
+
+OPREFIX="/usr/$(get_libdir)"
+
+QA_DT_HASH="${OPREFIX}/${PN}/.*"
+QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
+
+O_LINGUAS="af az be bg bn cs da de el en-GB es-ES es-LA et fi fr fr-CA fy gd hi
+hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv sw ta te
+th tl tr uk uz vi zh-CN zh-TW zu"
+
+for O_LINGUA in ${O_LINGUAS}; do
+ IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
+done
+
+DEPEND="
+ >=sys-apps/sed-4
+ app-arch/xz-utils
+"
+GTKRDEPEND="
+ dev-libs/atk
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ gtk? ( x11-libs/gtk+:2 )
+ gtk3? ( x11-libs/gtk+:3 )
+ x11-libs/pango
+ x11-libs/pixman
+"
+KDERDEPEND="
+ kde-base/kdelibs
+ x11-libs/qt-core
+ x11-libs/qt-gui
+"
+GSTRDEPEND="
+ dev-libs/glib:2
+ dev-libs/libxml2
+ media-libs/gst-plugins-base
+ media-libs/gstreamer
+ media-plugins/gst-plugins-meta
+"
+RDEPEND="
+ media-libs/fontconfig
+ media-libs/freetype
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXft
+ x11-libs/libXrender
+ x11-libs/libXt
+ gtk? ( ${GTKRDEPEND} )
+ gtk3? ( ${GTKRDEPEND} )
+ kde? ( ${KDERDEPEND} )
+ gstreamer? ( ${GSTRDEPEND} )
+"
+src_unpack() {
+ unpack ${A}
+ mv -v ${PN}* "${S}" || die
+}
+
+src_prepare() {
+ local LNGDIR="share/${PN}/locale"
+
+ # Count linguas
+ count() { echo ${#}; }
+ local lingua_count=$(count ${O_LINGUAS} en)
+ local locale_count=$(count ${LNGDIR}/*)
+ [[ ${lingua_count} = ${locale_count} ]] \
+ || die "Number of LINGUAS does not match number of locales"
+ unset count
+
+ # Remove unwanted linguas
+ einfo "Keeping these locales (linguas): ${LINGUAS}."
+ for LINGUA in ${O_LINGUAS}; do
+ if ! use linguas_${LINGUA/-/_}; then
+ LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
+ rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
+ fi
+ done
+
+ # Remove doc directory but keep the LICENSE under another name (bug #315473)
+ mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
+ rm -rf share/doc
+ for locale in share/${PN}/locale/*; do
+ rm -f "${locale}/license.txt"
+ ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
+ || die
+ done
+
+ # Remove package directory
+ rm -rf share/${PN}/package
+
+ # Optional libraries
+ if ! use gtk; then
+ rm lib/${PN}/liboperagtk2.so || die
+ fi
+ if ! use gtk3; then
+ rm lib/${PN}/liboperagtk3.so || die
+ fi
+ if ! use kde; then
+ rm lib/${PN}/liboperakde4.so || die
+ fi
+ if ! use gstreamer; then
+ rm -r lib/${PN}/gstreamer || die
+ fi
+
+ # Unzip the man pages before sedding
+ gunzip share/man/man1/* || die
+
+ # Replace PREFIX, SUFFIX and PN in various files
+ sed -i \
+ -e "s:@@{PREFIX}:/usr:g" \
+ -e "s:@@{SUFFIX}::g" \
+ -e "s:@@{_SUFFIX}::g" \
+ -e "s:@@{USUFFIX}::g" \
+ -e "s:opera:${PN}:g" \
+ share/man/man1/* \
+ share/applications/${PN}-*.desktop \
+ || die
+
+ # Replace "Opera" with "Opera Next"
+ if [[ ${PN} = opera-next ]]; then
+ sed -i share/applications/${PN}-*.desktop \
+ -e "/^Name=Opera\|^ Next/s:Opera:& Next:" || die
+ fi
+
+ # Create /usr/bin/opera wrapper
+ echo '#!/bin/sh' > ${PN}
+ echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN}
+ echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
+ >> ${PN}
+ echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
+
+ # Change libz.so.3 to libz.so.1 for gentoo/freebsd
+ if use elibc_FreeBSD; then
+ scanelf -qR -N libz.so.3 -F "#N" lib/${PN}/ | \
+ while read i; do
+ if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
+ then
+ export SANITY_CHECK_LIBZ_FAILED=1
+ break
+ fi
+ sed -i \
+ "$i" \
+ -e 's/libz\.so\.3/libz.so.1/g'
+ done
+ [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die
+ fi
+}
+
+src_install() {
+ # We install into usr instead of opt as Opera does not support the latter
+ dodir /usr
+ mv lib/ "${D}/${OPREFIX}" || die
+ mv share/ "${D}/usr/" || die
+
+ # Install startup scripts
+ dobin ${PN}
+
+ # Stop revdep-rebuild from checking opera binaries
+ dodir /etc/revdep-rebuild
+ echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
+ > "${D}"/etc/revdep-rebuild/90${PN}
+
+ # Set PaX markings for hardened/PaX (bug #344267)
+ pax-mark m "${D}"/${OPREFIX}/${PN}/opera*
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ if use elibc_FreeBSD; then
+ elog
+ elog "To improve shared memory usage please set:"
+ elog "$ sysctl kern.ipc.shm_allow_removed=1"
+ fi
+
+ # Update desktop file database and gtk icon cache (bug #334993)
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ # Update desktop file database and gtk icon cache (bug #334993)
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
diff --git a/www-client/opera-next/opera-next-12.00.1362.ebuild b/www-client/opera-next/opera-next-12.00.1362.ebuild
new file mode 100644
index 000000000000..d44194be3248
--- /dev/null
+++ b/www-client/opera-next/opera-next-12.00.1362.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1362.ebuild,v 1.1 2012/04/11 14:06:50 jer Exp $
+
+EAPI="4"
+
+inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
+
+DESCRIPTION="A fast and secure web browser and Internet suite"
+HOMEPAGE="http://www.opera.com/"
+
+SLOT="0"
+LICENSE="OPERA-11 LGPL-2 LGPL-3"
+KEYWORDS="~amd64"
+IUSE="elibc_FreeBSD gtk gtk3 kde +gstreamer"
+
+O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
+O_B="$(get_version_component_range 3)" # Build version, i.e. 1156
+
+O_D="4949_${O_V}-1360"
+O_P="${PN}-${O_V}-${O_B}"
+O_U="http://snapshot.opera.com/unix/"
+
+SRC_URI="
+ amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
+"
+
+OPREFIX="/usr/$(get_libdir)"
+
+QA_DT_HASH="${OPREFIX}/${PN}/.*"
+QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
+
+O_LINGUAS="af az be bg bn cs da de el en-GB es-ES es-LA et fi fr fr-CA fy gd hi
+hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv sw ta te
+th tl tr uk uz vi zh-CN zh-TW zu"
+
+for O_LINGUA in ${O_LINGUAS}; do
+ IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
+done
+
+DEPEND="
+ >=sys-apps/sed-4
+ app-arch/xz-utils
+"
+GTKRDEPEND="
+ dev-libs/atk
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ gtk? ( x11-libs/gtk+:2 )
+ gtk3? ( x11-libs/gtk+:3 )
+ x11-libs/pango
+ x11-libs/pixman
+"
+KDERDEPEND="
+ kde-base/kdelibs
+ x11-libs/qt-core
+ x11-libs/qt-gui
+"
+GSTRDEPEND="
+ dev-libs/glib:2
+ dev-libs/libxml2
+ media-libs/gst-plugins-base
+ media-libs/gstreamer
+ media-plugins/gst-plugins-meta
+"
+RDEPEND="
+ media-libs/fontconfig
+ media-libs/freetype
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXft
+ x11-libs/libXrender
+ x11-libs/libXt
+ gtk? ( ${GTKRDEPEND} )
+ gtk3? ( ${GTKRDEPEND} )
+ kde? ( ${KDERDEPEND} )
+ gstreamer? ( ${GSTRDEPEND} )
+"
+src_unpack() {
+ unpack ${A}
+ mv -v ${PN}* "${S}" || die
+}
+
+src_prepare() {
+ local LNGDIR="share/${PN}/locale"
+
+ # Count linguas
+ count() { echo ${#}; }
+ local lingua_count=$(count ${O_LINGUAS} en)
+ local locale_count=$(count ${LNGDIR}/*)
+ [[ ${lingua_count} = ${locale_count} ]] \
+ || die "Number of LINGUAS does not match number of locales"
+ unset count
+
+ # Remove unwanted linguas
+ einfo "Keeping these locales (linguas): ${LINGUAS}."
+ for LINGUA in ${O_LINGUAS}; do
+ if ! use linguas_${LINGUA/-/_}; then
+ LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
+ rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
+ fi
+ done
+
+ # Remove doc directory but keep the LICENSE under another name (bug #315473)
+ mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
+ rm -rf share/doc
+ for locale in share/${PN}/locale/*; do
+ rm -f "${locale}/license.txt"
+ ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
+ || die
+ done
+
+ # Remove package directory
+ rm -rf share/${PN}/package
+
+ # Optional libraries
+ if ! use gtk; then
+ rm lib/${PN}/liboperagtk2.so || die
+ fi
+ if ! use gtk3; then
+ rm lib/${PN}/liboperagtk3.so || die
+ fi
+ if ! use kde; then
+ rm lib/${PN}/liboperakde4.so || die
+ fi
+ if ! use gstreamer; then
+ rm -r lib/${PN}/gstreamer || die
+ fi
+
+ # Unzip the man pages before sedding
+ gunzip share/man/man1/* || die
+
+ # Replace PREFIX, SUFFIX and PN in various files
+ sed -i \
+ -e "s:@@{PREFIX}:/usr:g" \
+ -e "s:@@{SUFFIX}::g" \
+ -e "s:@@{_SUFFIX}::g" \
+ -e "s:@@{USUFFIX}::g" \
+ -e "s:opera:${PN}:g" \
+ share/man/man1/* \
+ share/applications/${PN}-*.desktop \
+ || die
+
+ # Replace "Opera" with "Opera Next"
+ if [[ ${PN} = opera-next ]]; then
+ sed -i share/applications/${PN}-*.desktop \
+ -e "/^Name=Opera\|^ Next/s:Opera:& Next:" || die
+ fi
+
+ # Create /usr/bin/opera wrapper
+ echo '#!/bin/sh' > ${PN}
+ echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN}
+ echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
+ >> ${PN}
+ echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
+
+ # Change libz.so.3 to libz.so.1 for gentoo/freebsd
+ if use elibc_FreeBSD; then
+ scanelf -qR -N libz.so.3 -F "#N" lib/${PN}/ | \
+ while read i; do
+ if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
+ then
+ export SANITY_CHECK_LIBZ_FAILED=1
+ break
+ fi
+ sed -i \
+ "$i" \
+ -e 's/libz\.so\.3/libz.so.1/g'
+ done
+ [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die
+ fi
+}
+
+src_install() {
+ # We install into usr instead of opt as Opera does not support the latter
+ dodir /usr
+ mv lib/ "${D}/${OPREFIX}" || die
+ mv share/ "${D}/usr/" || die
+
+ # Install startup scripts
+ dobin ${PN}
+
+ # Stop revdep-rebuild from checking opera binaries
+ dodir /etc/revdep-rebuild
+ echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
+ > "${D}"/etc/revdep-rebuild/90${PN}
+
+ # Set PaX markings for hardened/PaX (bug #344267)
+ pax-mark m "${D}"/${OPREFIX}/${PN}/opera*
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ if use elibc_FreeBSD; then
+ elog
+ elog "To improve shared memory usage please set:"
+ elog "$ sysctl kern.ipc.shm_allow_removed=1"
+ fi
+
+ # Update desktop file database and gtk icon cache (bug #334993)
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ # Update desktop file database and gtk icon cache (bug #334993)
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}