x11-wm/i3: Change git branch, add debug flag

svn path=/sunrise/; revision=9074

diff --git a/x11-wm/i3/ChangeLog b/x11-wm/i3/ChangeLog
index 295cbd1d6afe331df3741e0b6d84c5744ac90a98..9c173a83eb3955863baa841153a75a56071ed5cc 100644 (file)
--- a/x11-wm/i3/ChangeLog
+++ b/x11-wm/i3/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Aug 2009; Ondrej Sukup (mimi_vx) <mimi.vx@gmail.com> i3-9999.ebuild:
+  Change git branch, add debug flag
+
   19 Aug 2009; Ondrej Sukup (mimi_vx) <mimi.vx@gmail.com> +i3-3c.ebuild:
   Version bump
 

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 05655027d54bf3103f8ae7188ebb1f47275fc8d4..eed369278b180335e7ad4c304137ff95360060fa 100644 (file)
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -2,6 +2,6 @@ DIST i3-3.b.tar.bz2 97884 RMD160 d0ccbd97e5b1005145adfb95ac8cb3d222b43305 SHA1 e
 DIST i3-3.c.tar.bz2 110076 RMD160 94d7e7ed70c8d5d572985909dbe684b43c3b07df SHA1 4201fcea46e23e75eaa70bff5bd2bd0abe9aba19 SHA256 91726aa4fb958ff7e57ce4f074c086b738eacc231be34bc60d9d31693e493155
 EBUILD i3-3b.ebuild 847 RMD160 17e4a1b16acc4b67654cc19424d03df27da04d5c SHA1 c97b21cf890b9141a7e8b52730d448ed0e3e4d67 SHA256 f0a831fed3d09a00575f973f2b57e51a3de469ec2e8d41e626126e13f0648058
 EBUILD i3-3c.ebuild 956 RMD160 d64e7c684e44a289425fc5c6b7a28706561f4ac5 SHA1 07553d2f834928206d913c0ef75663b99dbd2447 SHA256 bc00f0604f3675fa57373573c379e0bf8648998b46db9e221b30acccf6c6c8f4
-EBUILD i3-9999.ebuild 1117 RMD160 554bab68638c79e762145763fb60d018dcbb952b SHA1 003269438e64772ebb639b8769a76c7dc764d8b7 SHA256 3fb45633fc46fe7ffac709bd06ab308ca9f86b1ecbc980f9ec5010fd1609ff79
-MISC ChangeLog 1355 RMD160 b524720549adafb7352d59d9c1af937d0a598e75 SHA1 0ad1a035b9ca1da6da46e93203573ff71eddff1f SHA256 536196b35718927ea0ed875342130253fee776bc3b3c21a491f3d863e6ecd54c
+EBUILD i3-9999.ebuild 1238 RMD160 5c6c6db4cc953a680d610a959a29b3749fecc990 SHA1 95bed6b09a9946f9e8cf8bc05d8374c9068917bc SHA256 b3b38f6fc513d4792c973d53315287489002cceed12b83755d33d9d24f8f8f63
+MISC ChangeLog 1466 RMD160 270b37a7855fcfdec1f7b7823afd56336c6ebb2a SHA1 07c8ab3e051725ee3d1c7aa3c1ed633da6ce8d87 SHA256 88bacfe41e73e01693aab6a2fdad060c4e583d980d50487479a75f172ad14865
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
index 680966278c4973063419ed60eb0ed1c2e227b02c..8b8c251e6d440477b993edc9dab6e67687b4e4e5 100644 (file)
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -10,27 +10,29 @@ DESCRIPTION="An improved dynamic tiling window manager"
 HOMEPAGE="http://i3.zekjur.net/"
 SRC_URI=""
 EGIT_REPO_URI="git://code.stapelberg.de/i3"
+EGIT_BRANCH="next"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc"
+IUSE="debug doc"
 
-RDEPEND="x11-libs/libxcb
-       x11-libs/xcb-util
+RDEPEND=">=x11-libs/libxcb-1.1.93
+       >=x11-libs/xcb-util-0.3.3
        x11-libs/libX11
        dev-libs/libev"
 DEPEND="${RDEPEND}
-       x11-proto/xcb-proto
+       >=x11-proto/xcb-proto-1.3
        >=app-text/asciidoc-8.3
        app-text/xmlto
        app-text/docbook-xml-dtd"
 
 src_prepare() {
+       use debug || { sed -i -e "s:DEBUG=1:DEBUG=0:" common.mk || die "sed die - debug" ; }
        sed -i \
                -e "s:/usr/local/include:/usr/include:" \
                -e "s:/usr/local/lib:/usr/$(get_libdir):" \
-               Makefile || die "sed die"
+               common.mk || die "sed die"
 }
 
 src_compile() {
@@ -43,6 +45,8 @@ src_install() {
        emake DESTDIR="${D}" install || die "emake install die"
        dodoc GOALS TODO CMDMODE || die "dodoc die"
        doman man/i3.1 || die "doman die"
-       use doc && { dohtml -r website/* docs/*.html || die "dohtml die" ; }
-       use doc && elog "Documentation in html is in /etc/share/doc/${P}"
+       if use doc; then
+               dohtml -r docs/*.html || die "dohtml die"
+               elog "Documentation in html is in /etc/share/doc/${P}"
+       fi
 }