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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3979813835A for ; Wed, 28 Apr 2021 06:42:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7F135E0827; Wed, 28 Apr 2021 06:42:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5AD61E0827 for ; Wed, 28 Apr 2021 06:42:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D90293410BF for ; Wed, 28 Apr 2021 06:42:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 78F9E735 for ; Wed, 28 Apr 2021 06:42:15 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1619592122.d4969ef6df5d723871f7de62174d2c3fd1b3c63d.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/neofetch/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/neofetch/neofetch-7.1.0-r1.ebuild app-misc/neofetch/neofetch-9999.ebuild X-VCS-Directories: app-misc/neofetch/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: d4969ef6df5d723871f7de62174d2c3fd1b3c63d X-VCS-Branch: master Date: Wed, 28 Apr 2021 06:42:15 +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: bd642e3a-da75-4326-99dd-a6cd35386ac5 X-Archives-Hash: 979045beb307a34981b896356e9968c5 commit: d4969ef6df5d723871f7de62174d2c3fd1b3c63d Author: Matt Smith offtopica uk> AuthorDate: Fri Apr 16 19:40:55 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Wed Apr 28 06:42:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4969ef6 app-misc/neofetch: Use optfeature for runtime dependencies Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Matt Smith offtopica.uk> Closes: https://github.com/gentoo/gentoo/pull/20413 Signed-off-by: Joonas Niilola gentoo.org> ...eofetch-9999.ebuild => neofetch-7.1.0-r1.ebuild} | 21 +++++++++------------ app-misc/neofetch/neofetch-9999.ebuild | 21 +++++++++------------ 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/app-misc/neofetch/neofetch-9999.ebuild b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild similarity index 65% copy from app-misc/neofetch/neofetch-9999.ebuild copy to app-misc/neofetch/neofetch-7.1.0-r1.ebuild index b5f654d39b3..b0c0a070de9 100644 --- a/app-misc/neofetch/neofetch-9999.ebuild +++ b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit prefix +inherit optfeature prefix if [[ ${PV} != *9999* ]]; then SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz" @@ -17,17 +17,6 @@ DESCRIPTION="Simple information system script" HOMEPAGE="https://github.com/dylanaraps/neofetch" LICENSE="MIT-with-advertising" SLOT="0" -IUSE="X" - -RDEPEND="sys-apps/pciutils - X? ( - media-gfx/imagemagick - media-libs/imlib2 - www-client/w3m[imlib] - x11-apps/xprop - x11-apps/xrandr - x11-apps/xwininfo - )" src_prepare() { if use prefix; then @@ -43,3 +32,11 @@ src_prepare() { src_install() { emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install } + +pkg_postinst() { + optfeature "displaying images" "media-libs/imlib2 www-client/w3m[imlib]" + optfeature "gpu detection" sys-apps/pciutils + optfeature "thumbnail creation" media-gfx/imagemagick + optfeature "wallpaper" media-gfx/feh x11-misc/nitrogen + optfeature "window size" x11-misc/xdotool "x11-apps/xwininfo x11-apps/xprop" "x11-apps/xwininfo x11-apps/xdpyinfo" +} diff --git a/app-misc/neofetch/neofetch-9999.ebuild b/app-misc/neofetch/neofetch-9999.ebuild index b5f654d39b3..b0c0a070de9 100644 --- a/app-misc/neofetch/neofetch-9999.ebuild +++ b/app-misc/neofetch/neofetch-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit prefix +inherit optfeature prefix if [[ ${PV} != *9999* ]]; then SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz" @@ -17,17 +17,6 @@ DESCRIPTION="Simple information system script" HOMEPAGE="https://github.com/dylanaraps/neofetch" LICENSE="MIT-with-advertising" SLOT="0" -IUSE="X" - -RDEPEND="sys-apps/pciutils - X? ( - media-gfx/imagemagick - media-libs/imlib2 - www-client/w3m[imlib] - x11-apps/xprop - x11-apps/xrandr - x11-apps/xwininfo - )" src_prepare() { if use prefix; then @@ -43,3 +32,11 @@ src_prepare() { src_install() { emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install } + +pkg_postinst() { + optfeature "displaying images" "media-libs/imlib2 www-client/w3m[imlib]" + optfeature "gpu detection" sys-apps/pciutils + optfeature "thumbnail creation" media-gfx/imagemagick + optfeature "wallpaper" media-gfx/feh x11-misc/nitrogen + optfeature "window size" x11-misc/xdotool "x11-apps/xwininfo x11-apps/xprop" "x11-apps/xwininfo x11-apps/xdpyinfo" +}