diff options
Diffstat (limited to 'app-office/lyx')
-rw-r--r-- | app-office/lyx/Manifest | 10 | ||||
-rw-r--r-- | app-office/lyx/files/lyx-2.3.6.1-python.patch | 50 | ||||
-rw-r--r-- | app-office/lyx/files/lyx-prefer-xdg-open.patch | 60 | ||||
-rw-r--r-- | app-office/lyx/lyx-2.4.1.ebuild (renamed from app-office/lyx/lyx-2.4.0_rc4.ebuild) | 6 | ||||
-rw-r--r-- | app-office/lyx/lyx-2.4.2.1.ebuild (renamed from app-office/lyx/lyx-2.3.7.ebuild) | 148 |
5 files changed, 73 insertions, 201 deletions
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest index 84d512de0c4a..0c90ade81c16 100644 --- a/app-office/lyx/Manifest +++ b/app-office/lyx/Manifest @@ -1,9 +1,7 @@ -AUX lyx-2.3.6.1-python.patch 2294 BLAKE2B 1980fe19607577d6b7462aaa4a049a41cbc329e881889cdee673df1bf57d7ab0dbfb8bd9aa705e23a88b1c195bd660f04efb519c9371167939e946c099b7784d SHA512 6f41de389bce14d8ef1c695268f6d6540276fe44d4871a14458f7ef38e6b4f4cb90877310d82df5550d537f39f65eded489722de24eb99ea6d83d8ec92dd7b71 AUX lyx-2.4.0-fix-hunspell.patch 780 BLAKE2B 04c8373fa29e7a1d40901d83104832fe01ca96fca25a99f19d472cfb0387145b14c124fa44a6d2710f0d35e4dc7061c8935b1e03378154de85c2e4c4079269f9 SHA512 992c21e8d3e30bf2c14c006e19c969e93f447a12f0080bf59238ccc66967938fd10fa35387ab3943f0d39ab132b330876e7cf207e49c6ab174a731a2dc4f4ef3 AUX lyx-2.4.0-prefer-xdg-open.patch 3138 BLAKE2B 95dd25064876a6ab58649249f0a42035bfdb6c91524dc7b6031017eb911efe7534c267e178b0dac26d0090409245962d153f81db3dd28785b11576e988ecef12 SHA512 e2f5a0484742af079bc69aff3056dd2d3afe8f952fd342f3e5da8445894bd8d6c60a575079bdee61a378ce20adba7e31e1e6a5cb6c2b00ba3b7d0b161c55ef12 -AUX lyx-prefer-xdg-open.patch 3470 BLAKE2B f989c3455d4cfb332d36edbca9b3bcc0208709d361696f04bdd565ea455104d1809877bdb85a362e950c2d48159c52d9a1a69c92d79f075269cfc9ccfceee4d7 SHA512 d17a2af0d75b6dcca06c1d31e615b814df3e75c3039c7ff5a14ab270b7cb75ab6f42ec851db7c804c90b7724a95eeec02d74de5c7511523c8400f0d50c2c0ce3 -DIST lyx-2.3.7-1.tar.xz 16158416 BLAKE2B 6041280ab0cd4dfa3c10e8ae01253ff657b4ac9ffe4cf61a3a2459b7aef152a7daf8ae306a09aaece799b6e7b6b15bc1aff62ab0f5d46508fbd79fd3e0b1c45b SHA512 b8aaefb68993032354fea3c6fd87d6da161395c92b5def4ecf92a7d6873ec59e01cdfb45c51ae1aaa62aa54db8e100b00ff9c2c9e0f1307c2f46860cd8c6eefe -DIST lyx-2.4.0~RC4.tar.xz 17785100 BLAKE2B 15d3785934045e9e3f39426d7a48ae4b200b64f28dc953b69c9b1b6f7c3e6cfe163aeaaaccbea9bb3b89c321a95f3162bab5869a290e4d4be2658bc39d6b2d46 SHA512 fa131ed3323a273529a59266b693381c0123400b7207733398992c99b424831a2918d019353ee0f2e6cce24b47042039f1abdbfe1ceeb28e56e35da4bf9e8c96 -EBUILD lyx-2.3.7.ebuild 4652 BLAKE2B 49cdfe4a7fc8c1766966f6d2cde604b08cd09f2cef858883d4d781da4a715a259c95dd57c9594308675103ec58fdf9db60114136003889044f4bca5d4ce10604 SHA512 73baeded196c8304a7955da756ebfde5ab0e3c021600fd24aaff126a9a7777712f9172412dd634a1e7860f1af8a9655c92900a73488cd385c3332a65170550a8 -EBUILD lyx-2.4.0_rc4.ebuild 3828 BLAKE2B 5983c2b8686886033fae43a853815ba2968bdc08dbea0fadd11bd8437d9f468d378dc1586b01803ba7d20ba2fef358f4992c042948f84f27419903070d74ac55 SHA512 341f6f9e68af8e25fa469d4c255ee76701e920afb92b842fe1c784d49f0ba9cfcf431ef3d32119d86e22b088e3af051ecb38a56fb2cd8b0c4f154404013691f9 +DIST lyx-2.4.1.tar.xz 17848700 BLAKE2B 5e9d9530610149a1b0f6a7d536068ff0da97e261a6069a9efc3c45a892c653e7accadcd0bde96bf3ffad9d936fef4a4b88ee7b5233f875bbc568044376a5b37e SHA512 80d57d46dab61ecb655c9d54ba1d20203ad943db5249ed16dbeb5b78b7845896a79224c8032213cc861fd943629fbe87ef8ac9155cc9b34da9be2f59eb087071 +DIST lyx-2.4.2.1.tar.xz 17876336 BLAKE2B 451aa44c34d763f7e2c4bd0bd4980859728781e74e40075d1e660edd08b9f8103c338ebcaea12c4249a1026fccbd99ad6c0449a2f89e13b229a75f9b2a60ee95 SHA512 2cb9773971b466be32333305e36a28ec4efd31ffa7d9f8ec0a2fe670296f428c260d6839b34cebfd7cda4b78bdd43a47e30cc1f2d64e2c836262661032c107db +EBUILD lyx-2.4.1.ebuild 3832 BLAKE2B c4ef34eaef2db18605cfa75ff5c86153b18ed3100c4486bbff504e836a0378b22ef5c92d28a22a66ffbdf016ec096d3b3521c5624243093a16c68ef80aed66eb SHA512 ce81366f6416af9fdcb3d1c64bd46e7f930c7a30daf1a8be19e892fe81c189bf330e6565aec481afe44a9b84d005ae8b0b0e2c484da2199a5209652f07d7b6ac +EBUILD lyx-2.4.2.1.ebuild 3850 BLAKE2B e96097d5124c63331e1f10107a160820af59c580bc15b5fba8a2f5a6e04a3e72edb5027f7f7dd7901162558e9fe378a6b7d8020dea40789ed6ed58bac4af05f3 SHA512 09fff52644382dd2b65b3ce8bf4c19951231e0384d099bf65190ab20fd9ee702f7111d022b49d749a50dfeec279f30bcd6c02f9b11947912d8fd4e60eef0ad4f MISC metadata.xml 1381 BLAKE2B dde484f4254356ccea9a7110761d3df4ca0dcbddb1b631e09126a762030638e4e3c53859db19df750467b2de8dbe186142b2464b5db2cc563fc2adb3684d8719 SHA512 40ae608e527af9727fbd077dc3e6e1254cd130f32424356d53479a34b6ffdf25b206e044f4071e32e59a7394fafe53ede429732a099e3c66658f337e77517ac9 diff --git a/app-office/lyx/files/lyx-2.3.6.1-python.patch b/app-office/lyx/files/lyx-2.3.6.1-python.patch deleted file mode 100644 index 666d82c06bf8..000000000000 --- a/app-office/lyx/files/lyx-2.3.6.1-python.patch +++ /dev/null @@ -1,50 +0,0 @@ -https://src.fedoraproject.org/rpms/lyx/raw/054d18eb79a8ec3d4480ab4449b3c62b12770d2d/f/lyx-2.3.6-layout2layout.patch ---- a/lib/scripts/layout2layout.py -+++ b/lib/scripts/layout2layout.py -@@ -256,7 +256,7 @@ - - def trim_bom(line): - " Remove byte order mark." -- if line[0:3] == "\357\273\277": -+ if line[0:3] == b"\357\273\277": - return line[3:] - else: - return line -@@ -345,8 +345,8 @@ - # for categories - re_Declaration = re.compile(b'^#\\s*\\Declare\\w+Class.*$') - re_ExtractCategory = re.compile(b'^(#\\s*\\Declare\\w+Class(?:\\[[^]]*?\\])?){([^(]+?)\\s+\\(([^)]+?)\\)\\s*}\\s*$') -- ConvDict = {"article": "Articles", "book" : "Books", "letter" : "Letters", "report": "Reports", \ -- "presentation" : "Presentations", "curriculum vitae" : "Curricula Vitae", "handout" : "Handouts"} -+ ConvDict = {b"article": b"Articles", b"book" : b"Books", b"letter" : b"Letters", b"report": b"Reports", \ -+ b"presentation" : b"Presentations", b"curriculum vitae" : b"Curricula Vitae", b"handout" : b"Handouts"} - # Arguments - re_OptArgs = re.compile(b'^(\\s*)OptionalArgs(\\s+)(\\d+)\\D*$', re.IGNORECASE) - re_ReqArgs = re.compile(b'^(\\s*)RequiredArgs(\\s+)(\\d+)\\D*$', re.IGNORECASE) -@@ -485,7 +485,7 @@ - continue - col = match.group(2) - if col == "collapsable": -- lines[i] = match.group(1) + "collapsible" -+ lines[i] = match.group(1) + b"collapsible" - i += 1 - continue - -@@ -703,7 +703,7 @@ - # Insert the required number of arguments at the end of the style definition - match = re_End.match(lines[i]) - if match: -- newarg = [''] -+ newarg = [b''] - # First the optionals (this is the required order pre 2.1) - if opts > 0: - if opts == 1: -@@ -1153,7 +1153,7 @@ - if latextype == b"item_environment" and label.lower() == b"counter_enumi": - lines[labeltype_line] = re_LabelType.sub(b'\\1\\2\\3Enumerate', lines[labeltype_line]) - # Don't add the LabelCounter line later -- counter = "" -+ counter = b"" - - # Replace - # diff --git a/app-office/lyx/files/lyx-prefer-xdg-open.patch b/app-office/lyx/files/lyx-prefer-xdg-open.patch deleted file mode 100644 index 5e12f6c2e699..000000000000 --- a/app-office/lyx/files/lyx-prefer-xdg-open.patch +++ /dev/null @@ -1,60 +0,0 @@ -From: "Dr. Tobias Quathamer" <toddy@debian.org> -Date: Wed, 31 Jan 2018 23:27:37 +0100 -Subject: Prefer xdg-open - -Add xdg-open as the first choice whenever this seems to be useful. ---- - lib/configure.py | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/lib/configure.py b/lib/configure.py -index 7fee68d..abc4d53 100644 ---- a/lib/configure.py -+++ b/lib/configure.py -@@ -657,7 +657,7 @@ def checkFormatEntries(dtl_tools): - checkViewerEditor('a Dia viewer and editor', ['dia'], - rc_entry = [r'\Format dia dia DIA "" "%%" "%%" "vector,zipped=native", "application/x-dia-diagram"']) - # -- checkViewerEditor('an OpenDocument drawing viewer and editor', ['libreoffice', 'lodraw', 'ooffice', 'oodraw', 'soffice'], -+ checkViewerEditor('an OpenDocument drawing viewer and editor', ['xdg-open', 'libreoffice', 'lodraw', 'ooffice', 'oodraw', 'soffice'], - rc_entry = [r'\Format odg "odg, sxd" "OpenDocument drawing" "" "%%" "%%" "vector,zipped=native" "application/vnd.oasis.opendocument.graphics"']) - # - checkViewerEditor('a Grace viewer and editor', ['xmgrace'], -@@ -682,16 +682,16 @@ def checkFormatEntries(dtl_tools): - \Format xbm xbm XBM "" "%s" "%s" "" "image/x-xbitmap" - \Format xpm xpm XPM "" "%s" "%s" "" "image/x-xpixmap"''' - path, iv = checkViewerNoRC('a raster image viewer', -- ['xv', 'gwenview', 'kview', -+ ['xdg-open', 'xv', 'gwenview', 'kview', - 'eog', 'xviewer', 'ristretto', 'gpicview', 'lximage-qt', -- 'xdg-open', 'gimp-remote', 'gimp'], -+ 'gimp-remote', 'gimp'], - rc_entry = [imageformats]) - path, ie = checkEditorNoRC('a raster image editor', - ['gimp-remote', 'gimp'], rc_entry = [imageformats]) - addToRC(imageformats % ((iv, ie)*10)) - # - checkViewerEditor('a text editor', -- ['xemacs', 'gvim', 'kedit', 'kwrite', 'kate', -+ ['xdg-open', 'xemacs', 'gvim', 'kedit', 'kwrite', 'kate', - 'nedit', 'gedit', 'geany', 'leafpad', 'mousepad', 'xed', 'notepad'], - rc_entry = [r'''\Format asciichess asc "Plain text (chess output)" "" "" "%%" "" "" - \Format docbook sgml DocBook B "" "%%" "document,menu=export" "" -@@ -745,7 +745,7 @@ def checkFormatEntries(dtl_tools): - #checkProg('a Postscript interpreter', ['gs'], - # rc_entry = [ r'\ps_command "%%"' ]) - checkViewer('a Postscript previewer', -- ['kghostview', 'okular', 'qpdfview --unique', -+ ['xdg-open', 'kghostview', 'okular', 'qpdfview --unique', - 'evince', 'xreader', - 'gv', 'ghostview -swap', 'gsview64', 'gsview32'], - rc_entry = [r'''\Format eps eps EPS "" "%%" "" "vector" "image/x-eps" -@@ -756,7 +756,7 @@ def checkFormatEntries(dtl_tools): - # maybe use "bestApplication()" from https://github.com/jleclanche/python-mime - # the MIME type is set for pdf6, because that one needs to be autodetectable by libmime - checkViewer('a PDF previewer', -- ['pdfview', 'kpdf', 'okular', 'qpdfview --unique', -+ ['xdg-open', 'pdfview', 'kpdf', 'okular', 'qpdfview --unique', - 'evince', 'xreader', 'kghostview', 'xpdf', 'SumatraPDF', - 'acrobat', 'acroread', 'mupdf', - 'gv', 'ghostview', 'AcroRd32', 'gsview64', 'gsview32'], diff --git a/app-office/lyx/lyx-2.4.0_rc4.ebuild b/app-office/lyx/lyx-2.4.1.ebuild index 95d64cac5f63..dc7b64d683df 100644 --- a/app-office/lyx/lyx-2.4.0_rc4.ebuild +++ b/app-office/lyx/lyx-2.4.1.ebuild @@ -3,14 +3,13 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit desktop font optfeature python-single-r1 cmake xdg DESCRIPTION="WYSIWYM (What You See Is What You Mean) document processor based on LaTeX" HOMEPAGE="https://www.lyx.org/" -SRC_URI="http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P/_rc/~RC}.tar.xz" -S=${WORKDIR}/${P/_rc/~RC} +SRC_URI="http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P}.tar.xz" LICENSE="GPL-2+" SLOT="0" @@ -110,6 +109,7 @@ src_configure() { -DLYX_INSTALL=ON -DLYX_USE_QT=QT6 -DLYX_INSTALL_PREFIX="${EPREFIX}/usr" + -DLYX_CXX_FLAGS_EXTRA="${CXXFLAGS}" -DLYX_NLS=$(usex nls) -DLYX_ASPELL=$(usex aspell) diff --git a/app-office/lyx/lyx-2.3.7.ebuild b/app-office/lyx/lyx-2.4.2.1.ebuild index 29a7b60275a0..06836670debe 100644 --- a/app-office/lyx/lyx-2.3.7.ebuild +++ b/app-office/lyx/lyx-2.4.2.1.ebuild @@ -3,41 +3,34 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..13} ) -MY_P="${P/_}" -inherit desktop font optfeature python-single-r1 qmake-utils toolchain-funcs xdg-utils +inherit desktop font optfeature python-single-r1 cmake xdg DESCRIPTION="WYSIWYM (What You See Is What You Mean) document processor based on LaTeX" HOMEPAGE="https://www.lyx.org/" -SRC_URI="http://ftp.lyx.org/pub/lyx/stable/$(ver_cut 1-2).x/${MY_P}-1.tar.xz" +SRC_URI="http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P}.tar.xz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv ~x86 ~x64-macos" -IUSE="aspell cups debug dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he" +KEYWORDS="~amd64 ~arm64" +IUSE="aspell cups dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="test" -# bc needed http://comments.gmane.org/gmane.editors.lyx.devel/137498 and bug #787839 -BDEPEND=" - app-alternatives/bc - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" RDEPEND="${PYTHON_DEPS} app-text/mythes dev-libs/boost:= - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 sys-apps/file - sys-libs/zlib + sys-libs/zlib:= virtual/imagemagick-tools[png,svg?] - + x11-libs/libxcb x11-misc/xdg-utils + dev-qt/qtbase:6[concurrent,dbus,gui,widgets] + dev-qt/qt5compat:6 + dev-qt/qtsvg:6 + aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) @@ -46,7 +39,10 @@ RDEPEND="${PYTHON_DEPS} gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) - l10n_he? ( dev-tex/culmus-latex ) + l10n_he? ( + dev-tex/culmus-latex + dev-texlive/texlive-langarabic + ) latex? ( app-text/dvipng app-text/ghostscript-gpl @@ -58,8 +54,8 @@ RDEPEND="${PYTHON_DEPS} dev-texlive/texlive-pictures dev-texlive/texlive-plaingeneric || ( - dev-tex/hevea dev-tex/latex2html + dev-tex/hevea dev-tex/tex4ht[java] dev-tex/tth ) @@ -70,27 +66,30 @@ RDEPEND="${PYTHON_DEPS} dev-tex/html2latex dev-tex/latex2rtf ) - svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) + svg? ( || ( + gnome-base/librsvg + media-gfx/inkscape + ) ) " -DEPEND="${RDEPEND} - dev-qt/qtconcurrent:5 +DEPEND="${RDEPEND}" +# bc needed http://comments.gmane.org/gmane.editors.lyx.devel/137498 and bug #787839 +BDEPEND=" + app-alternatives/bc + virtual/pkgconfig + dev-qt/qttools[linguist] + nls? ( sys-devel/gettext ) " DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING ) -S="${WORKDIR}/${MY_P}" - FONT_S="${S}/lib/fonts" FONT_SUFFIX="ttf" PATCHES=( + "${FILESDIR}"/lyx-2.4.0-fix-hunspell.patch # Try first with xdg-open before hardcoded commands # Patch from Debian using a similar approach to Fedora - "${FILESDIR}"/${PN}-prefer-xdg-open.patch - - # Already part of 2.4.x (from Fedora) - # https://bugzilla.redhat.com/show_bug.cgi?id=1965118 - "${FILESDIR}"/${PN}-2.3.6.1-python.patch + "${FILESDIR}"/lyx-2.4.0-prefer-xdg-open.patch ) pkg_setup() { @@ -99,48 +98,54 @@ pkg_setup() { } src_prepare() { - default - sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die + cmake_src_prepare } src_configure() { - tc-export CXX #bug 221921 export VARTEXFONTS="${T}"/fonts - econf \ - $(use_with aspell) \ - $(use_enable debug) \ - $(use_with enchant) \ - $(use_with hunspell) \ - $(use_enable monolithic-build) \ - $(use_enable nls) \ - --enable-qt5 \ - --with-qt-dir=$(qt5_get_libdir)/qt5 \ - --disable-stdlib-debug \ - --without-included-boost \ - --with-packaging=posix + local mycmakeargs=( + -DLYX_INSTALL=ON + -DLYX_USE_QT=QT6 + -DLYX_INSTALL_PREFIX="${EPREFIX}/usr" + -DLYX_CXX_FLAGS_EXTRA="${CXXFLAGS}" + + -DLYX_NLS=$(usex nls) + -DLYX_ASPELL=$(usex aspell) + -DLYX_ENCHANT=$(usex enchant) + -DLYX_HUNSPELL=$(usex hunspell) + + # external dependencies + -DLYX_EXTERNAL_Z=ON + -DLYX_EXTERNAL_ICONV=ON + -DLYX_EXTERNAL_HUNSPELL=ON + -DLYX_EXTERNAL_MYTHES=ON + -DLYX_EXTERNAL_BOOST=ON + -DLYX_PROGRAM_SUFFIX=OFF + + # debug control + -DLYX_NO_OPTIMIZE=OFF + -DLYX_RELEASE=ON + -DLYX_DEBUG=OFF + -DLYX_DEBUG_GLIBC=OFF + -DLYX_STDLIB_DEBUG=OFF + ) + + cmake_src_configure } src_install() { - default - - if use l10n_he ; then - echo "\bind_file cua" > "${T}"/hebrew.bind || die - echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind || die - - insinto /usr/share/lyx/bind - doins "${T}"/hebrew.bind - fi + cmake_src_install newicon -s 32 "development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png doicon -s 48 "lib/images/lyx.png" doicon -s scalable "lib/images/lyx.svg" # fix for bug 91108 - if use latex ; then - dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx + if use latex; then + dosym -r /usr/share/lyx/tex /usr/share/texmf-site/tex/latex/lyx fi # fonts needed for proper math display, see also bug #15629 @@ -148,48 +153,27 @@ src_install() { python_fix_shebang "${ED}"/usr/share/${PN} - if use hunspell ; then + if use hunspell; then dosym ../myspell /usr/share/lyx/dicts dosym ../myspell /usr/share/lyx/thes fi } -pkg_preinst() { - # Workaround https://bugs.gentoo.org/907288 - if has_version "<${CATEGORY}/${PN}-2.3.7"; then - ewarn "dev-texlive/texlive-fontsextra is now an optional dependency" - ewarn "If you need these fonts, you will need to manually install" - ewarn "them." - fi -} - pkg_postinst() { font_pkg_postinst - xdg_icon_cache_update - xdg_desktop_database_update + xdg_pkg_postinst # fix for bug 91108 if use latex ; then texhash || die fi - # instructions for RTL support. See also bug 168331. - if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then - elog - elog "Enabling RTL support in LyX:" - elog "If you intend to use a RTL language (such as Hebrew or Arabic)" - elog "You must enable RTL support in LyX. To do so start LyX and go to" - elog "Tools->Preferences->Language settings->Language" - elog "and make sure the \"Right-to-left language support\" is checked" - elog - fi - optfeature "handling more fonts" dev-texlive/texlive-fontsextra } pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update + font_pkg_postrm + xdg_pkg_postrm if use latex ; then texhash || die |