net-mail/gnubiff: add 2.2.17-r3

- adds a new LICENSE GPL-3+-with-openssl-exception
- cleans up all old 2.2.15 patches
- fixes compilation errors on clang-only systems by removing
  '-export-dynamic' from Makefile

Closes: https://bugs.gentoo.org/880267
Closes: https://bugs.gentoo.org/930500
Closes: https://bugs.gentoo.org/933241
Signed-off-by: Phil Stracchino <phils@caerllewys.net>
Closes: https://github.com/gentoo/gentoo/pull/37513
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>

6 files changed, 95 insertions, 32 deletions

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[@]}"
+}