summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnna Vyalkova <cyber+gentoo@sysrq.in>2023-01-15 08:29:38 +0200
committerJoonas Niilola <juippis@gentoo.org>2023-01-15 08:29:38 +0200
commitc3bbef528b501c7e3bb5d58a6f74a8167ae4f8d1 (patch)
tree9c4adab80113f1b323665b6ef9631da276045e00 /net-nntp/tin
parentx11-terms/kitty: update live (diff)
downloadgentoo-c3bbef528b501c7e3bb5d58a6f74a8167ae4f8d1.tar.gz
gentoo-c3bbef528b501c7e3bb5d58a6f74a8167ae4f8d1.tar.bz2
gentoo-c3bbef528b501c7e3bb5d58a6f74a8167ae4f8d1.zip
net-nntp/tin: drop libpcre support in 2.6.2
Signed-off-by: Anna Vyalkova <cyber+gentoo@sysrq.in> Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'net-nntp/tin')
-rw-r--r--net-nntp/tin/metadata.xml1
-rw-r--r--net-nntp/tin/tin-2.6.2-r1.ebuild (renamed from net-nntp/tin/tin-2.6.2.ebuild)11
2 files changed, 5 insertions, 7 deletions
diff --git a/net-nntp/tin/metadata.xml b/net-nntp/tin/metadata.xml
index 2273dcd0ef5a..99b4b39ce6a7 100644
--- a/net-nntp/tin/metadata.xml
+++ b/net-nntp/tin/metadata.xml
@@ -9,6 +9,5 @@
<flag name="cancel-locks">Enable Cancel-Lock header functionality</flag>
<flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> support</flag>
<flag name="libtls" restrict="&gt;=net-nntp/tin-2.6.2">Prefer <pkg>dev-libs/libretls</pkg> as SSL/TLS provider (ineffective with USE=-ssl)</flag>
- <flag name="pcre2" restrict="&gt;=net-nntp/tin-2.6.2">Use <pkg>dev-libs/libpcre2</pkg> instead of <pkg>dev-libs/libpcre</pkg></flag>
</use>
</pkgmetadata>
diff --git a/net-nntp/tin/tin-2.6.2.ebuild b/net-nntp/tin/tin-2.6.2-r1.ebuild
index 50345f36be9e..b5e39382f92c 100644
--- a/net-nntp/tin/tin-2.6.2.ebuild
+++ b/net-nntp/tin/tin-2.6.2-r1.ebuild
@@ -12,18 +12,17 @@ SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cancel-locks debug gnutls gpg libtls nls +pcre2 sasl socks5 ssl"
+IUSE="cancel-locks debug gnutls gpg libtls nls sasl socks5 ssl"
RDEPEND="
dev-libs/icu:=
+ dev-libs/libpcre2:=
dev-libs/uulib
sys-libs/ncurses:=
virtual/libiconv
cancel-locks? ( >=net-libs/canlock-3.0:= )
gpg? ( app-crypt/gnupg )
nls? ( virtual/libintl )
- pcre2? ( dev-libs/libpcre2:= )
- !pcre2? ( dev-libs/libpcre:3 )
sasl? ( virtual/gsasl )
socks5? ( net-proxy/dante )
ssl? (
@@ -37,6 +36,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="
app-alternatives/yacc
+ dev-libs/libpcre2
virtual/pkgconfig
nls? ( sys-devel/gettext )
"
@@ -56,9 +56,6 @@ src_configure() {
$(use_enable cancel-locks)
$(use_with cancel-locks canlock)
- $(use_with pcre2 pcre2-config)
- $(use_with !pcre2 pcre "${ESYSROOT}"/usr)
-
$(use_enable debug)
$(use_enable gpg pgp-gpg)
$(use_enable nls)
@@ -66,6 +63,8 @@ src_configure() {
--disable-mime-strict-charset
--enable-nntp
--enable-prototypes
+ --without-pcre
+ --with-pcre2-config
--with-coffee # easter egg :)
--with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.io}}"
--with-screen=ncursesw