commit: cef2099239ed0f050799aefe5cfa223b6afc5de6 Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com> AuthorDate: Tue Feb 22 18:18:49 2022 +0000 Commit: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com> CommitDate: Tue Feb 22 18:30:58 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cef20992
app-misc/fastfetch: add 0.604 Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com> app-misc/fastfetch/Manifest | 1 + ...astfetch-9999.ebuild => fastfetch-0.604.ebuild} | 36 ++++++++-------------- app-misc/fastfetch/fastfetch-9999.ebuild | 35 +++++++-------------- 3 files changed, 24 insertions(+), 48 deletions(-) diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest index fe3f3bd75..e56a66e7d 100644 --- a/app-misc/fastfetch/Manifest +++ b/app-misc/fastfetch/Manifest @@ -1 +1,2 @@ DIST fastfetch-0.599.tar.gz 323683 BLAKE2B 73dd5269fd37b6393f2f02fa93c1a398726101922cc6ec05862939f290edb02269131292cf1384dba3bd13996e06e861f62cd77cfa5c2dd2eaeee28c0eb97707 SHA512 90af0425d8a7746009028aeddb50970ead3d74506bc75defb8c4a179a9e51b8d2cd32186b25e9cc45c40c85567ee783edf581a79ee1fd5468d6936caf5ab4e2a +DIST fastfetch-0.604.tar.gz 324226 BLAKE2B 75860f98b5eaca0a59e29618a9d7bd2542aff12eb9761186b6233ffe17212df0b54e387b86511540b4e1522f017f73a1286ec58b0f54a4687a9f11fbb5235652 SHA512 09a531be1d35deb7ad34dd9059baa8abaa1d9872d27178d467d743e74d6b8e49549762f893ce2538c14c52dd392ed25ed4b68218d2bcda9b1e86f6bf1310011e diff --git a/app-misc/fastfetch/fastfetch-9999.ebuild b/app-misc/fastfetch/fastfetch-0.604.ebuild similarity index 73% copy from app-misc/fastfetch/fastfetch-9999.ebuild copy to app-misc/fastfetch/fastfetch-0.604.ebuild index 6b0e09ff4..0697f531e 100644 --- a/app-misc/fastfetch/fastfetch-9999.ebuild +++ b/app-misc/fastfetch/fastfetch-0.604.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit bash-completion-r1 cmake +inherit cmake DESCRIPTION="Like neofetch but faster" HOMEPAGE="https://github.com/LinusDierheimer/fastfetch"; @@ -11,14 +11,15 @@ if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/LinusDierheimer/fastfetch.git"; else - COMMIT="f72ec8a99f6021e95abce282668cce99fabd28c5" - VERSION_REV="f72ec8a" + COMMIT="0cb6e40bacfed8c217afc4bd580b7905d6d6893b" + VERSION_REV="0cb6e40" SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" 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,31 +55,18 @@ src_configure() { -DENABLE_XFCONF=$(usex xfce) ) - if [[ ${PV} != *9999 ]]; then - # version comes from git, fake it - VERSION_MAJOR="$(ver_cut 2)" - sed -i -e " - s/\(PROJECT_VERSION\) .*$/\1 \"r${VERSION_MAJOR}.${VERSION_REV}\")/ - s/\(PROJECT_VERSION_MAJOR\) .*$/\1 \"${VERSION_MAJOR}\")/" CMakeLists.txt || die "Cannot patch version" - fi - - cmake_src_configure -} - -src_install() { 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 - pushd "${BUILD_DIR}" || die - dobin fastfetch - popd - - newbashcomp completions/bash fastfetch - insinto /usr/share/${PN}/presets - doins presets/* - - einstalldocs + cmake_src_configure } diff --git a/app-misc/fastfetch/fastfetch-9999.ebuild b/app-misc/fastfetch/fastfetch-9999.ebuild index 6b0e09ff4..5e1fc6be7 100644 --- a/app-misc/fastfetch/fastfetch-9999.ebuild +++ b/app-misc/fastfetch/fastfetch-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit bash-completion-r1 cmake +inherit cmake DESCRIPTION="Like neofetch but faster" HOMEPAGE="https://github.com/LinusDierheimer/fastfetch"; @@ -11,8 +11,8 @@ if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/LinusDierheimer/fastfetch.git"; else - COMMIT="f72ec8a99f6021e95abce282668cce99fabd28c5" - VERSION_REV="f72ec8a" + COMMIT="0cb6e40bacfed8c217afc4bd580b7905d6d6893b" + VERSION_REV="0cb6e40" SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" fi @@ -54,31 +54,18 @@ src_configure() { -DENABLE_XFCONF=$(usex xfce) ) - if [[ ${PV} != *9999 ]]; then - # version comes from git, fake it - VERSION_MAJOR="$(ver_cut 2)" - sed -i -e " - s/\(PROJECT_VERSION\) .*$/\1 \"r${VERSION_MAJOR}.${VERSION_REV}\")/ - s/\(PROJECT_VERSION_MAJOR\) .*$/\1 \"${VERSION_MAJOR}\")/" CMakeLists.txt || die "Cannot patch version" - fi - - cmake_src_configure -} - -src_install() { 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 - pushd "${BUILD_DIR}" || die - dobin fastfetch - popd - - newbashcomp completions/bash fastfetch - insinto /usr/share/${PN}/presets - doins presets/* - - einstalldocs + cmake_src_configure }
