diff --git a/gui-apps/nwg-launchers/Manifest b/gui-apps/nwg-launchers/Manifest index 823953f3e5..ffcd138f4a 100644 --- a/gui-apps/nwg-launchers/Manifest +++ b/gui-apps/nwg-launchers/Manifest @@ -1,2 +1,2 @@ -DIST nwg-launchers-0.4.1.tar.gz 49118 BLAKE2B db8344c2138a71e617218c7c9bc277e759e3f055867804cef6253a865ee0b738a5926271f0c00e33661a8a4cf61dcc15d8df948280703ef8c4ac504aa5c7982f SHA512 51b97535f7db691a0fed39a993a66835aa1190a1623800cc6c9454d416dfd5277510c310f4210753c5ceabb864cd8445b83d13dff59792459b5defaf0598cdad DIST nwg-launchers-0.4.2.tar.gz 49127 BLAKE2B f09f957c4c8f4c41d11d953abbc59d096a64a8ab51d6a57bcfacbe127580fa0476f0d72ab37d87a2d49c2b76596f8fd35369b66ea6fa9b32f7050dc3f29cb6c4 SHA512 6489c34e8f72ed6bd5a684b1a87e3d2611e4ee7bd48840105af91dfc0f95a29b0ff801aa90f793b82b49a31f5001f61329a029f0c63e028933223d195efdd52a +DIST nwg-launchers-0.4.3.tar.gz 50615 BLAKE2B ff10a4438f371e8cf3166dc289dfe6a2266d8a332d50312563e0878b786e4e214c9828cf8d424ba552f3d07a36b30e922b7c381b386d315e784862ca8c979086 SHA512 6e280868019c3a657f49e48439efbe98d7ddf387cabeb03f41f987d060ef0b07e9bdd2e685fa462ade6baa9d867512b40d671e5085684451986801b339f28534 diff --git a/gui-apps/nwg-launchers/nwg-launchers-0.4.1.ebuild b/gui-apps/nwg-launchers/nwg-launchers-0.4.1.ebuild deleted file mode 100644 index dee57da34a..0000000000 --- a/gui-apps/nwg-launchers/nwg-launchers-0.4.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ "${PV}" == 9999 ]] -then - inherit git-r3 - EGIT_REPO_URI="https://github.com/nwg-piotr/nwg-launchers.git" -else - SRC_URI="https://github.com/nwg-piotr/nwg-launchers/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi -inherit meson - -DESCRIPTION="GTK+ launchers for sway, i3 and some other WMs" -HOMEPAGE="https://github.com/nwg-piotr/nwg-launchers" -LICENSE="GPL-3" - -SLOT="0" - -RDEPEND=" - x11-libs/gtk+:3 - dev-cpp/gtkmm:3.0 - dev-cpp/nlohmann_json" -DEPEND="${RDEPEND}" - -IUSE="+bar +dmenu +grid" - -RESTRICT="mirror test" - -src_configure() { - meson_src_configure $(meson_use bar) $(meson_use dmenu) $(meson_use grid) -} diff --git a/gui-apps/nwg-launchers/nwg-launchers-0.4.2-r1.ebuild b/gui-apps/nwg-launchers/nwg-launchers-0.4.2-r1.ebuild index 914a82d851..8b26640731 100644 --- a/gui-apps/nwg-launchers/nwg-launchers-0.4.2-r1.ebuild +++ b/gui-apps/nwg-launchers/nwg-launchers-0.4.2-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 @@ -11,7 +11,7 @@ else SRC_URI="https://github.com/nwg-piotr/nwg-launchers/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" fi -inherit meson +inherit meson xdg DESCRIPTION="GTK+ launchers for sway, i3 and some other WMs" HOMEPAGE="https://github.com/nwg-piotr/nwg-launchers" @@ -25,6 +25,8 @@ RDEPEND=" dev-cpp/nlohmann_json" DEPEND="${RDEPEND}" +RESTRICT="mirror" + IUSE="+bar +dmenu +grid" src_configure() { diff --git a/gui-apps/nwg-launchers/nwg-launchers-0.4.2.ebuild b/gui-apps/nwg-launchers/nwg-launchers-0.4.3.ebuild similarity index 77% rename from gui-apps/nwg-launchers/nwg-launchers-0.4.2.ebuild rename to gui-apps/nwg-launchers/nwg-launchers-0.4.3.ebuild index dc44e26d60..8b26640731 100644 --- a/gui-apps/nwg-launchers/nwg-launchers-0.4.2.ebuild +++ b/gui-apps/nwg-launchers/nwg-launchers-0.4.3.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 @@ -11,11 +11,11 @@ else SRC_URI="https://github.com/nwg-piotr/nwg-launchers/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" fi -inherit meson +inherit meson xdg DESCRIPTION="GTK+ launchers for sway, i3 and some other WMs" HOMEPAGE="https://github.com/nwg-piotr/nwg-launchers" -LICENSE="GPL-3" +LICENSE="GPL-3 CC-BY-SA-3.0" SLOT="0" @@ -25,10 +25,17 @@ RDEPEND=" dev-cpp/nlohmann_json" DEPEND="${RDEPEND}" -IUSE="+bar +dmenu +grid" - RESTRICT="mirror" +IUSE="+bar +dmenu +grid" + src_configure() { meson_src_configure $(meson_use bar) $(meson_use dmenu) $(meson_use grid) } + +src_install() { + meson_src_install + + insinto /usr/share/icons/nwg-launchers + doins -r "${FILESDIR}"/. +} diff --git a/gui-apps/nwg-launchers/nwg-launchers-9999.ebuild b/gui-apps/nwg-launchers/nwg-launchers-9999.ebuild index 914a82d851..8b26640731 100644 --- a/gui-apps/nwg-launchers/nwg-launchers-9999.ebuild +++ b/gui-apps/nwg-launchers/nwg-launchers-9999.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 @@ -11,7 +11,7 @@ else SRC_URI="https://github.com/nwg-piotr/nwg-launchers/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" fi -inherit meson +inherit meson xdg DESCRIPTION="GTK+ launchers for sway, i3 and some other WMs" HOMEPAGE="https://github.com/nwg-piotr/nwg-launchers" @@ -25,6 +25,8 @@ RDEPEND=" dev-cpp/nlohmann_json" DEPEND="${RDEPEND}" +RESTRICT="mirror" + IUSE="+bar +dmenu +grid" src_configure() {