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 9910C1382C5 for ; Thu, 21 Jan 2021 19:06:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9469DE07A5; Thu, 21 Jan 2021 19:06:14 +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 6B051E07A5 for ; Thu, 21 Jan 2021 19:06:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 9660F340BDA for ; Thu, 21 Jan 2021 19:06:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F14ED49 for ; Thu, 21 Jan 2021 19:06:10 +0000 (UTC) From: "Matthew Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" Message-ID: <1611255965.bda305d5d857908a178072f810c36ba68a56c915.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-wm/sway/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-wm/sway/sway-1.5.1-r1.ebuild gui-wm/sway/sway-1.5.1.ebuild X-VCS-Directories: gui-wm/sway/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: bda305d5d857908a178072f810c36ba68a56c915 X-VCS-Branch: master Date: Thu, 21 Jan 2021 19:06:10 +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: ba1aeb40-d960-413b-b49b-ae35c6d8fe97 X-Archives-Hash: 018d7478887b8c7e7d08ce751fcbc6d0 commit: bda305d5d857908a178072f810c36ba68a56c915 Author: Matthew Thode gentoo org> AuthorDate: Thu Jan 21 18:48:17 2021 +0000 Commit: Matthew Thode gentoo org> CommitDate: Thu Jan 21 19:06:05 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bda305d5 gui-wm/sway: stablize 1.5.1-r1 with cleanup Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Matthew Thode gentoo.org> gui-wm/sway/sway-1.5.1-r1.ebuild | 4 +- gui-wm/sway/sway-1.5.1.ebuild | 117 --------------------------------------- 2 files changed, 2 insertions(+), 119 deletions(-) diff --git a/gui-wm/sway/sway-1.5.1-r1.ebuild b/gui-wm/sway/sway-1.5.1-r1.ebuild index 1d2aa6e981d..f9c1308658c 100644 --- a/gui-wm/sway/sway-1.5.1-r1.ebuild +++ b/gui-wm/sway/sway-1.5.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then else MY_PV=${PV/_rc/-rc} SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 arm64 ~ppc64 x86" S="${WORKDIR}/${PN}-${MY_PV}" fi diff --git a/gui-wm/sway/sway-1.5.1.ebuild b/gui-wm/sway/sway-1.5.1.ebuild deleted file mode 100644 index d7f2f7059d3..00000000000 --- a/gui-wm/sway/sway-1.5.1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils meson - -DESCRIPTION="i3-compatible Wayland window manager" -HOMEPAGE="https://swaywm.org" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/swaywm/${PN}.git" -else - MY_PV=${PV/_rc/-rc} - SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm64 ~ppc64 x86" - S="${WORKDIR}/${PN}-${MY_PV}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X zsh-completion" -REQUIRED_USE="?? ( elogind systemd ) - tray? ( || ( elogind systemd ) )" - -DEPEND=" - >=dev-libs/json-c-0.13:0= - >=dev-libs/libinput-1.6.0:0= - dev-libs/libpcre - dev-libs/wayland - x11-libs/cairo - x11-libs/libxkbcommon - x11-libs/pango - x11-libs/pixman - media-libs/mesa[gles2,libglvnd(+)] - elogind? ( >=sys-auth/elogind-239 ) - swaybar? ( x11-libs/gdk-pixbuf:2 ) - swaybg? ( gui-apps/swaybg ) - swayidle? ( gui-apps/swayidle ) - swaylock? ( gui-apps/swaylock ) - systemd? ( >=sys-apps/systemd-239 ) - wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) - X? ( x11-libs/libxcb:0= ) -" -if [[ ${PV} == 9999 ]]; then - DEPEND+="~gui-libs/wlroots-9999:=[elogind=,seatd=,systemd=,X=]" -else - DEPEND+=" - =gui-libs/wlroots-0.12.0*:=[elogind=,seatd=,systemd=,X=] - " -fi -RDEPEND=" - x11-misc/xkeyboard-config - ${DEPEND} -" -BDEPEND=" - >=dev-libs/wayland-protocols-1.14 - >=dev-util/meson-0.53.0 - virtual/pkgconfig -" -if [[ ${PV} == 9999 ]]; then - BDEPEND+="man? ( ~app-text/scdoc-9999 )" -else - BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )" -fi - -src_prepare() { - default - - use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \ - -e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die - use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \ - -e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die - use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \ - -e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die -} - -src_configure() { - local emesonargs=( - -Dman-pages=$(usex man enabled disabled) - -Dtray=$(usex tray enabled disabled) - -Dxwayland=$(usex X enabled disabled) - $(meson_use wallpapers default-wallpaper) - $(meson_use fish-completion fish-completions) - $(meson_use zsh-completion zsh-completions) - "-Dbash-completions=true" - "-Dwerror=false" - ) - - if use swaybar; then - emesonargs+=("-Dgdk-pixbuf=enabled") - else - emesonargs+=("-Dgdk-pixbuf=disabled") - fi - - meson_src_configure -} - -pkg_preinst() { - if ! use systemd && ! use elogind && ! use seatd; then - fowners root:0 /usr/bin/sway - fperms 4511 /usr/bin/sway - fi -} - -pkg_postinst() { - if ! use systemd && ! use elogind && ! use seatd; then - elog "" - elog "If you use ConsoleKit2, remember to launch sway using:" - elog "exec ck-launch-session sway" - elog "" - elog "If your system does not set the XDG_RUNTIME_DIR environment" - elog "variable, you must set it manually to run Sway. See wiki" - elog "for details: https://wiki.gentoo.org/wiki/Sway" - fi -}