[gentoo-commits] dev/xarthisius:master commit in: x11-wm/i3/files/, x11-wm/i3/

[Kacper Kowalik]

commit:     32390da4ad4458255f55cc1a77d4b7e3544af1b1
Author:     Kacper Kowalik (Xarthisius) <xarthisius.kk <AT> gmail <DOT> com>
AuthorDate: Tue Jul 12 13:02:58 2011 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 13:02:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xarthisius.git;a=commit;h=32390da4

[x11-wm/i3] initial import

---
 x11-wm/i3/ChangeLog            |   12 +++
 x11-wm/i3/Manifest             |    5 +
 x11-wm/i3/files/i3-gentoo.diff |  175 ++++++++++++++++++++++++++++++++++++++++
 x11-wm/i3/i3-3e_p3.ebuild      |   52 ++++++++++++
 x11-wm/i3/metadata.xml         |    9 ++
 5 files changed, 253 insertions(+), 0 deletions(-)

diff --git a/x11-wm/i3/ChangeLog b/x11-wm/i3/ChangeLog
new file mode 100644
index 0000000..19dd417
--- /dev/null
+++ b/x11-wm/i3/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for x11-wm/i3
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*i3-3e_p3 (12 Jul 2011)
+
+  12 Jul 2011; Kacper Kowalik <xarthisius@g.o> +files/i3-gentoo.diff,
+  +i3-3e_p3.ebuild, +metadata.xml:
+  Initial import. Ebuild based on extensive work done by Ondrej Sukup (mimi_vx)
+  <mimi.vx@×××××.com> and Andre-Patrick Bubel (moredread) <code@×××××××××××.de>
+  in sunrise overlay. Fixes bug 267476
+

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
new file mode 100644
index 0000000..c94ff7e
--- /dev/null
+++ b/x11-wm/i3/Manifest
@@ -0,0 +1,5 @@
+AUX i3-gentoo.diff 5219 RMD160 d592d6e12f1983be50a78d43a65c1380f5366413 SHA1 8899a886209d30c21ab5f81f82f9e6a5fe487371 SHA256 a21e3f877eab4c2068f0fa7447765aa642cdf8a7756e495ef947da5118787897
+DIST i3-3.e-bf3.tar.bz2 360704 RMD160 858d92020e251b3afd34bcb0008d7ccc25d04669 SHA1 7c35f49fa14a21b606bb102b41c5f0cead4e93a3 SHA256 e0a7b030ebbad0ebf2ac39f235dd5e0ad34ef0ff5b83e31501a361f92e85c68f
+EBUILD i3-3e_p3.ebuild 1047 RMD160 66f5d82c72f8652fcf5dadb3446f1a9a27320f12 SHA1 e422b3ceae77a9dffe78d7c2ab7ab0948fb1a4fe SHA256 69bdfdbd358c00ec7acf5063eb95ac9a312dbe7f3f58aa372ad1c9b44ce6131f
+MISC ChangeLog 447 RMD160 11d52d06f1284551e81fdd37b7a440ad77293686 SHA1 f14f7bcd751a4eecf360b72f99925c37afe67f3f SHA256 198aae02cb97f465b5e5e76969fc6f301a2f5fe7d4097e3f110aa21db32f05f3
+MISC metadata.xml 262 RMD160 5fa004a3927201d509adf4583c80fcea57d845cb SHA1 7d07024bbe476df939b23a4552ec9a403ec8fff7 SHA256 9efce27cc1c3955b252cc5b7272629cd5b66260849fd9e5a5fae9e420a1829d9

diff --git a/x11-wm/i3/files/i3-gentoo.diff b/x11-wm/i3/files/i3-gentoo.diff
new file mode 100644
index 0000000..003707e
--- /dev/null
+++ b/x11-wm/i3/files/i3-gentoo.diff
@@ -0,0 +1,175 @@
+--- common.mk
++++ common.mk
+@@ -1,5 +1,5 @@
+ UNAME=$(shell uname)
+-DEBUG=1
++DEBUG=0
+ INSTALL=install
+ PREFIX=/usr
+ ifeq ($(PREFIX),/usr)
+@@ -17,8 +17,7 @@
+ # We don’t want unused-parameter because of the use of many callbacks
+ CFLAGS += -Wunused-value
+ CFLAGS += -Iinclude
+-CFLAGS += -I/usr/local/include
+-CFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
++CPPFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
+ 
+ # Check if pkg-config is installed, because without pkg-config, the following
+ # check for the version of libxcb cannot be done.
+@@ -33,27 +32,17 @@
+ ifeq ($(shell pkg-config --exact-version=0.3.3 xcb-keysyms && echo 1),1)
+ # xcb-keysyms fixed API from 0.3.3 to 0.3.4, so for some months, we will
+ # have this here. Distributions should upgrade their libxcb in the meantime.
+-CFLAGS += -DOLD_XCB_KEYSYMS_API
++CPPFLAGS += -DOLD_XCB_KEYSYMS_API
+ endif
+ 
+-LDFLAGS += -lm
+-LDFLAGS += -lxcb-keysyms
+ ifeq ($(shell pkg-config --exists xcb-util || echo 1),1)
+-CFLAGS += -DXCB_COMPAT
+-LDFLAGS += -lxcb-atom
+-LDFLAGS += -lxcb-aux
+-LDFLAGS += -lxcb-event
++CPPFLAGS += -DXCB_COMPAT
++LIBS += -lxcb-atom -lxcb-aux -lxcb-event
+ else
+-LDFLAGS += -lxcb-util
++LIBS += $(shell pkg-config --libs xcb-util)
+ endif
+-LDFLAGS += -lxcb-icccm
+-LDFLAGS += -lxcb-xinerama
+-LDFLAGS += -lxcb-randr
+-LDFLAGS += -lxcb
+-LDFLAGS += -lyajl
+-LDFLAGS += -lX11
+-LDFLAGS += -lev
+-LDFLAGS += -L/usr/local/lib -L/usr/pkg/lib
++LIBS += $(shell pkg-config --libs xcb-keysyms xcb-icccm xcb-xinerama xcb-randr xcb x11)
++LIBS += -lyajl -lev -lm
+ 
+ ifeq ($(UNAME),NetBSD)
+ # We need -idirafter instead of -I to prefer the system’s iconv over GNU libiconv
+@@ -63,12 +52,12 @@
+ 
+ ifeq ($(UNAME),OpenBSD)
+ CFLAGS += -I${X11BASE}/include
+-LDFLAGS += -liconv
++LIBS += -liconv
+ LDFLAGS += -L${X11BASE}/lib
+ endif
+ 
+ ifeq ($(UNAME),FreeBSD)
+-LDFLAGS += -liconv
++LIBS += -liconv
+ endif
+ 
+ # Fallback for libyajl 1 which did not include yajl_version.h. We need
+@@ -76,20 +65,15 @@
+ CFLAGS += -idirafter yajl-fallback
+ 
+ ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
+-CFLAGS += -D_GNU_SOURCE
++CPPFLAGS += -D_GNU_SOURCE
+ endif
+ 
+ ifeq ($(DEBUG),1)
+ # Extended debugging flags, macros shall be available in gcc
+ CFLAGS += -gdwarf-2
+ CFLAGS += -g3
+-else
+-CFLAGS += -O2
+ endif
+ 
+-# Don’t print command lines which are run
+-.SILENT:
+-
+ # Always remake the following targets
+ .PHONY: install clean dist distclean
+ 
+--- Makefile
++++ Makefile
+@@ -20,20 +20,14 @@
+ 
+ # Depend on the specific file (.c for each .o) and on all headers
+ src/%.o: src/%.c ${HEADERS}
+-	echo "CC $<"
+-	$(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/$(shell basename $< .c)/ { print NR }' loglevels.tmp))" -c -o $@ $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/$(shell basename $< .c)/ { print NR }' loglevels.tmp))" -c -o $@ $<
+ 
+ all: src/cfgparse.y.o src/cfgparse.yy.o ${FILES}
+-	echo "LINK i3"
+-	$(CC) -o i3 ${FILES} src/cfgparse.y.o src/cfgparse.yy.o $(LDFLAGS)
+-	echo ""
+-	echo "SUBDIR i3-msg"
++	$(CC) $(LDFLAGS) -o i3 ${FILES} src/cfgparse.y.o src/cfgparse.yy.o $(LIBS)
+ 	$(MAKE) TOPDIR=$(TOPDIR) -C i3-msg
+-	echo "SUBDIR i3-input"
+ 	$(MAKE) TOPDIR=$(TOPDIR) -C i3-input
+ 
+ loglevels.h:
+-	echo "LOGLEVELS"
+ 	for file in $$(ls src/*.c src/*.y src/*.l | grep -v 'cfgparse.\(tab\|yy\).c'); \
+ 	do \
+ 		echo $$(basename $$file .c); \
+@@ -45,17 +39,14 @@
+ 	echo "};") > include/loglevels.h;
+ 
+ src/cfgparse.yy.o: src/cfgparse.l src/cfgparse.y.o ${HEADERS}
+-	echo "LEX $<"
+ 	flex -i -o$(@:.o=.c) $<
+-	$(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c)
++	$(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c)
+ 
+ src/cfgparse.y.o: src/cfgparse.y ${HEADERS}
+-	echo "YACC $<"
+ 	bison --debug --verbose -b $(basename $< .y) -d $<
+-	$(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.y/ { print NR }' loglevels.tmp))" -c -o $@ $(<:.y=.tab.c)
++	$(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.y/ { print NR }' loglevels.tmp))" -c -o $@ $(<:.y=.tab.c)
+ 
+ install: all
+-	echo "INSTALL"
+ 	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
+ 	$(INSTALL) -d -m 0755 $(DESTDIR)$(SYSCONFDIR)/i3
+ 	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/include/i3
+--- i3-msg/Makefile
++++ i3-msg/Makefile
+@@ -11,15 +11,12 @@
+ 
+ # Depend on the specific file (.c for each .o) and on all headers
+ %.o: %.c ${HEADERS}
+-	echo "CC $<"
+-	$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+ 
+ all: ${FILES}
+-	echo "LINK i3-msg"
+-	$(CC) -o i3-msg ${FILES} $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o i3-msg ${FILES} $(LIBS)
+ 
+ install: all
+-	echo "INSTALL"
+ 	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
+ 	$(INSTALL) -m 0755 i3-msg $(DESTDIR)$(PREFIX)/bin/
+ 
+--- i3-input/Makefile
++++ i3-input/Makefile
+@@ -9,15 +9,12 @@
+ 
+ # Depend on the specific file (.c for each .o) and on all headers
+ %.o: %.c ${HEADERS}
+-	echo "CC $<"
+-	$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+ 
+ all: ${FILES}
+-	echo "LINK i3-input"
+-	$(CC) -o i3-input ${FILES} $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o i3-input ${FILES} $(LIBS)
+ 
+ install: all
+-	echo "INSTALL"
+ 	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
+ 	$(INSTALL) -m 0755 i3-input $(DESTDIR)$(PREFIX)/bin/
+ 

diff --git a/x11-wm/i3/i3-3e_p3.ebuild b/x11-wm/i3/i3-3e_p3.ebuild
new file mode 100644
index 0000000..5d360d5
--- /dev/null
+++ b/x11-wm/i3/i3-3e_p3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit base versionator toolchain-funcs
+
+MY_PV=$(version_format_string '$1.$2-${3/p/bf}')
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="http://i3wm.org/"
+SRC_URI="http://i3wm.org/downloads/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-libs/libev
+	dev-libs/yajl
+	x11-libs/libxcb
+	x11-libs/libX11
+	x11-libs/xcb-util"
+DEPEND="${CDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	x11-proto/xcb-proto"
+RDEPEND="${CDEPEND}
+	x11-apps/xmessage"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( GOALS TODO RELEASE-NOTES-${MY_PV} )
+PATCHES=( "${FILESDIR}"/${PN}-gentoo.diff )
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_install() {
+	base_src_install
+	doman man/*.1
+	dohtml -r docs/*
+}
+
+pkg_postinst() {
+	elog "${PN} by default uses x11-terms/rxvt-unicode as a default terminal."
+	elog "Either merge it yourself or change proper bind in /etc/${PN}/config"
+	elog "or ~/.i3/config"
+}

diff --git a/x11-wm/i3/metadata.xml b/x11-wm/i3/metadata.xml
new file mode 100644
index 0000000..2cb4afc
--- /dev/null
+++ b/x11-wm/i3/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-wm</herd>
+	<maintainer>
+		<email>xarthisius@g.o</email>
+		<name>Kacper Kowalik</name>
+	</maintainer>
+</pkgmetadata>