8 files changed, 99 insertions, 35 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 6824b0c14a99..6a578c5d7e39 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/gnubiff/Manifest b/net-mail/gnubiff/Manifest
index f20befaefd7e..57cf361ef47d 100644
--- a/net-mail/gnubiff/Manifest
+++ b/net-mail/gnubiff/Manifest
@@ -1,6 +1,7 @@
-AUX gnubiff-2.2.15-fix-nls.patch 427 BLAKE2B efc85599f1ff5f253fd4804cad09a7539b2713343d97c84e19ff28639f6f687674bdc3cba77d73b54b6d29cdcab97d5ba95d9e74ae80c194b0bcbb059566c1e6 SHA512 6eacfb95520449bc5ecb5183ffbf8e2362157dfd75af4ec749cd54fc75de38177d70a12ac446f1e1cba158d64b151b85ec37f011ad0822ea45659c21e8b9984f
-AUX gnubiff-2.2.15-gold.patch 511 BLAKE2B c0ef1cdecfcc91ead4d1adf5e3fdecee1b4d85af7f2c7a795996bcff401346c2f88552c4d9f9df641e8ef6110d94d538f104b2964f3bf6704b855e3754154b0b SHA512 3811028380a2a8d2cf641ec15c4a0645ead86008f478137767e8b9e6fd4ced2421050c3d9163b01a47830e2e09af62e0af6155d17e8a5f165baa4779a0ce02b6
-AUX gnubiff-2.2.15-underlink.patch 337 BLAKE2B ea045a75986fd13e63549b7f187315ac7979ddf71b0be7ad4bd6ab3300af7e74fe4f9ccf8be01753180949648c7018b23eb51f9fe67e34725eeed621658a6c44 SHA512 6d03040784eed725848cde01533304e33c8b0045e0488936a9782ec2edcb8492ebd47fb263ff142510e0e96c06e60c3de84bb074171e54ad2860e6b3c1d4eeb4
+AUX gnubiff-2.2.17-clang.patch 455 BLAKE2B b996eab8a97dfbf8d6f5d8640f6362edd0caf36742d91a24fd8569ff37a168ad36b6c04adb5ed444116896e36e747c8dfd6889f692dbb2ee336cad4a4cdfeda4 SHA512 74d6f4dcc602f35c898d7566ff66408f0417d90ebc5771aef35719bd2ab28cddc91984d164e87e2e96a5c1f85dd174c70e6a62b33b922efe17fb71e8c601b5a4
+AUX gnubiff-2.2.17-configure.patch 570 BLAKE2B 65c5883636730151589b1617f8f07d8a6e8f841e72613f2279418d6b2af39d7bd34d7dc8495754ca61f89f522c54bb783200978278413dd6af9d37b598799840 SHA512 d56dbb338c8cda9c18e6224ca0a83cce2f297eaf4e76109e8cefa8cf5e3d0d562b3d1b6f98b6e7c21b39e9af7ad7fd4d7409ce091f9cb0d95c6859c276d3749b
+AUX gnubiff-2.2.17-fix-nls.patch 428 BLAKE2B b5249410f139d9f847aee82e18638e72d00c406e971bcea814b4566056974d4aae93b042378dff9ab5df1010b4f0142fcdb0cbbad97142e9b047ed9250eaa97a SHA512 aa12ea13e861bbef319292c3c7a393f101fb073f39bb5f070664079823cec93d2a9bc2176200dc152097d6e95afbc2018cb1ca05d94f9d5f23ba6c8c32a87145
 DIST gnubiff-2.2.17.tar.gz 897817 BLAKE2B 5ee58828211eb7b85ab017129feec48c6d2b2df4de862f7791f15f361bda7919cbdc7aa37403130da044a1f9e2068154ddc5ae8629eb9f4d38956d759477fb80 SHA512 2fe715d584fb057255d4922275de152ff5b1167abcbdd27d33124921a4c659c3db301944a73d58622ecd22f62615d44b5bebb83838bbd53c67a2dd8286592d89
 EBUILD gnubiff-2.2.17-r2.ebuild 1118 BLAKE2B 930d805431cfe91e2fd534db195698b486d51693316acbe58d8523e2a583f29ef0d50de3fde2cd66aa945c4eade105a4fd55ec304de4a87ae415741db38a7bbb SHA512 3939b0f71fd664d0bbaff1943d22d8c8a0599d94312d65a0822ab9f2bd122e1e5c6e6de231ba7d37567e339f0a8e205fc8eb1295596cadb70c672a84361c54c2
+EBUILD gnubiff-2.2.17-r3.ebuild 1244 BLAKE2B 0b50cc6ccc17942ac4b625874e0d1a07be7012948db9a8d09e5da750c34b4bc7a788d92e6b7337ac0e78bc9c86d5ec2fa814e0d5dec46dcb6d78c036d33d627b SHA512 aec56355b8e1877a2c0df4a6775c5fdf70a09e0ddb9aba9b07ec4a87007eb3cf0f3965766a7caae17519b662a3c1eb876758fc4f41b8fb19dda7acd0a71d8504
 MISC metadata.xml 360 BLAKE2B cfc6e2635613789656ddcf8b0b7e3401e2b0e6c63b9f7c3b03f30c7ad450177596ced8246b74787c32d3a74027a1e6602df76d762328110127b3880b3eeaf10d SHA512 7d944abc4d771cb98ad569f516804d5c45acdc3a718d8b70fe2e709d51ba483419d0bb222a6b61c73187634922aee339096292da2008c70c1f27181d3134377e
diff --git a/net-mail/gnubiff/files/gnubiff-2.2.15-gold.patch b/net-mail/gnubiff/files/gnubiff-2.2.15-gold.patch
deleted file mode 100644
index fa31316671fd..000000000000
--- a/net-mail/gnubiff/files/gnubiff-2.2.15-gold.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Eray Aslan <eras@gentoo.org>
-Date:   Sat Jun 4 19:54:16 2011 +0000
-
-    do not underlink - needed for gold
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -117,6 +117,9 @@ AC_CHECK_LIB(ssl, AES_encrypt, AC_DEFINE_UNQUOTED(HAVE_AES, 1,
- 			 Define to 1 if AES encryption is available), [
- 	AC_CHECK_LIB(crypto, AES_encrypt, AC_DEFINE_UNQUOTED(HAVE_AES, 1))])
- 
-+dnl needed for gold
-+AC_CHECK_LIB([X11],[XSync])
-+
- dnl GLIB, GTK, ...
- GTK_REQUIRED="gtk+-2.0 >= 2.6"
- GDK_PIXBUF_REQUIRED="gdk-pixbuf-2.0 >= 2.4"
diff --git a/net-mail/gnubiff/files/gnubiff-2.2.15-underlink.patch b/net-mail/gnubiff/files/gnubiff-2.2.15-underlink.patch
deleted file mode 100644
index a3f8ee9c75d8..000000000000
--- a/net-mail/gnubiff/files/gnubiff-2.2.15-underlink.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Bug #456302
---- configure.ac	2013-02-15 13:15:01.306855243 +0200
-+++ configure.ac	2013-02-15 13:20:07.921188143 +0200
-@@ -120,6 +120,8 @@
- dnl needed for gold
- AC_CHECK_LIB([X11],[XSync])
- 
-+AC_CHECK_LIB([gthread-2.0],[g_thread_init])
-+
- dnl GLIB, GTK, ...
- GTK_REQUIRED="gtk+-3.0 >= 3.0.0"
- GMODULE_REQUIRED="gmodule-export-2.0 >= 2.4"
diff --git a/net-mail/gnubiff/files/gnubiff-2.2.17-clang.patch b/net-mail/gnubiff/files/gnubiff-2.2.17-clang.patch
new file mode 100644
index 000000000000..1d4d926715bc
--- /dev/null
+++ b/net-mail/gnubiff/files/gnubiff-2.2.17-clang.patch
@@ -0,0 +1,15 @@
+--- gnubiff-2.2.17-r3/src/Makefile.am
++++ gnubiff-2.2.17-r3/src/Makefile.am
+@@ -6,11 +6,11 @@
+ 	-DGNUBIFF_DATADIR=\""$(pkgdatadir)"\"			\
+ 	-DGNUBIFF_ICONDIR=\""$(datadir)/pixmaps"\"		\
+ 	-DGNUBIFF_UIDIR=\""$(datadir)/gnome-2.0/ui"\"	\
+ 	-DREAL_DATADIR=\""$(datadir)"\"					\
+ 	-D_GNU_SOURCE									\
+-	-Wall -ansi -pedantic -export-dynamic
++	-Wall -ansi -pedantic
+ 
+ bin_PROGRAMS = gnubiff
+ 
+ gnome_sources =  \
+ 	ui-applet-gnome.cc 		ui-applet-gnome.h
diff --git a/net-mail/gnubiff/files/gnubiff-2.2.17-configure.patch b/net-mail/gnubiff/files/gnubiff-2.2.17-configure.patch
new file mode 100644
index 000000000000..bdf108e68d1c
--- /dev/null
+++ b/net-mail/gnubiff/files/gnubiff-2.2.17-configure.patch
@@ -0,0 +1,18 @@
+--- gnubiff-2.2.17/configure.ac
++++ gnubiff-2.2.17/configure.ac
+@@ -115,10 +115,15 @@
+ dnl LIBSSL (for AES encryption/decryption)
+ AC_CHECK_LIB(ssl, AES_encrypt, AC_DEFINE_UNQUOTED(HAVE_AES, 1, 
+ 			 Define to 1 if AES encryption is available), [
+ 	AC_CHECK_LIB(crypto, AES_encrypt, AC_DEFINE_UNQUOTED(HAVE_AES, 1))])
+ 
++dnl needed for gold
++AC_CHECK_LIB([X11],[XSync])
++
++AC_CHECK_LIB([gthread-2.0],[g_thread_init])
++
+ dnl GLIB, GTK, ...
+ GTK_REQUIRED="gtk+-3.0 >= 3.0.0"
+ GMODULE_REQUIRED="gmodule-export-2.0 >= 2.4"
+ X11="xproto x11"
+ PKG_CHECK_MODULES(GNUBIFF_DEP, 
diff --git a/net-mail/gnubiff/files/gnubiff-2.2.15-fix-nls.patch b/net-mail/gnubiff/files/gnubiff-2.2.17-fix-nls.patch
index db83cde41676..1f54053bc0bf 100644
--- a/net-mail/gnubiff/files/gnubiff-2.2.15-fix-nls.patch
+++ b/net-mail/gnubiff/files/gnubiff-2.2.17-fix-nls.patch
@@ -1,6 +1,8 @@
---- src/nls.h	2009-01-01 16:45:39.000000000 -0800
-+++ src/nls.h	2010-10-01 17:13:03.595458860 -0700
-@@ -49,11 +49,6 @@
+--- gnubiff-2.2.17/src/nls.h
++++ gnubiff-2.2.17/src/nls.h
+@@ -43,13 +43,8 @@
+ #    define N_(String) (String)
+ #  endif
  #else
  #  define _(String) (String)
  #  define N_(String) (String)
diff --git a/net-mail/gnubiff/gnubiff-2.2.17-r3.ebuild b/net-mail/gnubiff/gnubiff-2.2.17-r3.ebuild
new file mode 100644
index 000000000000..0d4ecb09b88c
--- /dev/null
+++ b/net-mail/gnubiff/gnubiff-2.2.17-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A mail notification program"
+HOMEPAGE="https://gnubiff.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug fam nls password"
+
+# This package depends upon deprecated gnome-base/libglade.  An
+# upstream but has been filed on this issue.
+# (https://sourceforge.net/p/gnubiff/bugs/67/)
+
+RDEPEND="
+	dev-libs/popt
+	>=gnome-base/libglade-2.3
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-3:3
+	x11-libs/libX11
+	x11-libs/pango
+	fam? ( virtual/fam )
+	password? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.17-fix-nls.patch
+	"${FILESDIR}"/${PN}-2.2.17-configure.patch
+	"${FILESDIR}"/${PN}-2.2.17-clang.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-gnome # avoid deprecated gnome-panel-2.x
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable fam)
+		$(use_with password)
+		$(use_with password password-string ${RANDOM}${RANDOM}${RANDOM}${RANDOM})
+	)
+	econf "${myeconfargs[@]}"
+}