Install compat symlinks as some rdeps need them, drop old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 19 insertions, 266 deletions

diff --git a/sys-boot/plymouth/ChangeLog b/sys-boot/plymouth/ChangeLog
index a13cfcd516c2..7a1b30c27a50 100644
--- a/sys-boot/plymouth/ChangeLog
+++ b/sys-boot/plymouth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/plymouth
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/ChangeLog,v 1.39 2013/10/12 11:21:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/ChangeLog,v 1.40 2013/10/13 12:27:11 pacho Exp $
+
+*plymouth-0.8.8-r3 (13 Oct 2013)
+
+  13 Oct 2013; Pacho Ramos <pacho@gentoo.org> +plymouth-0.8.8-r3.ebuild,
+  -plymouth-0.8.3-r5.ebuild, -plymouth-0.8.4.ebuild, -plymouth-0.8.8-r2.ebuild,
+  -plymouth-0.8.8.ebuild:
+  Install compat symlinks as some rdeps need them, drop old
 
   12 Oct 2013; Pacho Ramos <pacho@gentoo.org> plymouth-0.8.8-r2.ebuild:
   Fix install with static-libs (#487756 by Andrius Štikonas)
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index 29887fdf1492..dcbccd62a1dd 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -5,20 +5,15 @@ AUX 0.8.3-drm-reduce-minimum-build-requirements.patch 16071 SHA256 4a953c22c211f
 AUX 0.8.3-gentoo-fb-path.patch 804 SHA256 5496471c4ace51561054aadce35b7772ac65b54ace04329386d2b2dfc1ef8c8f SHA512 c3a06a0420bd629a55575651dc84745202baa539e55f8723eef4d87f58861776d3c4bc566c5d9d14b267ac32c484a2281416c60a5e2bf9c4b77972d43e44a0c4 WHIRLPOOL c0961c703a38f20e6ba0acbc162712c0c11f1b813ff68c171988b8e5643f5e46e55847c668f82c789e4d898f51699e4ad4caae9824ebbae53f4b512bd9b8c7a2
 AUX 0.8.3-image-replace-deprecated-libpng-function.patch 962 SHA256 37df9d046cfba685c6447a1f9360c941bf7b9e8dc80970d06486054d34c6fd86 SHA512 dbf4418d1a9dddcfcdd35a51cabd181dc04424f0d4c74962a9e865a9856531d6bbb74bb4b8870ae7fe571f03f55c853319f8c5374ff3994b9da8a2738bd7520c WHIRLPOOL 262d338d7d7ab8ec44c85fcf62324455ad59ffbc7778757ff922369900dad9dd0f6c70f6d3658753eeca00ce50b9a7c18111ad6ddefb5c4d5307d2a1c8856964
 DIST gentoo-logo.png 14501 SHA256 79ebc1d66693371a90e218ad421cfed05066b51a6645bd967bb7da356a0881fa SHA512 059a555931b6d2a910bcd887f5ea0cc17c6edf2d2d45c03a1fec1bdda0138ba6bca6bdf90a65c6520a3f8f1b51ecf6f7956098f45ed6c1276f29c835e729163c WHIRLPOOL 65496223badb9a96cc72ba6a2432860af0756eea57f67946d2466ff1c3c1171c84568c502aa576613b77767c41cf251856728b509c72003567d4cebd1943375e
-DIST plymouth-0.8.3.tar.bz2 763575 SHA256 2e51abbc087228f7910302334755d0190fc9e923eae9992150adb0f6cccc9077
-DIST plymouth-0.8.4.tar.bz2 1142933 SHA256 0e272163adf99dec9ad16bd6ad72a0610f19da8146d413f310e1b118a03b90d6 SHA512 56a3b03eaa89e5aa6bbf74e14b8f3b575e8cb1860ed4e4fa2607d9c03b225b8cb16a741d3a26b4087c4370f0bf624aad0dbe5ec1f8b167816a0a51c77c84d05a WHIRLPOOL 80702584499b5703ceb029e7e63d600ecae95a896a4853a74daedc85d2cac0b562092da813d9658e0026d5f35b681dc8aab47fdb14acef80b48add70dd05bc3d
 DIST plymouth-0.8.8.tar.bz2 1143549 SHA256 1bada4e1d3a31a5a99adc2db83f5452d9818839cda51a6e430f044f6281d759b SHA512 97a20a8622c7ea51000e9b6d88a25fd84d7001fb2727527a72344b555f389c74954bd0be0bffd9cc9175b5c5a0d28e95af058fce79ec7531f736619ee74d8d94 WHIRLPOOL badb44a6c1eb004772e67cfe3cda601d22590d813ebd4bce5f0fcb325c445246916ba30e083c6aa98b73b460ddf4f2caf9bf2727d22bbbc5414f11a5cf0e5ddf
-EBUILD plymouth-0.8.3-r5.ebuild 2474 SHA256 07eb45e5f874a4207ab9aa8a3278862ea3f61e3c37c8de1589d2f633090f093b SHA512 acd31d9913f1306d63903b876361c45db528f7f363b2967b92d4daa279719a66426c14a4ba8e12b31ee803132bde09f2bb02810c2d2169ca6f7742f9667b252c WHIRLPOOL 76848f5ebf96245123994f23a175f8e0c1754862adf4b17c884c0768d55443da41ee3083cd0af6344e88de44048439dcd1ceb324b7e1b1fea37a15bf9ce489aa
-EBUILD plymouth-0.8.4.ebuild 2364 SHA256 380d7844071228d2bf21a7d25f6d6c55898f9734f776fe6580b8f0ab2e570d22 SHA512 ef6074f2ce7f92ea2050348243335b3723378d5ec82e18254ba57d72469b78d68de23fad8502ffb23a05c70dc1325927da4e2d9f754ebb3977190fd68e93c772 WHIRLPOOL 45d94c37b4c1a65b0c4ae08c19c1f133a77841e2804fe87ccb9eb84cd7d4c36590f729e65cdbd43d965e721a44eb51f5b53d05e577c51186afc7e5a738e67d64
 EBUILD plymouth-0.8.8-r1.ebuild 2621 SHA256 d8562af29e6fea19f718f2c788a8710ff8ff6b3e6e84be6bf8c638ba53b87007 SHA512 7b0fa749e549d9b2780b35e8f0ed8fda834c7ec87f8143bb5d403f41ca292e32d070a9e53bf5a6c0c490b9668a610dbe921aa1031dbde3013494d0703cf5152c WHIRLPOOL 4601eb60a82b732dfca14956d2df71ff6b49f9cdef225b732b1833916469d0ded008bc862bcb523bf1637ee7ef9ed01696098fb81b584f2738c1048f5eaffd6a
-EBUILD plymouth-0.8.8-r2.ebuild 2635 SHA256 aa1f184cd71c9d4142eea9bb3c2d03dee383f98b2fa3deb042abec6b71861ab4 SHA512 0944e244140288d115a13f0a851d6a633eb4bed9194bb976adccd5c71a6fd41f1a1b2d463ba5daa71a4729894bbc8b6da993d18c21c27819cd4d864934cbc282 WHIRLPOOL e73c2d9841eba9495dbf889eab81c60ad74c3eec146f071540a437b57a23f173b9582e0dd4802b362af9d60165924d061a926950bf4202132a48c8037ec34873
-EBUILD plymouth-0.8.8.ebuild 2497 SHA256 7daea20505dba6250598403cd7063fff39768b8ff4cf0269aa83a0ea38afec4b SHA512 bad8f3126a36f47662de04c619e46b778e851a1ac10b559b740e240abb990d208d08a072a57f099018f4fd74e19d0225624ee706be25e2ba0c8aa1725568fcd8 WHIRLPOOL e621ae1bb8cc9f394c68f2dfacac978ca75266800288fc776fe9281f5207b47211f269190823d8aa448597d3ff20b10d18cb6c26a00ca8830e76fc35a0158efb
-MISC ChangeLog 8301 SHA256 6ca1dbd5a168e71f27662c02ade8629619aedcf5e3fa5fd0c244378c27e107d0 SHA512 bb6ce5a95224816e44bd29b2f3aa7ca79039b186bd6d028c08abb89e9e4f527cbefadec771579242c7291b07aadded1a41360cd808c4a70de91f68ad198998f2 WHIRLPOOL cb424dd7a562b71efa1e4350f077d0c303f171603d3f3a9636d306befe52a9eecfdf08c08b8b4bb7cd5bf07a7dd461fc14e866c2df331c0bb758fb288756f7ac
+EBUILD plymouth-0.8.8-r3.ebuild 2862 SHA256 18ece89a64d2a8f2bbb45118f8372c881d0ebc53aafab96bc8029ec8537bba1c SHA512 41697efdf9867662259ca4a9bf915fe6113cb9bf4608c3d78a5629e3d0f8167931656cde67e130f6d170549a1bc635e83d0486614829b46607d335559c7dc886 WHIRLPOOL 5d2787b86f2c212ad1a33b98983bc6a4109bce5ca1c00e6f52d88513d6c496a15cf27edf3c240ff5a00a3ea4d05d1b1f1e6d092f1247cf882ca1ed5b6924c03d
+MISC ChangeLog 8575 SHA256 1a7264e4b242cbb6b99ed5c860960f3c76cb2605a642c9c01d8e51ce07dac5fc SHA512 290bfaff4bf2c3ca1f23a92864869737005627ea0904870788b8e31a7a7616a4ef80dc8e38257557a9fe46749dd16f2887a603fcf0be7a4226d0393fde2ae63d WHIRLPOOL fe9bca35fbc4d41387aa9012bcd7173bae84daba0cec3845e80a2ded3ca6013c86265e4b4dddc795da7294b264170ce144cbf9684bb4e15e96f7b8eefc21f0e3
 MISC metadata.xml 1117 SHA256 a688227fea0f168af093909bc5870d0a33e197b61ca68b186e8ed30caf819f0d SHA512 13a1b46f94fa664c0ebaca92aa4886169d5dfa1ba8634d218da8c545f7e75416fee742c3bd11f68b4eb466a9b70963f0d67c0dfab4b28b9aa9d6f14b2f341b56 WHIRLPOOL e38b974636059ef13bfcdc2c097a591e99c509021bf15d544ac171c6d0ca8def5de1bea582fe6004237a6852c71e1006d7e7e6ec6891073df2efd049e94ae8b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJZMLIACgkQCaWpQKGI+9Q02wCfcBRH9DlN2qt+5RwKmZ1Haju1
-MMEAnjpzhJWKBelzxL1OSU7/hd/e+ByP
-=IW98
+iEYEAREIAAYFAlJakaAACgkQCaWpQKGI+9T1LwCfTSLISftGU5A2YvfnIYPU7X9P
+f6YAnRD4YrzHs1EWGoXGTxhQI+3orNf/
+=zkUE
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/plymouth/plymouth-0.8.3-r5.ebuild b/sys-boot/plymouth/plymouth-0.8.3-r5.ebuild
deleted file mode 100644
index d86da7542cb2..000000000000
--- a/sys-boot/plymouth/plymouth-0.8.3-r5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/plymouth-0.8.3-r5.ebuild,v 1.5 2012/05/03 04:50:13 jdhore Exp $
-
-EAPI="3"
-
-inherit autotools-utils
-
-DESCRIPTION="Graphical boot animation (splash) and logger"
-HOMEPAGE="http://cgit.freedesktop.org/plymouth/"
-SRC_URI="http://cgit.freedesktop.org/${PN}/snapshot/${P}.tar.bz2
-	http://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png
-	"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE_VIDEO_CARDS="video_cards_intel video_cards_nouveau video_cards_radeon"
-IUSE="${IUSE_VIDEO_CARDS} debug gdm +openrc +pango static-libs"
-
-COMMON_DEPEND=">=media-libs/libpng-1.2.16
-	>=x11-libs/gtk+-2.12:2
-	pango? ( >=x11-libs/pango-1.21 )
-	video_cards_intel? ( x11-libs/libdrm[video_cards_intel] )
-	video_cards_nouveau? ( x11-libs/libdrm[video_cards_nouveau] )
-	video_cards_radeon? ( x11-libs/libdrm[video_cards_radeon] )
-	"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-kernel/dracut-008-r1[dracut_modules_plymouth]
-	openrc? ( sys-boot/plymouth-openrc-plugin !sys-apps/systemd )
-	"
-
-DOCS=(AUTHORS ChangeLog NEWS README TODO)
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-drm-reduce-minimum-build-requirements.patch
-	"${FILESDIR}"/${PV}-image-replace-deprecated-libpng-function.patch
-	"${FILESDIR}"/${PV}-gentoo-fb-path.patch
-	)
-
-src_prepare() {
-	autotools-utils_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		$(use_enable debug tracing)
-		$(use_enable pango)
-		$(use_enable gdm gdm-transition)
-		$(use_enable video_cards_intel libdrm_intel)
-		$(use_enable video_cards_nouveau libdrm_nouveau)
-		$(use_enable video_cards_radeon libdrm_radeon)
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use static-libs; then
-		mv "${D}/$(get_libdir)"/libply{,-splash-core}.a \
-			"${D}/usr/$(get_libdir)"/ || die 'mv *.a files failed'
-		gen_usr_ldscript libply.so libply-splash-core.so
-	else
-		local la
-		for la in "${D}/usr/$(get_libdir)"/plymouth/{*.la,renderers/*.la}; do
-			einfo "Removing left ${la#${D}}"
-			rm "${la}" || die "rm '${la}'"
-		done
-	fi
-
-	insinto /usr/share/plymouth
-	newins "${DISTDIR}"/gentoo-logo.png bizcom.png || die 'branding failed'
-}
-
-pkg_postinst() {
-	elog "Follow instructions on"
-	elog ""
-	elog "  http://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml"
-	elog ""
-	elog "to set up Plymouth."
-}
diff --git a/sys-boot/plymouth/plymouth-0.8.4.ebuild b/sys-boot/plymouth/plymouth-0.8.4.ebuild
deleted file mode 100644
index f7c606bba470..000000000000
--- a/sys-boot/plymouth/plymouth-0.8.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/plymouth-0.8.4.ebuild,v 1.8 2013/02/02 23:11:45 ago Exp $
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="Graphical boot animation (splash) and logger"
-HOMEPAGE="http://cgit.freedesktop.org/plymouth/"
-SRC_URI="
-	http://www.freedesktop.org/software/plymouth/releases/${P}.tar.bz2
-	http://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE_VIDEO_CARDS="video_cards_intel video_cards_nouveau video_cards_radeon"
-IUSE="${IUSE_VIDEO_CARDS} debug gdm +libkms +openrc +pango static-libs"
-
-CDEPEND=">=media-libs/libpng-1.2.16
-	>=x11-libs/gtk+-2.12:2
-	libkms? ( x11-libs/libdrm[libkms] )
-	pango? ( >=x11-libs/pango-1.21 )
-	video_cards_intel? ( x11-libs/libdrm[video_cards_intel] )
-	video_cards_nouveau? ( x11-libs/libdrm[video_cards_nouveau] )
-	video_cards_radeon? ( x11-libs/libdrm[video_cards_radeon] )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	"
-RDEPEND="${CDEPEND}
-	>=sys-kernel/dracut-008-r1[dracut_modules_plymouth]
-	openrc? ( sys-boot/plymouth-openrc-plugin !sys-apps/systemd )
-	"
-
-DOCS=(AUTHORS README TODO)
-
-src_prepare() {
-	autotools-utils_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-system-root-install
-		--localstatedir=/var
-		$(use_enable debug tracing)
-		$(use_enable libkms)
-		$(use_enable pango)
-		$(use_enable gdm gdm-transition)
-		$(use_enable video_cards_intel libdrm_intel)
-		$(use_enable video_cards_nouveau libdrm_nouveau)
-		$(use_enable video_cards_radeon libdrm_radeon)
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use static-libs; then
-		mv "${D}/$(get_libdir)"/libply{,-splash-core}.a \
-			"${D}/usr/$(get_libdir)"/ || die 'mv *.a files failed'
-		gen_usr_ldscript libply.so libply-splash-core.so
-	else
-		local la
-		for la in "${D}/usr/$(get_libdir)"/plymouth/{*.la,renderers/*.la}; do
-			einfo "Removing left ${la#${D}}"
-			rm "${la}" || die "rm '${la}'"
-		done
-	fi
-
-	insinto /usr/share/plymouth
-	newins "${DISTDIR}"/gentoo-logo.png bizcom.png
-}
-
-pkg_postinst() {
-	elog "Follow instructions on"
-	elog ""
-	elog "  http://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml"
-	elog ""
-	elog "to set up Plymouth."
-}
diff --git a/sys-boot/plymouth/plymouth-0.8.8-r2.ebuild b/sys-boot/plymouth/plymouth-0.8.8-r3.ebuild
index 2ae4f26963fa..d1ae2a26ef4e 100644
--- a/sys-boot/plymouth/plymouth-0.8.8-r2.ebuild
+++ b/sys-boot/plymouth/plymouth-0.8.8-r3.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/sys-boot/plymouth/plymouth-0.8.8-r2.ebuild,v 1.2 2013/10/12 11:21:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/plymouth-0.8.8-r3.ebuild,v 1.1 2013/10/13 12:27:11 pacho Exp $
 
 EAPI=5
 
@@ -74,6 +74,11 @@ src_install() {
 	insinto /usr/share/plymouth
 	newins "${DISTDIR}"/gentoo-logo.png bizcom.png
 
+	# Install compatibility symlinks as some rdeps hardcode the paths
+	dosym /usr/bin/plymouth /bin/plymouth
+	dosym /usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme
+	dosym /usr/sbin/plymouthd /sbin/plymouthd
+
 	readme.gentoo_create_doc
 }
 
diff --git a/sys-boot/plymouth/plymouth-0.8.8.ebuild b/sys-boot/plymouth/plymouth-0.8.8.ebuild
deleted file mode 100644
index 6b5c150de6be..000000000000
--- a/sys-boot/plymouth/plymouth-0.8.8.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/plymouth-0.8.8.ebuild,v 1.1 2013/03/10 19:41:38 maksbotan Exp $
-
-EAPI=4
-
-inherit autotools-utils systemd toolchain-funcs
-
-DESCRIPTION="Graphical boot animation (splash) and logger"
-HOMEPAGE="http://cgit.freedesktop.org/plymouth/"
-SRC_URI="
-	http://www.freedesktop.org/software/plymouth/releases/${P}.tar.bz2
-	http://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE_VIDEO_CARDS="video_cards_intel video_cards_nouveau video_cards_radeon"
-IUSE="${IUSE_VIDEO_CARDS} debug gdm +gtk +libkms +openrc +pango static-libs systemd"
-
-CDEPEND=">=media-libs/libpng-1.2.16
-	gtk? ( dev-libs/glib
-	>=x11-libs/gtk+-2.12:2 )
-	libkms? ( x11-libs/libdrm[libkms] )
-	pango? ( >=x11-libs/pango-1.21 )
-	video_cards_intel? ( x11-libs/libdrm[video_cards_intel] )
-	video_cards_nouveau? ( x11-libs/libdrm[video_cards_nouveau] )
-	video_cards_radeon? ( x11-libs/libdrm[video_cards_radeon] )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	"
-RDEPEND="${CDEPEND}
-	>=sys-kernel/dracut-008-r1[dracut_modules_plymouth]
-	openrc? ( sys-boot/plymouth-openrc-plugin !sys-apps/systemd )
-	"
-
-DOCS=(AUTHORS README TODO)
-
-src_prepare() {
-	sed -i 's:/bin/systemd-tty-ask-password-agent:/usr/bin/systemd-tty-ask-password-agent:g' \
-		systemd-units/systemd-ask-password-plymouth.service.in || die \
-		'sed bin failed'
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-system-root-install
-		--localstatedir=/var
-		$(use_enable debug tracing)
-		$(use_enable gtk gtk)
-		$(use_enable libkms)
-		$(use_enable pango)
-		$(use_enable gdm gdm-transition)
-		$(use_enable video_cards_intel libdrm_intel)
-		$(use_enable video_cards_nouveau libdrm_nouveau)
-		$(use_enable video_cards_radeon libdrm_radeon)
-		$(use_enable systemd systemd-integration)
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use static-libs; then
-		mv "${D}/$(get_libdir)"/libply{,-splash-core}.a \
-			"${D}/usr/$(get_libdir)"/ || die 'mv *.a files failed'
-		gen_usr_ldscript libply.so libply-splash-core.so
-	fi
-
-	insinto /usr/share/plymouth
-	newins "${DISTDIR}"/gentoo-logo.png bizcom.png
-}
-
-pkg_postinst() {
-	elog "Follow instructions on"
-	elog ""
-	elog "  http://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml"
-	elog ""
-	elog "to set up Plymouth."
-}