diff options
41 files changed, 194 insertions, 184 deletions
diff --git a/media-libs/aalib/ChangeLog b/media-libs/aalib/ChangeLog index 25d5f38f73a9..39e2cd08c056 100644 --- a/media-libs/aalib/ChangeLog +++ b/media-libs/aalib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/aalib # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/ChangeLog,v 1.33 2007/04/22 14:30:32 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/ChangeLog,v 1.34 2007/07/22 09:44:48 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; + aalib-1.4_rc4-r2.ebuild, aalib-1.4_rc5.ebuild: + Drop virtual/x11 references. 22 Apr 2007; Danny van Dyk <kugelfang@gentoo.org> aalib-1.4_rc5.ebuild: Fixed bug #165617. Thanks to jieryn@gmail.com. diff --git a/media-libs/aalib/aalib-1.4_rc4-r2.ebuild b/media-libs/aalib/aalib-1.4_rc4-r2.ebuild index 39d7469ae7fe..24bf3eab9487 100644 --- a/media-libs/aalib/aalib-1.4_rc4-r2.ebuild +++ b/media-libs/aalib/aalib-1.4_rc4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc4-r2.ebuild,v 1.36 2007/02/17 17:21:56 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc4-r2.ebuild,v 1.37 2007/07/22 09:44:47 dberkholz Exp $ inherit eutils libtool @@ -16,11 +16,11 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86" IUSE="X slang gpm static" -RDEPEND="X? ( || ( x11-libs/libX11 virtual/x11 ) )" +RDEPEND="X? ( x11-libs/libX11 )" DEPEND="${RDEPEND} >=sys-libs/ncurses-5.1 - X? ( || ( x11-proto/xproto virtual/x11 ) ) + X? ( x11-proto/xproto ) gpm? ( sys-libs/gpm ) slang? ( >=sys-libs/slang-1.4.2 )" diff --git a/media-libs/aalib/aalib-1.4_rc5.ebuild b/media-libs/aalib/aalib-1.4_rc5.ebuild index a2b5cc7d7b30..0028a54eccf4 100644 --- a/media-libs/aalib/aalib-1.4_rc5.ebuild +++ b/media-libs/aalib/aalib-1.4_rc5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc5.ebuild,v 1.19 2007/04/22 14:30:32 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc5.ebuild,v 1.20 2007/07/22 09:44:47 dberkholz Exp $ WANT_AUTOCONF=latest WANT_AUTOMAKE=latest @@ -19,11 +19,11 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" IUSE="X slang gpm" -RDEPEND="X? ( || ( x11-libs/libX11 virtual/x11 ) )" +RDEPEND="X? ( x11-libs/libX11 )" DEPEND="${RDEPEND} >=sys-libs/ncurses-5.1 - X? ( || ( x11-proto/xproto virtual/x11 ) ) + X? ( x11-proto/xproto ) gpm? ( sys-libs/gpm ) slang? ( >=sys-libs/slang-1.4.2 )" diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog index 4de45e5ea040..a9ac11e87349 100644 --- a/media-libs/allegro/ChangeLog +++ b/media-libs/allegro/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/allegro # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.65 2007/03/01 00:04:41 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.66 2007/07/22 09:43:17 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; + allegro-4.1.14.ebuild, allegro-4.2.0-r1.ebuild: + Drop virtual/x11 references. 28 Feb 2007; Tristan Heaven <nyhm@gentoo.org> allegro-4.2.1.ebuild: install setup utility, bug #155123 diff --git a/media-libs/allegro/allegro-4.1.14.ebuild b/media-libs/allegro/allegro-4.1.14.ebuild index b2635c56bff0..d3cd549c2161 100644 --- a/media-libs/allegro/allegro-4.1.14.ebuild +++ b/media-libs/allegro/allegro-4.1.14.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.1.14.ebuild,v 1.16 2006/08/27 19:39:28 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.1.14.ebuild,v 1.17 2007/07/22 09:43:17 dberkholz Exp $ IUSE="static mmx sse oss alsa esd arts X fbcon svga tetex doc" @@ -18,26 +18,16 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) esd? ( media-sound/esound ) arts? ( kde-base/arts ) X? ( - || ( - ( - x11-libs/libXxf86vm - x11-libs/libXxf86dga - ) - virtual/x11 - ) + x11-libs/libXxf86vm + x11-libs/libXxf86dga ) svga? ( media-libs/svgalib )" DEPEND="${RDEPEND} >=sys-apps/sed-4 X? ( - || ( - ( - x11-proto/xextproto - x11-proto/xf86dgaproto - x11-proto/xf86vidmodeproto - ) - virtual/x11 - ) + x11-proto/xextproto + x11-proto/xf86dgaproto + x11-proto/xf86vidmodeproto ) tetex? ( virtual/tetex )" diff --git a/media-libs/allegro/allegro-4.2.0-r1.ebuild b/media-libs/allegro/allegro-4.2.0-r1.ebuild index beb1c4d85f7f..05d8150a9009 100644 --- a/media-libs/allegro/allegro-4.2.0-r1.ebuild +++ b/media-libs/allegro/allegro-4.2.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.2.0-r1.ebuild,v 1.7 2006/08/28 02:09:59 metalgod Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.2.0-r1.ebuild,v 1.8 2007/07/22 09:43:17 dberkholz Exp $ inherit flag-o-matic eutils @@ -18,29 +18,23 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) arts? ( kde-base/arts ) alsa? ( media-libs/alsa-lib ) X? ( - || ( - ( x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXpm - x11-libs/libXxf86dga - x11-libs/libXxf86vm ) - virtual/x11 - ) + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXpm + x11-libs/libXxf86dga + x11-libs/libXxf86vm ) svga? ( media-libs/svgalib )" DEPEND="${RDEPEND} tetex? ( virtual/tetex ) X? ( - || ( - ( x11-libs/libXt - x11-proto/xextproto - x11-proto/xf86dgaproto - x11-proto/xf86vidmodeproto - x11-proto/xproto ) - virtual/x11 - ) + x11-libs/libXt + x11-proto/xextproto + x11-proto/xf86dgaproto + x11-proto/xf86vidmodeproto + x11-proto/xproto )" src_compile() { diff --git a/media-libs/coin/ChangeLog b/media-libs/coin/ChangeLog index 3d168945d368..8998ae373786 100644 --- a/media-libs/coin/ChangeLog +++ b/media-libs/coin/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/coin # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.20 2007/01/06 19:41:35 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.21 2007/07/22 09:41:34 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; coin-2.4.5.ebuild: + Drop virtual/x11 references. 06 Jan 2007; Danny van Dyk <kugelfang@gentoo.org> -coin-2.1.0.ebuild, -coin-2.4.3.ebuild: diff --git a/media-libs/coin/coin-2.4.5.ebuild b/media-libs/coin/coin-2.4.5.ebuild index 3bf137160fdf..a42cc4d09abf 100644 --- a/media-libs/coin/coin-2.4.5.ebuild +++ b/media-libs/coin/coin-2.4.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-2.4.5.ebuild,v 1.3 2006/12/02 21:52:10 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-2.4.5.ebuild,v 1.4 2007/07/22 09:41:34 dberkholz Exp $ inherit eutils @@ -21,7 +21,7 @@ RDEPEND="media-libs/freetype fontconfig? ( media-libs/fontconfig ) openal? ( media-libs/openal ) opengl? ( virtual/opengl virtual/glu ) - X? ( || ( ( x11-libs/libXt x11-libs/libXext ) virtual/x11 ) ) + X? ( x11-libs/libXt x11-libs/libXext ) zlib? ( sys-libs/zlib )" # java? ( virtual/jdk ) # javascript? ( dev-lang/spidermonkey ) diff --git a/media-libs/giflib/ChangeLog b/media-libs/giflib/ChangeLog index a794f0271593..432ef054b2dd 100644 --- a/media-libs/giflib/ChangeLog +++ b/media-libs/giflib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/giflib -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.43 2006/12/30 09:15:47 grobian Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.44 2007/07/22 09:40:53 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; giflib-4.1.4.ebuild: + Drop virtual/x11 references. 30 Dec 2006; Fabian Groffen <grobian@gentoo.org> giflib-4.1.4.ebuild: Dropped ppc-macos keyword, see you in prefix diff --git a/media-libs/giflib/giflib-4.1.4.ebuild b/media-libs/giflib/giflib-4.1.4.ebuild index 36d4bda1cf1e..13e792c9e167 100644 --- a/media-libs/giflib/giflib-4.1.4.ebuild +++ b/media-libs/giflib/giflib-4.1.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.4.ebuild,v 1.14 2006/12/30 09:15:47 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.4.ebuild,v 1.15 2007/07/22 09:40:53 dberkholz Exp $ inherit eutils libtool @@ -13,7 +13,11 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" IUSE="rle X" -DEPEND="X? ( || ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libICE x11-libs/libSM ) virtual/x11 ) ) +DEPEND="X? ( x11-libs/libXt + x11-libs/libX11 + x11-libs/libICE + x11-libs/libSM + ) rle? ( media-libs/urt ) !media-libs/libungif" diff --git a/media-libs/glfw/ChangeLog b/media-libs/glfw/ChangeLog index bad5c868ee8e..c4f9a008c9ae 100644 --- a/media-libs/glfw/ChangeLog +++ b/media-libs/glfw/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/glfw # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.6 2007/02/07 19:27:28 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.7 2007/07/22 09:39:56 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; glfw-2.5.0.ebuild: + Drop virtual/x11 references. *glfw-2.5.0-r1 (07 Feb 2007) diff --git a/media-libs/glfw/glfw-2.5.0.ebuild b/media-libs/glfw/glfw-2.5.0.ebuild index 13f1c6cc674e..421c569ac1c1 100644 --- a/media-libs/glfw/glfw-2.5.0.ebuild +++ b/media-libs/glfw/glfw-2.5.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-2.5.0.ebuild,v 1.4 2006/08/01 20:11:29 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-2.5.0.ebuild,v 1.5 2007/07/22 09:39:56 dberkholz Exp $ DESCRIPTION="The Portable OpenGL FrameWork" HOMEPAGE="http://glfw.sourceforge.net/" @@ -11,16 +11,10 @@ SLOT="0" KEYWORDS="~amd64 x86" IUSE="examples" -RDEPEND="|| ( - x11-libs/libXxf86vm - virtual/x11 - ) +RDEPEND="x11-libs/libXxf86vm virtual/opengl" DEPEND="${RDEPEND} - || ( - x11-proto/xf86vidmodeproto - virtual/x11 - )" + x11-proto/xf86vidmodeproto" S=${WORKDIR}/${P/.0/} diff --git a/media-libs/gst-plugins/ChangeLog b/media-libs/gst-plugins/ChangeLog index a6411a0da143..8d9cb455b1d2 100644 --- a/media-libs/gst-plugins/ChangeLog +++ b/media-libs/gst-plugins/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/gst-plugins # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/ChangeLog,v 1.151 2007/04/30 22:59:18 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/ChangeLog,v 1.152 2007/07/22 09:39:13 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; + gst-plugins-0.8.11.ebuild, gst-plugins-0.8.12.ebuild: + Drop virtual/x11 references. 30 Apr 2007; Marius Mauch <genone@gentoo.org> gst-plugins-0.8.11.ebuild, gst-plugins-0.8.12.ebuild: diff --git a/media-libs/gst-plugins/gst-plugins-0.8.11.ebuild b/media-libs/gst-plugins/gst-plugins-0.8.11.ebuild index 3cbdaaedeec4..fad72349785e 100644 --- a/media-libs/gst-plugins/gst-plugins-0.8.11.ebuild +++ b/media-libs/gst-plugins/gst-plugins-0.8.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.8.11.ebuild,v 1.18 2007/04/30 22:59:18 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.8.11.ebuild,v 1.19 2007/07/22 09:39:13 dberkholz Exp $ # order is important, gnome2 after gst-plugins inherit gst-plugins gnome2 eutils flag-o-matic libtool @@ -17,8 +17,9 @@ RDEPEND="|| ( =media-libs/gstreamer-0.8.11 =media-libs/gstreamer-0.8.12 ) >=gnome-base/gconf-2 !alpha? ( !arm? ( !ia64? ( !mips? ( !ppc64? ( >=dev-libs/liboil-0.3.0 ) ) ) ) ) - || ( ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes ) - virtual/x11 )" + x11-libs/libX11 + x11-libs/libXdamage + x11-libs/libXfixes" DEPEND="${RDEPEND} >=sys-devel/gettext-0.11.5 diff --git a/media-libs/gst-plugins/gst-plugins-0.8.12.ebuild b/media-libs/gst-plugins/gst-plugins-0.8.12.ebuild index 42abff6e3ffe..2d5f9c9023c7 100644 --- a/media-libs/gst-plugins/gst-plugins-0.8.12.ebuild +++ b/media-libs/gst-plugins/gst-plugins-0.8.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.8.12.ebuild,v 1.6 2007/04/30 22:59:18 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.8.12.ebuild,v 1.7 2007/07/22 09:39:13 dberkholz Exp $ # order is important, gnome2 after gst-plugins inherit gst-plugins gnome2 eutils flag-o-matic libtool @@ -17,8 +17,9 @@ RDEPEND="=media-libs/gstreamer-0.8.12 >=gnome-base/gconf-2 !alpha? ( !arm? ( !ia64? ( !mips? ( !ppc64? ( >=dev-libs/liboil-0.3.0 ) ) ) ) ) - || ( ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes ) - virtual/x11 )" + x11-libs/libX11 + x11-libs/libXdamage + x11-libs/libXfixes" DEPEND="${RDEPEND} >=sys-devel/gettext-0.11.5 diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog index ac0831b842ac..55d3f7762390 100644 --- a/media-libs/imlib2/ChangeLog +++ b/media-libs/imlib2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/imlib2 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.51 2007/05/29 05:52:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.52 2007/07/22 09:37:57 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; + imlib2-1.2.1.009.ebuild: + Drop virtual/x11 references. *imlib2-1.4.0 (29 May 2007) diff --git a/media-libs/imlib2/imlib2-1.2.1.009.ebuild b/media-libs/imlib2/imlib2-1.2.1.009.ebuild index 8910d383f04a..33810b189b62 100644 --- a/media-libs/imlib2/imlib2-1.2.1.009.ebuild +++ b/media-libs/imlib2/imlib2-1.2.1.009.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.1.009.ebuild,v 1.7 2007/05/29 05:45:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.1.009.ebuild,v 1.8 2007/07/22 09:37:57 dberkholz Exp $ EKEY_STATE="release" inherit enlightenment toolchain-funcs libtool @@ -18,7 +18,7 @@ DEPEND="=media-libs/freetype-2* png? ( >=media-libs/libpng-1.2.1 ) jpeg? ( media-libs/jpeg ) tiff? ( >=media-libs/tiff-3.5.5 ) - X? ( || ( ( x11-libs/libXext x11-proto/xextproto ) virtual/x11 ) ) + X? ( x11-libs/libXext x11-proto/xextproto ) mp3? ( media-libs/libid3tag )" src_compile() { diff --git a/media-libs/libafterimage/ChangeLog b/media-libs/libafterimage/ChangeLog index d21c815d90de..db0f20ddce39 100644 --- a/media-libs/libafterimage/ChangeLog +++ b/media-libs/libafterimage/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libafterimage # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/ChangeLog,v 1.1 2007/02/05 16:00:43 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/ChangeLog,v 1.2 2007/07/22 09:27:55 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; + libafterimage-1.07.ebuild: + Drop virtual/x11 references. *libafterimage-1.07 (05 Feb 2007) diff --git a/media-libs/libafterimage/libafterimage-1.07.ebuild b/media-libs/libafterimage/libafterimage-1.07.ebuild index 968894292d9d..7ef608549fb9 100644 --- a/media-libs/libafterimage/libafterimage-1.07.ebuild +++ b/media-libs/libafterimage/libafterimage-1.07.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/libafterimage-1.07.ebuild,v 1.2 2007/07/12 03:10:24 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/libafterimage-1.07.ebuild,v 1.3 2007/07/22 09:27:55 dberkholz Exp $ inherit eutils autotools @@ -16,14 +16,11 @@ KEYWORDS="~amd64 ~x86" IUSE="gif jpeg mmx nls png tiff examples" RDEPEND="media-libs/freetype - || ( ( x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXrender - x11-libs/libX11 - ) - virtual/x11 - ) + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXrender + x11-libs/libX11 png? ( >=media-libs/libpng-1.2.5 ) jpeg? ( >=media-libs/jpeg-6b ) gif? ( >=media-libs/giflib-4.1 ) diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog index 53cd9c9ddfe7..8b847788f5e5 100644 --- a/media-libs/libcaca/ChangeLog +++ b/media-libs/libcaca/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libcaca # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.46 2007/04/22 01:34:11 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.47 2007/07/22 09:37:01 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; + libcaca-0.9-r2.ebuild: + Drop virtual/x11 references. 22 Apr 2007; Bryan Østergaard <kloeri@gentoo.org> ChangeLog: Stable on Alpha, bug 174909. diff --git a/media-libs/libcaca/libcaca-0.9-r2.ebuild b/media-libs/libcaca/libcaca-0.9-r2.ebuild index e526d1dfd6cd..ed4a4c47701e 100644 --- a/media-libs/libcaca/libcaca-0.9-r2.ebuild +++ b/media-libs/libcaca/libcaca-0.9-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.9-r2.ebuild,v 1.13 2006/10/28 00:38:30 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.9-r2.ebuild,v 1.14 2007/07/22 09:37:01 dberkholz Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -19,9 +19,9 @@ IUSE="ncurses slang doc imlib X" RDEPEND="ncurses? ( >=sys-libs/ncurses-5.3 ) slang? ( =sys-libs/slang-1.4* ) imlib? ( media-libs/imlib2 ) - X? ( || ( ( x11-libs/libX11 - x11-libs/libXt ) - <virtual/x11-7 ) )" + X? ( x11-libs/libX11 + x11-libs/libXt + )" DEPEND="${RDEPEND} doc? ( app-doc/doxygen )" diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog index 4cac8e75d113..82e31c58f00c 100644 --- a/media-libs/libdc1394/ChangeLog +++ b/media-libs/libdc1394/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/libdc1394 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.26 2007/02/22 01:52:44 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.27 2007/07/22 09:35:30 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; + libdc1394-1.0.0-r1.ebuild, libdc1394-1.2.1.ebuild, + libdc1394-2.0.0_pre4.ebuild, libdc1394-2.0.0_pre6-r2.ebuild, + libdc1394-2.0.0_pre7-r1.ebuild, libdc1394-2.0.0_rc3.ebuild: + Drop virtual/x11 references. 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog: Transition to Manifest2. diff --git a/media-libs/libdc1394/libdc1394-1.0.0-r1.ebuild b/media-libs/libdc1394/libdc1394-1.0.0-r1.ebuild index 6bc95f961c84..2779e09bd1aa 100644 --- a/media-libs/libdc1394/libdc1394-1.0.0-r1.ebuild +++ b/media-libs/libdc1394/libdc1394-1.0.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-1.0.0-r1.ebuild,v 1.1 2006/05/03 14:05:49 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-1.0.0-r1.ebuild,v 1.2 2007/07/22 09:35:30 dberkholz Exp $ inherit eutils flag-o-matic @@ -14,8 +14,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" IUSE="X" RDEPEND=">=sys-libs/libraw1394-0.9.0 - X? ( || ( ( x11-libs/libSM x11-libs/libXv ) - virtual/x11 ) )" + X? ( x11-libs/libSM x11-libs/libXv )" DEPEND="${RDEPEND} !=sys-libs/libdc1394-1.0.0 sys-devel/libtool" diff --git a/media-libs/libdc1394/libdc1394-1.2.1.ebuild b/media-libs/libdc1394/libdc1394-1.2.1.ebuild index 637e8e905fb0..5188a00fd45a 100644 --- a/media-libs/libdc1394/libdc1394-1.2.1.ebuild +++ b/media-libs/libdc1394/libdc1394-1.2.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-1.2.1.ebuild,v 1.2 2006/09/13 02:10:21 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-1.2.1.ebuild,v 1.3 2007/07/22 09:35:30 dberkholz Exp $ inherit eutils flag-o-matic @@ -14,8 +14,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" IUSE="X" RDEPEND=">=sys-libs/libraw1394-0.9.0 - X? ( || ( ( x11-libs/libSM x11-libs/libXv ) - virtual/x11 ) )" + X? ( x11-libs/libSM x11-libs/libXv )" DEPEND="${RDEPEND} !=sys-libs/libdc1394-1.0.0 sys-devel/libtool" diff --git a/media-libs/libdc1394/libdc1394-2.0.0_pre4.ebuild b/media-libs/libdc1394/libdc1394-2.0.0_pre4.ebuild index 15c1f31c2540..3ca09b3d6fec 100644 --- a/media-libs/libdc1394/libdc1394-2.0.0_pre4.ebuild +++ b/media-libs/libdc1394/libdc1394-2.0.0_pre4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.0.0_pre4.ebuild,v 1.12 2006/12/03 06:28:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.0.0_pre4.ebuild,v 1.13 2007/07/22 09:35:30 dberkholz Exp $ inherit eutils @@ -20,8 +20,7 @@ IUSE="X" DEPEND=">=sys-libs/libraw1394-0.9.0 sys-devel/libtool - X? ( || ( ( x11-libs/libSM x11-libs/libXv ) - virtual/x11 ) )" + X? ( x11-libs/libSM x11-libs/libXv )" src_unpack() { unpack ${A} ; cd ${S} diff --git a/media-libs/libdc1394/libdc1394-2.0.0_pre6-r2.ebuild b/media-libs/libdc1394/libdc1394-2.0.0_pre6-r2.ebuild index 027b7a6a5baa..15de36741af3 100644 --- a/media-libs/libdc1394/libdc1394-2.0.0_pre6-r2.ebuild +++ b/media-libs/libdc1394/libdc1394-2.0.0_pre6-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.0.0_pre6-r2.ebuild,v 1.2 2006/05/03 14:34:23 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.0.0_pre6-r2.ebuild,v 1.3 2007/07/22 09:35:30 dberkholz Exp $ inherit eutils @@ -17,8 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="X" RDEPEND=">=sys-libs/libraw1394-1.2.0 - X? ( || ( ( x11-libs/libSM x11-libs/libXv ) - virtual/x11 ) )" + X? ( x11-libs/libSM x11-libs/libXv )" DEPEND="!=sys-libs/libdc1394-2* ${RDEPEND} sys-devel/libtool" diff --git a/media-libs/libdc1394/libdc1394-2.0.0_pre7-r1.ebuild b/media-libs/libdc1394/libdc1394-2.0.0_pre7-r1.ebuild index 459d4024cb8e..1630c3fe5450 100644 --- a/media-libs/libdc1394/libdc1394-2.0.0_pre7-r1.ebuild +++ b/media-libs/libdc1394/libdc1394-2.0.0_pre7-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.0.0_pre7-r1.ebuild,v 1.1 2006/06/19 17:31:04 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.0.0_pre7-r1.ebuild,v 1.2 2007/07/22 09:35:30 dberkholz Exp $ inherit eutils @@ -17,8 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="X" RDEPEND=">=sys-libs/libraw1394-1.2.0 - X? ( || ( ( x11-libs/libSM x11-libs/libXv ) - virtual/x11 ) )" + X? ( x11-libs/libSM x11-libs/libXv )" DEPEND="!=sys-libs/libdc1394-2* ${RDEPEND} sys-devel/libtool" diff --git a/media-libs/libdc1394/libdc1394-2.0.0_rc3.ebuild b/media-libs/libdc1394/libdc1394-2.0.0_rc3.ebuild index e730bd95c238..f3953106ce17 100644 --- a/media-libs/libdc1394/libdc1394-2.0.0_rc3.ebuild +++ b/media-libs/libdc1394/libdc1394-2.0.0_rc3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.0.0_rc3.ebuild,v 1.1 2006/08/29 15:16:34 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.0.0_rc3.ebuild,v 1.2 2007/07/22 09:35:30 dberkholz Exp $ inherit eutils @@ -17,8 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="X" RDEPEND=">=sys-libs/libraw1394-1.2.0 - X? ( || ( ( x11-libs/libSM x11-libs/libXv ) - virtual/x11 ) )" + X? ( x11-libs/libSM x11-libs/libXv )" DEPEND="!=sys-libs/libdc1394-2* ${RDEPEND} sys-devel/libtool" diff --git a/media-libs/ploticus/ChangeLog b/media-libs/ploticus/ChangeLog index 9bd484b8c0f6..f1f33a4daf40 100644 --- a/media-libs/ploticus/ChangeLog +++ b/media-libs/ploticus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/ploticus # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ploticus/ChangeLog,v 1.10 2007/04/09 23:12:30 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/ploticus/ChangeLog,v 1.11 2007/07/22 09:28:49 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; ploticus-2.32.ebuild, + ploticus-2.33.ebuild: + Drop virtual/x11 references. 09 Apr 2007; Marcus D. Hanwell <cryos@gentoo.org> ploticus-2.33.ebuild: Marked ~amd64, closes bug 170435. diff --git a/media-libs/ploticus/ploticus-2.32.ebuild b/media-libs/ploticus/ploticus-2.32.ebuild index 6168841f8c01..3483e355ae7c 100644 --- a/media-libs/ploticus/ploticus-2.32.ebuild +++ b/media-libs/ploticus/ploticus-2.32.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ploticus/ploticus-2.32.ebuild,v 1.6 2007/06/26 02:12:40 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/ploticus/ploticus-2.32.ebuild,v 1.7 2007/07/22 09:28:49 dberkholz Exp $ inherit eutils toolchain-funcs @@ -18,7 +18,7 @@ DEPEND="media-libs/libpng gd? ( >=media-libs/gd-1.84 media-libs/jpeg ) flash? ( =media-libs/ming-0.2a ) truetype? ( =media-libs/freetype-2* ) - X? ( || ( x11-libs/libX11 virtual/x11 ) )" + X? ( x11-libs/libX11 )" pkg_setup() { if use gd; diff --git a/media-libs/ploticus/ploticus-2.33.ebuild b/media-libs/ploticus/ploticus-2.33.ebuild index b1d3c1c9e1a0..89b06b912455 100644 --- a/media-libs/ploticus/ploticus-2.33.ebuild +++ b/media-libs/ploticus/ploticus-2.33.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ploticus/ploticus-2.33.ebuild,v 1.4 2007/06/26 02:12:40 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/ploticus/ploticus-2.33.ebuild,v 1.5 2007/07/22 09:28:49 dberkholz Exp $ inherit eutils toolchain-funcs @@ -18,7 +18,7 @@ DEPEND="media-libs/libpng gd? ( >=media-libs/gd-1.84 media-libs/jpeg ) flash? ( =media-libs/ming-0.2a ) truetype? ( =media-libs/freetype-2* ) - X? ( || ( x11-libs/libX11 virtual/x11 ) )" + X? ( x11-libs/libX11 )" pkg_setup() { if use gd; diff --git a/media-libs/plotutils/ChangeLog b/media-libs/plotutils/ChangeLog index c77629ac0c0f..7915e201e08c 100644 --- a/media-libs/plotutils/ChangeLog +++ b/media-libs/plotutils/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/plotutils # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/ChangeLog,v 1.39 2007/06/14 10:51:36 yoswink Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/ChangeLog,v 1.40 2007/07/22 09:33:22 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; + plotutils-2.4.1-r2.ebuild, plotutils-2.4.1-r3.ebuild, + plotutils-2.4.1-r4.ebuild: + Drop virtual/x11 references. 14 Jun 2007; Jose Luis Rivero <yoswink@gentoo.org> plotutils-2.4.1-r4.ebuild: diff --git a/media-libs/plotutils/plotutils-2.4.1-r2.ebuild b/media-libs/plotutils/plotutils-2.4.1-r2.ebuild index 047bdc1b3d21..f10b066233a4 100644 --- a/media-libs/plotutils/plotutils-2.4.1-r2.ebuild +++ b/media-libs/plotutils/plotutils-2.4.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.4.1-r2.ebuild,v 1.26 2007/04/30 23:33:16 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.4.1-r2.ebuild,v 1.27 2007/07/22 09:33:22 dberkholz Exp $ IUSE="X" @@ -22,11 +22,8 @@ LICENSE="GPL-2" KEYWORDS="x86 ppc sparc alpha amd64 ia64" DEPEND="media-libs/libpng - X? ( || ( ( x11-libs/libXaw - x11-proto/xextproto - ) - virtual/x11 - ) + X? ( x11-libs/libXaw + x11-proto/xextproto )" # Filter out k6 from the CFLAGS diff --git a/media-libs/plotutils/plotutils-2.4.1-r3.ebuild b/media-libs/plotutils/plotutils-2.4.1-r3.ebuild index 69e422647934..8cc89ab8428f 100644 --- a/media-libs/plotutils/plotutils-2.4.1-r3.ebuild +++ b/media-libs/plotutils/plotutils-2.4.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.4.1-r3.ebuild,v 1.19 2007/04/30 23:33:16 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.4.1-r3.ebuild,v 1.20 2007/07/22 09:33:22 dberkholz Exp $ inherit libtool eutils flag-o-matic @@ -21,11 +21,8 @@ KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 s390 sparc x86" IUSE="X" DEPEND="media-libs/libpng - X? ( || ( ( x11-libs/libXaw - x11-proto/xextproto - ) - virtual/x11 - ) + X? ( x11-libs/libXaw + x11-proto/xextproto )" src_unpack() { diff --git a/media-libs/plotutils/plotutils-2.4.1-r4.ebuild b/media-libs/plotutils/plotutils-2.4.1-r4.ebuild index a5852a66e91d..69047e7212a0 100644 --- a/media-libs/plotutils/plotutils-2.4.1-r4.ebuild +++ b/media-libs/plotutils/plotutils-2.4.1-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.4.1-r4.ebuild,v 1.13 2007/06/24 23:14:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.4.1-r4.ebuild,v 1.14 2007/07/22 09:33:22 dberkholz Exp $ inherit libtool eutils flag-o-matic @@ -21,11 +21,8 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86" IUSE="X" DEPEND="media-libs/libpng - X? ( || ( ( x11-libs/libXaw - x11-proto/xextproto - ) - virtual/x11 - ) + X? ( x11-libs/libXaw + x11-proto/xextproto )" src_unpack() { diff --git a/media-libs/urt/ChangeLog b/media-libs/urt/ChangeLog index d455ec2f7dd1..f79b251fbcb0 100644 --- a/media-libs/urt/ChangeLog +++ b/media-libs/urt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/urt # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/urt/ChangeLog,v 1.28 2007/03/01 17:23:21 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/urt/ChangeLog,v 1.29 2007/07/22 09:27:12 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; urt-3.1b-r1.ebuild: + Drop virtual/x11 references. 01 Mar 2007; <genstef@gentoo.org> urt-3.1b-r1.ebuild: Dropped ppc-macos keyword, see you in prefix diff --git a/media-libs/urt/urt-3.1b-r1.ebuild b/media-libs/urt/urt-3.1b-r1.ebuild index c62d7e898fc5..dd536b641bbd 100644 --- a/media-libs/urt/urt-3.1b-r1.ebuild +++ b/media-libs/urt/urt-3.1b-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/urt/urt-3.1b-r1.ebuild,v 1.26 2007/03/01 17:23:21 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/urt/urt-3.1b-r1.ebuild,v 1.27 2007/07/22 09:27:12 dberkholz Exp $ inherit eutils toolchain-funcs @@ -13,11 +13,8 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" IUSE="gif gs tiff X" -DEPEND="X? ( || ( ( x11-libs/libXext - x11-proto/xextproto - ) - virtual/x11 - ) +DEPEND="X? ( x11-libs/libXext + x11-proto/xextproto ) gif? ( media-libs/giflib ) tiff? ( media-libs/tiff ) diff --git a/media-libs/vflib/ChangeLog b/media-libs/vflib/ChangeLog index 383c7bd755f6..85005e27ae81 100644 --- a/media-libs/vflib/ChangeLog +++ b/media-libs/vflib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/vflib -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/vflib/ChangeLog,v 1.9 2006/12/30 12:24:01 usata Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/vflib/ChangeLog,v 1.10 2007/07/22 09:32:14 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; vflib-3.6.14.ebuild: + Drop virtual/x11 references. 30 Dec 2006; Mamoru KOMACHI <usata@gentoo.org> vflib-3.6.14.ebuild: Avoid hardcoded libdir; bug #119140. Added ~amd64 keyword. diff --git a/media-libs/vflib/vflib-3.6.14.ebuild b/media-libs/vflib/vflib-3.6.14.ebuild index 21c761ad0829..56b4195d0791 100644 --- a/media-libs/vflib/vflib-3.6.14.ebuild +++ b/media-libs/vflib/vflib-3.6.14.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/vflib/vflib-3.6.14.ebuild,v 1.3 2006/12/30 12:24:01 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/vflib/vflib-3.6.14.ebuild,v 1.4 2007/07/22 09:32:14 dberkholz Exp $ inherit libtool eutils @@ -15,24 +15,14 @@ SLOT="3" KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" IUSE="" -RDEPEND="|| ( - ( - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - ) - virtual/x11 - ) +RDEPEND="x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext =media-libs/freetype-1* media-libs/t1lib" DEPEND="${RDEPEND} - || ( - ( - x11-proto/xproto - ) - virtual/x11 - ) + x11-proto/xproto virtual/tetex" S=${WORKDIR}/${MY_P} diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index b04f5fd9aa9c..fc5df415b663 100644 --- a/media-libs/xine-lib/ChangeLog +++ b/media-libs/xine-lib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/xine-lib # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.473 2007/06/12 14:29:55 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.474 2007/07/22 09:31:12 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xine-lib-1.1.2-r3.ebuild: + Drop virtual/x11 references. *xine-lib-1.1.7 (12 Jun 2007) diff --git a/media-libs/xine-lib/xine-lib-1.1.2-r3.ebuild b/media-libs/xine-lib/xine-lib-1.1.2-r3.ebuild index 9bcdc34f5710..b3a801d53aed 100644 --- a/media-libs/xine-lib/xine-lib-1.1.2-r3.ebuild +++ b/media-libs/xine-lib/xine-lib-1.1.2-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.2-r3.ebuild,v 1.10 2007/01/26 19:33:19 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.2-r3.ebuild,v 1.11 2007/07/22 09:31:12 dberkholz Exp $ WANT_AUTOMAKE="1.9" WANT_AUTOCONF="2.5" @@ -37,19 +37,19 @@ dxr3 vidix mng flac oss v4l xinerama vcd a52 mp3 imagemagick dts asf debug modplug ${IUSE_VIDEO_CARDS}" RDEPEND="vorbis? ( media-libs/libvorbis ) - X? ( || ( ( - x11-libs/libXext - x11-libs/libX11 ) - <virtual/x11-7 ) ) - xv? ( || ( x11-libs/libXv <virtual/x11-7 ) ) + X? ( + x11-libs/libXext + x11-libs/libX11 + ) + xv? ( x11-libs/libXv ) xvmc? ( - || ( x11-libs/libXvMC <virtual/x11-7 ) + x11-libs/libXvMC video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers x11-drivers/nvidia-legacy-drivers ) ) - video_cards_via? ( || ( x11-drivers/xf86-video-via <virtual/x11-7 ) ) - video_cards_i810? ( || ( x11-drivers/xf86-video-i810 <virtual/x11-7 ) ) + video_cards_via? ( x11-drivers/xf86-video-via ) + video_cards_i810? ( x11-drivers/xf86-video-i810 ) ) - xinerama? ( || ( x11-libs/libXinerama <virtual/x11-7 ) ) + xinerama? ( x11-libs/libXinerama ) win32codecs? ( >=media-libs/win32codecs-0.50 ) esd? ( media-sound/esound ) dvd? ( >=media-libs/libdvdcss-1.2.7 ) @@ -77,14 +77,13 @@ RDEPEND="vorbis? ( media-libs/libvorbis ) !=media-libs/xine-lib-0.9.13*" DEPEND="${RDEPEND} - X? ( || ( ( - x11-libs/libXt - x11-proto/xproto - x11-proto/videoproto - x11-proto/xf86vidmodeproto - xinerama? ( x11-proto/xineramaproto ) ) - <virtual/x11-7 ) - ) + X? ( + x11-libs/libXt + x11-proto/xproto + x11-proto/videoproto + x11-proto/xf86vidmodeproto + xinerama? ( x11-proto/xineramaproto ) + ) v4l? ( virtual/os-headers ) dev-util/pkgconfig sys-devel/libtool |