gentoo auto-resync : 03:12:2022 - 08:59:05

3 files changed, 74 insertions, 7 deletions

diff --git a/app-misc/pwsafe/Manifest b/app-misc/pwsafe/Manifest
index b453b0458ef8..6ffe70251dc9 100644
--- a/app-misc/pwsafe/Manifest
+++ b/app-misc/pwsafe/Manifest
@@ -2,7 +2,8 @@ AUX pwsafe-0.2.0-XChangeProperty.patch 1613 BLAKE2B 1a9ed912fe1581f7ed2006595801
 AUX pwsafe-0.2.0-cvs-1.57.patch 1100 BLAKE2B 66038b0d11f061509a3a6300837f72bec77de84d014e1b15b5b0cd6ea9d7dde0fe446276f5fad876ee53dcf48421f43cb7717f4a5179d171273f36cbecf03426 SHA512 3772c833b16b29c5119f11a7c106e4a7b2d4d3f8cf17d42c78f5403cd5ae92136dadc16c5cfcf961822db4c76f04946412637547173a26227761f74d83765330
 AUX pwsafe-0.2.0-fake-readline.patch 2667 BLAKE2B 297032d651ae485796fd4a213182416de6a6503816d9631b2d372efb2e0e81fe4c1e9371746a8e9cb050834884513a2892dafa730bd1ac599fcce1712358ad58 SHA512 466686d56662728c7c4d208ff69212daa84a86b746a9b4e52d48b2c7789d83fc1ad98673a8979a6f750c8215a0199e5580b5eb152b29e13761b1254eab30778e
 AUX pwsafe-0.2.0-man-page-option-syntax.patch 848 BLAKE2B d05bca68e0d8d224c059b4b949bf5fd590eede9840dafb03e6df37cd961d867db9bd5cb3be15fb804961fd51d2ba6196d035ab18622a4d19e0f6882b9d980856 SHA512 17697927e64e5bcdbc68343775732e1559dd7fe5c000b15fda9af7229f3c2c36bbd4ee3af3c652da9e8d0550acd1b5bb39a75891f5f40c37640ea089a5b6306e
+AUX pwsafe-0.2.0-modern-autoconf-automake.patch 2102 BLAKE2B 59310804c060522620707a0ea0127c48f1c7f293b7d7511dda6557c01bc1b3307023251edfe64641a427dc10907c53ef02d9d6d3f958786c51b6ca4fa24c68d1 SHA512 a9424b3f6bb984bbb3a624bc1cf77bea11e36298b8d03920615c514d4dcc6c80e11b0481f20595996dac60e52f3dc6ecfb96be0b915235d2f1819c5795031ded
 AUX pwsafe-0.2.0-printf.patch 1868 BLAKE2B 85ca5b70068dc50f6f650d766cf381dd2013640b45db0628df7137c5694a18783932e0effcb86f60b27a84aaedb77c25c86c281f4d05b357cea72961340a64be SHA512 7567e666f7dfb9c798aa2e6368ea1abf72f749c953da42bff7ef1b61aea6bf2faca96ef702ef9f7a9ceeece90999c066763006e549c5f2ec365cbf9358547449
 DIST pwsafe-0.2.0.tar.gz 127433 BLAKE2B abfcf36e3fc685100302b4dc7862cc8d8335e5dade40943cb0b7ef17b83dd2b75c36e3069d6bf759ba907e46adf20f3712af5223a8d8a586ae57e98ff6c0a3db SHA512 e8d3684f523f83def6317ef5561a02d1493685cfbda18707644bf335b7f45b1a548aae17a735838d9f6df345ddb17934607162a6e99348df625b34a9ad5f4cf3
-EBUILD pwsafe-0.2.0-r5.ebuild 1041 BLAKE2B 91af96d3d1ca02ccc96afefc70c26509b8a780891ab2c7446a83ff9df278be06b6ed5bf26d252364cb1018877773a768aaeea70c245dac97b55f3715a62c4c43 SHA512 1d347dd65c1ee276748138e34b4c7eb2d05ec6edec2090d644f4e2fe02fd26d7c39e7c3f499e415ad02e233bddaef46a14c8453e48f48c8d61953ec1bfc1697f
+EBUILD pwsafe-0.2.0-r6.ebuild 1141 BLAKE2B 24c4d1c800926009900bd3ec155a004ea960274ef6db159395c94e4149569336a63a1aba5206eb4c893fed349694d3e7c9b5b2d0d59b343d00c4e348e55a9181 SHA512 744748ffdadb3f171ba4a99664cf30a434fd4f484f4750e5e40ec9ebcaf3795ee9aec3875cd155ace27ee7979afb1fcb1b3a38ffd9746660a4823d287cff3709
 MISC metadata.xml 898 BLAKE2B 7b9e05353cdc1f2ed29c8a1007b947841876283061832c82b775a1d6cf8ccb196be86dfb83cc5fc215e6b50566061d2fab343d30134143009280d3f25e43a4d7 SHA512 130ca5ac4eb88623e9b936b2572eae23a3f5a10e0273bbf99376bce646b29b016e277368800acce6c2247616fa3d3c6b7eea1e24dca0f0ed0f3a2cb7964bb33d
diff --git a/app-misc/pwsafe/files/pwsafe-0.2.0-modern-autoconf-automake.patch b/app-misc/pwsafe/files/pwsafe-0.2.0-modern-autoconf-automake.patch
new file mode 100644
index 000000000000..a10940fd5716
--- /dev/null
+++ b/app-misc/pwsafe/files/pwsafe-0.2.0-modern-autoconf-automake.patch
@@ -0,0 +1,61 @@
+https://github.com/nsd20463/pwsafe/commit/7a960f21eed6e3e8b74bf32628c38a5d8c963587
+https://github.com/nsd20463/pwsafe/commit/0bc444c8caadcbd93143e5dba77db3abfd3e51d2
+
+From 7a960f21eed6e3e8b74bf32628c38a5d8c963587 Mon Sep 17 00:00:00 2001
+From: "Nicolas S. Dade" <nic.dade@gmail.com>
+Date: Sat, 13 Jun 2015 16:49:20 -0700
+Subject: [PATCH] update ac input files to fix warnings from modern (version
+ 1.14.1) aclocal
+
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -6,7 +6,7 @@ dnl Define HAVE_STRUCT_UTIMBUF if `struct utimbuf' is declared --
+ dnl usually in <utime.h>.
+ dnl Some systems have utime.h but don't declare the struct anywhere.
+ 
+-AC_DEFUN(jm_CHECK_TYPE_STRUCT_UTIMBUF,
++AC_DEFUN([jm_CHECK_TYPE_STRUCT_UTIMBUF],
+ [
+   AC_CHECK_HEADERS(utime.h)
+   AC_REQUIRE([AC_HEADER_TIME])
+--- a/configure.ac
++++ b/configure.ac
+@@ -146,7 +146,7 @@ AC_CHECK_TYPE(socklen_t,[AC_DEFINE(HAVE_SOCKLEN_T, 1, [Define to 1 if the type s
+ 
+ 
+ dnl Checks for library functions.
+-AM_SYS_POSIX_TERMIOS
++AC_SYS_POSIX_TERMIOS
+ if test "$am_cv_sys_posix_termios" != yes -a "$ac_cv_sys_posix_termios" != yes; then
+   AC_MSG_ERROR("POSIX termios operations are required")
+ fi
+
+From 0bc444c8caadcbd93143e5dba77db3abfd3e51d2 Mon Sep 17 00:00:00 2001
+From: "Nicolas S. Dade" <nic.dade@gmail.com>
+Date: Sat, 13 Jun 2015 17:02:04 -0700
+Subject: [PATCH] Update configure.ac and INSTALL for a modern (1.14.1)
+ automake
+
+It seems fine to let automake symlink to its default versions
+of files it wants (like 'compile' and 'test-driver'), so for
+now I do that.
+
+Maybe instead I should regenerate everything. After all most
+of the autoXxx bits date from 2004.
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,10 +3,10 @@ dnl confgure.ac for pwsafe
+ dnl $Id$
+ 
+ AC_PREREQ(2.5)
+-AC_INIT(pwsafe.cpp)
+ 
+-dnl Every other copy of the package version number gets its value from here
+-AM_INIT_AUTOMAKE(pwsafe, 0.2.0)
++dnl Every other copy of the package version number gets its value from the following line
++AC_INIT([pwsafe.cpp], [0.2.0])
++AM_INIT_AUTOMAKE
+ 
+ dnl create a config.h file (Automake will add -DHAVE_CONFIG_H)
+ AM_CONFIG_HEADER(config.h)
+
diff --git a/app-misc/pwsafe/pwsafe-0.2.0-r5.ebuild b/app-misc/pwsafe/pwsafe-0.2.0-r6.ebuild
index ae32ba74d73e..04977864b35b 100644
--- a/app-misc/pwsafe/pwsafe-0.2.0-r5.ebuild
+++ b/app-misc/pwsafe/pwsafe-0.2.0-r6.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="A Password Safe compatible command-line password manager"
 HOMEPAGE="https://github.com/nsd20463/pwsafe"
@@ -10,12 +12,12 @@ SRC_URI="https://web.archive.org/web/20171006105548if_/http://nsd.dyndns.org/pws
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-
 IUSE="X readline"
 
-DEPEND="sys-libs/ncurses:0=
-	dev-libs/openssl:0=
-	readline? ( sys-libs/readline:0= )
+DEPEND="
+	dev-libs/openssl:=
+	sys-libs/ncurses:=
+	readline? ( sys-libs/readline:= )
 	X? (
 		x11-libs/libSM
 		x11-libs/libICE
@@ -31,7 +33,10 @@ src_prepare() {
 	eapply -p0 "${FILESDIR}/${P}-fake-readline.patch"
 	eapply -p0 "${FILESDIR}/${P}-man-page-option-syntax.patch"
 	eapply -p0 "${FILESDIR}/${P}-XChangeProperty.patch"
+	eapply "${FILESDIR}/${P}-modern-autoconf-automake.patch"
 	eapply_user
+	# Clang 16
+	eautoreconf
 }
 
 src_configure() {