1 |
commit: cef2099239ed0f050799aefe5cfa223b6afc5de6 |
2 |
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Feb 22 18:18:49 2022 +0000 |
4 |
Commit: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com> |
5 |
CommitDate: Tue Feb 22 18:30:58 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cef20992 |
7 |
|
8 |
app-misc/fastfetch: add 0.604 |
9 |
|
10 |
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com> |
11 |
|
12 |
app-misc/fastfetch/Manifest | 1 + |
13 |
...astfetch-9999.ebuild => fastfetch-0.604.ebuild} | 36 ++++++++-------------- |
14 |
app-misc/fastfetch/fastfetch-9999.ebuild | 35 +++++++-------------- |
15 |
3 files changed, 24 insertions(+), 48 deletions(-) |
16 |
|
17 |
diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest |
18 |
index fe3f3bd75..e56a66e7d 100644 |
19 |
--- a/app-misc/fastfetch/Manifest |
20 |
+++ b/app-misc/fastfetch/Manifest |
21 |
@@ -1 +1,2 @@ |
22 |
DIST fastfetch-0.599.tar.gz 323683 BLAKE2B 73dd5269fd37b6393f2f02fa93c1a398726101922cc6ec05862939f290edb02269131292cf1384dba3bd13996e06e861f62cd77cfa5c2dd2eaeee28c0eb97707 SHA512 90af0425d8a7746009028aeddb50970ead3d74506bc75defb8c4a179a9e51b8d2cd32186b25e9cc45c40c85567ee783edf581a79ee1fd5468d6936caf5ab4e2a |
23 |
+DIST fastfetch-0.604.tar.gz 324226 BLAKE2B 75860f98b5eaca0a59e29618a9d7bd2542aff12eb9761186b6233ffe17212df0b54e387b86511540b4e1522f017f73a1286ec58b0f54a4687a9f11fbb5235652 SHA512 09a531be1d35deb7ad34dd9059baa8abaa1d9872d27178d467d743e74d6b8e49549762f893ce2538c14c52dd392ed25ed4b68218d2bcda9b1e86f6bf1310011e |
24 |
|
25 |
diff --git a/app-misc/fastfetch/fastfetch-9999.ebuild b/app-misc/fastfetch/fastfetch-0.604.ebuild |
26 |
similarity index 73% |
27 |
copy from app-misc/fastfetch/fastfetch-9999.ebuild |
28 |
copy to app-misc/fastfetch/fastfetch-0.604.ebuild |
29 |
index 6b0e09ff4..0697f531e 100644 |
30 |
--- a/app-misc/fastfetch/fastfetch-9999.ebuild |
31 |
+++ b/app-misc/fastfetch/fastfetch-0.604.ebuild |
32 |
@@ -3,7 +3,7 @@ |
33 |
|
34 |
EAPI=8 |
35 |
|
36 |
-inherit bash-completion-r1 cmake |
37 |
+inherit cmake |
38 |
|
39 |
DESCRIPTION="Like neofetch but faster" |
40 |
HOMEPAGE="https://github.com/LinusDierheimer/fastfetch" |
41 |
@@ -11,14 +11,15 @@ if [[ ${PV} == *9999 ]]; then |
42 |
inherit git-r3 |
43 |
EGIT_REPO_URI="https://github.com/LinusDierheimer/fastfetch.git" |
44 |
else |
45 |
- COMMIT="f72ec8a99f6021e95abce282668cce99fabd28c5" |
46 |
- VERSION_REV="f72ec8a" |
47 |
+ COMMIT="0cb6e40bacfed8c217afc4bd580b7905d6d6893b" |
48 |
+ VERSION_REV="0cb6e40" |
49 |
SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
50 |
S="${WORKDIR}/${PN}-${COMMIT}" |
51 |
fi |
52 |
|
53 |
LICENSE="MIT" |
54 |
SLOT="0" |
55 |
+KEYWORDS="~amd64" |
56 |
IUSE="X gnome pci vulkan wayland xcb xfce xrandr" |
57 |
|
58 |
# note - qa-vdb will always report errors because fastfetch loads the libs dynamically |
59 |
@@ -54,31 +55,18 @@ src_configure() { |
60 |
-DENABLE_XFCONF=$(usex xfce) |
61 |
) |
62 |
|
63 |
- if [[ ${PV} != *9999 ]]; then |
64 |
- # version comes from git, fake it |
65 |
- VERSION_MAJOR="$(ver_cut 2)" |
66 |
- sed -i -e " |
67 |
- s/\(PROJECT_VERSION\) .*$/\1 \"r${VERSION_MAJOR}.${VERSION_REV}\")/ |
68 |
- s/\(PROJECT_VERSION_MAJOR\) .*$/\1 \"${VERSION_MAJOR}\")/" CMakeLists.txt || die "Cannot patch version" |
69 |
- fi |
70 |
- |
71 |
- cmake_src_configure |
72 |
-} |
73 |
- |
74 |
-src_install() { |
75 |
if [[ ${PV} == *9999 ]]; then |
76 |
elog "REV=\"r$(git rev-list --count HEAD)\"" |
77 |
elog "COMMIT=\"$(git rev-parse HEAD)\"" |
78 |
elog "VERSION_REV=\"$(git rev-parse --short HEAD)\"" |
79 |
+ else |
80 |
+ # version comes from git, fake it |
81 |
+ local project_version_major=$(ver_cut 2) |
82 |
+ mycmakeargs+=( |
83 |
+ -DPROJECT_VERSION="r${project_version_major}.${VERSION_REV}" |
84 |
+ -DPROJECT_VERSION_MAJOR="${project_version_major}" |
85 |
+ ) |
86 |
fi |
87 |
|
88 |
- pushd "${BUILD_DIR}" || die |
89 |
- dobin fastfetch |
90 |
- popd |
91 |
- |
92 |
- newbashcomp completions/bash fastfetch |
93 |
- insinto /usr/share/${PN}/presets |
94 |
- doins presets/* |
95 |
- |
96 |
- einstalldocs |
97 |
+ cmake_src_configure |
98 |
} |
99 |
|
100 |
diff --git a/app-misc/fastfetch/fastfetch-9999.ebuild b/app-misc/fastfetch/fastfetch-9999.ebuild |
101 |
index 6b0e09ff4..5e1fc6be7 100644 |
102 |
--- a/app-misc/fastfetch/fastfetch-9999.ebuild |
103 |
+++ b/app-misc/fastfetch/fastfetch-9999.ebuild |
104 |
@@ -3,7 +3,7 @@ |
105 |
|
106 |
EAPI=8 |
107 |
|
108 |
-inherit bash-completion-r1 cmake |
109 |
+inherit cmake |
110 |
|
111 |
DESCRIPTION="Like neofetch but faster" |
112 |
HOMEPAGE="https://github.com/LinusDierheimer/fastfetch" |
113 |
@@ -11,8 +11,8 @@ if [[ ${PV} == *9999 ]]; then |
114 |
inherit git-r3 |
115 |
EGIT_REPO_URI="https://github.com/LinusDierheimer/fastfetch.git" |
116 |
else |
117 |
- COMMIT="f72ec8a99f6021e95abce282668cce99fabd28c5" |
118 |
- VERSION_REV="f72ec8a" |
119 |
+ COMMIT="0cb6e40bacfed8c217afc4bd580b7905d6d6893b" |
120 |
+ VERSION_REV="0cb6e40" |
121 |
SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
122 |
S="${WORKDIR}/${PN}-${COMMIT}" |
123 |
fi |
124 |
@@ -54,31 +54,18 @@ src_configure() { |
125 |
-DENABLE_XFCONF=$(usex xfce) |
126 |
) |
127 |
|
128 |
- if [[ ${PV} != *9999 ]]; then |
129 |
- # version comes from git, fake it |
130 |
- VERSION_MAJOR="$(ver_cut 2)" |
131 |
- sed -i -e " |
132 |
- s/\(PROJECT_VERSION\) .*$/\1 \"r${VERSION_MAJOR}.${VERSION_REV}\")/ |
133 |
- s/\(PROJECT_VERSION_MAJOR\) .*$/\1 \"${VERSION_MAJOR}\")/" CMakeLists.txt || die "Cannot patch version" |
134 |
- fi |
135 |
- |
136 |
- cmake_src_configure |
137 |
-} |
138 |
- |
139 |
-src_install() { |
140 |
if [[ ${PV} == *9999 ]]; then |
141 |
elog "REV=\"r$(git rev-list --count HEAD)\"" |
142 |
elog "COMMIT=\"$(git rev-parse HEAD)\"" |
143 |
elog "VERSION_REV=\"$(git rev-parse --short HEAD)\"" |
144 |
+ else |
145 |
+ # version comes from git, fake it |
146 |
+ local project_version_major=$(ver_cut 2) |
147 |
+ mycmakeargs+=( |
148 |
+ -DPROJECT_VERSION="r${project_version_major}.${VERSION_REV}" |
149 |
+ -DPROJECT_VERSION_MAJOR="${project_version_major}" |
150 |
+ ) |
151 |
fi |
152 |
|
153 |
- pushd "${BUILD_DIR}" || die |
154 |
- dobin fastfetch |
155 |
- popd |
156 |
- |
157 |
- newbashcomp completions/bash fastfetch |
158 |
- insinto /usr/share/${PN}/presets |
159 |
- doins presets/* |
160 |
- |
161 |
- einstalldocs |
162 |
+ cmake_src_configure |
163 |
} |