[gentoo-commits] repo/gentoo:master commit in: x11-misc/splatmoji/

[Joonas Niilola]

commit:     0d57e3266677aa64086b246c53ae715764e2220c
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  5 07:40:17 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 07:40:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d57e326

x11-misc/splatmoji: use optfeature in 1.2.0

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 x11-misc/splatmoji/metadata.xml           |  3 ---
 x11-misc/splatmoji/splatmoji-1.2.0.ebuild | 21 +++++++++++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/x11-misc/splatmoji/metadata.xml b/x11-misc/splatmoji/metadata.xml
index 9815be8e15d..8098c7e79c6 100644
--- a/x11-misc/splatmoji/metadata.xml
+++ b/x11-misc/splatmoji/metadata.xml
@@ -13,9 +13,6 @@
                Splatmoji is a tool that lets users quickly look up and input 
emoji,
                emoticons and kaomoji via a pop-up menu.
        </longdescription>
-       <use>
-               <flag name="json">Escape output in JSON style using 
<pkg>app-misc/jq</pkg></flag>
-       </use>
        <upstream>
                <remote-id type="github">cspeterson/splatmoji</remote-id>
        </upstream>

diff --git a/x11-misc/splatmoji/splatmoji-1.2.0.ebuild 
b/x11-misc/splatmoji/splatmoji-1.2.0.ebuild
index acac0fd2d02..6bb90f7331e 100644
--- a/x11-misc/splatmoji/splatmoji-1.2.0.ebuild
+++ b/x11-misc/splatmoji/splatmoji-1.2.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit optfeature
+
 DESCRIPTION="Quickly look up and input emoji and/or emoticons"
 HOMEPAGE="https://github.com/cspeterson/splatmoji/";
 SRC_URI="https://github.com/cspeterson/splatmoji/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
@@ -10,13 +12,16 @@ 
SRC_URI="https://github.com/cspeterson/splatmoji/archive/v${PV}.tar.gz -> ${P}.t
 LICENSE="MIT"
 KEYWORDS="~amd64"
 SLOT="0"
-IUSE="json test"
+IUSE="test"
+
 RESTRICT="!test? ( test )"
 
-DEPEND="test? ( app-misc/jq dev-util/shunit2 )"
+DEPEND="test? (
+               app-misc/jq
+               dev-util/shunit2
+       )"
 RDEPEND="
        app-shells/bash
-       json? ( app-misc/jq )
        x11-misc/rofi
        x11-misc/xdotool
        x11-misc/xsel"
@@ -27,10 +32,18 @@ src_test() {
 
 src_install() {
        dobin splatmoji
+
        insinto /etc/xdg/splatmoji
        doins splatmoji.config
+
        insinto /usr/share/splatmoji
        doins -r data
+
        insinto /usr/lib/splatmoji
        doins lib/functions
 }
+
+pkg_postinst() {
+       elog "Optional uninstalled features:"
+       optfeature "JSON-style output" app-misc/jq
+}