diff options
| author |   Marcelo Góes <vanquirius@gentoo.org> | 2006-02-02 03:19:59 +0000 |
|---|---|---|
| committer | Marcelo Góes <vanquirius@gentoo.org> | 2006-02-02 03:19:59 +0000 |
| commit | 6920127cbdef735a15927459ad073be0730aed11 (patch) | |
| tree | f6044ad647455e19249c23f676e5d7ab932be2be | |
| parent | Added detailed "die" messages (see bug #120929) (diff) | |
| download | gentoo-2-6920127cbdef735a15927459ad073be0730aed11.tar.gz gentoo-2-6920127cbdef735a15927459ad073be0730aed11.tar.bz2 gentoo-2-6920127cbdef735a15927459ad073be0730aed11.zip | |
Make modular X friendly.
(Portage version: 2.0.54)
| -rw-r--r-- | media-gfx/k3d/ChangeLog | 5 | ||||
| -rw-r--r-- | media-gfx/k3d/Manifest | 2 | ||||
| -rw-r--r-- | media-gfx/k3d/k3d-0.5.0.34.ebuild | 22 |
3 files changed, 23 insertions, 6 deletions
diff --git a/media-gfx/k3d/ChangeLog b/media-gfx/k3d/ChangeLog index ca8704217749..35a6d83b87cc 100644 --- a/media-gfx/k3d/ChangeLog +++ b/media-gfx/k3d/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/k3d # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.23 2006/01/30 03:40:43 vanquirius Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.24 2006/02/02 03:19:59 vanquirius Exp $ + + 02 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> k3d-0.5.0.34.ebuild: + Make modular X friendly. 30 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> k3d-0.5.0.34.ebuild: Depend on >=x11-libs/gtkglext-1.0.6-r3, since earlier versions do not link diff --git a/media-gfx/k3d/Manifest b/media-gfx/k3d/Manifest index 8e198550f2e5..3c370df26793 100644 --- a/media-gfx/k3d/Manifest +++ b/media-gfx/k3d/Manifest @@ -3,5 +3,5 @@ MD5 f422c293ed6d2f4f51162353a19008a0 files/digest-k3d-0.5.0.33 66 MD5 20e100fbbfd6cb1cee996065d9a66660 files/digest-k3d-0.5.0.34 66 MD5 496ef774e987945057662901c2f855ee files/k3d-0.5.0.34-nls.patch 1610 MD5 b4275fc98b9707d8361812632919ef93 k3d-0.5.0.33.ebuild 2030 -MD5 8a927e727f00d68d5dc1c24e2fd9a5a7 k3d-0.5.0.34.ebuild 1923 +MD5 1a75b053456da7d5bfe93fdba3bfdf65 k3d-0.5.0.34.ebuild 2098 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161 diff --git a/media-gfx/k3d/k3d-0.5.0.34.ebuild b/media-gfx/k3d/k3d-0.5.0.34.ebuild index d3cc0a0b70aa..2b567ae6cdca 100644 --- a/media-gfx/k3d/k3d-0.5.0.34.ebuild +++ b/media-gfx/k3d/k3d-0.5.0.34.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.5.0.34.ebuild,v 1.4 2006/01/30 03:40:43 vanquirius Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.5.0.34.ebuild,v 1.5 2006/02/02 03:19:59 vanquirius Exp $ inherit eutils @@ -13,8 +13,7 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="expat gnome graphviz imagemagick javascript jpeg nls openexr plib png python qt svg tiff truetype xml2" -DEPEND="virtual/x11 - virtual/opengl +DEPEND="virtual/opengl virtual/glu dev-libs/boost expat? ( dev-libs/expat ) @@ -31,11 +30,26 @@ DEPEND="virtual/x11 plib? ( media-libs/plib ) png? ( media-libs/libpng ) python? ( >=dev-lang/python-2.3 ) - qt? ( x11-libs/qt ) + qt? ( =x11-libs/qt-3* ) tiff? ( media-libs/tiff ) =dev-libs/libsigc++-2.0* svg? ( gnome-base/librsvg )" +RDEPEND="${DEPEND} + ( || ( + ( x11-libs/libXmu + x11-libs/libXt + x11-libs/libICE + x11-libs/libSM ) + virtual/x11 ) + )" + +DEPEND="${DEPEND} + ( || ( + ( media-libs/mesa ) + virtual/x11 ) + )" + src_unpack() { unpack ${A} # bug 112144 |