From 1cb5e1aecf4ab0e06e80f35f6abdeb0e19120244 Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Tue, 17 Nov 2020 10:43:08 +0100 Subject: x11-wm/i3: Use meson_src_install explicitly Bug: https://bugs.gentoo.org/755032 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Nelo-T. Wallus Closes: https://github.com/gentoo/gentoo/pull/18295 Signed-off-by: Lars Wendler --- x11-wm/i3/i3-4.19-r1.ebuild | 106 ++++++++++++++++++++++++++++++++++++++++++++ x11-wm/i3/i3-4.19.ebuild | 106 -------------------------------------------- x11-wm/i3/i3-9999.ebuild | 2 +- 3 files changed, 107 insertions(+), 107 deletions(-) create mode 100644 x11-wm/i3/i3-4.19-r1.ebuild delete mode 100644 x11-wm/i3/i3-4.19.ebuild (limited to 'x11-wm/i3') diff --git a/x11-wm/i3/i3-4.19-r1.ebuild b/x11-wm/i3/i3-4.19-r1.ebuild new file mode 100644 index 000000000000..3c6f131dc56b --- /dev/null +++ b/x11-wm/i3/i3-4.19-r1.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson virtualx +if [[ "${PV}" = *9999 ]]; then + inherit git-r3 +fi + +DESCRIPTION="An improved dynamic tiling window manager" +HOMEPAGE="https://i3wm.org/" +if [[ "${PV}" = *9999 ]]; then + EGIT_REPO_URI="https://github.com/i3/i3" + EGIT_BRANCH="next" +else + SRC_URI="https://i3wm.org/downloads/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="doc test" + +CDEPEND="dev-libs/libev + dev-libs/libpcre + dev-libs/yajl + x11-libs/libxcb[xkb] + x11-libs/libxkbcommon[X] + x11-libs/startup-notification + x11-libs/xcb-util + x11-libs/xcb-util-cursor + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-wm + x11-libs/xcb-util-xrm + x11-misc/xkeyboard-config + x11-libs/cairo[X,xcb(+)] + x11-libs/pango[X]" +DEPEND="${CDEPEND} + test? ( + dev-perl/AnyEvent + dev-perl/X11-XCB + dev-perl/Inline + dev-perl/Inline-C + dev-perl/IPC-Run + dev-perl/ExtUtils-PkgConfig + dev-perl/local-lib + virtual/perl-Test-Simple + x11-base/xorg-server[xephyr] + x11-misc/xvfb-run + ) + doc? ( + app-text/asciidoc + app-text/xmlto + dev-lang/perl + )" +RDEPEND="${CDEPEND} + dev-lang/perl + dev-perl/AnyEvent-I3 + dev-perl/JSON-XS" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch" +) + +src_prepare() { + default + + cat <<- EOF > "${T}"/i3wm + #!/bin/sh + exec /usr/bin/i3 + EOF +} + +src_configure() { + local emesonargs=( + $(meson_use doc docs) + $(meson_use doc mans) + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + exeinto /etc/X11/Sessions + doexe "${T}"/i3wm +} + +src_test() { + virtx meson_src_test +} + +pkg_postinst() { + # Only show the elog information on a new install + if [[ ! ${REPLACING_VERSIONS} ]]; then + elog "There are several packages that you may find useful with ${PN} and" + elog "their usage is suggested by the upstream maintainers, namely:" + elog " x11-misc/dmenu" + elog " x11-misc/i3status" + elog " x11-misc/i3lock" + elog "Please refer to their description for additional info." + fi +} diff --git a/x11-wm/i3/i3-4.19.ebuild b/x11-wm/i3/i3-4.19.ebuild deleted file mode 100644 index 1f996455176e..000000000000 --- a/x11-wm/i3/i3-4.19.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson virtualx -if [[ "${PV}" = *9999 ]]; then - inherit git-r3 -fi - -DESCRIPTION="An improved dynamic tiling window manager" -HOMEPAGE="https://i3wm.org/" -if [[ "${PV}" = *9999 ]]; then - EGIT_REPO_URI="https://github.com/i3/i3" - EGIT_BRANCH="next" -else - SRC_URI="https://i3wm.org/downloads/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="doc test" - -CDEPEND="dev-libs/libev - dev-libs/libpcre - dev-libs/yajl - x11-libs/libxcb[xkb] - x11-libs/libxkbcommon[X] - x11-libs/startup-notification - x11-libs/xcb-util - x11-libs/xcb-util-cursor - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-wm - x11-libs/xcb-util-xrm - x11-misc/xkeyboard-config - x11-libs/cairo[X,xcb(+)] - x11-libs/pango[X]" -DEPEND="${CDEPEND} - test? ( - dev-perl/AnyEvent - dev-perl/X11-XCB - dev-perl/Inline - dev-perl/Inline-C - dev-perl/IPC-Run - dev-perl/ExtUtils-PkgConfig - dev-perl/local-lib - virtual/perl-Test-Simple - x11-base/xorg-server[xephyr] - x11-misc/xvfb-run - ) - doc? ( - app-text/asciidoc - app-text/xmlto - dev-lang/perl - )" -RDEPEND="${CDEPEND} - dev-lang/perl - dev-perl/AnyEvent-I3 - dev-perl/JSON-XS" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch" -) - -src_prepare() { - default - - cat <<- EOF > "${T}"/i3wm - #!/bin/sh - exec /usr/bin/i3 - EOF -} - -src_configure() { - local emesonargs=( - $(meson_use doc docs) - $(meson_use doc mans) - ) - - meson_src_configure -} - -src_install() { - default - - exeinto /etc/X11/Sessions - doexe "${T}"/i3wm -} - -src_test() { - virtx meson_src_test -} - -pkg_postinst() { - # Only show the elog information on a new install - if [[ ! ${REPLACING_VERSIONS} ]]; then - elog "There are several packages that you may find useful with ${PN} and" - elog "their usage is suggested by the upstream maintainers, namely:" - elog " x11-misc/dmenu" - elog " x11-misc/i3status" - elog " x11-misc/i3lock" - elog "Please refer to their description for additional info." - fi -} diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild index 1f996455176e..3c6f131dc56b 100644 --- a/x11-wm/i3/i3-9999.ebuild +++ b/x11-wm/i3/i3-9999.ebuild @@ -83,7 +83,7 @@ src_configure() { } src_install() { - default + meson_src_install exeinto /etc/X11/Sessions doexe "${T}"/i3wm -- cgit v1.2.3-18-g5258