Removed old version. Added support for modular X.

(Portage version: 2.1_pre3-r1)

6 files changed, 24 insertions, 104 deletions

diff --git a/x11-wm/wmii/ChangeLog b/x11-wm/wmii/ChangeLog
index d257f1f973b2..0dc8ce8379cd 100644
--- a/x11-wm/wmii/ChangeLog
+++ b/x11-wm/wmii/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/wmii
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.9 2005/08/12 15:36:22 tove Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.10 2006/01/24 09:13:59 tove Exp $
+
+  24 Jan 2006; Torsten Veller <tove@gentoo.org> -wmii-1.1.ebuild,
+  wmii-2.ebuild:
+  Removed old version. Added support for modular X.
 
 *wmii-2 (12 Aug 2005)
 
diff --git a/x11-wm/wmii/Manifest b/x11-wm/wmii/Manifest
index f3d2a5ea4752..20b1f903c02e 100644
--- a/x11-wm/wmii/Manifest
+++ b/x11-wm/wmii/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e9b2543eae6cd285b417bc03913b05dc wmii-2.ebuild 1834
-MD5 c906c78fa9d92ca9ec155771808c81e7 wmii-1.1.ebuild 2014
-MD5 1ea7b6c1aa6c71f82cca43f16880f9d0 ChangeLog 1602
-MD5 f5ba35e50e57b9e6df75d700acc82da8 metadata.xml 700
+MD5 d8a6ab603f5896afbb9086f884aab87b ChangeLog 1738
+MD5 6a5eddc0d9589e3314ac6414d7f9e018 files/digest-wmii-2 58
 MD5 ee68e1c5bc21e7124f02324bda993263 files/wmii-2_050802.patch 1015
-MD5 080701816705482fee573518bbe73bec files/digest-wmii-1.1 60
 MD5 48b2aadadc04fa539467a05f3afa031e files/wmii.desktop 174
-MD5 6a5eddc0d9589e3314ac6414d7f9e018 files/digest-wmii-2 58
+MD5 2e828c8a6e769ee7109242019d989499 metadata.xml 670
+MD5 8fb3ff654215b3cd7d328e43282f7427 wmii-2.ebuild 1665
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC/MIQV3J2n04EauwRAiraAJ0RwW8SnlhjG33Skd3JggYur2cQdACgl3Hq
-NeY+RMzYhXPqvder57Kcq+w=
-=VjPO
+iD8DBQFD1e+FV3J2n04EauwRAhkHAJ9BpwkIUdIX1dzAiUXGanQBEwgtdwCghj12
+UTxMYC/pcyZlWy2/CxnY0Mk=
+=391t
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/wmii/files/digest-wmii-1.1 b/x11-wm/wmii/files/digest-wmii-1.1
deleted file mode 100644
index 27233f4d5273..000000000000
--- a/x11-wm/wmii/files/digest-wmii-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8ad9da67501b2d85745ff472466be57c wmii-1.1.tar.bz2 70191
diff --git a/x11-wm/wmii/metadata.xml b/x11-wm/wmii/metadata.xml
index 656eca82f6b3..caa4e2bfa633 100644
--- a/x11-wm/wmii/metadata.xml
+++ b/x11-wm/wmii/metadata.xml
@@ -7,12 +7,12 @@
 		<name>Torsten Veller</name>
 	</maintainer>
 	<longdescription lang="en">
-		wmii is a highly customizable keyboard- and mouse-driven X11 window
-		manager which supports conventional, tabbed and tiled window management
-		with low memory usage and a vi-alike user interaction. Due to a complete
-		rewrite it is highly modularized and uses a new configuration and
-		inter-process communication interface which is oriented on the 9p
-		protocol of the plan9 operating system.
+		wmii is a dynamic window manager for X11. It is highly customizable and
+		usable with keyboard and mouse. It supports conventional, tabbed and
+		tiled window management and has a small memory footprint. It is highly
+		modularized and uses an inter-process communication interface which
+		conforms to the 9P2000 protocol introduced by the Plan 9 operating
+		system.
 	</longdescription>
 </pkgmetadata>
 
diff --git a/x11-wm/wmii/wmii-1.1.ebuild b/x11-wm/wmii/wmii-1.1.ebuild
deleted file mode 100644
index 30d3dcaf6e93..000000000000
--- a/x11-wm/wmii/wmii-1.1.ebuild
+++ /dev/null
@@ -1,76 +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/wmii/wmii-1.1.ebuild,v 1.1 2005/06/13 17:15:28 tove Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="window manager improved 2 -- the next generation of the WMI project."
-HOMEPAGE="http://wmi.modprobe.de/index.php/WMII/Overview"
-SRC_URI="http://wmi.modprobe.de/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-#IUSE="python cairo"
-IUSE="python"
-
-DEPEND=">=sys-apps/sed-4
-	${RDEPEND}"
-RDEPEND="virtual/x11
-	python? ( dev-python/pyrex )"
-#	cairo? ( >=x11-libs/cairo-0.3
-#		>=media-libs/freetype-2 )"
-
-src_unpack() {
-	unpack "${A}"
-
-	sed -i \
-		-e "/^CFLAGS/ s/-O0/${CFLAGS}/" \
-		-e "/^LDFLAGS/ s/-g/-g ${LDFLAGS}/" \
-		"${S}"/config.mk
-
-# removed because cairo backend crashes much too often
-#	if useq cairo; then
-#		sed -i \
-#			-e "/^#DRAW/,/^#CAIROINC/ s/^#//" \
-#			"${S}"/config.mk
-#	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		AR="$(tc-getAR) cr" \
-		RANLIB="$(tc-getRANLIB)" \
-		CONFPREFIX=/etc || die "emake failed"
-
-	if useq python ; then
-		cd "${S}"/libixp/python
-		python setup.py build || die "python build failed."
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" \
-		AR="$(tc-getAR) cr" \
-		RANLIB="$(tc-getRANLIB)" \
-		PREFIX=/usr \
-		CONFPREFIX=/etc install || die "make install failed."
-	dodoc ANNOUNCE CHANGES README LICENSE docs/welcome.txt || die "dodoc failed."
-
-	if useq python ; then
-		cd "${S}"/libixp/python
-		python setup.py install --root="${D}" || die "python install failed."
-	fi
-
-	insinto /usr/share/"${PN}"/contrib
-	doins "${S}"/contrib/README || die "contrib README failed."
-	exeinto /usr/share/"${PN}"/contrib
-	doexe "${S}"/contrib/*.{py,rb,sh} || die "contrib failed."
-
-	echo -e "#!/bin/sh\n/usr/bin/wmii" > "${T}"/"${PN}"
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/"${PN}" || die "/etc/X11/Sessions failed."
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/"${PN}".desktop || die "${PN}.desktop failed."
-}
diff --git a/x11-wm/wmii/wmii-2.ebuild b/x11-wm/wmii/wmii-2.ebuild
index 626dcc4f0fa5..f44c5ba5f0e5 100644
--- a/x11-wm/wmii/wmii-2.ebuild
+++ b/x11-wm/wmii/wmii-2.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/wmii/wmii-2.ebuild,v 1.1 2005/08/12 15:36:22 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-2.ebuild,v 1.2 2006/01/24 09:13:59 tove Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="python"
 
-DEPEND="virtual/x11
+DEPEND="|| ( x11-libs/libX11 virtual/x11 )
 	python? ( dev-python/pyrex )"
 
 src_unpack() {
@@ -36,7 +36,7 @@ src_unpack() {
 src_compile() {
 	emake || die "emake failed"
 
-	if useq python ; then
+	if use python ; then
 		cd "${S}"/libixp/python
 		python setup.py build || die "python build failed."
 	fi
@@ -48,16 +48,11 @@ src_install() {
 	dodoc ANNOUNCE || die "ANNOUNCE failed." # only in releases
 	dodoc CHANGES README LICENSE doc/welcome.txt || die "dodoc failed."
 
-	if useq python ; then
+	if use python ; then
 		cd "${S}"/libixp/python
 		python setup.py install --root="${D}" || die "python install failed."
 	fi
 
-#	insinto /usr/share/"${PN}"/contrib
-#	doins "${S}"/contrib/README || die "contrib README failed."
-#	exeinto /usr/share/"${PN}"/contrib
-#	doexe "${S}"/contrib/*.py || die "contrib failed."
-
 	echo -e "#!/bin/sh\n/usr/bin/wmii" > "${T}/${PN}"
 	exeinto /etc/X11/Sessions
 	doexe "${T}/${PN}" || die "/etc/X11/Sessions failed."