12 files changed, 270 insertions, 147 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 2237c4617553..99d058fbf4d2 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 29d4bcb9c8a7..38472cc23256 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -356,6 +356,7 @@ DIST bash44-015 1233 BLAKE2B 5504d4a64f938ccfbb12f43455c11c6dc6a38397e5692da874a
 DIST bash44-016 2069 BLAKE2B 5ac613c450d018edff4f82740655ed0e460e49b57ce1a817f0b7b0a101b9f1ab095c48904fc17789203d6bdcc1beb01dde23b4a097f36441eda5e11ab638e9bd SHA512 5acc704df3fe63b5b8055ba7bc14ae70cc23d15aefee8db6991e6c11cc8b0e10fcc67d516bc2d2fde84be26ed5c88dbf266fa164756218b60eccc2bfb4eed7d9
 DIST bash44-017 1143 BLAKE2B 64da515637109cd87b95e5f55857f25c2758b4a5c2620cd21250287e00767d5ca7a14fe331603cdef1ba02f622d97ee120bc0bfba463bccb113f16ebee56159f SHA512 c1d50aee953427ba0b95e48c10d2324e7413f3354ff65b9c3c1dfd14eedec55e619fcd12353e7b99b6e280f510e04d1c971b309c1a4efb97d48ddb30d69f14ac
 DIST bash44-018 1319 BLAKE2B abfd87f2cb5e9aeb0352bb0efbfd3ad95cbb26445e09edaa762cf1ea1fa01a00ab57c96d912ae5eaf653b66169bc54bba39fdf1d62ad45301c6599d21979ff14 SHA512 008ff44dbf916414d691c29cee29e7f636bbe79170463d76ef16ca63ecdc24a84ff4476078c28fb8788d9b1fb0572612a7e8cb30fceb55ad650f293db8361ad1
+DIST bash44-019 1671 BLAKE2B 3d917b1c2618b92d7a79d64a8282cda84098d7d83b8ab3e62c49ab259d6976ef953ab1bde98b9d2cd925cfbdff94b5fd5910876e8de85d40466cf5f3ceb377c4 SHA512 59984e221a7a6dbf72bf893b1b7c4a63fea34d6af1208a19f0e9e6cd59a09e4cf51890cb2d31c1502e2a2f644f584417bb59cf02c308d3250d2a98d41b63e893
 EBUILD bash-2.05b_p13.ebuild 4613 BLAKE2B c9eae8a532057dab41ca20640f7b85e9f0d8b11eacd84c91b0dc478dcc906cd14976e02b086e2fbc1786661f27ddfce0b8631211461ed77cced2037058e99338 SHA512 f933883acba8f96a5f0390b11650981291c8048211e832a6d3bcc6f41cafe9372380051f804e22958934803c4d8cac83d1bdb604689c313bddeb67446106bff8
 EBUILD bash-3.0_p22.ebuild 4746 BLAKE2B f8840c82f5cfbcf224d1504d3cbadc3eabe015d991a8c41de978562cc0c806b6baed999d085774594deb620dd714fb8d020ccc89d65c3e622745875528b61b57 SHA512 c39a3f5b22a8b462e6b2abf63a13454559b358002e0efb16640fb9caa04cbd9b416640cf25df98b9fdcaaca465bbf083c0687dc08e122c8b965e2761b01b37f6
 EBUILD bash-3.1_p23.ebuild 4427 BLAKE2B baf534ac2cf5a872673b355532b0b9ea8d4836df331f7e50425733815862435ffa44eb9cd95b1dbdd53a29010638b516deb16c8e72a44d5fa135eaea23c34bf5 SHA512 40e91cad8af0682565d4eed7ad2f6184e1624746a8f6ea1ce21bed459e45bcdc8157aa45cc7f89d1ce5c7f1f827707a839bc89a513956b827a50a5e3bc877959
@@ -368,4 +369,5 @@ EBUILD bash-4.3_p48-r1.ebuild 7248 BLAKE2B 3a8e835dd559ddb5495ce716ee869e2792765
 EBUILD bash-4.4_p12-r1.ebuild 7222 BLAKE2B dbea2f6145b913878f4ddbb549e1735f71f59f58bec7378164029c767243b695e85486782c24f752473754115d2be77a8416496b5c3552cff97e218b3acaff4b SHA512 7399a4bb123edce35bd9e8614cf0ac738906c47d7679d50e01d1712c1b8324d7cc2c680a7ff57ea1dcbe6d2e988aa01f318d9d8a8fb5f0f50428bc4ac9d2dc7c
 EBUILD bash-4.4_p12.ebuild 7166 BLAKE2B ced88ff95f990cd927250eb679a2fa1ef133013c21e4672fea96aa367f394eb7bdc7cfe73cea94fdefdc181138ee5705b0373e92bafb220dbff3fc65637840b7 SHA512 4723c35bd701194fc09f3deceac0406b145b5ba77c7ba565d3ec5553fc82cf7829ee742b5808144e10c838894496163f1c9499307d890359fa34e172e3be7f2b
 EBUILD bash-4.4_p18.ebuild 7222 BLAKE2B dbea2f6145b913878f4ddbb549e1735f71f59f58bec7378164029c767243b695e85486782c24f752473754115d2be77a8416496b5c3552cff97e218b3acaff4b SHA512 7399a4bb123edce35bd9e8614cf0ac738906c47d7679d50e01d1712c1b8324d7cc2c680a7ff57ea1dcbe6d2e988aa01f318d9d8a8fb5f0f50428bc4ac9d2dc7c
+EBUILD bash-4.4_p19.ebuild 7222 BLAKE2B dbea2f6145b913878f4ddbb549e1735f71f59f58bec7378164029c767243b695e85486782c24f752473754115d2be77a8416496b5c3552cff97e218b3acaff4b SHA512 7399a4bb123edce35bd9e8614cf0ac738906c47d7679d50e01d1712c1b8324d7cc2c680a7ff57ea1dcbe6d2e988aa01f318d9d8a8fb5f0f50428bc4ac9d2dc7c
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-4.4_p19.ebuild b/app-shells/bash/bash-4.4_p19.ebuild
new file mode 100644
index 000000000000..c11c5b32237a
--- /dev/null
+++ b/app-shells/bash/bash-4.4_p19.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs multilib prefix
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+is_release() {
+	case ${PV} in
+	*_alpha*|*_beta*|*_rc*) return 1 ;;
+	*) return 0 ;;
+	esac
+}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	[[ ${plevel} -eq 0 ]] && return 1
+	eval set -- {1..${plevel}}
+	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
+			printf "${u}/${pn}-${pv}-patches/%s " "$@"
+		done
+	fi
+}
+
+# The version of readline this bash normally ships with.
+READLINE_VER="7.0"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
+if is_release ; then
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
+else
+	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:0=
+	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+	nls? ( virtual/libintl )
+"
+RDEPEND="
+	${DEPEND}
+	!<sys-apps/portage-2.1.6.7_p1
+	!<sys-apps/paludis-0.26.0_alpha5
+"
+# we only need yacc when the .y files get patched (bash42-005)
+#DEPEND+=" virtual/yacc"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if is-flag -malign-double ; then #7332
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+
+	eapply "${FILESDIR}/${PN}-4.4-jobs_overflow.patch" #644720
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if is_release ; then
+		rm -rf lib/{readline,termcap}/*
+		touch lib/{readline,termcap}/Makefile.in # for config.status
+		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/*
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=(
+		--disable-profiling
+		--docdir='$(datarootdir)'/doc/${PF}
+		--htmldir='$(docdir)/html'
+		--with-curses
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading Bug 7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=${READLINE_VER%%_*}
+
+	# Force linking with system curses ... the bundled termcap lib
+	# sucks bad compared to ncurses.  For the most part, ncurses
+	# is here because readline needs it.  But bash itself calls
+	# ncurses in one or two small places :(.
+
+	if is_release ; then
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins; then
+		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+	tc-export AR #444070
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use plugins ; then
+		emake -C examples/loadables all others
+	fi
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED%/}"/usr/bin/bash "${ED%/}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+	keepdir /etc/bash/bashrc.d
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+	if ! use readline ; then
+		sed_args+=( #432338
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED%/}"/etc/skel/.bashrc \
+		"${ED%/}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			insinto /usr/share/doc/${PF}/${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					doins ${f}
+				fi
+			done
+		done
+	fi
+
+	doman doc/*.1
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+
+	if [[ -L ${EROOT}/bin/sh ]] ; then
+		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
+		# missing even temporarily causes a fatal error with paludis.
+		local target=$(readlink "${EROOT}"/bin/sh)
+		local tmp=$(emktemp "${EROOT}"/bin)
+		ln -sf "${target}" "${tmp}"
+		mv -f "${tmp}" "${EROOT}"/bin/sh
+	fi
+}
+
+pkg_postinst() {
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+}
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 2c3a90c86920..437a0305783a 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -4,4 +4,4 @@ DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d
 EBUILD fish-2.6.0.ebuild 2101 BLAKE2B 58ffb1a0240f07c7b84cdd09aafcde2fd5315bc089c6b0408e741e2ff692181910580c6d35b6ed7116eca4715d8908ea9283b1721b1ea6144ef397eb063e6a40 SHA512 300260bdc26e6e17ba5aa0ec8e1cb96b9669e43e83d92b98903ed79299ce6a350eb12b626ba5e6882138f2374107a2e7b9360a1012ccaf11578664f1270ced61
 EBUILD fish-2.7.0.ebuild 2287 BLAKE2B 483123e3b74e45e1402195ad971e26bb36f321646e7ac6298cdd29f8f6ff838f0fef0f255bf683bf37825164ede42d7823c9a6dad4253650a2e59f4404428979 SHA512 0ee5c9aec58088fb471c7212c48ecb9d8453983027e959d7ab5bf983f3c193fa8267b1f179ac02f33645f1d7bcad80fb1798c4df6683f811a7dd7c2a9631b7db
 EBUILD fish-2.7.1.ebuild 2159 BLAKE2B ded9a6da71c070afbc573024e45b1cfdbade653eebd9d1e6432958856ac58d5ffe413371e00e7c6858fb5742ef1ec1af13ee4d6bc5eb2d9668bae93ba80c37dc SHA512 aa9ac9b7d2cd622a21eb70f68b2ce9d78a6f659696eedf1a84b26b8804c25978c19183e5acad3b7b636aa514cc186e6e61c3bb2743dd7f50375bd94d37470735
-MISC metadata.xml 509 BLAKE2B e9b5650b9025866fd55d32c5f8e61eef8c7297c72599168cfdccbb7944106489e8be39b26bd711e2ebab7858ab848b19693b72becd3710551654c9d3202f2e8f SHA512 b4ba8bf04d8814847af718f64bfc59e79f6146f2841da5b8e9d1854caa9d72526cca85d2235483970656f5d78a9bcaba2d636b91ef6406f6f6a32a9fee3c312f
+MISC metadata.xml 357 BLAKE2B 86e4990eabc8979e51987a6b03fab2469620906fc7b511900133732071c8621b1bff80b8c8c2ffbf9758a03d254cfac4c71a827fed59eafe402841494d624eef SHA512 d8e65b1aec008a14cb7c729a9fec2e25cccbbd2d97df0fb182dc6c057a6abdeaf0e896429a7cc6c871d10047212bf8b123bdaea0ce6c37594306aa549c635982
diff --git a/app-shells/fish/metadata.xml b/app-shells/fish/metadata.xml
index 918d136fd201..f4443c79761f 100644
--- a/app-shells/fish/metadata.xml
+++ b/app-shells/fish/metadata.xml
@@ -4,11 +4,9 @@
 	<maintainer type="person">
 		<email>ya@sysdump.net</email>
 		<name>Georgy Yakovlev</name>
-		<description>Proxied maintainer. Please assign bugs to him.</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
-		<description>Proxy maintainer of Georgy. Please CC on bugs.</description>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-shells/mpv-bash-completion/Manifest b/app-shells/mpv-bash-completion/Manifest
index 8ce3579ae862..58af2575c7fc 100644
--- a/app-shells/mpv-bash-completion/Manifest
+++ b/app-shells/mpv-bash-completion/Manifest
@@ -1,7 +1,3 @@
-DIST mpv-bash-completion-3.3.12.tar.gz 19310 BLAKE2B d98233a576402e28b94b5a00a985ed2fe781d6529a09be2abc499c44c2b5a1a7b6237f0fd72822a8e1da568829b097cab7419096870f86a7b07b6858f148c456 SHA512 f019e9a66072333b40213437f07097cacb9f01a1f322fded763e695ef5ef4656016ca07fcb402d406fd99785026dba1fc7292a2c04a14ac18a24557bb8ab2cd1
-DIST mpv-bash-completion-3.3.15.tar.gz 19830 BLAKE2B 95b61e10dcf37c688a789fc1d5d295e9004e908ec4746991e0749e392f3ab5af0e5b4ebb8778822ec2b9a0df0c767df812c8035586723bfed899796842661bd9 SHA512 d4e263bb7c21f80b962bac9f1b01c594d5038d7a7095af0e7702dc5688fd69a9de1b5d8976f24d7a652a8fba4ceaf3ea2a81c771e7ea704807aeac0c526a09f6
 DIST mpv-bash-completion-3.3.16.tar.gz 20125 BLAKE2B 1350445ea05474e553ade334c1f11e97828df11143021920a25787a295d6e870595e35dda6ccd048ed4e01e0e85443a5902893fed1aa1525e875649a93ef632d SHA512 d962cc911d571b0345ddee22ecae6faef307f2da44642d6db5223fb0e51d2b2087b038e1964cf8f1ed683bb95a3268a8ffc1fff2759561100b23921406a0e31f
-EBUILD mpv-bash-completion-3.3.12.ebuild 1011 BLAKE2B 9dd8d7252321818c92e132604912840037566a2055956530149876914c4c65f59c19fab6399a8e719abe4cbaaa662a2ecf9176664f9a1f2063cab79eda01bbfc SHA512 4a32d4d8cc9fe52735bacba4b351522b702a7daf01eb74662f2c935952d1d005f1c3c7be1229bc183d477fa12071ef6688b80061d03ea2e7b98a495ea78479f6
-EBUILD mpv-bash-completion-3.3.15.ebuild 1012 BLAKE2B d69ab34e57f3d3dd9e772051ab8a3a8ca83bb6bb74d450a5c641577e927e87b70dd18da6b583c850ca2a738072f00cd992f2ac8004cf25e6e68a36efd308b885 SHA512 612b2af3a767013de5cd392be076fe6cf70e3863928b5048ef60faba7edd7ccbacc3e40ef568206a6e9065d9309f6af723d18c84d3ef4ef3cd424fe62c7ebbaa
 EBUILD mpv-bash-completion-3.3.16.ebuild 1011 BLAKE2B 662cef51d4b5849a97323b301ff69536a162d3bdab937bc68a126616eb4dd627eff22ad580aae3418fbcdc4bbb9f7edebebe1fb216cc499b2d3e2f9c4dd252bf SHA512 2a46ad7794718a676c8b20fd7bfc35710f9d2908ab7e1821e44dade6c2a43dc540b76c1acfd5756b1bc19547e32c122ba64cf370792774890a02af5462e28fb5
 MISC metadata.xml 643 BLAKE2B 94c8ac2a90c9662ad1a887b4824b7976b135aa182bddb84c00701ec07f5a3526e95c45976802b57e4855c1001c696dfa49d3b3beb5aedca5aa469cc21a74e2a5 SHA512 8f27bb84763dbeb1b45290b6a0ff6ede7d5a3e15513d1ccbdbb544bf20a324c8cd687a517b50823320f5f0ddc7b8a71efe7cadb29ed3ca1fa4a1c43500f6ca76
diff --git a/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.12.ebuild b/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.12.ebuild
deleted file mode 100644
index 73163ee89721..000000000000
--- a/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="Bash completion for the mpv video player"
-HOMEPAGE="https://2ion.github.io/mpv-bash-completion/"
-SRC_URI="https://github.com/2ion/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="luajit"
-
-COMMON_DEPEND=">=media-video/mpv-0.14.0[cli]"
-RDEPEND="${COMMON_DEPEND}
-	>=app-shells/bash-completion-2.3-r1
-"
-DEPEND="${COMMON_DEPEND}
-	!luajit? ( dev-lang/lua:* )
-	luajit? ( dev-lang/luajit:2 )
-"
-
-src_prepare() {
-	default_src_prepare
-	# Avoid 'mpv' make target that supports lua only.
-	sed -i -e 's|check: mpv|check:|' Makefile || die
-}
-
-src_compile() {
-	$(usex luajit 'luajit' 'lua') gen.lua > mpv || die
-}
-
-src_install() {
-	dobashcomp mpv
-	einstalldocs
-}
-
-pkg_postinst() {
-	if ! has_version 'x11-apps/xrandr'; then
-		elog
-		elog "If you want completion of window sizes, please install 'x11-apps/xrandr'."
-		elog
-	fi
-}
diff --git a/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.15.ebuild b/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.15.ebuild
deleted file mode 100644
index cc0b326cb44d..000000000000
--- a/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.15.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="Bash completion for the mpv video player"
-HOMEPAGE="https://2ion.github.io/mpv-bash-completion/"
-SRC_URI="https://github.com/2ion/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="luajit"
-
-COMMON_DEPEND=">=media-video/mpv-0.25.0[cli]"
-RDEPEND="${COMMON_DEPEND}
-	>=app-shells/bash-completion-2.3-r1
-"
-DEPEND="${COMMON_DEPEND}
-	!luajit? ( dev-lang/lua:* )
-	luajit? ( dev-lang/luajit:2 )
-"
-
-src_prepare() {
-	default_src_prepare
-	# Avoid 'mpv' make target that supports lua only.
-	sed -i -e 's|check: mpv|check:|' Makefile || die
-}
-
-src_compile() {
-	$(usex luajit 'luajit' 'lua') gen.lua > mpv || die
-}
-
-src_install() {
-	dobashcomp mpv
-	einstalldocs
-}
-
-pkg_postinst() {
-	if ! has_version 'x11-apps/xrandr'; then
-		elog
-		elog "If you want completion of window sizes, please install 'x11-apps/xrandr'."
-		elog
-	fi
-}
diff --git a/app-shells/rrs/Manifest b/app-shells/rrs/Manifest
index 888ee7b5ef2d..4f1ac797b4a5 100644
--- a/app-shells/rrs/Manifest
+++ b/app-shells/rrs/Manifest
@@ -1,5 +1,4 @@
-AUX rrs-1.70-asneeded.patch 1437 BLAKE2B 7c475dee125d2d394bbf9ff5c95c5952731ea70d6d299e96f7e3d7b57dd9d463a22f5fc81974f3ee523fc93657d0d7695ddfbb64f42b3d656b0660c36524bd38 SHA512 f72670f986887a04efaec8ba8b4d8a5c725ae21dd25217f67268973487556f757d0e24a4b81bdc573d0dd85bdf0f35c4148b3d553298046696aa4571ab511363
+AUX rrs-1.70-asneeded.patch 1436 BLAKE2B ab35e22a351024935c13433d49e9c7e1ae452b597e179810a58a9e181895d6731a81d472abd2147865ff76bd4ad338429d41eadcead229a5ce243a66b66e8c17 SHA512 05972478d2e27290a430b0d80343f25c494a9f0f82ad87df2bc400dc652775dff447d8914e367d3092db2fcb5c4700e5d5873452767943e3d0b27410bef51188
 DIST rrs-1.70.tar.gz 49579 BLAKE2B 0345f559239f64d51891100c11f3b80d2b41277eaa0e283c86dbd990496f083e1da60aa6937c870c133bfe8e7f905848d0da1a17b827a2bb07bd8ee1be4b36de SHA512 58a3d34bd80f2ddaa62112819d83ab2175daf1b9e66605d0b629a15d1fc6b43b482e1a4a763b99a07d85bbb0fa6df339d0dfcc203e3a3da3d5cfdabbd14a4bfa
-EBUILD rrs-1.70-r1.ebuild 711 BLAKE2B 87f27933c5e6414668dddb8f99876b2bafd6952a00b84135f417c190f1edb324fe9967c4bf3e99ef9b494f2ca535459224a420bf4dec5d0c388dc62dcacd024b SHA512 9a503747336f3cbbf0321448690bb31ce88c69b0e2430d690b3193c014e7667508b3ab5a4b36fcaa6273219f52292802df801b5722638f73c05effbbe451a269
-EBUILD rrs-1.70-r2.ebuild 746 BLAKE2B cccb1d96ae78a5b84d36ab3cfa3b9f13de2ea43b5cf7b6c068874ba9893991f3aa8249ac36ea43be1abedd16947e67566708fab09744a2abea3fcd14e453ad01 SHA512 335e07e3a4a2d7fb043155aabf311bd3c452635fd6d06536ba96cd7539feed94d2d3ba9f45028ec73ce6f37732ba5c29c4a8eb4d6ed9500e003a9421126f7bf5
+EBUILD rrs-1.70-r2.ebuild 721 BLAKE2B f3adb0826e4243789287286c4258aafa8da95030148cce06b2a9a56f9cc748ac924b67212cd5a611c4b6ea1b0ff28cf1a3616671b2bf0df4a7acb50164fadbd1 SHA512 466f0c10175cd675bf54af6cc727ba9bd2101a24cff53d9fc41da3a0adf7a8a7bcc20e4876b41179f05788762325e0451ce0581ac3734caa8c81e2c24e60c9d3
 MISC metadata.xml 317 BLAKE2B 79bf68384cb06bb254c6bd8757a368e929ae41d5dcd793c7123ea0e336c9187c9062013fc4feeb032c18515fa865d05f1f61272555f2e137e419c23b289246e7 SHA512 b80e5e730f8ee1225f73e1c1651c9cec243f117f3b983ef0814699ba367f373ada228e1fe2b6b8f1928eeb5cd854c1a7bf07d59075607a992a4a0e0dd3482ee4
diff --git a/app-shells/rrs/files/rrs-1.70-asneeded.patch b/app-shells/rrs/files/rrs-1.70-asneeded.patch
index 9ed9ee16fbee..8c55d17678e1 100644
--- a/app-shells/rrs/files/rrs-1.70-asneeded.patch
+++ b/app-shells/rrs/files/rrs-1.70-asneeded.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2004-05-30 02:14:14.000000000 +0200
-+++ Makefile	2009-01-03 15:02:19.253460887 +0100
+--- a/Makefile	2004-05-30 02:14:14.000000000 +0200
++++ b/Makefile	2009-01-03 15:02:19.253460887 +0100
 @@ -8,8 +8,8 @@
  # if your system doesn't have GNU's getopt_long(), add -DWITHOUT_GNU_GETOPT
  CFLAGS=-I/usr/local/include -Wall -O2
diff --git a/app-shells/rrs/rrs-1.70-r1.ebuild b/app-shells/rrs/rrs-1.70-r1.ebuild
deleted file mode 100644
index 1bc50a484efe..000000000000
--- a/app-shells/rrs/rrs-1.70-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Reverse Remote Shell"
-HOMEPAGE="http://freecode.com/projects/rrs"
-SRC_URI="http://www.cycom.se/uploads/36/19/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="ssl"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/"${P}"-asneeded.patch
-	sed -i -e "s/-s //g" Makefile || die
-}
-
-src_compile() {
-	local target=""
-	use ssl || target="-nossl"
-
-	emake generic${target} CFLAGS="${CFLAGS}" LDEXTRA="${LDFLAGS}" CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin rrs
-	dodoc CHANGES README
-	doman rrs.1
-}
diff --git a/app-shells/rrs/rrs-1.70-r2.ebuild b/app-shells/rrs/rrs-1.70-r2.ebuild
index 36ca714b57e3..efc3d8c7394f 100644
--- a/app-shells/rrs/rrs-1.70-r2.ebuild
+++ b/app-shells/rrs/rrs-1.70-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,15 +11,13 @@ SRC_URI="http://www.cycom.se/uploads/36/19/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="ssl"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}"
 
-PATCH=( "${FILESDIR}"/"${P}"-asneeded.patch)
-
-DOCS=( CHANGES README )
+PATCHES=( "${FILESDIR}"/"${P}"-asneeded.patch )
 
 src_prepare() {
 	default