10 files changed, 176 insertions, 6 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index a35fec6e5c18..724e334d8cd9 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index f510ad9a31f5..36ae81d71076 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -1,3 +1,3 @@
 DIST libgee-0.20.6.tar.xz 690436 BLAKE2B cdb88719e0e1bceccefd6a824823e6e514bf1f4d6b8cf5330d6d83f781649312b23554c7dfc4a6b4eeb3bbcd81ca42843666d596b85634ff95fc90e90fea44bd SHA512 05176b221274b2a0512b018b93ae730ca750482bbc7a4951376eb868c0a388950371e80a438b5af792ebe4a64b6a38e0c94ca52ebd0fc4539f0fe233e0be5903
-EBUILD libgee-0.20.6.ebuild 698 BLAKE2B fd01d8294672ad071b8e5326656e88ea084faf92387ee4166a4b2397cd09d555ee2ec29c301a287ae90658c4dc49d91032d3a67aa02cf5dd376ee4316d2abbf0 SHA512 b428084d36a3d9d8e3908183f6fa1fcadee8f46b3162f8a5162f3358d4fc7716d5fb816ee882dc9e59bf0f01659c541b5201149e7aab6b9241d7db20f883bd04
+EBUILD libgee-0.20.6.ebuild 687 BLAKE2B 763a4d704d0b5908482f6eec3370f86b043a71947109be77e1045d72ab94058f32091f2a242eb048a16fd5f8a7bbdfe39178ac55caa7b1776ed9a41fde15a55a SHA512 ca3f1452ecb1e1c543c37d0d86a395be961a7ae435b2ce34b4632512c67f3e13d1b4642f7961fc250fcac9862900cc7b7cf6188a518b7e8afada1f6f5a07a1fc
 MISC metadata.xml 347 BLAKE2B c0d6f55760dc3a10dca3c4d56e1833da7bb94a048d5f1c44c4275685b441eeea003e0a858a0544d720b165e8ed0c9162dffe205b9a526b40fb428caa275899ad SHA512 93d4276fb984fb4bfd9959ceb26b88acaffdec1da9e8c4b6fe62a0c5abbfb89b1707de6d392e026d23846feb17147d3ca6baaa336cd3127747c92d778467120f
diff --git a/dev-libs/libgee/libgee-0.20.6.ebuild b/dev-libs/libgee/libgee-0.20.6.ebuild
index 31ae5bb1cead..d04df6b84520 100644
--- a/dev-libs/libgee/libgee-0.20.6.ebuild
+++ b/dev-libs/libgee/libgee-0.20.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit gnome2
+inherit gnome2 vala
 
 DESCRIPTION="GObject-based interfaces and classes for commonly used data structures"
 HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
@@ -22,7 +22,8 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_configure() {
+	vala_setup
+
 	gnome2_src_configure \
-		$(use_enable introspection) \
-		VALAC="$(type -P false)"
+		$(use_enable introspection)
 }
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 1d144b55d384..b800e8c8e6d4 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,5 +1,6 @@
 AUX libgpg-error-1.44-remove_broken_check.patch 811 BLAKE2B ff90643ba8afe80393ae0328590ba161c5a68c6b1d6e3ab771a9b295e2827d4cb02d620315e0437647d36698d539c911aa572a9d57393feed9818986440dd437 SHA512 29dbad17b3626eab56ecc352479f55aeb54958245558716134e1da5c8581c0713d53463caa778ebd6c33ea3281072d7aa2d6fd62630bfa973a41bd3e76ca1a57
 DIST libgpg-error-1.47.tar.bz2 1020862 BLAKE2B bc04efa0686b1b7d7cdce045fc080c090c1abec60349b673c2e1ce27900483aea090eb6ebcb3fb49a4eed36f18156a12413d5446f739475632f4ed2a2481ff27 SHA512 bbb4b15dae75856ee5b1253568674b56ad155524ae29a075cb5b0a7e74c4af685131775c3ea2226fff2f84ef80855e77aa661645d002b490a795c7ae57b66a30
 DIST libgpg-error-1.47.tar.bz2.sig 119 BLAKE2B d23ea6c38621407c8f9f0c6bde71abd0e50c136d2e5de9a6cef64627f5d398c344a3438995a2405c4ef148ad8638ef7125f34670819957acd7d597370f1630e5 SHA512 09343016eaf7fcc455f8ce533847153a8a9b7c36f375a8ebe71ef5fc2923edf7b70842f834f52c51874e427869487b74a2286ea0112cffad0d72f79cb6d4eceb
+EBUILD libgpg-error-1.47-r1.ebuild 2615 BLAKE2B 0bf042a9af1e4bb851b6b3c58c65cc36aa1695e827525e3caad6ffaf799b81055e6242142fd7de050bd98dab0bc16f56f4e1afeac7ad7b5f76eea64653d93141 SHA512 3659669b469a1c2c790ee09b395c83a2c8d840a0971c4090a54d18e8c8507382fca435461e42faa8bd20309d20126c1cbd2a1441b9375163dcce0305c8293718
 EBUILD libgpg-error-1.47.ebuild 2586 BLAKE2B 00372e4b21b58587cd76d4866f8426f37115dd65a69d4612c3166f6c02f5bc2066edb8347d8bc651dcca76fff3eee98d5d145e651ac911c7f5b11fdb00990d8f SHA512 18c6e53e702fc91e7848bbd2cab2aa6b81d4fa4fdf6b522ab8d9fead61fc1426f07a35fcd44e7838bf7144998ee4788164f360a12361fbbb5c82210233552e4d
 MISC metadata.xml 420 BLAKE2B 0b469c533336497584faf0c8a5531c54dd242817d46fb78f1369997b77ec3ea49da3a0ae869488c17639fdee26bc4dee94fb20605db6fa8f6f3dbaeab77d3072 SHA512 22259311b2c83f7b63e859a7196a3fd586c85afbd777327d9a6172a359500160807866b74051836717c42145ed0e289152fb0a374a05bcc7e982d4df3e94b305
diff --git a/dev-libs/libgpg-error/libgpg-error-1.47-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.47-r1.ebuild
new file mode 100644
index 000000000000..42ff68452a53
--- /dev/null
+++ b/dev-libs/libgpg-error/libgpg-error-1.47-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit autotools multilib-minimal toolchain-funcs prefix verify-sig
+
+DESCRIPTION="Contains error handling functions used by GnuPG software"
+HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="common-lisp nls static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/gpg-error.h
+	/usr/include/gpgrt.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gpg-error-config
+	/usr/bin/gpgrt-config
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.44-remove_broken_check.patch"
+)
+
+src_prepare() {
+	default
+
+	if use prefix ; then
+		# don't hardcode /usr/xpg4/bin/sh as shell on Solaris
+		sed -i -e 's/solaris\*/disabled/' configure.ac || die
+	fi
+
+	# only necessary for as long as we run eautoreconf, configure.ac
+	# uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
+	# not a pure /bin/sh script, so it fails on some hosts
+	sed -i -e "1s:.*:#\!${BASH}:" autogen.sh || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(multilib_is_native_abi || echo --disable-languages)
+		$(use_enable common-lisp languages)
+		$(use_enable nls)
+		# required for sys-power/suspend[crypt], bug 751568
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+
+		# See bug #699206 and its duplicates wrt gpgme-config
+		# Upstream no longer install this by default and we should
+		# seek to disable it at some point.
+		--enable-install-gpg-error-config
+
+		--enable-threads
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index a111059ddde8..e63095b8c672 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -3,6 +3,6 @@ AUX libnl-3.8.0-python-decorator-syntax.patch 798 BLAKE2B 364c3eff7873ae791c5ff2
 DIST libnl-3.7.0.tar.gz 1000913 BLAKE2B 22c418ea520416d79ee4552ab6bc5ba99239b29e074c840d31b0ec4171a0403ea9d2c1afcbf1b3428564dd371cadd99bc062ae7540e7496f970c4fb98f967e84 SHA512 80fbbc079299c90afd2a5eda62e4d4f98bf4ef23958c3ce5101f4ed4d81d783af733213bb3bab15f218555d8460bc2394898f909f4ac024fc27281faec86a041
 DIST libnl-3.8.0.tar.gz 1071113 BLAKE2B ff90d52e9b617ad8a53e4d42f43bee065b331ed919a3effc4a0f38c8e15b46f86c1eb153816499ed77dd99063500b1dc52951891034475a5bb81da1ad8004594 SHA512 a8da7e8464c5cab2807cd86f83fca53bc77f7c3bdefe43880db7be9caf5ba6bfca1b7e778b906c12fda1cf7e6f413f88cc7ad1dcc42fe8c050a8d28a6e656c02
 EBUILD libnl-3.7.0.ebuild 2639 BLAKE2B 9f93d4b6028347d62b49758d015b1dafd1627f87ae84259fd8d5a68f20ed1355db80d0defc0f3fb4a1d55180c20927fb024d9e1bbb30a78e528543e1004d4fac SHA512 c3eda33ee4c7a322c36f658c3cda16b97ff560aee28362db5c288d2f60d6562e739aa523f4db164984bf8c29777e49e124989715a09f189f8f978d188928fa95
-EBUILD libnl-3.8.0.ebuild 2920 BLAKE2B 1004ab8eeb6c408739ae736b8163905e1802102138261649ffd5dc89b28407fe4e8908c8026d65cc378eaf7cffb9218cd1b46f829949d48444dadcb7f12ae860 SHA512 59116eed1eeecee764394c2740fbf4330f104c72c36433a99559d4f1410c5e921c42745c044ecf166472e54e29a04241d92dc9abe36b62b3b90bc9867a041db8
+EBUILD libnl-3.8.0.ebuild 2917 BLAKE2B afc99d04c92bcf023233388275656dcfd562429bbf2bb22bd14807d7d273cbe39d547e1a86a30c57a263eb81ed5054c8c5830832ab48c2c4b97a9f12da3d9a0b SHA512 b943ee1547e7fb93537dedbdc98113bc16d70f75f17fd723ac7ea5af67b94c2fe7a78fecd45b5f2e9bff6f35bcd0c873cad424fbd49a3a316eb2c70a3033cbd9
 EBUILD libnl-9999.ebuild 2810 BLAKE2B 54681f825988d5dd0f1ea10fb5d1289624822648f47ac42dbf8de8ca910cb71066d145323c6d0adbd78a361b190003cb9c0b1b9e777d259ed3fd0403f5b3f943 SHA512 e019f5c19aeab75277f3e741405d8a5a1442d874dc49bc3364db6f37acf16077b8081e0fdfc49ab3ede5f2fe7ba69b977bbce83cf84daf7fb5741e2788d9af72
 MISC metadata.xml 525 BLAKE2B 62918f4b184a0636f9dbe24a31978ceccf354610b2b8d6db040440f5b519f5a7d710861b94671fd1c684da40e2a9df8563093509e7de9318c891e7c93567b7bf SHA512 076a06cff6803de3775cb295688cbe61831e79e3fa2d7a7e53b376a2c0a5137b349db153692b4cfa22ce6121d9e0579253dee06056076e9aec6f09aaf7a41387
diff --git a/dev-libs/libnl/libnl-3.8.0.ebuild b/dev-libs/libnl/libnl-3.8.0.ebuild
index 6715037c611d..9e6239deebaa 100644
--- a/dev-libs/libnl/libnl-3.8.0.ebuild
+++ b/dev-libs/libnl/libnl-3.8.0.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 	S="${WORKDIR}/${LIBNL_P}"
 fi
diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest
index cba6e4f314e4..856a0cbef7b4 100644
--- a/dev-libs/log4cpp/Manifest
+++ b/dev-libs/log4cpp/Manifest
@@ -4,7 +4,9 @@ AUX 1.0-gcc43.patch 1061 BLAKE2B f139f522885af9f7376220af297028fd55d97d58bb3fef7
 AUX log4cpp-1.1-automake-1.13.patch 242 BLAKE2B 17ac8a6529025edf8f46109906ec2bb2087f56ced626f4f3ddf47c000714b85ba558af1680ae3ab29f5aca8799185e25bed7a7c563d6950f1f3159e58f60eba8 SHA512 22abe490efd1a6b500265744abb2f58345fd9f6df881f1d932d7a95e6076397009c0bbd190eb803c0a4800035c0e435493164393674d19c611825235cb59fcc5
 AUX log4cpp-1.1-cmath-fix.patch 206 BLAKE2B 7caa58dcb66cc184b1f88a99ea6c6c0d21233c9bbd9b7da6727f735f73c98849c0cc95a3e90913847805ecbc1bd84ee56436d3fed6736259251e1c94363f436f SHA512 926e10166d162863c6c1774ce3a6e523a27ae999df68f9423c2ee94042152078d931eda77b07c323890850918832396a3603c3a9226310af90cd3946a7de7ffe
 AUX log4cpp-1.1-glibc-2.31.patch 647 BLAKE2B 80d59c50d322531258f79a8a90385e1565ac0c5658071682dd13ee22b0fba22f1f4b799c4c08a59f07a57eeea2cafa7ffa76902951870854a1dafbf7805abdf2 SHA512 b27fe0c8218dd48c5b72ffc0ba0eb103c610b665777e643929b18b52e23ddf9f6e87bb4c9798f077aaedfcbe1d9ca44342499b15b4c209e5097e7b07269f0fcf
+AUX log4cpp-1.1.3-fix-implicit-func-in-configure.patch 801 BLAKE2B 735f8dc4d64f13ebae58826be3fbc695b089ea8882d93cb0276849b758ba09e42de6b0aee18386e3b9cd232c757f95345f5d390e0da568e9d395d01a21bf36b0 SHA512 a4310f44d6a694f81730cd8295590c496ed3c00c316cb13edc0c51a6bbc8db8516241a2022f16d0d0aa9e877e8cbccdb0d12a5602d210b95026a88a04b113c7d
 AUX log4cpp-1.1.3-fix-version.patch 314 BLAKE2B 27dabdf67a2c3a53ff1f10b1c4b2b1796e144213b2ba545ffd800d21bcae22e8248cf53da73d951a3e712b45e2fcac97f4c5d131bf260ca9680699df8ba527ae SHA512 1ecba987f5295d507babff49f3d0d37d7e998ac2014ee430a981f7c64c35f1d10f2a3810bcfd7e8ca037a0fdadac61972ff93bf37cf6f543d7cedc6b836edb49
 DIST log4cpp-1.1.3.tar.gz 595639 BLAKE2B fc7d643aa70d739e38ec5aba127b4e760a47a064f4032690586c4698ec83a2b7f219d8476650d3bfc5e25563de0852869429ec45171233c6bd5c08b69476b169 SHA512 88e5e10bce8d7d6421c3dcf14aa25385159c4ae52becdc1f3666ab86e1ad3f633786d82afe398c517d4faaa57b3e7b7c0b524361d81c6b9040dbded5cecc19de
 EBUILD log4cpp-1.1.3-r2.ebuild 1333 BLAKE2B 9ab435cb3e74cccb276917b37493ac36b65a3b7f3b18039279f4c93ea2222a0587f2e38f321e98a3233e1d0048a9429c92314f3b3dea61be9f9dd187943cc8d9 SHA512 41f0537c2525afdf53a111e34bbaa14c211662993501470953b115ee9bdccd935e0dd2ee54dc037dbb242bd49405e86b72f771672f1d39359855f9760621e9b5
+EBUILD log4cpp-1.1.3-r3.ebuild 1478 BLAKE2B f7d01aeb6f89e206513141cdd645a92e6c61e3bbfef5c9c5b91430f7650fac059ab3e512a10dce0050ed13c87c8dd7c010336f9e8cac6eed63e7e93fab319071 SHA512 9195d6a66fde8726fb60dd76378285450467fd777a8aef136acec0069659f07b99090bddec04b185e0ebf5e3b644f60ec5ea1042b5d70bc5d612ecfb86d7ee2d
 MISC metadata.xml 245 BLAKE2B fc64c325a442c85782c437edf7e7835b640d7d42d6161da3d4e803c0e81c7e1df99baa33c812e6da007a7286084aa97678109e21c72f684a4b7ab5903f1d281a SHA512 8ae4a6eeb33b2013ef7200430fbd5e9e24c72b8c1f02a7b36d7c62a122c5a10a184e4b86645f1e5ad3ee0b384fd786b2d7d063cdd1befb911f6d4bad7506862a
diff --git a/dev-libs/log4cpp/files/log4cpp-1.1.3-fix-implicit-func-in-configure.patch b/dev-libs/log4cpp/files/log4cpp-1.1.3-fix-implicit-func-in-configure.patch
new file mode 100644
index 000000000000..9e21817ab890
--- /dev/null
+++ b/dev-libs/log4cpp/files/log4cpp-1.1.3-fix-implicit-func-in-configure.patch
@@ -0,0 +1,20 @@
+clang16 throws an error because of the implicit function declaration of exit().
+This leads to the wrong assumption that snprintf is not present on the system.
+
+Bug: https://bugs.gentoo.org/906535
+Upstream PR: https://sourceforge.net/p/log4cpp/codegit/merge-requests/10/
+
+#  Pascal Jäger <pascal.jaeger@leimstift.de> (2023-09-22)
+
+--- a/m4/AC_FUNC_SNPRINTF.m4
++++ b/m4/AC_FUNC_SNPRINTF.m4
+@@ -12,7 +12,8 @@ dnl @author Caolan McNamara <caolan@skynet.ie>
+ dnl
+ AC_DEFUN([AC_FUNC_SNPRINTF],
+ [AC_CACHE_CHECK(for working snprintf, ac_cv_func_snprintf,
+-[AC_TRY_RUN([#include <stdio.h>
++[AC_TRY_RUN([#include <stdlib.h>
++#include <stdio.h>
+ int main () { int l = snprintf(NULL,0,"%d",100); exit (!((3 <= l) || (-1 == l))); }
+ ], ac_cv_func_snprintf=yes, ac_cv_func_snprintf=no,
+ ac_cv_func_snprintf=no)])
diff --git a/dev-libs/log4cpp/log4cpp-1.1.3-r3.ebuild b/dev-libs/log4cpp/log4cpp-1.1.3-r3.ebuild
new file mode 100644
index 000000000000..0c849abac195
--- /dev/null
+++ b/dev-libs/log4cpp/log4cpp-1.1.3-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations"
+HOMEPAGE="https://log4cpp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~s390 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/1.0-doc_install_path.patch
+	"${FILESDIR}"/1.0-gcc43.patch
+	"${FILESDIR}"/1.0-asneeded.patch
+	"${FILESDIR}"/${PN}-1.1-cmath-fix.patch
+	"${FILESDIR}"/${PN}-1.1-automake-1.13.patch
+	"${FILESDIR}"/${PN}-1.1-glibc-2.31.patch
+	"${FILESDIR}"/${PN}-1.1.3-fix-version.patch
+	"${FILESDIR}"/${PN}-1.1.3-fix-implicit-func-in-configure.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
+	# Build tests conditionally
+	if ! use test; then
+		sed -i -e '/^SUBDIRS/s/ tests//' Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -Wno-register # https://bugs.gentoo.org/895054
+	# Bashisms call configure tests to malfunction / config.h to be misgenerated
+	# which then causes a build failure later on in the package (w/ GCC 12,
+	# anyway).
+	CONFIG_SHELL="${BROOT}"/bin/bash econf \
+		--without-idsa \
+		$(use_enable doc doxygen)
+}
+
+src_install() {
+	default
+
+	# Package installs .pc files
+	find "${ED}" -name '*.la' -delete || die
+}