diff options
| -rw-r--r-- | profiles/package.mask | 6 | ||||
| -rw-r--r-- | x11-wm/i3-gaps/Manifest | 3 | ||||
| -rw-r--r-- | x11-wm/i3-gaps/files/i3-gaps-4.18-musl.patch | 74 | ||||
| -rw-r--r-- | x11-wm/i3-gaps/i3-gaps-4.20.1.ebuild | 85 | ||||
| -rw-r--r-- | x11-wm/i3-gaps/i3-gaps-4.21-r2.ebuild | 85 | ||||
| -rw-r--r-- | x11-wm/i3-gaps/i3-gaps-4.21.1.ebuild | 85 | ||||
| -rw-r--r-- | x11-wm/i3-gaps/metadata.xml | 11 |
7 files changed, 0 insertions, 349 deletions
diff --git a/profiles/package.mask b/profiles/package.mask index 28708b1d66b3..6a7358cb9f54 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -293,12 +293,6 @@ dev-python/cbor # Removal on 2023-05-09 net-im/wazzapp-bin -# John Helmert III <ajak@gentoo.org> (2023-04-08) -# i3-gaps has been meregd into upstream i3. Use x11-wm/i3 instead. -# See also: https://github.com/i3/i3/issues/3724 -# Removal on 2023-05-08. -x11-wm/i3-gaps - # Ionen Wolkens <ionen@gentoo.org> (2023-03-30) # NVIDIA dropped support for the 390.xx branch in December 2022[1]. # diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest deleted file mode 100644 index e630aa455874..000000000000 --- a/x11-wm/i3-gaps/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST i3-gaps-4.20.1.tar.gz 4199697 BLAKE2B b9297f95d8e29f6bcc2fa89ba99c30bd9c4df3549de8b4eff018c0ad1e39e1c5a89281e5a0994596b6af08e8bdf94b8df866667042023dc757fa2596770484be SHA512 0f3cab505f5dcd11d4d9ab63aa84d7d90e63ffebe6a867c9592c7979fe57d37db69869d555ea2127b84caa108778a028e03fa8fab1432d897c02723e3c83e6ba -DIST i3-gaps-4.21.1.tar.gz 4214689 BLAKE2B 5194a9b148c9909834f70c6cc3aaf771682bf0f1874358ef8c54004fa62fa4a648ccbf42c7e122a8f1d2769773efb3a39378a426506bff59400258ca0d485687 SHA512 9ef5bd2b658609907b0f76894508fdf2f9b94b85e5d211489f7b4bf7d98e8a66a670a040c8770f85795d929c8e07239cacc50082c6044ee78cf51633a78b4ce4 -DIST i3-gaps-4.21.tar.gz 4212229 BLAKE2B ee871dcb374d3dadbcf3c1b4be230be9b608902c2cc9923a635d2fb8f3896e01361b270c09ec69d5a0bddd4b53181db8e6545346a03a30df53d6dccf6b990514 SHA512 5bf423977a92e8d428eb13019bd683948584c876429290b17e118135e8d9cc16545dd62ee07befd54adfc0f3dba3c0f7748e58e3fe4f3aa484e3f00a9af75a16 diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.18-musl.patch b/x11-wm/i3-gaps/files/i3-gaps-4.18-musl.patch deleted file mode 100644 index bf59b32e3f70..000000000000 --- a/x11-wm/i3-gaps/files/i3-gaps-4.18-musl.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- a/i3bar/src/main.c -+++ b/i3bar/src/main.c -@@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) { - * - */ - static char *expand_path(char *path) { -- static glob_t globbuf; -- if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) { -- ELOG("glob() failed\n"); -- exit(EXIT_FAILURE); -+ char *home, *expanded; -+ -+ if (strncmp(path, "~/", 2) == 0) { -+ home = getenv("HOME"); -+ if (home != NULL) { -+ /* new length: sum - 1 (omit '~') + 1 (for '\0') */ -+ expanded = scalloc(strlen(home)+strlen(path), 1); -+ strcpy(expanded, home); -+ strcat(expanded, path+1); -+ return expanded; -+ } - } -- char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path); -- globfree(&globbuf); -- return result; -+ -+ return sstrdup(path); - } - - static void print_usage(char *elf_name) { ---- a/libi3/resolve_tilde.c -+++ b/libi3/resolve_tilde.c -@@ -19,28 +19,18 @@ - * - */ - char *resolve_tilde(const char *path) { -- static glob_t globbuf; -- char *head, *tail, *result; -+ char *home, *expanded; - -- tail = strchr(path, '/'); -- head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path)); -- -- int res = glob(head, GLOB_TILDE, NULL, &globbuf); -- free(head); -- /* no match, or many wildcard matches are bad */ -- if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1) -- result = sstrdup(path); -- else if (res != 0) { -- err(EXIT_FAILURE, "glob() failed"); -- } else { -- head = globbuf.gl_pathv[0]; -- result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1); -- strcpy(result, head); -- if (tail) { -- strcat(result, tail); -+ if (strncmp(path, "~/", 2) == 0) { -+ home = getenv("HOME"); -+ if (home != NULL) { -+ /* new length: sum - 1 (omit '~') + 1 (for '\0') */ -+ expanded = scalloc(strlen(home)+strlen(path), 1); -+ strcpy(expanded, home); -+ strcat(expanded, path+1); -+ return expanded; - } - } -- globfree(&globbuf); - -- return result; -+ return sstrdup(path); - } --- -2.27.0 - diff --git a/x11-wm/i3-gaps/i3-gaps-4.20.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.20.1.ebuild deleted file mode 100644 index db94abcd1d57..000000000000 --- a/x11-wm/i3-gaps/i3-gaps-4.20.1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson optfeature - -DESCRIPTION="i3 fork with gaps and some more features" -HOMEPAGE="https://github.com/Airblader/i3" -SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/i3-${PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND="dev-libs/glib:2 - 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 - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-wm - x11-libs/xcb-util-xrm" -DEPEND="${COMMON_DEPEND} - test? ( - dev-perl/ExtUtils-PkgConfig - dev-perl/IPC-Run - dev-perl/Inline - dev-perl/Inline-C - dev-perl/X11-XCB - dev-perl/XS-Object-Magic - x11-apps/xhost - x11-base/xorg-server[xephyr,xvfb] - x11-misc/xvfb-run - )" -BDEPEND="app-text/asciidoc - app-text/xmlto - dev-lang/perl - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - dev-lang/perl - dev-perl/AnyEvent-I3 - dev-perl/JSON-XS - !x11-wm/i3" - -DOCS=( RELEASE-NOTES-$(ver_cut 1-3) ) - -PATCHES=( - "${FILESDIR}/${PN}-4.18-musl.patch" -) - -src_configure() { - local emesonargs=( - -Ddocdir="/usr/share/doc/${PF}" - -Ddocs=$(usex doc true false) - -Dmans=true - ) - - meson_src_configure -} - -src_install() { - meson_src_install - - exeinto /etc/X11/Sessions - newexe - i3wm <<- EOF - #!/usr/bin/env sh - exec /usr/bin/i3 - EOF -} - -pkg_postinst() { - optfeature "Application launcher" x11-misc/dmenu - optfeature "Simple screen locker" x11-misc/i3lock - optfeature "Status bar generator" x11-misc/i3status -} diff --git a/x11-wm/i3-gaps/i3-gaps-4.21-r2.ebuild b/x11-wm/i3-gaps/i3-gaps-4.21-r2.ebuild deleted file mode 100644 index c0089941c838..000000000000 --- a/x11-wm/i3-gaps/i3-gaps-4.21-r2.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson optfeature - -DESCRIPTION="i3 fork with gaps and some more features" -HOMEPAGE="https://github.com/Airblader/i3" -SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/i3-${PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND="dev-libs/glib:2 - dev-libs/libev - dev-libs/libpcre2 - dev-libs/yajl:= - x11-libs/cairo[X,xcb(+)] - x11-libs/libxcb:= - x11-libs/libxkbcommon[X] - x11-libs/pango[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" -DEPEND="${COMMON_DEPEND} - test? ( - dev-perl/ExtUtils-PkgConfig - dev-perl/IPC-Run - dev-perl/Inline - dev-perl/Inline-C - dev-perl/X11-XCB - dev-perl/XS-Object-Magic - x11-apps/xhost - x11-base/xorg-server[xephyr,xvfb] - x11-misc/xvfb-run - )" -BDEPEND="app-text/asciidoc - app-text/xmlto - dev-lang/perl - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - dev-lang/perl - dev-perl/AnyEvent-I3 - dev-perl/JSON-XS - !x11-wm/i3" - -DOCS=( RELEASE-NOTES-$(ver_cut 1-3) ) - -PATCHES=( - "${FILESDIR}/${PN}-4.18-musl.patch" -) - -src_configure() { - local emesonargs=( - -Ddocdir="/usr/share/doc/${PF}" - -Ddocs=$(usex doc true false) - -Dmans=true - ) - - meson_src_configure -} - -src_install() { - meson_src_install - - exeinto /etc/X11/Sessions - newexe - i3wm <<- EOF - #!/usr/bin/env sh - exec /usr/bin/i3 - EOF -} - -pkg_postinst() { - optfeature "Application launcher" x11-misc/dmenu - optfeature "Simple screen locker" x11-misc/i3lock - optfeature "Status bar generator" x11-misc/i3status -} diff --git a/x11-wm/i3-gaps/i3-gaps-4.21.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.21.1.ebuild deleted file mode 100644 index c4a28a87b33f..000000000000 --- a/x11-wm/i3-gaps/i3-gaps-4.21.1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson optfeature - -DESCRIPTION="i3 fork with gaps and some more features" -HOMEPAGE="https://github.com/Airblader/i3" -SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/i3-${PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND="dev-libs/glib:2 - dev-libs/libev - dev-libs/libpcre2 - dev-libs/yajl:= - x11-libs/cairo[X,xcb(+)] - x11-libs/libxcb:= - x11-libs/libxkbcommon[X] - x11-libs/pango[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" -DEPEND="${COMMON_DEPEND} - test? ( - dev-perl/ExtUtils-PkgConfig - dev-perl/IPC-Run - dev-perl/Inline - dev-perl/Inline-C - dev-perl/X11-XCB - dev-perl/XS-Object-Magic - x11-apps/xhost - x11-base/xorg-server[xephyr,xvfb] - x11-misc/xvfb-run - )" -BDEPEND="app-text/asciidoc - app-text/xmlto - dev-lang/perl - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - dev-lang/perl - dev-perl/AnyEvent-I3 - dev-perl/JSON-XS - !x11-wm/i3" - -DOCS=( RELEASE-NOTES-$(ver_cut 1-3) ) - -PATCHES=( - "${FILESDIR}/${PN}-4.18-musl.patch" -) - -src_configure() { - local emesonargs=( - -Ddocdir="/usr/share/doc/${PF}" - -Ddocs=$(usex doc true false) - -Dmans=true - ) - - meson_src_configure -} - -src_install() { - meson_src_install - - exeinto /etc/X11/Sessions - newexe - i3wm <<- EOF - #!/usr/bin/env sh - exec /usr/bin/i3 - EOF -} - -pkg_postinst() { - optfeature "Application launcher" x11-misc/dmenu - optfeature "Simple screen locker" x11-misc/i3lock - optfeature "Status bar generator" x11-misc/i3status -} diff --git a/x11-wm/i3-gaps/metadata.xml b/x11-wm/i3-gaps/metadata.xml deleted file mode 100644 index 5cae6b57b8d3..000000000000 --- a/x11-wm/i3-gaps/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>ajak@gentoo.org</email> - <name>John Helmert III</name> - </maintainer> - <upstream> - <remote-id type="github">Airblader/i3</remote-id> - </upstream> -</pkgmetadata> |