From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 10A2A15808C for ; Tue, 22 Feb 2022 18:31:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1FD33E0AFE; Tue, 22 Feb 2022 18:31:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E9277E0AFD for ; Tue, 22 Feb 2022 18:31:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C897034395E for ; Tue, 22 Feb 2022 18:31:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F1A6F2D6 for ; Tue, 22 Feb 2022 18:31:34 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1645554658.cef2099239ed0f050799aefe5cfa223b6afc5de6.viorel_munteanu@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-misc/fastfetch/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-misc/fastfetch/Manifest app-misc/fastfetch/fastfetch-0.604.ebuild app-misc/fastfetch/fastfetch-9999.ebuild X-VCS-Directories: app-misc/fastfetch/ X-VCS-Committer: viorel_munteanu X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: cef2099239ed0f050799aefe5cfa223b6afc5de6 X-VCS-Branch: dev Date: Tue, 22 Feb 2022 18:31:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 16930641-8ae6-4c2b-8bb5-d34d84b0613e X-Archives-Hash: 23763d6b57f8dde915fc645b6426c9f0 commit: cef2099239ed0f050799aefe5cfa223b6afc5de6 Author: Viorel Munteanu gmail com> AuthorDate: Tue Feb 22 18:18:49 2022 +0000 Commit: Viorel Munteanu gmail 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 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 }