summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2005-12-11 23:22:26 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2005-12-11 23:22:26 +0000
commite58a5896a89c66b81e87ab409a9f8d3de88c8783 (patch)
tree8c31497a766127911a9c4743095a6a9057ecdfd4
parentAdd modular X dependencies. (diff)
downloadgentoo-2-e58a5896a89c66b81e87ab409a9f8d3de88c8783.tar.gz
gentoo-2-e58a5896a89c66b81e87ab409a9f8d3de88c8783.tar.bz2
gentoo-2-e58a5896a89c66b81e87ab409a9f8d3de88c8783.zip
(#110992) Add modular X dependencies.
(Portage version: 2.0.53)
-rw-r--r--media-gfx/imagemagick/ChangeLog6
-rw-r--r--media-gfx/imagemagick/imagemagick-6.2.5.4.ebuild16
2 files changed, 18 insertions, 4 deletions
diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 0265ee99451b..0bd49b1f2ad5 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/imagemagick
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.168 2005/11/28 12:54:00 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.169 2005/12/11 23:22:26 spyderous Exp $
+
+ 11 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ imagemagick-6.2.5.4.ebuild:
+ (#110992) Add modular X dependencies.
28 Nov 2005; <mcumming@gentoo.org> imagemagick-6.2.1.5-r1.ebuild,
imagemagick-6.2.1.5.ebuild, imagemagick-6.2.2.0-r1.ebuild,
diff --git a/media-gfx/imagemagick/imagemagick-6.2.5.4.ebuild b/media-gfx/imagemagick/imagemagick-6.2.5.4.ebuild
index a1301572dd2e..cbdced268a0b 100644
--- a/media-gfx/imagemagick/imagemagick-6.2.5.4.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.2.5.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.5.4.ebuild,v 1.3 2005/11/28 12:54:00 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.5.4.ebuild,v 1.4 2005/12/11 23:22:26 spyderous Exp $
inherit eutils perl-app multilib
@@ -19,7 +19,14 @@ IUSE="bzip2 doc fpx graphviz gs jbig jpeg lcms mpeg nocxx perl png tiff truetype
RDEPEND="bzip2? ( app-arch/bzip2 )
zlib? ( sys-libs/zlib )
- X? ( virtual/x11 )
+ X? ( || ( ( x11-libs/libXext
+ x11-libs/libXt
+ x11-libs/libICE
+ x11-libs/libSM
+ )
+ virtual/x11
+ )
+ )
gs? ( virtual/ghostscript )
lcms? ( >=media-libs/lcms-1.06 )
mpeg? ( >=media-video/mpeg2vidcodec-12 )
@@ -36,7 +43,10 @@ RDEPEND="bzip2? ( app-arch/bzip2 )
fpx? ( media-libs/libfpx )"
DEPEND="${RDEPEND}
>=sys-apps/sed-4
- >=sys-devel/libtool-1.5.2-r6"
+ >=sys-devel/libtool-1.5.2-r6
+ X? ( || ( x11-proto/xextproto
+ virtual/x11 )
+ )"
S=${WORKDIR}/${MY_P}