diff options
22 files changed, 179 insertions, 216 deletions
diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog index e0236929a75b..728501b332b2 100644 --- a/x11-wm/afterstep/ChangeLog +++ b/x11-wm/afterstep/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-wm/afterstep # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.80 2007/04/28 16:30:49 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.81 2007/07/22 06:02:57 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; + afterstep-2.00.05.ebuild, afterstep-2.1.2.ebuild, afterstep-2.2.0.ebuild, + afterstep-2.2.1.ebuild, afterstep-2.2.2.ebuild, afterstep-2.2.2-r1.ebuild, + afterstep-2.2.3.ebuild, afterstep-2.2.4.ebuild: + Drop virtual/x11 references. 28 Apr 2007; Sven Wegener <swegener@gentoo.org> afterstep-2.00.05.ebuild, afterstep-2.1.2.ebuild, afterstep-2.2.0.ebuild, afterstep-2.2.1.ebuild, diff --git a/x11-wm/afterstep/afterstep-2.00.05.ebuild b/x11-wm/afterstep/afterstep-2.00.05.ebuild index 81ddafe273e4..657772705717 100644 --- a/x11-wm/afterstep/afterstep-2.00.05.ebuild +++ b/x11-wm/afterstep/afterstep-2.00.05.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/x11-wm/afterstep/afterstep-2.00.05.ebuild,v 1.9 2007/07/12 03:41:53 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.00.05.ebuild,v 1.10 2007/07/22 06:02:57 dberkholz Exp $ inherit flag-o-matic @@ -20,26 +20,20 @@ RDEPEND="virtual/libc jpeg? ( >=media-libs/jpeg-6b ) gif? ( >=media-libs/giflib-4.1.0 ) tiff? ( >=media-libs/tiff-3.5.7 ) - || ( ( x11-libs/libICE - x11-libs/libXext - x11-libs/libSM - x11-libs/libXmu - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - ) - virtual/x11 - )" + x11-libs/libICE + x11-libs/libXext + x11-libs/libSM + x11-libs/libXmu + x11-libs/libXt + x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} - || ( ( x11-proto/xextproto - x11-proto/xproto - xinerama? ( x11-proto/xineramaproto ) - ) - virtual/x11 - )" + x11-proto/xextproto + x11-proto/xproto + xinerama? ( x11-proto/xineramaproto )" S="${WORKDIR}/AfterStep-${PV}" diff --git a/x11-wm/afterstep/afterstep-2.1.2.ebuild b/x11-wm/afterstep/afterstep-2.1.2.ebuild index d337600d4f46..610cb0992db5 100644 --- a/x11-wm/afterstep/afterstep-2.1.2.ebuild +++ b/x11-wm/afterstep/afterstep-2.1.2.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/x11-wm/afterstep/afterstep-2.1.2.ebuild,v 1.9 2007/07/12 03:41:53 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.1.2.ebuild,v 1.10 2007/07/22 06:02:57 dberkholz Exp $ inherit flag-o-matic @@ -20,26 +20,20 @@ RDEPEND="virtual/libc jpeg? ( >=media-libs/jpeg-6b ) gif? ( >=media-libs/giflib-4.1.0 ) tiff? ( >=media-libs/tiff-3.5.7 ) - || ( ( x11-libs/libICE - x11-libs/libXext - x11-libs/libSM - x11-libs/libXmu - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - ) - virtual/x11 - )" + x11-libs/libICE + x11-libs/libXext + x11-libs/libSM + x11-libs/libXmu + x11-libs/libXt + x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} - || ( ( x11-proto/xextproto - x11-proto/xproto - xinerama? ( x11-proto/xineramaproto ) - ) - virtual/x11 - )" + x11-proto/xextproto + x11-proto/xproto + xinerama? ( x11-proto/xineramaproto )" S="${WORKDIR}/AfterStep-${PV}" diff --git a/x11-wm/afterstep/afterstep-2.2.0.ebuild b/x11-wm/afterstep/afterstep-2.2.0.ebuild index 4bed4d908745..d9c95f63a4eb 100644 --- a/x11-wm/afterstep/afterstep-2.2.0.ebuild +++ b/x11-wm/afterstep/afterstep-2.2.0.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/x11-wm/afterstep/afterstep-2.2.0.ebuild,v 1.9 2007/07/12 03:41:53 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.0.ebuild,v 1.10 2007/07/22 06:02:57 dberkholz Exp $ inherit flag-o-matic @@ -20,26 +20,20 @@ RDEPEND="virtual/libc jpeg? ( >=media-libs/jpeg-6b ) gif? ( >=media-libs/giflib-4.1.0 ) tiff? ( >=media-libs/tiff-3.5.7 ) - || ( ( x11-libs/libICE - x11-libs/libXext - x11-libs/libSM - x11-libs/libXmu - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - ) - virtual/x11 - )" + x11-libs/libICE + x11-libs/libXext + x11-libs/libSM + x11-libs/libXmu + x11-libs/libXt + x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} - || ( ( x11-proto/xextproto - x11-proto/xproto - xinerama? ( x11-proto/xineramaproto ) - ) - virtual/x11 - )" + x11-proto/xextproto + x11-proto/xproto + xinerama? ( x11-proto/xineramaproto )" S="${WORKDIR}/AfterStep-${PV}" diff --git a/x11-wm/afterstep/afterstep-2.2.1.ebuild b/x11-wm/afterstep/afterstep-2.2.1.ebuild index e44a8eb1a8db..fc7afed8fa44 100644 --- a/x11-wm/afterstep/afterstep-2.2.1.ebuild +++ b/x11-wm/afterstep/afterstep-2.2.1.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/x11-wm/afterstep/afterstep-2.2.1.ebuild,v 1.3 2007/07/12 03:41:53 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.1.ebuild,v 1.4 2007/07/22 06:02:57 dberkholz Exp $ inherit flag-o-matic @@ -20,26 +20,20 @@ RDEPEND="virtual/libc jpeg? ( >=media-libs/jpeg-6b ) gif? ( >=media-libs/giflib-4.1.0 ) tiff? ( >=media-libs/tiff-3.5.7 ) - || ( ( x11-libs/libICE - x11-libs/libXext - x11-libs/libSM - x11-libs/libXmu - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - ) - virtual/x11 - )" + x11-libs/libICE + x11-libs/libXext + x11-libs/libSM + x11-libs/libXmu + x11-libs/libXt + x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} - || ( ( x11-proto/xextproto - x11-proto/xproto - xinerama? ( x11-proto/xineramaproto ) - ) - virtual/x11 - )" + x11-proto/xextproto + x11-proto/xproto + xinerama? ( x11-proto/xineramaproto )" S="${WORKDIR}/AfterStep-${PV}" diff --git a/x11-wm/afterstep/afterstep-2.2.2-r1.ebuild b/x11-wm/afterstep/afterstep-2.2.2-r1.ebuild index 52b4f7a15e01..32de3db0205b 100644 --- a/x11-wm/afterstep/afterstep-2.2.2-r1.ebuild +++ b/x11-wm/afterstep/afterstep-2.2.2-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/x11-wm/afterstep/afterstep-2.2.2-r1.ebuild,v 1.8 2007/07/12 03:41:53 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.2-r1.ebuild,v 1.9 2007/07/22 06:02:57 dberkholz Exp $ inherit flag-o-matic eutils @@ -20,26 +20,20 @@ RDEPEND="virtual/libc jpeg? ( >=media-libs/jpeg-6b ) gif? ( >=media-libs/giflib-4.1.0 ) tiff? ( >=media-libs/tiff-3.5.7 ) - || ( ( x11-libs/libICE - x11-libs/libXext - x11-libs/libSM - x11-libs/libXmu - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - ) - virtual/x11 - )" + x11-libs/libICE + x11-libs/libXext + x11-libs/libSM + x11-libs/libXmu + x11-libs/libXt + x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} - || ( ( x11-proto/xextproto - x11-proto/xproto - xinerama? ( x11-proto/xineramaproto ) - ) - virtual/x11 - )" + x11-proto/xextproto + x11-proto/xproto + xinerama? ( x11-proto/xineramaproto )" S="${WORKDIR}/AfterStep-${PV}" diff --git a/x11-wm/afterstep/afterstep-2.2.2.ebuild b/x11-wm/afterstep/afterstep-2.2.2.ebuild index 0629082750b4..9ef6f8ee899a 100644 --- a/x11-wm/afterstep/afterstep-2.2.2.ebuild +++ b/x11-wm/afterstep/afterstep-2.2.2.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/x11-wm/afterstep/afterstep-2.2.2.ebuild,v 1.3 2007/07/12 03:41:53 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.2.ebuild,v 1.4 2007/07/22 06:02:57 dberkholz Exp $ inherit flag-o-matic @@ -20,26 +20,20 @@ RDEPEND="virtual/libc jpeg? ( >=media-libs/jpeg-6b ) gif? ( >=media-libs/giflib-4.1.0 ) tiff? ( >=media-libs/tiff-3.5.7 ) - || ( ( x11-libs/libICE - x11-libs/libXext - x11-libs/libSM - x11-libs/libXmu - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - ) - virtual/x11 - )" + x11-libs/libICE + x11-libs/libXext + x11-libs/libSM + x11-libs/libXmu + x11-libs/libXt + x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} - || ( ( x11-proto/xextproto - x11-proto/xproto - xinerama? ( x11-proto/xineramaproto ) - ) - virtual/x11 - )" + x11-proto/xextproto + x11-proto/xproto + xinerama? ( x11-proto/xineramaproto )" S="${WORKDIR}/AfterStep-${PV}" diff --git a/x11-wm/afterstep/afterstep-2.2.3.ebuild b/x11-wm/afterstep/afterstep-2.2.3.ebuild index 45bab75a6cb8..36643fc6bcaa 100644 --- a/x11-wm/afterstep/afterstep-2.2.3.ebuild +++ b/x11-wm/afterstep/afterstep-2.2.3.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/x11-wm/afterstep/afterstep-2.2.3.ebuild,v 1.8 2007/07/12 03:41:53 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.3.ebuild,v 1.9 2007/07/22 06:02:57 dberkholz Exp $ inherit flag-o-matic eutils @@ -20,26 +20,20 @@ RDEPEND="virtual/libc jpeg? ( >=media-libs/jpeg-6b ) gif? ( >=media-libs/giflib-4.1.0 ) tiff? ( >=media-libs/tiff-3.5.7 ) - || ( ( x11-libs/libICE - x11-libs/libXext - x11-libs/libSM - x11-libs/libXmu - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - ) - virtual/x11 - )" + x11-libs/libICE + x11-libs/libXext + x11-libs/libSM + x11-libs/libXmu + x11-libs/libXt + x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} - || ( ( x11-proto/xextproto - x11-proto/xproto - xinerama? ( x11-proto/xineramaproto ) - ) - virtual/x11 - )" + x11-proto/xextproto + x11-proto/xproto + xinerama? ( x11-proto/xineramaproto )" S="${WORKDIR}/AfterStep-${PV}" diff --git a/x11-wm/afterstep/afterstep-2.2.4.ebuild b/x11-wm/afterstep/afterstep-2.2.4.ebuild index ba6d01c5c839..978c12056a38 100644 --- a/x11-wm/afterstep/afterstep-2.2.4.ebuild +++ b/x11-wm/afterstep/afterstep-2.2.4.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/x11-wm/afterstep/afterstep-2.2.4.ebuild,v 1.12 2007/07/12 03:41:53 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.4.ebuild,v 1.13 2007/07/22 06:02:57 dberkholz Exp $ inherit flag-o-matic eutils @@ -20,26 +20,20 @@ RDEPEND="virtual/libc jpeg? ( >=media-libs/jpeg-6b ) gif? ( >=media-libs/giflib-4.1.0 ) tiff? ( >=media-libs/tiff-3.5.7 ) - || ( ( x11-libs/libICE - x11-libs/libXext - x11-libs/libSM - x11-libs/libXmu - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - ) - virtual/x11 - )" + x11-libs/libICE + x11-libs/libXext + x11-libs/libSM + x11-libs/libXmu + x11-libs/libXt + x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} - || ( ( x11-proto/xextproto - x11-proto/xproto - xinerama? ( x11-proto/xineramaproto ) - ) - virtual/x11 - )" + x11-proto/xextproto + x11-proto/xproto + xinerama? ( x11-proto/xineramaproto )" S="${WORKDIR}/AfterStep-${PV}" diff --git a/x11-wm/ion2/ChangeLog b/x11-wm/ion2/ChangeLog index c54a64ad6c3b..dbc51f9e15c3 100644 --- a/x11-wm/ion2/ChangeLog +++ b/x11-wm/ion2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/ion2 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ChangeLog,v 1.30 2007/02/21 22:37:07 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ChangeLog,v 1.31 2007/07/22 06:03:55 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; + ion2-20040729-r1.ebuild: + Drop virtual/x11 references. 21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog: Redigest for Manifest2 diff --git a/x11-wm/ion2/ion2-20040729-r1.ebuild b/x11-wm/ion2/ion2-20040729-r1.ebuild index baf55c4a8dae..78b13b630be7 100644 --- a/x11-wm/ion2/ion2-20040729-r1.ebuild +++ b/x11-wm/ion2/ion2-20040729-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/x11-wm/ion2/ion2-20040729-r1.ebuild,v 1.3 2006/02/07 09:11:22 twp Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ion2-20040729-r1.ebuild,v 1.4 2007/07/22 06:03:55 dberkholz Exp $ inherit eutils @@ -11,29 +11,18 @@ LICENSE="LGPL-2.1" SLOT="2" KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86" IUSE="xinerama" -DEPEND=" - || ( - ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - xinerama? ( x11-libs/libXinerama ) - ) - virtual/x11 - ) +DEPEND="x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + xinerama? ( x11-libs/libXinerama ) >=dev-lang/lua-5.0.2 >=sys-devel/libtool-1.4.3" RDEPEND="${DEPEND} - || ( - ( - x11-apps/xmessage - x11-proto/xproto - x11-proto/xextproto - xinerama? ( x11-proto/xineramaproto ) - ) - virtual/x11 - ) + x11-apps/xmessage + x11-proto/xproto + x11-proto/xextproto + xinerama? ( x11-proto/xineramaproto ) app-misc/run-mailcap" S=${WORKDIR}/ion-2-${PV} diff --git a/x11-wm/matchbox-window-manager/ChangeLog b/x11-wm/matchbox-window-manager/ChangeLog index af51b8c917d6..73afb1a1dd5d 100644 --- a/x11-wm/matchbox-window-manager/ChangeLog +++ b/x11-wm/matchbox-window-manager/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/matchbox-window-manager # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-window-manager/ChangeLog,v 1.9 2007/04/24 20:06:05 yvasilev Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-window-manager/ChangeLog,v 1.10 2007/07/22 06:08:47 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; + matchbox-window-manager-1.1.ebuild, matchbox-window-manager-1.2.ebuild: + Drop virtual/x11 references. 24 Apr 2007; <yvasilev@gentoo.org> -matchbox-window-manager-1.0.ebuild: Removed version 1.0. diff --git a/x11-wm/matchbox-window-manager/matchbox-window-manager-1.1.ebuild b/x11-wm/matchbox-window-manager/matchbox-window-manager-1.1.ebuild index f9d201d0d084..78dde4b56659 100644 --- a/x11-wm/matchbox-window-manager/matchbox-window-manager-1.1.ebuild +++ b/x11-wm/matchbox-window-manager/matchbox-window-manager-1.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 2006-2006 Gentoo Foundation +# Copyright 2006-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-window-manager/matchbox-window-manager-1.1.ebuild,v 1.1 2006/08/17 15:54:21 yvasilev Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-window-manager/matchbox-window-manager-1.1.ebuild,v 1.2 2007/07/22 06:08:47 dberkholz Exp $ inherit eutils versionator gnome2 @@ -17,11 +17,9 @@ DEPEND=">=x11-libs/libmatchbox-1.5 expat? ( dev-libs/expat ) gnome? ( gnome-base/gconf ) startup-notification? ( x11-libs/startup-notification ) - session? ( || ( x11-libs/libSM - virtual/x11 ) ) - xcomposite? ( || ( ( x11-libs/libXcomposite - x11-libs/libXdamage ) - virtual/x11 ) )" + session? ( x11-libs/libSM ) + xcomposite? ( x11-libs/libXcomposite + x11-libs/libXdamage )" src_unpack() { unpack ${A} diff --git a/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2.ebuild b/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2.ebuild index fa67463987a8..b715837d3819 100644 --- a/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2.ebuild +++ b/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 2006-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2.ebuild,v 1.1 2007/04/24 20:01:20 yvasilev Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2.ebuild,v 1.2 2007/07/22 06:08:47 dberkholz Exp $ inherit eutils versionator gnome2 @@ -17,11 +17,9 @@ DEPEND=">=x11-libs/libmatchbox-1.5 expat? ( dev-libs/expat ) gnome? ( gnome-base/gconf ) startup-notification? ( x11-libs/startup-notification ) - session? ( || ( x11-libs/libSM - virtual/x11 ) ) - xcomposite? ( || ( ( x11-libs/libXcomposite - x11-libs/libXdamage ) - virtual/x11 ) )" + session? ( x11-libs/libSM ) + xcomposite? ( x11-libs/libXcomposite + x11-libs/libXdamage )" src_unpack() { unpack ${A} diff --git a/x11-wm/matchbox/ChangeLog b/x11-wm/matchbox/ChangeLog index 423784d2d9c0..1030578106bb 100644 --- a/x11-wm/matchbox/ChangeLog +++ b/x11-wm/matchbox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/matchbox # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox/ChangeLog,v 1.14 2007/07/02 02:03:30 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox/ChangeLog,v 1.15 2007/07/22 06:04:45 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; + matchbox-0.7.1.ebuild: + Drop virtual/x11 references. 02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> matchbox-0.7.1.ebuild: (QA) RESTRICT clean up. diff --git a/x11-wm/matchbox/matchbox-0.7.1.ebuild b/x11-wm/matchbox/matchbox-0.7.1.ebuild index bd3786085086..716d50ad8545 100644 --- a/x11-wm/matchbox/matchbox-0.7.1.ebuild +++ b/x11-wm/matchbox/matchbox-0.7.1.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/x11-wm/matchbox/matchbox-0.7.1.ebuild,v 1.10 2007/07/02 02:58:48 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox/matchbox-0.7.1.ebuild,v 1.11 2007/07/22 06:04:45 dberkholz Exp $ IUSE="jpeg png nls debug" @@ -12,14 +12,12 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="ppc x86" -RDEPEND="|| ( ( - x11-libs/libXtst - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXpm - x11-libs/libXrender - x11-libs/libXft ) - virtual/x11 ) +RDEPEND="x11-libs/libXtst + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXpm + x11-libs/libXrender + x11-libs/libXft dev-libs/expat x11-libs/startup-notification x11-libs/libxsettings-client @@ -27,10 +25,8 @@ RDEPEND="|| ( ( jpeg? ( media-libs/jpeg )" DEPEND="${RDEPEND} - || ( ( - x11-proto/xproto - x11-proto/xextproto ) - virtual/x11 ) + x11-proto/xproto + x11-proto/xextproto sys-devel/libtool" src_compile() { diff --git a/x11-wm/ratpoison/ChangeLog b/x11-wm/ratpoison/ChangeLog index c088b1f3970d..c7f29915ba69 100644 --- a/x11-wm/ratpoison/ChangeLog +++ b/x11-wm/ratpoison/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/ratpoison # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ChangeLog,v 1.45 2007/04/12 22:25:03 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ChangeLog,v 1.46 2007/07/22 06:06:02 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; + ratpoison-1.4.0.ebuild, ratpoison-1.4.1.ebuild: + Drop virtual/x11 references. 12 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> -ratpoison-1.3.0.ebuild, -ratpoison-1.4.0_beta2.ebuild, diff --git a/x11-wm/ratpoison/ratpoison-1.4.0.ebuild b/x11-wm/ratpoison/ratpoison-1.4.0.ebuild index 66453115b679..5afd49cbfe2a 100644 --- a/x11-wm/ratpoison/ratpoison-1.4.0.ebuild +++ b/x11-wm/ratpoison/ratpoison-1.4.0.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/x11-wm/ratpoison/ratpoison-1.4.0.ebuild,v 1.8 2007/04/12 21:49:59 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ratpoison-1.4.0.ebuild,v 1.9 2007/07/22 06:06:01 dberkholz Exp $ WANT_AUTOMAKE=latest WANT_AUTOCONF=latest @@ -19,7 +19,8 @@ SLOT="0" KEYWORDS="amd64 hppa ppc sparc x86" IUSE="emacs" -DEPEND="|| ( ( x11-libs/libXinerama x11-libs/libXtst ) virtual/x11 ) +DEPEND="x11-libs/libXinerama + x11-libs/libXtst virtual/perl-PodParser emacs? ( virtual/emacs )" diff --git a/x11-wm/ratpoison/ratpoison-1.4.1.ebuild b/x11-wm/ratpoison/ratpoison-1.4.1.ebuild index 3ff892b05ef7..ff6942882388 100644 --- a/x11-wm/ratpoison/ratpoison-1.4.1.ebuild +++ b/x11-wm/ratpoison/ratpoison-1.4.1.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/x11-wm/ratpoison/ratpoison-1.4.1.ebuild,v 1.1 2007/02/05 23:23:39 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ratpoison-1.4.1.ebuild,v 1.2 2007/07/22 06:06:01 dberkholz Exp $ WANT_AUTOMAKE=latest WANT_AUTOCONF=latest @@ -19,7 +19,8 @@ SLOT="0" KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" IUSE="emacs" -DEPEND="|| ( ( x11-libs/libXinerama x11-libs/libXtst ) virtual/x11 ) +DEPEND="x11-libs/libXinerama + x11-libs/libXtst virtual/perl-PodParser emacs? ( virtual/emacs )" diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog index fc00e8e2d44d..418a8cb5f3b6 100644 --- a/x11-wm/windowmaker/ChangeLog +++ b/x11-wm/windowmaker/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/windowmaker # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.80 2007/04/10 02:00:16 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.81 2007/07/22 06:07:21 dberkholz Exp $ + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; + windowmaker-0.91.0-r1.ebuild, windowmaker-0.92.0-r3.ebuild: + Drop virtual/x11 references. 10 Apr 2007; Jeroen Roovers <jer@gentoo.org> windowmaker-0.92.0-r3.ebuild: Stable for HPPA (bug #173537). diff --git a/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild index 4e2c394b8f46..4401b567eb90 100644 --- a/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild +++ b/x11-wm/windowmaker/windowmaker-0.91.0-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/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild,v 1.22 2007/07/12 03:41:53 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild,v 1.23 2007/07/22 06:07:21 dberkholz Exp $ inherit eutils gnustep-funcs @@ -12,8 +12,9 @@ SRC_URI="ftp://ftp.windowmaker.info/pub/source/release/${P/windowm/WindowM}.tar. HOMEPAGE="http://www.windowmaker.info/" IUSE="gif gnustep jpeg nls png tiff modelock xinerama" -DEPEND="|| ( ( x11-libs/libXv x11-libs/libXft x11-libs/libXt ) - virtual/x11 ) +DEPEND="x11-libs/libXv + x11-libs/libXft + x11-libs/libXt media-libs/fontconfig gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( >=media-libs/libpng-1.2.1 ) diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r3.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r3.ebuild index 33c78f8cead7..3c913c276490 100644 --- a/x11-wm/windowmaker/windowmaker-0.92.0-r3.ebuild +++ b/x11-wm/windowmaker/windowmaker-0.92.0-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/x11-wm/windowmaker/windowmaker-0.92.0-r3.ebuild,v 1.17 2007/07/12 03:41:53 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r3.ebuild,v 1.18 2007/07/22 06:07:21 dberkholz Exp $ inherit eutils gnustep-funcs flag-o-matic multilib @@ -12,8 +12,9 @@ SRC_URI="ftp://ftp.windowmaker.info/pub/source/release/${P/windowm/WindowM}.tar. HOMEPAGE="http://www.windowmaker.info/" IUSE="gif gnustep jpeg nls png tiff modelock xinerama" -DEPEND="|| ( ( x11-libs/libXv x11-libs/libXft x11-libs/libXt ) - virtual/x11 ) +DEPEND="x11-libs/libXv + x11-libs/libXft + x11-libs/libXt media-libs/fontconfig gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( >=media-libs/libpng-1.2.1 ) |