Version bump.

(Portage version: 2.0.51.22-r2)

5 files changed, 107 insertions, 6 deletions

diff --git a/x11-wm/wmii/ChangeLog b/x11-wm/wmii/ChangeLog
index 87dd9f616143..d257f1f973b2 100644
--- a/x11-wm/wmii/ChangeLog
+++ b/x11-wm/wmii/ChangeLog
@@ -1,6 +1,12 @@
 # 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.8 2005/06/13 17:15:28 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.9 2005/08/12 15:36:22 tove Exp $
+
+*wmii-2 (12 Aug 2005)
+
+  12 Aug 2005; Torsten Veller <tove@gentoo.org> +files/wmii-2_050802.patch,
+  +wmii-2.ebuild:
+  New release.
 
 *wmii-1.1 (13 Jun 2005)
 
diff --git a/x11-wm/wmii/Manifest b/x11-wm/wmii/Manifest
index 80a96d326c80..c8e2ea9c6338 100644
--- a/x11-wm/wmii/Manifest
+++ b/x11-wm/wmii/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 d896cfa634061ec2eed018dc6265319f wmii-2.ebuild 1836
 MD5 c906c78fa9d92ca9ec155771808c81e7 wmii-1.1.ebuild 2014
-MD5 7b1a53f98d648a55652e3259027b84ec ChangeLog 1469
+MD5 e456ed27d589ace5b1a6d68cf57bd912 ChangeLog 1602
 MD5 f5ba35e50e57b9e6df75d700acc82da8 metadata.xml 700
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFCrb9LV3J2n04EauwRAnasAJ98812cLO2qNQmBM3+AWn095a9etgCgx9Ts
-JztTd+FDQCn5xet0rOBMnos=
-=F/bx
+iD8DBQFC/LmzV3J2n04EauwRAqOEAKCgU978yrHFcacRIfB6Izy0BDE33QCguptg
+2u87SQuGyaGakOVNLUFdfAs=
+=essO
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/wmii/files/digest-wmii-2 b/x11-wm/wmii/files/digest-wmii-2
new file mode 100644
index 000000000000..84bb2b3f6c1f
--- /dev/null
+++ b/x11-wm/wmii/files/digest-wmii-2
@@ -0,0 +1 @@
+MD5 de5e7838d76c4d52d49a223c6ecf4243 wmii-2.tar.bz2 67004
diff --git a/x11-wm/wmii/files/wmii-2_050802.patch b/x11-wm/wmii/files/wmii-2_050802.patch
new file mode 100644
index 000000000000..fc030168a162
--- /dev/null
+++ b/x11-wm/wmii/files/wmii-2_050802.patch
@@ -0,0 +1,24 @@
+diff -ur wmii-2-old/doc/welcome.txt wmii-2/doc/welcome.txt
+--- wmii-2-old/doc/welcome.txt	2005-08-02 19:45:34.713531024 +0200
++++ wmii-2/doc/welcome.txt	2005-08-02 21:41:06.215754752 +0200
+@@ -27,7 +27,7 @@
+ 
+ 4.  Create a new page with ctrl+mod1+y (pnew) and apply float layout to
+     it with mod1+shift+f (lfloat).
+-    To return to this page again, you can press ctrl+mod1+l (pnext).
++    To return to this page again, you can press mod1+h (pprev).
+ 
+ 5.  Experiment with your mouse a bit. Resize this client through clicking
+     left mouse button on a border and drag, move this client around
+diff -ur wmii-2-old/rc/keys wmii-2/rc/keys
+--- wmii-2-old/rc/keys	2005-08-02 19:45:34.711531442 +0200
++++ wmii-2/rc/keys	2005-08-02 19:46:08.264508742 +0200
+@@ -78,7 +78,7 @@
+ for i in 1 2 3 4 5 6 7 8 9; do
+     bind normal "$MODKEY+shift+$i" "wmira p $i"
+ done
+-bind normal "$MODKEY+0" "wmira p 10"
++bind normal "$MODKEY+shift+0" "wmira p 10"
+ bind normal "$MODKEY+shift+p" "wmira pager"
+ 
+ # activate normal mode:
diff --git a/x11-wm/wmii/wmii-2.ebuild b/x11-wm/wmii/wmii-2.ebuild
new file mode 100644
index 000000000000..626dcc4f0fa5
--- /dev/null
+++ b/x11-wm/wmii/wmii-2.ebuild
@@ -0,0 +1,67 @@
+# 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-2.ebuild,v 1.1 2005/08/12 15:36:22 tove Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="window manager improved 2 -- the next generation of the WMI project."
+HOMEPAGE="http://www.wmii.net"
+SRC_URI="http://wmi.modprobe.de/download/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="python"
+
+DEPEND="virtual/x11
+	python? ( dev-python/pyrex )"
+
+src_unpack() {
+	unpack "${A}"
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}_050802.patch"
+
+	sed -i \
+		-e "/^PREFIX/s/=.*/= \/usr/" \
+		-e "/^CONFPREFIX/s/=.*/= \/etc/" \
+		-e "/^CC/s/=.*/= $(tc-getCC)/" \
+		-e "/^AR/s/=.*/= $(tc-getAR) cr/" \
+		-e "/^RANLIB/s/=.*/= $(tc-getRANLIB)/" \
+		-e "/^CFLAGS/s/-O0/${CFLAGS}/" \
+		-e "/^LDFLAGS/s/-g /-g ${LDFLAGS} /" \
+		"${S}/config.mk" || die "sed failed."
+}
+
+src_compile() {
+	emake || 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}" install || die "make install failed."
+
+	dodoc ANNOUNCE || die "ANNOUNCE failed." # only in releases
+	dodoc CHANGES README LICENSE doc/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 || 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."
+}