More X modular love.

Package-Manager: portage-2.1_pre7-r4

8 files changed, 40 insertions, 235 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index 58b0e7361361..4e97f152dc0b 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.65 2006/01/31 16:08:13 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.66 2006/04/05 15:27:38 metalgod Exp $
+
+  05 Apr 2006; Luis Medinas <metalgod@gentoo.org>
+  windowmaker-0.91.0-r1.ebuild, -windowmaker-0.91.0-r7.ebuild,
+  windowmaker-0.92.0-r1.ebuild, windowmaker-0.92.0-r2.ebuild,
+  windowmaker-0.92.0-r3.ebuild:
+  More X modular love.
 
 *windowmaker-0.92.0-r3 (31 Jan 2006)
 
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 7c70ed4351eb..21d8bcc10bde 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4ba9cc4d1aa347cf018e0cff29f697f1 ChangeLog 16062
-RMD160 f4ebf72cdb29714b2056e85fa8aef4e6bc288d97 ChangeLog 16062
-SHA256 ab5ade1e118bd0b5b379e39f372f019c1b5ccb6582706ab980c605b3b971b123 ChangeLog 16062
+MD5 a54b851ae350998574d95df884f6e34f ChangeLog 16293
+RMD160 c1ac3c42e5be1191efbb9a32fd452a275ac926a8 ChangeLog 16293
+SHA256 d4b4b11afa4e8407f967b628d0e13caeaa2613c313357873b208c6ee6b31a6ba ChangeLog 16293
 MD5 c8eb68627dc7b53b10143626018ff597 files/0.80.2/gtk2flickerfix.patch 1969
 RMD160 a21c185c4d05ba166588e94ad064c87cb7de63eb files/0.80.2/gtk2flickerfix.patch 1969
 SHA256 50c6f7cb9691fd129364154f58f7f0eb4b9e9c80d48eb809fc8d1dd83ace08fe files/0.80.2/gtk2flickerfix.patch 1969
@@ -55,9 +55,6 @@ SHA256 24b0e6c8b118f95c17d995a161cdb6655bbc085e287be615fd9842dc88ee36e3 files/di
 MD5 8b11b75a0ece3b854bf47e03ded7e0ba files/digest-windowmaker-0.91.0-r1 144
 RMD160 74e37e0a3100b0df33d5b90be337680aac4d5556 files/digest-windowmaker-0.91.0-r1 144
 SHA256 e66726aaf2b249c043adaf29f5ceb9e226d30db0b1135cc0c3f49962de3f863a files/digest-windowmaker-0.91.0-r1 144
-MD5 4c748a4dd9d3e57dfe5c1d01ccac4b54 files/digest-windowmaker-0.91.0-r7 227
-RMD160 b31da3f02c035c4758daede724ff5891c1540c0e files/digest-windowmaker-0.91.0-r7 227
-SHA256 fff1b6d46b50988782c45a02d36274916a669740a8655ac7bfaed775e6cf4720 files/digest-windowmaker-0.91.0-r7 227
 MD5 56fa606e28d04ba426e4d4cacc8d0b2d files/digest-windowmaker-0.92.0-r1 144
 RMD160 218776f4a36887dae3d7509c6984082f2efc9a1a files/digest-windowmaker-0.92.0-r1 144
 SHA256 ea41d4af91d6e98fcf212bc31d22bf4038c33fd933486f89ab8ba8a1b4d52ca3 files/digest-windowmaker-0.92.0-r1 144
@@ -79,25 +76,22 @@ SHA256 7cf62fd49cf872941377fedc739451ea6f285dd06ad1fef2034a5fc84ddbd1ff windowma
 MD5 3ceafc6ffa736e5cd7d21d18895e2aa1 windowmaker-0.80.2-r4.ebuild 4092
 RMD160 af26dde4e0c6108b14a871f8cae362995e4983b0 windowmaker-0.80.2-r4.ebuild 4092
 SHA256 23b5e053d0ef8fe0fed30ca80bfe02b98493743ea29c3849d9b61ba665ad5e36 windowmaker-0.80.2-r4.ebuild 4092
-MD5 0b7d5f0f23bea9a4793a92f25117d9f3 windowmaker-0.91.0-r1.ebuild 5881
-RMD160 15401d0c46197d9c622f2557195387991a91728f windowmaker-0.91.0-r1.ebuild 5881
-SHA256 ad8f5120f78032a208d76d72a2ccaf49ec78c1cd0b51cec89a9a4aff10cf2f39 windowmaker-0.91.0-r1.ebuild 5881
-MD5 6dfb07e767918268038ad952d0e38029 windowmaker-0.91.0-r7.ebuild 6800
-RMD160 fe3ece5d5d91f3f5a5edf1dd3132e05a879db9d1 windowmaker-0.91.0-r7.ebuild 6800
-SHA256 5fa0d751990414399edd296e609e714d43ee18b9726cf9a51ad2d2af60c90ed7 windowmaker-0.91.0-r7.ebuild 6800
-MD5 7cd4046827ba9b7b99679af4c0a14586 windowmaker-0.92.0-r1.ebuild 5354
-RMD160 150ed9ada9911ebd989f13b74fc87ec8932d2dea windowmaker-0.92.0-r1.ebuild 5354
-SHA256 7bd59f2fc62317454bd6c74f3e57cd008d5b158974d7d90cbccb1857a4ee3006 windowmaker-0.92.0-r1.ebuild 5354
-MD5 fc719636563d4ef47b1be6726231374d windowmaker-0.92.0-r2.ebuild 5217
-RMD160 0e70f591c2e1d7e945f3fc8a39bce886e02fb541 windowmaker-0.92.0-r2.ebuild 5217
-SHA256 86a9eaaa440913533a4c830e81972ed95be6c032c049d60e66a9961cd4257917 windowmaker-0.92.0-r2.ebuild 5217
-MD5 e805bca58ab50f9eab81ca66601ba50a windowmaker-0.92.0-r3.ebuild 5267
-RMD160 4b300eaf4e646874e5f4013bb10c7cd38e00e193 windowmaker-0.92.0-r3.ebuild 5267
-SHA256 e11ba6d5c8683c2e1af41e276217ee414c1f6a1a7f3527cbb10acb4320401d9e windowmaker-0.92.0-r3.ebuild 5267
+MD5 e789860f3fed82394a8c33696ede2d3b windowmaker-0.91.0-r1.ebuild 5905
+RMD160 23f8882c14f5a8b55be3caf30b292d5b4268de78 windowmaker-0.91.0-r1.ebuild 5905
+SHA256 dd614bf090727ab2401b72e2f55fee993b7a6cd1a7a8d8c2f726da07fa9122e6 windowmaker-0.91.0-r1.ebuild 5905
+MD5 c70074f5979b8f8e43c7953fd3915813 windowmaker-0.92.0-r1.ebuild 5376
+RMD160 2edeb84454941a8a851f2e9b610e8469fcb8da04 windowmaker-0.92.0-r1.ebuild 5376
+SHA256 f820a628b03212b25a12771401f19778eac1d4b6f1dce65b651db563012f575c windowmaker-0.92.0-r1.ebuild 5376
+MD5 097e8173ab6ddec46bc051e438c76cb4 windowmaker-0.92.0-r2.ebuild 5238
+RMD160 66b7b6162f31e53b4ba7532ed32d41eefb9e3100 windowmaker-0.92.0-r2.ebuild 5238
+SHA256 de924379fa7f96391d0e022211634992cea6c62a20115b61bebc51c249b86956 windowmaker-0.92.0-r2.ebuild 5238
+MD5 cef66d7b911ca0f38104282aac25177c windowmaker-0.92.0-r3.ebuild 5288
+RMD160 171f0f3b586281f09b3c8c211d011888b0279af9 windowmaker-0.92.0-r3.ebuild 5288
+SHA256 ad1fe790182a75853056234d51e07b16ff3b195985086181242d39d3112bdcac windowmaker-0.92.0-r3.ebuild 5288
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFD34rCwUpWvClEHQoRAmSoAJ4jf9AselomtWWrhf9WHGenrr0HJgCeNpPZ
-/BLiHVCujLYk1r6aZ6oOgDg=
-=huBW
+iD8DBQFEM++kwUpWvClEHQoRAmqKAJ45pCQwcJwtUIPSOVQrp3lqCmlAmACeJ2md
+nxwEQARDSO6zAb27YkY5qy8=
+=cX/S
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/windowmaker/files/digest-windowmaker-0.91.0-r7 b/x11-wm/windowmaker/files/digest-windowmaker-0.91.0-r7
deleted file mode 100644
index df49129f367d..000000000000
--- a/x11-wm/windowmaker/files/digest-windowmaker-0.91.0-r7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 be07953e905d1e42fe7a65ac2193a5f9 WindowMaker-0.91.0.tar.gz 2742380
-MD5 07c7700daaaf232bc490f5abaabef085 WindowMaker-extra-0.1.tar.gz 238018
-MD5 5de4e8a41f5d73280b4f4287e90af4b5 windowmaker-0.9X-use-giflib.patch3.bz2 102552
diff --git a/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild
index 63fd7356e663..9bbe9ed12594 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-2005 Gentoo Foundation
+# Copyright 1999-2006 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.17 2005/12/24 01:37:47 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild,v 1.18 2006/04/05 15:27:38 metalgod Exp $
 
 inherit eutils gnustep-funcs
 
@@ -12,7 +12,8 @@ SRC_URI="ftp://ftp.windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.g
 HOMEPAGE="http://www.windowmaker.org/"
 
 IUSE="gif gnustep jpeg nls png tiff modelock xinerama"
-DEPEND="x11-base/xorg-x11
+DEPEND="|| ( ( x11-libs/libXv )
+	virtual/x11 )
 	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.91.0-r7.ebuild b/x11-wm/windowmaker/windowmaker-0.91.0-r7.ebuild
deleted file mode 100644
index 4a5b5d39dcb2..000000000000
--- a/x11-wm/windowmaker/windowmaker-0.91.0-r7.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2005 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-r7.ebuild,v 1.3 2005/06/24 00:32:26 fafhrd Exp $
-
-inherit eutils gnustep-funcs flag-o-matic
-
-S=${WORKDIR}/${P/windowm/WindowM}
-
-DESCRIPTION="The fast and light GNUstep window manager"
-SRC_URI="ftp://ftp.windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
-	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
-	mirror://gentoo/windowmaker-0.9X-use-giflib.patch3.bz2"
-HOMEPAGE="http://www.windowmaker.org/"
-
-IUSE="gif gnustep jpeg nls png tiff modelock xinerama"
-DEPEND="x11-base/xorg-x11
-	media-libs/fontconfig
-	gif? ( >=media-libs/giflib-4.1.0-r3 )
-	png? ( >=media-libs/libpng-1.2.1 )
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.6.1-r2 )"
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.39 )
-	gnustep? ( gnustep-base/gnustep-env )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips ~alpha"
-
-if use gnustep; then
-	egnustep_install_domain "System"
-fi
-
-src_unpack() {
-	is-flag -fstack-protector && filter-flags -fstack-protector \
-		&& ewarn "CFLAG -fstack-protector has been disabled, as it is known to cause bugs with WindowMaker (bug #78051)" && ebeep 2
-	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/windowmaker-0.9X-use-giflib.patch3 || die "giflib patch failed"
-	epatch ${FILESDIR}/${PV}/menufocus.patch || die "menu focus patch failed"
-	epatch ${FILESDIR}/${PV}/singleclick-shadeormaxopts-0.9x.patch2 || die "single click and shade-or-maximize-options patch failed"
-	epatch ${FILESDIR}/${PV}/wlist-0.9x.patch || die "window list patch failed"
-	epatch ${FILESDIR}/${PV}/64bit+endian-fixes-0.9x.patch || die "64-bit + endian fix patch failed"
-	epatch ${FILESDIR}/${PV}/maximize-fix-0.9x.patch || die "maximize fix patch failed"
-}
-
-src_compile() {
-	local myconf
-	local gs_user_postfix
-
-	# image format types
-	# xpm is provided by X itself
-	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
-
-	# non required X capabilities
-	myconf="${myconf} $(use_enable modelock) $(use_enable xinerama)"
-
-	# integrate with GNUstep environment, or not
-	if use gnustep ; then
-		egnustep_env
-		myconf="${myconf} --with-appspath=$(egnustep_system_root)/Applications"
-	else
-		# no change from wm-0.80* ebuilds, as to not pollute things more
-		myconf="${myconf} --with-appspath=/usr/lib/GNUstep/Applications"
-	fi
-
-	use nls \
-		&& export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" \
-		|| myconf="${myconf} --disable-nls --disable-locale"
-
-	# default settings with $myconf appended
-	econf \
-		--sysconfdir=/etc/X11 \
-		--with-x \
-		--enable-usermenu \
-		--with-pixmapdir=/usr/share/pixmaps \
-		${myconf} || die
-
-	# call here needed as some users report breakage with one of the above
-	#  patches (though patched after autoreconf)
-	libtoolize --copy --force
-
-	# don't know if zh_TW is still non-functional, but leaving it out still
-	#  for now
-	cd ${S}/po
-	cp Makefile Makefile.orig
-	sed 's:zh_TW.*::' \
-		Makefile.orig > Makefile
-
-	cd ${S}/WPrefs.app/po
-	cp Makefile Makefile.orig
-	sed 's:zh_TW.*::' \
-		Makefile.orig > Makefile
-
-	cd ${S}
-	for file in ${S}/WindowMaker/*menu*; do
-		if [ -r $file ]; then
-			if use gnustep ; then
-				sed -e "s/\/usr\/local\/GNUstep/`cat ${TMP}/sed.gs_prefix`System/g;
-					s/XXX_SED_FSLASH/\//g;" < $file > $file.tmp
-			else
-				sed -e 's/\/usr\/local\/GNUstep/\/usr\/lib\/GNUstep/g;' < $file > $file.tmp
-			fi
-			mv $file.tmp $file;
-
-			sed -e 's/\/usr\/local\/share\/WindowMaker/\/usr\/share\/WindowMaker/g;' < $file > $file.tmp;
-			mv $file.tmp $file;
-		fi;
-	done;
-
-	cd ${S}
-	emake -j1 || die "windowmaker: make has failed"
-
-	cd ${S}
-	for file in ${S}/WindowMaker/Defaults/W*; do
-		if [ -r $file ]; then
-			if use gnustep; then
-				sed -e "s/\$HOME\/GNUstep\//\$HOME`cat ${TMP}/sed.gs_user_root_suffix`/g;
-						s/XXX_SED_FSLASH/\//g;" < $file > $file.tmp
-				mv $file.tmp $file;
-
-				sed -e "s/~\/GNUstep\//~`cat ${TMP}/sed.gs_user_root_suffix`/g;
-						s/XXX_SED_FSLASH/\//g;" < $file > $file.tmp
-				mv $file.tmp $file;
-			fi
-		fi
-	done;
-
-	# WindowMaker Extra Package (themes and icons)
-	cd ../WindowMaker-extra-0.1
-	econf || die "windowmaker-extra: configure has failed"
-	emake || die "windowmaker-extra: make has failed"
-}
-
-src_install() {
-	emake install DESTDIR=${D} || die "windowmaker: install has failed."
-
-	dodoc AUTHORS BUGFORM BUGS ChangeLog COPYING* INSTALL* FAQ* \
-	      MIRRORS README* NEWS TODO
-
-	# WindowMaker Extra
-	cd ../WindowMaker-extra-0.1
-	emake install DESTDIR=${D} || die "windowmaker-extra: install failed"
-
-	newdoc README README.extra
-
-	# create wmaker session shell script
-	echo "#!/bin/bash" > wmaker
-	echo "/usr/bin/wmaker" >> wmaker
-	exeinto /etc/X11/Sessions/
-	doexe wmaker
-
-	insinto /etc/X11/dm/Sessions
-	doins ${FILESDIR}/wmaker.desktop
-	make_desktop_entry /usr/bin/wmaker
-}
-
-pkg_postinst() {
-	einfo "If you are using 'startx' from the command line, and require"
-	einfo "  .xinitrc, you may need to execute 'wmaker.inst', which will"
-	einfo "  setup default configurations for you."
-	einfo ""
-
-	if use gnustep ; then
-		einfo "WPrefs.app is installed in you GNUstep System Applications directory."
-		einfo ""
-		ewarn "*** IMPORTANT ***"
-		ewarn "If you changed the GNUstep user root, via a use flag like 'layout-osx-like' in gnustep-make"
-		ewarn "  you will have to repair the personal WindowMaker config files you have.  For example,"
-		ewarn "  if you changed the default user root as above, \$HOME/GNUstep to ~/, these commands"
-		ewarn "  will help you:"
-		ewarn "cd ; cp -a ./GNUstep/.AppInfo . ; cp -a ./GNUstep/Defaults/W* ./Defaults/ ;"
-		ewarn "  cp -a ./GNUstep/Library/Icons ./GNUstep/Library/WindowMaker ./Library/"
-		ewarn "The above commands are specifically to help repair your WindowMaker install;"
-		ewarn "  a less elegant, but reasonable method is to simply run wmaker.inst again,"
-		ewarn "  **after sourcing GNUstep.sh**, as this env script sets the GNUSTEP_USER_ROOT variable."
-		ewarn "Generally, other config files in your old ~/GNUstep directory, can simply be"
-		ewarn "  moved to the new GNUSTEP_USER_ROOT."
-		ewarn "^^^ IMPORTANT ^^^"
-		ewarn ""
-	else
-		einfo "Even though you are not using the GNUstep environment, wmaker.inst will"
-		einfo "  create a 'GNUstep' directory in your home -- it uses this directory"
-		einfo "  to store your WindowMaker configuration files."
-		einfo "WPrefs.app can be launched at /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs"
-		einfo "  or by simply **clicking on it in the WindowMaker default dock.**"
-		einfo ""
-	fi
-
-	ewarn "This package provides libwraster.so.3.  Packages depending on"
-	ewarn "  libwraster.so.2 will have to be rebuilt, i.e. 'revdep-rebuild'"
-
-	ebeep 4
-	epause 4
-}
-
diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r1.ebuild
index ab12f13e2127..2df834507388 100644
--- a/x11-wm/windowmaker/windowmaker-0.92.0-r1.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.92.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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-r1.ebuild,v 1.2 2005/12/28 22:31:26 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r1.ebuild,v 1.3 2006/04/05 15:27:38 metalgod Exp $
 
 inherit eutils gnustep-funcs flag-o-matic multilib
 
@@ -12,7 +12,8 @@ SRC_URI="ftp://ftp.windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.g
 HOMEPAGE="http://www.windowmaker.org/"
 
 IUSE="gif gnustep jpeg nls png tiff modelock xinerama"
-DEPEND="x11-base/xorg-x11
+DEPEND="|| ( ( x11-libs/libXv )
+	virtual/x11 )
 	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-r2.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r2.ebuild
index c585e523c371..82b87b6923b0 100644
--- a/x11-wm/windowmaker/windowmaker-0.92.0-r2.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.92.0-r2.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/x11-wm/windowmaker/windowmaker-0.92.0-r2.ebuild,v 1.2 2006/01/12 01:07:56 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r2.ebuild,v 1.3 2006/04/05 15:27:38 metalgod Exp $
 
 inherit eutils gnustep-funcs flag-o-matic multilib
 
@@ -12,7 +12,8 @@ SRC_URI="ftp://ftp.windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.g
 HOMEPAGE="http://www.windowmaker.org/"
 
 IUSE="gif gnustep jpeg nls png tiff modelock xinerama"
-DEPEND="x11-base/xorg-x11
+DEPEND="|| ( ( x11-libs/libXv )
+	virtual/x11 )
 	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 180635f63389..7d6bab124c1e 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-2006 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.1 2006/01/31 16:08:13 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r3.ebuild,v 1.2 2006/04/05 15:27:38 metalgod Exp $
 
 inherit eutils gnustep-funcs flag-o-matic multilib
 
@@ -12,7 +12,8 @@ SRC_URI="ftp://ftp.windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.g
 HOMEPAGE="http://www.windowmaker.org/"
 
 IUSE="gif gnustep jpeg nls png tiff modelock xinerama"
-DEPEND="x11-base/xorg-x11
+DEPEND="|| ( ( x11-libs/libXv )
+	virtual/x11 )
 	media-libs/fontconfig
 	gif? ( >=media-libs/giflib-4.1.0-r3 )
 	png? ( >=media-libs/libpng-1.2.1 )