8 files changed, 75 insertions, 103 deletions
diff --git a/sys-apps/pick/Manifest b/sys-apps/pick/Manifest
index 1a6bc5ac7c73..74e1ecb19fe9 100644
--- a/sys-apps/pick/Manifest
+++ b/sys-apps/pick/Manifest
@@ -1,3 +1 @@
-DIST pick-2.0.1.tar.gz 108010 BLAKE2B 3fae7cfbbcf6913af9cf695e44f171aef58737038e94c779f0cedbe2e386577b4661cc9a55ad657b1a11873fc06bdb7bdc8eac032b6ca584778fe695f8ad4e68 SHA512 616c7889e2ad5d5bb267f683530327e9e121a678db4bd04d5cd720bb8bd81ae14e6bd83e342b33863ef18bd10943e6bbdef177c9639af513456e0146f9b73226
-DIST pick-2.0.2.tar.gz 132174 BLAKE2B 1f186d7dd0fc628d7a1b5fd41ad8c4b0c81f12c1855418354e77376232beb9fa500f43172d8d75f55972ee2589feafbefa6d777cb2149e4707509df355542744 SHA512 92d74fa62f6c829117c6c3faf6ec39fc5dd66465516be396d21d7b0a92ee10761a1d3f43aa4a454f8d19790ac02a4a1af145139d488344c97a511805c5d6965b
-DIST pick-3.0.1.tar.gz 29878 BLAKE2B 8910bf726102802a76717ecc20360882c1c25bc346324c33173eb64872066ff284636557bf10a98a6cfbecc50dd4c8cd87b68aa924b976b072e5fead8989e316 SHA512 7448e7937640f69d397bd1bd48526865b8866a8f47eb04b7af918df992f36b6e932a1cb68e845f9262faa9c88c1afcb354368b7e1c6b1dd8503aafdb53e4b70f
+DIST pick-4.0.0.tar.gz 29786 BLAKE2B c1d119cfb5dd91bd3c71171d32a6ce92d06ab8ea1cfa5a40c042448b7b90ef5d24c02dc04962b24ef91fd3ea5cb56858b231901c7035f47e2c04682f99e5c61e SHA512 690f8ee174f69ec5897831b71f22bc82dbdaf71329e2b540cfb06e49963231196efe6192d1f564c1c7029c7335736d42f02483850ccbb2bd5bcd1dc52b034f56
diff --git a/sys-apps/pick/files/pick-1.8.0-cflags.patch b/sys-apps/pick/files/pick-1.8.0-cflags.patch
deleted file mode 100644
index 6d7834b5cad9..000000000000
--- a/sys-apps/pick/files/pick-1.8.0-cflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pick-1.8.0/Makefile.am
-+++ pick-1.8.0/Makefile.am
-@@ -1,6 +1,6 @@
- AUTOMAKE_OPTIONS=foreign
- 
--AM_CFLAGS=-Wall -Werror -Wextra
-+AM_CFLAGS=-Wall -Wextra
- AM_CPPFLAGS=-D_GNU_SOURCE
- 
- bin_PROGRAMS=pick
diff --git a/sys-apps/pick/files/pick-4.0.0-tinfo.patch b/sys-apps/pick/files/pick-4.0.0-tinfo.patch
new file mode 100644
index 000000000000..7797f1422d94
--- /dev/null
+++ b/sys-apps/pick/files/pick-4.0.0-tinfo.patch
@@ -0,0 +1,28 @@
+From a21522afa9fcd0f299923767f71577feac34be4c Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Sun, 10 Jan 2021 00:51:36 +0100
+Subject: [PATCH] configure: Fix build against ncurses with separate tinfo lib
+
+Gentoo-bug: https://bugs.gentoo.org/685712
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure b/configure
+index 857ce4e..e0f26ee 100755
+--- a/configure
++++ b/configure
+@@ -161,6 +161,9 @@ set -x
+ if (LDFLAGS=-lcurses check_curses); then
+ 	HAVE_CURSES=1
+ 	LDFLAGS="${LDFLAGS} -lcurses"
++elif (LDFLAGS=-ltinfow check_curses); then
++	HAVE_NCURSESW=1
++	LDFLAGS="${LDFLAGS} -ltinfow"
+ elif (LDFLAGS=-lncursesw check_curses); then
+ 	HAVE_NCURSESW=1
+ 	LDFLAGS="${LDFLAGS} -lncursesw"
+-- 
+2.30.0
+
diff --git a/sys-apps/pick/metadata.xml b/sys-apps/pick/metadata.xml
index 6eab74ef0029..370118421de4 100644
--- a/sys-apps/pick/metadata.xml
+++ b/sys-apps/pick/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">mptre/pick</remote-id>
 	</upstream>
diff --git a/sys-apps/pick/pick-2.0.1.ebuild b/sys-apps/pick/pick-2.0.1.ebuild
deleted file mode 100644
index 88c100aa3408..000000000000
--- a/sys-apps/pick/pick-2.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="a fuzzy search tool for the command-line"
-HOMEPAGE="https://github.com/calleerlandsson/pick"
-SRC_URI="https://github.com/calleerlandsson/pick/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.0-cflags.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sys-apps/pick/pick-2.0.2.ebuild b/sys-apps/pick/pick-2.0.2.ebuild
deleted file mode 100644
index 54ee90179479..000000000000
--- a/sys-apps/pick/pick-2.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="a fuzzy search tool for the command-line"
-HOMEPAGE="https://github.com/mptre/pick"
-SRC_URI="https://github.com/mptre/pick/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sys-apps/pick/pick-3.0.1.ebuild b/sys-apps/pick/pick-3.0.1.ebuild
deleted file mode 100644
index 15898cb11a03..000000000000
--- a/sys-apps/pick/pick-3.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="a fuzzy search tool for the command-line"
-HOMEPAGE="https://github.com/mptre/pick"
-SRC_URI="https://github.com/mptre/pick/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	# not autoconf
-	./configure || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" BINDIR=/usr/bin MANDIR=/usr/share/man install
-	dodoc CHANGELOG.md
-}
diff --git a/sys-apps/pick/pick-4.0.0-r1.ebuild b/sys-apps/pick/pick-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..c0a61f4ebb91
--- /dev/null
+++ b/sys-apps/pick/pick-4.0.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A fuzzy search tool for the command-line"
+HOMEPAGE="https://github.com/mptre/pick"
+SRC_URI="https://github.com/mptre/pick/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.0-tinfo.patch"
+)
+
+# all these checks are compiled via a homebrew configure script which
+# does set -Werror. bug #908573
+QA_CONFIG_IMPL_DECL_SKIP+=(
+	# "check if _GNU_SOURCE is needed" ???
+	wcwidth
+	# not available on Linux
+	pledge
+	# libbsd
+	strtonum
+)
+
+src_configure() {
+	# not autoconf
+	tc-export CC
+	./configure || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" BINDIR=/usr/bin MANDIR=/usr/share/man install
+	dodoc CHANGELOG.md
+}