gentoo resync : 29.12.2022

8 files changed, 170 insertions, 24 deletions

diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 1b2140196fb5..d8de4cbf3f9f 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index 2e4c9d957fcd..dc88265fb7b2 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1,5 +1,5 @@
-DIST rssguard-4.1.2.tar.gz 21716383 BLAKE2B 5c8da03cdc563799e569dd8c2170f28c5c627a0452a5d0eb325ebb7c88c352248b13624b46d26e94fe443ef1dd948bd281dedb8dcbb0546a984f56472ba0d216 SHA512 d02c6ec7ba6156b6a40e9ad929dc614b7e4aaeb8dfcfe9002e927a4c446908bcb5f299daa1fc67745fea6ebc4954e54a2c296542044a1b86ae98864d5f25bf39
 DIST rssguard-4.2.1.tar.gz 22541187 BLAKE2B 78cc23a39cd75697b53b4c3b043a63d01b8b4e9a9b1cc3fc3f070487dede8d18a33ca462f806b4bfb6847e015a2bacaa77ce27745a95349fb2c09c72cccde3d2 SHA512 05b69d47b3d679005122e03c404ea26d8779f3905ac05ac0565631135c26c56d21ef2f4b3939af6c191a20727a4416e9669ceb4a001e729ffe45fc351183f53a
-EBUILD rssguard-4.1.2.ebuild 1679 BLAKE2B 0f27f6f237d135c077309a473c29af3e254fb87689dcffdeb4579022733b1f72fa26e0271ad67fbdb4285745128c52eca4ea57c5f5197e7faa96c630ba1a7a34 SHA512 f4c5e8a447ce2475d272e81c5142f17915fca91a3b1fd324c37468e42e9247da817266b0485d980bb460138dd2736e5f0f6e1f59c5b699cb6ff4ac58abefc192
+DIST rssguard-4.2.3.tar.gz 21940720 BLAKE2B fe97fb26261ec0ec06eac305c96317299921492f7796d246a6d4e7348b7dd8c6484cf52bec0bdd032a02a897a0406a73077e7366d601e1ef80b98ce2dac592ad SHA512 0ead2ae8d23d9fc6e7a6d42fd462e36be06a5a28e26398550dfa9cb2b7dd4574f2cb7a881a0d0b6d43bdb219db87cc92af9d5f131429e93f255f17f70dee244d
 EBUILD rssguard-4.2.1.ebuild 1275 BLAKE2B 27a32725328497229c00b0c4a87985c9682ec60babd8cc55069320a40b4ebe65671696a99332d7d6027c594b04d1e1a17daca24cfdeae0f4a33763d6786ba788 SHA512 2d5deab0618c5b8730987536b61bd37e19d30650d162615008806f7426e108ffbe9be205a17ceeffba68c016f0852ae32cae7a329ab9282649ca6ca0c70620e1
+EBUILD rssguard-4.2.3.ebuild 1275 BLAKE2B 27a32725328497229c00b0c4a87985c9682ec60babd8cc55069320a40b4ebe65671696a99332d7d6027c594b04d1e1a17daca24cfdeae0f4a33763d6786ba788 SHA512 2d5deab0618c5b8730987536b61bd37e19d30650d162615008806f7426e108ffbe9be205a17ceeffba68c016f0852ae32cae7a329ab9282649ca6ca0c70620e1
 MISC metadata.xml 736 BLAKE2B d607ab8fb90cb5146807e306ba77c4784b4abc4b38e7b55d10b772be9866ea9cd8883e14dd9ebab5e36f44240b4e51802ca2c742c12afb39de61970c9458b356 SHA512 ac0e86dc29d5171dee5eae0d05aa6d7fda1a01dbd5d31314f7d691aec5c77dc150ee8ac6a8239750ca50db08eb18da6d3ff1ede2b8597d38f5b4a1ef79ebd362
diff --git a/net-news/rssguard/rssguard-4.1.2.ebuild b/net-news/rssguard/rssguard-4.2.3.ebuild
index 9dcccc8acdbd..bb1e5906f153 100644
--- a/net-news/rssguard/rssguard-4.1.2.ebuild
+++ b/net-news/rssguard/rssguard-4.2.3.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-QTMIN="5.9.0"
-inherit flag-o-matic optfeature qmake-utils xdg
+QTMIN="5.10.0"
+inherit cmake optfeature xdg
 
 DESCRIPTION="Simple (yet powerful) feed reader"
 HOMEPAGE="https://github.com/martinrotter/rssguard"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/martinrotter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 LICENSE="|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug webengine"
+IUSE="webengine"
 
 BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
 DEPEND="
@@ -32,28 +32,12 @@ RDEPEND="${DEPEND}"
 
 DOCS=( README.md resources/docs/Documentation.md )
 
-src_prepare() {
-	default
-	sed -e 's:$$PREFIX/lib:$$PREFIX/'$(get_libdir)':' -i pri/install.pri || die
-}
-
 src_configure() {
-	eqmake5_args=(
-		CONFIG+=$(usex debug debug release)
-		USE_WEBENGINE=$(usex webengine true false)
-		PREFIX="${EPREFIX}"/usr
-		INSTALL_ROOT=.
+	local mycmakeargs=(
+		-DUSE_WEBENGINE=$(usex webengine)
 	)
 
-	# https://github.com/martinrotter/rssguard/issues/156
-	is-flagq "-flto*" && eqmake5_args+=( CONFIG+=ltcg )
-
-	eqmake5 "${eqmake5_args[@]}"
-}
-
-src_install() {
-	emake -j1 install INSTALL_ROOT="${D}"
-	einstalldocs
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/net-news/sfeed/Manifest b/net-news/sfeed/Manifest
index a14e26360646..b139fa934776 100644
--- a/net-news/sfeed/Manifest
+++ b/net-news/sfeed/Manifest
@@ -1,5 +1,7 @@
 DIST sfeed-1.3.tar.gz 63037 BLAKE2B 30e3b8a82380b15230e895bc281d7c4ee33126269233fbc281e223b02976c236ca95d20764e0e30238149b97df44fbf197ea5003382774503ef1fad929835039 SHA512 858ebe0bf76f119a3b1a1b1bdf03a13b8085802bb796ae68f0a5ccb85e13747cc55498c29ef0443401678e56326bdef2bf9688966144e9581ff2cae486b729be
 DIST sfeed-1.4.tar.gz 64312 BLAKE2B 517c25eb28ba120e3d1bb564812fdfd6453741ddf09d60ca2f6b5c30bda15f17fc187302e803cc91937d3582116654f732a030a7aa17dfc9b234a0c858770674 SHA512 9187692076cad9029dd65c58c666972b8aeaefe90155ce9105af32803cdd0365c3b66fafcb5bee485d466126142a3a26f6f38cc9696531c2623b7e8963c578fb
+DIST sfeed-1.5.tar.gz 65067 BLAKE2B 0f2fbe263d869d396aae9a13c482d381d0e7201ca62b86f795bedd4e4174bea1959c16d1b63d534013e9a100527d6885122b9965e060773809912d299a9a573e SHA512 9a027b092620968bd6a086b37ce5bc3e2d5ee8193b59251466d5318bc1514ca78d3edf894c1988504c99b94f0bb3af2a54ba3067b2d90d1109665a5650bfd8a2
 EBUILD sfeed-1.3.ebuild 2145 BLAKE2B 61f2343cd1e3c1122cc718efdc8664f500e4f4d3764acd033a0669be3275a380163cec323c8c7b658d7f4386f1ceb5a6a48d3035045b867aef9cc802add4e981 SHA512 c0b229f2147f3cf8c5775ac67239b184d34ed74c5576525c9a3a8866242137b779f652dab204cd903b9a6a29dca285e1fe7db5375ef9fb729a744d55c13b163e
 EBUILD sfeed-1.4.ebuild 2132 BLAKE2B 7195461d20e235a937c6c765edde55f1f6c04d3a2c7ea0f3970319294826ae8258b9ea5844f951102e5bc95f5aae29eec667d65cbb4832f638a3a17f0399fe23 SHA512 4e01e16822eea08bac1015d0472372a975d22e4cda4ab077ef2e484592873af8351859efeb8ea4f854760c563faff5be5cdc6ca756d6c9eca08e3262a351afac
+EBUILD sfeed-1.5.ebuild 2132 BLAKE2B 7195461d20e235a937c6c765edde55f1f6c04d3a2c7ea0f3970319294826ae8258b9ea5844f951102e5bc95f5aae29eec667d65cbb4832f638a3a17f0399fe23 SHA512 4e01e16822eea08bac1015d0472372a975d22e4cda4ab077ef2e484592873af8351859efeb8ea4f854760c563faff5be5cdc6ca756d6c9eca08e3262a351afac
 MISC metadata.xml 800 BLAKE2B 21467934f1d8fb7f3b77e26daa8595a19d4a2d4e87aebfcffbefd367348668fec28eb560e98505c4f4cb7a479b5c2e5e1e9992a8b7d66ee651ed37895bda8aa9 SHA512 08fa61b54e15a3968f168a4a542a55a14d33ee539a67bfe4a58770d6b2a4553483fdd8889a436287462858b2d56f0022c14b71f7c7b1834092c4c4a9f92b7387
diff --git a/net-news/sfeed/sfeed-1.5.ebuild b/net-news/sfeed/sfeed-1.5.ebuild
new file mode 100644
index 000000000000..31103b5adee3
--- /dev/null
+++ b/net-news/sfeed/sfeed-1.5.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
+}
diff --git a/net-news/snownews/Manifest b/net-news/snownews/Manifest
index c7b19d8891a6..0629e3321bc0 100644
--- a/net-news/snownews/Manifest
+++ b/net-news/snownews/Manifest
@@ -1,3 +1,5 @@
+AUX snownews-1.9-no-which.patch 1023 BLAKE2B 58cc7a8d643e7d7a7cdcd6d91274f19500509832ea48417a50dcbc7679d49a21a47c91ef0e81a00341d10a4b4ef27fee64a85548372a0adcb2ad7e9cff92a7e7 SHA512 95d9ea476c20931bc986c0ef1a9d0b6e71de6f131a083060902e143d21195bd61446a12230df7e8f7c79195dada97a9519d2166472edf265e3eff662bb30a07b
 DIST snownews-1.9.tar.gz 149935 BLAKE2B 331c94964a617871df8ab0ed7c8b36acea9386e7cb5057232dc5e93d148f04b56e64af96b9a212469115592d4509cba641bf183e927bddc9e12baff9f3936f20 SHA512 f833dbb41b5c0215c034b8388d787398360fac0ec9670f8f31b76c3ee2ffd974b4c6ebebc30aebb539b9904f513628124b393f4f473a92d4969f483caeca8596
+EBUILD snownews-1.9-r1.ebuild 969 BLAKE2B 51908cb2945d26b2c754eecd1ce706569a99d8e90cfcc4bb8c1915d52045d126da82a798a90cc42b91e8746a9d2be877da5feefa2720550ee312ee6d4172bce5 SHA512 c2461b5788f3ee9b8bd5d34ba00fe3833c05293d82538c4c128b2e70841ca970b34f7a68b4f62d15764ab47f85b8f94ba1797f9a385e4192cdc6d8c598f9be50
 EBUILD snownews-1.9.ebuild 901 BLAKE2B 8b8f43e73a1d81e321665e0609518b45e3e2bd61eb0e49db7900132877f5bf4cbc69ab4720979a8ac5ea615aeba83eea8485545c6c36f339d0e0588f2328f5f6 SHA512 ec024729790d45753c53de5cf9f8017d080b82d26fb5444581076f0a3546c836c12ca3586950ec20d07420cc6c3453df195d4fdc0375e4976c699a8c936aa9b7
 MISC metadata.xml 394 BLAKE2B 515ca6f962ff0fd4c3b57b0af00bb61e79b2a9f640d441ea5ad60c298780ce0ae8f9e090fe26d5293627448062cbd8bd78db844e923d61ad0db4644e1410b0bf SHA512 3492dae90b43f94860e1c6d08868d238a60ff13ea060bc6ec7619698d4a8830de6354d67b40b7459149e585209dfd886a94474b92191212f275ae974cc2abf1e
diff --git a/net-news/snownews/files/snownews-1.9-no-which.patch b/net-news/snownews/files/snownews-1.9-no-which.patch
new file mode 100644
index 000000000000..84335e93711b
--- /dev/null
+++ b/net-news/snownews/files/snownews-1.9-no-which.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/844901
+--- a/configure
++++ b/configure
+@@ -164,7 +164,7 @@ s/@builddir@/\$\{TMPDIR\}\/make/g"
+ 
+ #### Find programs and libs ##########################################
+ 
+-# Programs found using which
++# Programs found using command -v
+ for i in $progs; do
+     pname=$(expr $i : '\([^=]*\)')
+     pcall=$(expr $i : '[^=]*=\([^=]*\)')
+@@ -172,7 +172,7 @@ for i in $progs; do
+     # First check if an environment variable is set
+     [ -n "$ppath" ] && sub "s/@$pname@/$ppath/g"
+     # Check if the program exists
+-    ppath=$(which $pcall 2>/dev/null)
++    ppath=$(command -v $pcall 2>/dev/null)
+     [ -n "$ppath" ] && [ -x "$ppath" ] && sub "s/@$pname@/$pcall/g"
+ done
+ # If nothing found in first loop, set the first pair anyway
+@@ -183,7 +183,7 @@ for i in $progs; do
+ done
+ 
+ # Packages found using pkg-config
+-pkgconfig=$(which pkg-config 2>/dev/null)
++pkgconfig=$(command -v pkg-config 2>/dev/null)
+ if [ -n "$pkgconfig" ] && [ -x "$pkgconfig" ]; then
+     faildeps=""
+     for i in $pkgs; do
diff --git a/net-news/snownews/snownews-1.9-r1.ebuild b/net-news/snownews/snownews-1.9-r1.ebuild
new file mode 100644
index 000000000000..da5e7bfd6e0a
--- /dev/null
+++ b/net-news/snownews/snownews-1.9-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Command-line RSS feed reader"
+HOMEPAGE="https://github.com/msharov/snownews"
+SRC_URI="https://github.com/msharov/snownews/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/openssl:=
+	net-misc/curl
+	sys-libs/ncurses:=[unicode(+)]
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9-no-which.patch
+)
+
+src_prepare() {
+	default
+
+	tc-export CC
+
+	# Disable stripping in the build system - leave it to the package manager
+	sed -i -e '/ldflags/s/-s/-g -rdynamic/' -e '/cflags/s/-g0/-g/' Config.mk.in || die
+}
+
+src_configure() {
+	econf "$(use_with debug)"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}