Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

8 files changed, 3 insertions, 327 deletions

diff --git a/media-video/projectx/Manifest b/media-video/projectx/Manifest
index 9f26d82d749b..50317a97f1c5 100644
--- a/media-video/projectx/Manifest
+++ b/media-video/projectx/Manifest
@@ -1,18 +1,12 @@
 AUX build-0.90.4.00_p33.xml 2026 BLAKE2B fd29c13f89695542d16908aae974b17faf52dd0a663954f54a94a8c8cf1c673ae26276a3f94e812461ac0b336db7c0f8a3fa87110b099eed210eca488535e644 SHA512 6fbe6fdb00f814c5fa72dc52542c3d9950ff4229939090161a208c0013ec0e2867ff6fc656249f2de68c58a26ef2bd059ffe767be1498318a8cb9eddadbb72ea
-AUX build-0.91.0.10.xml 2026 BLAKE2B fd29c13f89695542d16908aae974b17faf52dd0a663954f54a94a8c8cf1c673ae26276a3f94e812461ac0b336db7c0f8a3fa87110b099eed210eca488535e644 SHA512 6fbe6fdb00f814c5fa72dc52542c3d9950ff4229939090161a208c0013ec0e2867ff6fc656249f2de68c58a26ef2bd059ffe767be1498318a8cb9eddadbb72ea
 AUX projectx-0.90.4.00_p33-bl2.patch 515 BLAKE2B d90acfe7f28fc6fe0d2c21ee2f5a40a41f37be4826c9d49ea731119e9eb7db4fa64ddcbd77c4093bf75b00b42654d1b7fa30226793bba356fa54a914bccfb797 SHA512 0538f36fed3bb26badea0e38d350717851395274d960b63469198c1ab6ac33e70eb517cbe5281017f8233237c7235eeff58842493476d536beb99727c623fde3
 AUX projectx-0.90.4.00_p33-idctfast.patch 1069 BLAKE2B 0522d6934f4e0f44f180211ca1210f79d2dbac4b726ab92199e76aa1172949a48847260d7445071a2ac8441f901350ab96dc03da9109e281a70decd1ac22d30a SHA512 696241ab0589132a8286de50a384aff626275aad971429f6a7bef51d912cde31da03eb47f68a001479001cc31c33d1f1670a883900097f9c569e7f4fa4b395ae
 AUX projectx-0.90.4.00_p33-stdout-corrupt.patch 358 BLAKE2B 8a7634c660e3d5a3405372af81479d890201ebdcae3fe08375736e4e19a9f7c38f1dccbec6f782f9b97fdfd74ec3a0790d669ebdde46776fba4a35eb56b7bc1e SHA512 b3d6a5c278929c6e6cd60c76a708b5df6cfa0f3772725ddcd6a9334aa5d91c3f2fefc9162381456f4594bd7ffdbf041177968feda82ca513dc9fbd53bc5b23ca
 AUX projectx-0.90.4.00_p33-xdg.patch 1062 BLAKE2B 21b55ea40b37a975f53bd5b65cc3c95236c966901578254bac7471c3ac2181ead24dc3e369966ae6e10e0b8f93ecc714f3885983d929c079caaf34908f3970b2 SHA512 661c2577d83845464ae1669b401780ddc312857292e97c962f8fe52463d543b920e66b8ce779193b4ffa66a522f771d78861606ad1f7c915f4ce51fdbeefb3a0
-AUX projectx-0.91.0.10-bl2.patch 535 BLAKE2B aeeba4ee7d33c77c64563e48005260c68d5f3da6f126df4d2c0ea3be7276748be944cb80705110dcad0cb5410bfcb084add24ff01d98bc098b690a1012359412 SHA512 88f8602ed85760c5be7ff3db2ce4347cc13c0d440d97c1a878bbef9ba62f7bf5c763c901384615db92cc63755c6534f730b32d253bea18f913d92d6503884427
-AUX projectx-0.91.0.10-idctfast.patch 1089 BLAKE2B 9dbef016e8ce6ac93f8554fe0414191434ac9364ddb51dafb9505c125a887e72dcd38e58f6eecd8595f9b735f099592730debf7948f97927ca3930c30731fa62 SHA512 309beac4a582a3abe25a4f28acf2a69d55f3a7824a18d845a2c46cfb3a05bd1fba1021a01da396eb395a633cc999a96527d53654b2b8cf3c5f87add9ebc2e24d
-AUX projectx-0.91.0.10-stdout-corrupt.patch 378 BLAKE2B 7a92d7c16688e75e6d0510a93a02ac52fec7aec83ea768b70011d5dc8016c7f31cb4194bfd44f6696b6067c0c4fd179e03bf922d49358846b62c33914641128c SHA512 22f859c66d723f501002ca507a3a246716adf584d94d84fbb75b870b3418d93f073b6f46495232a9a9215007283e0acbe21871a4af74695dcbd0fc3a3ecbb2f3
-AUX projectx-0.91.0.10-xdg.patch 1082 BLAKE2B 331e818365afb4aa09a4c6cc4498a674100720cdb76248662d8786cbc14ebcc8cd98a828683b56fd4da44333dc6249bfec1ede3ee861d6719f752954d58d58db SHA512 f41700446a6ff32a95a95f1388aaefdeb9cb3e22a77841ef7ae42e85d0d267d8e4c4581dc0923f98d94de9aaacc7283583554693003c81018ee2a876e02beb58
 DIST projectx-0.91.0.10.tar.xz 830104 BLAKE2B 511481dd2c391a6a26acfa0603f1c221d013d334593cf8ce6da0cf09505387424e58772705e17f9e90da546c43ce5aad313723aafd36063c5cd4a46d93634f86 SHA512 681dae4fd368a00a7ada37f8e64271c838a9c3737008b6fcd7f74679ca9fdf2cce140b0627a4c77a9a00baea76659bad0d2d710511b66026f9597ad153a2e725
 DIST projectx-icon.png 1692 BLAKE2B 6da85b69961b81f64638b04860b467e8cf599287513d85157aa71e4575003b8ef6e96cbe4b0b40b54bb15b6ca74c14f4bf1855c80f1f6db89294567a77f9e151 SHA512 33d9e505140d2dd22d34f87ebff040530130bbb7d1e9958d7345f442bd3d6e17dff8d243e22f374217aed20139871e406e46ca6f03ca48eb338dc3630af2417a
 DIST projectx-idctfast.tar.xz 12444 BLAKE2B e4b2a6ab235601dbdd1acf8a73a14fecb5da455670bad52598e0dbd8a7300305fad1b22b3d550dd046dcac68975af4b225e042f7c968ce9108f702d01586302f SHA512 85dd6dd0011c166aaefd47a47c4455dda68ba6da65c9eda5a996f7d078ce3900168714c0c72c6250f7b99181fda84c6d81e3afb392ace9c12c3c5690de01c1d8
 DIST xdg-20100731.java.xz 648 BLAKE2B 8bd082c445d64051c65c66e8a22b61e582d04f1f650e3b15ee2f3400d47b10f137d245bd8a7633d96299e2c688f7bf836b59a4dd49ea3c181684a78fa55304c3 SHA512 8b5d8e695f3f052f889002dc93742da8ba9eada173cb10ad1db525e1ad89d1c8f44200d79dc02068ccf93fdbf2e8daa5bb359dae77bacbc89cb6d4895732774b
-EBUILD projectx-0.91.0.10-r1.ebuild 3247 BLAKE2B 0862bf4c67c52db190f7467d9f0cabeef8f94935c58922a061c99eeee6ebe5203bbc6bfaddf49f1cec39f9f8dac4077567f32e8360216c9b4cf6fcdbe1fdecb0 SHA512 dea0f5b71dc67be9837ab7da025631918bd485f9d6003e0e88864e949a4970cb904474a4de12ee50d95856a9153548cfa42c437ce4c89091727439c4429e6fe5
-EBUILD projectx-0.91.0.10-r2.ebuild 3280 BLAKE2B ee6a8b69281992f88cfe43d542c83ba095704ba6f949efa1ab308ebe6c470446332071e1c2a516c5cffc6cc32ef3a891e25bd0b18e2f62d5abd556f7438a73f6 SHA512 fcd8c4926920ae05663cf62f91da13d0390fb578f0ba7fcc6b8f3cf2fe821b5393a4efb0aedc28ecfe90aa2ad9c8683c6763abd01ecfa3d4a76e2dabdf87289d
+EBUILD projectx-0.91.0.10-r1.ebuild 3251 BLAKE2B c5d61bbf276c7186dde2bf817f68f7fcc83c96218d397a5c4c5f31791f6a4a900fc3f959b6e4abd64df73384dd29abca7094b388def55b956a3a1cb2a2d75ac0 SHA512 fba239114105423fa1a9910121d1231d3e9c20f97d57f6a5ef356ebffdb92c3575768007a7030b75b648c861d8fe61c53cfde8d782a89d63fdfc8a2796fbe2f4
 EBUILD projectx-0.91.0.10.ebuild 3222 BLAKE2B 51c2e3239304bdde3556f24a10a3b4e5bedbdfe14950dd792879f8da972fde7dadd005e1b629eb322968b82971a2dec0a59bc19efcb1e3860081146b90e7515b SHA512 8ba93b3cb9bd02b79bb004dcb31741ca9b165650f5e9e3dcb704df4fca9c8f66b95f0bc307b54a0be6f417630579c6fb0ed89d14fb762433d5dd1481ebfc1009
 MISC metadata.xml 742 BLAKE2B 5aacc52def6d49258139e9435aa1db4f2295a07e4491a921db142c262c84a3deaaf8b9b22d7bc68dcd00ee142cb4f9912463f4ab2fb79eae74ea461375b1467c SHA512 3a5546c1efbafa335ee5d05ff24c2b22f0f49d8944e242348bef9627ac5e72205d9bd3e697b3d89c7d0ef3e34d98fe19b58c021f41bcaff872c74373a6803341
diff --git a/media-video/projectx/files/build-0.91.0.10.xml b/media-video/projectx/files/build-0.91.0.10.xml
deleted file mode 100644
index f35638733b13..000000000000
--- a/media-video/projectx/files/build-0.91.0.10.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="projectx" default="jar">
-	<!-- some properties -->
-	<property name="src.dir" value="src" />
-	<property name="build.dir" value="build" />
-	<property name="docs.dir" value="apidocs" />
-	<property name="dist.dir" value="dist" />
-	<property name="lib.dir" value="lib" />
-	<property name="resources.dir" value="resources" />
-	<property name="project.jar" value="${dist.dir}/${ant.project.name}.jar" />
-	<property name="target.jdk" value="1.5" />
-
-	<!-- classpath -->
-	<path id="refcp">
-		<fileset dir="${lib.dir}">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-	
-	<!-- init -->
-	<target name="init">
-		<mkdir dir="${dist.dir}" />
-		<mkdir dir="${docs.dir}" />
-		<mkdir dir="${build.dir}" />
-	</target>	
-
-	<!-- compile everything -->
-	<target name="compile" depends="init">
-		<javac srcdir="${src.dir}"
-			destdir="${build.dir}"
-			source="${target.jdk}"
-			target="${target.jdk}"
-			classpathref="refcp"
-			encoding="ISO-8859-1"/>
-		<copy todir="${build.dir}">
-			<fileset dir="${resources.dir}" />
-		</copy>
-	</target>
-
-	<!-- build the jar files -->
-	<target name="build" depends="compile">
-		<jar jarfile="${project.jar}" basedir="${build.dir}">
-			<manifest>
-				<attribute name="Main-Class" value="${manifest.mainclass}" />
-			</manifest>
-		</jar>
-	</target>
-	
-	<!-- generate javadocs -->
-	<target name="javadoc" depends="init">
-		<javadoc sourcepath="${src.dir}"
-			packagenames="*"
-           		destdir="${docs.dir}"
-           		author="true"
-           		version="true"
-			use="true"
-			charset="UTF-8"
-			encoding="ISO-8859-1"
-           		windowtitle="${ant.project.name} API" />
-	</target>
-	
-	<!-- clean up -->
-	<target name="clean">
-		<delete dir="${build.dir}" />
-		<delete dir="${docs.dir}" />
-		<delete dir="${dist.dir}" />
-	</target>
-
-        <!-- zip the sources -->
-        <target name="sourcezip">
-		<zip destfile="${dist.dir}/${ant.project.name}-src.zip">
-                        <zipfileset dir="${src.dir}" />
-                </zip>
-        </target>
-
-</project>
diff --git a/media-video/projectx/files/projectx-0.91.0.10-bl2.patch b/media-video/projectx/files/projectx-0.91.0.10-bl2.patch
deleted file mode 100644
index 3799c15e19cb..000000000000
--- a/media-video/projectx/files/projectx-0.91.0.10-bl2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Project-X/src/net/sourceforge/dvb/projectx/gui/Html.java	2006-11-25 22:28:52.000000000 +0100
-+++ Project-X/src/net/sourceforge/dvb/projectx/gui/Html.java	2007-06-10 13:37:59.000000000 +0200
-@@ -159,9 +159,10 @@
- 		{
- 			try 
- 			{
--				BrowserLauncher.openURL(u.toString());
-+				BrowserLauncher launcher = new BrowserLauncher();
-+				launcher.openURLinBrowser(u.toString());
- 			} 
--			catch (IOException e) 
-+			catch (Exception e) 
- 			{
- 				Common.setMessage(Resource.getString("msg.browser.launcher.error") + " " + e);
- 			}
diff --git a/media-video/projectx/files/projectx-0.91.0.10-idctfast.patch b/media-video/projectx/files/projectx-0.91.0.10-idctfast.patch
deleted file mode 100644
index 84b7893c835f..000000000000
--- a/media-video/projectx/files/projectx-0.91.0.10-idctfast.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- Project-X/src/net/sourceforge/dvb/projectx/video/MpvDecoder.java	2009-12-31 15:24:13.000000000 +0100
-+++ Project-X/src/net/sourceforge/dvb/projectx/video/MpvDecoder.java	2010-07-31 14:32:19.945223425 +0200
-@@ -72,7 +72,7 @@
- 
- public class MpvDecoder extends Object {
- 
--	private IDCTRefNative idct;
-+	private IDCTFast idct;
- 	private IDCTSseNative idctsse;
- 
- 	private int preview_horizontal_size = 512;
-@@ -134,13 +134,13 @@
- 	{
- 		Arrays.fill(pixels2, 0xFF505050);
- 
--		idct = new IDCTRefNative();
-+		idct = new IDCTFast();
- 		idctsse = new IDCTSseNative();
- 
--		if (IDCTRefNative.isLibraryLoaded())
-+		if (IDCTFast.isLibraryLoaded())
- 			idct.init();
- 
--		if (IDCTRefNative.isLibraryLoaded() || IDCTSseNative.isLibraryLoaded())
-+		if (IDCTFast.isLibraryLoaded() || IDCTSseNative.isLibraryLoaded())
- 			acceleration = true;
- 	}
- 
-@@ -2407,7 +2407,7 @@
- 			}
- 		}
- 
--		else if (IDCTRefNative.isLibraryLoaded() && isAccelerated())
-+		else if (IDCTFast.isLibraryLoaded() && isAccelerated())
- 		{
- 			/* copy or add block data into picture */
- 			for (comp=0; comp<block_count; comp++)
diff --git a/media-video/projectx/files/projectx-0.91.0.10-stdout-corrupt.patch b/media-video/projectx/files/projectx-0.91.0.10-stdout-corrupt.patch
deleted file mode 100644
index 7ea802019793..000000000000
--- a/media-video/projectx/files/projectx-0.91.0.10-stdout-corrupt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Project-X/src/net/sourceforge/dvb/projectx/common/GuiInterface.java	2008-12-04 01:47:03.000000000 +0100
-+++ Project-X/src/net/sourceforge/dvb/projectx/common/GuiInterface.java	2008-12-04 02:21:11.342918380 +0100
-@@ -190,7 +190,7 @@
- 			impl.updateProgressBar(percent);
- 
- 		else
--			System.out.print("\r" + percent + " %");
-+			System.out.print(percent + " %");
- 	}
- 
- 	/**
diff --git a/media-video/projectx/files/projectx-0.91.0.10-xdg.patch b/media-video/projectx/files/projectx-0.91.0.10-xdg.patch
deleted file mode 100644
index fcb8b0e67e39..000000000000
--- a/media-video/projectx/files/projectx-0.91.0.10-xdg.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- Project-X/src/net/sourceforge/dvb/projectx/common/Settings.java	2008-02-18 19:34:48.000000000 +0100
-+++ Project-X/src/net/sourceforge/dvb/projectx/common/Settings.java	2010-07-31 19:44:59.151224244 +0200
-@@ -46,6 +46,8 @@
- import java.util.Set;
- import java.util.TreeMap;
- 
-+import xdg.*;
-+
- import net.sourceforge.dvb.projectx.xinput.XInputDirectory;
- 
- /**
-@@ -56,7 +58,7 @@
- public class Settings extends Object {
- 
- 	/** the default ini filename */
--	private static final String DEFAULT_INI = "X.ini";
-+	private static final String DEFAULT_INI = "Project-X.ini";
- 
- 	/** the current ini filename */
- 	private String inifile = "";
-@@ -75,7 +77,7 @@
- 	 */
- 	public Settings()
- 	{
--		this(Resource.workdir + Resource.filesep + DEFAULT_INI);
-+		this(xdg.config_home() + Resource.filesep + DEFAULT_INI);
- 	}
- 
- 	/**
-@@ -161,6 +163,7 @@
- 			str = inifile;
- 
- 		try {
-+			xdg.mkdirs_file(str);
- 			PrintWriter w = new PrintWriter(new FileWriter(str));
- 
- 			String base_key = "# Project-X INI";
-@@ -714,4 +717,4 @@
- 		return inifile;
- 	}
- 
--}
-\ Kein Zeilenumbruch am Dateiende.
-+}
diff --git a/media-video/projectx/projectx-0.91.0.10-r1.ebuild b/media-video/projectx/projectx-0.91.0.10-r1.ebuild
index 28b9987cb4dd..930ed27128ca 100644
--- a/media-video/projectx/projectx-0.91.0.10-r1.ebuild
+++ b/media-video/projectx/projectx-0.91.0.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="X cpu_flags_x86_mmx cpu_flags_x86_sse"
 
 COMMON_DEP="dev-java/commons-net:0
diff --git a/media-video/projectx/projectx-0.91.0.10-r2.ebuild b/media-video/projectx/projectx-0.91.0.10-r2.ebuild
deleted file mode 100644
index 664b3f10673d..000000000000
--- a/media-video/projectx/projectx-0.91.0.10-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit desktop eutils java-pkg-2 java-ant-2 toolchain-funcs xdg
-
-XDG_P="xdg-20100731"
-
-DESCRIPTION="Converts, splits and demuxes DVB and other MPEG recordings"
-HOMEPAGE="http://project-x.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.xz
-	https://dev.gentoo.org/~billie/distfiles/${PN}-idctfast.tar.xz
-	https://dev.gentoo.org/~billie/distfiles/${XDG_P}.java.xz
-	https://dev.gentoo.org/~billie/distfiles/${PN}-icon.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="X cpu_flags_x86_mmx cpu_flags_x86_sse"
-
-COMMON_DEPEND="
-	dev-java/commons-net:0
-	X? ( dev-java/browserlauncher2:1.0 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	>=virtual/jre-1.5
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=virtual/jdk-1.5
-	app-arch/xz-utils
-	virtual/libiconv
-"
-
-S="${WORKDIR}/Project-X"
-
-mainclass() {
-	# read Main-Class from MANIFEST.MF
-	sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" || die
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	local X
-
-	# apply stdout corruption patch (zzam@gentoo.org)
-	eapply "${FILESDIR}/${PN}-0.91.0.10-stdout-corrupt.patch"
-
-	# apply BrowserLauncher2 patch
-	use X && eapply "${FILESDIR}/${PN}-0.91.0.10-bl2.patch"
-	rm -rf src/edu || die
-
-	# apply IDCTFast patch
-	eapply "${FILESDIR}/${PN}-0.91.0.10-idctfast.patch"
-
-	# apply XDG patch
-	cp -f "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java" || die
-	eapply "${FILESDIR}/${PN}-0.91.0.10-xdg.patch"
-
-	# copy build.xml
-	cp -f "${FILESDIR}/build-0.91.0.10.xml" build.xml || die
-
-	# patch executable and icon
-	sed -i -e "s:^\(Exec=\).*:\1${PN}_gui:g" \
-		-e "s:^\(Icon=\).*:\1${PN}:g" *.desktop || die
-
-	# convert CRLF to LF
-	edos2unix *.txt MANIFEST.MF
-
-	# convert docs to utf-8
-	if [ -x "$(type -p iconv)" ]; then
-		for X in zutun.txt; do
-			iconv -f LATIN1 -t UTF8 -o "${X}~" "${X}" && mv -f "${X}~" "${X}" || die
-		done
-	fi
-
-	# merge/remove resources depending on USE="X"
-	if use X; then
-		mv -f htmls resources/ || die
-	else
-		rm -rf src/net/sourceforge/dvb/projectx/gui || die
-		rm resources/*.gif || die
-	fi
-
-	# update library packages
-	cd lib || die
-	rm -f {commons-net,jakarta-oro}*.jar || die
-	java-pkg_jar-from commons-net
-	use X && java-pkg_jar-from browserlauncher2-1.0
-	java-pkg_ensure-no-bundled-jars
-}
-
-src_compile() {
-	local IDCT="idct-mjpeg"  # default IDCT implementation
-	if use x86 || use amd64; then
-		use cpu_flags_x86_mmx && IDCT="idct-mjpeg-mmx"
-		use cpu_flags_x86_sse && IDCT="idct-mjpeg-sse"
-	fi
-
-	eant build $(use_doc) -Dmanifest.mainclass=$(mainclass)
-
-	cd lib/PORTABLE || die
-	emake CC=$(tc-getCC) IDCT="${IDCT}" LDFLAGS="${LDFLAGS}" \
-		CPLAT="${CFLAGS} -O3 -ffast-math -fPIC"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_doso lib/PORTABLE/libidctfast.so
-
-	java-pkg_dolauncher ${PN}_cli --main $(mainclass) \
-		--java_args "-Djava.awt.headless=true -Xmx256m"
-
-	if use X; then
-		java-pkg_dolauncher ${PN}_gui --main $(mainclass) \
-			--java_args "-Xmx256m"
-		dosym ${PN}_gui /usr/bin/${PN}
-		newicon "${DISTDIR}/${PN}-icon.png" "${PN}.png"
-		domenu *.desktop
-	else
-		dosym ${PN}_cli /usr/bin/${PN}
-	fi
-
-	dodoc *.txt
-	use doc && java-pkg_dojavadoc apidocs
-	use source && java-pkg_dosrc src
-}