From 5d93bae2c1576ab817f482024a6d47592829407b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 5 Sep 2024 12:28:41 +0100 Subject: gentoo auto-resync : 05:09:2024 - 12:28:40 --- app-misc/Manifest.gz | Bin 50721 -> 50736 bytes app-misc/dvorak7min/Manifest | 1 - app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild | 37 ------- app-misc/sonypid/Manifest | 2 - app-misc/sonypid/sonypid-1.9.ebuild | 29 ------ app-misc/vifm/Manifest | 8 +- app-misc/vifm/files/vifm-0.13-musl.patch | 133 +++++++++++++++++++++++++ app-misc/vifm/metadata.xml | 1 - app-misc/vifm/vifm-0.11.ebuild | 83 --------------- app-misc/vifm/vifm-0.12.ebuild | 86 ---------------- app-misc/vifm/vifm-0.13-r1.ebuild | 101 +++++++++++++++++++ app-misc/ytree/Manifest | 2 +- app-misc/ytree/ytree-2.09.ebuild | 2 +- 13 files changed, 239 insertions(+), 246 deletions(-) delete mode 100644 app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild delete mode 100644 app-misc/sonypid/sonypid-1.9.ebuild create mode 100644 app-misc/vifm/files/vifm-0.13-musl.patch delete mode 100644 app-misc/vifm/vifm-0.11.ebuild delete mode 100644 app-misc/vifm/vifm-0.12.ebuild create mode 100644 app-misc/vifm/vifm-0.13-r1.ebuild (limited to 'app-misc') diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz index 52b283fef227..ad3a169d88e0 100644 Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ diff --git a/app-misc/dvorak7min/Manifest b/app-misc/dvorak7min/Manifest index fb7a485dbfd4..6226b4f012bf 100644 --- a/app-misc/dvorak7min/Manifest +++ b/app-misc/dvorak7min/Manifest @@ -3,6 +3,5 @@ AUX dvorak7min-1.6.1-debian-changes.patch 7956 BLAKE2B 77396f83105259f53556e6e47 AUX dvorak7min-1.6.1-makefile-flags.patch 684 BLAKE2B 94d9a24871d88f3d18e8804b3f09f5435dd1e5c4f084322dff2bb40213dfafd1ced7c931adc439b0ab8e089f080254bdff7dc58a7efc77b42da037ed10c9cfb3 SHA512 173858e4daaba8f6f764f4c9cb4aa8e7c6d513d1dff8bc3e2753a969bad15fd4d1a9e91a7da3b9a9353c67c40209b3f316d7f4394042329205d0d80dc9e1454c AUX dvorak7min-1.6.1-ncurses-pkg-config.patch 608 BLAKE2B 0541105aba889a65ed74dcca7696a5bc0fb983778cd81cb7225317b25e17d7bac856ea325f4eed0e1724588d7d7d2fc1a271b7a2ccbc2263d565eb63b24aa7cc SHA512 85e2a05b6ec78be488c3f5bc1a29286a4fbea08bae69f0cbd1901c5f3c03de9d5340900bb898316da61277f66b6ff0a209cae66b029ff5b57166af6ddc320542 DIST dvorak7min-1.6.1.tar.gz 53115 BLAKE2B f884f1900a7de0422f076e3701f7b982d5c5cba70ae1805bd3540ebd109e9bbaaa9e439272ac530862eac9dca2c0ba67b1d0040aa58294b5cabba2fa126d04ae SHA512 17ed601f298673a51d73b2efeb1555d91337f34cfbcc099a71c11de38fecdb29747de9533abec9028c3abc9f04dc9090e4452bba1c53cdac8d65e86a760e8a7a -EBUILD dvorak7min-1.6.1-r1.ebuild 822 BLAKE2B 0c6f7136df13e84db9661e73fb0b7cc89b4a46bb6118939606a0ea2a358e0e508cf29158fe5a3754a1111c1bcd40d371913fddd08d920b51a3cee4fdcb8bbaf1 SHA512 819ba083b42db6751cf69f32e48a074e6b74b5e283ee2edc73ff7ee0d989e381543bd674d910799787d6642719a747a211a83753cf83edd199036c3cb714976b EBUILD dvorak7min-1.6.1-r2.ebuild 873 BLAKE2B 1c5748a5a91813d8900136a67853cacc55a2a171ef9d1173616d0afa67254d3ae47367a7772ba726b8664fd5e7906513018eb89e0053f67875cfb7707f5e37be SHA512 9667ac4f430b59d60768c977b853eca6a9ecdd04392add779d42dfc0a15a770dab7bd17cc2f6a5a0b75968393d8b6c88c034576022fa1dadc9981d2c4740a1fe MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild b/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild deleted file mode 100644 index cb6545c1f3ce..000000000000 --- a/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Simple ncurses-based typing tutor for learning the Dvorak keyboard layout" -HOMEPAGE="http://www.linalco.com/comunidad.html" -SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" - -BDEPEND="virtual/pkgconfig" -DEPEND="sys-libs/ncurses:=" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.1-debian-changes.patch - "${FILESDIR}"/${PN}-1.6.1-makefile-flags.patch - "${FILESDIR}"/${PN}-1.6.1-ncurses-pkg-config.patch -) - -src_compile() { - tc-export PKG_CONFIG - emake \ - CC="$(tc-getCC)" \ - PROF="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin ${PN} - dodoc ChangeLog README -} diff --git a/app-misc/sonypid/Manifest b/app-misc/sonypid/Manifest index 1930c671df54..dbb4fce99300 100644 --- a/app-misc/sonypid/Manifest +++ b/app-misc/sonypid/Manifest @@ -1,5 +1,3 @@ DIST sonypid-1.9.1.tar.bz2 10089 BLAKE2B 51b1376f6fefc5e04d11431a302b462452c7511ff16fa4598b257b9569987aa817d2f895418fbb545e028360fdde0642f3a41f7fb885bf14868d42c69506c436 SHA512 7bf65f88b719ff511cce82d0def528e054a34274449f5cf9a07f721f5f3a9cb9b328656ff375585ad48405e6511f8b2de6bfe30a78bfba8c85d5e835d8cc0e96 -DIST sonypid-1.9.tar.bz2 9710 BLAKE2B edc68ffe6649b6ad7f8afa41666be514b34593bf5f764f29d1ea0d94c335e2f497b7c31b9f0946210b008d6c37e0647b3327476cbc628db24ba7179dc2c25360 SHA512 fcd2b2d2a9db94cd59b8d0f23c41aca2e738e433ecd6818ce84cc1298f5609c84aa16b75e0ce1323e24bf6bb59feccd28c5016549d0690e6dd2f3aae1244e3d0 EBUILD sonypid-1.9.1.ebuild 561 BLAKE2B e74e7f5ed0de18547101a8454afce54205a07123bc74af55c2d0e0116a9bd9ce2bc720156e91ef816d276c88ad2acc80b721326e059fd2ab69f11b7408ea6499 SHA512 1822a8b09144237948e57f22f2d94ebbe28f969923f292e589276804a747426c189369f8f56543500ddcf58336c1c2e2e71fa25889598b57a08ec3daf00f6f78 -EBUILD sonypid-1.9.ebuild 561 BLAKE2B de1dad932c9fdb8386cf7b5858196a8fb9bf58f3dd0374dec5962c95ecfb419d5a67685657f45001434d7e26a7f957a5172b1b60ee0e39a909ff08b07488a0e7 SHA512 50503b69d977724cda7aec923aac75202a12aa6e3f66101b65e74d3b225b77c59a13a1d8e35545dc268157d0bb4850d61cfc1c33e1949fa7bdfe3a50f4d70a05 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/app-misc/sonypid/sonypid-1.9.ebuild b/app-misc/sonypid/sonypid-1.9.ebuild deleted file mode 100644 index d2cabe974388..000000000000 --- a/app-misc/sonypid/sonypid-1.9.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Tool to use the Sony Vaios jog-dial as a mouse-wheel" -HOMEPAGE="https://www.popies.net/sonypi/" -SRC_URI="https://www.popies.net/sonypi/${P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 x86" - -RDEPEND="x11-libs/libXtst" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" - -src_compile() { - emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin sonypid - dodoc AUTHORS CHANGES -} diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest index 2f59d11620f5..0e551412ac32 100644 --- a/app-misc/vifm/Manifest +++ b/app-misc/vifm/Manifest @@ -1,8 +1,6 @@ -DIST vifm-0.11.tar.gz 1525791 BLAKE2B c2aa6d3ddd0304ce1e3a0d1c9ac3218a783bc6dd8eebf7b3346ca262811f63dac75597913ad4883c62680cb77036c2985ca4ce88989a0dd0212dce975d8ec8b8 SHA512 15ace460da6d5f9bb7a016d8bb3f3d9cba47a608da5a39defbf7d09ff9de64c90a63a44264d695fe005f2f6d27ecb07dcec8f4ed5aef15e9d8728b52f1168dbd -DIST vifm-0.12.tar.gz 1913398 BLAKE2B 6a1933e5a70a61402ae52259ee9e03515916e9d6df57285726ec6062257d85966a32173142e730fbc35b48250c585a5e66cadba788e2029e5dcd620544341c4f SHA512 9491b1932535daa0ce6bd33ef955bfaedf995da27f049b36bdb0de9aa87a9a4dd6d2e22c8bf79e343febee16ae0fb87edfa8bde9c2d115b92c768e87bc0a8a7d +AUX vifm-0.13-musl.patch 4230 BLAKE2B 5f4877935a9a1e376d21c2f09561813d941b1a8a1289a53fcce18134d270021a2e9e47be487556f09c8273c1b42b9bb06dec2b591545a018cc14fb1d012d522b SHA512 6b5dbba6287ff749cd89a3b5ee39635a6f0a45cc752a5b22941c53e60fe27aec959bfbf3a0a02fe0dc58cf88c4e8f34fc7c1d28213587bd59e8fff1a139e1706 DIST vifm-0.13.tar.gz 2218099 BLAKE2B 99661dd0defcb434abdc397855feac5c6da55a783cf8ad6afe333e208c431b9d10f05928fcf5a9f8e28ed4d602f66414162b14a872ce8881526f679e6e66259a SHA512 bd5e9f84cfb176e220e798dcdfc62e2ae3e89dbebd08cf4cce73eb843b85060c2df05f04f4db994d406baf2e0f90a04f5cb871beaf00fb04174464c81dd85938 -EBUILD vifm-0.11.ebuild 1808 BLAKE2B f2f849555c24d2a7f08bca670a181d06e357d81ce9e69c1ae089efe8586f7c48f3d64697e3f075f68dd8c8837f59869a7618e2d48b4b58492ddb9fc036a0c2e6 SHA512 b9231330bf7e547139126ffce08fbadcacf97c92b9add66ae601d2b1312e2e564f4b1033d56439632831019f1183b54b1c98fa657201f1b23a16976d480d5210 -EBUILD vifm-0.12.ebuild 1878 BLAKE2B 3a4cab72b0b581ffb36e5f591a69dbccff41bb3b03f8730fedd9e056c0c19e8a8a2309ed05d50110a7da3d3600814841d08271c5f6bd41bb26d6dfa989adf9c4 SHA512 b0a21cf4349bef2a694c786f3732210265789401deb57e8491989d0ec88490365e8324363280c18ff9ab5d018e4e09852978f21f8c083349fb3a5f751942aede +EBUILD vifm-0.13-r1.ebuild 2261 BLAKE2B 6a99263285de840ac19b20edb6d3d5267470a63f09412d6ef5bf3609a40f64b1606abc196ba7d215388392e5e497e6c9266ba5906abe6452d0e7f923ee0ada74 SHA512 4f6592efae8d3129bce7fa0f0b2f912344c1aef2c0163b6b53201f09c9108d6c7c1d90874ff63ca49372e9d1e8f44effba71fae2ff0bdef016e1165c3b175c99 EBUILD vifm-0.13.ebuild 2130 BLAKE2B 22e9aedefd0852b2813b124242dc8b92e8961bc41f2cddaeac76573bffc8205051a4beaf8b50039a46a6ed503de2f723cae76825986081f342b12781ba953b75 SHA512 8db4c850ad3842ec327be00c6f176d8bc629445bae7f1622f505a240d149a6fe166e785c17ff742faa1df1775894323d8c44d38bcaf07fee3103a38f8eead45a EBUILD vifm-9999.ebuild 2133 BLAKE2B fddade233455e3cb7b05a3a7ecd698b652756bb4ed2e5d7fb43458c1d3ce901bacd99e39149ee671b703f006a654eb8f789f2a429e659739ced72e8193d42518 SHA512 77e89bdd10b395495aeb670a81cb5814fcb0ea5389e3207052bd98ee04c184628b1adef72834a8511db33279e38e5dfa1aa9114a2f5dc11626bcb52d14f499a4 -MISC metadata.xml 1110 BLAKE2B b6b3173c2eb6b2d020bcb02dbad79b4c766a1bc668cce8c67a285de04acdbe2342b2e37b1ac414765efa77e1883cd096a5fbaa52aa50beefd6a0e4db9596d082 SHA512 325a630cd6e7d67091653e77cf010077d4cdd5a79e38a1f5ba2bcaa51a7e4e8fdaad677781965c02aff5debed72a471c55e505a8e386c50301e9d941718cad8b +MISC metadata.xml 1036 BLAKE2B dc3584dfe5e9475cf857c46561f96ad5a608850ead292a74ed577497e6b6a54571d7464ac39b2a44c210e77d189e023c136458bf5aaa1259e8fd7aa9583f820d SHA512 52b096005e5499df726d0f450e605f19e1d474880b509e00f8d557e6491baa355fc722bbb5f8eb3bc235037672ba1a5e645ab3f4d6ae1b5789ac2b80e7194780 diff --git a/app-misc/vifm/files/vifm-0.13-musl.patch b/app-misc/vifm/files/vifm-0.13-musl.patch new file mode 100644 index 000000000000..6682da354187 --- /dev/null +++ b/app-misc/vifm/files/vifm-0.13-musl.patch @@ -0,0 +1,133 @@ +From c97f144231afbeb4215659d5c685fdf1e3fe5612 Mon Sep 17 00:00:00 2001 +From: xaizek +Date: Sat, 8 Jul 2023 15:02:37 +0300 +Subject: [PATCH] Fix running tests with musl libc + +Thanks to Henrik Holst (a.k.a. hholst80). +--- +Upstream commit https://github.com/vifm/vifm/commit/c97f144231afbeb4215659d5c685fdf1e3fe5612 + +diff --git a/src/filelist.c b/src/filelist.c +index 28d26c69f..a7121f238 100644 +--- a/src/filelist.c ++++ b/src/filelist.c +@@ -329,7 +329,11 @@ flist_free_view(view_t *view) + modview_info_free(view->vi); + view->vi = NULL; + +- regfree(&view->primary_group); ++ if(view->primary_group_set) ++ { ++ regfree(&view->primary_group); ++ view->primary_group_set = 0; ++ } + + marks_clear_view(view); + +diff --git a/src/opt_handlers.c b/src/opt_handlers.c +index 5d1c000b0..9905b2b7f 100644 +--- a/src/opt_handlers.c ++++ b/src/opt_handlers.c +@@ -3301,9 +3301,13 @@ set_sortgroups(view_t *view, char **opt, char value[]) + { + if(scope == OPT_LOCAL) + { +- regfree(&view->primary_group); ++ if(view->primary_group_set) ++ { ++ regfree(&view->primary_group); ++ } + (void)regexp_compile(&view->primary_group, first, + REG_EXTENDED | REG_ICASE); ++ view->primary_group_set = 1; + } + free(first); + } +diff --git a/src/ui/fileview.c b/src/ui/fileview.c +index 11c80fe8b..ef5f422be 100644 +--- a/src/ui/fileview.c ++++ b/src/ui/fileview.c +@@ -253,6 +253,7 @@ fview_init(view_t *view) + view->sort_groups_g = strdup(""); + (void)regexp_compile(&view->primary_group, view->sort_groups, + REG_EXTENDED | REG_ICASE); ++ view->primary_group_set = 1; + + view->preview_prg = strdup(""); + view->preview_prg_g = strdup(""); +diff --git a/src/ui/ui.h b/src/ui/ui.h +index c9fee0782..886eb9d38 100644 +--- a/src/ui/ui.h ++++ b/src/ui/ui.h +@@ -449,6 +449,9 @@ struct view_t + char *sort_groups, *sort_groups_g; + /* Primary group of sort_groups (not sort_groups_g) in compiled form. */ + regex_t primary_group; ++ /* Indicates that primary_group was initialized, which is used to avoid ++ * freeing uninitialized data or freeing it twice. */ ++ int primary_group_set; + + int history_num; /* Number of used history elements. */ + int history_pos; /* Current position in history. */ +diff --git a/tests/misc/sort.c b/tests/misc/sort.c +index 9938414b5..3db71db5b 100644 +--- a/tests/misc/sort.c ++++ b/tests/misc/sort.c +@@ -409,8 +409,13 @@ TEST(groups_sorting_works) + lwin.dir_entry[6].origin = lwin.curr_dir; + + update_string(&lwin.sort_groups, "-(done|todo).*"); ++ if(lwin.primary_group_set) ++ { ++ regfree(&lwin.primary_group); ++ } + (void)regcomp(&lwin.primary_group, "-(done|todo).*", + REG_EXTENDED | REG_ICASE); ++ lwin.primary_group_set = 1; + + /* Ascending sorting. */ + +@@ -437,15 +442,17 @@ TEST(groups_sorting_works) + assert_string_equal("11-todo-publish", lwin.dir_entry[4].name); + assert_string_equal("1-done", lwin.dir_entry[5].name); + assert_string_equal("3-done", lwin.dir_entry[6].name); +- +- regfree(&lwin.primary_group); +- update_string(&lwin.sort_groups, NULL); + } + + TEST(global_groups_sorts_entries_list) + { + update_string(&lwin.sort_groups_g, "([0-9])"); ++ if(lwin.primary_group_set) ++ { ++ regfree(&lwin.primary_group); ++ } + (void)regcomp(&lwin.primary_group, "([a-z])", REG_EXTENDED | REG_ICASE); ++ lwin.primary_group_set = 1; + + dir_entry_t entry_list[] = { { .name = "a1" }, { .name = "b0" } }; + entries_t entries = { entry_list, 2 }; +diff --git a/tests/test-support/test-utils.c b/tests/test-support/test-utils.c +index 932bdc9c9..e3d9ba694 100644 +--- a/tests/test-support/test-utils.c ++++ b/tests/test-support/test-utils.c +@@ -32,6 +32,7 @@ + #include "../../src/utils/macros.h" + #include "../../src/utils/matcher.h" + #include "../../src/utils/path.h" ++#include "../../src/utils/regexp.h" + #include "../../src/utils/str.h" + #include "../../src/utils/string_array.h" + #include "../../src/utils/utils.h" +@@ -254,6 +255,10 @@ view_setup(view_t *view) + view_set_sort(view->sort, SK_BY_NAME, SK_NONE); + view_set_sort(view->sort_g, SK_BY_NAME, SK_NONE); + ++ /* The code assumes that this field is initialized. */ ++ assert_success(regexp_compile(&view->primary_group, "", REG_ICASE)); ++ view->primary_group_set = 1; ++ + view->custom.entry_count = 0; + view->custom.entries = NULL; + diff --git a/app-misc/vifm/metadata.xml b/app-misc/vifm/metadata.xml index d48a2ae9eff2..408df775c61b 100644 --- a/app-misc/vifm/metadata.xml +++ b/app-misc/vifm/metadata.xml @@ -14,7 +14,6 @@ conjunto de órdenes. - Enable features of interest to developers Support for extended keys (arrows, home etc) Use gtk+ to determine mimetypes Install the vifm vim plugin and vim-compatible documentation diff --git a/app-misc/vifm/vifm-0.11.ebuild b/app-misc/vifm/vifm-0.11.ebuild deleted file mode 100644 index 9927dd8f487f..000000000000 --- a/app-misc/vifm/vifm-0.11.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools vim-doc xdg - -DESCRIPTION="Console file manager with vi(m)-like keybindings" -HOMEPAGE="https://vifm.info/" -SRC_URI="https://github.com/vifm/vifm/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 ppc x86" -IUSE="developer +extended-keys gtk +magic +vim +vim-syntax X" - -DEPEND=" - >=sys-libs/ncurses-5.9-r3:0 - magic? ( sys-apps/file ) - gtk? ( x11-libs/gtk+:2 ) - X? ( x11-libs/libX11 )" -RDEPEND="${DEPEND} - vim? ( || ( app-editors/vim app-editors/gvim ) ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --disable-werror \ - $(use_enable developer) \ - $(use_enable extended-keys) \ - $(use_with magic libmagic) \ - $(use_with gtk) \ - $(use_with X X11) -} - -src_install() { - default - - if use vim; then - local t - for t in app plugin; do - insinto /usr/share/vim/vimfiles/"${t}" - doins -r data/vim/doc/${t}/${PN}* - done - fi - - if use vim-syntax; then - local t - for t in ftdetect ftplugin syntax; do - insinto /usr/share/vim/vimfiles/"${t}" - doins -r data/vim/${t}/${PN}* - done - fi -} - -pkg_postinst() { - xdg_pkg_postinst - if use vim; then - update_vim_helptags - - if [[ -n ${REPLACING_VERSIONS} ]]; then - elog - elog "You don't need to copy or link any files for" - elog " the vim plugin and documentation to work anymore." - elog "If you copied any vifm files to ~/.vim/ manually" - elog " in earlier vifm versions, please delete them." - fi - elog - elog "To use vim in vifm to view the documentation" - elog " edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp" - elog - fi -} - -pkg_postrm() { - xdg_pkg_postrm - use vim && update_vim_helptags -} diff --git a/app-misc/vifm/vifm-0.12.ebuild b/app-misc/vifm/vifm-0.12.ebuild deleted file mode 100644 index 0084f374fe4d..000000000000 --- a/app-misc/vifm/vifm-0.12.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools vim-doc xdg - -DESCRIPTION="Console file manager with vi(m)-like keybindings" -HOMEPAGE="https://vifm.info/" -SRC_URI="https://github.com/vifm/vifm/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~x86" -IUSE="+extended-keys gtk +magic +vim +vim-syntax X" - -DEPEND=" - >=sys-libs/ncurses-5.9-r3:0 - magic? ( sys-apps/file ) - gtk? ( x11-libs/gtk+:2 ) - X? ( x11-libs/libX11 )" - -RDEPEND="${DEPEND} - vim? ( || ( app-editors/vim app-editors/gvim ) ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # developer just turns off optimisations and adds -Werror again - # bug #855386 - econf \ - --disable-developer \ - --disable-werror \ - $(use_enable extended-keys) \ - $(use_with magic libmagic) \ - $(use_with gtk) \ - $(use_with X X11) -} - -src_install() { - default - - if use vim; then - local t - for t in app plugin; do - insinto /usr/share/vim/vimfiles/"${t}" - doins -r data/vim/doc/${t}/${PN}* - done - fi - - if use vim-syntax; then - local t - for t in ftdetect ftplugin syntax; do - insinto /usr/share/vim/vimfiles/"${t}" - doins -r data/vim/${t}/${PN}* - done - fi -} - -pkg_postinst() { - xdg_pkg_postinst - if use vim; then - update_vim_helptags - - if [[ -n ${REPLACING_VERSIONS} ]]; then - elog - elog "You don't need to copy or link any files for" - elog " the vim plugin and documentation to work anymore." - elog "If you copied any vifm files to ~/.vim/ manually" - elog " in earlier vifm versions, please delete them." - fi - elog - elog "To use vim in vifm to view the documentation" - elog " edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp" - elog - fi -} - -pkg_postrm() { - xdg_pkg_postrm - use vim && update_vim_helptags -} diff --git a/app-misc/vifm/vifm-0.13-r1.ebuild b/app-misc/vifm/vifm-0.13-r1.ebuild new file mode 100644 index 000000000000..524072b9c243 --- /dev/null +++ b/app-misc/vifm/vifm-0.13-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools vim-doc xdg + +DESCRIPTION="Console file manager with vi(m)-like keybindings" +HOMEPAGE="https://vifm.info/" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/vifm/vifm" + inherit git-r3 +else + SRC_URI="https://github.com/vifm/vifm/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+extended-keys gtk +magic +vim +vim-syntax X" + +DEPEND=" + >=sys-libs/ncurses-5.9-r3:= + magic? ( sys-apps/file ) + gtk? ( x11-libs/gtk+:2 ) + X? ( x11-libs/libX11 ) +" +RDEPEND=" + ${DEPEND} + vim? ( || ( app-editors/vim app-editors/gvim ) ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) +" +# "Either perl or Vim is necessary to generate tags for documentation in Vim's format." from configure +BDEPEND="|| ( dev-lang/perl app-editors/vim )" + +PATCHES=( + # Bacported fix from upstream, + # see also https://github.com/vifm/vifm/issues/913 + "${FILESDIR}/${P}-musl.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # developer just turns off optimisations and adds -Werror again + # bug #855386 + econf \ + --disable-developer \ + --disable-werror \ + $(use_enable extended-keys) \ + $(use_with magic libmagic) \ + $(use_with gtk) \ + $(use_with X X11) +} + +src_install() { + default + + if use vim; then + local t + for t in app plugin; do + insinto /usr/share/vim/vimfiles/"${t}" + doins -r data/vim/doc/${t}/${PN}* + done + fi + + if use vim-syntax; then + local t + for t in ftdetect ftplugin syntax; do + insinto /usr/share/vim/vimfiles/"${t}" + doins -r data/vim/${t}/${PN}* + done + fi +} + +pkg_postinst() { + xdg_pkg_postinst + if use vim; then + update_vim_helptags + + if [[ -n ${REPLACING_VERSIONS} ]]; then + elog + elog "You don't need to copy or link any files for" + elog " the vim plugin and documentation to work anymore." + elog "If you copied any vifm files to ~/.vim/ manually" + elog " in earlier vifm versions, please delete them." + fi + elog + elog "To use vim in vifm to view the documentation" + elog " edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp" + elog + fi +} + +pkg_postrm() { + xdg_pkg_postrm + use vim && update_vim_helptags +} diff --git a/app-misc/ytree/Manifest b/app-misc/ytree/Manifest index 14e6db348631..a4a136943562 100644 --- a/app-misc/ytree/Manifest +++ b/app-misc/ytree/Manifest @@ -3,5 +3,5 @@ DIST ytree-2.08.tar.gz 120455 BLAKE2B 8252f4895732fe91140f60e18b2e3add34331e0cd8 DIST ytree-2.09.tar.gz 121209 BLAKE2B 51acea07f345694ca164dc81dac2e6bb54ce53970d42ee60cbfe0511e3fc7663ef23e8006af136fb2a5d7416313664db64cd2897cc7be71046746db3c17f1211 SHA512 6220345d89791b0ac7a68c4ac477e669cd2c50fb25002b1c4742f811f2dd4ec89385e5a920e5ef815e8eb1efa935d388f096216a94971a0ef3b90789ead8663b EBUILD ytree-2.05.ebuild 596 BLAKE2B ceed6745bf4164bae78bb81572e12aa34caec912dab6064e3dce2da3f5f0a95f07351f857f387bda6c9d27d47f87009341a2c448b53288c82fdfa29c4c699a2b SHA512 5bdb0494ca747450e486e90a918bedb7e5f92aade81f3f824fb13d94ab574656e43a48e5a363bd1287ffb49404e952602023d60d21c7c944240eb41fa278716f EBUILD ytree-2.08.ebuild 598 BLAKE2B d5d15346c1f6052d4805b791c697ab5e7faedf2f3b783bea58ef8da057cbbb69dacf9f82f1a293b362da63bbd40cf5feea4f018d622e9751686fe0e57e4149f6 SHA512 b779d46e6c40f25de74b5234e392657fb47a125c90feb57661cf50bfaadb8e4fea5532755a651363efcc92c0eb470c8f1285c185426962ed01b9206d688d8783 -EBUILD ytree-2.09.ebuild 596 BLAKE2B 9952d5632048593a32b76089f533faccb6c8506ea70476a5f27a6f0ed187f60b975bd164f74a1862b01098129de346b9517a90414c961830c65a6be348285def SHA512 653da3f03f7fc8c8b3815bf32d4fdd733d341ccfbbee8027bb4214aa598ec6bbdd17902672c3a74bb1c1152cb6bc3379411f8cd581d93d93b9fb338b78f86bb0 +EBUILD ytree-2.09.ebuild 594 BLAKE2B 5e3779c4549514182e6d8dc8ae2f3ac3d7a17bca7b1e0159f8577801e395207aed08b31d173e428c41f6ec158097def6462b22be48009cfced1e262c58a6fb86 SHA512 2e6c4d12174c402c6e24f06e516555a3e21c34942e3d0b6aa33ba70c35275ba78affa1143d6e8c19f4c7561de5561fa1bbfb05cc63e48da9ac133235dd656e76 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/app-misc/ytree/ytree-2.09.ebuild b/app-misc/ytree/ytree-2.09.ebuild index 8525ec06e24c..d86278be06e2 100644 --- a/app-misc/ytree/ytree-2.09.ebuild +++ b/app-misc/ytree/ytree-2.09.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.han.de/~werner/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" +KEYWORDS="amd64 ~riscv x86" DEPEND=" sys-libs/ncurses:0= -- cgit v1.2.3