Add Origin and EMF file format patch by Stephan Zevenhuisen, Universiteit Utrecht

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 276 insertions, 7 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 5aeb5a4f809a..a62a92148227 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/qtiplot
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.86 2011/12/22 15:45:25 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.87 2012/01/22 14:20:07 dilfridge Exp $
+
+*qtiplot-0.9.8.9-r1 (22 Jan 2012)
+
+  22 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +qtiplot-0.9.8.9-r1.ebuild, +files/qtiplot-0.9.8.9-origin-2.patch:
+  Add Origin and EMF file format patch by Stephan Zevenhuisen, Universiteit
+  Utrecht
 
 *qtiplot-0.9.8.9 (22 Dec 2011)
 
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index d5e33bd5316f..de13425ba973 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -19,6 +19,7 @@ AUX qtiplot-0.9.8.6-kde.patch 425 RMD160 428d0b2304b02e4e70264c4100be604bca0af1d
 AUX qtiplot-0.9.8.6-tamuanova.patch 894 RMD160 f71ef91129284035e378e55a60e61448ba914e04 SHA1 830b518e3ef63625df84363a8047417124f243b0 SHA256 8c4deccaf3fa09133ac6ae35327a73637dccff0a4edfaa427894a9c6592e7f4c
 AUX qtiplot-0.9.8.7-kde.patch 454 RMD160 dd38d3a9e4c1034fff061f7bc4e6ef95aa07ee10 SHA1 cc2734760b55a53c1cc7de89dd8de57ee7611565 SHA256 5cfe122907403ed1f766118934aa42eac05db41efabd0c6618df17af16e3aff1
 AUX qtiplot-0.9.8.8-system-gl2ps.patch 2436 RMD160 4ef13f2ff717759a882e91169bc81a167dc08b9e SHA1 cdbb846d85372720021b52c71f86e5230f913e32 SHA256 0787155b465aa6cdf4b2c12a87dd68e6b5aa2197b041b06a550023c1ca96c81c
+AUX qtiplot-0.9.8.9-origin-2.patch 1715 RMD160 15cef2683087f8b4f15dcb9798d7e6d0397ddd0a SHA1 9c0f4ee5c42367f2011826886f775ba1e1b5e5a7 SHA256 31b842536b4bb98e9bbe49cd0a86bae7639f108c09f5d8eecd4e159740b0ce3b
 DIST qtiplot-0.9.7.14.tar.bz2 8119824 RMD160 09bf50211c77159dad674fcab4f9772fe4267947 SHA1 3e31b2c3fea827a573da96fb50118e6d9cc33f4b SHA256 10edfe55651d0e82f87b10b53fe068cee54782d1df2cbf482a7bafcc27eb3d18
 DIST qtiplot-0.9.8.2.tar.bz2 8244887 RMD160 0ee5e9f5eb50c44b2666cf904ef7ff23850c4c0b SHA1 dd8d1003cee8767d4ba9e616e5263da1302c290d SHA256 f544a42a1b103c1fb8cf28f00313fc984fac6ed5d7748a511e726410612e2c02
 DIST qtiplot-0.9.8.3.tar.bz2 8195869 RMD160 864e45bd9e74f3dd7526c84d387ab88438c1ee70 SHA1 e5ffdd25f1f69611f3f39a0b22e8c23959ab51e1 SHA256 9c8b89c4b931db2d51a902cb74c87f14cdef4e0ab33127ae59196429ae3ab4a7
@@ -27,6 +28,7 @@ DIST qtiplot-0.9.8.5.tar.bz2 10399116 RMD160 56647644c8433fbe97b3d7f36a75919da5a
 DIST qtiplot-0.9.8.6.tar.bz2 10415560 RMD160 830c4bb911a0680771a078dfe1796b4cd6889397 SHA1 e8a5ea1e1fb0e87cf76985f63b25e263b03f5fa9 SHA256 3fef0e8796e6045aad5404b156bf1e125e9732a034cb3e61c58dcebd5079985f
 DIST qtiplot-0.9.8.7.tar.bz2 10439239 RMD160 8f56f2b92bc46a99ecddb68a521ffd72867ab079 SHA1 f143b6e1f240cf3ed6b6145e161c2839c093420f SHA256 2dd29616016fbb302ce8fb20080d86fc15fdeb69572a1c92bb46f21cd5ba0e39
 DIST qtiplot-0.9.8.8.tar.bz2 10437325 RMD160 400b958581bf75bdcea5cfb829ebebf842de345c SHA1 02801cdf31b543c0f5d7ef1b1f358f0738d93d48 SHA256 cc4c96aff68dd6124374f228eb3866c2f6d0cd478cfb9242b43fca012ecbb0c3
+DIST qtiplot-0.9.8.9-origin.patch.bz2 104708 RMD160 cbdd313f6054ecce19987be949b381c6210a3dad SHA1 632fbe607af7d2b1a903ef414ccadc4f425f9058 SHA256 e83d7212be0fadae31b14c8a86b655fdb3b7c7b8fc80b1e2d91eb0a7e96b1e99
 DIST qtiplot-0.9.8.9.tar.bz2 16202943 RMD160 6f78160aabc94fc8f01d4f5fb65f5cb4a718eae2 SHA1 73b17dd9195c3d86750d5f1f5bdd4d5483c5fe30 SHA256 a523ea259516d7581abaf2fe376507d152db32f71d88176cff18f5bc391b9ef0
 EBUILD qtiplot-0.9.7.14-r1.ebuild 5294 RMD160 1c7ed30f4a15a469fcd7153dd3d2b42c18069ed2 SHA1 911b55806849db16a2e8032606ac73ea4a2a79b1 SHA256 f90ab5b808466118e16d5ba23a2743b75270c881d1ee7553d374530d47e7f43f
 EBUILD qtiplot-0.9.8.2.ebuild 5401 RMD160 ec3aaa60bd9f48b4202980c86d41352cfa93ce1b SHA1 c698f5425ff1e3c613782cbc45a44e0a92ae3829 SHA256 860833f9f224c29cdcdbb081909803bb1df3ea8240a4cee2bed7614f8ee9b8a1
@@ -36,13 +38,24 @@ EBUILD qtiplot-0.9.8.5.ebuild 5331 RMD160 28fd64588c35cb641c64e9100bb0a4e749aa10
 EBUILD qtiplot-0.9.8.6.ebuild 5588 RMD160 c2ecf35156578918fc6bd92628af341e28a5d40f SHA1 dade73496bf579d3c18a1fc5e881cfedd8222432 SHA256 8e49b91599c4334a7a454ad07b30214783ff94dc63acd4892521d61e4e1ff5bd
 EBUILD qtiplot-0.9.8.7.ebuild 5561 RMD160 81e8cac2a30b289a957ff8f8770de9771a9eb858 SHA1 6bcb4900edf5bbe3e5b539e561ac6427aea09eb1 SHA256 bff735cd67a777db17882442cfc461588319b55e2c6244b83a6989e1c0f7ba65
 EBUILD qtiplot-0.9.8.8.ebuild 5605 RMD160 97def6b6c419cf44a9c5854a5c756b0d807a9ab0 SHA1 ef151e1241b4883a767fb644cfde44da20da7341 SHA256 a7568b7bceebd1ccc6a2955258e9eb86dee90a1eca69033cd181d4d852e3359d
+EBUILD qtiplot-0.9.8.9-r1.ebuild 5828 RMD160 7bc9ac6ef8efa970a3308c880c8b476f08e84fe7 SHA1 ef2f64fdf7514859590d373f7b80b4f5811fa10b SHA256 34d01c6de2bc632fe1d047a4650d693e67d1b3d9ca5fd724f3317087158be6c5
 EBUILD qtiplot-0.9.8.9.ebuild 5609 RMD160 e2cd1cbdc865c27ae49edc797e6c0c255be982d8 SHA1 3a1ec5ef3d671d651f869eec0852a1b8a6d87781 SHA256 eb2541d996b2fb1f407a47b16f83152d6022e71808871c23b462901625069c28
-MISC ChangeLog 20728 RMD160 b89f02eb74dcb6dc5f2177654d7eec023873110f SHA1 48d5ea29915d960570aae93c8b89e060a6c4cd84 SHA256 5f9bbc43518305a619d4f1c3cb8e9872135278754725b4aa704fbd0983aef0b3
+MISC ChangeLog 20981 RMD160 bd388eddedfc1bd0d7b218d417839acfb481f6d2 SHA1 aa64360a534161b05ea4bbfd4a698db250e39a04 SHA256 0f9b9f46861d4747cd0a23c8c220ebc72933a89341ba30a1bd7f111b0f96a675
 MISC metadata.xml 919 RMD160 d5a42a5872798c2f2f3a0c8ca241a15444a6f8b9 SHA1 1117f722c109e074538193ded0c6a5c5c8334dc7 SHA256 379fdffaca2a9a4769a8bfd3d6c38efca329faf1382b9e9013a2b1f4262a42ec
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk7zUKEACgkQgAnW8HDreRZ6nwCguoXw/Ff01boJRgBLTENGmyQG
-gQAAnjBn+pZsRd0kBoSg9C7v5nkJLzIs
-=BJh/
+iQIcBAEBCgAGBQJPHBtTAAoJENwGBM22xffeehMP/3Yakyom6vRpdBV+rwxZ+RhJ
+Gq0VAM7Lp7Fh8cYphXn8nAEmfZCgdW+3nQtEDwZ9xYS0wwEUl2b6Az2yi8cFAJ5R
+g394IOTLAUz7fHNpTVRFlKQ+mvoWtRU9AcSjBWDASwNuRswf1YwPE4gY1fsGDxMU
+qwKFAWWo6wRljqdBeS1TjCtxjXowX9PgAmRBsPGuxRcgJat9x6UZJSCRrsQ7FvRR
+08OZC/pbbmNgpGQ0X40wcAbd/V0fftyccQpvBVocDtV1jlzJMM3DisQggiIRswys
+uHdhRE1bEKcCq66x2jhqJ+cEPLeV/MJJ48cfqNz+XYHnlcQjoKVgGOizEY/WND/B
+5BLQbqot40HstyZ8wq6PqrMGJYeNUYceVlbjUXyiVen/KgviAbxmxly7yNm/1UyU
+tCSc7yF7DR81oHHdnqUKDIGf/SYy1URM5mNSbzWpr7yRUlUa5v0VGFeZlB93xs+J
+QTxtn9fSkOPAopPrTJiT3Y/YqZkVf0bgZcBETGkUfdqRWRsgULHJy+jIcJdSS2or
+CwqvYEThL5roYdSOEVxJfc8jCMP8ghq78shGkteTwwewvmkTg6A6trmRqkaQQa5f
+2DmFuvp5Ya/X7vRf3WM0fw0/keMH2DbJRBioxRnCyc0PHbOyx3hZEflOuoDIlGqM
+Nc3z8ZyYrspk+lladRn7
+=/qWi
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-origin-2.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-origin-2.patch
new file mode 100644
index 000000000000..2159977b99f2
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-origin-2.patch
@@ -0,0 +1,38 @@
+diff -ruN qtiplot-0.9.8.9-origin/qtiplot/exportEMF.pro qtiplot-0.9.8.9/qtiplot/exportEMF.pro
+--- qtiplot-0.9.8.9-origin/qtiplot/exportEMF.pro	2012-01-21 20:39:03.000000000 +0100
++++ qtiplot-0.9.8.9/qtiplot/exportEMF.pro	2012-01-21 20:32:45.000000000 +0100
+@@ -5,6 +5,7 @@
+ 
+ INCLUDEPATH	+= $$QWT_INCLUDEPATH
+ INCLUDEPATH	+= $$GSL_INCLUDEPATH
++INCLUDEPATH	+= /usr/include/libEMF
+ 
+ include(src/core/core.pri)
+ include(src/lib/libqti.pri)
+diff -ruN qtiplot-0.9.8.9-origin/qtiplot/qtiplot.pro qtiplot-0.9.8.9/qtiplot/qtiplot.pro
+--- qtiplot-0.9.8.9-origin/qtiplot/qtiplot.pro	2011-11-07 10:17:21.000000000 +0100
++++ qtiplot-0.9.8.9/qtiplot/qtiplot.pro	2012-01-21 20:44:11.000000000 +0100
+@@ -236,9 +236,9 @@
+ ###############################################################
+ 
+ TARGET		=	qtiplot
+-DESTDIR		=	../
++DESTDIR		=	./
+ LIBS		+=	../tmp/qtiplot/libFreeSoftwareQtiPlotExportEMF.a \
+ 				../tmp/qtiplot/libFreeSoftwareQtiPlotImportOPJ.a
+ 
+ include(src/plugins/exportEMF/exportEMF.pri)
+-include(src/plugins/OriginPlugin/OriginPlugin.pri)
+\ Kein Zeilenumbruch am Dateiende.
++include(src/plugins/OriginPlugin/OriginPlugin.pri)
+diff -ruN qtiplot-0.9.8.9-origin/qtiplot/src/plugins/exportEMF/exportEMF.pri qtiplot-0.9.8.9/qtiplot/src/plugins/exportEMF/exportEMF.pri
+--- qtiplot-0.9.8.9-origin/qtiplot/src/plugins/exportEMF/exportEMF.pri	2011-10-27 13:44:34.000000000 +0200
++++ qtiplot-0.9.8.9/qtiplot/src/plugins/exportEMF/exportEMF.pri	2012-01-21 20:51:34.000000000 +0100
+@@ -10,5 +10,5 @@
+ SOURCES		+=  src/plugins/exportEMF/exportEMF.cpp \
+ 				src/plugins/exportEMF/3rdparty/EmfEngine/src/EmfEngine.cpp \
+ 				src/plugins/exportEMF/3rdparty/EmfEngine/src/EmfPaintDevice.cpp
+-				
+-LIBS		+= -lgdi32
++
++LIBS		+= -lEMF
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild
new file mode 100644
index 000000000000..efc576e12a8f
--- /dev/null
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild,v 1.1 2012/01/22 14:20:07 dilfridge Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2"
+
+inherit eutils qt4-r2 fdo-mime python
+
+DESCRIPTION="Qt based clone of the Origin plotting package"
+HOMEPAGE="http://soft.proindependent.com/qtiplot.html
+	http://www.staff.science.uu.nl/~zeven101/qtiplot.html"
+SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2
+	http://dev.gentoo.org/~dilfridge/distfiles/${P}-origin.patch.bz2"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bindist doc mono latex python"
+
+LANGS="cn cz de es fr ja ro ru sv"
+for l in ${LANGS}; do
+	lu=${l/cz/cs}
+	lu=${lu/cn/zh_CN}
+	IUSE="${IUSE} linguas_${lu}"
+done
+
+# qwtplot3d much modified from original upstream
+# >=x11-libs/qwt-5.3 they are using trunk checkouts
+CDEPEND="
+	media-libs/libemf
+	x11-libs/qt-assistant
+	x11-libs/qt-gui
+	x11-libs/qt-opengl:4
+	x11-libs/qt-qt3support:4
+	|| ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 )
+	x11-libs/qt-svg:4
+	>=x11-libs/gl2ps-1.3.5[png]
+	>=dev-cpp/muParser-1.32
+	>=dev-libs/boost-1.35.0
+	dev-libs/quazip
+	media-libs/libpng
+	sci-libs/gsl
+	sci-libs/tamu_anova
+	latex? ( dev-tex/qtexengine )
+	mono? ( dev-dotnet/libgdiplus )"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	python? ( >=dev-python/sip-4.9 )
+	doc? (
+		>=app-text/docbook-sgml-utils-0.6.14-r1
+		>=app-text/docbook-xml-dtd-4.4-r2:4.4 )"
+
+RDEPEND="${CDEPEND}
+	python? ( dev-python/PyQt4[X] )"
+
+PATCHES=(
+	"${DISTDIR}/${P}-origin.patch.bz2"
+	"${FILESDIR}/${P}-origin-2.patch"
+	"${FILESDIR}/${PN}-0.9.8.8-system-gl2ps.patch"
+	"${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch"
+	"${FILESDIR}/${PN}-0.9.8.6-gold.patch"
+	"${FILESDIR}/${PN}-0.9.8.7-kde.patch"
+	)
+
+pkg_setup() {
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	local mylibs
+
+	qt4-r2_src_prepare
+
+	rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost} || die
+	sed \
+		-e "s:dll:static:g" \
+		-e "/INSTALLS/d" \
+		-i 3rdparty/qwtplot3d/*.pro
+
+	mylibs="${mylibs} -lquazip"
+	use mono && mylibs="${mylibs} $(pkg-config --libs libgdiplus)"
+
+	# Check build.conf for changes on bump.
+	cat > build.conf <<-EOF
+	# Automatically generated by Gentoo ebuild
+	isEmpty( QTI_ROOT ) {
+	  message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
+	}
+
+	MUPARSER_LIBS = \$\$system(pkg-config --libs muparser)
+	GSL_LIBS = \$\$system(pkg-config --libs gsl)
+	QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src
+	QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
+	QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include
+	QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
+	SYS_LIBS = -lgl2ps ${mylibs}
+
+	PYTHON = python
+	LUPDATE = lupdate
+	LRELEASE = lrelease
+
+	SCRIPTING_LANGS += muParser
+
+	CONFIG          += release
+	CONFIG          += CustomInstall
+	DEFINES         += SCRIPTING_CONSOLE
+
+	EOF
+
+	use bindist && echo "DEFINES         += QTIPLOT_SUPPORT" >> build.conf
+	use bindist || echo "DEFINES         += QTIPLOT_PRO" >> build.conf
+	use python && echo "SCRIPTING_LANGS += Python" >> build.conf
+	use latex && echo "TEX_ENGINE_LIBS = -lQTeXEngine" >> build.conf
+	echo "LIBPNG_LIBS = -lpng" >> build.conf
+	echo "TAMUANOVA_LIBS = -ltamuanova" >> build.conf && \
+	echo "TAMUANOVA_INCLUDEPATH = \"${EPREFIX}/usr/include/tamu_anova\"" >> build.conf
+
+	sed \
+		-e "s:doc/${PN}/manual:doc/${PN}/html:" \
+		-e "s:/usr/local/${PN}:${EPREFIX}$(python_get_sitedir)/qtiplot:" \
+		-e '/INSTALLS.*documentation/d' \
+		-e '/INSTALLS.*manual/d' \
+		-e "/INSTALLBASE/s: /usr: ${EPREFIX}/usr:g" \
+		-e 's:/usr/local/qtiplot:$$INSTALLBASE:g' \
+		-i qtiplot/qtiplot.pro || die
+
+	sed \
+		-e "/^target.path/s:/usr:${EPREFIX}/usr:g" \
+		-i fitPlugins/*/*.pro || die
+
+	sed -e '/manual/d' -i qtiplot.pro || die
+
+	sed -e "s:QTIPLOT_PRO:QTIPLOT_PROFESSIONAL:g" -i qtiplot/src/core/main.cpp || die
+
+	# Drop langs only if LINGUAS is not empty
+	if [[ -n ${LINGUAS} ]]; then
+		for l in ${LANGS}; do
+			lu=${l/cz/cs}
+			lu=${lu/cn/zh_CN}
+			use linguas_${lu} || \
+				sed -e "s:translations/qtiplot_${l}.[tq][sm]::" \
+						-i qtiplot/qtiplot.pro || die
+		done
+	fi
+	chmod -x qtiplot/qti_wordlist.txt
+
+	# sed out debian paths
+	sed -e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \
+		-i manual/qtiplot.dsl || die
+	sed -e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \
+		-i manual/qtiplot_html.xsl || die
+
+	sed \
+		-e '1i#define OF(x) x' \
+		-i 3rdparty/zlib/minigzip.c || die
+}
+
+src_configure() {
+	use amd64 && export QMAKESPEC="linux-g++-64"
+	eqmake4
+}
+
+src_compile() {
+	emake || die "emake failed"
+	lrelease qtiplot/qtiplot.pro || die
+	if use doc; then
+		cd manual
+		emake web || die "html docbook building failed"
+	fi
+}
+
+src_install() {
+	qt4-r2_src_install
+	newicon qtiplot_logo.png qtiplot.png
+	make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot
+	if use doc; then
+		insinto /usr/share/doc/${PN}/html
+		doins -r manual/html/* || die "install manual failed"
+	fi
+
+	if [[ -n ${LINGUAS} ]]; then
+		insinto /usr/share/${PN}/translations
+		for l in ${LANGS}; do
+			lu=${l/cz/cs}
+			lu=${lu/cn/zh_CN}
+			use linguas_${lu} && \
+				doins qtiplot/translations/qtiplot_${l}.qm
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		elog "You might want to emerge"
+		elog "\t dev-python/pygsl"
+		elog "\t dev-python/rpy"
+		elog "\t sci-libs/scipy and"
+		elog "\t dev-python/sympy"
+		elog "to gain full python support."
+	fi
+
+	fdo-mime_desktop_database_update
+	use python && python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_cleanup ${PN}
+}