Initial commit. Ebuild by Nico Wohlgemuth.

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-hh1 i686)

6 files changed, 175 insertions, 0 deletions

diff --git a/x11-wm/echinus/ChangeLog b/x11-wm/echinus/ChangeLog
new file mode 100644
index 000000000000..22b4f3fa6bf2
--- /dev/null
+++ b/x11-wm/echinus/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for x11-wm/echinus
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/echinus/ChangeLog,v 1.1 2008/08/22 23:20:32 yngwin Exp $
+
+*echinus-0.3.1 (22 Aug 2008)
+
+  22 Aug 2008; Ben de Groot <yngwin@gentoo.org>
+  +files/echinus-0.3.1-modkey.patch, +files/echinus.desktop, +metadata.xml,
+  +echinus-0.3.1.ebuild:
+  Initial commit. Ebuild by Nico Wohlgemuth.
+
diff --git a/x11-wm/echinus/Manifest b/x11-wm/echinus/Manifest
new file mode 100644
index 000000000000..8ea7c649d8b2
--- /dev/null
+++ b/x11-wm/echinus/Manifest
@@ -0,0 +1,6 @@
+AUX echinus-0.3.1-modkey.patch 2227 RMD160 929f100e7387b925084e50e4d1fc353a3f6cb4d1 SHA1 07c1d4fa14207b29bd3d997de3aa792ad29d8779 SHA256 c0861a8736f5621b6756132d6b6f5f087b8776299e98313e5fb37f3373f0c6ab
+AUX echinus.desktop 115 RMD160 60e9884de00f5c4ca45498aaf2cc54a369b00399 SHA1 0442a39f67c06cdb6ce3b774977490166255a8b4 SHA256 53388f1c2c9078e4f91e2c0e5de50a5c9802fa1f943cdcb01bf639a40261e480
+DIST echinus-0.3.1.tar.gz 26905 RMD160 58e9db859ff7b3ade7e0c60ea795639b8bbe60c3 SHA1 d409c9970a3833b44ecc38ff27d2538b56ab7853 SHA256 f609a53cb81c28d7197fede748ab459b8f96a4d24479c9e28a0c5041b1af2fa3
+EBUILD echinus-0.3.1.ebuild 1816 RMD160 5fdac1f0011a54ac1aef87e6ff7521ef94c1a7e2 SHA1 09cb9ef2c26bcef74d21a1fe42dae966d6d6a887 SHA256 db8d8cdf2aefc25fdbdb8c40d023b286213cf0c4dbad46d5c590b599be1c53d1
+MISC ChangeLog 340 RMD160 fe7658ab8334c08e5000ee86ba01417e21970c9f SHA1 fe695fe3f750efab85c68c8a12b1f7175afa216d SHA256 0c9eb6e36e5c4f5cb2780c65f9f163b818cab008c8d222c280a1d381145b8696
+MISC metadata.xml 333 RMD160 c7ad0362f29d09ef38f276276ed1d1a2ea9e1ecd SHA1 65c19736bdf80795ace96422c6d6878f564a8b76 SHA256 330a9fb4d9ca576c81df34f3cf234b98479f63e7e794a846f43b3d03b69b50f3
diff --git a/x11-wm/echinus/echinus-0.3.1.ebuild b/x11-wm/echinus/echinus-0.3.1.ebuild
new file mode 100644
index 000000000000..8620bfe818e8
--- /dev/null
+++ b/x11-wm/echinus/echinus-0.3.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/echinus/echinus-0.3.1.ebuild,v 1.1 2008/08/22 23:20:32 yngwin Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A window manager for X in the spirit of dwm"
+HOMEPAGE="http://www.rootshell.be/~polachok/code/"
+SRC_URI="http://www.rootshell.be/~polachok/code/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXft"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e "s/CFLAGS = -Os/CFLAGS += -g/" \
+		-e "s/LDFLAGS = -s/LDFLAGS += -g/" \
+		config.mk || die "sed failed"
+
+	epatch "${FILESDIR}"/"${P}"-modkey.patch
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+
+	doman ${PN}.1
+	dodoc README
+}
+
+pkg_postinst() {
+	if ! has_version x11-misc/dmenu; then
+		elog "Installing ${PN} without x11-misc/dmenu"
+		elog "To have a menu you can install x11-misc/dmenu"
+		elog "and use \"Echinus*spawn\" in echinusrc"
+		elog "to launch dmenu_run. Check echinus documentation for details."
+		elog ""
+	fi
+	# x11-misc/ourico is not in portage atm, this will change soon.
+	#if ! has_version x11-misc/ourico; then
+	#	elog "Installing ${PN} without x11-misc/ourico"
+	#	elog "To have a taskbar you can install x11-misc/ourico"
+	#	elog ""
+	#fi
+	elog "A standard config file with its pixmaps has been installed to:"
+	elog "${PREFIX}/usr/share/examples/${PN}/"
+	elog "Copy this folder to ~/.${PN}/ and modify the echinusrc as you wish."
+	elog ""
+	elog "For changing the modkey you can use \"Echinus*modkey: X\""
+	elog "in echinusrc. Replace the X with the number you want to use,"
+	elog "1 is for Mod1Mask, 2 for Mod2Mask and so on."
+}
diff --git a/x11-wm/echinus/files/echinus-0.3.1-modkey.patch b/x11-wm/echinus/files/echinus-0.3.1-modkey.patch
new file mode 100644
index 000000000000..2b1c9781ac8b
--- /dev/null
+++ b/x11-wm/echinus/files/echinus-0.3.1-modkey.patch
@@ -0,0 +1,73 @@
+diff -r ffa4f6eba0b2 echinus.c
+--- a/echinus.c	Tue Aug 19 22:53:23 2008 +0400
++++ b/echinus.c	Wed Aug 20 03:20:40 2008 +0200
+@@ -276,6 +276,7 @@
+ int nrules = 0;
+ Bool dectiled = 0;
+ Bool hidebastards = 0;
++unsigned int modkey = 0;
+ /* configuration, allows nested code to access above variables */
+ #include "config.h"
+ #include "ewmh.c"
+@@ -488,7 +489,7 @@
+         focus(c);
+         restack();
+         XAllowEvents(dpy, ReplayPointer, CurrentTime);
+-        if(CLEANMASK(ev->state) != MODKEY)
++        if(CLEANMASK(ev->state) != modkey)
+            return;
+         if(ev->button == Button1) {
+                 if((layouts[ltidxs[curtag]].arrange == floating) || c->isfloating)
+@@ -959,8 +960,8 @@
+ void
+ grabbuttons(Client *c, Bool focused) {
+     unsigned int Buttons[] = {Button1, Button2, Button3};            
+-    unsigned int Modifiers[] = {MODKEY, MODKEY|LockMask,
+-               MODKEY|numlockmask, MODKEY|numlockmask|LockMask};                                                                                              
++    unsigned int Modifiers[] = {modkey, modkey|LockMask,
++               modkey|numlockmask, modkey|numlockmask|LockMask};                                                                                              
+     int i, j;   
+     XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+ 
+@@ -1779,6 +1780,30 @@
+         xrdb = XrmGetFileDatabase("echinusrc");
+         if(!xrdb)
+             eprint("echinus: cannot open configuration file\n");
++
++	/* init modkey */
++		char* key;
++		if(!(key = getresource("modkey", NULL)))
++			modkey = MODKEY;
++		else {
++			switch(atoi(key)) {
++				case 1:
++					modkey = Mod1Mask;
++					break;
++				case 2:
++					modkey = Mod2Mask;
++					break;
++				case 3:
++					modkey = Mod3Mask;
++					break;
++				case 4:
++					modkey = Mod4Mask;
++					break;
++				default:
++					modkey = MODKEY;
++					break;
++			}
++		}	
+ 
+ 	/* init tags */
+         inittags();
+diff -r ffa4f6eba0b2 echinusrc
+--- a/echinusrc	Tue Aug 19 22:53:23 2008 +0400
++++ b/echinusrc	Wed Aug 20 03:20:40 2008 +0200
+@@ -41,6 +41,7 @@
+ Echinus*tags.layout1: m
+ Echinus*tags.layout3: b
+ 
++Echinus*modkey: 1
+ Echinus*togglestruts: A + b
+ Echinus*focusnext: A + j
+ Echinus*focusprev: A + k
diff --git a/x11-wm/echinus/files/echinus.desktop b/x11-wm/echinus/files/echinus.desktop
new file mode 100644
index 000000000000..4ddcc10a535b
--- /dev/null
+++ b/x11-wm/echinus/files/echinus.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=echinus
+Comment=echinus wm
+Exec=echinus
+TryExec=echinus
+Icon=
+Type=Application
diff --git a/x11-wm/echinus/metadata.xml b/x11-wm/echinus/metadata.xml
new file mode 100644
index 000000000000..a0a98dec9500
--- /dev/null
+++ b/x11-wm/echinus/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>nico@lifeisabug.com</email>
+		<name>Nico R. Wohlgemuth</name>
+		<description>maintainer by proxy yngwin@gentoo.org</description>
+	</maintainer>
+</pkgmetadata>