Fixed dependencies for modular X. Removed old version.

(Portage version: 2.1_pre3-r1)

6 files changed, 39 insertions, 70 deletions

diff --git a/x11-wm/wmi/ChangeLog b/x11-wm/wmi/ChangeLog
index 71798dae1941..e78ddbd9e24c 100644
--- a/x11-wm/wmi/ChangeLog
+++ b/x11-wm/wmi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/wmi
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmi/ChangeLog,v 1.14 2005/05/08 14:40:55 herbs Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmi/ChangeLog,v 1.15 2006/01/22 13:05:30 tove Exp $
+
+  22 Jan 2006; Torsten Veller <tove@gentoo.org> metadata.xml, -wmi-9.ebuild,
+  wmi-10.ebuild:
+  Fixed dependencies for modular X. Removed old version.
 
   08 May 2005; Herbie Hopkins <herbs@gentoo.org> wmi-10.ebuild:
   Stable on amd64.
diff --git a/x11-wm/wmi/Manifest b/x11-wm/wmi/Manifest
index 6d49c078629b..0ea810f24421 100644
--- a/x11-wm/wmi/Manifest
+++ b/x11-wm/wmi/Manifest
@@ -1,17 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 276c8a86034d064720d9196a9fe4201d wmi-9.ebuild 1046
-MD5 65061256ce24b9ad0322a9e657805917 wmi-10.ebuild 1069
-MD5 14542bcab32f2ee3c25aeb3fecfa81cd ChangeLog 2148
-MD5 3113eb62900633d059d2bcbad0ef8f7e metadata.xml 343
-MD5 607f0418f6681898ac8da1fbe4e8b6e7 files/wmi.desktop 112
-MD5 f7f19525d1f04d7c2f698e824bca26b8 files/digest-wmi-9 57
+MD5 1e3c9ce6189ad51438fcb684f40b790b ChangeLog 2300
 MD5 1bc69f6a689f8553a641ce0309ac1311 files/digest-wmi-10 58
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCfiUr2G5bA0cA/ScRAo4tAJwIVTmbu0juTAAlwzdI47pUFfKsrgCbBBD4
-4P4sZwc/5REAu2/xeBs4Rjs=
-=vRm+
------END PGP SIGNATURE-----
+MD5 607f0418f6681898ac8da1fbe4e8b6e7 files/wmi.desktop 112
+MD5 384dcc3ab785c0f3c798da8ba631b2c1 metadata.xml 400
+MD5 bbabbe77ddf95ad7af959355877a9a2a wmi-10.ebuild 1413
diff --git a/x11-wm/wmi/files/digest-wmi-9 b/x11-wm/wmi/files/digest-wmi-9
deleted file mode 100644
index d77d3c127a35..000000000000
--- a/x11-wm/wmi/files/digest-wmi-9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 99d906845f2100b769d14845f5137784 wmi-9.tar.gz 181197
diff --git a/x11-wm/wmi/metadata.xml b/x11-wm/wmi/metadata.xml
index 6c6bde048f75..59dc6e2da413 100644
--- a/x11-wm/wmi/metadata.xml
+++ b/x11-wm/wmi/metadata.xml
@@ -2,8 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-  <email>john@milsson.nu</email>
-  <description>John Nilsson isn't Gentoo official developer but will help us maintain x11-wm/wmi ebuilds.</description>
+	<email>john@milsson.nu</email>
+	<description>John Nilsson isn't Gentoo official developer but will help us maintain x11-wm/wmi ebuilds.</description>
+</maintainer>
+<maintainer>
+	<email>tove@gentoo.org</email>
 </maintainer>
 <herd>desktop-wm</herd>
 </pkgmetadata>
diff --git a/x11-wm/wmi/wmi-10.ebuild b/x11-wm/wmi/wmi-10.ebuild
index 66bb9ef519d7..aa4e94d24a24 100644
--- a/x11-wm/wmi/wmi-10.ebuild
+++ b/x11-wm/wmi/wmi-10.ebuild
@@ -1,28 +1,43 @@
-# 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/wmi/wmi-10.ebuild,v 1.6 2005/05/08 14:40:55 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmi/wmi-10.ebuild,v 1.7 2006/01/22 13:05:30 tove Exp $
 
 DESCRIPTION="WMI is a new window manager for X11, which combines the best features of larswm, ion, evilwm and ratpoison into one window manager."
-SRC_URI="http://download.berlios.de/wmi/${P}.tar.gz"
-HOMEPAGE="http://wmi.modprobe.de/"
+SRC_URI="http://wmii.de/download/${P}.tar.gz"
+HOMEPAGE="http://wmii.de/"
 
 LICENSE="as-is"
-DEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libSM
+			x11-libs/libXft )
+		virtual/x11 )
 	dev-libs/expat
 	media-libs/fontconfig
 	media-libs/freetype"
 
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xproto
+			x11-libs/libXt )
+		virtual/x11 )"
+
 KEYWORDS="x86 ppc ~ppc-macos amd64"
 SLOT="0"
 IUSE=""
 
+pkg_setup() {
+	echo
+	einfo "wmi is outdated and not maintained, because upstream is"
+	einfo "convinced that wmi sucks (taken from homepage)."
+	einfo "Please try x11-wm/wmii. Hopefully wmii can replace wmi soon."
+	echo
+}
+
 src_compile() {
 	econf --with-slot-support --with-xft-support || die
 	emake || die
 }
 
 src_install () {
-	make install DESTDIR=${D} || die
+	make DESTDIR="${D}" install || die
 
 	dodoc AUTHORS BUGS CONTRIB COPYING ChangeLog FAQ INSTALL LICENSE.txt \
 		  NEWS README TODO
@@ -33,10 +48,10 @@ src_install () {
 	docinto examples/themes
 	dodoc examples/themes/*
 
-	echo -e "#!/bin/sh\n/usr/bin/wmi" > ${T}/wmi
+	echo -e "#!/bin/sh\n/usr/bin/wmi" > "${T}"/wmi
 	exeinto /etc/X11/Sessions
-	doexe ${T}/wmi
+	doexe "${T}"/wmi
 
 	insinto /usr/share/xsessions
-	doins ${FILESDIR}/wmi.desktop
+	doins "${FILESDIR}"/wmi.desktop
 }
diff --git a/x11-wm/wmi/wmi-9.ebuild b/x11-wm/wmi/wmi-9.ebuild
deleted file mode 100644
index c5f5c3d9ae95..000000000000
--- a/x11-wm/wmi/wmi-9.ebuild
+++ /dev/null
@@ -1,40 +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/wmi/wmi-9.ebuild,v 1.4 2005/02/20 20:00:29 slarti Exp $
-
-DESCRIPTION="WMI is a new window manager for X11, which combines the best features of larswm, ion, evilwm and ratpoison into one window manager."
-SRC_URI="http://download.berlios.de/wmi/${P}.tar.gz"
-HOMEPAGE="http://wmi.berlios.de/"
-LICENSE="as-is"
-DEPEND="virtual/x11
-	dev-libs/expat
-	media-libs/fontconfig
-	media-libs/freetype"
-KEYWORDS="x86 ppc"
-SLOT="0"
-IUSE=""
-
-src_compile() {
-	econf --with-slot-support --with-xft-support || die
-	emake || die
-}
-
-src_install () {
-	make install DESTDIR=${D} || die
-
-	dodoc AUTHORS BUGS CONTRIB COPYING ChangeLog FAQ INSTALL LICENSE.txt \
-		  NEWS README TODO
-
-	docinto examples
-	dodoc examples/*
-
-	docinto examples/themes
-	dodoc examples/themes/*
-
-	echo -e "#!/bin/sh\n/usr/bin/wmi" > ${T}/wmi
-	exeinto /etc/X11/Sessions
-	doexe ${T}/wmi
-
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/wmi.desktop
-}