gentoo auto-resync : 12:03:2023 - 18:13:14

6 files changed, 194 insertions, 237 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 64db23906715..28e5cb7fd3ef 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index e165c3bbefc2..4fbd4e33801b 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -2,10 +2,10 @@ AUX prompt_gentoo_setup-1 817 BLAKE2B 37f6f7eae4602ca62b8bd8a01c442712903b5b1823
 AUX zprofile-4 1314 BLAKE2B 8373d9f68613d5d44121c46a02dd7a5c988f4a3d948aa6bf96a9b0c5f67967f4b787b7ab346e7fabcdd8805321a89b63e6919d5abef082d24e4c46157c68e4db SHA512 5f87b4f0e59bb338f9aa8ec811424d37042ab5ad889aa00f6f912003b7aaaf8b3ea59746590c639a45facace0743deab89779ae5cee8ff6a39beda99864c9cf7
 AUX zsh-5.3-init.d-gentoo.diff 1048 BLAKE2B 295e391679ef876a7bdaeaf6dc4b1b3a342c40f092f8cbeba137ee5ea6d26e16f988fc92f105bfcec739bc2aeca62195839b80dee337de8bfdfb5ff00a34fa22 SHA512 9f059cf4b99b7006955ab0ac43d4a4b4d762d193da9a738f771c562f2c3af3a9125694da59c584a3ff829598443e5429c873319ecd8fae2feba7096b597798dd
 AUX zsh-5.9-clang-15-configure.patch 16591 BLAKE2B 6ea7078eb0ab59c151626de20e3a27e392afee656d0baae7294b7c2bdd63263dc28e9ad81d14884b10fb496a198c458a00459d63b144c16bbdad2489e9c5ec2b SHA512 0fd193a92c24dfd3b97f6294469cad8c799c91c27bb1f298bb64dcd10982543e80ab9e63517915ff648096e85105044c9d2d4368977266f7e3f6b34e69277768
+AUX zsh-5.9-do-not-use-egrep-in-tests.patch 4576 BLAKE2B 583cd5f37b7e9af0bbceb0592580f8f2780d3615ccea587e601cc79a85d9b0717ded2ffff9071445f7f724ea4c9f8cad08a3c999d66f801ad0fd1141c917842a SHA512 e185a94359b3f9a2f832fa412d4aefd513be5b9c4550ed68c0add48ed31b1f2e17b3382ace15995e90ee8deba51e5942cfbb2fa3ddf0a0b694b5e2fd43ed6fee
 AUX zsh-5.9-musl-V09datetime-test-fix.patch 641 BLAKE2B 693f3caf1e98ba971d776f1afc40570eb9fedb95b0be9f676cc7aae0e4a2c60af1c95d90b7e675be5de5498d1b2e8af6e3bfb3410e3f4e81d3b6eabc0159fa01 SHA512 1a11e774b85b68065e49a3a9407f46c3fde1432ce5192a696aea66f5a6beb9a2430e71233d1c29b75f87ac0ba27173b450b8bc867f684eccd28db03b7dc71a09
 DIST zsh-5.9-doc.tar.xz 3130444 BLAKE2B 96b635b438f8a90bc1f3c15c8a287ab392ba830e975e49b7f1c09d12de44c250dcf33d1d6dc93b58693839af2e57eb5c9d4e874ca08dd82fe876cb5ca26e6508 SHA512 5cc6abcdcfb4f5ad7bc4a31364ca49dfd87ae03e0082d89cc2ba1f00570f6757266ee60894ad31b562408de91494c22f177b414b03cb78c31d92328686be9860
 DIST zsh-5.9.tar.xz 3332400 BLAKE2B 3ecd6d080ff47b78d228d9bf5c1bafd3dfc602beb681ec533ce1039041d0e93143ebd7e0e73a9aed0789e27ca42d58a55f3b6e2c7d89113ab3ee99112dec46d1 SHA512 d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e
-EBUILD zsh-5.9-r1.ebuild 6477 BLAKE2B e5056ec62f5aa5a9ee2e53f02e68cd91a6080dbca1d8a96bc52b7f3dc18f5e9804017390c443d74324b898a19a57671022efef5f3234f96e0fec81ae6f3979f7 SHA512 d62f608777b9831da8d227eecd822b6510d2d67f3970e95fc428245e9668e1bf8787e4cd385b7ab45d3add9a36d3b21d1cd8f98404dc204898a6f6dca68b428b
 EBUILD zsh-5.9-r3.ebuild 6468 BLAKE2B 110a838070c8684bcc2d801264710378d1316c493b5dc1a3735e2dca364e52a16c5fc4edbfd4395f5d2085b2ccc84dd02aad6f23e60253ff443df194aac2a016 SHA512 c344eb8106642b28de281271ba10b15e1b72aac29ef325b6778465918d124491ff309b1a244d90a74da913809d2ef926fe313e9c9f96fdb20faa8ec82c3d8710
-EBUILD zsh-9999.ebuild 5898 BLAKE2B a0343e0caa2b715c1d35060f6d907e48449e6163007f7cd944a9374174e3efbcc8c0599f29af409114f291beca97635db89ad2aba07595b1c48820f3bb7c1563 SHA512 75496f76a2146eae389d8ba1f4c6aea2dcc9bb1c38a2c5ef6844d14e6272c2f26eb0daa082780bd224457e20fc76b9c1ade64bbd7832909c221a1b9266080a82
-MISC metadata.xml 659 BLAKE2B 659f50310f4925023da341663c06672715fee9853f56a4f538c54e5c5a38c6fc494a5f35cb144de7b0f2ae74402fe48eed4b1402c3fd718cde9017505f94b0d0 SHA512 fa1929d584f7c29e861f6e07e2c359400a4e725d5037837f1bcfdba1867b78c200bb583539b9e03bfc03a60d32893c75528c18a177497cfdaf88f42a190f4e7e
+EBUILD zsh-5.9-r4.ebuild 6484 BLAKE2B f2989ece4ea107df5bd52f20866224a058fa5a90621f2213ad34876e494735f25dc2cc9d444508e84ae2a1a86367812986593b7fdd3d9079ee37804d1392bd21 SHA512 78223f5206e49d540ec2032b6d53ad671644a3d5cd1fa443979782f6725a463cdacada1742ca599a87bea360b57bfa334407938eadd3840009f89bd9b8f92a4f
+MISC metadata.xml 736 BLAKE2B 4bdcda7d67731eb834f9dda457cfbc920e5de70ce265b0ef3dd86740b3b909d0b584402c04257e226c163a9aba03b5a282f2c15bb163ac840446c539d099e5f7 SHA512 610d1ac5a2123e8f2aff28551306a6af4f82672faccf805ff30a9a3ad29503b753b0e3c80512a57f2d500ed16680ae39ccc9ee2a59f7a1da616a848f7c7c5552
diff --git a/app-shells/zsh/files/zsh-5.9-do-not-use-egrep-in-tests.patch b/app-shells/zsh/files/zsh-5.9-do-not-use-egrep-in-tests.patch
new file mode 100644
index 000000000000..7cf605674e96
--- /dev/null
+++ b/app-shells/zsh/files/zsh-5.9-do-not-use-egrep-in-tests.patch
@@ -0,0 +1,166 @@
+commit 4fc5dc0292acd77f17281f451774ba2ca4203026
+Author: Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
+Date:   2022-09-15 18:56:20 +0900
+
+    50629: do not use egrep in tests
+
+    (ChangeLog changes removed)
+
+diff --git a/Test/D07multibyte.ztst b/Test/D07multibyte.ztst
+index e2e9a25ef..6909346cb 100644
+--- a/Test/D07multibyte.ztst
++++ b/Test/D07multibyte.ztst
+@@ -1,19 +1,7 @@
+ %prep
+ 
+-# Find a UTF-8 locale.
+-  setopt multibyte
+-# Don't let LC_* override our choice of locale.
+-  unset -m LC_\*
+-  mb_ok=
+-  langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8
+-	 $(locale -a 2>/dev/null | egrep 'utf8|UTF-8'))
+-  for LANG in $langs; do
+-    if [[ é = ? ]]; then
+-      mb_ok=1
+-      break;
+-    fi
+-  done
+-  if [[ -z $mb_ok ]]; then
++  LANG=$(ZTST_find_UTF8)
++  if [[ -z $LANG ]]; then
+     ZTST_unimplemented="no UTF-8 locale or multibyte mode is not implemented"
+   else
+     print -u $ZTST_fd Testing multibyte with locale $LANG
+diff --git a/Test/E01options.ztst b/Test/E01options.ztst
+index 2acbfd357..d38fbed74 100644
+--- a/Test/E01options.ztst
++++ b/Test/E01options.ztst
+@@ -651,7 +651,7 @@
+ >noktarg1
+ >0 1
+ 
+-  showopt() { setopt | egrep 'localoptions|ksharrays'; }
++  showopt() { echo ${(FM)${(@f)"$(setopt)"}:#(localoptions|ksharrays)*} }
+   f1() { setopt localoptions ksharrays; showopt }
+   f2() { setopt ksharrays; showopt }
+   setopt kshoptionprint
+diff --git a/Test/V07pcre.ztst b/Test/V07pcre.ztst
+index c9c844d2a..ca13419e5 100644
+--- a/Test/V07pcre.ztst
++++ b/Test/V07pcre.ztst
+@@ -6,20 +6,8 @@
+     return 0
+   fi
+   setopt rematch_pcre
+-# Find a UTF-8 locale.
+-  setopt multibyte
+-# Don't let LC_* override our choice of locale.
+-  unset -m LC_\*
+-  mb_ok=
+-  langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8
+-	 $(locale -a 2>/dev/null | egrep 'utf8|UTF-8'))
+-  for LANG in $langs; do
+-    if [[ é = ? ]]; then
+-      mb_ok=1
+-      break;
+-    fi
+-  done
+-  if [[ -z $mb_ok ]]; then
++  LANG=$(ZTST_find_UTF8)
++  if [[ -z $LANG ]]; then
+     ZTST_unimplemented="no UTF-8 locale or multibyte mode is not implemented"
+   else
+     print -u $ZTST_fd Testing PCRE multibyte with locale $LANG
+diff --git a/Test/X02zlevi.ztst b/Test/X02zlevi.ztst
+index 8146d6752..203c13c32 100644
+--- a/Test/X02zlevi.ztst
++++ b/Test/X02zlevi.ztst
+@@ -1,16 +1,7 @@
+ # Tests of the vi mode of ZLE
+ 
+ %prep
+-  unset -m LC_\*
+-  ZSH_TEST_LANG=
+-  langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8
+-	 $(locale -a 2>/dev/null | egrep 'utf8|UTF-8'))
+-  for LANG in $langs; do
+-    if [[ é = ? ]]; then
+-      ZSH_TEST_LANG=$LANG 
+-      break;
+-    fi
+-  done
++  ZSH_TEST_LANG=$(ZTST_find_UTF8)
+   if ( zmodload zsh/zpty 2>/dev/null ); then
+     . $ZTST_srcdir/comptest
+     comptestinit -v -z $ZTST_testdir/../Src/zsh
+diff --git a/Test/X03zlebindkey.ztst b/Test/X03zlebindkey.ztst
+index 43692a85b..5277332a7 100644
+--- a/Test/X03zlebindkey.ztst
++++ b/Test/X03zlebindkey.ztst
+@@ -3,16 +3,7 @@
+ # into bindings.  The latter is particularly tricky with multibyte sequences.
+ 
+ %prep
+-  unset -m LC_\*
+-  ZSH_TEST_LANG=
+-  langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8
+-	 $(locale -a 2>/dev/null | egrep 'utf8|UTF-8'))
+-  for LANG in $langs; do
+-    if [[ é = ? ]]; then
+-      ZSH_TEST_LANG=$LANG
+-      break;
+-    fi
+-  done
++  ZSH_TEST_LANG=$(ZTST_find_UTF8)
+   if ( zmodload zsh/zpty 2>/dev/null ); then
+     . $ZTST_srcdir/comptest
+     comptestinit -z $ZTST_testdir/../Src/zsh
+diff --git a/Test/Y01completion.ztst b/Test/Y01completion.ztst
+index 6af0efc6d..f976f9f91 100644
+--- a/Test/Y01completion.ztst
++++ b/Test/Y01completion.ztst
+@@ -1,16 +1,7 @@
+ # Tests for completion system.
+ 
+ %prep
+-  unset -m LC_\*
+-  ZSH_TEST_LANG=
+-  langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8
+-         $(locale -a 2>/dev/null | egrep 'utf8|UTF-8'))
+-  for LANG in $langs; do
+-    if [[ é = ? ]]; then
+-      ZSH_TEST_LANG=$LANG
+-      break;
+-    fi
+-  done
++  ZSH_TEST_LANG=$(ZTST_find_UTF8)
+   if ( zmodload zsh/zpty 2>/dev/null ); then
+     . $ZTST_srcdir/comptest
+     mkdir comp.tmp
+diff --git a/Test/ztst.zsh b/Test/ztst.zsh
+index aca275c1c..d95b726e7 100755
+--- a/Test/ztst.zsh
++++ b/Test/ztst.zsh
+@@ -37,6 +37,21 @@ emulate -R zsh
+ # LANG must be passed to child zsh.
+ export LANG
+ 
++# find UTF-8 locale
++ZTST_find_UTF8 () {
++  setopt multibyte
++  # Don't let LC_* override our choice of locale.
++  unset -m LC_\*
++  local langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8
++               ${(M)$(locale -a 2>/dev/null):#*.(utf8|UTF-8)})
++  for LANG in $langs; do
++    if [[ é = ? ]]; then
++      echo $LANG
++      return
++    fi
++  done
++}
++
+ # Don't propagate variables that are set by default in the shell.
+ typeset +x WORDCHARS
+ 
diff --git a/app-shells/zsh/metadata.xml b/app-shells/zsh/metadata.xml
index 39071458c305..5494fe7078d3 100644
--- a/app-shells/zsh/metadata.xml
+++ b/app-shells/zsh/metadata.xml
@@ -15,4 +15,7 @@
   and tcsh were incorporated into zsh; many original features were
   added.
   </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">zsh</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-shells/zsh/zsh-5.9-r1.ebuild b/app-shells/zsh/zsh-5.9-r4.ebuild
index 2ce37dce147c..97907e6b79e4 100644
--- a/app-shells/zsh/zsh-5.9-r1.ebuild
+++ b/app-shells/zsh/zsh-5.9-r4.ebuild
@@ -1,30 +1,26 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit autotools flag-o-matic prefix
 
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
-else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
-		https://www.zsh.org/pub/old/${P}.tar.xz
-		mirror://sourceforge/${PN}/${P}.tar.xz
-		doc? (
-			https://www.zsh.org/pub/${P}-doc.tar.xz
-			mirror://sourceforge/${PN}/${P}-doc.tar.xz
-		)"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
+	https://www.zsh.org/pub/old/${P}.tar.xz
+	mirror://sourceforge/${PN}/${P}.tar.xz
+	doc? (
+		https://www.zsh.org/pub/${P}-doc.tar.xz
+		mirror://sourceforge/${PN}/${P}-doc.tar.xz
+	)"
 
 DESCRIPTION="UNIX Shell similar to the Korn shell"
 HOMEPAGE="https://www.zsh.org/"
 
 LICENSE="ZSH gdbm? ( GPL-2 )"
 SLOT="0"
-IUSE="caps debug doc examples gdbm maildir pcre static unicode"
+IUSE="caps debug doc examples gdbm maildir pcre static"
 
 RDEPEND="
 	>=sys-libs/ncurses-5.1:0=
@@ -34,7 +30,10 @@ RDEPEND="
 		>=dev-libs/libpcre-3.9
 		static? ( >=dev-libs/libpcre-3.9[static-libs] )
 	)
-	gdbm? ( sys-libs/gdbm:= )
+	gdbm? (
+		sys-libs/gdbm:=
+		static? ( sys-libs/gdbm:=[static-libs] )
+	)
 "
 DEPEND="sys-apps/groff
 	${RDEPEND}"
@@ -57,6 +56,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.9-musl-V09datetime-test-fix.patch
 	# bug #869539
 	"${FILESDIR}"/${PN}-5.9-clang-15-configure.patch
+	"${FILESDIR}"/${PN}-5.9-do-not-use-egrep-in-tests.patch
 )
 
 src_prepare() {
@@ -86,11 +86,11 @@ src_configure() {
 		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
 		--enable-function-subdirs
 		--with-tcsetpgrp
-		--with-term-lib="$(usex unicode 'tinfow ncursesw' 'tinfo ncurses')"
+		--enable-multibyte
+		--with-term-lib='tinfow ncursesw'
 		$(use_enable maildir maildir-support)
 		$(use_enable pcre)
 		$(use_enable caps cap)
-		$(use_enable unicode multibyte)
 		$(use_enable gdbm)
 	)
 
@@ -151,6 +151,10 @@ src_test() {
 		unset LANG
 		rm "${S}"/Test/E02xtrace.ztst || die
 	fi
+
+	# Breaks tests if inherited from environment.
+	unset TMPPREFIX
+
 	addpredict /dev/ptmx
 	local i
 	for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
deleted file mode 100644
index 98399ff00b86..000000000000
--- a/app-shells/zsh/zsh-9999.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic prefix
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
-		https://www.zsh.org/pub/old/${P}.tar.xz
-		mirror://sourceforge/${PN}/${P}.tar.xz
-		doc? (
-			https://www.zsh.org/pub/${P}-doc.tar.xz
-			mirror://sourceforge/${PN}/${P}-doc.tar.xz
-		)"
-fi
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="https://www.zsh.org/"
-
-LICENSE="ZSH gdbm? ( GPL-2 )"
-SLOT="0"
-IUSE="caps debug doc examples gdbm maildir pcre static"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.1:0=
-	static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
-	caps? ( sys-libs/libcap )
-	pcre? (
-		>=dev-libs/libpcre-3.9
-		static? ( >=dev-libs/libpcre-3.9[static-libs] )
-	)
-	gdbm? ( sys-libs/gdbm:= )
-"
-DEPEND="sys-apps/groff
-	${RDEPEND}"
-PDEPEND="
-	examples? ( app-doc/zsh-lovers )
-"
-if [[ ${PV} == *9999 ]] ; then
-	DEPEND+=" app-text/yodl
-		doc? (
-			sys-apps/texinfo
-			app-text/texi2html
-			virtual/latex-base
-		)"
-fi
-
-src_prepare() {
-	if [[ ${PV} != *9999 ]]; then
-		# fix zshall problem with soelim
-		ln -s Doc man1 || die
-		mv Doc/zshall.1 Doc/zshall.1.soelim || die
-		soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
-	fi
-
-	# add openrc specific options for init.d completion
-	eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
-
-	default
-
-	hprefixify configure.ac
-	if [[ ${PV} == *9999 ]] ; then
-		sed -i "/^VERSION=/s@=.*@=${PV}@" Config/version.mk || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--enable-etcdir="${EPREFIX}"/etc/zsh
-		--enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
-		--enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
-		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
-		--enable-function-subdirs
-		--enable-multibyte
-		--with-tcsetpgrp
-		--with-term-lib='tinfow ncursesw'
-		$(use_enable maildir maildir-support)
-		$(use_enable pcre)
-		$(use_enable caps cap)
-		$(use_enable gdbm)
-	)
-
-	if use static ; then
-		myconf+=( --disable-dynamic )
-		append-ldflags -static
-	fi
-	if use debug ; then
-		myconf+=(
-			--enable-zsh-debug
-			--enable-zsh-mem-debug
-			--enable-zsh-mem-warning
-			--enable-zsh-secure-free
-			--enable-zsh-hash-debug
-		)
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf+=( --enable-libs=-liconv )
-		append-ldflags -Wl,-x
-	fi
-
-	econf "${myconf[@]}"
-
-	if use static ; then
-		# compile all modules statically, see Bug #27392
-		# removed cap and curses because linking failes
-		sed -e "s,link=no,link=static,g" \
-			-e "/^name=zsh\/cap/s,link=static,link=no," \
-			-e "/^name=zsh\/curses/s,link=static,link=no," \
-			-i "${S}"/config.modules || die
-		if ! use gdbm ; then
-			sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
-				"${S}"/config.modules || die
-		fi
-	fi
-}
-
-src_compile() {
-	default
-
-	if [[ ${PV} == *9999 ]] && use doc ; then
-		emake -C Doc everything pdf dvi
-	fi
-}
-
-src_test() {
-	addpredict /dev/ptmx
-	local i
-	for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
-		rm "${S}"/Test/${i} || die
-	done
-	emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install $(usex doc "install.info" "")
-
-	insinto /etc/zsh
-	export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
-	newins "$(prefixify_ro "${FILESDIR}"/zprofile-4)" zprofile
-
-	keepdir /usr/share/zsh/site-functions
-	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
-	newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
-
-	local i
-
-	# install miscellaneous scripts (bug #54520)
-	sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
-		-e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
-		-i {Util,Misc}/* || die
-	for i in Util Misc ; do
-		insinto /usr/share/zsh/${PV%_*}/${i}
-		doins ${i}/*
-	done
-
-	# install header files (bug #538684)
-	insinto /usr/include/zsh
-	doins config.h Src/*.epro
-	for i in Src/{zsh.mdh,*.h} ; do
-		sed -e 's@\.\./config\.h@config.h@' \
-			-e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
-			-i "${i}"
-		doins "${i}"
-	done
-
-	dodoc ChangeLog* META-FAQ NEWS README config.modules
-
-	if use doc ; then
-		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
-		dodoc Doc/zsh.{dvi,pdf}
-		docinto html
-		dodoc Doc/*.html
-		popd >/dev/null
-	fi
-
-	docinto StartupFiles
-	dodoc StartupFiles/z*
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		echo
-		elog "If you want to enable Portage completions and Gentoo prompt,"
-		elog "emerge app-shells/gentoo-zsh-completions and add"
-		elog "	autoload -U compinit promptinit"
-		elog "	compinit"
-		elog "	promptinit; prompt gentoo"
-		elog "to your ~/.zshrc"
-		echo
-		elog "Also, if you want to enable cache for the completions, add"
-		elog "	zstyle ':completion::complete:*' use-cache 1"
-		elog "to your ~/.zshrc"
-		echo
-		elog "Note that a system zprofile startup file is installed. This will override"
-		elog "PATH and possibly other variables that a user may set in ~/.zshenv."
-		elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
-		elog "or other user startup files that are sourced after the system zprofile."
-		echo
-		elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
-		elog "one method is to use a separate path-setting file that is conditionally sourced"
-		elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
-		elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
-		echo
-		elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
-		echo
-	fi
-}