Fix configure.ac to quote correctly, #188930 thanks to Mike Frysigner.

  Hard depend on ncurses as it's not optional.
(Portage version: 2.1.3.5)

4 files changed, 65 insertions, 34 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index b860abdc6dc2..0c298d8982cf 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/zsh
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.113 2007/06/14 18:16:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.114 2007/08/16 09:52:54 uberlord Exp $
+
+  16 Aug 2007; Roy Marples <uberlord@gentoo.org>
+  +files/zsh-4.3.4-configure-changequote.patch, zsh-4.3.4.ebuild:
+  Fix configure.ac to quote correctly, #188930 thanks to Mike Frysigner.
+  Hard depend on ncurses as it's not optional.
 
   14 Jun 2007; Raúl Porcel <armin76@gentoo.org> zsh-4.3.2-r2.ebuild:
   alpha stable wrt #168320
diff --git a/app-shells/zsh/files/digest-zsh-4.3.4 b/app-shells/zsh/files/digest-zsh-4.3.4
index 535aa4ba10dc..7afc774d765a 100644
--- a/app-shells/zsh/files/digest-zsh-4.3.4
+++ b/app-shells/zsh/files/digest-zsh-4.3.4
@@ -1,4 +1,3 @@
-MD5 1a4ab09a9d75c5ae8585ad645406f27d zsh-4.3.4-doc.tar.bz2 2358063
 RMD160 768ce8ca2860139428d27a0fedf5c0724967e444 zsh-4.3.4-doc.tar.bz2 2358063
 SHA256 e74289f99479328b8bcee9c47ae07038e54437e860fb5487da57cfc8d1836777 zsh-4.3.4-doc.tar.bz2 2358063
 MD5 8410a30e4f5c6160790bc3afc096424f zsh-4.3.4.tar.bz2 2374851
diff --git a/app-shells/zsh/files/zsh-4.3.4-configure-changequote.patch b/app-shells/zsh/files/zsh-4.3.4-configure-changequote.patch
new file mode 100644
index 000000000000..2abad2462ee2
--- /dev/null
+++ b/app-shells/zsh/files/zsh-4.3.4-configure-changequote.patch
@@ -0,0 +1,25 @@
+diff -ur a/configure.ac b/configure.ac
+--- a/configure.ac	2007-01-05 13:58:04 +0000
++++ b/configure.ac	2007-08-16 09:17:29 +0100
+@@ -2249,6 +2249,10 @@
+   zsh_cv_sys_elf=yes,
+   zsh_cv_sys_elf=no,
+   zsh_cv_sys_elf=yes)])
++  
++  # We use [0-9]* in case statements, so need to change quoting
++  changequote(, )
++
+   DL_EXT="${DL_EXT=so}"
+   if test x$zsh_cv_sys_elf = xyes; then
+     case "$host" in
+@@ -2352,6 +2356,10 @@
+       esac
+     ;;
+   esac
++
++  # Done with our shell code, so restore autotools quoting
++  changequote([, ])
++  
+   AC_CACHE_CHECK(if your dlsym() needs a leading underscore,
+    zsh_cv_func_dlsym_needs_underscore,
+    [echo failed >conftestval && cat >conftest.c <<EOM
diff --git a/app-shells/zsh/zsh-4.3.4.ebuild b/app-shells/zsh/zsh-4.3.4.ebuild
index 02b22d822088..ebc9671458a2 100644
--- a/app-shells/zsh/zsh-4.3.4.ebuild
+++ b/app-shells/zsh/zsh-4.3.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.4.ebuild,v 1.2 2007/05/01 11:31:00 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.4.ebuild,v 1.3 2007/08/16 09:52:54 uberlord Exp $
 
-inherit eutils multilib
+inherit eutils multilib autotools
 
 LOVERS_PV=0.5
 LOVERS_P=zsh-lovers-${LOVERS_PV}
@@ -17,31 +17,35 @@ SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
 LICENSE="ZSH"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="maildir ncurses static doc examples pcre caps unicode"
+IUSE="maildir static doc examples pcre caps unicode"
 
-RDEPEND="pcre? ( >=dev-libs/libpcre-3.9 )
+RDEPEND=">=sys-libs/ncurses-5.1
 	caps? ( sys-libs/libcap )
-	ncurses? ( >=sys-libs/ncurses-5.1 )"
+	pcre? ( >=dev-libs/libpcre-3.9 )"
 DEPEND="sys-apps/groff
-	>=sys-apps/sed-4
 	${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-init.d-gentoo.diff
-	cd ${S}/Doc
-	ln -sf . man1
+	cd "${S}"
+
 	# fix zshall problem with soelim
-	soelim zshall.1 > zshall.1.soelim
-	mv zshall.1.soelim zshall.1
+	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.diff
+	epatch "${FILESDIR}/${P}"-configure-changequote.patch
+	eautoreconf
 }
 
 src_compile() {
-	local myconf
+	local myconf=
 
-	use static && myconf="${myconf} --disable-dynamic" \
-		&& LDFLAGS="${LDFLAGS} -static"
+	if use static ; then
+		myconf="${myconf} --disable-dynamic"
+		LDFLAGS="${LDFLAGS} -static"
+	fi
 
 	econf \
 		--bindir=/bin \
@@ -56,8 +60,8 @@ src_compile() {
 		--enable-site-fndir=/usr/share/zsh/site-functions \
 		--enable-function-subdirs \
 		--enable-ldflags="${LDFLAGS}" \
+		--enable-curses-terminfo \
 		--with-tcsetpgrp \
-		$(use_with ncurses curses-terminfo) \
 		$(use_enable maildir maildir-support) \
 		$(use_enable pcre) \
 		$(use_enable caps) \
@@ -70,38 +74,36 @@ src_compile() {
 			-e "s/load=no/load=yes/g" \
 			config.modules || die
 	else
-		# avoid linking to libs in /usr/lib, see Bug #27064
-		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" \
-			Makefile || die
+		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" Makefile
 	fi
 
-	# emake still b0rks
-	emake -j1 || die "make failed"
+	emake || die "make failed"
 }
 
 src_test() {
+	local f=
 	for f in /dev/pt* ; do
-		addpredict $f
+		addpredict "$f"
 	done
 	make check || die "make check failed"
 }
 
 src_install() {
 	einstall \
-		bindir=${D}/bin \
-		libdir=${D}/usr/$(get_libdir) \
-		fndir=${D}/usr/share/zsh/${PV%_*}/functions \
-		sitefndir=${D}/usr/share/zsh/site-functions \
-		scriptdir=${D}/usr/share/zsh/${PV%_*}/scripts \
+		bindir="${D}"/bin \
+		libdir="${D}"/usr/$(get_libdir) \
+		fndir="${D}"/usr/share/zsh/${PV%_*}/functions \
+		sitefndir="${D}"/usr/share/zsh/site-functions \
+		scriptdir="${D}"/usr/share/zsh/${PV%_*}/scripts \
 		install.bin install.man install.modules \
 		install.info install.fns || die "make install failed"
 
 	insinto /etc/zsh
-	doins ${FILESDIR}/zprofile
+	doins "${FILESDIR}"/zprofile
 
 	keepdir /usr/share/zsh/site-functions
 	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
-	doins ${FILESDIR}/prompt_gentoo_setup || die
+	doins "${FILESDIR}"/prompt_gentoo_setup || die
 
 	# install miscellaneous scripts; bug #54520
 	sed -i -e "s:/usr/local:/usr:g" {Util,Misc}/* || "sed failed"
@@ -110,7 +112,7 @@ src_install() {
 	insinto /usr/share/zsh/${PV%_*}/Misc
 	doins Misc/* || die "doins Misc scripts failed"
 
-	dodoc ChangeLog* META-FAQ README INSTALL LICENCE config.modules
+	dodoc ChangeLog* META-FAQ README config.modules
 
 	if use doc ; then
 		dohtml Doc/*
@@ -119,12 +121,12 @@ src_install() {
 	fi
 
 	if use examples; then
-		cd ${WORKDIR}/${LOVERS_P}
+		cd "${WORKDIR}/${LOVERS_P}"
 		doman  zsh-lovers.1    || die "doman zsh-lovers failed"
 		dohtml zsh-lovers.html || die "dohtml zsh-lovers failed"
 		docinto zsh-lovers
 		dodoc zsh.vim README
-		insinto /usr/share/doc/${PF}/zsh-lovers
+		insinto /usr/share/doc/"${PF}"/zsh-lovers
 		doins zsh-lovers.{ps,pdf} refcard.{dvi,ps,pdf}
 		doins -r zsh_people || die "doins zsh_people failed"
 		cd -