commit:     4acd68248552b775002a8e9f0fd311b92ac4dc51
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 06:54:10 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 09:36:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4acd6824

x11-wm/i3: sync live ebuild

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/18384
Acked-by: Nelo-T. Wallus <nelo <AT> wallus.de>
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 x11-wm/i3/i3-9999.ebuild | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
index 3c6f131dc56..e644fcb77f5 100644
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit meson virtualx
+inherit meson optfeature virtualx
 if [[ "${PV}" = *9999 ]]; then
        inherit git-r3
 fi
@@ -22,7 +22,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="doc test"
 
-CDEPEND="dev-libs/libev
+COMMON_DEPEND="dev-libs/libev
        dev-libs/libpcre
        dev-libs/yajl
        x11-libs/libxcb[xkb]
@@ -36,7 +36,7 @@ CDEPEND="dev-libs/libev
        x11-misc/xkeyboard-config
        x11-libs/cairo[X,xcb(+)]
        x11-libs/pango[X]"
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
        test? (
                dev-perl/AnyEvent
                dev-perl/X11-XCB
@@ -54,7 +54,7 @@ DEPEND="${CDEPEND}
                app-text/xmlto
                dev-lang/perl
        )"
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
        dev-lang/perl
        dev-perl/AnyEvent-I3
        dev-perl/JSON-XS"
@@ -75,6 +75,7 @@ src_prepare() {
 
 src_configure() {
        local emesonargs=(
+               -Ddocdir="/usr/share/doc/${PF}"
                $(meson_use doc docs)
                $(meson_use doc mans)
        )
@@ -94,13 +95,10 @@ src_test() {
 }
 
 pkg_postinst() {
-       # Only show the elog information on a new install
-       if [[ ! ${REPLACING_VERSIONS} ]]; then
-               elog "There are several packages that you may find useful with 
${PN} and"
-               elog "their usage is suggested by the upstream maintainers, 
namely:"
-               elog "  x11-misc/dmenu"
-               elog "  x11-misc/i3status"
-               elog "  x11-misc/i3lock"
-               elog "Please refer to their description for additional info."
-       fi
+       elog "There are several packages that you may find useful with i3 and"
+       elog "their usage is suggested by the upstream maintainers."
+       elog "Uninstalled optional dependencies:"
+       optfeature "Application launcher" x11-misc/dmenu
+       optfeature "Simple screen locker" x11-misc/i3lock
+       optfeature "Status bar generator" x11-misc/i3status
 }

Reply via email to