Version bump, drop dependency on libX11

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

4 files changed, 97 insertions, 8 deletions

diff --git a/x11-wm/i3/ChangeLog b/x11-wm/i3/ChangeLog
index 41ee5e47126c..8681f4680011 100644
--- a/x11-wm/i3/ChangeLog
+++ b/x11-wm/i3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/i3
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/i3/ChangeLog,v 1.60 2015/02/15 18:13:13 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/i3/ChangeLog,v 1.61 2015/02/28 21:24:00 xarthisius Exp $
+
+*i3-4.9 (28 Feb 2015)
+
+  28 Feb 2015; Kacper Kowalik <xarthisius@gentoo.org> +i3-4.9.ebuild,
+  i3-9999.ebuild:
+  Version bump, drop dependency on libX11
 
   15 Feb 2015; Ultrabug <ultrabug@gentoo.org> i3-9999.ebuild:
   i3 git repo moved to github
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index ba71e6e3052c..387bcd5f0d86 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -5,14 +5,26 @@ AUX i3-4.6-missing_include.patch 325 SHA256 726a5e3c15973d2810075379beeb42cf521d
 AUX i3-4.7.2-cflags.patch 529 SHA256 6cf35eebd73d0acd909e9b509e050125526cb6214567f2b0a41b906bc9462222 SHA512 2066ad0918bab75e71f7e90e409682a2f9a121f8619545ecb1cd917e36ebb8bef8e4284de976815f587ee7123fcc424fbbfedd05fc0fc174a85e196311964393 WHIRLPOOL b7e89411e8b4d2ff6c9f420d4e9a0fc39322d6bb01872f72664a9bd20a704e00faa548877e6f81ce02708f44364df57e2c87a82dbf45f93efae1ae0a6ef59f81
 AUX i3-4.7.2-parallel_make.patch 2381 SHA256 541590c752b591910f414a2b3128e4c008a79be4ee409fb5a63431fb4cfc5a04 SHA512 5d63763839834f30b77a40a009ef5097da46156ab5e2b69d3a36351e19c67ee8220aa1cc5533c7088b5f5d59ed3afee08cc77d6d1119155de74da17a3b5c6720 WHIRLPOOL 08f0c6a2da29cc517d29e1a947b9e922ddb1df3f0169b0c9b4d299e6490ae998d43ef5b9253c74b439504b8529332bce9dc49760c64219e4fd7c78aa46eedb36
 DIST i3-4.8.tar.bz2 939690 SHA256 502c34290f239780bb40352191f0500e8f35d2446eddb573c67c27873d6a1b6b SHA512 fd6f92da857246119f1ae710b6c5168128fa2da5eae8308550b1b9c75879f060cac8246897333f3d67e18de36828a11dd12b4ccee9bd6cd6ad32e2b44c50b43e WHIRLPOOL 6c6288cb66ffdbf225df0dfcdc4f540cd36d7c8333a9f9d9c363cb6580d6a7c1ca0deb227a8f46ac907f2afc6e4e46efc448a51f0764a167bb9639956beae4ef
+DIST i3-4.9.tar.bz2 940707 SHA256 bee31908e3a9ad679beb6e68807ae8ba7804671da2066abb9b3ea2025475d058 SHA512 006c62d186702ba748157f52436d6edb2065c475b3e5b168af76768ac659f6ee95b1fc2249d03cd96b217594e3a25560b5dacdda04973cd36388091d08f00de6 WHIRLPOOL bf77409e34b34ae3236b9853b8d1b511217ecf409ff511d7382123e28e971c98680d71a6449e5f268af6f12d6407834becfa01235a93a05e45dd00e83aec4f68
 EBUILD i3-4.8.ebuild 1545 SHA256 20dc1fb3eebee8ff6b6641ce6c4edc44f406fc81b9f245d9534486b66e5c1b9d SHA512 1f2e02a00a3405abb0ce489b8ecda3fb5aeec6188a5fa79a6c36e14ee6e90287c2f4cf82a2dabf3935cc926e3e23efd53596b1a3ee201461e2364744d57d16a5 WHIRLPOOL 62180176b522df07246d4bc2ecb48d4417e3a18b75f55c8e8f5d6dc2c64192130f28d7f8deb97b10a28cb2063bac2cfad61b28b23c4a89428b074589e15ef269
-EBUILD i3-9999.ebuild 1560 SHA256 ba997b20c2ce8e12df400bc7136ac0d9e643243c76d6dd5bf05511854c8d284d SHA512 f60e987767fb6b800f36184b1b04b72ff98bc248885be42242bfe44acf5ac621f3a1c9af2485770d8df0048235b38013f234d7862674cfb732eaf63a62541658 WHIRLPOOL ed76a1985ee3a8fba6af57c329eff4c370e744863d43946928ef9ee73b880d63ff58be5f63053c3a31966c628e9a6e2c1af15e4c3f9d0fca12d3f47f9a0c9613
-MISC ChangeLog 8750 SHA256 3327fe82e219d8dc284a6e07feca164de7c1e5b540ac6b7cffab111c4ab6c05b SHA512 f5b0762f7582911b9352875e86e89506cbc68f8ea291cc2776e049810a04e90fd208fdab77d81f9fb009ff8e10ca04861077090d748a3ae3728d3fb78cd5d1d1 WHIRLPOOL 7e80b77b349c21a41df5f49ef1597c40b5cb56683dca722dd35359900b64061ecc7e1838c19368ad6ce5da71a7e10c265b8795834bdd1bbed8c0069ee2e62fde
+EBUILD i3-4.9.ebuild 1533 SHA256 93970d9e5c640814bbdf9467318e2fa734e3a31d82e10622d6addcf85927ea5c SHA512 5a114e12f12c61982c720be0b7fd059e4ff25bef7c9512b1ed04b9f041424244f248a7fffc37d1095cfd6152713d5e9c6e4dfa83f67bea9b68c069026624c912 WHIRLPOOL 9a49c61028db6d9fa3cdf1d4bc01064bf1f5e4a5b7d4ad9654fa3659adbbfdcaa28dad194f323f7e179499a387f8bb194731df8778c1dbbec8dbfac8de114776
+EBUILD i3-9999.ebuild 1545 SHA256 a1277b201c6ae16c98d3f18d785201b85e90bcbab9c6f54b2ea8fb2b7ee907c5 SHA512 f6956aa14b801d9087781883fb695c7d9523bbf8b6ad8a86a9cfd1577073edac60f499cda65b8255da41880e229ff1ddbd5daecd03f5bf25aa362036de35c862 WHIRLPOOL 2abd01df0a2f77b59669d667d8af90356132d464b89a8b06ab5d31100fad1a0ff9694b0dd57b3b2a9bba183d2fc764b75d07593e19dc3c94056234c75d0a3ebe
+MISC ChangeLog 8906 SHA256 53e9a81b1238f71a1e5c16a52a145b7b8860adbcaa496989ac73196c7857159d SHA512 77eb4fb676de58edf00308ea879544429185c3307f961a53821fcb551d5efaf10052af138430b3b98309605d8b9e662c16e420ce4db156bebe7943280ea00a59 WHIRLPOOL 264be6af079ad7fc9ca4cd39a7c027885508e62eb167089299e11f6baafd5341e221cb2504e8d3d9ab9a7746b2eeb5d48de7114698f8e5165f014ffe5cd259c9
 MISC metadata.xml 578 SHA256 747cbbd11d56e581ae8e58210207070fee2a663d7f029b260a5e5f1a69fb05ad SHA512 b8afbb2ec3fa72b688c19935ea9c28b43fdd4569a25ec3a91d04a211ccffd1cb661a03adf810b6c0fa054505bcd8086db60764bafd721411eb81f287b19e7514 WHIRLPOOL 6802ac798ca27a7cb073522c5e0c883459865cb63110f575a7d2ba2db0b13feb36d1102ff86a75e04c16bb740911d39b67d4da9b13c6683e051f8a8f3b44fa68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlTg4b4ACgkQKiQSS7ZY+hNo0gEAhJ+TO+fP45ebCSBfXCCKzN86
-q0N3japYjH1Zd4TZ254A/3+cgKAUA+cgYCTPTofLoqJRVa0LnAD4jlKirt+vHcOa
-=0Pza
+iQIcBAEBCAAGBQJU8jH0AAoJEF0huFKJUZL57CcQAJutpxMl/zFX0IaLZPRnmSU1
+QajNC8o3pQ2oxRgTjwYWuyL3nu2PD2g7mzgnixGPL75tseSj5zYtindLl7vk2MFE
+o8By5nOkobWbYhAww5vKumdm9qqwCsCDqIKte73+9C6oHClaxl/T/1XIw4TVLSe1
+e6O7PHoNfoIoMZlv3nwN13OG82OSJGZ8ec06/LImhwhFnubwxgnVdznqTeFh0m7N
+9rKeDsxRrpjU5AwrdcgASPYQWYLE27WpZGdcPcgjoNwgZYlyX5W1V4PUE3wGMwl5
+ruVA08GjvQCK5obMDpEs9uRXfoyyiFcqEr9PTiUlzEpqqDneijwYfcMTg50QRKT5
+UkVwQzaXpq6zQ54917joBkI+OYF6fSFKZElr34neHeVFHOTTNWVXUx9q71oKGLgn
+3I2lcs7Fy33IVlxmhFmlknVSOdwEtgVTOb8pZPL1BjCetodY+JyvFEhQXa4fpkYy
+M1tNL1gc2R2+sYbjzO1QCJpa/mfkKHkuvgnQSFiXmScSNYvRv3Z9ZW7yTY9/AOQu
+6hZeMbIbshWgWPJEUnc7sQN2JqZcUaK8co2Dx8pQgXcsRTGVT9KOCU2BjcxIxgho
+zTU/Bvr31obNP4OwlYmFttylbwcphIb0XPs6dVJpZALMxeZbFncxuOFYyK2nKMnn
+Na3r9R6n0qWxT/4Ap9wk
+=PdzE
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/i3/i3-4.9.ebuild b/x11-wm/i3/i3-4.9.ebuild
new file mode 100644
index 000000000000..25c4705764b2
--- /dev/null
+++ b/x11-wm/i3/i3-4.9.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/i3/i3-4.9.ebuild,v 1.1 2015/02/28 21:24:00 xarthisius Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="http://i3wm.org/"
+SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+pango"
+
+CDEPEND="dev-libs/libev
+	dev-libs/libpcre
+	>=dev-libs/yajl-2.0.3
+	x11-libs/libxcb
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	pango? (
+		>=x11-libs/pango-1.30.0[X]
+		>=x11-libs/cairo-1.12.2[X,xcb]
+	)"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	dev-lang/perl
+	dev-perl/AnyEvent-I3
+	dev-perl/JSON-XS"
+
+DOCS=( RELEASE-NOTES-${PV} )
+
+src_prepare() {
+	if ! use pango; then
+		sed -i common.mk -e '/PANGO/d' || die
+	fi
+
+	cat <<- EOF > "${T}"/i3wm
+		#!/bin/sh
+		exec /usr/bin/i3
+	EOF
+
+	epatch_user #471716
+}
+
+src_compile() {
+	emake V=1 CC="$(tc-getCC)" AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+	dohtml -r docs/*
+	doman man/*.1
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/i3wm
+}
+
+pkg_postinst() {
+	einfo "There are several packages that you may find useful with ${PN} and"
+	einfo "their usage is suggested by the upstream maintainers, namely:"
+	einfo "  x11-misc/dmenu"
+	einfo "  x11-misc/i3status"
+	einfo "  x11-misc/i3lock"
+	einfo "Please refer to their description for additional info."
+}
diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
index c08d54705066..dc6c8f39de7e 100644
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/i3/i3-9999.ebuild,v 1.6 2015/02/15 18:13:13 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/i3/i3-9999.ebuild,v 1.7 2015/02/28 21:24:00 xarthisius Exp $
 
 EAPI=5
 
@@ -22,7 +22,6 @@ CDEPEND="dev-lang/perl
 	dev-libs/libpcre
 	>=dev-libs/yajl-2.0.3
 	x11-libs/libxcb
-	x11-libs/libX11
 	x11-libs/startup-notification
 	x11-libs/xcb-util
 	x11-libs/xcb-util-cursor