diff options
author | Roy Marples <uberlord@gentoo.org> | 2007-08-16 09:52:54 +0000 |
---|---|---|
committer | Roy Marples <uberlord@gentoo.org> | 2007-08-16 09:52:54 +0000 |
commit | 0e05124771eca716d4f232822ad7b5a2f4e8a985 (patch) | |
tree | b140e81eb442ae485e3a3044f00f0d4e95e2268b /app-shells | |
parent | ppc stable (diff) | |
download | historical-0e05124771eca716d4f232822ad7b5a2f4e8a985.tar.gz historical-0e05124771eca716d4f232822ad7b5a2f4e8a985.tar.bz2 historical-0e05124771eca716d4f232822ad7b5a2f4e8a985.zip |
Fix configure.ac to quote correctly, #188930 thanks to Mike Frysigner.
Hard depend on ncurses as it's not optional.
Package-Manager: portage-2.1.3.5
Diffstat (limited to 'app-shells')
-rw-r--r-- | app-shells/zsh/ChangeLog | 7 | ||||
-rw-r--r-- | app-shells/zsh/Manifest | 26 | ||||
-rw-r--r-- | app-shells/zsh/files/digest-zsh-4.3.4 | 1 | ||||
-rw-r--r-- | app-shells/zsh/files/zsh-4.3.4-configure-changequote.patch | 25 | ||||
-rw-r--r-- | app-shells/zsh/zsh-4.3.4.ebuild | 66 |
5 files changed, 80 insertions, 45 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/Manifest b/app-shells/zsh/Manifest index 8c54e7235400..3f97749cb01c 100644 --- a/app-shells/zsh/Manifest +++ b/app-shells/zsh/Manifest @@ -10,6 +10,10 @@ AUX zsh-4.2.1-gentoo.diff 735 RMD160 c14de49d5f13101c9b40a0d1f0f9eacf8ce2efd0 SH MD5 e6a9690e5c9b23757e887e14da621c9c files/zsh-4.2.1-gentoo.diff 735 RMD160 c14de49d5f13101c9b40a0d1f0f9eacf8ce2efd0 files/zsh-4.2.1-gentoo.diff 735 SHA256 a8a236864616138a376aa5a2d0f9795604f7bf369d99f2fb82abb513482318f2 files/zsh-4.2.1-gentoo.diff 735 +AUX zsh-4.3.4-configure-changequote.patch 694 RMD160 9f56120b2f8cc7ca913518ed099167fba3bc0b7f SHA1 986a8b03bc49da157ced270321538a579a9b6ec0 SHA256 78047e66ce905a701464616d3e3cc2a3a9714ac88ad063b6330234c5ea61e9e6 +MD5 1f5e133534ac3dd0748693ff8cba85bd files/zsh-4.3.4-configure-changequote.patch 694 +RMD160 9f56120b2f8cc7ca913518ed099167fba3bc0b7f files/zsh-4.3.4-configure-changequote.patch 694 +SHA256 78047e66ce905a701464616d3e3cc2a3a9714ac88ad063b6330234c5ea61e9e6 files/zsh-4.3.4-configure-changequote.patch 694 AUX zsh-init.d-gentoo.diff 1389 RMD160 1c317d93058b05e1d89dd81b4ab746ef31b4c38a SHA1 eb91fb330c0df1e227ee541159c7ac2d2fe15e53 SHA256 a8dcd168ab909a2b80b2958e3fc3cc974bc6048c08499be16c7925c1723b212f MD5 eaa2f7dff9e7ca62087f9786cea84897 files/zsh-init.d-gentoo.diff 1389 RMD160 1c317d93058b05e1d89dd81b4ab746ef31b4c38a files/zsh-init.d-gentoo.diff 1389 @@ -40,14 +44,14 @@ EBUILD zsh-4.3.2-r2.ebuild 4646 RMD160 0ee5af1eec20f48f92a3285cebd21242733388c7 MD5 e06904d7ba943fd1bd118e4ab1792e21 zsh-4.3.2-r2.ebuild 4646 RMD160 0ee5af1eec20f48f92a3285cebd21242733388c7 zsh-4.3.2-r2.ebuild 4646 SHA256 99a4b2c157c3bfd0d0a615b05a958d479960c4859d87ea189081ce1fd5367460 zsh-4.3.2-r2.ebuild 4646 -EBUILD zsh-4.3.4.ebuild 4653 RMD160 52704f77b998231e3c763a73a0446ae149cab50d SHA1 c5f9388d6f7abdfa9d5fc3a3cda6efc30e7bddc6 SHA256 8a0956adc79243e0c42604df82e501e705733d0e0c73eb2f06aad79d22149ff7 -MD5 4c76adbe3fb96adc1b8d19577acb92dd zsh-4.3.4.ebuild 4653 -RMD160 52704f77b998231e3c763a73a0446ae149cab50d zsh-4.3.4.ebuild 4653 -SHA256 8a0956adc79243e0c42604df82e501e705733d0e0c73eb2f06aad79d22149ff7 zsh-4.3.4.ebuild 4653 -MISC ChangeLog 17649 RMD160 a4193846511f7f0b36629e80adbe6e741927941f SHA1 3ab0f1718b5544e15c87fd2d8a50ca65031defb0 SHA256 49fc20c640936326e581c1c89f1a8f0da93d9ba79c3add5f29c7145b1f3e64fb -MD5 4e0aba8f71b50d798258edfe4bb0fb19 ChangeLog 17649 -RMD160 a4193846511f7f0b36629e80adbe6e741927941f ChangeLog 17649 -SHA256 49fc20c640936326e581c1c89f1a8f0da93d9ba79c3add5f29c7145b1f3e64fb ChangeLog 17649 +EBUILD zsh-4.3.4.ebuild 4624 RMD160 157f2a1e8cf253d8557db9af09ab53e05d0240a9 SHA1 71f23aea3eb48004b117b284d73f0222b930d56a SHA256 a19109b15fbf72f15e13a238922c34771bb04408825e83226f53877536309713 +MD5 7cead91052db2d137c86bec4699698cd zsh-4.3.4.ebuild 4624 +RMD160 157f2a1e8cf253d8557db9af09ab53e05d0240a9 zsh-4.3.4.ebuild 4624 +SHA256 a19109b15fbf72f15e13a238922c34771bb04408825e83226f53877536309713 zsh-4.3.4.ebuild 4624 +MISC ChangeLog 17886 RMD160 19bf56e4b7c73ae2620285b5dc484dd236f038ee SHA1 aaef14f5bf0c708f378139dc1bb982757a070e68 SHA256 3f6525bbabb39a048c802d77e2d8f6ac7761c550fda9d774e0523cc8facb62ff +MD5 5436649f179c55691f3cae0595fba1b7 ChangeLog 17886 +RMD160 19bf56e4b7c73ae2620285b5dc484dd236f038ee ChangeLog 17886 +SHA256 3f6525bbabb39a048c802d77e2d8f6ac7761c550fda9d774e0523cc8facb62ff ChangeLog 17886 MISC metadata.xml 506 RMD160 2bb66fd9797dfb0000540f70ba3ae0b0d7e7ebe0 SHA1 ffc2013388ceb5abe378ec9668e33b692d568c45 SHA256 32679041c8a9f3c0d25ecee624fa8642ab0d99e65e93e728caa856973ec18729 MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506 RMD160 2bb66fd9797dfb0000540f70ba3ae0b0d7e7ebe0 metadata.xml 506 @@ -61,6 +65,6 @@ SHA256 4f32fb9bdd53a1e529c592afbfab6a4ab308dfa2081f9b9c7aac6c97e0e5f060 files/di MD5 abd77212c6ad589c56d6ed1a88c0ae56 files/digest-zsh-4.3.2-r2 741 RMD160 91777435ca73f1f3911802b190e7cf298c5861fe files/digest-zsh-4.3.2-r2 741 SHA256 c5cf1890cb7526846f2b71a94bc35527b2939b315171cfa9a843c57b7ca04919 files/digest-zsh-4.3.2-r2 741 -MD5 dd9706ce92adcbe43306e8c853d11bf0 files/digest-zsh-4.3.4 741 -RMD160 d20de19421e69abff973eca7e0c90629559ef72e files/digest-zsh-4.3.4 741 -SHA256 cfad1793044f24086765954a603f93fd25355649926f23e9d79f09cf2f4490fb files/digest-zsh-4.3.4 741 +MD5 8fc96cd01cb7172ac09b55f88eedde46 files/digest-zsh-4.3.4 674 +RMD160 2a667e8798c476a55c79dac282b26a96fa92033d files/digest-zsh-4.3.4 674 +SHA256 9c8839c9244f79ba4e6c8985fe2f89a66d16bf67314f20b3ea7a9a12d0275945 files/digest-zsh-4.3.4 674 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 - |