[gentoo-commits] repo/gentoo:master commit in: net-news/sfeed/

["Petr Vaněk" <arkamar@gentoo.org>]

commit:     79ac66b42f13bfc3889a9b20458c78537c6101d0
Author:     NRK <nrk <AT> disroot <DOT> org>
AuthorDate: Thu Feb 15 21:38:53 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 08:45:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79ac66b4

net-news/sfeed: add 2.0, drop old

Signed-off-by: NRK <nrk <AT> disroot.org>
Closes: https://github.com/gentoo/gentoo/pull/35361
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 net-news/sfeed/Manifest                            |  3 +-
 net-news/sfeed/sfeed-1.6.ebuild                    | 78 ----------------------
 .../sfeed/{sfeed-1.8.ebuild => sfeed-2.0.ebuild}   |  4 +-
 3 files changed, 3 insertions(+), 82 deletions(-)

diff --git a/net-news/sfeed/Manifest b/net-news/sfeed/Manifest
index c3139916fdf4..ee61c2438e2c 100644
--- a/net-news/sfeed/Manifest
+++ b/net-news/sfeed/Manifest
@@ -1,3 +1,2 @@
-DIST sfeed-1.6.tar.gz 65239 BLAKE2B 25a5f645d8814d48d6c2617cbc9944339866e668c7b7d21581db605987284447c5d6e2f505b5c9d1c1f5d22702ef3b3c80a076f8d9c930f8ae7d5447fd88ecb0 SHA512 450cde27b0d437b165fc024f2b95612fd7755c357e3539167f3c9b123d7a63c3193cb808b6c9621d15b1f5e2d8d783131423e52db6e98c228aa5af190eb167eb
-DIST sfeed-1.8.tar.gz 67335 BLAKE2B 7898d6fe51455c65e7b1d7708ba4804880f36d0d3447746f6c81a85a22427bf3f0b7f8f7685f0e3b27b538b4ef7193fdef54f5aa4e1816e33d78a50143307804 SHA512 7a57108ace21813de9d80e7ebcc9ffed37580f52f08313ddcf86f2ee0df54d733631cba6936921623aa34c41a06dba43778cedbf557738db009d91f961fc9af7
 DIST sfeed-1.9.tar.gz 67718 BLAKE2B 414f53e63962192e994b5f57ff76c809df49d7f089bf1f4bf14cd16f7c52534f5fd7030acf5bcc6514d8b5b4a74cc1f7bdf31759df4c37186d4e1c35fad0b184 SHA512 714ce9526ce6a37cdc5777e279512b611f9e329ed0d7d1e9fd8efe8c981a69fe19c6622685d0ac2e16eef1f699096262e616e5b4f5ba81e44624ae99d10de749
+DIST sfeed-2.0.tar.gz 67584 BLAKE2B b9c8bdaeea63c2a6781f69087601814943a09ea62b5764668ae0d22dab12976f47b4185196cdc87365cc03fa27322de357541c7c8ad4430323241fb56e2c3d11 SHA512 cc4c0236b14ac6da6a9417d879caef9943c30506e2fee404eefceea53dea597b36814846cfc454d76727ddcca33746f2bac3c1ee6831f9900e68d00f6eb32b5b

diff --git a/net-news/sfeed/sfeed-1.6.ebuild b/net-news/sfeed/sfeed-1.6.ebuild
deleted file mode 100644
index a61229227340..000000000000
--- a/net-news/sfeed/sfeed-1.6.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~arm ~arm64 ~hppa ~riscv ~sparc ~x86"
-
-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
-}

diff --git a/net-news/sfeed/sfeed-1.8.ebuild b/net-news/sfeed/sfeed-2.0.ebuild
similarity index 95%
rename from net-news/sfeed/sfeed-1.8.ebuild
rename to net-news/sfeed/sfeed-2.0.ebuild
index a89e369836a3..ecbca4d83f64 100644
--- a/net-news/sfeed/sfeed-1.8.ebuild
+++ b/net-news/sfeed/sfeed-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://codemadness.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc ~x86"
 
 THEMES=( mono{,-highlight} newsboat templeos )
 IUSE="+ncurses +${THEMES[@]/#/theme-}"