summaryrefslogtreecommitdiff
path: root/app-shells
diff options
context:
space:
mode:
Diffstat (limited to 'app-shells')
-rw-r--r--app-shells/Manifest.gzbin8446 -> 8278 bytes
-rw-r--r--app-shells/bash/Manifest1
-rw-r--r--app-shells/bash/files/bash-5.0-assignment-preceding-builtin.patch83
-rw-r--r--app-shells/dash/Manifest2
-rw-r--r--app-shells/dash/dash-0.5.11.ebuild1
-rw-r--r--app-shells/fish/Manifest2
-rw-r--r--app-shells/fish/fish-9999.ebuild26
-rw-r--r--app-shells/rssh/Manifest6
-rw-r--r--app-shells/rssh/files/rssh-2.3.4_p3-autotools.patch33
-rw-r--r--app-shells/rssh/metadata.xml11
-rw-r--r--app-shells/rssh/rssh-2.3.4.ebuild37
-rw-r--r--app-shells/rssh/rssh-2.3.4_p3.ebuild46
-rw-r--r--app-shells/yash/Manifest8
-rw-r--r--app-shells/yash/metadata.xml1
-rw-r--r--app-shells/yash/yash-2.49.ebuild8
-rw-r--r--app-shells/yash/yash-2.50.ebuild (renamed from app-shells/yash/yash-2.48.ebuild)12
-rw-r--r--app-shells/zsh-completions/Manifest2
-rw-r--r--app-shells/zsh-completions/zsh-completions-0.32.0.ebuild33
18 files changed, 74 insertions, 238 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index b91118bff258..c56abee26623 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
Binary files differ
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index ea3a5bebfb6a..315b68412e13 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -57,7 +57,6 @@ AUX bash-4.4-jobs_overflow.patch 331 BLAKE2B 6897770ef49b5f3def669abaec3d18fd8c7
AUX bash-4.4-popd-offset-overflow.patch 1069 BLAKE2B b23ce9f427cdf252aebdf7330828074230f9b22b5bb59b712d1b148ecbf73aea78ce4e29d353198235b25fa19c4046405c8ae6eeb7fd1cf299d05b732f7cc37b SHA512 535f61b2e0c6423031520700be423750e9177ec96055be781aee5dbdd01c720c1dbc30fffa73b88464527981193c1c6a74ec4139753ef4f40a5bb0f55c4de61c
AUX bash-4.4-set-SHOBJ_STATUS.patch 410 BLAKE2B beddcd4ea00cf6814615896e9842a607280d56086165c38338bfdc8e92922f92219f30419f47dd1bd65939f2a3e48fced612db1332a9ee357465816b4939c678 SHA512 9a723b712279e640396bdaa18f4b5ec48fcbbf253573b0aa1e2e6e2cd9200d8d8a082fb3816154aaff0dd81de2e7a66babbdd682e50e4fc2e93dfaa1af17f04d
AUX bash-4.x-deferred-heredocs.patch 1255 BLAKE2B 944c8d5feaba6a6818fe7e20300fdd44d1e162511c1aaf272bdb4d4c382e100908c16a17e4bef622134116e153f96f61fae4d7985e58cb881012058250a2e7f5 SHA512 9016203189d0b601f0441daec19f902de7387b599a2196c475d76c596dcf9a9c22765a58e7fc5a3117522ec2722475bd166bea271ff3048f31674e8bed2901a0
-AUX bash-5.0-assignment-preceding-builtin.patch 2790 BLAKE2B fbafa51f96f1fef538e56e55ab3b7067ac4532ab8c0f93d151eeaf6b3a521bc15d7d4ae580489352cc6d9ecc5b43b96494c8b661cf2db3b97265bd1dffad5390 SHA512 9a4ec56b341ed90f348c3ca5ec5c98790eb98a7d78d436131a56bcdde49f09f618398e87c81da7c1dde645690d9c779578f5a2b37dadda75c587332715ab1732
AUX bash-5.0-history-append.patch 1150 BLAKE2B cc3d4c2303b37b14da2cbb3130db0c2fa65cdc7f7f8d0a4413042a898c4c48afbedcca03c9dbfc525ab191ddc2b4258fb976a28830e03490011f89a1361974b4 SHA512 9c2fb93c67a5da1e97b293db4b26469fd6813e2cfc8ffd776042529878b96312644d8dc247887d6171c89c0853d552e9f7d5d2c0b2f3d05c25c15e17e6706999
AUX bash-5.0-syslog-history-extern.patch 376 BLAKE2B d883d3c3adbf8f4d19ecc3c2790754a7f6972682d1679b07d5bc599bdbfc019ba8ad4d1271ec550b59447db0a02f1219c9e6057a0b1c1c6c52f7750a746a07bf SHA512 c8dd17bdd8ccbd73061a7cbcb7351195e703a2c5fc6faf288ec3721fc6e526d88dd4b2201f87078a92ca134b98214ccfa935f82f585322f72e9a41fd51842b6a
AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d
diff --git a/app-shells/bash/files/bash-5.0-assignment-preceding-builtin.patch b/app-shells/bash/files/bash-5.0-assignment-preceding-builtin.patch
deleted file mode 100644
index 84b7fbc8b2a7..000000000000
--- a/app-shells/bash/files/bash-5.0-assignment-preceding-builtin.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-*** ../bash-5.0-patched/variables.c 2018-12-18 11:07:21.000000000 -0500
---- variables.c 2019-03-20 10:30:56.000000000 -0400
-***************
-*** 4473,4476 ****
---- 4473,4489 ----
- var = (SHELL_VAR *)data;
-
-+ #if 1 /* TAG:bash-5.1 */
-+ /* Just like do_assignment_internal(). This makes assignments preceding
-+ special builtins act like standalone assignment statements when in
-+ posix mode, satisfying the posix requirement that this affect the
-+ "current execution environment." */
-+ v = bind_variable (var->name, value_cell (var), ASS_FORCE|ASS_NOLONGJMP);
-+
-+ /* If this modifies an existing local variable, v->context will be non-zero.
-+ If it comes back with v->context == 0, we bound at the global context.
-+ Set binding_table appropriately. It doesn't matter whether it's correct
-+ if the variable is local, only that it's not global_variables->table */
-+ binding_table = v->context ? shell_variables->table : global_variables->table;
-+ #else
- binding_table = global_variables->table;
- if (binding_table == 0)
-***************
-*** 4478,4486 ****
-
- v = bind_variable_internal (var->name, value_cell (var), binding_table, 0, ASS_FORCE|ASS_NOLONGJMP);
-
- /* global variables are no longer temporary and don't need propagating. */
-! var->attributes &= ~(att_tempvar|att_propagate);
- if (v)
-! v->attributes |= var->attributes;
-
- if (find_special_var (var->name) >= 0)
---- 4491,4508 ----
-
- v = bind_variable_internal (var->name, value_cell (var), binding_table, 0, ASS_FORCE|ASS_NOLONGJMP);
-+ #endif
-
- /* global variables are no longer temporary and don't need propagating. */
-! if (binding_table == global_variables->table)
-! var->attributes &= ~(att_tempvar|att_propagate);
-!
- if (v)
-! {
-! v->attributes |= var->attributes;
-! v->attributes &= ~att_tempvar; /* not a temp var now */
-! #if 0 /* TAG:bash-5.1 code doesn't need this, disable for bash-5.1 */
-! v->context = (binding_table == global_variables->table) ? 0 : shell_variables->scope;
-! #endif
-! }
-
- if (find_special_var (var->name) >= 0)
-***************
-*** 4576,4587 ****
- {
- int i;
-
- tempvar_list = strvec_create (HASH_ENTRIES (temporary_env) + 1);
- tempvar_list[tvlist_ind = 0] = 0;
-!
-! hash_flush (temporary_env, pushf);
-! hash_dispose (temporary_env);
- temporary_env = (HASH_TABLE *)NULL;
-
- tempvar_list[tvlist_ind] = 0;
-
---- 4598,4612 ----
- {
- int i;
-+ HASH_TABLE *disposer;
-
- tempvar_list = strvec_create (HASH_ENTRIES (temporary_env) + 1);
- tempvar_list[tvlist_ind = 0] = 0;
-!
-! disposer = temporary_env;
- temporary_env = (HASH_TABLE *)NULL;
-
-+ hash_flush (disposer, pushf);
-+ hash_dispose (disposer);
-+
- tempvar_list[tvlist_ind] = 0;
-
-
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index d42eb49a4555..512c01b43a8f 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -3,5 +3,5 @@ AUX dash-0.5.9.1-format-security.patch 374 BLAKE2B 63a9128f8a396e9c9808867ffdff9
DIST dash-0.5.10.2.tar.gz 225196 BLAKE2B af48879d29aee8041949b51f08eb89c3938e77b2e05553a3e1a9939da7b00fd80f7b9fb35f33e18b0c11850bfb1b8377e9dc9bcfd80754fd29c9d160e0ce5a4d SHA512 0ae29be77794df0ba254967649b9728611a75fbb3acd32ab6634d76399d1ce97c7d12d31da465482a7e4f3207093415c496c39525cace9b78ab3cb9444dd7640
DIST dash-0.5.11.tar.gz 238776 BLAKE2B 0d399b35c10a33f6a22f51f7b74b9e092fb11d47ae45948f43fab0dd1416061145e7f930f0f0d1119d02cc45790ba19ce040c951322c131e706e5f3f32f2612b SHA512 41c3afa8aa4788f7899b9a4c1bce2dc8629f4405184cdc7269993e72c695cf9537c9e68b654d56f06c604a82ffa73c9160b91368e82a3593a12ff7dea10505d1
EBUILD dash-0.5.10.2-r1.ebuild 1599 BLAKE2B bd791b7188f16fe8bf627321cc99b9bd165d35c4bd42f6c5c9de0446ba99277ffbe88f6df1cfd6c51518f5f506b9966680159e0bbc7fa46ee34d881368ae1ce9 SHA512 672b9b87555c251c071772a505b77f70190513692002ee974587e6905fc4f100eba3cde7d115f380ceb0d8102fc7e3091354e8693ce466cb48f7d88713ec0d3b
-EBUILD dash-0.5.11.ebuild 1494 BLAKE2B 1d49135606a56d499170d54ada356dccd2cc0ca40b2aa701ead2cabf1e7f09a53eb3af44e6dab5ea371a6032e74a2690bab9da6c2e9ce9d28a276ad94245928f SHA512 bec31e98044899ef233c5a082c9d480a5e6a1e19f7d850e3528d21167c4b8e52285a8f4ccc14ceabaa00a41d14b6db915139bec302f77caa50e5be73434bcdd9
+EBUILD dash-0.5.11.ebuild 1529 BLAKE2B 024ab6c9362510e03778238a95f3ec21d3d19211258aff8f14d9d6bf15436689b39cc73543e068e687fd0ff9f4390611c4e6b01de497a31d8ff6b42ea80297e9 SHA512 74cc3b72b2d6179d20caa9d8a2bc0341a9428944caaafb366ccd770946555b9f9a746831212a3a35a99166e6e6af9b5f7315b29861e0ed0334fb80d57510120c
MISC metadata.xml 490 BLAKE2B f6f682adcb15a93d01eb38876463816daf7fe89133a20995343a9692511b7cfc60c3deb9efa0603ca3abe667ba56407e3c501a6698e7946ae48ddea6a5bc12db SHA512 95ba5f3a7a4f45b722b082ab015d7cc922a0b7d8e3c641a3f83c42527720cedf9647e5fc143ce530b686e830321bbaecd7e7a240b8096d636e61ccd40f3063dd
diff --git a/app-shells/dash/dash-0.5.11.ebuild b/app-shells/dash/dash-0.5.11.ebuild
index 1bd542ff8270..9482c8379d58 100644
--- a/app-shells/dash/dash-0.5.11.ebuild
+++ b/app-shells/dash/dash-0.5.11.ebuild
@@ -43,6 +43,7 @@ src_configure() {
use static && append-ldflags -static
# Do not pass --enable-glob due to #443552.
local myeconfargs=(
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
--bindir="${EPREFIX}"/bin
--enable-fnmatch
$(use_with libedit)
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index ed124557af99..c6e59fd1d1f6 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -9,5 +9,5 @@ EBUILD fish-2.7.1.ebuild 2446 BLAKE2B e3ef925138c3db3412cd276dbaa374e3073beca137
EBUILD fish-3.0.2.ebuild 1662 BLAKE2B 803c662cd6cda8a2cc4b17d69fac6d89707770c7aaf140acebffda40f690d90f38a253424db4ea19fcea155f0d6e49d6bd92495fade96b750b1d451a04f57903 SHA512 e51b71e0a7bbbcb54a50dea245facd141bfc6e07e5d45199dbad5e2e1a6747b16a5f269b55ffafeffdefa0227c29c39e3b0b039eabacaae700476b14fe9fac09
EBUILD fish-3.1.0.ebuild 1557 BLAKE2B ccd54d16b09cd15983cb58ac4da97170fcdd8493f315968c5709e20ef06b9550192a67f7df82c69637ccb08ef8e07db199f90a1ce960d13fedfd6525852bdc11 SHA512 99fb79a548105a2df3c4c8098a2967ce91e52eee8a6d866e95606ef373a0bae8d23d81a322d3e307344f3ad04ed9d3a6240d3d25b84c1130bc54c2f7fb8a6570
EBUILD fish-3.1.2.ebuild 1571 BLAKE2B 91cf51764d5969c2d941612b5f74456133de08c4ab101e38d80d2169da6661e5711ce449edf677106bfdb55a75a75549efbea36673dc0b11384a10c137819391 SHA512 b8b956ae839cfec8acfece28ca1b6b9b8cc9875112f27a728ab32f7d3b1a929ea9044f0e3dabf3723683c92309b6e2e56cc04638f1e74741de0da4779b19e68a
-EBUILD fish-9999.ebuild 1591 BLAKE2B 1133b6360cbdb5e3ac7d4c8ad799bc14dfb6590829535345ec69159abc46a52e7ad1192ed371d05d91dabad83ca78108de2a86d10ab65097faba70f849516703 SHA512 62c2e273b74443551ec12502c5fc1f2246e49229ed32a919ffcc5f9f577fd47654c58746b5357bef198f105ec84fa360fed764a88af5a8c05b2a9b1bcbcebe89
+EBUILD fish-9999.ebuild 2057 BLAKE2B 8c6efe43984f467ef77552f189eae1f947334e2a3e1558a5b1a51cb2376e5bf8a7de85cc780d882bfc99e22a04919eb5a9db9795e546e0ab719481d8d27af17b SHA512 915e41d259b8401b4d4bb08152744d3493fea9e326e6923beb43dddd2dc6b9bd1d4105dbb53238788e6ae9b6035461e7bb797bd4d2bb20cd1f5bf1782644a78e
MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild
index 34e66d1137bb..0ba68e1c6750 100644
--- a/app-shells/fish/fish-9999.ebuild
+++ b/app-shells/fish/fish-9999.ebuild
@@ -3,7 +3,9 @@
EAPI=7
-inherit cmake readme.gentoo-r1
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit cmake python-any-r1 readme.gentoo-r1
DESCRIPTION="Friendly Interactive SHell"
HOMEPAGE="http://fishshell.com/"
@@ -21,8 +23,8 @@ fi
LICENSE="GPL-2"
SLOT="0"
+IUSE="+doc nls test"
-IUSE="doc nls test"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -32,13 +34,25 @@ RDEPEND="
"
DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
nls? ( sys-devel/gettext )
- test? ( dev-tcltk/expect )
+ test? (
+ ${PYTHON_DEPS}
+ dev-tcltk/expect
+ $(python_gen_any_dep '
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ ')
+ )
"
+# we don't need shpinx dep for release tarballs
+[[ ${PV} == 9999 ]] && DEPEND+=" doc? ( dev-python/sphinx )"
S="${WORKDIR}/${MY_P}"
+python_check_deps() {
+ use test || return 0
+ has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
+}
+
src_prepare() {
# workaround for https://github.com/fish-shell/fish-shell/issues/4883
sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
@@ -51,9 +65,11 @@ src_configure() {
-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-DCURSES_NEED_NCURSES=ON
- -DBUILD_DOCS="$(usex doc)"
+ -DINSTALL_DOCS="$(usex doc)"
-DWITH_GETTEXT="$(usex nls)"
)
+ # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
+ [[ ${PV} == 9999 ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
cmake_src_configure
}
diff --git a/app-shells/rssh/Manifest b/app-shells/rssh/Manifest
deleted file mode 100644
index 40f21a7db4fb..000000000000
--- a/app-shells/rssh/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX rssh-2.3.4_p3-autotools.patch 1016 BLAKE2B d820619518dcea2a2c2a968451c71ab79baf322c9677dabe6ea6aa10253da35731446261854eab3a15c6d1f8885d9441f0614a6d836456fdb3f1a35d0e938303 SHA512 af3de7f5855d1feb3145684ecfd64fa29716a8d7ca9cf29bfaa0567de1ee32f5aa67bd53f408fcb87bdba94f9501769027f5725b25b8c19dda3250c00a00f228
-DIST rssh-2.3.4.tar.gz 113315 BLAKE2B 5f214c21af475da6754a9b233edd680bcfe2eefeb55b6899e18f834c016a0520c8acafcdab5701d594ea5998482a754c170b2f615418c47fe3dee429ba507812 SHA512 c1a77abdf4abe5f936fb1c9c008fc81fabf7b624d69ed31fe2ae5619dfa4a79f1d4a4f2daa5291a36d40353fa2168e74e5ba61294230d702fcdc88ae0d520487
-DIST rssh_2.3.4-3.debian.tar.xz 27364 BLAKE2B 400bbcc7540d23eec8309be83a2976b5393cf1fab42a4aa85481f9577b82974503756a9803d31a4e832551789c12c52df90180cf263a60aa324f0cc15e1a9f64 SHA512 963d51c0a806090f8008b1f83ca3a0bc271f789e1388c4f4de993e61d705458be4163ba74ebb4fccea454b6ab08239b0a7c2b067bfe7ab222033b9785cb79a90
-EBUILD rssh-2.3.4.ebuild 844 BLAKE2B 04a1a51d8c01546743c85596726d0222d7e7b75b1cd779c227e08713934321007ef6f91dbf84a3a65b46b0e8fed9e2782ab85aafe0b17e2ef83b1e4ea9977b7a SHA512 a355eb2fa29e1d9e0df88aa8673d8f0d677623c36636a35ffff52e1d7c3f761f26f2b87db826207fc6964a4b4b92e7aa2090664a584f58c2918ab2862f8f4a38
-EBUILD rssh-2.3.4_p3.ebuild 1264 BLAKE2B a236479142c86335dd5a45714a214912efeea8f76389f3875f79e7a904f8825713166fe5cd5de8decafbb792ab838087396dc31424c16e1d894ea02402f065f8 SHA512 f1722d018643b1170609af05b34964b1d5e93820843dbd110696b8e45307e0e42694f78ae9adf01200520cd624c095efc27d7d0d79beccd1df4efbad8edd198a
-MISC metadata.xml 327 BLAKE2B 98ff0a2a3e40e186edaf434a7ca62711b7d95721804f799cdf97a3383122d7d6aa03d9081a3e025c0ec6b6db02b2f42bde64be8cf8212abb8dd8fcd0b3ac4c6a SHA512 832309f815fa92e689864e8cbe0319be98560dde39e870c840b74453f6498c89ece302e14e43e101b25ac0595df9c379ddc9fac856c2ec4d52afa80de9caa2bb
diff --git a/app-shells/rssh/files/rssh-2.3.4_p3-autotools.patch b/app-shells/rssh/files/rssh-2.3.4_p3-autotools.patch
deleted file mode 100644
index 8030eda525f3..000000000000
--- a/app-shells/rssh/files/rssh-2.3.4_p3-autotools.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur rssh-2.3.4.orig/configure.ac rssh-2.3.4/configure.ac
---- rssh-2.3.4.orig/configure.ac 2013-11-15 16:11:21.301056547 -0700
-+++ rssh-2.3.4/configure.ac 2013-11-15 16:11:51.471424233 -0700
-@@ -13,12 +13,6 @@
- AC_PROG_MAKE_SET
- AC_CHECK_TOOL([STRIP],[strip])
-
--if test yes = "$GCC" ; then
-- defcflags="-O2 -Wall -Wshadow"
--else
-- echo "Using default flags"
--fi
--
- # Checks for libraries.
-
- # Checks for header files.
-diff -Naur rssh-2.3.4.orig/Makefile.am rssh-2.3.4/Makefile.am
---- rssh-2.3.4.orig/Makefile.am 2013-11-15 16:11:21.301056547 -0700
-+++ rssh-2.3.4/Makefile.am 2013-11-15 16:12:28.581876494 -0700
-@@ -15,7 +15,7 @@
- base=`echo @PACKAGE_STRING@|tr " " "-"`
-
- install-exec-hook:
-- chmod u+s $(libexecdir)/rssh_chroot_helper
-+ chmod u+s $(DESTDIR)/$(libexecdir)/rssh_chroot_helper
-
- rpm: dist
- rpmbuild -ta --sign $(base).tar.gz
-@@ -24,3 +24,4 @@
- gpg -ba --default-key ddm@pizzashack.org $(base).tar.gz
- mv $(base).tar.gz.asc $(base).tar.gz.sig
-
-+AM_CPPFLAGS += -I. -I$(srcdir)
diff --git a/app-shells/rssh/metadata.xml b/app-shells/rssh/metadata.xml
deleted file mode 100644
index e365f24c8302..000000000000
--- a/app-shells/rssh/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>junghans@gentoo.org</email>
- <name>Christoph Junghans</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">rssh</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-shells/rssh/rssh-2.3.4.ebuild b/app-shells/rssh/rssh-2.3.4.ebuild
deleted file mode 100644
index c7f65ae63eff..000000000000
--- a/app-shells/rssh/rssh-2.3.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils multilib
-
-DESCRIPTION="Restricted shell for SSHd"
-HOMEPAGE="http://rssh.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rssh/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="static"
-
-RDEPEND="virtual/ssh"
-
-src_prepare() {
- epatch_user
-
- sed -i 's:chmod u+s $(:chmod u+s $(DESTDIR)$(:' Makefile.in || die
- # respect CFLAGS, bug #450458
- sed -i -e '/$(CC) -c/s/$(CPPFLAGS)/$(CFLAGS)/' Makefile.in || die
-}
-
-src_configure() {
- econf \
- --libexecdir="/usr/$(get_libdir)/misc" \
- --with-scp=/usr/bin/scp \
- --with-sftp-server="/usr/$(get_libdir)/misc/sftp-server" \
- $(use_enable static)
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- dodoc AUTHORS ChangeLog CHROOT INSTALL README TODO
-}
diff --git a/app-shells/rssh/rssh-2.3.4_p3.ebuild b/app-shells/rssh/rssh-2.3.4_p3.ebuild
deleted file mode 100644
index d122e75c3c05..000000000000
--- a/app-shells/rssh/rssh-2.3.4_p3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-utils multilib
-
-DESCRIPTION="Restricted shell for SSHd"
-HOMEPAGE="http://rssh.sourceforge.net/"
-MY_P="${P/%_p*}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
- mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="static subversion"
-
-RDEPEND="virtual/ssh"
-
-S="${WORKDIR}/${MY_P}"
-DOCS=( AUTHORS ChangeLog CHROOT INSTALL README TODO )
-
-src_prepare() {
- epatch "${WORKDIR}"/debian/patches/fixes/*.diff "${FILESDIR}/${P}"-autotools.patch
- use subversion && epatch "${WORKDIR}"/debian/patches/features/subversion.diff
- AUTOTOOLS_AUTORECONF=1 autotools-utils_src_prepare #due to debian patches
-}
-
-src_configure() {
- local myeconfargs=(
- --libexecdir="/usr/$(get_libdir)/misc"
- --with-scp=/usr/bin/scp
- --with-sftp-server="/usr/$(get_libdir)/misc/sftp-server"
- $(use_enable static)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
- if use subversion && [[ -f "${EROOT}"/etc/rssh.conf ]]; then
- awk -f conf_convert "${EROOT}"/etc/rssh.conf > "${T}/rssh.conf" || die
- insinto /etc
- doins "${T}/rssh.conf"
- fi
-}
diff --git a/app-shells/yash/Manifest b/app-shells/yash/Manifest
index efc3958a9ba0..d798f365e419 100644
--- a/app-shells/yash/Manifest
+++ b/app-shells/yash/Manifest
@@ -1,5 +1,5 @@
-DIST yash-2.48.tar.xz 736280 BLAKE2B bbb7d2f723000bbb168ce8d354c27d80b350d5b5b1fc450987b8ff45a3d0f3c94986632ead5510de70b27689498cdc370bef8bbcdded66dc8d43061358c438b8 SHA512 51201a5bec24ebfb550d3e6b52114c83221d2e4b54cde577b76def1ccdd3476758ea2c8e1468047bcfccd6e8cdc3fc1d35d6c0dc8b7017c8d290c4aea66350f3
DIST yash-2.49.tar.xz 740780 BLAKE2B 61fa2d2ab8a5f672cb21cc39c78f18076a4acd79d84fa2285bb35b03a697a58fa77584e5d66268dedbf69b5b2f2e00a7d2b6f6954ffa37a5e9fee3995851034b SHA512 99d98cfbe09aa746f2707217ecb506d8d5998df4a603ac276a8a67782fdcb3a7bd41fb34744f3834e319b0fdb0b1fd480cf9e2a4b835fec3e758280e13036db5
-EBUILD yash-2.48.ebuild 755 BLAKE2B 1c958f592561f655e7f5700ebd61b86edd9c9db43431c09b4142524c3d876c09044490ad868f092254b856726788637217f49cd5c4aba76eab3426de3b5f162c SHA512 f5f6125e45d159bb740dd3befdfc28c2c71fc0a2ceacc6bb0a821150336ce9901599987b85e133c05207a502c289c6fdde307a7996f4abf83c0cca1488951903
-EBUILD yash-2.49.ebuild 757 BLAKE2B df37c3ea6ef12f438f71ee4a50971fff6bb219e839c78840aa365d54100f7898f3c4baeffa661711268106bdea79d37d049be2b6df5eb880bc974c98403f0d18 SHA512 d6f57ad4fa77c5431b4b4070dc2dbced0fe5c0ad41fd0bdd5801a6b53612caab8267c151091efe0dd89399f4b6dcee6bf68a8ac2caffc3bf10082de27fa682e2
-MISC metadata.xml 1043 BLAKE2B a83b4a65aace09de65f4c1f44b99711171ffe1d5abc453f0c616fc02d0dfb63828ca7dc7ca431641c6c87d4aab15c5160802ee534de055e0f53bc0350a4110d5 SHA512 004f1faa56032de6e2f37af8199f165c4394a4f7a3c2e2eebd79254a5155bf429e0e0d1e97e7b025037d7a3fbcf91d14b67e37dbe0313fe1ca38a2a7d56ec9f4
+DIST yash-2.50.tar.xz 739988 BLAKE2B 4d8047150e2326b7c401f79416d87d09c099d4743026ee997e7f49d096cb23de210ded489b348cc9a264ece2fd4778b4f5c5c9999ed7391ab78699ce77ec03e0 SHA512 fc78d61b09f7c81d1d7bd3f4feefa7d4c0de910524759ebcba2b53322abc3f1e0a937007b36a5060af0ee759df210ec06d5eed2c71cf3f7ccd0825521b50edb7
+EBUILD yash-2.49.ebuild 764 BLAKE2B 45d93ae014cde19737f8ee1f0a905c863db0e448e3c86fc7ca84749d62bc88cb8e7af68224ed9f6f360e47c474fbcd7a87b16b1f5e64ab0b0513971edbc76be9 SHA512 29d521dcc409e7dfa6ce3bd202e59aff0673b01b34bda4f06cd19c5e0285218ae6942d69cf6be7240aa490aa2ed8971cebc8ad0ddee6bd3f06d3deebe4c1a080
+EBUILD yash-2.50.ebuild 766 BLAKE2B fc480d9ca7be75d0406c35b36b3c99ed294b0dc13b8fdab66dee583c92af51d8051e1227c7480063c9de013a83196cf4d86f2365405af501ee77fc033d614202 SHA512 2bb70cada71ab37c8846f15a855286bedf086347588e07ac6b2729e1f75c96503e09e8e7743578cb7451a40b1370015b562ce269c603c1863aa75320db2a751d
+MISC metadata.xml 1074 BLAKE2B d708f52e13ea634a70925efd46c586d97c6fe285fab4742f4671e245524be326f62a962ee45163edbff305f85471ee2f02ebf096764261842cffb1106c8bb0c3 SHA512 a1f98063d8920e0ed5e5386e2fed7d80cb16c091f8bd48ad9ff8242e4ca61be77c70e3a7102d97f0a7732d768a91ee4473126a1cf8dd0141b83c9f7f845eceb1
diff --git a/app-shells/yash/metadata.xml b/app-shells/yash/metadata.xml
index 106f4c845b23..539357784aab 100644
--- a/app-shells/yash/metadata.xml
+++ b/app-shells/yash/metadata.xml
@@ -3,6 +3,7 @@
<pkgmetadata>
<maintainer type="person">
<email>hattya@gentoo.org</email>
+ <name>Akinori Hattori</name>
</maintainer>
<longdescription lang="en">
Yash, yet another shell, is a POSIX-compliant command line shell
diff --git a/app-shells/yash/yash-2.49.ebuild b/app-shells/yash/yash-2.49.ebuild
index bb1d804ac188..600ce96ffb7d 100644
--- a/app-shells/yash/yash-2.49.ebuild
+++ b/app-shells/yash/yash-2.49.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -12,14 +12,14 @@ SRC_URI="mirror://sourceforge.jp/${PN}/71638/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="nls test"
RESTRICT="!test? ( test )"
RDEPEND="sys-libs/ncurses:=
nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )
test? ( sys-apps/ed )"
src_configure() {
diff --git a/app-shells/yash/yash-2.48.ebuild b/app-shells/yash/yash-2.50.ebuild
index 39eaefe2728f..bf89ed32fa99 100644
--- a/app-shells/yash/yash-2.48.ebuild
+++ b/app-shells/yash/yash-2.50.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
PLOCALES="en ja"
inherit flag-o-matic l10n toolchain-funcs
DESCRIPTION="Yash is a POSIX-compliant command line shell"
HOMEPAGE="https://yash.osdn.jp/"
-SRC_URI="mirror://sourceforge.jp/${PN}/70439/${P}.tar.xz"
+SRC_URI="mirror://sourceforge.jp/${PN}/73097/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="nls test"
RESTRICT="!test? ( test )"
RDEPEND="sys-libs/ncurses:=
nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )
test? ( sys-apps/ed )"
src_configure() {
diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
index 7ae4c31e393e..580713fd9a78 100644
--- a/app-shells/zsh-completions/Manifest
+++ b/app-shells/zsh-completions/Manifest
@@ -1,4 +1,6 @@
DIST zsh-completions-0.31.0.tar.gz 247806 BLAKE2B 1923013feab9800f2dd0eef7b2263b0e252dd35b21d865e3f42f7946eeba2d1a882179e05fd16fdf473006646896ef87ca1da5cbc9bf69b52c66bcf99e82c010 SHA512 3f707e96c5d08103359304905cd36889d2b8dae82f0ea3781048a8fbd2f1db509abc1a181dc75215552214a59ee532d207897167fdb3850a5b1cc40e13b2b108
+DIST zsh-completions-0.32.0.tar.gz 273885 BLAKE2B 73400a13543f63c45fd32d78752f0294e3eaef9a63d41700aa004e445f123673c8bd8cba7aa3c0969fee0e188ea019b3f92cae2a6de341bf9b2f0f5842792785 SHA512 f1ef5dab3343675a9d82f6df0db4f541196d1904386becc94753b69a4515229ddcc133fe491c33e4a736ea0789c667f50306e60fbe5e61b97d0b3fd4946bf69a
EBUILD zsh-completions-0.31.0.ebuild 800 BLAKE2B 8cd0c838f544a7dff4cd7e5ab1c38308a25cbedfe141bcbadd9909e6af260c739fe1a961e265b8a90851be304077f38792c0043e15d732fdcf16351f0da86131 SHA512 565c3633835f5fa660f1cf25129455b1909e772faf3357b0eac5150d81f574b1caeb2d7a7c0bc4b3abe180a70feba08f0f5444d90dd3a01c05a22141a0a7f792
+EBUILD zsh-completions-0.32.0.ebuild 801 BLAKE2B d379c27f3a26423f4a86c8b2ad85d098ac01d10057c34f09423578986147fa2c71ed72872a7e31d88f0d2a0bd03947e116e12a6889be455ff4f5a071164834b7 SHA512 e56dd9709de49ba1608f70902b0f5e098c8d3c1a7c1462c21d9e93afc0fb895e5719996fdf71b2f8db7ac048a76a85e4a1914970867140ef193c94395b34b12c
EBUILD zsh-completions-9999.ebuild 785 BLAKE2B 41e5cb4e18fc3947a5478e4927c1552ff20441d8e249f2589efbe2b1796d625381bb02d6180d8eae4c7e415b66aacdf386993089ba360ac4b039df8fee89f700 SHA512 6801846ac6ca49cded07839324e97ac8d32fbb46454b60e56dd0a5644d918bff08b316ebfd9e5cb4c5d96cd4d12d3f1644abfc3893062e9267964386b4f5a8e7
MISC metadata.xml 262 BLAKE2B 3da59cbc52cd06fd6aa07842e28a11ccfdc1f1db2d44b2a6d1496325ffe72f536797631682e751e9f3b4cbc6b9b61fd52795758bce69e3cdc4f84098ae2bac22 SHA512 61b2418f9a970c2404f413abfd65d7600bf985c248718801021e1e7846b5c8b453b3672123cf0d5815af0a1930fb45928494b20a18d86384d77e6a57bdfc35c2
diff --git a/app-shells/zsh-completions/zsh-completions-0.32.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.32.0.ebuild
new file mode 100644
index 000000000000..bac7cbeb28ce
--- /dev/null
+++ b/app-shells/zsh-completions/zsh-completions-0.32.0.ebuild
@@ -0,0 +1,33 @@
+# 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/zsh-users/zsh-completions.git"
+else
+ SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Additional completion definitions for Zsh"
+HOMEPAGE="https://github.com/zsh-users/zsh-completions"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="app-shells/zsh"
+
+src_install() {
+ insinto /usr/share/zsh/site-functions
+ doins src/_*
+}
+
+pkg_postinst() {
+ elog
+ elog "If you happen to compile your functions, you may need to delete"
+ elog "~/.zcompdump{,.zwc} and recompile to make the new completions available"
+ elog "to your shell."
+ elog
+}