Gentoo Archives: gentoo-commits

From: Anna Vyalkova <cyber+gentoo@×××××.in>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-news/sfeed/
Date: Sun, 20 Feb 2022 19:02:10
Message-Id: 1645383709.d612df4dc1178cd4cedd431f30db61730281ad90.cybertailor@gentoo
1 commit: d612df4dc1178cd4cedd431f30db61730281ad90
2 Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
3 AuthorDate: Sat Feb 19 17:31:10 2022 +0000
4 Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
5 CommitDate: Sun Feb 20 19:01:49 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d612df4d
7
8 net-news/sfeed: revbump to add slot operator
9
10 sync live
11
12 Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
13
14 .../{sfeed-1.2.ebuild => sfeed-1.2-r1.ebuild} | 2 +-
15 net-news/sfeed/sfeed-9999.ebuild | 42 ++++++++++++++++++----
16 2 files changed, 36 insertions(+), 8 deletions(-)
17
18 diff --git a/net-news/sfeed/sfeed-1.2.ebuild b/net-news/sfeed/sfeed-1.2-r1.ebuild
19 similarity index 97%
20 rename from net-news/sfeed/sfeed-1.2.ebuild
21 rename to net-news/sfeed/sfeed-1.2-r1.ebuild
22 index ea650ce68..4f364eedb 100644
23 --- a/net-news/sfeed/sfeed-1.2.ebuild
24 +++ b/net-news/sfeed/sfeed-1.2-r1.ebuild
25 @@ -23,7 +23,7 @@ THEMES=( mono{,-highlight} newsboat templeos )
26 IUSE="+ncurses +$(printf "theme-%s " ${THEMES[@]})"
27 REQUIRED_USE="ncurses? ( ^^ ( $(printf "theme-%s " ${THEMES[@]}) ) )"
28
29 -DEPEND="ncurses? ( sys-libs/ncurses )"
30 +DEPEND="ncurses? ( sys-libs/ncurses:= )"
31 RDEPEND="${DEPEND}
32 ncurses? ( !net-news/sfeed_curses )
33 "
34
35 diff --git a/net-news/sfeed/sfeed-9999.ebuild b/net-news/sfeed/sfeed-9999.ebuild
36 index 95c50fc04..4f364eedb 100644
37 --- a/net-news/sfeed/sfeed-9999.ebuild
38 +++ b/net-news/sfeed/sfeed-9999.ebuild
39 @@ -1,9 +1,9 @@
40 -# Copyright 2020 Gentoo Authors
41 +# Copyright 2020-2022 Gentoo Authors
42 # Distributed under the terms of the GNU General Public License v2
43
44 EAPI=7
45
46 -inherit toolchain-funcs
47 +inherit toolchain-funcs savedconfig
48
49 DESCRIPTION="simple RSS and Atom parser"
50 HOMEPAGE="https://www.codemadness.org/sfeed.html"
51 @@ -12,24 +12,52 @@ if [[ ${PV} == 9999 ]]; then
52 inherit git-r3
53 EGIT_REPO_URI="git://git.codemadness.org/sfeed"
54 else
55 - SRC_URI="https://www.codemadness.org/releases/sfeed/sfeed-${PV}.tar.gz"
56 + SRC_URI="https://www.codemadness.org/releases/${PN}/${P}.tar.gz"
57 KEYWORDS="~amd64"
58 fi
59
60 LICENSE="ISC"
61 SLOT="0"
62
63 +THEMES=( mono{,-highlight} newsboat templeos )
64 +IUSE="+ncurses +$(printf "theme-%s " ${THEMES[@]})"
65 +REQUIRED_USE="ncurses? ( ^^ ( $(printf "theme-%s " ${THEMES[@]}) ) )"
66 +
67 +DEPEND="ncurses? ( sys-libs/ncurses:= )"
68 +RDEPEND="${DEPEND}
69 + ncurses? ( !net-news/sfeed_curses )
70 +"
71 +BDEPEND="virtual/pkgconfig"
72 +
73 +src_configure() {
74 + for name in "${THEMES[@]}"; do
75 + if use theme-${name}; then
76 + SFEED_THEME="${name//-/_}"
77 + fi
78 + done
79 +
80 + use ncurses && SFEED_CURSES="sfeed_curses"
81 +
82 + restore_config $(printf "themes/%s.h " ${THEMES[@]//-/_})
83 +}
84 +
85 src_compile() {
86 tc-export AR CC
87 - emake RANLIB=$(tc-getRANLIB)
88 + emake RANLIB=$(tc-getRANLIB) \
89 + SFEED_CURSES="${SFEED_CURSES}" \
90 + SFEED_THEME="${SFEED_THEME}" \
91 + SFEED_CURSES_LDFLAGS="${LDFLAGS} $(pkg-config --libs ncurses)"
92 }
93
94 src_install() {
95 DESTDIR="${D}" \
96 emake install \
97 - PREFIX="/usr" \
98 - MANPREFIX="/usr/share/man" \
99 - DOCPREFIX="/usr/share/doc/${P}"
100 + SFEED_CURSES="${SFEED_CURSES}" \
101 + PREFIX="${EPREFIX}/usr" \
102 + MANPREFIX="${EPREFIX}/usr/share/man" \
103 + DOCPREFIX="${EPREFIX}/usr/share/doc/${PF}"
104
105 einstalldocs
106 +
107 + save_config $(printf "themes/%s.h " ${THEMES[@]//-/_})
108 }