gentoo resync : 05.12.2021

4 files changed, 64 insertions, 36 deletions

diff --git a/x11-misc/clipmenu/Manifest b/x11-misc/clipmenu/Manifest
index 5f3f4bfe1877..9396a39a9519 100644
--- a/x11-misc/clipmenu/Manifest
+++ b/x11-misc/clipmenu/Manifest
@@ -1,3 +1,3 @@
 DIST clipmenu-6.2.0.tar.gz 9019 BLAKE2B 2dddd900483656a38b2335f994a46302af797b0f47509b0bd2c1a302e1c27729cd80091a4c8bfd587844f7ee8c271742aea668910553d9a4c54595d18e4f1ec7 SHA512 adfd649a120264552e2c05314ae2ad039055308f77d620dbb3fc206e4244a6f1f2e5ed4a7e86fd547a78692aebaec1761528e10408d838f80def99959ef58295
-EBUILD clipmenu-6.2.0.ebuild 614 BLAKE2B 718594186206d77759521efc9875707c76676a57fca57f2b0debf5a361f3f55a8bf71afb8898c6c4d16f6ee347c6d5e098fe96151df9fa9408763c6e5bc0834e SHA512 84fcbc2540e6de8411e307c2f1b0656de44a7ec12950a56e2e384774bd53de3addeb0913d742e3c6e8e259cc485228b2222036748f07f96ede0e6594e2b46f30
-MISC metadata.xml 395 BLAKE2B dcaa15923e33d03c1a12f1df08009a91597fc9f4694ef0944c0d5794399b97923221334299c452cca7a2914cb91734a065203b2368afcea8b0d9a0eae35f1cab SHA512 6e74e9fa942889f45173b090355ec058258f2d2f29b81a4553cfa54ae425322796ee995a0095297108ed7828d77bf3b9933e5600d5eb137914d34e0aec771238
+EBUILD clipmenu-6.2.0-r1.ebuild 1242 BLAKE2B 39d9c6cc107d64a23610f207d9f774a484eb97fd504cd1b79a7fe25ea83efae06bfcf47e3c9d7644f8158ea7e4191df830930485631f113b7bfc8e3e17fccdba SHA512 bb8a8274214199eeb34dcd13cd808a45d0720cff03cc7adfae4d13bd6f3f5978fcbcd5c9f78ef77d75a9d024c79e5f44a3ff910c3837eb0cb02fc760baa0c73c
+MISC metadata.xml 578 BLAKE2B e4a566dcb4257903154de0991b2186ce0674eb2d60049639dcadd0357cb62c6d352665b2065033f2b644f3ed5bfd33b88eef9e1b4933613bcf58b37f50500a06 SHA512 7285c98a640636990f263b8229cbbe72b507efedde7b3067f69e8c4012d88ee84fbd5979eaaac7eb67cb7da876dc5f1bbf8bbdfa36a84b8e8846258c0841c4ef
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..a3194cfe7320
--- /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"
+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 fzf rofi"
+REQUIRED_USE="?? ( dmenu fzf rofi )"
+
+RDEPEND="
+	x11-misc/clipnotify
+	x11-misc/xsel
+	dmenu? ( x11-misc/dmenu )
+	fzf? ( app-shells/fzf )
+	rofi? ( x11-misc/rofi )
+"
+
+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 fzf && ! use rofi ; 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 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="dmenu">Use dmenu as default launcher</flag>
+		<flag name="rofi">Use rofi as default launcher</flag>
+		<flag name="fzf">Use fzf as default launcher</flag>
+	</use>
 </pkgmetadata>