summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-03-16 08:31:48 +0000
committerTim Harder <radhermit@gentoo.org>2012-03-16 08:31:48 +0000
commit036b308a3b652477e683463312baf229ade0bd3b (patch)
tree272c7edd179d7f944758493b84c5e3106ef3a9bc /media-gfx
parentBump (diff)
downloadhistorical-036b308a3b652477e683463312baf229ade0bd3b.tar.gz
historical-036b308a3b652477e683463312baf229ade0bd3b.tar.bz2
historical-036b308a3b652477e683463312baf229ade0bd3b.zip
Disable image display capabilities when X support is disabled (bug 408311).
Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/gmic/ChangeLog5
-rw-r--r--media-gfx/gmic/Manifest18
-rw-r--r--media-gfx/gmic/gmic-1.5.1.0.ebuild12
3 files changed, 22 insertions, 13 deletions
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 <radhermit@gentoo.org> gmic-1.5.1.0.ebuild:
+ Disable image display capabilities when X support is disabled (bug 408311).
01 Mar 2012; Tim Harder <radhermit@gentoo.org> -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/Manifest b/media-gfx/gmic/Manifest
index a0819cb7ee0b..aeae4ed1e306 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -7,17 +7,17 @@ DIST gmic_1.5.0.9.tar.gz 1196717 RMD160 fdd779ecbe0bc33060641dcfd6b1f5e1d3db3d26
DIST gmic_1.5.1.0.tar.gz 1958110 RMD160 e683d04588e3b5b5e186a61e5cf8ddbf87944aa3 SHA1 34f22eda7fdb730718ab1c9de15f5c721c5ef163 SHA256 1622d3d8365e3b8720e13f5fc4eb58dfecb944535f9334255a5ea99e14ba6074
DIST gmic_reference-1.5.1.0.pdf.xz 15783964 RMD160 390c3321d03eb1bcb9a9e3919e34052c73cbf838 SHA1 5bbc8e0e44cd664ed8bf97be20dda21463162bcb SHA256 044a028b8c977354702a721512503bcf61b7eff2c7a3b834a73477129fda73a8
EBUILD gmic-1.5.0.9.ebuild 1733 RMD160 773a61fa536bf52923db9deab49fce8ed8d3e448 SHA1 661b43be8595ed1aeaf17021293d8975fbfbce19 SHA256 0d751f47006fae542d2dc027efefd1d1085271bfd5e27659db19b340ed22a264
-EBUILD gmic-1.5.1.0.ebuild 1924 RMD160 35a06170e8530d471ad4183faa32a25df473f16f SHA1 33f5feacf769d26da27c0d81957f0272ecda66fd SHA256 823cf430c524c332ed42bba8e22703d448dcd120dec3b37b6714d084cc8158f5
-MISC ChangeLog 1909 RMD160 5af8752e3fe67aa8bf30e7d2c03b402cbf38834b SHA1 216255431da781352723cf8a082616388cca996b SHA256 5d7e45b33df5c001d6f8e0fd62c984000d3321b404d257a1cf08302b2fc6114a
+EBUILD gmic-1.5.1.0.ebuild 2040 RMD160 39cd8ee422618752bd1b98daa49a622b3d963df2 SHA1 464691d44f417360b617dbcea1ecba958ac6cf8a SHA256 00ef68a5e80b223d1c6bd0112247757e85ad2463896a3d1b12fd81651d3f80ed
+MISC ChangeLog 2058 RMD160 b36e8a39fca6d3005eea769ea607f7043ab07a6e SHA1 1edffdde61afb5c6fc7ea05a03406268078cf888 SHA256 202287fe2ecaaef1365d14088eabb5492560888d548829fdb40b9fb87702f550
MISC metadata.xml 473 RMD160 680f8739786ae6d9221c0f6d2734cb16682c1b7c SHA1 1ce57e832b27b5e349e070cdeaf37ff11f500b18 SHA256 def06af4d0283b01f9313231ff05df286129ff57afbcac23fcc7c45d8f735a6c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBCgAGBQJPT/OBAAoJEEqz6FtPBkyj6l4H/02Q+01eTR+++FFP26gbJ599
-bK/45CVTavlQtY5v7uNyRVSZYmpF6kkL2z2yHr+XHF+6XfMWcX9/vfcD97lPkql+
-tiQ/LEbJ/CJjhqzv9XPAMxYZ94v4lusYzZBgX9+Kb/loCLj/wRUnd178IT78wMvl
-VhqCQdWg+jdKunHxQI92q92NNyREIsCr8xld8YmIGwFUyKfvc+pFilk/X0rN+1Xw
-wbHWJSZyr7S9bXXtSCMUzXJfdhllEabOKJ+EIJcmSK4Kv4ShdAEnCgRTFJHDNbGg
-Q8Kb2O5/B36FHcM+Mxq3sBXZ9fF1QNMb5JPij2CGNlbHcT2gC7/zyhW4sqHA5jw=
-=VjpK
+iQEcBAEBCgAGBQJPYvp+AAoJEEqz6FtPBkyj/iMH/ianwTSgWETgX/PEnSBdINkT
+rXe9hYFXDL4zWkB7fD3OZkCbcAQSH43BXVYHouOEGx3qmYTjwiQZHLuqRMa2XDpz
+/avwYOvxM5k5S70GbhmaXnD8CUr4QuGq3S5v1V2Ke66IWvZ33FvSjNnKQsVwiEZe
+gbSXa6woiWFn9d4qkYyyzk6nEi1Qz1JKMpz+XQX0ElbEcmqlCII4dzrNmX4UEFbm
+IFMW/Ool1ZkHa8hBoFb014WAa/sXtLOumRS1DOO+lyULY7du94w1+/a0KB7K7DNy
+ApwwKJJoyT8Blp6UFkXEDvH2c+cj0YPKmcbzpLlnVyVQsC9KyDLmsvVLZMfClsk=
+=tvk5
-----END PGP SIGNATURE-----
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() {