Diff tin-2.6.1-r1 with a tin-2.6.2-r1

/usr/portage/net-nntp/tin/tin-2.6.2-r1.ebuild 2023-10-09 14:52:34.732368482 +0300
12 12
LICENSE="BSD"
13 13
SLOT="0"
14 14
KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
15
IUSE="cancel-locks debug gpg nls sasl socks5"
15
IUSE="cancel-locks debug gnutls gpg libtls nls sasl socks5 ssl"
16 16

  
17 17
RDEPEND="
18 18
	dev-libs/icu:=
19
	dev-libs/libpcre:3
19
	dev-libs/libpcre2:=
20 20
	dev-libs/uulib
21
	sys-libs/ncurses:=[unicode(+)]
21
	sys-libs/ncurses:=
22
	virtual/libiconv
22 23
	cancel-locks? ( >=net-libs/canlock-3.0:= )
23 24
	gpg? ( app-crypt/gnupg )
24 25
	nls? ( virtual/libintl )
25 26
	sasl? ( virtual/gsasl )
26 27
	socks5? ( net-proxy/dante )
28
	ssl? (
29
		gnutls? ( net-libs/gnutls:= )
30
		!gnutls? (
31
			libtls? ( dev-libs/libretls:= )
32
			!libtls? ( dev-libs/openssl:= )
33
		)
34
	)
27 35
"
28 36
DEPEND="${RDEPEND}"
29 37
BDEPEND="
30
	virtual/pkgconfig
31 38
	app-alternatives/yacc
39
	dev-libs/libpcre2
40
	virtual/pkgconfig
41
	nls? ( sys-devel/gettext )
32 42
"
33 43

  
44
PATCHES=( "${FILESDIR}"/${P}-gnutls.patch )
45

  
34 46
DOCS=(
35 47
	README{,.MAC,.WIN}
36 48
	doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW,filtering}
37 49
)
38 50

  
39
PATCHES=(
40
	"${FILESDIR}"/${PN}-2.6.1-configure-clang16.patch
41
)
42

  
43 51
src_configure() {
44 52
	tc-export AR CC RANLIB
53
	tc-export_build_env
45 54

  
46 55
	local myeconfargs=(
47
		$(use_enable cancel-locks) $(use_with cancel-locks canlock)
56
		$(use_enable cancel-locks)
57
		$(use_with cancel-locks canlock)
58

  
48 59
		$(use_enable debug)
49 60
		$(use_enable gpg pgp-gpg)
50 61
		$(use_enable nls)
51
		$(use_with socks5 socks) $(use_with socks5)
62
		$(use_with socks5 socks)
52 63
		--disable-mime-strict-charset
53
		--enable-nntp-only
64
		--enable-nntp
54 65
		--enable-prototypes
55
		--with-coffee
66
		--without-pcre
67
		--with-pcre2-config
68
		--with-coffee # easter egg :)
56 69
		--with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.io}}"
57
		--with-pcre=/usr
58 70
		--with-screen=ncursesw
71
	)
72

  
73
	if use ssl; then
74
		if use gnutls; then
75
			myeconfargs+=( --with-nntps=gnutls )
76
		elif use libtls; then
77
			myeconfargs+=( --with-nntps=libtls )
78
		else
79
			myeconfargs+=( --with-nntps=openssl )
80
		fi
81
	fi
59 82

  
83
	myeconfargs+=(
60 84
		# set default paths for utilities
61 85
		--with-editor="${EPREFIX}"/usr/libexec/editor
62 86
		--with-gpg="${EPREFIX}"/usr/bin/gpg
63 87
		--with-ispell="${EPREFIX}"/usr/bin/aspell
64 88
		--with-mailer="${EPREFIX}"/bin/mail
65
		--with-metamail="${EPREFIX}"/usr/bin/metamail
66 89
		--with-sum="${EPREFIX}"/usr/bin/sum
90

  
91
		# set default paths for directories
92
		--with-libdir="${EPREFIX}"/var/lib/news
93
		--with-spooldir="${EPREFIX}"/var/spool/news
67 94
	)
68 95

  
69 96
	econf "${myeconfargs[@]}"
70 97
}
71 98

  
72 99
src_compile() {
73
	# To build from the root dir you have to call `make build`, not just
74
	# `make`.
100
	# To build from the root dir you have to call `make build`, not just `make`.
75 101
	emake build
76 102
}
77 103

  
78 104
src_install() {
79 105
	default
106

  
80 107
	emake DESTDIR="${D}" install_sysdefs
81 108
	emake -C src DESTDIR="${D}" install_nls_man
82 109

  
Thank you!