commit:     7b603dee6c7a7923d631192bf3edf7fbaa4b8848
Author:     NRK <nrk <AT> disroot <DOT> org>
AuthorDate: Fri Mar 14 21:49:41 2025 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 15 15:53:09 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b603dee

net-news/sfeed: add 2.2, drop 1.9 and 2.0

Signed-off-by: NRK <nrk <AT> disroot.org>
Closes: https://github.com/gentoo/gentoo/pull/41085
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

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

diff --git a/net-news/sfeed/Manifest b/net-news/sfeed/Manifest
index 08c23695a969..ff14bcfa788a 100644
--- a/net-news/sfeed/Manifest
+++ b/net-news/sfeed/Manifest
@@ -1,3 +1,2 @@
-DIST sfeed-1.9.tar.gz 67718 BLAKE2B 
414f53e63962192e994b5f57ff76c809df49d7f089bf1f4bf14cd16f7c52534f5fd7030acf5bcc6514d8b5b4a74cc1f7bdf31759df4c37186d4e1c35fad0b184
 SHA512 
714ce9526ce6a37cdc5777e279512b611f9e329ed0d7d1e9fd8efe8c981a69fe19c6622685d0ac2e16eef1f699096262e616e5b4f5ba81e44624ae99d10de749
-DIST sfeed-2.0.tar.gz 67584 BLAKE2B 
b9c8bdaeea63c2a6781f69087601814943a09ea62b5764668ae0d22dab12976f47b4185196cdc87365cc03fa27322de357541c7c8ad4430323241fb56e2c3d11
 SHA512 
cc4c0236b14ac6da6a9417d879caef9943c30506e2fee404eefceea53dea597b36814846cfc454d76727ddcca33746f2bac3c1ee6831f9900e68d00f6eb32b5b
 DIST sfeed-2.1.tar.gz 68610 BLAKE2B 
6ce4d99dfa6665282ba6db3d6d41e0e0008d487b662a7799a781682faaafc0118a387d9fc2e4562e958996e79a19090f70936f2dffb4fbcf15f00003407b6bd8
 SHA512 
47f176bcb9e97e42446edf2b8fd2f902430d86bd93cd076e474532b344dca930fdeaffdf89cb58b59a5583bfed94921f1d2032ee8921e7075ee31d38a766e396
+DIST sfeed-2.2.tar.gz 68969 BLAKE2B 
8c3dce5eae3795a03c28db291a5da2cff5b22e55e4e228a008e35da3da286c79b2b5ce6b3194b180e624b12cf9ebd1def7937e3db3a700ddd82eb046d9729345
 SHA512 
d9ac4856583478f9ab9358d5f0b6b9001338b5c2be3a55184e2dd9fb6e9cc1bac23c9a8254d172e3d302682b4726521d7a7a10bc788f2be3cdccfb166b2b8f1a

diff --git a/net-news/sfeed/sfeed-2.0.ebuild b/net-news/sfeed/sfeed-2.0.ebuild
deleted file mode 100644
index 29f9216d38f3..000000000000
--- a/net-news/sfeed/sfeed-2.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2022-2024 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="$(usev 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="$(usev 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.9.ebuild b/net-news/sfeed/sfeed-2.2.ebuild
similarity index 95%
rename from net-news/sfeed/sfeed-1.9.ebuild
rename to net-news/sfeed/sfeed-2.2.ebuild
index a89e369836a3..19d1974f6a4d 100644
--- a/net-news/sfeed/sfeed-1.9.ebuild
+++ b/net-news/sfeed/sfeed-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2025 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-}"

Reply via email to