From: Diego Elio Pettenò Date: Mon, 20 Nov 2006 20:02:38 +0000 (+0000) Subject: XMMS Removal - media-plugins/xmms-spc gone. -- Sorry but this week I'm unavailable... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=19aefac38d7bcfacf25f063d4716f0821dbbf1f1;p=gentoo.git XMMS Removal - media-plugins/xmms-spc gone. -- Sorry but this week I'm unavailable, so I'm removing it a couple of days earlier. --- diff --git a/media-plugins/xmms-spc/ChangeLog b/media-plugins/xmms-spc/ChangeLog deleted file mode 100644 index 177df46fe8a8..000000000000 --- a/media-plugins/xmms-spc/ChangeLog +++ /dev/null @@ -1,64 +0,0 @@ -# ChangeLog for media-plugins/xmms-spc -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-spc/ChangeLog,v 1.17 2006/08/18 00:35:32 metalgod Exp $ - -*xmms-spc-0.2.1-r2 (18 Aug 2006) - - 18 Aug 2006; Luis Medinas - +files/xmms-spc-0.2.1-autoconf.patch, +xmms-spc-0.2.1-r2.ebuild: - Added a patch to fix makefiles with recent gcc thanks to desbaine@yahoo.com. - Fixes bug #143723. - - 30 Oct 2005; Luis Medinas xmms-spc-0.2.1-r1.ebuild: - Fix package by adding eautoreconf before elibtoolize. Fixes bug #97046. - - 04 Sep 2005; Diego Pettenò - xmms-spc-0.2.1-r1.ebuild: - Don't install COPYING file. - - 03 May 2005; Jeremy Huddleston - +files/xmms-spc-0.2.1-amd64.patch, xmms-spc-0.2.1-r1.ebuild: - Added amd64 patch and added to ~amd64. Closes bug #66595. - - 11 Mar 2005; David Holm xmms-spc-0.2.1-r1.ebuild: - Masked on ppc, sound corrupted - - 31 Oct 2004; Jeremy Huddleston - -files/xmms-spc-0.2.1.patch: - Removing old version. Marking -amd64 for bug #66595. - - 06 Oct 2004; Jeremy Huddleston - xmms-spc-0.2.1-r1.ebuild: - multilib fixes. - - 03 Sep 2004; Jeremy Huddleston - xmms-spc-0.2.1-r1.ebuild: - Stable amd64 x86. - -*xmms-spc-0.2.1-r1 (07 Jul 2004) - - 07 Jul 2004; Jeremy Huddleston - xmms-spc-0.2.1-r1.ebuild, files/xmms-spc-0.2.1-r1.patch: - -sparc. auto* update so it builds shared library properly. - - 17 Jun 2004; Jeremy Huddleston - xmms-spc-0.2.1.ebuild: - gnuconfig update for ~amd64 addition. - - 17 Apr 2004; Jeremy Huddleston - xmms-spc-0.2.1.ebuild: - epatch. IUSE. - -*xmms-spc-0.2.1 (31 Oct 2002) - - 14 Mar 2003; jje xmms-spc-0.2.1.ebuild, - files/xmms-spc-0.2.1.patch: - Updated to patch makefiles. Unable to test as i don't have any of the media. - - Submitted by: Adam Duck - - 31 Oct 2002; Seemant Kulleen xmms-spc-0.2.1.ebuild - ChangeLog files/digest-xmms-spc-0.2.1 : - - XMMS plugin to play Super Nintendo Sound Bank Files (.spc). Thanks to: - jaquadro@penguinia.net (Justin Aquadro) in bug #7377. diff --git a/media-plugins/xmms-spc/Manifest b/media-plugins/xmms-spc/Manifest deleted file mode 100644 index b16ac5e910df..000000000000 --- a/media-plugins/xmms-spc/Manifest +++ /dev/null @@ -1,45 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX xmms-spc-0.2.1-amd64.patch 408 RMD160 53b84af3fb25bef295eb9fcdc79394c0f29dea11 SHA1 2a97d8b4df989ad995315a209f3516599a9581a5 SHA256 903aa99d2d750ecd7103a741db4283ab249a54d13b8b7d3cd4e8c4f5c782492e -MD5 2244fa5e3f55c79a7b9d51e42ce24e8e files/xmms-spc-0.2.1-amd64.patch 408 -RMD160 53b84af3fb25bef295eb9fcdc79394c0f29dea11 files/xmms-spc-0.2.1-amd64.patch 408 -SHA256 903aa99d2d750ecd7103a741db4283ab249a54d13b8b7d3cd4e8c4f5c782492e files/xmms-spc-0.2.1-amd64.patch 408 -AUX xmms-spc-0.2.1-autoconf.patch 1388 RMD160 dd534d96dc3214572825e24bd48beb38c6044ee5 SHA1 e18b91155b92f7a19367379a75b80675adfdd27a SHA256 cc92a07b1465153a6370b37d6cc9c8583666d5d92788b108ea4cfc591bb37094 -MD5 7f1dc14ff4f9e5982e10ef5fef4059e5 files/xmms-spc-0.2.1-autoconf.patch 1388 -RMD160 dd534d96dc3214572825e24bd48beb38c6044ee5 files/xmms-spc-0.2.1-autoconf.patch 1388 -SHA256 cc92a07b1465153a6370b37d6cc9c8583666d5d92788b108ea4cfc591bb37094 files/xmms-spc-0.2.1-autoconf.patch 1388 -AUX xmms-spc-0.2.1-r1.patch 2905 RMD160 4b64840685143ba2642fca7f3c5328c1216f1eee SHA1 f61fd1d573a64702ebe23fe8800effb52ad85477 SHA256 4c50144ddbb56d1ab573f340f4e65fe7bd743dc4945615a1262450daba29559b -MD5 73f665e685e8e66c587a7ec694f1b05f files/xmms-spc-0.2.1-r1.patch 2905 -RMD160 4b64840685143ba2642fca7f3c5328c1216f1eee files/xmms-spc-0.2.1-r1.patch 2905 -SHA256 4c50144ddbb56d1ab573f340f4e65fe7bd743dc4945615a1262450daba29559b files/xmms-spc-0.2.1-r1.patch 2905 -DIST spcxmms-0.2.1.tar.bz2 150267 RMD160 4952c31cd344bf3d7320c6b1a09400996984b91d SHA1 6cfdf52fc2753ce567ea2e053649a01c89ed6eb1 SHA256 9847a01a2aca2a16bfe5efb06ce68af9ce1fe83ab7587bfd5056c1c660f632e9 -EBUILD xmms-spc-0.2.1-r1.ebuild 964 RMD160 9085d4ec57933ad28690523415d537d9f6235a1d SHA1 bdeb56d7f393858b64e5b54a0b791d5ee8bd6557 SHA256 2c251b0593cd00055d157469ccb76e4d71494c3b7ac2d1c5eb0d62043607e780 -MD5 ee3c9b43fbd0ce9dbba66b2abd13a5eb xmms-spc-0.2.1-r1.ebuild 964 -RMD160 9085d4ec57933ad28690523415d537d9f6235a1d xmms-spc-0.2.1-r1.ebuild 964 -SHA256 2c251b0593cd00055d157469ccb76e4d71494c3b7ac2d1c5eb0d62043607e780 xmms-spc-0.2.1-r1.ebuild 964 -EBUILD xmms-spc-0.2.1-r2.ebuild 1006 RMD160 7723f4e5a813be115d46d1d9e3cd66f3fa592d6e SHA1 bd37d59a652ce79dbf7f9f25f46826bd640d592e SHA256 642fcfe1d50958af1c4314f6b042a8858b8fede0f3fa580261f583815d5feddf -MD5 144d89d93f474264b94ebaf64211dfc4 xmms-spc-0.2.1-r2.ebuild 1006 -RMD160 7723f4e5a813be115d46d1d9e3cd66f3fa592d6e xmms-spc-0.2.1-r2.ebuild 1006 -SHA256 642fcfe1d50958af1c4314f6b042a8858b8fede0f3fa580261f583815d5feddf xmms-spc-0.2.1-r2.ebuild 1006 -MISC ChangeLog 2288 RMD160 4adc65d3409005a1083d8ebc49f4c93b4b8f8a46 SHA1 c3de263ba3814208566fba98b7b54ef4f3087537 SHA256 62b3f4abd2c557821c2236fc318567cd06e3f9167a4053570827f7d62b669d70 -MD5 e58628f30074ad6987fa07fcbd988068 ChangeLog 2288 -RMD160 4adc65d3409005a1083d8ebc49f4c93b4b8f8a46 ChangeLog 2288 -SHA256 62b3f4abd2c557821c2236fc318567cd06e3f9167a4053570827f7d62b669d70 ChangeLog 2288 -MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b -MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 -RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158 -SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158 -MD5 e1a72bdbe5f75f22bece1744d05d524c files/digest-xmms-spc-0.2.1-r1 244 -RMD160 0019c6f042fe1c3e12cf779bf50115630d06d1a9 files/digest-xmms-spc-0.2.1-r1 244 -SHA256 48ff269093d916da132267c0cec41730fe99369898ec90054e55b014dcbef1b5 files/digest-xmms-spc-0.2.1-r1 244 -MD5 e1a72bdbe5f75f22bece1744d05d524c files/digest-xmms-spc-0.2.1-r2 244 -RMD160 0019c6f042fe1c3e12cf779bf50115630d06d1a9 files/digest-xmms-spc-0.2.1-r2 244 -SHA256 48ff269093d916da132267c0cec41730fe99369898ec90054e55b014dcbef1b5 files/digest-xmms-spc-0.2.1-r2 244 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFE5QthwUpWvClEHQoRAoSmAJ9eOIuqzh7eF6THMFahd0VMmeJ6WgCdH0VL -IXIMQvniogaiJW6sLn9obHw= -=1ogf ------END PGP SIGNATURE----- diff --git a/media-plugins/xmms-spc/files/digest-xmms-spc-0.2.1-r1 b/media-plugins/xmms-spc/files/digest-xmms-spc-0.2.1-r1 deleted file mode 100644 index 18ccf2a2355e..000000000000 --- a/media-plugins/xmms-spc/files/digest-xmms-spc-0.2.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 bb4975661ce7cce2da59f76dd1a29372 spcxmms-0.2.1.tar.bz2 150267 -RMD160 4952c31cd344bf3d7320c6b1a09400996984b91d spcxmms-0.2.1.tar.bz2 150267 -SHA256 9847a01a2aca2a16bfe5efb06ce68af9ce1fe83ab7587bfd5056c1c660f632e9 spcxmms-0.2.1.tar.bz2 150267 diff --git a/media-plugins/xmms-spc/files/digest-xmms-spc-0.2.1-r2 b/media-plugins/xmms-spc/files/digest-xmms-spc-0.2.1-r2 deleted file mode 100644 index 18ccf2a2355e..000000000000 --- a/media-plugins/xmms-spc/files/digest-xmms-spc-0.2.1-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 bb4975661ce7cce2da59f76dd1a29372 spcxmms-0.2.1.tar.bz2 150267 -RMD160 4952c31cd344bf3d7320c6b1a09400996984b91d spcxmms-0.2.1.tar.bz2 150267 -SHA256 9847a01a2aca2a16bfe5efb06ce68af9ce1fe83ab7587bfd5056c1c660f632e9 spcxmms-0.2.1.tar.bz2 150267 diff --git a/media-plugins/xmms-spc/files/xmms-spc-0.2.1-amd64.patch b/media-plugins/xmms-spc/files/xmms-spc-0.2.1-amd64.patch deleted file mode 100644 index 9351ff9645dd..000000000000 --- a/media-plugins/xmms-spc/files/xmms-spc-0.2.1-amd64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- spcxmms-0.2.1/libspc/port.h.orig 2005-05-01 09:15:50.000000000 -0400 -+++ spcxmms-0.2.1/libspc/port.h 2005-05-01 09:14:04.000000000 -0400 -@@ -147,7 +147,7 @@ - #endif - - #if defined(__i386__) || defined(__i486__) || defined(__i586__) || \ -- defined(__WIN32) || defined(__alpha__) -+ defined(__WIN32) || defined(__alpha__) || defined(__x86_64__) - #define LSB_FIRST - #define FAST_LSB_WORD_ACCESS - #else diff --git a/media-plugins/xmms-spc/files/xmms-spc-0.2.1-autoconf.patch b/media-plugins/xmms-spc/files/xmms-spc-0.2.1-autoconf.patch deleted file mode 100644 index 9c9f8da98a42..000000000000 --- a/media-plugins/xmms-spc/files/xmms-spc-0.2.1-autoconf.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur spcxmms-0.2.1/configure.in spcxmms-0.2.1.mine/configure.in ---- spcxmms-0.2.1/configure.in 2000-10-28 12:02:31.000000000 -0700 -+++ spcxmms-0.2.1.mine/configure.in 2006-08-12 13:30:59.000000000 -0700 -@@ -57,5 +57,7 @@ - AC_DEFINE(ENABLE_XMDSP) - fi - -+AC_CHECK_LIB(pthread, pthread_join) -+ - dnl Finally create all the generated files - AC_OUTPUT(Makefile libspc/Makefile spcplay/Makefile xmms-plugin/Makefile) - -diff -Naur spcxmms-0.2.1/spcplay/Makefile.am spcxmms-0.2.1.mine/spcplay/Makefile.am ---- spcxmms-0.2.1/spcplay/Makefile.am 2006-08-12 13:52:54.000000000 -0700 -+++ spcxmms-0.2.1/spcplay/Makefile.am.mine 2006-08-12 13:52:47.000000000 -0700 -@@ -2,5 +2,6 @@ - - spcplay_SOURCES = getopt.c getopt1.c getopt.h main.c - spcplay_LDADD = ../libspc/libspc.la -+CCLD = $(CXX) - - INCLUDES = -I../libspc - ---- spcxmms-0.2.1/xmms-plugin/Makefile.am 2006-08-12 15:37:39.000000000 -0700 -+++ spcxmms-0.2.1/xmms-plugin/Makefile.am.mine 2006-08-12 15:38:15.000000000 -0700 -@@ -2,10 +2,13 @@ - - lib_LTLIBRARIES = libspc.la - libspc_la_LDFLAGS = -module -avoid-version --libspc_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ ../libspc/libspc.la -+libspc_la_LIBADD = @GTK_LIBS@ ../libspc/libspc.la - libspc_la_SOURCES = spcxmms.c spcxmms.h \ - interface.c interface.h support.c support.h callbacks.h gui.c - - INCLUDES = @GTK_CFLAGS@ -I../libspc - - EXTRA_DIST = spcxmms.glade -+ -+CCLD=$(CXX) -+ diff --git a/media-plugins/xmms-spc/files/xmms-spc-0.2.1-r1.patch b/media-plugins/xmms-spc/files/xmms-spc-0.2.1-r1.patch deleted file mode 100644 index dad6a533ea0c..000000000000 --- a/media-plugins/xmms-spc/files/xmms-spc-0.2.1-r1.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -Naur spcxmms-0.2.1.orig/libspc/Makefile.am spcxmms-0.2.1/libspc/Makefile.am ---- spcxmms-0.2.1.orig/libspc/Makefile.am 2000-10-13 01:16:38.000000000 -0700 -+++ spcxmms-0.2.1/libspc/Makefile.am 2004-07-07 01:21:44.933579000 -0700 -@@ -5,3 +5,6 @@ - apu.cpp apu.h apumem.h globals.cpp soundux.cpp soundux.h \ - spc700.cpp spc700.h port.h snes9x.h memmap.h - -+CFLAGS = @CFLAGS@ -fPIC -DPIC -+CXXFLAGS = @CXXFLAGS@ -fPIC -DPIC -+ -diff -Naur spcxmms-0.2.1.orig/libspc/soundux.cpp spcxmms-0.2.1/libspc/soundux.cpp ---- spcxmms-0.2.1.orig/libspc/soundux.cpp 2000-07-04 23:26:38.000000000 -0700 -+++ spcxmms-0.2.1/libspc/soundux.cpp 2004-07-07 01:20:10.122594000 -0700 -@@ -414,7 +414,7 @@ - if (SoundData.channels[channel].type == SOUND_NOISE) - hertz = NoiseFreq [APU.DSP [APU_FLG] & 0x1f]; - SoundData.channels[channel].frequency = (int) -- (((int64) hertz * FIXED_POINT) / so.playback_rate); -+ ((((int64) hertz * FIXED_POINT) / so.playback_rate) * .980); - } - } - -diff -Naur spcxmms-0.2.1.orig/spcplay/Makefile.in spcxmms-0.2.1/spcplay/Makefile.in ---- spcxmms-0.2.1.orig/spcplay/Makefile.in 2000-10-28 12:10:04.000000000 -0700 -+++ spcxmms-0.2.1/spcplay/Makefile.in 2004-07-07 01:16:35.311275000 -0700 -@@ -108,7 +108,7 @@ - LIBS = @LIBS@ - spcplay_OBJECTS = getopt.o getopt1.o main.o - spcplay_DEPENDENCIES = ../libspc/libspc.la --spcplay_LDFLAGS = -+spcplay_LDFLAGS = -lstdc++ - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -diff -Naur spcxmms-0.2.1.orig/xmms-plugin/Makefile.in spcxmms-0.2.1/xmms-plugin/Makefile.in ---- spcxmms-0.2.1.orig/xmms-plugin/Makefile.in 2000-10-28 12:10:05.000000000 -0700 -+++ spcxmms-0.2.1/xmms-plugin/Makefile.in 2004-07-07 01:16:35.322275000 -0700 -@@ -93,7 +93,7 @@ - - lib_LTLIBRARIES = libspc.la - libspc_la_LDFLAGS = -module -avoid-version --libspc_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ ../libspc/libspc.la -+libspc_la_LIBADD = @GTK_LIBS@ -lstdc++ @PTHREAD_LIBS@ ../libspc/libspc.la - libspc_la_SOURCES = spcxmms.c spcxmms.h interface.c interface.h support.c support.h callbacks.h gui.c - - -diff -Naur spcxmms-0.2.1.orig/xmms-plugin/spcxmms.c spcxmms-0.2.1/xmms-plugin/spcxmms.c ---- spcxmms-0.2.1.orig/xmms-plugin/spcxmms.c 2000-10-13 01:11:05.000000000 -0700 -+++ spcxmms-0.2.1/xmms-plugin/spcxmms.c 2004-07-07 01:16:34.900253000 -0700 -@@ -106,6 +106,7 @@ - - static void *play_loop(void *arg) - { -+ long int i = 0; - gint8 *mixbuf; - mixbuf = g_new(guint8, mixbuf_size); - -@@ -113,7 +114,9 @@ - SPC_update(mixbuf); - spc_ip.add_vis_pcm(spc_ip.output->written_time(), FMT_S16_LE, 2, - mixbuf_size, mixbuf); -+ i++; - -+ if (i >= 18300) going = FALSE; - while (spc_ip.output->buffer_free() < mixbuf_size && going) - xmms_usleep(10000); - diff --git a/media-plugins/xmms-spc/metadata.xml b/media-plugins/xmms-spc/metadata.xml deleted file mode 100644 index e1774e3d9ad7..000000000000 --- a/media-plugins/xmms-spc/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - -sound - diff --git a/media-plugins/xmms-spc/xmms-spc-0.2.1-r1.ebuild b/media-plugins/xmms-spc/xmms-spc-0.2.1-r1.ebuild deleted file mode 100644 index 935f9ab49469..000000000000 --- a/media-plugins/xmms-spc/xmms-spc-0.2.1-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-spc/xmms-spc-0.2.1-r1.ebuild,v 1.8 2005/10/30 23:38:52 metalgod Exp $ - -IUSE="" - -inherit eutils gnuconfig libtool autotools - -MY_P=spcxmms-${PV} -S=${WORKDIR}/${MY_P} -DESCRIPTION="SPC Plugun for XMMS" -HOMEPAGE="http://www.self-core.org/~kaoru-k/" -SRC_URI="http://www.self-core.org/~kaoru-k/pub/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -#-sparc: 0.2.1-r1: audio does not play -KEYWORDS="x86 ~amd64 -sparc -ppc" - -RDEPEND="media-sound/xmms" -DEPEND="${RDEPEND} - sys-devel/automake" - -src_unpack() { - unpack ${A} - - cd ${S} - epatch ${FILESDIR}/${PF}.patch - epatch ${FILESDIR}/${P}-amd64.patch - - export WANT_AUTOMAKE=1.4 - export WANT_AUTOCONF=2.5 - - eautoreconf - elibtoolize - gnuconfig_update -} - -src_install() { - make DESTDIR=${D} libdir=`xmms-config --input-plugin-dir` install || die - dodoc AUTHORS NEWS README -} diff --git a/media-plugins/xmms-spc/xmms-spc-0.2.1-r2.ebuild b/media-plugins/xmms-spc/xmms-spc-0.2.1-r2.ebuild deleted file mode 100644 index bf154a81ae21..000000000000 --- a/media-plugins/xmms-spc/xmms-spc-0.2.1-r2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-spc/xmms-spc-0.2.1-r2.ebuild,v 1.1 2006/08/18 00:35:32 metalgod Exp $ - -IUSE="" - -inherit eutils gnuconfig libtool autotools - -MY_P=spcxmms-${PV} -S=${WORKDIR}/${MY_P} -DESCRIPTION="SPC Plugun for XMMS" -HOMEPAGE="http://www.self-core.org/~kaoru-k/" -SRC_URI="http://www.self-core.org/~kaoru-k/pub/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -#-sparc: 0.2.1-r1: audio does not play -KEYWORDS="x86 ~amd64 -sparc -ppc" - -RDEPEND="media-sound/xmms" -DEPEND="${RDEPEND} - sys-devel/automake" - -src_unpack() { - unpack ${A} - - cd ${S} - epatch ${FILESDIR}/${P}-r1.patch - epatch ${FILESDIR}/${P}-amd64.patch - epatch ${FILESDIR}/${P}-autoconf.patch - - export WANT_AUTOMAKE=1.4 - export WANT_AUTOCONF=2.5 - - eautoreconf - elibtoolize - gnuconfig_update -} - -src_install() { - make DESTDIR=${D} libdir=`xmms-config --input-plugin-dir` install || die - dodoc AUTHORS NEWS README -}