From 36ac65103bf5503e5bad1ecc7e8cb9e7643f6840 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 13 Sep 2019 17:49:31 +0100 Subject: Revert "gentoo resync : 13.09.2019" This reverts commit a1392efe64137262023d92492396ca9156d22396. --- gui-apps/Manifest.gz | Bin 1543 -> 1543 bytes gui-apps/waybar/Manifest | 8 ++--- gui-apps/waybar/metadata.xml | 1 + gui-apps/waybar/waybar-0.7.2-r1.ebuild | 58 +++++++++++++++++++++++++++++++ gui-apps/waybar/waybar-0.8.0.ebuild | 60 --------------------------------- gui-apps/waybar/waybar-9999.ebuild | 16 ++++----- 6 files changed, 70 insertions(+), 73 deletions(-) create mode 100644 gui-apps/waybar/waybar-0.7.2-r1.ebuild delete mode 100644 gui-apps/waybar/waybar-0.8.0.ebuild (limited to 'gui-apps') diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz index 7c4fc0783664..6454fda74001 100644 Binary files a/gui-apps/Manifest.gz and b/gui-apps/Manifest.gz differ diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest index 853994a590cf..78f183f467f4 100644 --- a/gui-apps/waybar/Manifest +++ b/gui-apps/waybar/Manifest @@ -1,4 +1,4 @@ -DIST waybar-0.8.0.tar.gz 112019 BLAKE2B b3b61e02a104599e8f9047f9e2f76ec57ef7dd164edca2afd7b0afbb6b2c2341e20d6175905eba525337df9215473afa6cf017f736bb2de24e4daa169a5af3ee SHA512 c670fd21a7d29396d8bbe1b7540ddbbe44a98f7fb49f8518e0cc302aa57e5bb993ff8306973a7b8ca4ec000a7ecc311872762a0782ce19e4bf4cff8ea09caccb -EBUILD waybar-0.8.0.ebuild 1276 BLAKE2B 8768bd945677fee49b286d8e34de755b687c222525dd8d34bfad3459a2e2f49c9da0a7415bf1c709a9bdc0ee6e39a857060b72d98685a221c38bc3ba6cc0bf1d SHA512 edea2c41126379a6887a6c33e87a59322eb241fd9afc855e6183b44aefee72b32d6f73cbf77cfd968f1c05bc4f7b27a145bd4c907253168301b61151b752a637 -EBUILD waybar-9999.ebuild 1276 BLAKE2B 8768bd945677fee49b286d8e34de755b687c222525dd8d34bfad3459a2e2f49c9da0a7415bf1c709a9bdc0ee6e39a857060b72d98685a221c38bc3ba6cc0bf1d SHA512 edea2c41126379a6887a6c33e87a59322eb241fd9afc855e6183b44aefee72b32d6f73cbf77cfd968f1c05bc4f7b27a145bd4c907253168301b61151b752a637 -MISC metadata.xml 998 BLAKE2B 2aeae48c242cc18cd6a6a28ba48424d5bdb5a2b2cff65553d99ee408e2242f0402ddc6bd2e0e45fbe44d380d7a3e5f5201c4d988048ccc3727932453e86c285a SHA512 cfdbd3845174d2e00dab95c2bb7e11854de2a54bdd5972026e3a1451627f29dc6cc1ae759a4db885625919265c8598a0bf2df1eec492d89430611c575d610d8c +DIST waybar-0.7.2.tar.gz 101206 BLAKE2B d44b46c840094340e1e5f70d4ef3d01faf483a8c744ce6b549c1fa8767bf455c4c0ef67b564c61795e44c652d37c09848cce6f50ee3664de73477da6b4bce84e SHA512 d83f92d0111cdd01b276907fad18344dbf35be1e0bbbce2208f928e0d5e0fcccfa65ff2279de5a7e4dad5f04a6c99521670d75d65e32a0382bec2bf32eea00e2 +EBUILD waybar-0.7.2-r1.ebuild 1308 BLAKE2B 82a7f8be5413cd2a4c72344853ff8a8ce9a9889ff72f0603c0f4b222479cc9d192e52923171fe16f5d076f240c6c693d9e9db2af75e96aba39bc8c44ea645853 SHA512 14f9d375ec051c64eeb38891283bf9cf4068db4c8954feb490a87e26d987f19517f0c44fbbbb68c37627a20d0d757245276b76962baa58cd74a83acfd466db16 +EBUILD waybar-9999.ebuild 1308 BLAKE2B 82a7f8be5413cd2a4c72344853ff8a8ce9a9889ff72f0603c0f4b222479cc9d192e52923171fe16f5d076f240c6c693d9e9db2af75e96aba39bc8c44ea645853 SHA512 14f9d375ec051c64eeb38891283bf9cf4068db4c8954feb490a87e26d987f19517f0c44fbbbb68c37627a20d0d757245276b76962baa58cd74a83acfd466db16 +MISC metadata.xml 1090 BLAKE2B 5715f34c1493cb3c3b32697c30abe64c40dd28eec3cac3db8bd9c12b288c11d32ed21b8e11f744b8d9401965e29807a2126885f441f038e923b6c2357b8adea7 SHA512 b8dd49c8c049fcc4bf914e1aaa3ec178f59a3cb1094bb0130b2127016033fd2fb1e684e263412d1527159569c899dbe1720ccb5886dc31cb7a54da4f72ccabea diff --git a/gui-apps/waybar/metadata.xml b/gui-apps/waybar/metadata.xml index c61fcb565127..3ff34b03135a 100644 --- a/gui-apps/waybar/metadata.xml +++ b/gui-apps/waybar/metadata.xml @@ -13,6 +13,7 @@ Highly customizable Wayland bar for Sway and Wlroots based compositors. + Build with Clang's libc++ instead of libstdc++ on Linux. Enable support for the Music Player Daemon Enable libnl support for network related features Enable support for tray diff --git a/gui-apps/waybar/waybar-0.7.2-r1.ebuild b/gui-apps/waybar/waybar-0.7.2-r1.ebuild new file mode 100644 index 000000000000..c26192592d71 --- /dev/null +++ b/gui-apps/waybar/waybar-0.7.2-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson + +DESCRIPTION="Highly customizable Wayland bar for Sway and Wlroots based compositors." +HOMEPAGE="https://github.com/Alexays/Waybar" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Alexays/${PN^}.git" +else + SRC_URI="https://github.com/Alexays/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="libcxx mpd network pulseaudio tray +udev" + +DEPEND=" + dev-cpp/gtkmm:3.0 + dev-libs/jsoncpp:= + dev-libs/libinput:= + dev-libs/libsigc++:2 + >=dev-libs/libfmt-5.3.0:0/5 + >=dev-libs/spdlog-1.3.1:= + dev-libs/wayland + dev-libs/wayland-protocols + gui-libs/wlroots + libcxx? ( sys-libs/libcxx ) + mpd? ( media-libs/libmpdclient ) + network? ( dev-libs/libnl:3 ) + pulseaudio? ( media-sound/pulseaudio ) + tray? ( dev-libs/libdbusmenu[gtk3] ) + udev? ( virtual/libudev:= )" + +RDEPEND="${DEPEND}" + +BDEPEND="virtual/pkgconfig" + +if [[ ${PV} != 9999 ]]; then + S="${WORKDIR}/${PN^}-${PV}" +fi + +src_configure() { + local emesonargs=( + $(meson_use libcxx) + $(meson_feature mpd) + $(meson_feature network libnl) + $(meson_feature pulseaudio) + $(meson_feature tray dbusmenu-gtk) + $(meson_feature udev libudev) + ) + meson_src_configure +} diff --git a/gui-apps/waybar/waybar-0.8.0.ebuild b/gui-apps/waybar/waybar-0.8.0.ebuild deleted file mode 100644 index 8cd23063c51d..000000000000 --- a/gui-apps/waybar/waybar-0.8.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson - -DESCRIPTION="Highly customizable Wayland bar for Sway and Wlroots based compositors." -HOMEPAGE="https://github.com/Alexays/Waybar" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/Alexays/${PN^}.git" -else - SRC_URI="https://github.com/Alexays/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="mpd network pulseaudio tray +udev" - -BDEPEND=" - >=app-text/scdoc-1.9.2 - virtual/pkgconfig -" - -DEPEND=" - dev-cpp/gtkmm:3.0 - dev-libs/jsoncpp:= - dev-libs/libinput:= - dev-libs/libsigc++:2 - >=dev-libs/libfmt-5.3.0:= - >=dev-libs/spdlog-1.3.1:= - dev-libs/wayland - dev-libs/wayland-protocols - gui-libs/wlroots - mpd? ( media-libs/libmpdclient ) - network? ( dev-libs/libnl:3 ) - pulseaudio? ( media-sound/pulseaudio ) - tray? ( dev-libs/libdbusmenu[gtk3] ) - udev? ( virtual/libudev:= ) -" - -RDEPEND="${DEPEND}" - -if [[ ${PV} != 9999 ]]; then - S="${WORKDIR}/${PN^}-${PV}" -fi - -src_configure() { - local emesonargs=( - $(meson_feature mpd) - $(meson_feature network libnl) - $(meson_feature pulseaudio) - $(meson_feature tray dbusmenu-gtk) - $(meson_feature udev libudev) - ) - meson_src_configure -} diff --git a/gui-apps/waybar/waybar-9999.ebuild b/gui-apps/waybar/waybar-9999.ebuild index 8cd23063c51d..c26192592d71 100644 --- a/gui-apps/waybar/waybar-9999.ebuild +++ b/gui-apps/waybar/waybar-9999.ebuild @@ -18,38 +18,36 @@ fi LICENSE="MIT" SLOT="0" -IUSE="mpd network pulseaudio tray +udev" - -BDEPEND=" - >=app-text/scdoc-1.9.2 - virtual/pkgconfig -" +IUSE="libcxx mpd network pulseaudio tray +udev" DEPEND=" dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 - >=dev-libs/libfmt-5.3.0:= + >=dev-libs/libfmt-5.3.0:0/5 >=dev-libs/spdlog-1.3.1:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots + libcxx? ( sys-libs/libcxx ) mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] ) - udev? ( virtual/libudev:= ) -" + udev? ( virtual/libudev:= )" RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + if [[ ${PV} != 9999 ]]; then S="${WORKDIR}/${PN^}-${PV}" fi src_configure() { local emesonargs=( + $(meson_use libcxx) $(meson_feature mpd) $(meson_feature network libnl) $(meson_feature pulseaudio) -- cgit v1.2.3