Gentoo Archives: gentoo-commits

From: Viorel Munteanu <ceamac.paragon@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-misc/fastfetch/, app-misc/fastfetch/files/
Date: Wed, 09 Feb 2022 10:43:27
Message-Id: 1644403337.264ade50a692c5b9bc1de4f622439d63bfb9e240.viorel_munteanu@gentoo
1 commit: 264ade50a692c5b9bc1de4f622439d63bfb9e240
2 Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
3 AuthorDate: Wed Feb 9 10:42:17 2022 +0000
4 Commit: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
5 CommitDate: Wed Feb 9 10:42:17 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=264ade50
7
8 app-misc/fastfetch: drop 0.569-r1
9
10 Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
11
12 app-misc/fastfetch/Manifest | 1 -
13 app-misc/fastfetch/fastfetch-0.569-r1.ebuild | 89 ---------
14 .../fastfetch-0.569-cmake-optional-deps.patch | 199 ---------------------
15 3 files changed, 289 deletions(-)
16
17 diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
18 index 0f5eb91f3..fe315e062 100644
19 --- a/app-misc/fastfetch/Manifest
20 +++ b/app-misc/fastfetch/Manifest
21 @@ -1,2 +1 @@
22 -DIST fastfetch-0.569.tar.gz 319899 BLAKE2B 07c3169e97a5127a67941972ea6feac1bec11203bb55b23243a4b298580299d942b518eab24a741dd0354d56879dc9ccd192bf88024aa660a4c83f149c8133cd SHA512 979a9e717bc2ef59aa0b410fe62015f8ecf58419e4b1df56ea139aa84e627491ab310da358e821a7dcc95efc8017b8fd71d1174cde8a770717759a1e50d0fb31
23 DIST fastfetch-0.575.tar.gz 321524 BLAKE2B a59dee15e7492d7af7671ed25eb5492a0a0c97346c000b794cab923dcc7298aa06c0cc232d5cc8ee171c470b474f42b3adf912e20b5b59370f23dbd803372934 SHA512 45a573a4e837463398151775d7a4bbb666021422e5b2d08955cfd60c6a7b89263d5464691481ac419876439689b09dac6817388592d4c27b1bbe5d27f1d6881e
24
25 diff --git a/app-misc/fastfetch/fastfetch-0.569-r1.ebuild b/app-misc/fastfetch/fastfetch-0.569-r1.ebuild
26 deleted file mode 100644
27 index ce926d740..000000000
28 --- a/app-misc/fastfetch/fastfetch-0.569-r1.ebuild
29 +++ /dev/null
30 @@ -1,89 +0,0 @@
31 -# Copyright 2022 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=8
35 -
36 -inherit bash-completion-r1 cmake
37 -
38 -DESCRIPTION="Like neofetch but faster"
39 -HOMEPAGE="https://github.com/LinusDierheimer/fastfetch"
40 -if [[ ${PV} == *9999 ]]; then
41 - inherit git-r3
42 - EGIT_REPO_URI="https://github.com/LinusDierheimer/fastfetch.git"
43 -else
44 - COMMIT="7ad73d3ba13489b341a07782e6374d92c54091ba"
45 - VERSION_REV="7ad73d3"
46 - SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
47 - S="${WORKDIR}/${PN}-${COMMIT}"
48 -fi
49 -
50 -LICENSE="MIT"
51 -SLOT="0"
52 -KEYWORDS="~amd64"
53 -IUSE="X gnome pci vulkan wayland xcb xfce xrandr"
54 -
55 -# note - qa-vdb will always report errors because fastfetch loads the libs dynamically
56 -RDEPEND="
57 - X? ( x11-libs/libX11 )
58 - gnome? (
59 - dev-libs/glib
60 - gnome-base/dconf
61 - )
62 - pci? ( sys-apps/pciutils )
63 - vulkan? ( media-libs/vulkan-loader )
64 - wayland? ( dev-libs/wayland )
65 - xcb? ( x11-libs/libxcb )
66 - xfce? ( xfce-base/xfconf )
67 - xrandr? ( x11-libs/libXrandr )
68 -"
69 -DEPEND="${RDEPEND}"
70 -BDEPEND="virtual/pkgconfig"
71 -
72 -REQUIRED_USE="xrandr? ( X )"
73 -
74 -PATCHES=(
75 - "${FILESDIR}/fastfetch-0.569-cmake-optional-deps.patch"
76 -)
77 -
78 -src_configure() {
79 - local mycmakeargs=(
80 - -DENABLE_RPM=no
81 - -DENABLE_VULKAN=$(usex vulkan)
82 - -DENABLE_WAYLAND=$(usex wayland)
83 - -DENABLE_XCB_RANDR=$(usex xcb)
84 - -DENABLE_XCB=$(usex xcb)
85 - -DENABLE_XRANDR=$(usex xrandr)
86 - -DENABLE_X11=$(usex X)
87 - -DENABLE_GIO=$(usex gnome)
88 - -DENABLE_DCONF=$(usex gnome)
89 - -DENABLE_XFCONF=$(usex xfce)
90 - )
91 -
92 - if [[ ${PV} != *9999 ]]; then
93 - # version comes from git, fake it
94 - VERSION_MAJOR="$(ver_cut 2)"
95 - sed -i -e "
96 - s/\(PROJECT_VERSION\) .*$/\1 \"r${VERSION_MAJOR}.${VERSION_REV}\")/
97 - s/\(PROJECT_VERSION_MAJOR\) .*$/\1 \"${VERSION_MAJOR}\")/" CMakeLists.txt || die "Cannot patch version"
98 - fi
99 -
100 - cmake_src_configure
101 -}
102 -
103 -src_install() {
104 - if [[ ${PV} == *9999 ]]; then
105 - elog "REV=\"r$(git rev-list --count HEAD)\""
106 - elog "COMMIT=\"$(git rev-parse HEAD)\""
107 - elog "VERSION_REV=\"$(git rev-parse --short HEAD)\""
108 - fi
109 -
110 - pushd "${BUILD_DIR}" || die
111 - dobin fastfetch
112 - popd
113 -
114 - newbashcomp completions/bash fastfetch
115 - insinto /usr/share/${PN}/presets
116 - doins presets/*
117 -
118 - einstalldocs
119 -}
120
121 diff --git a/app-misc/fastfetch/files/fastfetch-0.569-cmake-optional-deps.patch b/app-misc/fastfetch/files/fastfetch-0.569-cmake-optional-deps.patch
122 deleted file mode 100644
123 index 617b6c6e9..000000000
124 --- a/app-misc/fastfetch/files/fastfetch-0.569-cmake-optional-deps.patch
125 +++ /dev/null
126 @@ -1,199 +0,0 @@
127 -Add options to disable automagical dependencies
128 -
129 -diff --git a/CMakeLists.txt b/CMakeLists.txt
130 -index 0915750..05ca503 100644
131 ---- a/CMakeLists.txt
132 -+++ b/CMakeLists.txt
133 -@@ -48,82 +48,116 @@ find_package(Threads REQUIRED)
134 -
135 - find_package(PkgConfig REQUIRED)
136 -
137 --pkg_check_modules (LIBPCI libpci)
138 --if(LIBPCI_FOUND)
139 -- add_compile_definitions(FF_HAVE_LIBPCI=1)
140 --else(LIBPCI_FOUND)
141 -- message(WARNING "Package libpci not found. Building without support.")
142 --endif(LIBPCI_FOUND)
143 --
144 --pkg_check_modules (VULKAN vulkan)
145 --if(VULKAN_FOUND)
146 -- add_compile_definitions(FF_HAVE_VULKAN=1)
147 --else(VULKAN_FOUND)
148 -- message(WARNING "Package vulkan not found. Building without support.")
149 --endif(VULKAN_FOUND)
150 --
151 --pkg_check_modules (WAYLAND wayland-client)
152 --if(WAYLAND_FOUND)
153 -- add_compile_definitions(FF_HAVE_WAYLAND=1)
154 --else(WAYLAND_FOUND)
155 -- message(WARNING "Package wayland-client not found. Building without support.")
156 --endif(WAYLAND_FOUND)
157 --
158 --pkg_check_modules (XCB_RANDR xcb-randr)
159 --if(XCB_RANDR_FOUND)
160 -- add_compile_definitions(FF_HAVE_XCB_RANDR=1)
161 --else(XCB_RANDR_FOUND)
162 -- message(WARNING "Package xcb-randr not found. Building without support.")
163 --endif(XCB_RANDR_FOUND)
164 --
165 --pkg_check_modules (XCB xcb)
166 --if(XCB_FOUND)
167 -- add_compile_definitions(FF_HAVE_XCB=1)
168 --else(XCB_FOUND)
169 -- message(WARNING "Package xcb not found. Building without support.")
170 --endif(XCB_FOUND)
171 --
172 --pkg_check_modules (XRANDR xrandr)
173 --if(XRANDR_FOUND)
174 -- add_compile_definitions(FF_HAVE_XRANDR=1)
175 --else(XRANDR_FOUND)
176 -- message(WARNING "Package xrandr not found. Building without support.")
177 --endif(XRANDR_FOUND)
178 --
179 --pkg_check_modules (X11 x11)
180 --if(X11_FOUND)
181 -- add_compile_definitions(FF_HAVE_X11=1)
182 --else(X11_FOUND)
183 -- message(WARNING "Package x11 not found. Building without support.")
184 --endif(X11_FOUND)
185 --
186 --pkg_check_modules (GIO gio-2.0)
187 --if(GIO_FOUND)
188 -- add_compile_definitions(FF_HAVE_GIO=1)
189 --else(GIO_FOUND)
190 -- message(WARNING "Package gio-2.0 not found. Building without support.")
191 --endif(GIO_FOUND)
192 --
193 --pkg_check_modules (DCONF dconf)
194 --if(DCONF_FOUND)
195 -- add_compile_definitions(FF_HAVE_DCONF=1)
196 --else(DCONF_FOUND)
197 -- message(WARNING "Package dconf not found. Building without support.")
198 --endif(DCONF_FOUND)
199 --
200 --pkg_check_modules (XFCONF libxfconf-0)
201 --if(XFCONF_FOUND)
202 -- add_compile_definitions(FF_HAVE_XFCONF=1)
203 --else(XFCONF_FOUND)
204 -- message(WARNING "Package libxfconf-0 not found. Building without support.")
205 --endif(XFCONF_FOUND)
206 --
207 --pkg_check_modules (RPM rpm)
208 --if(RPM_FOUND)
209 -- add_compile_definitions(FF_HAVE_RPM=1)
210 --else(RPM_FOUND)
211 -- message(WARNING "Package librpm not found. Building without support.")
212 --endif(RPM_FOUND)
213 -+OPTION(ENABLE_LIBPCI "Enable libpci" ON)
214 -+OPTION(ENABLE_VULKAN "Enable vulkan" ON)
215 -+OPTION(ENABLE_WAYLAND "Enable wayland-client" ON)
216 -+OPTION(ENABLE_XCB_RANDR "Enable xcb-randr" ON)
217 -+OPTION(ENABLE_XCB "Enable xcb" ON)
218 -+OPTION(ENABLE_XRANDR "Enable xrandr" ON)
219 -+OPTION(ENABLE_X11 "Enable x11" ON)
220 -+OPTION(ENABLE_GIO "Enable gio-2.0" ON)
221 -+OPTION(ENABLE_DCONF "Enable dconf" ON)
222 -+OPTION(ENABLE_XFCONF "Enable libxfconf-0" ON)
223 -+OPTION(ENABLE_RPM "Enable rpm" ON)
224 -+
225 -+if(ENABLE_LIBPCI)
226 -+ pkg_check_modules (LIBPCI libpci)
227 -+ if(LIBPCI_FOUND)
228 -+ add_compile_definitions(FF_HAVE_LIBPCI=1)
229 -+ else(LIBPCI_FOUND)
230 -+ message(WARNING "Package libpci not found. Building without support.")
231 -+ endif(LIBPCI_FOUND)
232 -+endif(ENABLE_LIBPCI)
233 -+
234 -+if(ENABLE_VULKAN)
235 -+ pkg_check_modules (VULKAN vulkan)
236 -+ if(VULKAN_FOUND)
237 -+ add_compile_definitions(FF_HAVE_VULKAN=1)
238 -+ else(VULKAN_FOUND)
239 -+ message(WARNING "Package vulkan not found. Building without support.")
240 -+ endif(VULKAN_FOUND)
241 -+endif(ENABLE_VULKAN)
242 -+
243 -+if(ENABLE_WAYLAND)
244 -+ pkg_check_modules (WAYLAND wayland-client)
245 -+ if(WAYLAND_FOUND)
246 -+ add_compile_definitions(FF_HAVE_WAYLAND=1)
247 -+ else(WAYLAND_FOUND)
248 -+ message(WARNING "Package wayland-client not found. Building without support.")
249 -+ endif(WAYLAND_FOUND)
250 -+endif(ENABLE_WAYLAND)
251 -+
252 -+if(ENABLE_XCB_RANDR)
253 -+ pkg_check_modules (XCB_RANDR xcb-randr)
254 -+ if(XCB_RANDR_FOUND)
255 -+ add_compile_definitions(FF_HAVE_XCB_RANDR=1)
256 -+ else(XCB_RANDR_FOUND)
257 -+ message(WARNING "Package xcb-randr not found. Building without support.")
258 -+ endif(XCB_RANDR_FOUND)
259 -+endif(ENABLE_XCB_RANDR)
260 -+
261 -+if(ENABLE_XCB)
262 -+ pkg_check_modules (XCB xcb)
263 -+ if(XCB_FOUND)
264 -+ add_compile_definitions(FF_HAVE_XCB=1)
265 -+ else(XCB_FOUND)
266 -+ message(WARNING "Package xcb not found. Building without support.")
267 -+ endif(XCB_FOUND)
268 -+endif(ENABLE_XCB)
269 -+
270 -+if(ENABLE_XRANDR)
271 -+ pkg_check_modules (XRANDR xrandr)
272 -+ if(XRANDR_FOUND)
273 -+ add_compile_definitions(FF_HAVE_XRANDR=1)
274 -+ else(XRANDR_FOUND)
275 -+ message(WARNING "Package xrandr not found. Building without support.")
276 -+ endif(XRANDR_FOUND)
277 -+endif(ENABLE_XRANDR)
278 -+
279 -+if(ENABLE_X11)
280 -+ pkg_check_modules (X11 x11)
281 -+ if(X11_FOUND)
282 -+ add_compile_definitions(FF_HAVE_X11=1)
283 -+ else(X11_FOUND)
284 -+ message(WARNING "Package x11 not found. Building without support.")
285 -+ endif(X11_FOUND)
286 -+endif(ENABLE_X11)
287 -+
288 -+if(ENABLE_GIO)
289 -+ pkg_check_modules (GIO gio-2.0)
290 -+ if(GIO_FOUND)
291 -+ add_compile_definitions(FF_HAVE_GIO=1)
292 -+ else(GIO_FOUND)
293 -+ message(WARNING "Package gio-2.0 not found. Building without support.")
294 -+ endif(GIO_FOUND)
295 -+endif(ENABLE_GIO)
296 -+
297 -+if(ENABLE_DCONF)
298 -+ pkg_check_modules (DCONF dconf)
299 -+ if(DCONF_FOUND)
300 -+ add_compile_definitions(FF_HAVE_DCONF=1)
301 -+ else(DCONF_FOUND)
302 -+ message(WARNING "Package dconf not found. Building without support.")
303 -+ endif(DCONF_FOUND)
304 -+endif(ENABLE_DCONF)
305 -+
306 -+if(ENABLE_XFCONF)
307 -+ pkg_check_modules (XFCONF libxfconf-0)
308 -+ if(XFCONF_FOUND)
309 -+ add_compile_definitions(FF_HAVE_XFCONF=1)
310 -+ else(XFCONF_FOUND)
311 -+ message(WARNING "Package libxfconf-0 not found. Building without support.")
312 -+ endif(XFCONF_FOUND)
313 -+endif(ENABLE_XFCONF)
314 -+
315 -+if(ENABLE_RPM)
316 -+ pkg_check_modules (RPM rpm)
317 -+ if(RPM_FOUND)
318 -+ add_compile_definitions(FF_HAVE_RPM=1)
319 -+ else(RPM_FOUND)
320 -+ message(WARNING "Package librpm not found. Building without support.")
321 -+ endif(RPM_FOUND)
322 -+endif(ENABLE_RPM)
323 -
324 - include_directories(
325 - ${PROJECT_BINARY_DIR}