Version bump, install header files (bug #538684).

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 254 insertions, 23 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 94f22b000c16..02dc335ea74f 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/zsh
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.250 2015/01/04 01:34:42 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.251 2015/06/21 05:07:22 radhermit Exp $
+
+*zsh-5.0.8 (21 Jun 2015)
+
+  21 Jun 2015; Tim Harder <radhermit@gentoo.org> +zsh-5.0.8.ebuild,
+  zsh-9999.ebuild:
+  Version bump, install header files (bug #538684).
 
   04 Jan 2015; Tim Harder <radhermit@gentoo.org> zsh-9999.ebuild:
   Update documentation URL (bug #534472).
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 5093f6c9f9f5..f17cb1d912bd 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -10,20 +10,23 @@ DIST zsh-5.0.5-doc.tar.bz2 2940018 SHA256 e4f22bafaa8410bbc2d83f2d748ca476436575
 DIST zsh-5.0.5.tar.bz2 3104375 SHA256 6624d2fb6c8fa4e044d2b009f86ed1617fe8583c83acfceba7ec82826cfa8eaf SHA512 34d69bed190cbc476bcdaa4b703fee1caaeae7e011fe7ea595b29bbd31df57bbe4d19b5940618e0c89a0a4b6c476f9ef03ce9829b4fb3735c1aedf309b0225a5 WHIRLPOOL bf02ca194261e15e88a9e26212644aa7be1afcc8e73cd6bb18ffb8e1c1d46a8742fee109d92a3b455c418258df9ae74dece21a05ff0e54e8c370af094512af16
 DIST zsh-5.0.7-doc.tar.bz2 3005587 SHA256 43e8665ba9d9eca8370c64e2d4846e84f9111c628e5792f2aa639a7fb209fcf1 SHA512 5a8bdf00bb646bb844a2d953aed85de802fe2e8fa05a76382d3baeba8a0108fa2d0b137b7d9bf88eeeb77ea06843fe1c56ec1fece1389b502e39a16dd31f208c WHIRLPOOL 0364f134997e4df63e7d6e9b6c81030dcf96ce30bb329b353fccf682ab5e20964d028e6667d836ff1a4c70e27331632cc96c7871ba69afc611c7bbdd09c8508b
 DIST zsh-5.0.7.tar.bz2 3181030 SHA256 544e27de81740286b916d1d77c9f48ad7c26ad7943ed96d278abee67cf6704b3 SHA512 e309863b41c9f92996fb9301d96d1aa43270ef8a04626c946703675b16a0a2ac9fddc959184cd8c639bd061fc2dd21902b21515550f639faacccdabd59e256e5 WHIRLPOOL f7cfbc41a2c990f702fee4ee158db79ebaad794479a62ff0ccd1d466077556e93b5e563575f9fd25dde1cb5e3c3610a14c997155ea76d86293d0a08168a3a418
+DIST zsh-5.0.8-doc.tar.bz2 3204865 SHA256 0ee5088c47fa5ceac6e087c7e00f2ede3f5920a03d32220772342ce980339e40 SHA512 86f75cfa16a2d0acbd75dc11d16a9bd4813ea2f0c6e323ed6fd73e66250420333fe0be2dbd62171a36aa479b5b5b423777f7ca369afb29d0f456fb7ed68926f6 WHIRLPOOL 1b25a455e7617cf624f8656eef2064e35a3c7798aec3d2822522bb89cad11441e1658966c467ecd758fa9e02ffcc235ee036830fd00757a04c3ff8e1b21fc434
+DIST zsh-5.0.8.tar.bz2 3250542 SHA256 8079cf08cb8beff22f84b56bd72bb6e6962ff4718d816f3d83a633b4c9e17d23 SHA512 79e438e32802c030749fd1bfff07fb3e5e7f7864e5106233c6f51ea477aa5a8471449e22f262f03bf69f42e66bf39e3b8a93295a247436ce97c66409b582ceae WHIRLPOOL 3ed95b2763bd3e486104a9f935efc89fd9ff1b3d745c1c3a93181a511c2986246e4f14c6d15fd88dd735c006127523ce423150813147250343871c9e2f40f413
 EBUILD zsh-5.0.5.ebuild 5178 SHA256 6b70bd81fad4ef5095c56ee069ebace35b2848601dd70ad976988f113a45ec87 SHA512 ebeb64c9f721bce97ac9380cacc61438f6c2e40e85e254a9d0536cbd30f744407bd69273a396531bfa2bc8bea212b1592c02492ecbcaa27ebd2380aef598d41b WHIRLPOOL e1a8a68985f093d8bd9353ae685a4b715c75a63261ea9c02282fac352587eff1f55442cf8531f18c9c704c69144633e6bfcba7f7a191b7636ebbacb9390ebc1a
 EBUILD zsh-5.0.7-r1.ebuild 5270 SHA256 80248f7bf83a21221bc5c86c6292b720c830407a06bc91b04d3eeb4735717520 SHA512 5fd993d447025435c497e2562bc7f1dfb3a61571d9dba409867ce45c399df0dc70dcf3d71c582275450afd3aea003d385d7c30ffe5bd1790d969e85387f3cd31 WHIRLPOOL 26588cc94a20b955f969b5dc83e843b7379d013558d3cba69cc6601a66d238d059d9b243aa5c3233c58f0865bceeac07afd9512036efcf0730b4e42b629e4ddf
 EBUILD zsh-5.0.7-r2.ebuild 5307 SHA256 ea649d2f5b89e76cc5bb5f020d439d4ebf97e58091191aece8980bc4aa2b913b SHA512 f2d3cd8fe8450f0729b6784c3cae0d5b68f8f576def1b7c3ac2e5528742c95bacae43d5128be1fc61b417a4cd24c695069fa5f1134fd5afae40f5e6467c248bb WHIRLPOOL 41c87b731f53b29eb6fc5b628b4cdce04ca1e570fd9df19024697dad735446cc665e0ab9a3f68f3ade7e3b9fa5e2b994cb50844a86f7a3927a79e4be88764f9c
-EBUILD zsh-9999.ebuild 5699 SHA256 4dcb45614b171da60cac4a6ccd1764d50a8b8744018b0e59556e1d5ee430b918 SHA512 b044c56203b4868816560f0a7cf844378eaae3c4d412a1515ab0c4db55443aee2ed129666660513b52ba21373cadb46b0cdd13de898990f9a13ff73d1a04363e WHIRLPOOL 8fcfe9d9f8b56232f302ee67a142f298ba529f8e5fc611151109cf92b6c636853a8a87fdb127cd925723dea2fef433753d0ed501c4823fe5befb6abef2d8b83d
-MISC ChangeLog 34723 SHA256 5b1ebd7ee3170159d13339f82514ad649da4c811f070242187a54f2a1a3453cf SHA512 7f273acdcd9a7c171d63917297d5702daeeb6de0feedb8594c57be7d42cedf3519bbe29abdd1ecb4dd2418718460e51362f9e8eb6973694f0e33ad4c55151cb8 WHIRLPOOL e8bcc319770d8e481ce22bbf1103e69f823f936a3db625f56ffea8cd15cc1a9a5b62cb6f8cf667424cbe224cc80b71c9100db3faddcb44f81c08ce63c9328b28
+EBUILD zsh-5.0.8.ebuild 5959 SHA256 987a72ab8f3844ed5fcb1b5be39908256a845e6fa22074585fa54c8153103641 SHA512 63dec3880b29a8e23243d11b0cbf5b21b959d3e586e70ea691d3d110fcb7dcdbff2887b35f96ff3382b3ecceb65573886ef042658440825e3ea0847acc88321a WHIRLPOOL 17d9720eae0516e5b3014c9231ce02f1364806c6485f26e1b8f4f6b5359079a2968e6f42319f5f32e13caa83ff4569ecd124ace07f05c11f14e663eaf4269f53
+EBUILD zsh-9999.ebuild 5958 SHA256 ab2ac7e58bcb2a11744316baed3f0f14eb0627e76130074558edaa8fba0433f6 SHA512 0be6b738e95fdc63a931f012ecb7f69efa9042034eaa53113403c2ba344e08a0f2c84b0f8f5ee1d6eb997404bd688bc2642f734f217517191d22ef78f719c5be WHIRLPOOL 15c0ebcbe9893bc3d242f9e81d8850632c157d00146fd37586adefe7075e24813e6c3ec6b88d8d43c4091f1181dec8c578535db4e81ef70f5a50d4524e81dd97
+MISC ChangeLog 34889 SHA256 3fdb6a201493782e4a3811cc155f68e1dfec472d3b97b9461ee7fdc0f8d13e8a SHA512 6de6804512799d2f2bf5428f38125089c1d2b768e0c43f8580583af14957e9d938439c0791760e9afdf7bba83a5bb1e5a1e88c92e9c5485e081a53bd7d28a5ec WHIRLPOOL 39ded7fed818b91d7a1b505e47eb757f67db82d6761b0cef423c2210f167fe69663cff9b53caedcfaab7945f18d9c1814c651edbf80bad794f46110995cbc75e
 MISC metadata.xml 485 SHA256 84d741251360af7179bf3a275080446750e3e360b4f48937b8a623ccd7602c12 SHA512 e702b9c921b24b7303e0936fe6370f901173e1bfa9bc91bacc747c69dda8205ab785f77088e6d9ea357b4863bb56b17bbe787ddc33290c1b7561764b0856cf6e WHIRLPOOL 3abceaebe3c2ec65bcfccfe040bb7693a5100d604d247bb252ce8d670fd5eb4229ea1ae24ae3b4d3ef8d1cd4eb5d8e64063ebb019b83a021c20f47283c039a94
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUqJjAAAoJEEqz6FtPBkyjKecH/0ixZwo1MwUNPOs/eN7guP6C
-93Hojpl2TRFFVnEL+uu7tNIDrTHkCslcM1zA+AdNpXgx0ZjW2K6KcLNnnRZOe4HV
-RhZ4BDOOwC9E/tEbZt8QcY1cK+SeFM24H0Iodno8DjuZ6GQo8Eko/qsor047clG7
-HydQaRNbDsS58WtbfiMuK6AiIEgC5A/FZtJrZ6fhBreZrnxomEqD829fySDZu+Z8
-BJckZn0mqnOEUsZyp59uPP5B25HkhTpfksd2GijvX15/zYQxsBf1G1erP1BGWfos
-+n4DZZ7sd7v83khwtiLStu5k3hxT6HNI537XsBu6J/4bjchXczOof66ZcYLM1WY=
-=GRXN
+iQEcBAEBCAAGBQJVhkaLAAoJEEqz6FtPBkyjAzEH/RsKaZqOoD17fik8uWiZBIZ4
+EZssrElKBOndIm9EdVvVUsdUdoE9PHEgv5DIZmok/LVd+qudUx/PlK/PT3UgQlIH
+eGjrpI07DpZuJTISiI27omToQZCZKqIEa6i9D92Xu1yT9Z+HMz4baBLJfNuy9RPH
+kSUGQqbwgIi7xc/t56Xxsn8EwQ35dJiuaPIn5FT1rLQoC8YMEY3ARALsB4HmRZJD
+ohYOXe8xuYLQLpRed8Cs9P7KWlrB2r0c7MnPMsvHWLDKcjgF9+9EsmCfNW21DB+F
+KsYBhct9QXaUJImOwNm+rdJyrwzC1hVmsg0x6aHo2BpGyzFnTV4D0SvNocoPR5Q=
+=Aolb
 -----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/zsh-5.0.8.ebuild b/app-shells/zsh/zsh-5.0.8.ebuild
new file mode 100644
index 000000000000..87b89e4b7071
--- /dev/null
+++ b/app-shells/zsh/zsh-5.0.8.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-5.0.8.ebuild,v 1.1 2015/06/21 05:07:22 radhermit Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib prefix
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="http://www.zsh.org/pub/${P}.tar.bz2
+		doc? ( http://www.zsh.org/pub/${P}-doc.tar.bz2 )"
+fi
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="http://www.zsh.org/"
+
+LICENSE="ZSH gdbm? ( GPL-2 )"
+SLOT="0"
+IUSE="caps debug doc examples gdbm maildir pcre static unicode"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.1
+	static? ( >=sys-libs/ncurses-5.7-r4[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() {
+	# fix zshall problem with soelim
+	ln -s Doc man1
+	mv Doc/zshall.1 Doc/zshall.1.soelim
+	soelim Doc/zshall.1.soelim > Doc/zshall.1
+
+	epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff
+
+	cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
+	eprefixify "${T}"/zprofile || die
+	if use prefix ; then
+		sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die
+	else
+		sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
+	fi
+
+	if [[ ${PV} == 9999* ]] ; then
+		sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myconf=()
+
+	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 \
+		--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 \
+		--with-tcsetpgrp \
+		$(use_enable maildir maildir-support) \
+		$(use_enable pcre) \
+		$(use_enable caps cap) \
+		$(use_enable unicode multibyte) \
+		$(use_enable gdbm ) \
+		"${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
+	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 install.info
+
+	insinto /etc/zsh
+	doins "${T}"/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
+		dohtml -r Doc/*
+		insinto /usr/share/doc/${PF}
+		doins Doc/zsh.{dvi,pdf}
+		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
+}
diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
index d958a214b4e8..43bb3b8a62f2 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-9999.ebuild,v 1.4 2015/01/04 01:34:42 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-9999.ebuild,v 1.5 2015/06/21 05:07:22 radhermit Exp $
 
 EAPI=5
 
@@ -67,23 +67,24 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf
+	local myconf=()
 
 	if use static ; then
-		myconf+=" --disable-dynamic"
+		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"
+		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"
+		myconf+=( --enable-libs=-liconv )
 		append-ldflags -Wl,-x
 	fi
 
@@ -101,7 +102,7 @@ src_configure() {
 		$(use_enable caps cap) \
 		$(use_enable unicode multibyte) \
 		$(use_enable gdbm ) \
-		${myconf}
+		"${myconf[@]}"
 
 	if use static ; then
 		# compile all modules statically, see Bug #27392
@@ -144,16 +145,27 @@ src_install() {
 	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
 	newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
 
-	# install miscellaneous scripts; bug #54520
 	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 "${S}"/{Util,Misc}/* || die
+		-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