6 files changed, 5 insertions, 128 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index e76c6f686dbe..6df52e9485c7 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index 0be231c04693..4440acc5fae7 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -1,9 +1,5 @@
-AUX passwordsafe-1.15.0-gcc12-time.patch 306 BLAKE2B 03c0d2cefc7cab1b1342df38bd49e6b4fcce6d4c656c0cfabc678a4dd037c95d45e4e5ddeebb4bf8b2031e4c3b2c3c8738eb4e4b8fcb567f472ccd5c861136fa SHA512 2f209a5ae3691b37144b5c32eb467dd50abfe1b8f440bf63b6e3c3f070f788a160a56dd1e28f631df695c58981bd5596534b3d931ce7096555cd0cd12a3bfdb7
-AUX passwordsafe-1.15.0-gtest-no-gnu++11.patch 467 BLAKE2B d3d09e3ed71c722abf11b07edcbf5f430b0eb1f1b530824cacee9ad35c301e45a942c5494c5767ef2cc62f4b63c3a3f9fd39877f4de5821b5164d12640e302f8 SHA512 a1f133b23e2e8651e30e15335b3e06e570c960cd0e31d567bdceb6862ad0df6576182f8784e97ba6cf66b6777ac99a052f7e6a077c6274af32401f9156edd605
-DIST passwordsafe-1.15.0.tar.gz 15354159 BLAKE2B 699f80325884cba9bc6e5ffb33bea5c0b2c01f12ed7e4ea1226c4a64c761a8f20b8272e771261ca59aeeb49bfaa4ea83edc9af6c0aa9ae853e537b0f76f28aaa SHA512 803572afc479d608899e1166ef032a2a660fce122e03f89f59f8e9da9f7439e0eb1d602f77283200626f49d7e146e82edf8edee40060ff4cf6163e81bdf5f738
-DIST passwordsafe-1.16.0.tar.gz 15369804 BLAKE2B 344e77f74e588f41ba3696f5ea05cf054fca9f285437294033284561cbb83c76dc1311033b78673db0049132b7c9f37493c3698bb3b66e8e0a91ae63f7a83cdf SHA512 839de5072d6c9ec8fb82456e4516e51408be271ac8041b6dd9cf30990ac88914a139d96b40ee09764892acd8320abb2950d7f159a5b18c3d1549e58b922aa024
 DIST passwordsafe-1.17.0.tar.gz 15463920 BLAKE2B e64c73139c829b16b5f825d3c078f1cb3285cb15400be988e35b64e4ce701a5241e099a09092a576e487f709464b6fa5d5911f5f68e096d194329cd0214ac8cd SHA512 de1ef537c2f6c17e35d93a53cf46e86b7c1f1a4439282f8c2b98443845e3d381e113448acd739fc6ccdb5eee8ff7ebfd8c0e4306cda517ab623eaf5b9354d39d
-EBUILD passwordsafe-1.15.0.ebuild 1869 BLAKE2B 31576c5fc6aeafe6246e02c03c9b5d435b771f0139e54b536e6f10bffb4c4bbb0fafc55f51d0511dba84b2ffc959f3010ac0a0e61cf99d417109fef3076fdf37 SHA512 ddcb1d77847eb265a1b36b9259dc2390a6eaa5608f6a8da4e64ba3d72cfe61eee9c6df0ae530fefe2a031d62997f655c39fa54889538a13b76bf04ae1963461b
-EBUILD passwordsafe-1.16.0.ebuild 1849 BLAKE2B 0a3a800d7aed751dfbd81ae21317e8adc8fbc7e5accb66252a636777f9dfb6b4071a515190e8a0eda68f1c39492a470664454b458648db5fecef828cc2379a4e SHA512 b20ba3428093566142b9519040013e24dac8e22018ed2339344f9d068fbd4455433aa9bdbfb4e86e41ed78ec64897085ff5f59666fd6a13dd3f430a16979dabb
+DIST passwordsafe-1.18.2.tar.gz 15613801 BLAKE2B e4ad44fe3aae6230c6a1d07e644b7b02831ec5bc815decd85050099c6f43e83bc09cd7d8f88ddfa5b63e5636db774f4b295bb34739e15115ba55c5142d3b08ae SHA512 09fb19133ff325832fa5d284aa1b1e7eda1788c4298424701132ede27fbb17956d874c0007ac00a2b9367d279175666744e192523ec79786baf626fb461abec7
 EBUILD passwordsafe-1.17.0.ebuild 1786 BLAKE2B a37cbc4acceb2a7612aec613e39c1bf93ec843801752f62c2fdb5169c9cbdca6ec3ffcae8475ba27a6f13f2b3aa759f9fb0a0a74ee5b3de25bf74fd4a5b2a144 SHA512 bcb9029f854d77ad2d90abe2b4a9e12c5616163a38ec20a17d080d4be402fa8ffa6f77216c882cf254442ace2622f5cc13fbd6b5a89876ff402e13244a5c43c8
+EBUILD passwordsafe-1.18.2.ebuild 1787 BLAKE2B e56c06358a39a930fd695c51891b21e42955371b92eef54579a34c0905357cc23295b4d09ec7f15bbd026bdeb9fbf2e2e65260a4b78200587024bdb4f7e0f939 SHA512 9cfb066cc84a2780120eab112e5f242252bac000b5401b20f67ed8b3f05ddfa0b81cb1ff5b8e9a9f5b9074d73eb2c8f1de14b4341b899c050274a445be2b3626
 MISC metadata.xml 714 BLAKE2B 336a69bebe009487ad72444b3805a0b332fc78aacff06566601a431d91d7799a750cf2b7aa9d61df26061a4a073c9a3fe478e80419256bdb472374eeee3c3599 SHA512 d0e6fb3b93211ca74371beecf4099bad8c9ef608d804942b961ed0ec954cebd690c3d6157caf200c07f22af3169728f2a541be334142bce060890b88cac4b246
diff --git a/app-admin/passwordsafe/files/passwordsafe-1.15.0-gcc12-time.patch b/app-admin/passwordsafe/files/passwordsafe-1.15.0-gcc12-time.patch
deleted file mode 100644
index c960c9ca2688..000000000000
--- a/app-admin/passwordsafe/files/passwordsafe-1.15.0-gcc12-time.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/pwsafe/pwsafe/pull/865
-https://bugs.gentoo.org/854144
---- a/src/os/unix/pws_time.h
-+++ b/src/os/unix/pws_time.h
-@@ -10,9 +10,7 @@
- 
- #include "../typedefs.h"
- #include <stdint.h>
--#ifdef __FreeBSD__
- #include <time.h>
--#endif
- 
- #ifndef __TIME64_T_TYPE
- #define __TIME64_T_TYPE uint64_t
diff --git a/app-admin/passwordsafe/files/passwordsafe-1.15.0-gtest-no-gnu++11.patch b/app-admin/passwordsafe/files/passwordsafe-1.15.0-gtest-no-gnu++11.patch
deleted file mode 100644
index fe39281f29b1..000000000000
--- a/app-admin/passwordsafe/files/passwordsafe-1.15.0-gtest-no-gnu++11.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Bug: https://bugs.gentoo.org/893464
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -248,7 +248,7 @@
- 
- else ()
- set(CMAKE_CXX_FLAGS
--  "${CMAKE_CXX_FLAGS} -fPIC -Wall -std=gnu++11 -DUNICODE -DWCHAR_INCOMPATIBLE_XMLCH ${CMAKE_WXWINDOWS_CXX_FLAGS}")
-+  "${CMAKE_CXX_FLAGS} -fPIC -Wall  -DUNICODE -DWCHAR_INCOMPATIBLE_XMLCH ${CMAKE_WXWINDOWS_CXX_FLAGS}")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DDEBUG")
- if (USE_ASAN)
-   set(CMAKE_CXX_FLAGS_DEBUG
diff --git a/app-admin/passwordsafe/passwordsafe-1.15.0.ebuild b/app-admin/passwordsafe/passwordsafe-1.15.0.ebuild
deleted file mode 100644
index 43dc7b3551fa..000000000000
--- a/app-admin/passwordsafe/passwordsafe-1.15.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit cmake desktop optfeature wxwidgets xdg
-
-MY_PV="${PV/_beta/BETA}"
-DESCRIPTION="Password manager with wxGTK based frontend"
-HOMEPAGE="https://pwsafe.org/ https://github.com/pwsafe/pwsafe/"
-SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="qr test +xml yubikey"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/openssl:0=
-	net-misc/curl
-	sys-apps/file
-	sys-apps/util-linux
-	x11-libs/libXt
-	x11-libs/libXtst
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	qr? ( media-gfx/qrencode )
-	xml? ( dev-libs/xerces-c )
-	yubikey? ( sys-auth/ykpers )"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	app-arch/zip
-	sys-devel/gettext
-	test? ( dev-cpp/gtest )"
-
-S="${WORKDIR}/pwsafe-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.15.0-gcc12-time.patch
-	"${FILESDIR}"/${PN}-1.15.0-gtest-no-gnu++11.patch
-)
-
-src_configure() {
-	setup-wxwidgets
-
-	local mycmakeargs=(
-		-DNO_QR=$(usex !qr)
-		-DNO_GTEST=$(usex !test)
-		-DGTEST_BUILD=OFF
-		-DXML_XERCESC=$(usex xml)
-		-DNO_YUBI=$(usex !yubikey)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	pushd "${BUILD_DIR}" || die
-
-	dobin pwsafe
-	dobin cli/pwsafe-cli
-	dosym pwsafe /usr/bin/${PN}
-	dosym pwsafe-cli /usr/bin/${PN}-cli
-
-	insinto /usr/share/locale
-	doins -r src/ui/wxWidgets/I18N/mos/*
-
-	insinto /usr/share/${PN}/help
-	doins help/*.zip
-
-	popd || die
-
-	newman docs/pwsafe.1 ${PN}.1
-
-	dodoc README.md README.LINUX.* SECURITY.md docs/{ReleaseNotes.md,ChangeLog.txt}
-
-	insinto /usr/share/${PN}
-	doins -r xml
-
-	doicon -s 48 install/graphics/pwsafe.png
-	newmenu install/desktop/pwsafe.desktop ${PN}.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	optfeature "on-screen keyboard for password entry" x11-misc/xvkbd
-}
diff --git a/app-admin/passwordsafe/passwordsafe-1.16.0.ebuild b/app-admin/passwordsafe/passwordsafe-1.18.2.ebuild
index cb8c08081f13..bb09079ca4f2 100644
--- a/app-admin/passwordsafe/passwordsafe-1.16.0.ebuild
+++ b/app-admin/passwordsafe/passwordsafe-1.18.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-WX_GTK_VER="3.0-gtk3"
+WX_GTK_VER="3.2-gtk3"
 
 inherit cmake desktop optfeature wxwidgets xdg
 
@@ -15,7 +15,7 @@ S="${WORKDIR}/pwsafe-${MY_PV}"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="qr test +xml yubikey"
 RESTRICT="!test? ( test )"
 
@@ -37,8 +37,6 @@ BDEPEND="
 	virtual/pkgconfig
 	test? ( dev-cpp/gtest )"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.15.0-gtest-no-gnu++11.patch )
-
 src_configure() {
 	setup-wxwidgets