Version bump. (bug #165800)

(Portage version: 2.1.2-r9)

7 files changed, 18 insertions, 122 deletions

diff --git a/x11-wm/wmii/ChangeLog b/x11-wm/wmii/ChangeLog
index e2d64c1d0a51..2b736bc5cfa2 100644
--- a/x11-wm/wmii/ChangeLog
+++ b/x11-wm/wmii/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/wmii
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.17 2007/01/30 23:08:01 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.18 2007/02/09 02:29:06 omp Exp $
+
+*wmii-3.6_rc2 (09 Feb 2007)
+
+  09 Feb 2007; David Shakaryan <omp@gentoo.org>
+  -files/wmii-20070116-WMState.patch, +wmii-3.6_rc2.ebuild,
+  -wmii-20070116.ebuild, -wmii-20070116-r1.ebuild:
+  Version bump. (bug #165800)
 
 *wmii-20070116-r1 (30 Jan 2007)
 
diff --git a/x11-wm/wmii/files/digest-wmii-20070116 b/x11-wm/wmii/files/digest-wmii-20070116
deleted file mode 100644
index 254c5338efbd..000000000000
--- a/x11-wm/wmii/files/digest-wmii-20070116
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 47ee52f434bb2921124da2773deabc7a wmii-20070116.tar.gz 41957
-RMD160 f7d1607e66ff9d8a6de4f93638a724331d772f9e wmii-20070116.tar.gz 41957
-SHA256 5f28c93b7dc3cc4bdecc4fe3f180b00da8739ac65fd1f1c9ec560f43c7cfbe14 wmii-20070116.tar.gz 41957
diff --git a/x11-wm/wmii/files/digest-wmii-20070116-r1 b/x11-wm/wmii/files/digest-wmii-20070116-r1
deleted file mode 100644
index 254c5338efbd..000000000000
--- a/x11-wm/wmii/files/digest-wmii-20070116-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 47ee52f434bb2921124da2773deabc7a wmii-20070116.tar.gz 41957
-RMD160 f7d1607e66ff9d8a6de4f93638a724331d772f9e wmii-20070116.tar.gz 41957
-SHA256 5f28c93b7dc3cc4bdecc4fe3f180b00da8739ac65fd1f1c9ec560f43c7cfbe14 wmii-20070116.tar.gz 41957
diff --git a/x11-wm/wmii/files/digest-wmii-3.6_rc2 b/x11-wm/wmii/files/digest-wmii-3.6_rc2
new file mode 100644
index 000000000000..e91168401f00
--- /dev/null
+++ b/x11-wm/wmii/files/digest-wmii-3.6_rc2
@@ -0,0 +1,3 @@
+MD5 9c9945385be9d9e8edb30d4ba10f4704 wmii-3.6-rc2.tar.gz 42890
+RMD160 3934edf33cbdc7ac3c1dc05e5edc8f33f96d1360 wmii-3.6-rc2.tar.gz 42890
+SHA256 603b0eba443d1db6aeb577f6c1e89ff29cf3d9c8e62f33071ecb6206063c47f0 wmii-3.6-rc2.tar.gz 42890
diff --git a/x11-wm/wmii/files/wmii-20070116-WMState.patch b/x11-wm/wmii/files/wmii-20070116-WMState.patch
deleted file mode 100644
index 48def7cdcc03..000000000000
--- a/x11-wm/wmii/files/wmii-20070116-WMState.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -uN wmii-3.5.1.old/client.c wmii-3.5.1/client.c
---- wmii-3.5.1.old/client.c	2007-01-30 14:49:04.000000000 -0800
-+++ wmii-3.5.1/client.c	2007-01-30 14:54:05.000000000 -0800
-@@ -125,6 +125,14 @@
- }
- 
- void
-+set_client_state(Client * c, int state)
-+{
-+    long data[] = { state, None };
-+    XChangeProperty(blz.dpy, c->win, wm_atom[WMState], wm_atom[WMState], 32,
-+            PropModeReplace, (unsigned char *) data, 2);
-+}
-+
-+void
- update_client_grab(Client *c, Bool is_sel) {
- 	if(is_sel) {
- 		ungrab_mouse(c->framewin, AnyModifier, AnyButton);
-@@ -187,7 +195,8 @@
- map_client(Client *c) {
- 	XSelectInput(blz.dpy, c->win, CLIENT_MASK & ~StructureNotifyMask);
- 	XMapWindow(blz.dpy, c->win);
--	XSelectInput(blz.dpy, c->win, CLIENT_MASK);
-+    XSelectInput(blz.dpy, c->win, CLIENT_MASK);
-+	set_client_state(c, NormalState);
- }
- 
- void
-@@ -195,6 +204,7 @@
- 	XSelectInput(blz.dpy, c->win, CLIENT_MASK & ~StructureNotifyMask);
- 	XUnmapWindow(blz.dpy, c->win);
- 	XSelectInput(blz.dpy, c->win, CLIENT_MASK);
-+    set_client_state(c, WithdrawnState);
- }
- 
- void
-diff -uN wmii-3.5.1.old/main.c wmii-3.5.1/main.c
---- wmii-3.5.1.old/main.c	2007-01-30 14:49:04.000000000 -0800
-+++ wmii-3.5.1/main.c	2007-01-30 14:54:05.000000000 -0800
-@@ -91,6 +91,7 @@
- 
- static void
- init_atoms() {
-+    wm_atom[WMState] = XInternAtom(blz.dpy, "WM_STATE", False);
- 	wm_atom[WMProtocols] = XInternAtom(blz.dpy, "WM_PROTOCOLS", False);
- 	wm_atom[WMDelete] = XInternAtom(blz.dpy, "WM_DELETE_WINDOW", False);
- 	net_atom[NetSupported] = XInternAtom(blz.dpy, "_NET_SUPPORTED", False);
-Common subdirectories: wmii-3.5.1.old/rc and wmii-3.5.1/rc
-diff -uN wmii-3.5.1.old/wmii.h wmii-3.5.1/wmii.h
---- wmii-3.5.1.old/wmii.h	2007-01-30 14:49:04.000000000 -0800
-+++ wmii-3.5.1/wmii.h	2007-01-30 14:54:05.000000000 -0800
-@@ -67,7 +67,7 @@
- };
- 
- /* WM atoms */
--enum { WMProtocols, WMDelete, WMLast };
-+enum { WMState, WMProtocols, WMDelete, WMLast };
- 
- /* NET atoms */
- enum { NetSupported, NetWMName, NetLast };
diff --git a/x11-wm/wmii/wmii-20070116-r1.ebuild b/x11-wm/wmii/wmii-20070116-r1.ebuild
deleted file mode 100644
index f5a1fff89a4b..000000000000
--- a/x11-wm/wmii/wmii-20070116-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-20070116-r1.ebuild,v 1.1 2007/01/30 23:08:01 omp Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A dynamic window manager for X11"
-HOMEPAGE="http://wmii.suckless.org/"
-SRC_URI="http://suckless.org/snaps/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/libixp
-	x11-libs/libX11"
-RDEPEND="${DEPEND}
-	x11-misc/dmenu"
-
-S=${WORKDIR}/${PN}-3.5.1
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-WMState.patch"
-
-	sed -i \
-		-e "/^PREFIX/s|=.*|= /usr|" \
-		-e "/^CONFPREFIX/s|=.*|= /etc|" \
-		-e "/^X11INC/s|=.*|= /usr/include|" \
-		-e "/^X11LIB/s|=.*|= /usr/lib|" \
-		-e "/^CFLAGS/s|= -Os|+=|" \
-		-e "/^LDFLAGS/s|=|+=|" \
-		-e "/^CC/s|=.*|= $(tc-getCC)|" \
-		config.mk || die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc LICENSE
-
-	echo -e "#!/bin/sh\n/usr/bin/wmii" > "${T}/${PN}"
-	exeinto /etc/X11/Sessions
-	doexe "${T}/${PN}"
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-}
diff --git a/x11-wm/wmii/wmii-20070116.ebuild b/x11-wm/wmii/wmii-3.6_rc2.ebuild
index 546e77ec05ba..68a6f60c9c38 100644
--- a/x11-wm/wmii/wmii-20070116.ebuild
+++ b/x11-wm/wmii/wmii-3.6_rc2.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-20070116.ebuild,v 1.1 2007/01/30 07:11:45 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-3.6_rc2.ebuild,v 1.1 2007/02/09 02:29:06 omp Exp $
 
 inherit toolchain-funcs
 
+MY_P=${P/_/-}
+
 DESCRIPTION="A dynamic window manager for X11"
 HOMEPAGE="http://wmii.suckless.org/"
-SRC_URI="http://suckless.org/snaps/${P}.tar.gz"
+SRC_URI="http://suckless.org/download/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -18,7 +20,7 @@ DEPEND="sys-libs/libixp
 RDEPEND="${DEPEND}
 	x11-misc/dmenu"
 
-S=${WORKDIR}/${PN}-3.5.1
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
@@ -29,7 +31,7 @@ src_unpack() {
 		-e "/^CONFPREFIX/s|=.*|= /etc|" \
 		-e "/^X11INC/s|=.*|= /usr/include|" \
 		-e "/^X11LIB/s|=.*|= /usr/lib|" \
-		-e "/^CFLAGS/s|= -Os|+=|" \
+		-e "/^CFLAGS/s|=|+=|" \
 		-e "/^LDFLAGS/s|=|+=|" \
 		-e "/^CC/s|=.*|= $(tc-getCC)|" \
 		config.mk || die "sed failed"
@@ -37,7 +39,7 @@ src_unpack() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc LICENSE
+	dodoc README
 
 	echo -e "#!/bin/sh\n/usr/bin/wmii" > "${T}/${PN}"
 	exeinto /etc/X11/Sessions