From 9f08cf8cd34e3591d78d523c0c8c95ce296f49d5 Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Mon, 26 Mar 2007 20:04:34 +0000 Subject: [PATCH] Remove virtual/x11 depends in some eclasses --- eclass/embassy-2.10.eclass | 4 ++-- eclass/embassy-2.9.eclass | 4 ++-- eclass/embassy.eclass | 4 ++-- eclass/font.eclass | 4 ++-- eclass/tetex.eclass | 7 ++----- eclass/vim.eclass | 9 ++++----- 6 files changed, 14 insertions(+), 18 deletions(-) diff --git a/eclass/embassy-2.10.eclass b/eclass/embassy-2.10.eclass index 9fb7ba74d008..996e0486438f 100644 --- a/eclass/embassy-2.10.eclass +++ b/eclass/embassy-2.10.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/embassy-2.10.eclass,v 1.6 2005/07/30 00:39:02 ribosome Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/embassy-2.10.eclass,v 1.7 2007/03/26 20:04:34 genstef Exp $ # Author Olivier Fisette @@ -31,7 +31,7 @@ SLOT="0" IUSE="X png" DEPEND=">=sci-biology/emboss-${EBOV} - X? ( virtual/x11 ) + X? ( x11-libs/libX11 ) png? ( sys-libs/zlib media-libs/libpng >=media-libs/gd-1.8 diff --git a/eclass/embassy-2.9.eclass b/eclass/embassy-2.9.eclass index e218c27a0542..5c68084a82b8 100644 --- a/eclass/embassy-2.9.eclass +++ b/eclass/embassy-2.9.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/embassy-2.9.eclass,v 1.8 2005/07/30 00:39:02 ribosome Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/embassy-2.9.eclass,v 1.9 2007/03/26 20:04:34 genstef Exp $ # Author Olivier Fisette @@ -31,7 +31,7 @@ IUSE="X png" DEPEND="=sci-biology/emboss-${EBOV} !=sci-biology/emboss-2.10* - X? ( virtual/x11 ) + X? ( x11-libs/libX11 ) png? ( sys-libs/zlib media-libs/libpng >=media-libs/gd-1.8 diff --git a/eclass/embassy.eclass b/eclass/embassy.eclass index be81766d4cc9..127ad54fec49 100644 --- a/eclass/embassy.eclass +++ b/eclass/embassy.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/embassy.eclass,v 1.12 2005/12/14 03:29:26 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/embassy.eclass,v 1.13 2007/03/26 20:04:34 genstef Exp $ # Author Olivier Fisette @@ -30,7 +30,7 @@ IUSE="X png" DEPEND="=sci-biology/emboss-${EBOV}* !=media-libs/gd-1.8 diff --git a/eclass/font.eclass b/eclass/font.eclass index 00d82ec940a2..8d39a86efbbb 100644 --- a/eclass/font.eclass +++ b/eclass/font.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/font.eclass,v 1.21 2006/10/30 06:13:48 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/font.eclass,v 1.22 2007/03/26 20:04:34 genstef Exp $ # Author: foser @@ -26,7 +26,7 @@ DOCS="" # Docs to install IUSE="X" -DEPEND="X? ( || ( x11-apps/mkfontdir virtual/x11 ) ) +DEPEND="X? ( x11-apps/mkfontdir ) media-libs/fontconfig" # diff --git a/eclass/tetex.eclass b/eclass/tetex.eclass index c03e6ec6fd77..6d37817015e3 100644 --- a/eclass/tetex.eclass +++ b/eclass/tetex.eclass @@ -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/eclass/tetex.eclass,v 1.49 2006/11/23 14:02:50 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/tetex.eclass,v 1.50 2007/03/26 20:04:34 genstef Exp $ # # Author: Jaromir Malenko # Author: Mamoru KOMACHI @@ -58,7 +58,7 @@ fi DEPEND="${DEPEND} sys-apps/ed sys-libs/zlib - X? ( || ( ( + X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm @@ -66,9 +66,6 @@ DEPEND="${DEPEND} x11-libs/libSM x11-libs/libXaw x11-libs/libXfont - ) - virtual/x11 - ) ) >=media-libs/libpng-1.2.1 sys-libs/ncurses diff --git a/eclass/vim.eclass b/eclass/vim.eclass index 342b8f6d4965..2eb134adec2b 100644 --- a/eclass/vim.eclass +++ b/eclass/vim.eclass @@ -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/eclass/vim.eclass,v 1.162 2007/03/21 03:40:22 pioto Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.163 2007/03/26 20:04:34 genstef Exp $ # Authors: # Ryan Phillips @@ -81,10 +81,9 @@ else if [[ "${MY_PN}" == "vim" ]] ; then IUSE="${IUSE} vim-with-x minimal" # see bug #111979 for modular X deps - DEPEND="${DEPEND} vim-with-x? ( || ( - ( x11-libs/libXt x11-libs/libX11 x11-libs/libSM x11-proto/xproto ) - virtual/x11 ) )" - RDEPEND="${RDEPEND} vim-with-x? ( || ( x11-libs/libXt virtual/x11 ) )" + DEPEND="${DEPEND} vim-with-x? ( x11-libs/libXt x11-libs/libX11 + x11-libs/libSM x11-proto/xproto )" + RDEPEND="${RDEPEND} vim-with-x? ( x11-libs/libXt )" elif [[ "${MY_PN}" == "gvim" ]] ; then if version_is_at_least "6.3.086" ; then IUSE="${IUSE} gnome gtk motif" -- 2.26.2