From d42200bec37eef2a7478d88988ff00addd0a9202 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Jan 2020 11:50:47 +0000 Subject: gentoo resync : 25.01.2020 --- gui-wm/Manifest.gz | Bin 396 -> 394 bytes gui-wm/sway/Manifest | 6 +-- gui-wm/sway/sway-1.1.1.ebuild | 112 ---------------------------------------- gui-wm/sway/sway-1.4.ebuild | 116 ++++++++++++++++++++++++++++++++++++++++++ gui-wm/sway/sway-9999.ebuild | 8 +-- 5 files changed, 124 insertions(+), 118 deletions(-) delete mode 100644 gui-wm/sway/sway-1.1.1.ebuild create mode 100644 gui-wm/sway/sway-1.4.ebuild (limited to 'gui-wm') diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz index 5b24c19dd40e..39d582808b65 100644 Binary files a/gui-wm/Manifest.gz and b/gui-wm/Manifest.gz differ diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest index eaf8a1a231a3..3d08a6351468 100644 --- a/gui-wm/sway/Manifest +++ b/gui-wm/sway/Manifest @@ -1,6 +1,6 @@ -DIST sway-1.1.1.tar.gz 5480615 BLAKE2B 2cc55535a030d5d057c332a8b2647f394ec8f08a3a5aebe48e0bd21da718eac23bdbcc5a2ce26624efb9360518e5f14eaafe406e1c7d9b3eb81621bab7b6c39c SHA512 2585446ca0936df41c7959b6b48487b25c86f1a8a3bedcd146aab023a873a416ce750698e3cabcd9cb861e35bbd7e280574ff477152906669af9b17d3e54028e DIST sway-1.2.tar.gz 5493376 BLAKE2B f059ec7c3db7ff048129c9d701e8730b04f01670dc3b1be826ef3d609f2881ddf1e3bfd82c39bebf5e7e99127f7250239b2af76292f60cfa208fc465f14cd779 SHA512 b43f625d35145a3377e64ea942f8b005946bb0925f08deace2da73ab504038b29331df9943296c97141e2283cd9b55e6cb3bca18c5c3999ecbd461325e36165b -EBUILD sway-1.1.1.ebuild 2950 BLAKE2B 9658c0b1282956f91bfa19bce0d0a7bc04cffeac562a4a5c73bf2dc40aa2f15ec1e180d48a66bc7a41bcf03738c2bd7cd926dde5af7cfe46e1ac6fce862d392b SHA512 415489fc1450e4aded50e663cc6f3a96153e56376318fe097ec9419913f65d5f44712ddaaf9ec42b9cdf9e7e20f60b90243804bc074719106141d5ceca447e04 +DIST sway-1.4.tar.gz 5514489 BLAKE2B 31eb1aee32079e643cc7a0263a097000c089e36916ea2a681e1ec696f8329e7ecfe3c8a981ec3b6d4e3dd99c8e263b2c208dbe602308d6bdaf4cdabbb3c10971 SHA512 3b280bdfdbdae8fb9b4f555bc630c64e7c1d09f7b2c783b99413863a6b620d50cd2b6d10d63e11fdfb9c678fce9a403228ac52fa69fb52561ffbd06790505a71 EBUILD sway-1.2.ebuild 3007 BLAKE2B 60398d99e26096f39a2c84f2f6ed3ba6f4bcadcacc82c813ba7fb44dc8412dbc5e8d2fa55435d86e2cf6a7ef9f679dfe91d19fe02b11c23138877faf677b36e6 SHA512 feb50d347bfcf7e144039393cfcc34ea4694c9934557279fe66ba82ec7b7bee6ff048d9741112d37463a4a718a3fb0425202b056f9149a098388fb0d87dda51c -EBUILD sway-9999.ebuild 3041 BLAKE2B 47d93074eec956d20b3a1d5daafcb0dfd38b136dddf3c4d1a0e15b25b0b34f635b423dbdf8f099bfb9400cfc0ed56a1aa3bb5dff86ba4e140588b11cbea4760c SHA512 e32e1d34329133729f01f505cf5a4bc3013cd34fe566d291f93fd41ec3c8ea7999c959f46fd7cc57354abd106ea78e3ed69d1fecc70995d60798151d78b54a7d +EBUILD sway-1.4.ebuild 3045 BLAKE2B 7a6ebdaf0a6a923b915af7e1363f63555780fa37f0d4c5ba81f608de0f3481163dc1aa91e0dec51d7a2a0eb6677d5ec9d0c4f6de22d101c94d89d3924015e63f SHA512 86f1ce470af97a3a14cf9b9bc81bda806e5ce6f43eb806de2752f96dc4a372735ac8c6a7a9bd8f81063ad7d0f9bb519155a1c435958b307a745f9506a8386033 +EBUILD sway-9999.ebuild 3045 BLAKE2B 7a6ebdaf0a6a923b915af7e1363f63555780fa37f0d4c5ba81f608de0f3481163dc1aa91e0dec51d7a2a0eb6677d5ec9d0c4f6de22d101c94d89d3924015e63f SHA512 86f1ce470af97a3a14cf9b9bc81bda806e5ce6f43eb806de2752f96dc4a372735ac8c6a7a9bd8f81063ad7d0f9bb519155a1c435958b307a745f9506a8386033 MISC metadata.xml 2374 BLAKE2B e17f6ebbeca77d00043359eb5eec3cf6070c8b3ef1c852dbcbf9ef69e2ae558b78eebf37485e21d475d45f33015a97bc6a61740e158d2aafd1695b842262b5bd SHA512 e232fe896f8fd0c8e7293093fba00c03604771740e5984978f32605f62e86f5d97d5ba95a10488b354d30d65a94bb33a051e21196bba1b0693ee13cef09ce33d diff --git a/gui-wm/sway/sway-1.1.1.ebuild b/gui-wm/sway/sway-1.1.1.ebuild deleted file mode 100644 index 2e0fd50b6e4b..000000000000 --- a/gui-wm/sway/sway-1.1.1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2019 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 x86" - S="${WORKDIR}/${PN}-${MY_PV}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag 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 - 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 ) - X? ( x11-libs/libxcb:0= ) -" -if [[ ${PV} == 9999 ]]; then - DEPEND+="~gui-libs/wlroots-9999[elogind=,systemd=,X=]" -else - DEPEND+=">=gui-libs/wlroots-0.6.0[elogind=,systemd=,X=]" -fi -RDEPEND=" - x11-misc/xkeyboard-config - ${DEPEND} -" -BDEPEND=" - >=dev-libs/wayland-protocols-1.14 - 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; then - fowners root:0 /usr/bin/sway - fperms 4511 /usr/bin/sway - fi -} - -pkg_postinst() { - if ! use systemd && ! use elogind; 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 -} diff --git a/gui-wm/sway/sway-1.4.ebuild b/gui-wm/sway/sway-1.4.ebuild new file mode 100644 index 000000000000..4e8d954b57fd --- /dev/null +++ b/gui-wm/sway/sway-1.4.ebuild @@ -0,0 +1,116 @@ +# 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 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] + 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 ) + X? ( x11-libs/libxcb:0= ) +" +if [[ ${PV} == 9999 ]]; then + DEPEND+="~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]" +else + DEPEND+=" + >=gui-libs/wlroots-0.10.0:=[elogind=,systemd=,X=] +