[gentoo-commits] repo/proj/guru:master commit in: app-misc/fastfetch/

[Ronny Gutbrod]

commit:     13246eee06847f70d85e10a1653e88c2480e9981
Author:     Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Sun Mar 20 19:01:52 2022 +0000
Commit:     Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Sun Mar 20 19:01:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=13246eee

app-misc/fastfetch: add 1.0.0

Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>

 app-misc/fastfetch/Manifest                           |  1 +
 .../{fastfetch-9999.ebuild => fastfetch-1.0.0.ebuild} | 19 ++-----------------
 app-misc/fastfetch/fastfetch-9999.ebuild              | 18 +-----------------
 3 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index d5a344c27..2211420d1 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1 +1,2 @@
 DIST fastfetch-0.619.tar.gz 327381 BLAKE2B 
c85425478fa1cf42570232927e7bbd12b53cd450925a64ff21318ea9a3f22544d66e66b32f4f5b33a660082ca0dfc8666cc8b705078c8cec29de657385e1d564
 SHA512 
57ba0697e0b2f1d984a4ede21b50873a7ba0381b54eed07ad508fc454903e3dbcdfdb6ac6456141aff5cf0ce6d880f58f4343b2cad6e785491b397ab7413329e
+DIST fastfetch-1.0.0.tar.gz 326757 BLAKE2B 
65a63a930bcc59f8ffc95f41515ea1eb924803c9365d830a8b5f17627b64ba4b64795cc5c3af24d0971fd8969f557fcd398234fca845481b38417ebe3ea0177c
 SHA512 
c32df2276176e475c434ea9aae60debd9d05b0fed1861f2b1ce659ff693d98b181bf54aeb35abbd80944d72fd2280d2b7325f91eef1ee124083a81c46c9c7a10

diff --git a/app-misc/fastfetch/fastfetch-9999.ebuild 
b/app-misc/fastfetch/fastfetch-1.0.0.ebuild
similarity index 66%
copy from app-misc/fastfetch/fastfetch-9999.ebuild
copy to app-misc/fastfetch/fastfetch-1.0.0.ebuild
index 5e1fc6be7..414ee9c3d 100644
--- a/app-misc/fastfetch/fastfetch-9999.ebuild
+++ b/app-misc/fastfetch/fastfetch-1.0.0.ebuild
@@ -11,14 +11,12 @@ if [[ ${PV} == *9999 ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/LinusDierheimer/fastfetch.git";
 else
-       COMMIT="0cb6e40bacfed8c217afc4bd580b7905d6d6893b"
-       VERSION_REV="0cb6e40"
-       
SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/${COMMIT}.tar.gz 
-> ${P}.tar.gz"
-       S="${WORKDIR}/${PN}-${COMMIT}"
+       
SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/refs/tags/${PV}.tar.gz
 -> ${P}.tar.gz"
 fi
 
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64"
 IUSE="X gnome pci vulkan wayland xcb xfce xrandr"
 
 # note - qa-vdb will always report errors because fastfetch loads the libs 
dynamically
@@ -54,18 +52,5 @@ src_configure() {
                -DENABLE_XFCONF=$(usex xfce)
        )
 
-       if [[ ${PV} == *9999 ]]; then
-               elog "REV=\"r$(git rev-list --count HEAD)\""
-               elog "COMMIT=\"$(git rev-parse HEAD)\""
-               elog "VERSION_REV=\"$(git rev-parse --short HEAD)\""
-       else
-               # version comes from git, fake it
-               local project_version_major=$(ver_cut 2)
-               mycmakeargs+=(
-                       
-DPROJECT_VERSION="r${project_version_major}.${VERSION_REV}"
-                       -DPROJECT_VERSION_MAJOR="${project_version_major}"
-               )
-       fi
-
        cmake_src_configure
 }

diff --git a/app-misc/fastfetch/fastfetch-9999.ebuild 
b/app-misc/fastfetch/fastfetch-9999.ebuild
index 5e1fc6be7..8690c19dd 100644
--- a/app-misc/fastfetch/fastfetch-9999.ebuild
+++ b/app-misc/fastfetch/fastfetch-9999.ebuild
@@ -11,10 +11,7 @@ if [[ ${PV} == *9999 ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/LinusDierheimer/fastfetch.git";
 else
-       COMMIT="0cb6e40bacfed8c217afc4bd580b7905d6d6893b"
-       VERSION_REV="0cb6e40"
-       
SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/${COMMIT}.tar.gz 
-> ${P}.tar.gz"
-       S="${WORKDIR}/${PN}-${COMMIT}"
+       
SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/refs/tags/${PV}.tar.gz
 -> ${P}.tar.gz"
 fi
 
 LICENSE="MIT"
@@ -54,18 +51,5 @@ src_configure() {
                -DENABLE_XFCONF=$(usex xfce)
        )
 
-       if [[ ${PV} == *9999 ]]; then
-               elog "REV=\"r$(git rev-list --count HEAD)\""
-               elog "COMMIT=\"$(git rev-parse HEAD)\""
-               elog "VERSION_REV=\"$(git rev-parse --short HEAD)\""
-       else
-               # version comes from git, fake it
-               local project_version_major=$(ver_cut 2)
-               mycmakeargs+=(
-                       
-DPROJECT_VERSION="r${project_version_major}.${VERSION_REV}"
-                       -DPROJECT_VERSION_MAJOR="${project_version_major}"
-               )
-       fi
-
        cmake_src_configure
 }