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 DA41B1396D0 for ; Thu, 17 Aug 2017 20:08:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 357F8E0D49; Thu, 17 Aug 2017 20:08:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 17E00E0D49 for ; Thu, 17 Aug 2017 20:08:34 +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 43B353418C5 for ; Thu, 17 Aug 2017 20:08:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB111793C for ; Thu, 17 Aug 2017 20:08:27 +0000 (UTC) From: "Tim Harder" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tim Harder" Message-ID: <1503000250.97e297085c06b587a90e43b0c466b0d94c092ba4.radhermit@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/sxiv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/sxiv/sxiv-9999.ebuild X-VCS-Directories: media-gfx/sxiv/ X-VCS-Committer: radhermit X-VCS-Committer-Name: Tim Harder X-VCS-Revision: 97e297085c06b587a90e43b0c466b0d94c092ba4 X-VCS-Branch: master Date: Thu, 17 Aug 2017 20:08:27 +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-Archives-Salt: f13df6ea-820b-417c-bc2e-60f5d1fb65dc X-Archives-Hash: e1b5966a2210b973740b8d03bd1331b0 commit: 97e297085c06b587a90e43b0c466b0d94c092ba4 Author: Tim Harder gentoo org> AuthorDate: Thu Aug 17 20:04:10 2017 +0000 Commit: Tim Harder gentoo org> CommitDate: Thu Aug 17 20:04:10 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e29708 media-gfx/sxiv: use build options to disable exif/gif support media-gfx/sxiv/sxiv-9999.ebuild | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/media-gfx/sxiv/sxiv-9999.ebuild b/media-gfx/sxiv/sxiv-9999.ebuild index 75f593a1b0f..d6b5f0192b8 100644 --- a/media-gfx/sxiv/sxiv-9999.ebuild +++ b/media-gfx/sxiv/sxiv-9999.ebuild @@ -31,28 +31,16 @@ DEPEND="${RDEPEND}" src_prepare() { sed -i '/^LDFLAGS/d' Makefile || die - # disable exif support as required - if ! use exif; then - sed \ - -e 's/^.* -DHAVE_GIFLIB/#\0/' \ - -e 's/^.* -lgif/#\0/' \ - -i Makefile || die - fi - - # disable gif support as required - if ! use gif; then - sed \ - -e 's/^.* -DHAVE_LIBEXIF/#\0/' \ - -e 's/^.* -lexif/#\0/' \ - -i Makefile || die - fi - tc-export CC restore_config config.h default } +src_compile() { + emake $(usex exif "" NO_LIBEXIF=1) $(usex gif "" NO_GIFLIB=1) +} + src_install() { emake DESTDIR="${ED}" PREFIX=/usr install emake -C icon DESTDIR="${ED}" PREFIX=/usr install