i3: Bump to 4.1 and update ebuilds

4 files changed, 44 insertions, 111 deletions

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 8c0a505..4102a13 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,5 +1,3 @@
-EBUILD i3-3e-r3.ebuild 1538 RMD160 d33c04eda9cb3f69588796fda87232d91d9dbe6e SHA1 67f11b0edc1b1997fc4aa0904537168f4ecee61b SHA256 d10e00d8cf0c98534901fc50b81c6e774ad7998f9d0b8bd18544396733a20417
-EBUILD i3-4_pre2.ebuild 1356 RMD160 7a9c5e7efba4c558a7ef49f28027a7917e6cf496 SHA1 dbc7b11c66d04dbc28b4a4b48c1cf497611354bb SHA256 2a2a6637aa8657c43134c4309bb80a6b4e2da6e02d523fb7a717efa41cfb4146
-EBUILD i3-9999.ebuild 1220 RMD160 e0a6cdc71b226baba6888aeae18c41023ac317b0 SHA1 0a7924175d3f42a030bf0d573b75c4e0e1398ff7 SHA256 3d1521fe2e2442ae364ecd2fed4895a82df44cd23702dd957c5a50dcb5f00223
-DIST i3-tree-pr2.tar.bz2 395023 RMD160 8179253b14491988baf1fa4f307753a79da5a761 SHA1 0ab841ada18129bfe466d9e4cd7f7e35e2dd7ccc SHA256 b7a4d983a7bc0893182fd71de328a504e6f525778f67791ae0458eb4a1c13460
-DIST i3-3.e-bf3.tar.bz2 360704 RMD160 858d92020e251b3afd34bcb0008d7ccc25d04669 SHA1 7c35f49fa14a21b606bb102b41c5f0cead4e93a3 SHA256 e0a7b030ebbad0ebf2ac39f235dd5e0ad34ef0ff5b83e31501a361f92e85c68f
+EBUILD i3-4.1.ebuild 1284 RMD160 c27ae4ec0e0eaf508efb6c413be9201024fb00b4 SHA1 5862745e9e3be658f92f1241119dd4926605ac06 SHA256 db32408bbda37d971329e52bffb1feba4ea567d0309ada4c5d645d8b1df47f6d
+EBUILD i3-9999.ebuild 1286 RMD160 9e26c5f7cfa54a1c027f94f5f9a38f92df775a19 SHA1 4802032fba6d4f8a3e0f1933017dc4c55da420e7 SHA256 1f35513306b0a70805c26af455e8d980a095ed9af63e8073e8da5614f04d26fd
+DIST i3-4.1.tar.bz2 564086 RMD160 1b7858995e2247e57d74e2314387b1fd5231becf SHA1 e8aa51d32028b3f076b9785c4b46911b50ba6996 SHA256 3b4f21d9bf66f8e4588521dfa706d8cc3fe1999976a55fb5a6c13a621a1455a0
diff --git a/x11-wm/i3/i3-3e-r3.ebuild b/x11-wm/i3/i3-4.1.ebuild
index 0c5919f..7e995c1 100644
--- a/x11-wm/i3/i3-3e-r3.ebuild
+++ b/x11-wm/i3/i3-4.1.ebuild
@@ -4,17 +4,11 @@
 
 EAPI="3"
 
-inherit multilib versionator
-
-[[ "${PR}" != "r0" ]] && \
-	BUGFIX="-bf${PR#r}"
-
-MY_PV="$(get_major_version).$(get_version_component_range 2)"
-MY_P="${PN}-${MY_PV}${BUGFIX}"
+inherit multilib
 
 DESCRIPTION="An improved dynamic tiling window manager"
 HOMEPAGE="http://i3wm.org/"
-SRC_URI="http://i3wm.org/downloads/${MY_P}.tar.bz2"
+SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
@@ -22,7 +16,11 @@ KEYWORDS="~x86 ~amd64"
 IUSE="debug doc"
 
 RDEPEND="
-	>=x11-libs/libxcb-1.1.90.1
+	dev-libs/libev
+	dev-libs/yajl
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.1.93
+	x11-libs/startup-notification
 	>=x11-libs/xcb-util-0.3.3
 	|| (
 		<x11-libs/xcb-util-0.3.8
@@ -32,39 +30,34 @@ RDEPEND="
 			>=x11-libs/xcb-util-wm-0.3.8
 		)
 	)
-	x11-libs/libX11
-	dev-libs/libev
-	dev-libs/yajl
 	"
 DEPEND="${RDEPEND}
-	>=x11-proto/xcb-proto-1.3
-	doc? ( >=app-text/asciidoc-8.1.0 )
+	dev-util/pkgconfig
 	sys-devel/bison
 	sys-devel/flex
-	dev-util/pkgconfig
+	>=x11-proto/xcb-proto-1.3
+	doc? ( >=app-text/asciidoc-8.3 )
 	"
 
-S="${WORKDIR}/${MY_P}"
-
 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):" \
-		common.mk || die "sed die"
 }
 
 src_compile() {
-	emake || die "emake compile die"
-	use doc && { emake -C docs || die "emake docs die" ; }
+	emake i3 || die "emake compile die"
+
+	local subs=( ${PN}-{input,msg} )
+
+	use doc && subs+=( docs )
+
+	for sub in ${subs[@]}; do
+		emake -C ${sub} || die "emake ${sub}"
+	done
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install die"
-	doman man/*.1 || die "doman die"
-	dodoc GOALS TODO || die "dodoc die"
-	if use doc; then
-		dohtml -r docs/*.html || die "dohtml die"
-		elog "Documentation in html is in /etc/share/doc/${P}"
-	fi
+	doman man/*.1 i3bar/doc/*.1 || die "doman die"
+	dodoc GOALS || die "dodoc die"
+	use doc && { dohtml -r docs/*.html || die "dohtml die" ; }
 }
diff --git a/x11-wm/i3/i3-4_pre2.ebuild b/x11-wm/i3/i3-4_pre2.ebuild
deleted file mode 100644
index 4aac781..0000000
--- a/x11-wm/i3/i3-4_pre2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit multilib
-
-MY_PV="${PV/4/tree}"
-MY_PV="${MY_PV/_/-}"
-MY_PV="${MY_PV/pre/pr}"
-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="~x86 ~amd64"
-IUSE="debug doc"
-
-RDEPEND="
-	>=x11-libs/libxcb-1.1.90.1
-	>=x11-libs/xcb-util-0.3.3
-	<x11-libs/xcb-util-0.3.8
-	x11-libs/libX11
-	dev-libs/libev
-	dev-libs/yajl
-	"
-DEPEND="${RDEPEND}
-	>=x11-proto/xcb-proto-1.3
-	doc? ( >=app-text/asciidoc-8.1.0 )
-	sys-devel/bison
-	sys-devel/flex
-	dev-util/pkgconfig
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-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):" \
-		common.mk || die "sed die"
-}
-
-src_compile() {
-	emake || die "emake compile die"
-	use doc && { emake -C docs || die "emake docs die" ; }
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install die"
-	doman man/*.1 || die "doman die"
-	dodoc GOALS TODO || die "dodoc die"
-	if use doc; then
-		dohtml -r docs/*.html || die "dohtml die"
-		elog "Documentation in html is in /etc/share/doc/${P}"
-	fi
-}
diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
index bc79eab..dd69886 100644
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -19,7 +19,11 @@ KEYWORDS="~x86 ~amd64"
 IUSE="debug doc +man"
 
 RDEPEND="
+	dev-libs/libev
+	dev-libs/yajl
+	x11-libs/libX11
 	>=x11-libs/libxcb-1.1.93
+	x11-libs/startup-notification
 	>=x11-libs/xcb-util-0.3.3
 	|| (
 		<x11-libs/xcb-util-0.3.8
@@ -29,21 +33,17 @@ RDEPEND="
 			>=x11-libs/xcb-util-wm-0.3.8
 		)
 	)
-	x11-libs/libX11
-	dev-libs/libev
-	dev-libs/yajl
-	x11-libs/startup-notification
 	"
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/bison
+	sys-devel/flex
 	>=x11-proto/xcb-proto-1.3
 	doc? ( >=app-text/asciidoc-8.3 )
 	man? (
 		>=app-text/asciidoc-8.3
 		app-text/xmlto
 	)
-	sys-devel/bison
-	sys-devel/flex
-	dev-util/pkgconfig
 	"
 
 src_prepare() {
@@ -51,17 +51,21 @@ src_prepare() {
 }
 
 src_compile() {
-	emake
-	use man && emake -C man
-	use doc && emake -C docs
+	emake i3
+
+	local subs=( ${PN}-{input,msg} )
+
+	use doc && subs+=( docs )
+	use man && subs+=( man i3bar/doc )
+
+	for sub in ${subs[@]}; do
+		emake -C ${sub}
+	done
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
-	use man && doman man/*.1
+	use man && doman man/*.1 i3bar/doc/*.1
 	dodoc GOALS
-	if use doc; then
-		dohtml -r docs/*.html
-		elog "Documentation in html is in /etc/share/doc/${P}"
-	fi
+	use doc && dohtml -r docs/*.html
 }