diff options
author | Vadim Kuznetsov <vadimk@gentoo.org> | 2011-12-05 16:04:21 +0000 |
---|---|---|
committer | Vadim Kuznetsov <vadimk@gentoo.org> | 2011-12-05 16:04:21 +0000 |
commit | 9056e9967f038de6ca383c04792fb7e8d7432aa4 (patch) | |
tree | 67d49aeb6c1123b1501475b93c105f8d88f388e1 /app-emulation/vmware-player | |
parent | Cleanup (diff) | |
download | gentoo-2-9056e9967f038de6ca383c04792fb7e8d7432aa4.tar.gz gentoo-2-9056e9967f038de6ca383c04792fb7e8d7432aa4.tar.bz2 gentoo-2-9056e9967f038de6ca383c04792fb7e8d7432aa4.zip |
removed old version. bug 385727.
(Portage version: 2.1.10.39/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/vmware-player')
9 files changed, 10 insertions, 519 deletions
diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog index 3cc46176237e..7a7ad47c0367 100644 --- a/app-emulation/vmware-player/ChangeLog +++ b/app-emulation/vmware-player/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-emulation/vmware-player # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.99 2011/12/03 20:07:45 vadimk Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.100 2011/12/05 16:04:20 vadimk Exp $ + + 05 Dec 2011; Vadim Kuznetsov <vadimk@gentoo.org> + -vmware-player-2.5.5.328052.ebuild, + -files/2.5.5.328052/vmware-player.py.patch, + -files/2.5.5.328052/vmware-player-extras.py.patch, + -files/vmware-player-2.5.5.328052-installer.patch, + -files/vmware-player-2.5.rc, -files/helpers/module_patcher.sh, + -files/helpers/unbundler.sh, -files/helpers/vmware-config.sh: + removed old version. bug 385727. *vmware-player-4.0.1.528992-r1 (03 Dec 2011) diff --git a/app-emulation/vmware-player/files/2.5.5.328052/vmware-player-extras.py.patch b/app-emulation/vmware-player/files/2.5.5.328052/vmware-player-extras.py.patch deleted file mode 100644 index eb9e723058cb..000000000000 --- a/app-emulation/vmware-player/files/2.5.5.328052/vmware-player-extras.py.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/vmware-player-extras.py b/vmware-player-extras.py -index 21595b1..e8adf08 100644 ---- a/vmware-player-extras.py -+++ b/vmware-player-extras.py -@@ -6,7 +6,8 @@ VMware Player Extras component installer. - - DEST = LIBDIR/'vmware' - SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', } --CONF = DEST/'setup/vmware-config' -+import os -+CONF = path(os.environ['WORKDIR'])/'vmware-config.sh' - - - class PlayerExtras(Installer): diff --git a/app-emulation/vmware-player/files/2.5.5.328052/vmware-player.py.patch b/app-emulation/vmware-player/files/2.5.5.328052/vmware-player.py.patch deleted file mode 100644 index 49306c33f42e..000000000000 --- a/app-emulation/vmware-player/files/2.5.5.328052/vmware-player.py.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/vmware-player.py b/vmware-player.py -index bee22df..d06cca9 100644 ---- a/vmware-player.py -+++ b/vmware-player.py -@@ -6,7 +6,8 @@ VMware Player component installer. - - GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults' - DEST = LIBDIR/'vmware' --CONFIG = DEST/'setup/vmware-config' -+import os -+CONFIG = path(os.environ['WORKDIR'])/'vmware-config.sh' - CUPSLIBDIR = LIBDIR/'cups' - # XXX: LIBDIR should be properly calculated, to make this cleaner - if (PREFIX/'lib64/cups').exists(): -@@ -84,12 +85,12 @@ class Player(Installer): - ret, kvers = output('uname', '-r') - kvers = kvers.strip() - modules = ('vmmon', 'vmnet', 'vmblock', 'vmci', 'vsock') -- base = path('/lib/modules/%s/misc' % kvers) -+ base = path('/this/path/doesnt/exist/lib/modules/%s/misc' % kvers) - - for module in modules: - for ext in ('o', 'ko'): - mod = '%s.%s' % (module, ext) -- (base/mod).remove(ignore_errors=True) -+ # (base/mod).remove(ignore_errors=True) - - def PreUninstall(self, old, new, upgrade): - script = INITSCRIPTDIR/'vmware' -@@ -156,8 +157,8 @@ class Player(Installer): - def PostTransactionInstall(self, old, new, upgrade): - if ENV.get('VMWARE_SKIP_MODULES'): - log.info('Skipping kernel module installation') -- elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0: -- log.info('Successfully installed kernel modules') -+ # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0: -+ # log.info('Successfully installed kernel modules') - else: - log.info('Unable to install kernel modules') - -@@ -189,8 +190,8 @@ class Player(Installer): - for handler in ('vm', 'vms'): - for gconfType, key, value in settings: - key = key % handler -- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, -- '--type', gconfType, '--set', key, value) -+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, -+ # '--type', gconfType, '--set', key, value) - - # Instruct all gconfd daemons to reload. - run('killall', '-HUP', 'gconfd-2') -@@ -200,9 +201,9 @@ class Player(Installer): - def _deconfigureVMStreamingHandlers(self): - """ Deconfigures the handlers for vm:// and vms:// used for VM streaming""" - def deconfigureGConf(): -- for handler in ('vm', 'vms'): -- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, -- '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler) -+ # for handler in ('vm', 'vms'): -+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, -+ # '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler) - - # Instruct all gconfd daemons to reload. - run('killall', '-HUP', 'gconfd-2') diff --git a/app-emulation/vmware-player/files/helpers/module_patcher.sh b/app-emulation/vmware-player/files/helpers/module_patcher.sh deleted file mode 100755 index 03c490a73959..000000000000 --- a/app-emulation/vmware-player/files/helpers/module_patcher.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -MY_BASE=$(basename $1) -if [ -f ${FILESDIR}/${PV}/${MY_BASE}.patch ]; -then - echo -n "Module Patcher: " - patch -f -p1 ${1} < ${FILESDIR}/${PV}/${MY_BASE}.patch -fi diff --git a/app-emulation/vmware-player/files/helpers/unbundler.sh b/app-emulation/vmware-player/files/helpers/unbundler.sh deleted file mode 100755 index b19b587c2af5..000000000000 --- a/app-emulation/vmware-player/files/helpers/unbundler.sh +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash - -ORIGFILE="$1" - -is_relative() { - local path="$1" - shift - - [ "${path:0:1}" != "/" ] - return -} - -set_offsets() { - # This won't work with non-GNU stat. - FILE_SIZE=`stat -L --format "%s" "$1"` - local offset=$(($FILE_SIZE - 4)) - - MAGIC_OFFSET=$offset - offset=$(($offset - 4)) - - CHECKSUM_OFFSET=$offset - offset=$(($offset - 4)) - - VERSION_OFFSET=$offset - offset=$(($offset - 4)) - - PREPAYLOAD_OFFSET=$offset - offset=$(($offset - 4)) - - PREPAYLOAD_SIZE_OFFSET=$offset - offset=$(($offset - 4)) - - LAUNCHER_SIZE_OFFSET=$offset - offset=$(($offset - 4)) - - PAYLOAD_OFFSET=$offset - offset=$(($offset - 4)) - - PAYLOAD_SIZE_OFFSET=$offset - offset=$(($offset - 4)) -} - -set_lengths() { - local file="$1" - if [ ! -s "$file" ]; then - echo "$file does not exist" - exit 1 - fi - - # XXX: put extraction in its own function - MAGIC_NUMBER=`od -An -t u4 -N 4 -j $MAGIC_OFFSET "$file" | tr -d ' '` - - if [ "$MAGIC_NUMBER" != "907380241" ]; then - echo "magic number does not match" - exit 1 - fi - - LAUNCHER_SIZE=`od -An -t u4 -N 4 -j $LAUNCHER_SIZE_OFFSET "$file" | tr -d ' '` - PAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PAYLOAD_SIZE_OFFSET "$file" | tr -d ' '` - PREPAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PREPAYLOAD_SIZE_OFFSET "$file" | tr -d ' '` - - SKIP_BYTES=$(($PREPAYLOAD_SIZE + $LAUNCHER_SIZE)) - - return 0 -} - -if is_relative "${ORIGFILE}"; then - ORIGFILE="`pwd`/${ORIGFILE}" -fi - - -set_offsets ${ORIGFILE} -set_lengths ${ORIGFILE} - -echo "Unbundling" ${ORIGFILE} - -PREPAYLOAD="prepayload" -PAYLOAD="payload" - -# Unpack the pre-payload file -mkdir ${PREPAYLOAD} -cd ${PREPAYLOAD} -dd if="${ORIGFILE}" ibs=$LAUNCHER_SIZE obs=1024 skip=1 | tar -xzf - 2> /dev/null -cd .. - -# Unpack the main file -mkdir ${PAYLOAD} -cd ${PAYLOAD} -dd if="${ORIGFILE}" ibs=$SKIP_BYTES obs=1024 skip=1 | tar -xzf - 2> /dev/null -cd .. - diff --git a/app-emulation/vmware-player/files/helpers/vmware-config.sh b/app-emulation/vmware-player/files/helpers/vmware-config.sh deleted file mode 100755 index 4895502ac2b7..000000000000 --- a/app-emulation/vmware-player/files/helpers/vmware-config.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -CONFIG_FILE="${D}/etc/vmware/config" - -remove_key() { - local key=${1} - grep -v "^${key} =" ${CONFIG_FILE} - grep -v "^${key} =" ${CONFIG_FILE} > ${CONFIG_FILE}.tmp - mv ${CONFIG_FILE}.tmp ${CONFIG_FILE} -} - -add_key() { - local key=${1} - local value=${2} - echo "${1} = \"${2}\"" >> ${CONFIG_FILE} -} - -mkdir -p $(dirname ${CONFIG_FILE}) -touch ${CONFIG_FILE} - -if [ "${1}" == "-s" ]; then - remove_key ${2} - add_key ${2} ${3/${D}/} -fi - -if [ "${1}" == "-d" ]; then - remove_key ${2} -fi - diff --git a/app-emulation/vmware-player/files/vmware-player-2.5.5.328052-installer.patch b/app-emulation/vmware-player/files/vmware-player-2.5.5.328052-installer.patch deleted file mode 100644 index 80a301e5c183..000000000000 --- a/app-emulation/vmware-player/files/vmware-player-2.5.5.328052-installer.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py -index 7a46312..e1dbff1 100644 ---- a/payload/install/vmware-installer/vmis/__init__.py -+++ b/payload/install/vmware-installer/vmis/__init__.py -@@ -12,5 +12,5 @@ VERSION_INFO = (1,0) - VERSION = '.'.join([str(x) for x in VERSION_INFO]) - MAJOR_VERSION = VERSION_INFO[0] - --CONFDIR = path(u'/etc/vmware') -+CONFDIR = path(u'./vmware-confdir') - DATABASE_PATH = CONFDIR/'database' -diff --git a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py -index e7abc2e..81c4a2b 100644 ---- a/payload/install/vmware-installer/vmis/core/env.py -+++ b/payload/install/vmware-installer/vmis/core/env.py -@@ -66,6 +66,8 @@ def LoadInstaller(component, loadPath): - # Python will interrept as being a module separator - moduleName = component.name.replace('.', '') - fileObj, pathName, description = imp.find_module(moduleName, [loadPath]) -+ print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1], -+ fileObj = file(pathName) - - try: - # XXX: db.config cannot be set at the module level because this -diff --git a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py -index 2be10de..f92ecff 100644 ---- a/payload/install/vmware-installer/vmis/core/questions.py -+++ b/payload/install/vmware-installer/vmis/core/questions.py -@@ -139,6 +139,9 @@ class InitDir(Directory): - """ - super(InitDir, self).Validate(answer) - -+ ### GENTOO PATCH ### Finish early -+ return True -+ - rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d') - answer = path(answer) - -diff --git a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py -index 525df75..abb81b3 100644 ---- a/payload/install/vmware-installer/vmis/ui/console.py -+++ b/payload/install/vmware-installer/vmis/ui/console.py -@@ -148,7 +148,7 @@ class Wizard(object): - wrapper = TextWrapper() - wrapper.width = 79 - wrapper.replace_whitespace = False # Needed to preserve paragraph spacing. -- Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text)) -+ Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text)) - except IOError: # RHEL4 appears to close stdin while we still expect it to be open - pass - -diff --git a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py -index 4f609c4..b07b89d 100644 ---- a/payload/install/vmware-installer/vmis/util/log.py -+++ b/payload/install/vmware-installer/vmis/util/log.py -@@ -22,6 +22,8 @@ else: - # running a build) - LOG_FILE = '/tmp/vmware-installer.log' - -+LOG_FILE = './vmware-installer.log' -+ - if level <= logging.DEBUG: - MAX_BYTES = 0 - BACKUP_COUNT = 0 diff --git a/app-emulation/vmware-player/files/vmware-player-2.5.rc b/app-emulation/vmware-player/files/vmware-player-2.5.rc deleted file mode 100644 index 6edba1627c73..000000000000 --- a/app-emulation/vmware-player/files/vmware-player-2.5.rc +++ /dev/null @@ -1,74 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/files/vmware-player-2.5.rc,v 1.1 2008/11/09 20:23:55 ikelos Exp $ - -depend() { - need localmount - use logger net hald - after samba -} - -vmware_prettify() { - # Yea, the code is ugly but the output is pretty - state=$1 - waserror=0 - msgtype=0 - while read line - do - [ "${line}" = "" ] && continue - if [ ${msgtype} -le 0 ] - then - if [ ${msgtype} -eq -1 ] - then - ewarn ${line} - continue - fi - case ${line} in - *:*) - einfon ${line} - echo - eend 0 - msgtype=1;; - *) - ewarn ${line} - msgtype=-1 - waserror=1;; - esac - continue - fi - - # Strip out anything after the <esc> code - message=`echo ${line} | sed -e "s/^\(.*\).*$/\1/"` - einfon " ${message}" - echo - - echo ${line} | grep -q done - status=$? - eend ${status} - - if [ ${status} -eq 0 ] - then - logger -p local0.err -t vmware-${state} "${line}" - waserror=${status} - fi - done - if [ "${msgtype}" = "-1" ] - then - eend 1 "VMware is not properly configured! See above." - fi - return ${waserror} -} - -start() { - test -x /etc/vmware/init.d/vmware || \ - eend 1 "vmware init script not found. Aborting" || return 1 - - /etc/vmware/init.d/vmware start | vmware_prettify start - return $? -} - -stop() { - /etc/vmware/init.d/vmware stop | vmware_prettify stop - return $? -} diff --git a/app-emulation/vmware-player/vmware-player-2.5.5.328052.ebuild b/app-emulation/vmware-player/vmware-player-2.5.5.328052.ebuild deleted file mode 100644 index e202f938fd96..000000000000 --- a/app-emulation/vmware-player/vmware-player-2.5.5.328052.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-2.5.5.328052.ebuild,v 1.4 2011/11/22 18:00:27 vadimk Exp $ - -EAPI="2" - -inherit eutils versionator fdo-mime gnome2-utils - -MY_PN="VMware-Player-$(replace_version_separator 3 - $PV)" - -DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators" -HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html" -SRC_URI=" - x86? ( mirror://vmware/software/vmplayer/${MY_PN}.i386.bundle ) - amd64? ( mirror://vmware/software/vmplayer/${MY_PN}.x86_64.bundle ) - " - -LICENSE="vmware" -SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="" -RESTRICT="strip binchecks" - -# vmware-workstation should not use virtual/libc as this is a -# precompiled binary package thats linked to glibc. -DEPEND=">=dev-lang/python-2.5[sqlite,ncurses] - dev-python/lxml" -RDEPEND=" - ~app-emulation/vmware-modules-1.0.0.25 - dev-cpp/cairomm - dev-cpp/libgnomecanvasmm - dev-cpp/libsexymm - dev-libs/libxml2 - sys-libs/glibc - sys-apps/pciutils - >=x11-libs/libview-0.6.2 - x11-libs/libXcursor - x11-libs/libXft - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXtst - !app-emulation/vmware-workstation - " - -S=${WORKDIR}/vmware-distrib -VM_INSTALL_DIR="/opt/vmware/player" - -pkg_setup() { - if use x86; then - MY_P="${MY_PN}.i386" - elif use amd64; then - MY_P="${MY_PN}.x86_64" - fi - - if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then - die "Please emerge this package using a different terminal (e.g. not within screen)." - fi -} - -pkg_nofetch() { - if use x86; then - MY_P="${MY_PN}.i386" - elif use amd64; then - MY_P="${MY_PN}.x86_64" - fi - - einfo "Please download the ${MY_P}.bundle from ${HOMEPAGE}" -} - -src_unpack() { - # Unbundle the bundle - cp "${FILESDIR}"/helpers/* "${WORKDIR}" - chmod a+x "${WORKDIR}"/*.sh - "${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle -} - -src_prepare() { - # Patch up the installer - epatch "${FILESDIR}/${P}-installer.patch" - - mkdir "${WORKDIR}/vmware-confdir" -} - -src_install() { - dodir /etc/init.d - - #Run the installer - local INSTALLER="${WORKDIR}/payload/install/vmware-installer" - local PYOPTS="-W ignore::DeprecationWarning" - export VMWARE_SKIP_NETWORKING="true" - python ${PYOPTS} "${INSTALLER}/vmware-installer.py" \ - --set-setting vmware-installer.libconf "${INSTALLER}/lib/libconf" \ - --set-setting initdir "${T}" \ - --set-setting initscriptdir "${D}/etc/init.d" \ - --set-setting prefix "${D}${VM_INSTALL_DIR}" \ - --set-setting sysconfdir "${D}/etc" \ - --install-component "${INSTALLER}" \ - --install-bundle "${DISTDIR}/${MY_P}.bundle" \ - --console --required - - rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary" - - if [ ! -e "${WORKDIR}"/vmware-confdir/bootstrap ]; then - eerror "VMware installation seems to have rolled back." - eerror "Please include the contents of ${WORKDIR}/vmware-installer.log" - eerror "in any bug reports you file." - die "VMware installation rolled back." - fi - - # Redirect all the ${D} paths to / paths" - sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap - - # Fix up icons/mime/desktop handlers - dodir /usr/share/ - mv "${D}${VM_INSTALL_DIR}"/share/applications "${D}"/usr/share/ - rm -f "${D}${VM_INSTALL_DIR}"/share/icons/hicolor/{icon-theme.cache,index.theme} - mv "${D}${VM_INSTALL_DIR}"/share/icons "${D}"/usr/share/ - dodir /usr/share/mime - mv "${D}${VM_INSTALL_DIR}"/share/mime/packages "${D}"/usr/share/mime - sed -i -e "s:${D}::" "${D}"/usr/share/applications/*.desktop - - # Bug 311435 - mv "${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libxml2.so.2/libxml2.so.2 \ - "${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libxml2.so.2/libxml2.so.2.old - dosym /usr/lib/libxml2.so.2 "${VM_INSTALL_DIR}"/lib/vmware/lib/libxml2.so.2/libxml2.so.2 - - # Copy across the temporary /etc/vmware directory - dodir /etc/vmware/init.d - cp -r "${WORKDIR}"/vmware-confdir/* "${D}/etc/vmware" - mv "${D}"/etc/init.d/* "${D}/etc/vmware/init.d" - sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${D}"/etc/vmware/init.d/vmware - newinitd "${FILESDIR}/${PN}"-2.5.rc vmware - touch "${D}"/etc/vmware/networking - - # Setup the path environment - insinto /etc/env.d - doins "${FILESDIR}/90${PN}" - - # Fix some paths to allow included gtk to work - for i in "/etc/pango/pangorc" \ - "/etc/pango/pango.modules" \ - "/etc/gtk-2.0/gtk.immodules" \ - "/etc/gtk-2.0/gdk-pixbuf.loaders" ; do - sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf${i} ; - sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/installer/lib/libconf${i} ; - done -} - -pkg_config() { - ${VM_INSTALL_DIR}/bin/vmware-networks --postinstall ${PN},old,new -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - - ewarn "Before you can use vmware-player, you must configure a default network setup." - ewarn "You can do this by running 'emerge --config ${PN}'." -} - -pkg_prerm() { - einfo "Stopping ${product_name} for safe unmerge" - /etc/init.d/vmware stop -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} |