4 files changed, 96 insertions, 33 deletions
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index 4cb3c9dc2d2b..5301b99b1991 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -1 +1,2 @@
-DIST passwordsafe-1.15.0.tar.gz 15354159 BLAKE2B 699f80325884cba9bc6e5ffb33bea5c0b2c01f12ed7e4ea1226c4a64c761a8f20b8272e771261ca59aeeb49bfaa4ea83edc9af6c0aa9ae853e537b0f76f28aaa SHA512 803572afc479d608899e1166ef032a2a660fce122e03f89f59f8e9da9f7439e0eb1d602f77283200626f49d7e146e82edf8edee40060ff4cf6163e81bdf5f738
+DIST passwordsafe-1.17.0.tar.gz 15463920 BLAKE2B e64c73139c829b16b5f825d3c078f1cb3285cb15400be988e35b64e4ce701a5241e099a09092a576e487f709464b6fa5d5911f5f68e096d194329cd0214ac8cd SHA512 de1ef537c2f6c17e35d93a53cf46e86b7c1f1a4439282f8c2b98443845e3d381e113448acd739fc6ccdb5eee8ff7ebfd8c0e4306cda517ab623eaf5b9354d39d
+DIST passwordsafe-1.18.2.tar.gz 15613801 BLAKE2B e4ad44fe3aae6230c6a1d07e644b7b02831ec5bc815decd85050099c6f43e83bc09cd7d8f88ddfa5b63e5636db774f4b295bb34739e15115ba55c5142d3b08ae SHA512 09fb19133ff325832fa5d284aa1b1e7eda1788c4298424701132ede27fbb17956d874c0007ac00a2b9367d279175666744e192523ec79786baf626fb461abec7
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/passwordsafe-1.15.0.ebuild b/app-admin/passwordsafe/passwordsafe-1.17.0.ebuild
index bc3fbce0c6ee..fb5458c1a459 100644
--- a/app-admin/passwordsafe/passwordsafe-1.15.0.ebuild
+++ b/app-admin/passwordsafe/passwordsafe-1.17.0.ebuild
@@ -1,27 +1,26 @@
-# Copyright 2021-2022 Gentoo Authors
+# 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 flag-o-matic optfeature wxwidgets xdg
+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"
+S="${WORKDIR}/pwsafe-${MY_PV}"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="qr test +xml yubikey"
 RESTRICT="!test? ( test )"
 
-DEPEND="
-	dev-libs/openssl:0=
+RDEPEND="
 	net-misc/curl
-	sys-apps/file
 	sys-apps/util-linux
 	x11-libs/libXt
 	x11-libs/libXtst
@@ -29,23 +28,15 @@ DEPEND="
 	qr? ( media-gfx/qrencode )
 	xml? ( dev-libs/xerces-c )
 	yubikey? ( sys-auth/ykpers )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 BDEPEND="
 	app-arch/zip
+	dev-lang/perl
 	sys-devel/gettext
+	virtual/pkgconfig
 	test? ( dev-cpp/gtest )"
 
-S="${WORKDIR}/pwsafe-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.15.0-gcc12-time.patch
-)
-
-pkg_pretend() {
-	einfo "Checking for -std=c++11 support in compiler"
-	test-flags-CXX -std=c++11 > /dev/null || die
-}
-
 src_configure() {
 	setup-wxwidgets
 
diff --git a/app-admin/passwordsafe/passwordsafe-1.18.2.ebuild b/app-admin/passwordsafe/passwordsafe-1.18.2.ebuild
new file mode 100644
index 000000000000..9581dc5e6d16
--- /dev/null
+++ b/app-admin/passwordsafe/passwordsafe-1.18.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-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"
+S="${WORKDIR}/pwsafe-${MY_PV}"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~x86"
+IUSE="qr test +xml yubikey"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-misc/curl
+	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 )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	app-arch/zip
+	dev-lang/perl
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
+
+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
+}