x11-wm/i3: Add doc flag in i3-9999,remove obsolete code in i3-3b, thanks to idl0r...

svn path=/sunrise/; revision=8979

diff --git a/x11-wm/i3/ChangeLog b/x11-wm/i3/ChangeLog
index 4db66c85eea57752bde04bfe7721182c294422ea..86a7660ac73026c2484b1eee97a320345484f17c 100644 (file)
--- a/x11-wm/i3/ChangeLog
+++ b/x11-wm/i3/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Aug 2009; Ondrej Sukup (mimi_vx) <mimi.vx@gmail.com> i3-3b.ebuild,
+  i3-9999.ebuild:
+  Add doc flag in i3-9999,remove obsolete code in i3-3b, thanks to idl0r and
+  scarabeus
+
   06 Aug 2009; Ondrej Sukup (mimi_vx) <mimi.vx@gmail.com> i3-9999.ebuild:
   Small repair in live ebuild, thanks to sedzimir
 

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index e6bf755b95ea6e11e5e6c9082a869f4034f1ce1d..2305b57098b2a1f225093f40053a1694899f0235 100644 (file)
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,5 +1,5 @@
 DIST i3-3.b.tar.bz2 97884 RMD160 d0ccbd97e5b1005145adfb95ac8cb3d222b43305 SHA1 e33e6c0ee2190f16b897ce916be52e61aa29efe9 SHA256 87330b10fc7482971462fd65fceb0b30cb5f686a180ff29e06bd7f3f89c4194e
-EBUILD i3-3b.ebuild 976 RMD160 78b0f4699e4c48f677c02b1c9087b07b9ef31dc1 SHA1 c180a890d7416ce188c512ca98f073a52507f85b SHA256 8f0769082b8d9f7d2d1cd2506b7b479e6125213377df5433cc3b27e7327ec00e
-EBUILD i3-9999.ebuild 997 RMD160 fd8038e64fd18aaf1228ea9a3ec0fad5af107947 SHA1 c708f699bf46f85f65cc1418a4aa3e5b7abd9578 SHA256 e3051bead72f4ad90ad79c0c8aceb2b90a98ed7f275f8c07c0e9fb5efaf96be9
-MISC ChangeLog 858 RMD160 9fdaf22c375a080f491671d6784ad761edacd410 SHA1 8007bef23074a485ea5036f58b09b61caa719e65 SHA256 3634fbb8518e8236f23c2fef8ffc19c1a4e66af894bb8c4641bc75f55870ed26
+EBUILD i3-3b.ebuild 847 RMD160 17e4a1b16acc4b67654cc19424d03df27da04d5c SHA1 c97b21cf890b9141a7e8b52730d448ed0e3e4d67 SHA256 f0a831fed3d09a00575f973f2b57e51a3de469ec2e8d41e626126e13f0648058
+EBUILD i3-9999.ebuild 1137 RMD160 21814580cd4fe6c24f47be80fa1712aa29723e71 SHA1 353ec3cc2901417cb0c972ae84329efb71efaf5f SHA256 74637f982fa8e78f5211158e7bc98c6cbd17300824de48a850399b6c75814e15
+MISC ChangeLog 1038 RMD160 81ef621e5a3148d88baea18f25f4979f71252330 SHA1 96d4c05734271f7125e195d9de7d09fec9a0f461 SHA256 97f5890314e401361a5b55eafc72a805fe6ae314e9b5d6a79ef84c33e2b028d2
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/x11-wm/i3/i3-3b.ebuild b/x11-wm/i3/i3-3b.ebuild
index b0be757c76d9a8c11a4a346aefc0bac36f7454df..3bf30eb35fe0fcd883c665d2145cb96ee247d3f4 100644 (file)
--- a/x11-wm/i3/i3-3b.ebuild
+++ b/x11-wm/i3/i3-3b.ebuild
@@ -33,10 +33,5 @@ src_compile() {
 src_install() {
        emake DESTDIR="${D}" install || die "install failed"
        dodoc GOALS TODO || die "dodoc ${PN} failed"
-
        doman man/${PN}.1 || die "doman ${PN} failed"
-
-       echo -e "#!/bin/sh\n/usr/bin/${PN}" > "${T}/${PN}"
-       exeinto /etc/X11/Sessions
-       doexe "${T}/${PN}" || die "doexe ${PN} failes"
 }

diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
index 685b1fc33f9d739639a9ddd7e98ade9091be2dbb..683e367feced65ae21fd017e6ef25f4f73a663a6 100644 (file)
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="git://code.stapelberg.de/i3"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="doc"
 
 RDEPEND="x11-libs/libxcb
        x11-libs/xcb-util
@@ -36,12 +36,16 @@ src_prepare() {
 src_compile() {
        emake || die "emake compile die"
        emake -C man || die "emake man die"
+       use doc && { emake -C docs || die "emake docs die" ; }
 }
 
 src_install() {
        emake DESTDIR="${D}" install || die "emake install die"
-
-       dodoc GOALS TODO CMDMODE docs/hacking-howto docs/userguide || die "dodoc die"
+       dodoc GOALS TODO CMDMODE || die "dodoc die"
        doman man/i3.1 || die "doman die"
-       dohtml -r website/* || die "dohtml die"
+       use doc && { dohtml -r website/* docs/*.html || die "dohtml die" ; }
 }
+
+pkg_postinst() {
+       use doc && einfo "Documentation in html is in /etc/share/doc/${P}"
+}
\ No newline at end of file