summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2006-01-25 02:57:05 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2006-01-25 02:57:05 +0000
commit77b17df524d32e895b3e60346c6686e13229998e (patch)
tree3ea9b671f67f65bc76cdc1aa97d0f609d96d73cf /app-emulation/vice
parentAdded modular X dependencies and closing bug #120225. (diff)
downloadgentoo-2-77b17df524d32e895b3e60346c6686e13229998e.tar.gz
gentoo-2-77b17df524d32e895b3e60346c6686e13229998e.tar.bz2
gentoo-2-77b17df524d32e895b3e60346c6686e13229998e.zip
General *DEPEND cleanup.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'app-emulation/vice')
-rw-r--r--app-emulation/vice/ChangeLog6
-rw-r--r--app-emulation/vice/vice-1.17.ebuild48
-rw-r--r--app-emulation/vice/vice-1.19.ebuild48
3 files changed, 45 insertions, 57 deletions
diff --git a/app-emulation/vice/ChangeLog b/app-emulation/vice/ChangeLog
index d8f9adf0f61b..13116ebff7e7 100644
--- a/app-emulation/vice/ChangeLog
+++ b/app-emulation/vice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/vice
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.33 2006/01/25 02:50:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.34 2006/01/25 02:57:05 wolf31o2 Exp $
+
+ 25 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> vice-1.17.ebuild,
+ vice-1.19.ebuild:
+ General *DEPEND cleanup.
25 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> vice-1.17.ebuild,
vice-1.19.ebuild:
diff --git a/app-emulation/vice/vice-1.17.ebuild b/app-emulation/vice/vice-1.17.ebuild
index 5e09b3596c0a..26092062ea15 100644
--- a/app-emulation/vice/vice-1.17.ebuild
+++ b/app-emulation/vice/vice-1.17.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/app-emulation/vice/vice-1.17.ebuild,v 1.5 2006/01/25 02:50:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-1.17.ebuild,v 1.6 2006/01/25 02:57:05 wolf31o2 Exp $
inherit eutils games
@@ -13,62 +13,54 @@ SLOT="0"
KEYWORDS="~amd64 ppc x86"
IUSE="X Xaw3d arts esd ffmpeg gnome nls readline sdl"
-XDEPEND="|| ( (
+XDEPEND="|| (
+ (
x11-libs/libX11
x11-libs/libXext
x11-libs/libXxf86vm
x11-libs/libICE
x11-libs/libSM
x11-libs/libXv
- x11-libs/libXxf86dga
- )
- virtual/x11
- )"
+ x11-libs/libXxf86dga )
+ virtual/x11 )"
RDEPEND="esd? ( media-sound/esound )
media-libs/libpng
sys-libs/zlib
arts? ( kde-base/arts )
gnome? (
${XDEPEND}
- gnome-base/gnome-libs
- )
+ gnome-base/gnome-libs )
readline? ( sys-libs/readline )
sdl? (
${XDPENED}
- || ( (
+ || (
+ (
x11-libs/libXt
- x11-libs/libXmu
- )
- virtual/x11
- )
- media-libs/libsdl
- )
+ x11-libs/libXmu )
+ virtual/x11 )
+ media-libs/libsdl )
X? (
${XDEPEND}
- || ( (
+ || (
+ (
x11-libs/libXt
x11-libs/libXmu
x11-libs/libXpm
- x11-libs/libXaw
- )
- virtual/x11
- )
- )
+ x11-libs/libXaw )
+ virtual/x11 ) )
Xaw3d? (
${XDEPEND}
- x11-libs/Xaw3d
- )
+ x11-libs/Xaw3d )
ffmpeg? ( media-video/ffmpeg )"
DEPEND="${RDEPEND}
- || ( (
+ || (
+ (
x11-proto/xproto
x11-proto/xf86vidmodeproto
x11-proto/xextproto
x11-proto/xf86dgaproto
- x11-proto/videoproto
- )
- virtual/x11
- )"
+ x11-proto/videoproto )
+ virtual/x11 )"
src_compile() {
egamesconf \
diff --git a/app-emulation/vice/vice-1.19.ebuild b/app-emulation/vice/vice-1.19.ebuild
index 574a32f47d59..f91e1e03d8cd 100644
--- a/app-emulation/vice/vice-1.19.ebuild
+++ b/app-emulation/vice/vice-1.19.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/app-emulation/vice/vice-1.19.ebuild,v 1.2 2006/01/25 02:50:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-1.19.ebuild,v 1.3 2006/01/25 02:57:05 wolf31o2 Exp $
inherit eutils games
@@ -13,62 +13,54 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="X Xaw3d arts esd ffmpeg gnome nls readline sdl"
-XDEPEND="|| ( (
+XDEPEND="|| (
+ (
x11-libs/libX11
x11-libs/libXext
x11-libs/libXxf86vm
x11-libs/libICE
x11-libs/libSM
x11-libs/libXv
- x11-libs/libXxf86dga
- )
- virtual/x11
- )"
+ x11-libs/libXxf86dga )
+ virtual/x11 )"
RDEPEND="esd? ( media-sound/esound )
media-libs/libpng
sys-libs/zlib
arts? ( kde-base/arts )
gnome? (
${XDEPEND}
- gnome-base/gnome-libs
- )
+ gnome-base/gnome-libs )
readline? ( sys-libs/readline )
sdl? (
${XDPENED}
- || ( (
+ || (
+ (
x11-libs/libXt
- x11-libs/libXmu
- )
- virtual/x11
- )
- media-libs/libsdl
- )
+ x11-libs/libXmu )
+ virtual/x11 )
+ media-libs/libsdl )
X? (
${XDEPEND}
- || ( (
+ || (
+ (
x11-libs/libXt
x11-libs/libXmu
x11-libs/libXpm
- x11-libs/libXaw
- )
- virtual/x11
- )
- )
+ x11-libs/libXaw )
+ virtual/x11 ) )
Xaw3d? (
${XDEPEND}
- x11-libs/Xaw3d
- )
+ x11-libs/Xaw3d )
ffmpeg? ( media-video/ffmpeg )"
DEPEND="${RDEPEND}
- || ( (
+ || (
+ (
x11-proto/xproto
x11-proto/xf86vidmodeproto
x11-proto/xextproto
x11-proto/xf86dgaproto
- x11-proto/videoproto
- )
- virtual/x11
- )"
+ x11-proto/videoproto )
+ virtual/x11 )"
src_compile() {
egamesconf \