gentoo resync : 06.04.2022

4 files changed, 80 insertions, 71 deletions

diff --git a/net-news/sfeed/Manifest b/net-news/sfeed/Manifest
index e5e667a74ec2..a14e26360646 100644
--- a/net-news/sfeed/Manifest
+++ b/net-news/sfeed/Manifest
@@ -1,6 +1,5 @@
-AUX sfeed-1.2-ldflags.patch 885 BLAKE2B a100ccffbd7dd909515c03f3f3eff96c453fc5971068ced87d6e11a7da2ea877f070403f0ed6d6ffae20fbc490d6432aa2e58094d5c5fa0cef72f5313cfb98d9 SHA512 560960c10d5ac3e941d0c4d7072387cad9ce3caa612f97f3adde36aa5bccbc5477e3c41e4641a94432721b9313c8e67447605f77692ffb28c9f5f24d26c7c3c3
-DIST sfeed-1.2.tar.gz 62575 BLAKE2B 080ef555e9ea6711ec1eea296c15dc11d937035742d32096f28ee4b4023c9cd4fcd0f7b59807cfdbfaa82c5f2bd7d51045caabcf33e72f2fd193c82885547cf3 SHA512 4307f11ab02310a881717d99892486152dad93ecb1d6526401e60d6275c1610d90599de9784d9878f9ebb5aa34881abd1daa348c977d9ef6758095be74216a29
 DIST sfeed-1.3.tar.gz 63037 BLAKE2B 30e3b8a82380b15230e895bc281d7c4ee33126269233fbc281e223b02976c236ca95d20764e0e30238149b97df44fbf197ea5003382774503ef1fad929835039 SHA512 858ebe0bf76f119a3b1a1b1bdf03a13b8085802bb796ae68f0a5ccb85e13747cc55498c29ef0443401678e56326bdef2bf9688966144e9581ff2cae486b729be
-EBUILD sfeed-1.2.ebuild 962 BLAKE2B e64022c34115ff78e037c2ddcd57570f8bfaacea61e0c917402051a80aed19f747fd4a3298c6a72f286dea80f3f2f0a8f2af0f9ae4c79233f77efaa975da681d SHA512 726e9e363f4603dcf35ab4570b9384fceb7fa4d67d5115b71f2575fa6e75cc7d053045689891e7363fab4e5af5fda2b8307c649a6d6f0169e7c0a1e11145c899
+DIST sfeed-1.4.tar.gz 64312 BLAKE2B 517c25eb28ba120e3d1bb564812fdfd6453741ddf09d60ca2f6b5c30bda15f17fc187302e803cc91937d3582116654f732a030a7aa17dfc9b234a0c858770674 SHA512 9187692076cad9029dd65c58c666972b8aeaefe90155ce9105af32803cdd0365c3b66fafcb5bee485d466126142a3a26f6f38cc9696531c2623b7e8963c578fb
 EBUILD sfeed-1.3.ebuild 2145 BLAKE2B 61f2343cd1e3c1122cc718efdc8664f500e4f4d3764acd033a0669be3275a380163cec323c8c7b658d7f4386f1ceb5a6a48d3035045b867aef9cc802add4e981 SHA512 c0b229f2147f3cf8c5775ac67239b184d34ed74c5576525c9a3a8866242137b779f652dab204cd903b9a6a29dca285e1fe7db5375ef9fb729a744d55c13b163e
+EBUILD sfeed-1.4.ebuild 2132 BLAKE2B 7195461d20e235a937c6c765edde55f1f6c04d3a2c7ea0f3970319294826ae8258b9ea5844f951102e5bc95f5aae29eec667d65cbb4832f638a3a17f0399fe23 SHA512 4e01e16822eea08bac1015d0472372a975d22e4cda4ab077ef2e484592873af8351859efeb8ea4f854760c563faff5be5cdc6ca756d6c9eca08e3262a351afac
 MISC metadata.xml 800 BLAKE2B 21467934f1d8fb7f3b77e26daa8595a19d4a2d4e87aebfcffbefd367348668fec28eb560e98505c4f4cb7a479b5c2e5e1e9992a8b7d66ee651ed37895bda8aa9 SHA512 08fa61b54e15a3968f168a4a542a55a14d33ee539a67bfe4a58770d6b2a4553483fdd8889a436287462858b2d56f0022c14b71f7c7b1834092c4c4a9f92b7387
diff --git a/net-news/sfeed/files/sfeed-1.2-ldflags.patch b/net-news/sfeed/files/sfeed-1.2-ldflags.patch
deleted file mode 100644
index 51f712976e9a..000000000000
--- a/net-news/sfeed/files/sfeed-1.2-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ru sfeed-1.2.orig/Makefile sfeed-1.2/Makefile
---- sfeed-1.2.orig/Makefile	2022-02-20 11:43:35.164358731 +0100
-+++ sfeed-1.2/Makefile	2022-02-20 11:43:45.874495281 +0100
-@@ -27,14 +27,14 @@
- SFEED_CURSES_CFLAGS = ${CFLAGS}
- SFEED_CURSES_CPPFLAGS = -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 -D_BSD_SOURCE \
- 	 -DSFEED_THEME=\"themes/${SFEED_THEME}.h\" ${SFEED_CPPFLAGS}
--SFEED_CURSES_LDFLAGS = ${LDFLAGS} -lcurses
-+#SFEED_CURSES_LDFLAGS = ${LDFLAGS} -lcurses
- 
- # Linux: some distros use ncurses and require -lncurses.
- #SFEED_CURSES_LDFLAGS = ${LDFLAGS} -lncurses
- 
- # Gentoo Linux: some distros might also require -ltinfo and -D_DEFAULT_SOURCE
- # to prevent warnings about feature test macros.
--#SFEED_CURSES_LDFLAGS = ${LDFLAGS} -lcurses -ltinfo
-+SFEED_CURSES_LDFLAGS = ${LDFLAGS} -lcurses -ltinfo
- 
- # FreeBSD: unset feature test macros for SIGWINCH etc.
- #SFEED_CURSES_CPPFLAGS =
diff --git a/net-news/sfeed/sfeed-1.2.ebuild b/net-news/sfeed/sfeed-1.2.ebuild
deleted file mode 100644
index f70410c8c920..000000000000
--- a/net-news/sfeed/sfeed-1.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="simple RSS and Atom parser"
-HOMEPAGE="https://codemadness.org/sfeed-simple-feed-parser.html"
-SRC_URI="https://codemadness.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ncurses"
-
-DEPEND="ncurses? ( sys-libs/ncurses )"
-RDEPEND="${DEPEND}
-	net-misc/curl
-	sys-apps/coreutils
-	sys-libs/glibc
-	virtual/awk
-	www-client/lynx
-	x11-misc/xclip
-	x11-misc/xdg-utils"
-BDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2-ldflags.patch"
-)
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		RANLIB=$(tc-getRANLIB) \
-		AR=$(tc-getAR) \
-		SFEED_CURSES=$(usex ncurses "sfeed_curses" "")
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		MANPREFIX="${EPREFIX}/usr/share/man" \
-		DOCPREFIX="${EPREFIX}/usr/share/doc/${P}" \
-		SFEED_CURSES=$(usex ncurses "sfeed_curses" "") \
-		install
-}
diff --git a/net-news/sfeed/sfeed-1.4.ebuild b/net-news/sfeed/sfeed-1.4.ebuild
new file mode 100644
index 000000000000..31103b5adee3
--- /dev/null
+++ b/net-news/sfeed/sfeed-1.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs savedconfig optfeature
+
+DESCRIPTION="simple RSS and Atom parser"
+HOMEPAGE="https://codemadness.org/sfeed-simple-feed-parser.html"
+SRC_URI="https://codemadness.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+THEMES=( mono{,-highlight} newsboat templeos )
+IUSE="+ncurses +${THEMES[@]/#/theme-}"
+REQUIRED_USE="ncurses? ( ^^ ( "${THEMES[@]/#/theme-}" ) )"
+
+DEPEND="ncurses? ( sys-libs/ncurses:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="ncurses? ( virtual/pkgconfig )"
+
+src_configure() {
+	local name
+	for name in "${THEMES[@]}"; do
+		use "theme-${name}" && SFEED_THEME="${name//-/_}"
+	done
+
+	restore_config $(printf "themes/%s.h " "${THEMES[@]//-/_}")
+}
+
+src_compile() {
+	local ncurses_ldflags=""
+	use ncurses && ncurses_ldflags="$($(tc-getPKG_CONFIG) --libs ncurses || die)"
+
+	emake \
+		CC="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
+		AR="$(tc-getAR)" \
+		SFEED_CURSES="$(usex ncurses "sfeed_curses" "")" \
+		SFEED_THEME="${SFEED_THEME}" \
+		SFEED_CURSES_LDFLAGS="${LDFLAGS} ${ncurses_ldflags}"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		MANPREFIX="${EPREFIX}/usr/share/man" \
+		DOCPREFIX="${EPREFIX}/usr/share/doc/${PF}" \
+		SFEED_CURSES="$(usex ncurses "sfeed_curses" "")" \
+		install
+
+	save_config $(printf "themes/%s.h " "${THEMES[@]//-/_}")
+}
+
+pkg_postinst() {
+	local optmsg
+
+	if use ncurses; then
+		optmsg="yanking the URL or enclosure in sfeed_curses. "
+		optmsg+="See \$SFEED_YANKER to change it."
+		optfeature "${optmsg}" x11-misc/xclip
+
+		optmsg="plumbing the URL or enclosure in sfeed_curses. "
+		optmsg+="See \$SFEED_PLUMBER to change it."
+		optfeature "${optmsg}" x11-misc/xdg-utils
+	fi
+
+	optmsg="converting HTML content via sfeed_content. "
+	optmsg+="See the ENVIRONMENT VARIABLES section in the man page to change it."
+	optfeature "${optmsg}" www-client/lynx
+
+	optmsg="fetching feeds. Used by sfeed_update as default. "
+	optmsg+="See OVERRIDE FUNCTIONS section on sfeedrc manpage to change it."
+	optfeature "${optmsg}" net-misc/curl
+}