From dbbd2ae5e62a232616ede4dae3ed69e15903940a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 24 Jan 2023 18:57:53 +0000 Subject: gentoo auto-resync : 24:01:2023 - 18:57:53 --- media-libs/Manifest.gz | Bin 68223 -> 68225 bytes media-libs/libraw/Manifest | 2 - media-libs/libraw/libraw-0.20.2.ebuild | 62 ------------- media-libs/tiff/Manifest | 6 -- .../files/tiff-4.4.0-hylafaxplus-regression.patch | 34 ------- .../files/tiff-4.4.0_rc1-skip-thumbnail-test.patch | 32 ------- media-libs/tiff/tiff-4.4.0-r1.ebuild | 97 -------------------- media-libs/tiff/tiff-4.4.0-r2.ebuild | 102 --------------------- 8 files changed, 335 deletions(-) delete mode 100644 media-libs/libraw/libraw-0.20.2.ebuild delete mode 100644 media-libs/tiff/files/tiff-4.4.0-hylafaxplus-regression.patch delete mode 100644 media-libs/tiff/files/tiff-4.4.0_rc1-skip-thumbnail-test.patch delete mode 100644 media-libs/tiff/tiff-4.4.0-r1.ebuild delete mode 100644 media-libs/tiff/tiff-4.4.0-r2.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index 7cd82923d0dd..a2302a620904 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest index feba8e7efdda..2011aa445b95 100644 --- a/media-libs/libraw/Manifest +++ b/media-libs/libraw/Manifest @@ -1,5 +1,3 @@ -DIST LibRaw-0.20.2.tar.gz 1432141 BLAKE2B 6e41d91b560951ad4595c41a1d089505ca91337f4fc6b98bafe44211971bee143709482a070bacb7daebbd643bbbf17730f544d791c0237bf1689a7a59133079 SHA512 96b1aaf09e2d46448d1b3619270c1f1c32e9bcbd866567cec67d5b1f889362f0fae3f3533ea9bf6a11a917be3b61ee6c9938bad09209d93453039ed04eaeae4a DIST LibRaw-0.21.1.tar.gz 1638461 BLAKE2B 5db9a02f6854b90acf5e22419e2bc5470118140173be38cb520cc03553a328cad86d97ebda62c149622e045325ce82dcc34df40b5f700c319929c10fc43fdc9e SHA512 8d11df0be2af5fd8a8251f150ccd59103319606f52effff541ee43e97ceb64f1a00a02bba7b730aedd0c1c705c1e465793c8a2a52769712c1102af7f5534dd5d -EBUILD libraw-0.20.2.ebuild 1418 BLAKE2B 848a04befc4bf6c4b1eefeb4573edfc30796af76460efd4626d47eaa472e964ae87f43e590d06b89ce6fccdfd57c8f179f99e95f80a28f938e3211ffaba22bcd SHA512 69524c743d44de0159311d5f2765a2c9460de97dc5a7a40ea1a6a45b2c843b8410df2e4de9b26654e9d8977bf8b2990ef2535d6eeebd81e0b1e1431003eb300c EBUILD libraw-0.21.1.ebuild 1545 BLAKE2B 6c064249c7ae9c3e1dd1119de71d463313b9a43c333167a373aec29a4434aed6e6b96345a79d0dad09017754b72234e30eda17c69854c0caaa6225a68ba82491 SHA512 4737b259683ca8557f5fa3ae58d10c3025dc63774bb8fb4a184012acc94a96267ebef5536dab3c6a6635d6580cb71c1f8758936c2954162d8d9a9b9ccdc3981c MISC metadata.xml 277 BLAKE2B 173d0b654a315fbeb39d77d02381d4acddceb0ea54baf2cdd2026b6cf5665299dc2944e68ae103181620df1e27a53cf82279e54b7e5f497ee1fd1e06db4e4556 SHA512 e2e9247845f55db13088ad027b4c056c7a070e1ab9a7bb74faed666347d646ba28ad121bfb38e3995844518f0a2583e1a51f6b3ca49295639157f98728444fda diff --git a/media-libs/libraw/libraw-0.20.2.ebuild b/media-libs/libraw/libraw-0.20.2.ebuild deleted file mode 100644 index 087d6fe30077..000000000000 --- a/media-libs/libraw/libraw-0.20.2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal toolchain-funcs - -MY_PN=LibRaw -MY_PV="${PV/_b/-B}" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras" -HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw" -SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1 CDDL" -SLOT="0/20" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="examples jpeg +lcms openmp" - -RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) - lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )" - -DEPEND="${RDEPEND}" - -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -DOCS=( Changelog.txt README.md ) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --disable-static - --disable-jasper - $(multilib_native_use_enable examples) - $(use_enable jpeg) - $(use_enable lcms) - $(use_enable openmp) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - - # package installs .pc files - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest index b14bef640f2f..02adc1099cff 100644 --- a/media-libs/tiff/Manifest +++ b/media-libs/tiff/Manifest @@ -1,11 +1,5 @@ -AUX tiff-4.4.0-hylafaxplus-regression.patch 1100 BLAKE2B 7d45e1b8c9ff6e2956b7190618dea150fa7868585bfe68259e637e5a98655b51b985fe3ee3b08b5ada3335ee2f887d683524a105653c16d48d90b2a23d850d69 SHA512 4232c057d472651d2532814c288399a8bdcb1c0397d860ecb994489d863c2ddf05ce8a2b014ce750b0619f50cc439979607baa2dcb2b9aa97f02c8352ec60170 -AUX tiff-4.4.0_rc1-skip-thumbnail-test.patch 1176 BLAKE2B aec14df94825b3709941b065bfa6eccfef5727ab237feb4022e614749964541b5528f9724763bd86ead8aa1584590cb7900f17123c58d3e4b45a470f240a4d68 SHA512 e58fc43a081205107175122dc6f05281e2c11ef961645e3f0ac4ee6b54c22d3898c978c8ea8984394fc74a92bd81c4fb4a37915d32689314fb97c7f3aeb5b6c1 AUX tiff-4.5.0_rc1-skip-tools-tests-multilib.patch 1477 BLAKE2B d6daf36a65fcd2afbec2fd5e5f3b75fa4547f32079c0709e98a48b0ba28d993346dfc597ef46b37db5242f2e28c7dd87a1616fe9324ca2d9659a97040bcd23db SHA512 0c7b69ddd772d73fde800e610ed533804392d0ea4ddefa409f52abcf174cc77cd1f4160a03076043d654533e98812d642d5166030d97b273ec80f5288bf3eda3 -DIST tiff-4.4.0.tar.xz 1929292 BLAKE2B d05a2fb293557d1e7cdec116c65c8338d7714af7b6abd8dd3bb2b476d62e044adc7d6c298843649d63c6bc09f6ce4660ee23638f9beb716937ccf236c2829dcf SHA512 c9611faadc9b1199f3aba9a43bfa160c77c11558d1fa358b42115ed78db73c8387531c0668cc9021842c58f1c02f8d84264d3600e1039dfe6f866822ad91cff9 -DIST tiff-4.4.0.tar.xz.sig 310 BLAKE2B 00dc8ff9c232ec4cca8b294659e6379b9bb512b58cd3d2f9231e7c10111510ac56aff3c6fc133a47f9fafc27595e099297c25940414495d8ea7f5a75aa43e9d2 SHA512 4ffdcbf5a8ce4a3be543d0ad43101ddcdb6ef22c3da5768c86660a40cc0cab48032a65c5e7bb0667f43d55dad5aa09dc0df302e2f9dbc9f24b8ccac643a0408c DIST tiff-4.5.0.tar.xz 2320900 BLAKE2B c69801ba9d55b1ed27a92d31d8cd16937fe69299fbf5450efb4a6caa60245b72ddade110daae78f2198613640383623f76ec2265ba785375d0a85c7909b73fe9 SHA512 c6c866064c2dd5d1711c6ece7bafe5f011f5ce26c0aeaecbff79c05b5671f44150324bea95a0665cc43331883114de855ee1cd87ed733bff0f4d0814515b9f10 DIST tiff-4.5.0.tar.xz.sig 310 BLAKE2B bbe7f9600061416227276424eb220714a1375d3e295cb0c5b7f76074324c1a2698a5029dde3e734331e9caf02d8a086273ded2ab09285857dbbfe3ad83506912 SHA512 8cef09755f4efe68db69591967e495852cf63c2d8113a877a2254f536d38c60b6dc864c07089249cd8109a8408672a297ae9e59d8233687bc2796dc158ccfb32 -EBUILD tiff-4.4.0-r1.ebuild 2828 BLAKE2B 7e519df6e4d72869c2bef577881b911feaf9f74d0e574a5697f4c937cc05d2d980309b13dfe9ade1cc286e4a692c83bdd53c7f2d1ff542440791fbef6233b3b2 SHA512 c446d72065674828b2f6c18ec8749ea184a20b4fd64d0cbb46b581742e59c36b7f4f7613003e99a238cd85a89488b35c404b8d589e6511d7a54ff35df8f11911 -EBUILD tiff-4.4.0-r2.ebuild 2972 BLAKE2B 7bcbe10de4b91a3a60f3337533043c7490aa923d8857a632de7cdb40cd8deac3e40ef667dfa6e4a0119482237619b37c6257512d524e5347510aaf58459bedb2 SHA512 1febfff08c2a57f019a1531772999b0d0680e224506d9ad640532b295b888ce8c0635671a5b2eb7d14b47f3e905074f0e2920d7572445b346fe4822ccb0ea688 EBUILD tiff-4.5.0.ebuild 2652 BLAKE2B 88e1bf84ab026017b08f58e2086e2a9a13d06516f2e8981840494e5e3b1d4e532bf7d98b9347bcf4be3c37d68a425f52d125e546024e26712b383bb8c8f43bae SHA512 c97fcf9aa837999e3b9f15480c1bb1fe60c2688d3e7b06da4c8923cc0aa421089e7f5f9fa6d928920654e713d51b417f92e34dd10f246da383a071ca13566803 MISC metadata.xml 615 BLAKE2B b76f8c2714111fe539c2d15b56361bc3b2bc7469b3cd74cf933a9dad4ac8577b7bb1a2bc010ceb3623640778d1dbc912433988e938db7df8f8fca67c51003c2c SHA512 81b22e0e2763fbcd573d2c1fee362785c15c7c33cc00d0f7ce89eb9f95f55e64aee78eefc51de6d7270aa966102b744f070620828becbbb03012cc22e3e99469 diff --git a/media-libs/tiff/files/tiff-4.4.0-hylafaxplus-regression.patch b/media-libs/tiff/files/tiff-4.4.0-hylafaxplus-regression.patch deleted file mode 100644 index c640f6e1b1a7..000000000000 --- a/media-libs/tiff/files/tiff-4.4.0-hylafaxplus-regression.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://bugs.gentoo.org/883641 -https://gitlab.com/libtiff/libtiff/-/issues/489 -https://gitlab.com/libtiff/libtiff/-/commit/72de8fd00be8a583a6b16cc0b700105020d249ba - -From 72de8fd00be8a583a6b16cc0b700105020d249ba Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Tue, 29 Nov 2022 14:57:27 +0100 -Subject: [PATCH] TIFFWriteRawStrip(): restore capabilities to append data in - the current strip (fixes #489) - -This fixes a regression of libtiff 4.4.0 ---- a/libtiff/tif_write.c -+++ b/libtiff/tif_write.c -@@ -341,10 +341,13 @@ TIFFWriteRawStrip(TIFF* tif, uint32_t strip, void* data, tmsize_t cc) - return ((tmsize_t) -1); - } - -- tif->tif_curstrip = strip; -+ if (tif->tif_curstrip != strip) -+ { -+ tif->tif_curstrip = strip; - -- /* this informs TIFFAppendToStrip() we have changed or reset strip */ -- tif->tif_curoff = 0; -+ /* this informs TIFFAppendToStrip() we have changed or reset strip */ -+ tif->tif_curoff = 0; -+ } - - if (td->td_stripsperimage == 0) { - TIFFErrorExtR(tif, module,"Zero strips per image"); --- -GitLab - - diff --git a/media-libs/tiff/files/tiff-4.4.0_rc1-skip-thumbnail-test.patch b/media-libs/tiff/files/tiff-4.4.0_rc1-skip-thumbnail-test.patch deleted file mode 100644 index 574a02dd3487..000000000000 --- a/media-libs/tiff/files/tiff-4.4.0_rc1-skip-thumbnail-test.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://gitlab.com/libtiff/libtiff/-/merge_requests/334 - -From 62a49eeb3f0c986c5fcbfc53cd3d7ef2a3fab9b3 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sat, 21 May 2022 01:01:35 +0100 -Subject: [PATCH] test/tiffcp-thumbnail.sh: skip test if tools aren't built - -In Gentoo, we avoid building the tools for multilib (32-bit, x86) builds on -amd64/x86_64 because we only need the library to keep binary applications working. - -This causes a test failure in just tiffcp-thumbnail.sh as the 'thumbnail' -binary isn't built. Skip it if unavailable as it's only a single test. - -Fixes: https://gitlab.com/libtiff/libtiff/-/issues/421 ---- a/test/tiffcp-thumbnail.sh -+++ b/test/tiffcp-thumbnail.sh -@@ -4,7 +4,12 @@ - # - . ${srcdir:-.}/common.sh - -+if [ ! -x "${TIFFCP}" ] || [ ! -x "${THUMBNAIL}" ] ; then -+ # https://gitlab.com/libtiff/libtiff/-/issues/421 -+ exit 77 -+fi -+ - outfile1=o-tiffcp-thumbnail-in.tif - outfile2=o-tiffcp-thumbnail-out.tif - f_test_convert "${TIFFCP} -c g3:1d" "${IMG_MINISWHITE_1C_1B}" "${outfile1}" --f_test_convert "${THUMBNAIL}" "${outfile1}" "${outfile2}" -\ No newline at end of file -+f_test_convert "${THUMBNAIL}" "${outfile1}" "${outfile2}" -GitLab diff --git a/media-libs/tiff/tiff-4.4.0-r1.ebuild b/media-libs/tiff/tiff-4.4.0-r1.ebuild deleted file mode 100644 index 4fce57119100..000000000000 --- a/media-libs/tiff/tiff-4.4.0-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -QA_PKGCONFIG_VERSION="$(ver_cut 1-3)" - -# Release signer can vary per version but not clear if others will be doing -# them in future, so gone with Even Rouault for now as he does other geosci -# stuff too like PROJ, GDAL. Previous release manager of TIFF was -# GraphicsMagick maintainer Bob Friesenhahn. Please be careful when verifying -# who made releases. -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/rouault.asc -inherit multilib-minimal verify-sig libtool flag-o-matic - -MY_P="${P/_rc/rc}" -DESCRIPTION="Tag Image File Format (TIFF) library" -HOMEPAGE="http://libtiff.maptools.org" -SRC_URI="https://download.osgeo.org/libtiff/${MY_P}.tar.xz" -SRC_URI+=" verify-sig? ( https://download.osgeo.org/libtiff/${MY_P}.tar.xz.sig )" -S="${WORKDIR}/${PN}-$(ver_cut 1-3)" - -LICENSE="libtiff" -SLOT="0" -if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi -IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd" -RESTRICT="!test? ( test )" - -# bug #483132 -REQUIRED_USE="test? ( jpeg )" - -RDEPEND="jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] ) - jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) - webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) - zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-evenrouault )" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/tiffconf.h -) - -PATCHES=( - "${FILESDIR}"/${PN}-4.4.0_rc1-skip-thumbnail-test.patch -) - -src_prepare() { - default - elibtoolize -} - -multilib_src_configure() { - local myeconfargs=( - --without-x - --with-docdir="${EPREFIX}"/usr/share/doc/${PF} - $(use_enable cxx) - $(use_enable jbig) - $(use_enable jpeg) - $(use_enable lzma) - $(use_enable static-libs static) - $(use_enable webp) - $(use_enable zlib) - $(use_enable zstd) - ) - - append-lfs-flags - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" - - # Remove components (like tools) that are irrelevant for the multilib - # build which we only want libraries for. - # TODO: upstream options to disable these properly - if ! multilib_is_native_abi ; then - sed -i \ - -e 's/ tools//' \ - -e 's/ contrib//' \ - -e 's/ man//' \ - -e 's/ html//' \ - Makefile || die - fi -} - -multilib_src_test() { - if ! multilib_is_native_abi ; then - emake -C tools - fi - - emake check -} - -multilib_src_install_all() { - find "${ED}" -type f -name '*.la' -delete || die - rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die -} diff --git a/media-libs/tiff/tiff-4.4.0-r2.ebuild b/media-libs/tiff/tiff-4.4.0-r2.ebuild deleted file mode 100644 index 9f2ae8c6446f..000000000000 --- a/media-libs/tiff/tiff-4.4.0-r2.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -QA_PKGCONFIG_VERSION="$(ver_cut 1-3)" - -# Release signer can vary per version but not clear if others will be doing -# them in future, so gone with Even Rouault for now as he does other geosci -# stuff too like PROJ, GDAL. Previous release manager of TIFF was -# GraphicsMagick maintainer Bob Friesenhahn. Please be careful when verifying -# who made releases. -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/rouault.asc -inherit multilib-minimal verify-sig libtool flag-o-matic - -MY_P="${P/_rc/rc}" -DESCRIPTION="Tag Image File Format (TIFF) library" -HOMEPAGE="http://libtiff.maptools.org" -SRC_URI="https://download.osgeo.org/libtiff/${MY_P}.tar.xz" -SRC_URI+=" verify-sig? ( https://download.osgeo.org/libtiff/${MY_P}.tar.xz.sig )" -S="${WORKDIR}/${PN}-$(ver_cut 1-3)" - -LICENSE="libtiff" -SLOT="0" -if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi -IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd" -RESTRICT="!test? ( test )" - -# bug #483132 -REQUIRED_USE="test? ( jpeg )" - -RDEPEND="jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] ) - jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) - webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) - zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-evenrouault )" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/tiffconf.h -) - -PATCHES=( - "${FILESDIR}"/${PN}-4.4.0_rc1-skip-thumbnail-test.patch - "${FILESDIR}"/${P}-hylafaxplus-regression.patch -) - -src_prepare() { - default - - # Added to fix cross-compilation - elibtoolize -} - -multilib_src_configure() { - append-lfs-flags - - local myeconfargs=( - --without-x - --with-docdir="${EPREFIX}"/usr/share/doc/${PF} - $(use_enable cxx) - $(use_enable jbig) - $(use_enable jpeg) - $(use_enable lzma) - $(use_enable static-libs static) - $(use_enable webp) - $(use_enable zlib) - $(use_enable zstd) - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" - - # Remove components (like tools) that are irrelevant for the multilib - # build which we only want libraries for. - # TODO: upstream options to disable these properly - # https://gitlab.com/libtiff/libtiff/-/merge_requests/334 - if ! multilib_is_native_abi ; then - sed -i \ - -e 's/ tools//' \ - -e 's/ contrib//' \ - -e 's/ man//' \ - -e 's/ html//' \ - Makefile || die - fi -} - -multilib_src_test() { - if ! multilib_is_native_abi ; then - emake -C tools - fi - - emake check -} - -multilib_src_install_all() { - find "${ED}" -type f -name '*.la' -delete || die - rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die -} -- cgit v1.2.3