From 3de91cf03ea98944f53dc40e1e6fe3a3092f1b27 Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Fri, 16 Mar 2012 08:31:48 +0000 Subject: Disable image display capabilities when X support is disabled (bug 408311). (Portage version: 2.2.0_alpha90/cvs/Linux x86_64) --- media-gfx/gmic/ChangeLog | 5 ++++- media-gfx/gmic/gmic-1.5.1.0.ebuild | 12 +++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'media-gfx/gmic') diff --git a/media-gfx/gmic/ChangeLog b/media-gfx/gmic/ChangeLog index 62c9b0deb6b7..1263581393fe 100644 --- a/media-gfx/gmic/ChangeLog +++ b/media-gfx/gmic/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/gmic # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.12 2012/03/01 22:08:59 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.13 2012/03/16 08:31:48 radhermit Exp $ + + 16 Mar 2012; Tim Harder gmic-1.5.1.0.ebuild: + Disable image display capabilities when X support is disabled (bug 408311). 01 Mar 2012; Tim Harder -gmic-1.5.0.7.ebuild, -files/gmic-1.5.0.7-makefile.patch, -gmic-1.5.0.8.ebuild: diff --git a/media-gfx/gmic/gmic-1.5.1.0.ebuild b/media-gfx/gmic/gmic-1.5.1.0.ebuild index 6f0604dd3e4f..3baafb19a1eb 100644 --- a/media-gfx/gmic/gmic-1.5.1.0.ebuild +++ b/media-gfx/gmic/gmic-1.5.1.0.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.1.0.ebuild,v 1.1 2012/03/01 22:07:11 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.1.0.ebuild,v 1.2 2012/03/16 08:31:48 radhermit Exp $ EAPI="4" -inherit eutils toolchain-funcs bash-completion-r1 +inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic DESCRIPTION="GREYC's Magic Image Converter" HOMEPAGE="http://gmic.sourceforge.net/" @@ -48,7 +48,13 @@ src_prepare() { use graphicsmagick || { sed -i -r -e "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; } use openexr || { sed -i -r -e "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; } - use X || { sed -i -r -e "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\1/" Makefile || die ; } + + if ! use X ; then + sed -i -r -e "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\1/" Makefile || die + + # Disable display capabilities when X support is disabled + append-flags -Dcimg_display=0 + fi } src_compile() { -- cgit v1.2.3-65-gdbad