net-news/sfeed: add v1.4, drop v1.2

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Nickolas Raymond Kaczynski <nrk@disroot.org>
Closes: https://github.com/gentoo/gentoo/pull/24880
Signed-off-by: Sam James <sam@gentoo.org>

4 files changed, 79 insertions, 69 deletions

diff --git a/net-news/sfeed/Manifest b/net-news/sfeed/Manifest
index ef654433165d..0e70d48ac21a 100644
--- a/net-news/sfeed/Manifest
+++ b/net-news/sfeed/Manifest
@@ -1,2 +1,2 @@
-DIST sfeed-1.2.tar.gz 62575 BLAKE2B 080ef555e9ea6711ec1eea296c15dc11d937035742d32096f28ee4b4023c9cd4fcd0f7b59807cfdbfaa82c5f2bd7d51045caabcf33e72f2fd193c82885547cf3 SHA512 4307f11ab02310a881717d99892486152dad93ecb1d6526401e60d6275c1610d90599de9784d9878f9ebb5aa34881abd1daa348c977d9ef6758095be74216a29
 DIST sfeed-1.3.tar.gz 63037 BLAKE2B 30e3b8a82380b15230e895bc281d7c4ee33126269233fbc281e223b02976c236ca95d20764e0e30238149b97df44fbf197ea5003382774503ef1fad929835039 SHA512 858ebe0bf76f119a3b1a1b1bdf03a13b8085802bb796ae68f0a5ccb85e13747cc55498c29ef0443401678e56326bdef2bf9688966144e9581ff2cae486b729be
+DIST sfeed-1.4.tar.gz 64312 BLAKE2B 517c25eb28ba120e3d1bb564812fdfd6453741ddf09d60ca2f6b5c30bda15f17fc187302e803cc91937d3582116654f732a030a7aa17dfc9b234a0c858770674 SHA512 9187692076cad9029dd65c58c666972b8aeaefe90155ce9105af32803cdd0365c3b66fafcb5bee485d466126142a3a26f6f38cc9696531c2623b7e8963c578fb
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 312ed6aea5cf..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
+}