diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-09-10 04:21:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-09-10 04:21:55 +0100 |
commit | 677b7ba5c317778df2ad7e70df94b9b7eec4adbc (patch) | |
tree | 6c418a1546fff5becab5d8b9ed6803323e7f316e /x11-wm/i3 | |
parent | fbda87924e6faa7a1919f1a2b4182490bde5ec5c (diff) |
gentoo resync : 10.09.2021
Diffstat (limited to 'x11-wm/i3')
-rw-r--r-- | x11-wm/i3/Manifest | 6 | ||||
-rw-r--r-- | x11-wm/i3/i3-4.19.1.ebuild | 2 | ||||
-rw-r--r-- | x11-wm/i3/i3-4.19.2.ebuild | 33 | ||||
-rw-r--r-- | x11-wm/i3/i3-9999.ebuild | 43 |
4 files changed, 47 insertions, 37 deletions
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest index c95041d7348c..ebe611cb2d83 100644 --- a/x11-wm/i3/Manifest +++ b/x11-wm/i3/Manifest @@ -8,7 +8,7 @@ DIST i3-4.19.tar.xz 1278600 BLAKE2B 3af5eac9cb618bc3b3da0bca430e1882701802f49e09 EBUILD i3-4.18.3.ebuild 2133 BLAKE2B f5b1ca5ab47d57102c358e72d958d4b0153d24b41573067f8760f80860150567a16839b5baf9270f80c9ac2daeb751c103a893ca4c8246e7f476f401200451d9 SHA512 6006b8efd31270c81b4ab4047ef22abc15779729d71ff6a6e3ab2a82376bf84c1e19eb80a6e5d22d7f68ea03d78ca088edd9d4c35e9aa5093a39e2d689d6648a EBUILD i3-4.18.ebuild 2126 BLAKE2B 29048fa9165965ccd572cbacc8fdcc15697384bb75039c2c77caa3970040b31592359c1aa4b8df9242fd8c455e0b1a44d33c76422a9e603235651828cb7020d3 SHA512 527a652e1c6e05b1730a404c38a612820aebc2619ea8baf63c3403cbaaa8a4a5608ba63586c4f5ab09d7d57225727ed3f1207da317110b2b50b31b224440820c EBUILD i3-4.19-r1.ebuild 2009 BLAKE2B 879d419a2519c1a9ed7d6450f2c61a2fd55e0092f372affcdf71a695b037086d02ba89563b2157cb10ed82b31abadc96e5b610a5a9d7b615256ca54da3e47b1f SHA512 1b102e92604ae0b0cb10dac8fba11f263915c87ca5572aa779d8c77be92e3bb2c9304229a2031a1cd32937d0bab56a1e7777ad70a3c8ac7bb42fa256ff93eb1b -EBUILD i3-4.19.1.ebuild 1964 BLAKE2B 0efd370883036b7cd359cf3fe4d98d96943d04a649d43aa826bca482def052b6ad9721b6b21ab561599dd97817ba8feebd2551bca690fde5117b762978e4d014 SHA512 350da5c0f9cb8b490567d6aeeb0b013376e667164df060fb012b563e77b6ccca2e623b0e3cf4e72bf1b1e1c48a577f74e2f0952ddfa11b8a78f260b7bd38a9c0 -EBUILD i3-4.19.2.ebuild 1971 BLAKE2B be37919b839646d9fb218db3b9d964c1b7d26d07a01039d6e2891c9aa235081fd92f14d1abf3e31b533a7e2ae4171d54f3501d0be12cb35e852b355b1f8eb5d1 SHA512 4191952f094743d0f6a4ce32ec2fb1098647478235e871007cfa193454f1d7406280aaf2bb81e48648879e414b18d4e7682854dc0ab5bacd76cf924f96fe447c -EBUILD i3-9999.ebuild 1964 BLAKE2B 0efd370883036b7cd359cf3fe4d98d96943d04a649d43aa826bca482def052b6ad9721b6b21ab561599dd97817ba8feebd2551bca690fde5117b762978e4d014 SHA512 350da5c0f9cb8b490567d6aeeb0b013376e667164df060fb012b563e77b6ccca2e623b0e3cf4e72bf1b1e1c48a577f74e2f0952ddfa11b8a78f260b7bd38a9c0 +EBUILD i3-4.19.1.ebuild 1963 BLAKE2B c4c67cbfe2936a71dbe28975de1ba900e38c0b6e950c5d2651f0495ce79070ead37168b97ebee170c23f27e96e50b93311296360e4bd42f2c7dd056649b9133b SHA512 b3e605f591aaed7fe4281efe32fc4172988b225f6445537ec4512564e9eb2dee08baf365b7361bcac10f0d0614140d1e4ccb6395df51ca72ead2c014e40d0e02 +EBUILD i3-4.19.2.ebuild 1973 BLAKE2B 6560c66a1e6b47f767f7b9b7711646aeab3603d4856dba9973751f12ba99019d4c0f5d45d6ab28a75f01652d300654847b7f6eea8be48efe797e0940adfd4697 SHA512 d240e390c4c7f949de52ac382421afd5cab2f507fbe2bec97756180424c098a2fb62190d595dc49c8a4d71e59a3b433cb8a0177086445315af7c82a5a7e10dc6 +EBUILD i3-9999.ebuild 1973 BLAKE2B 6560c66a1e6b47f767f7b9b7711646aeab3603d4856dba9973751f12ba99019d4c0f5d45d6ab28a75f01652d300654847b7f6eea8be48efe797e0940adfd4697 SHA512 d240e390c4c7f949de52ac382421afd5cab2f507fbe2bec97756180424c098a2fb62190d595dc49c8a4d71e59a3b433cb8a0177086445315af7c82a5a7e10dc6 MISC metadata.xml 466 BLAKE2B 68dae84f55852f76b6ad6df28add5f7db85c6f705bee50eb74cb2a85c22d52bdeed558e1548a32da4ff5e117112d9a0640ebe04080878a02ebedcaf18b4e6de0 SHA512 d634203a4ee1e160540f7d71531148d7a1694692c6f1b0287ac50930be6b3a0b545d01da674806d3afb637c9af99f0bd68a4215930a46463099a8ac8628aa97d diff --git a/x11-wm/i3/i3-4.19.1.ebuild b/x11-wm/i3/i3-4.19.1.ebuild index 99bd3b7ad0b6..8488d74426ae 100644 --- a/x11-wm/i3/i3-4.19.1.ebuild +++ b/x11-wm/i3/i3-4.19.1.ebuild @@ -15,7 +15,7 @@ if [[ "${PV}" = *9999 ]]; then EGIT_BRANCH="next" else SRC_URI="https://i3wm.org/downloads/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~x86" fi LICENSE="BSD" diff --git a/x11-wm/i3/i3-4.19.2.ebuild b/x11-wm/i3/i3-4.19.2.ebuild index 0b7b213271dd..8aedb5be5197 100644 --- a/x11-wm/i3/i3-4.19.2.ebuild +++ b/x11-wm/i3/i3-4.19.2.ebuild @@ -4,15 +4,13 @@ EAPI=7 inherit meson optfeature 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" + inherit git-r3 else SRC_URI="https://i3wm.org/downloads/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" @@ -21,12 +19,16 @@ fi LICENSE="BSD" SLOT="0" IUSE="doc test" +RESTRICT="!test? ( test )" -COMMON_DEPEND="dev-libs/libev +COMMON_DEPEND=" + dev-libs/libev dev-libs/libpcre dev-libs/yajl + x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] + x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor @@ -34,17 +36,17 @@ COMMON_DEPEND="dev-libs/libev x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config - x11-libs/cairo[X,xcb(+)] - x11-libs/pango[X]" -DEPEND="${COMMON_DEPEND} +" +DEPEND=" + ${COMMON_DEPEND} test? ( dev-perl/AnyEvent - dev-perl/X11-XCB + dev-perl/ExtUtils-PkgConfig dev-perl/Inline dev-perl/Inline-C dev-perl/IPC-Run - dev-perl/ExtUtils-PkgConfig dev-perl/local-lib + dev-perl/X11-XCB virtual/perl-Test-Simple x11-base/xorg-server[xephyr] x11-misc/xvfb-run @@ -53,15 +55,18 @@ DEPEND="${COMMON_DEPEND} app-text/asciidoc app-text/xmlto dev-lang/perl - )" -RDEPEND="${COMMON_DEPEND} + ) +" +RDEPEND=" + ${COMMON_DEPEND} dev-lang/perl dev-perl/AnyEvent-I3 - dev-perl/JSON-XS" + dev-perl/JSON-XS +" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch" + "${FILESDIR}"/${PN}-4.16-musl-GLOB_TILDE.patch ) src_prepare() { @@ -75,7 +80,7 @@ src_prepare() { src_configure() { local emesonargs=( - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} $(meson_use doc docs) $(meson_use doc mans) ) diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild index 99bd3b7ad0b6..8aedb5be5197 100644 --- a/x11-wm/i3/i3-9999.ebuild +++ b/x11-wm/i3/i3-9999.ebuild @@ -4,15 +4,13 @@ EAPI=7 inherit meson optfeature 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" + inherit git-r3 else SRC_URI="https://i3wm.org/downloads/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" @@ -21,12 +19,16 @@ fi LICENSE="BSD" SLOT="0" IUSE="doc test" +RESTRICT="!test? ( test )" -COMMON_DEPEND="dev-libs/libev +COMMON_DEPEND=" + dev-libs/libev dev-libs/libpcre dev-libs/yajl + x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] + x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor @@ -34,17 +36,17 @@ COMMON_DEPEND="dev-libs/libev x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config - x11-libs/cairo[X,xcb(+)] - x11-libs/pango[X]" -DEPEND="${COMMON_DEPEND} +" +DEPEND=" + ${COMMON_DEPEND} test? ( dev-perl/AnyEvent - dev-perl/X11-XCB + dev-perl/ExtUtils-PkgConfig dev-perl/Inline dev-perl/Inline-C dev-perl/IPC-Run - dev-perl/ExtUtils-PkgConfig dev-perl/local-lib + dev-perl/X11-XCB virtual/perl-Test-Simple x11-base/xorg-server[xephyr] x11-misc/xvfb-run @@ -53,21 +55,24 @@ DEPEND="${COMMON_DEPEND} app-text/asciidoc app-text/xmlto dev-lang/perl - )" -RDEPEND="${COMMON_DEPEND} + ) +" +RDEPEND=" + ${COMMON_DEPEND} dev-lang/perl dev-perl/AnyEvent-I3 - dev-perl/JSON-XS" + dev-perl/JSON-XS +" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch" + "${FILESDIR}"/${PN}-4.16-musl-GLOB_TILDE.patch ) src_prepare() { default - cat <<- EOF > "${T}"/i3wm + cat > "${T}"/i3wm <<- EOF || die #!/bin/sh exec /usr/bin/i3 EOF @@ -75,7 +80,7 @@ src_prepare() { src_configure() { local emesonargs=( - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} $(meson_use doc docs) $(meson_use doc mans) ) @@ -83,6 +88,10 @@ src_configure() { meson_src_configure } +src_test() { + virtx meson_src_test +} + src_install() { meson_src_install @@ -90,10 +99,6 @@ src_install() { doexe "${T}"/i3wm } -src_test() { - virtx meson_src_test -} - pkg_postinst() { optfeature_header "There are several packages that may be useful with i3:" optfeature "application launcher" x11-misc/dmenu |