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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F36FC138359 for ; Sun, 23 Aug 2020 18:14:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EDF4EE0831; Sun, 23 Aug 2020 18:14:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D85BCE0831 for ; Sun, 23 Aug 2020 18:14:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 14840340BE3 for ; Sun, 23 Aug 2020 18:14:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 90EB632E for ; Sun, 23 Aug 2020 18:14:20 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1598203303.8f833556e2489f8610f7a463fdfe51f4729c62d7.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/j4-dmenu-desktop/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17-r1.ebuild x11-misc/j4-dmenu-desktop/metadata.xml X-VCS-Directories: x11-misc/j4-dmenu-desktop/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 8f833556e2489f8610f7a463fdfe51f4729c62d7 X-VCS-Branch: master Date: Sun, 23 Aug 2020 18:14:20 +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: 68cbdda6-0304-4583-adaa-7c8980d936e7 X-Archives-Hash: c86fe63d647b13cd323dac60fe8bc5c8 commit: 8f833556e2489f8610f7a463fdfe51f4729c62d7 Author: Conrad Kostecki gentoo org> AuthorDate: Sun Aug 23 16:45:45 2020 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sun Aug 23 17:21:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f833556 x11-misc/j4-dmenu-desktop: make dmenu optional Since x11-misc/j4-dmenu-desktop uses dmenu as default, it's being installed as a dependency by default too. But there are also pure wayland users, but dmenu can't be used on wayland. As x11-misc/j4-dmenu-desktop is flexible, users can manually configure a dmenu alternative, like dev-libs/bemenu. The possibility of disabling dmenu also won't pull in any X11 dependencies from x11-misc/dmenu anymore. Also migrated from cmake-utils to cmake. Closes: https://bugs.gentoo.org/730740 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Conrad Kostecki gentoo.org> .../j4-dmenu-desktop-2.17-r1.ebuild | 56 ++++++++++++++++++++++ x11-misc/j4-dmenu-desktop/metadata.xml | 3 ++ 2 files changed, 59 insertions(+) diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17-r1.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17-r1.ebuild new file mode 100644 index 00000000000..8a8d8c7525b --- /dev/null +++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +MY_PV="r${PV}" + +DESCRIPTION="A fast desktop replacement for i3-dmenu-desktop" +HOMEPAGE="https://github.com/enkore/j4-dmenu-desktop" +SRC_URI="https://github.com/enkore/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="+dmenu test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-cpp/catch:1 )" +RDEPEND="dmenu? ( x11-misc/dmenu )" + +S="${WORKDIR}/${PN}-${MY_PV}" + +src_prepare() { + cmake_src_prepare + + # Respect users CFLAGS + sed -i -e "s/-pedantic -O2//" CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DWITH_GIT_CATCH="no" + -DWITH_TESTS="$(usex test)" + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + doman j4-dmenu-desktop.1 +} + +pkg_postinst() { + if ! use dmenu; then + elog "As you have disabled the 'dmenu' use flag," + elog "x11-misc/dmenu won't be installed by default." + elog "" + elog "Since x11-misc/j4-dmenu-desktop uses x11-misc/dmenu as default," + elog "you must configure your own replacement with --dmenu=," + elog "as otherwise it won't work." + fi +} diff --git a/x11-misc/j4-dmenu-desktop/metadata.xml b/x11-misc/j4-dmenu-desktop/metadata.xml index 4e3a92938df..fd4200a4705 100644 --- a/x11-misc/j4-dmenu-desktop/metadata.xml +++ b/x11-misc/j4-dmenu-desktop/metadata.xml @@ -10,6 +10,9 @@ The purpose is to find .desktop files, but shell commands can also be executed. + + Use x11-misc/dmenu as default. Disable to use a different implementation. + https://github.com/enkore/j4-dmenu-desktop/issues enkore/j4-dmenu-desktop