From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CC2EE158086 for ; Fri, 3 Dec 2021 13:02:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CF102BC021; Fri, 3 Dec 2021 13:02:35 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 485642BC00D for ; Fri, 3 Dec 2021 13:02:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 102733433C3 for ; Fri, 3 Dec 2021 13:02:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 842F51FE for ; Fri, 3 Dec 2021 13:02:32 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1638536545.fab6223dd54f049cf170e01e17e8aa1d6b2a7f0c.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/clipmenu/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild x11-misc/clipmenu/clipmenu-6.2.0.ebuild x11-misc/clipmenu/metadata.xml X-VCS-Directories: x11-misc/clipmenu/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: fab6223dd54f049cf170e01e17e8aa1d6b2a7f0c X-VCS-Branch: master Date: Fri, 3 Dec 2021 13:02:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: aa917770-9eb2-4156-974b-b6c737b1bdb2 X-Archives-Hash: 626aec991399d1a377e35ab2dc833d45 commit: fab6223dd54f049cf170e01e17e8aa1d6b2a7f0c Author: NRK disroot org> AuthorDate: Tue Nov 30 12:52:37 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri Dec 3 13:02:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fab6223d x11-misc/clipmenu: introduce different launcher options while the default menu/frontend for clipmenu is dmenu, it can also work with rofi, fzf or any other "menu" application and thus dmenu should not be pulled in as a hard dep. Closes: https://github.com/gentoo/gentoo/pull/23125 Signed-off-by: Nickolas Raymond Kaczynski disroot.org> Signed-off-by: Joonas Niilola gentoo.org> x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild | 57 ++++++++++++++++++++++++++++++ x11-misc/clipmenu/clipmenu-6.2.0.ebuild | 34 ------------------ x11-misc/clipmenu/metadata.xml | 5 +++ 3 files changed, 62 insertions(+), 34 deletions(-) diff --git a/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild b/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild new file mode 100644 index 000000000000..be3e66670c5d --- /dev/null +++ b/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd + +DESCRIPTION="Clipboard management using dmenu" +HOMEPAGE="https://github.com/cdown/clipmenu" +SRC_URI="https://github.com/cdown/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Unlicense" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="+dmenu rofi fzf" +REQUIRED_USE="?? ( dmenu rofi fzf )" + +RDEPEND=" + x11-misc/clipnotify + x11-misc/xsel + dmenu? ( x11-misc/dmenu ) + rofi? ( x11-misc/rofi ) + fzf? ( app-shells/fzf ) +" + +src_prepare() { + default + + if use rofi ; then + sed -i 's|CM_LAUNCHER=dmenu|CM_LAUNCHER=rofi|' clipmenu || die "sed failed" + elif use fzf ; then + sed -i 's|CM_LAUNCHER=dmenu|CM_LAUNCHER=fzf|' clipmenu || die "sed failed" + fi +} + +src_compile() { + : +} + +src_install() { + local binfile + for binfile in clipctl clipdel clipfsck clipmenu clipmenud; do + dobin ${binfile} + done + + dodoc README.md + + systemd_douserunit "init/clipmenud.service" +} + +pkg_postinst() { + if ! use dmenu && ! use rofi && ! use fzf ; then + ewarn "Clipmenu has been installed without a launcher." + ewarn "You will need to set \$CM_LAUNCHER to a dmenu-compatible app for clipmenu to work." + ewarn "Please refer to the documents for more info." + fi +} diff --git a/x11-misc/clipmenu/clipmenu-6.2.0.ebuild b/x11-misc/clipmenu/clipmenu-6.2.0.ebuild deleted file mode 100644 index 5ae7092c8f4c..000000000000 --- a/x11-misc/clipmenu/clipmenu-6.2.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd - -DESCRIPTION="Clipboard management using dmenu" -HOMEPAGE="https://github.com/cdown/clipmenu" -SRC_URI="https://github.com/cdown/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Unlicense" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=" - x11-misc/clipnotify - x11-misc/dmenu - x11-misc/xsel -" - -src_compile() { - : -} - -src_install() { - local binfile - for binfile in clipctl clipdel clipfsck clipmenu clipmenud; do - dobin ${binfile} - done - - systemd_douserunit "init/clipmenud.service" -} diff --git a/x11-misc/clipmenu/metadata.xml b/x11-misc/clipmenu/metadata.xml index a057b342f48a..ad77c07f77a8 100644 --- a/x11-misc/clipmenu/metadata.xml +++ b/x11-misc/clipmenu/metadata.xml @@ -9,4 +9,9 @@ proxy-maint@gentoo.org Proxy Maintainers + + Use dmenu as default launcher + Use rofi as default launcher + Use fzf as default launcher +