From 72e5f93dab8f186525a5706a3883194bd66604a9 Mon Sep 17 00:00:00 2001
From: Quentin Glidic <sardemff7+git@sardemff7.net>
Date: Wed, 19 Dec 2012 22:02:33 +0100
Subject: i3-9999: Adapt to upstream changes

---
 x11-wm/i3/Manifest       |  4 +---
 x11-wm/i3/i3-9999.ebuild | 29 +++++++++++------------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 803139d..a7f1f23 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,3 +1 @@
-DIST i3-4.1.tar.bz2 564086 RMD160 1b7858995e2247e57d74e2314387b1fd5231becf SHA1 e8aa51d32028b3f076b9785c4b46911b50ba6996 SHA256 3b4f21d9bf66f8e4588521dfa706d8cc3fe1999976a55fb5a6c13a621a1455a0
-EBUILD i3-4.1.ebuild 1284 RMD160 c27ae4ec0e0eaf508efb6c413be9201024fb00b4 SHA1 5862745e9e3be658f92f1241119dd4926605ac06 SHA256 db32408bbda37d971329e52bffb1feba4ea567d0309ada4c5d645d8b1df47f6d
-EBUILD i3-9999.ebuild 1273 RMD160 8e60e1b420bc7fe0a567e69b9a1911cd099b12c9 SHA1 1f210be7fff5af3e17d27f91b78a5a9ea2ff18b7 SHA256 e259c9bf02abced2db0ed6367364580f112bf911519aab410302a690ce62138c
+EBUILD i3-9999.ebuild 1179 SHA256 f649d54d8296ae0db93b952ba92b3c254be81aa226a81e5559f58b0ee1a617f2 SHA512 12d71e1067733744765b785a2d9ef6aa3ef58b45625a19e544cefbfba83fb29d08442ed0a67872b45b332bc0a34ef5927eb6c0841330aaac417daf1e5714c4df WHIRLPOOL b1b223e0816e220b424f5e09ea426841aa0aeb302e0517b4c0f431d7a9236e65680955796a9a690a6a45e39c4eaa3c2d2035f069fdb8d23e3a809a599412ee9a
diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
index 389e60a..0ed0edc 100644
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -23,18 +23,15 @@ RDEPEND="
 	dev-libs/yajl
 	x11-libs/libX11
 	>=x11-libs/libxcb-1.1.93
+	x11-libs/libXcursor
+	x11-libs/pango
 	x11-libs/startup-notification
-	>=x11-libs/xcb-util-0.3.3
-	|| (
-		<x11-libs/xcb-util-0.3.8
-		(
-			>=x11-libs/xcb-util-0.3.8
-			>=x11-libs/xcb-util-keysyms-0.3.8
-			>=x11-libs/xcb-util-wm-0.3.8
-		)
-	)
+	>=x11-libs/xcb-util-0.3.8
+	>=x11-libs/xcb-util-keysyms-0.3.8
+	>=x11-libs/xcb-util-wm-0.3.8
 	"
 DEPEND="${RDEPEND}
+	dev-lang/perl
 	dev-util/pkgconfig
 	sys-devel/bison
 	sys-devel/flex
@@ -51,20 +48,16 @@ src_prepare() {
 }
 
 src_compile() {
-	emake i3
-
-	local subs=( ${PN}-{input,msg} )
+	local targets=( all )
 
-	use doc && subs+=( docs )
-	use man && subs+=( man i3bar/doc )
+	use doc && targets+=( docs )
+	use man && targets+=( mans )
 
-	for sub in ${subs[@]}; do
-		emake -C ${sub}
-	done
+	emake ${targets[@]}
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
-	use man && doman man/*.1 i3bar/doc/*.1
+	use man && doman man/*.1
 	use doc && dohtml -r docs/*.html
 }
-- 
cgit v1.2.3-65-gdbad