From 1d31ae12bce2c8290abc974787c256c82c74f2f1 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Tue, 3 Jul 2007 16:49:11 +0000 Subject: Applied patch to fix normalize-command bug, as upstream applied this fix as well. Bug #183754, thanks to Yuri Karaban Package-Manager: portage-2.1.2.7 --- app-shells/tcsh/ChangeLog | 10 +++- app-shells/tcsh/Manifest | 26 ++++---- app-shells/tcsh/files/digest-tcsh-6.15 | 6 -- app-shells/tcsh/files/digest-tcsh-6.15-r1 | 6 ++ .../files/tcsh-6.15.00-normalize-command-fix.patch | 14 +++++ app-shells/tcsh/tcsh-6.15-r1.ebuild | 69 ++++++++++++++++++++++ app-shells/tcsh/tcsh-6.15.ebuild | 68 --------------------- 7 files changed, 113 insertions(+), 86 deletions(-) delete mode 100644 app-shells/tcsh/files/digest-tcsh-6.15 create mode 100644 app-shells/tcsh/files/digest-tcsh-6.15-r1 create mode 100644 app-shells/tcsh/files/tcsh-6.15.00-normalize-command-fix.patch create mode 100644 app-shells/tcsh/tcsh-6.15-r1.ebuild delete mode 100644 app-shells/tcsh/tcsh-6.15.ebuild (limited to 'app-shells') diff --git a/app-shells/tcsh/ChangeLog b/app-shells/tcsh/ChangeLog index 5db9947127f3..433ba8f433bf 100644 --- a/app-shells/tcsh/ChangeLog +++ b/app-shells/tcsh/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-shells/tcsh # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.73 2007/06/30 21:38:32 lavajoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.74 2007/07/03 16:49:11 grobian Exp $ + +*tcsh-6.15-r1 (03 Jul 2007) + + 03 Jul 2007; Fabian Groffen + +files/tcsh-6.15.00-normalize-command-fix.patch, -tcsh-6.15.ebuild, + +tcsh-6.15-r1.ebuild: + Applied patch to fix normalize-command bug, as upstream applied this fix as + well. Bug #183754, thanks to Yuri Karaban 30 Jun 2007; Joe Peterson tcsh-6.15.ebuild: Add ~x86-fbsd keyword diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest index 8a2950b242d0..fa01ee1f3c6b 100644 --- a/app-shells/tcsh/Manifest +++ b/app-shells/tcsh/Manifest @@ -14,6 +14,10 @@ AUX tcsh-6.14.00-debian-dircolors.patch 444 RMD160 8ab4e49fbfd979aed6cfdd5bd45c5 MD5 18211cacb14d3b0d1253b35bb9683d21 files/tcsh-6.14.00-debian-dircolors.patch 444 RMD160 8ab4e49fbfd979aed6cfdd5bd45c5e37fa810394 files/tcsh-6.14.00-debian-dircolors.patch 444 SHA256 a9568a2a474ef662a665c87c52983fea7999e5cf2bc4920d45baa2558c9dc32a files/tcsh-6.14.00-debian-dircolors.patch 444 +AUX tcsh-6.15.00-normalize-command-fix.patch 399 RMD160 5b99c58b08402b5e0b65b9f2ad7c39cf2faa8012 SHA1 f49464f1622cdf72639e48a45e8ac7ee27c2fb80 SHA256 e22acf90d146927b261c00bbeb6f7f9ca86ff8c77d017027308ca2a54aeb1b04 +MD5 2d441ba438087ece914739b9e91a569d files/tcsh-6.15.00-normalize-command-fix.patch 399 +RMD160 5b99c58b08402b5e0b65b9f2ad7c39cf2faa8012 files/tcsh-6.15.00-normalize-command-fix.patch 399 +SHA256 e22acf90d146927b261c00bbeb6f7f9ca86ff8c77d017027308ca2a54aeb1b04 files/tcsh-6.15.00-normalize-command-fix.patch 399 DIST tcsh-6.14-conffiles.tar.bz2 20200 RMD160 96e5e43985fe1b6e53b4a2a53f1b7bed3c2ae103 SHA1 3ec8841c88b2c99c6b5978b907d9f3daa22faa7c SHA256 1bae5000c84593187974580c48b0edcec88e2f6363e3c1ec1e43da45c9a63049 DIST tcsh-6.14.00.tar.gz 859780 RMD160 fa7635225ceb0225aedcfad5dd9d8e17d8d70849 SHA1 55a08b31a57cfd8631edd1fb7e42f18578d8198a SHA256 fd738ac0c003d283a214d15d46c1bc3fb80afad697110994dccb8d101f0d6f0e DIST tcsh-6.15.00.tar.gz 870886 RMD160 8065279e93bd3fddb2a95a3f74a680858d36508c SHA1 d24f7bf27e80222a6293b6629c14db547f0b7387 SHA256 dca83e59025f18a9811895cd7cf2a760ab1750240ea7c8c86ea21e24f783acdc @@ -30,14 +34,14 @@ EBUILD tcsh-6.14-r5.ebuild 1845 RMD160 a3340b309b18216adabc97e5cf9101f4be57020e MD5 f521e16702a3ae690ab5ae6e0fdfd0da tcsh-6.14-r5.ebuild 1845 RMD160 a3340b309b18216adabc97e5cf9101f4be57020e tcsh-6.14-r5.ebuild 1845 SHA256 37772cef67a96a57a3bf8d8a911287db93932b47d21546164a5677eec0b26df5 tcsh-6.14-r5.ebuild 1845 -EBUILD tcsh-6.15.ebuild 1722 RMD160 2fffac5b794f919acd6c8317b2564523132fc8d0 SHA1 7cf09663820cf5af1dcd78067033339a57af9fbd SHA256 ce7f01945be371ee767dc2724a0e77d3e995a4cc061a4da2f0a6ecfd3bab5ee9 -MD5 c07d0a2b84820ff4ff7dde883b95a055 tcsh-6.15.ebuild 1722 -RMD160 2fffac5b794f919acd6c8317b2564523132fc8d0 tcsh-6.15.ebuild 1722 -SHA256 ce7f01945be371ee767dc2724a0e77d3e995a4cc061a4da2f0a6ecfd3bab5ee9 tcsh-6.15.ebuild 1722 -MISC ChangeLog 11006 RMD160 0a1b67800695aafe38c17fed7afa7205fe3eb7f9 SHA1 c62c5b0aa9dae5e0c3a0425063cce2ac463b7d58 SHA256 341c23465c3b06f7dc907fdc392828d54c6a3fc6a020a8bb0e85d87856415cd4 -MD5 948ee085d979874c587bfa2044d55a53 ChangeLog 11006 -RMD160 0a1b67800695aafe38c17fed7afa7205fe3eb7f9 ChangeLog 11006 -SHA256 341c23465c3b06f7dc907fdc392828d54c6a3fc6a020a8bb0e85d87856415cd4 ChangeLog 11006 +EBUILD tcsh-6.15-r1.ebuild 1797 RMD160 322ed97bf6f7ca18b52b824ab2a4a3d37ec1a99c SHA1 60d1ec5b8a86e414328be139795ebff00813bb90 SHA256 6549035c4ffc85f2d535bce04c541a0f8869fda1d93480f4554f13e15ab330d2 +MD5 7b2fda932a02d20e14b8b6b97dcd8b16 tcsh-6.15-r1.ebuild 1797 +RMD160 322ed97bf6f7ca18b52b824ab2a4a3d37ec1a99c tcsh-6.15-r1.ebuild 1797 +SHA256 6549035c4ffc85f2d535bce04c541a0f8869fda1d93480f4554f13e15ab330d2 tcsh-6.15-r1.ebuild 1797 +MISC ChangeLog 11303 RMD160 b16656ed51f3eb8495857af00699de871f003aa6 SHA1 96828de6c3db8f27a85900eebc5a3e63d068aa8a SHA256 430cd0ca49b8415c3b6c9f69418a2859b3791c7f3eb4e2b446f2064d23ddbe2a +MD5 95a3e111b133b09c8acc6b7729e52c23 ChangeLog 11303 +RMD160 b16656ed51f3eb8495857af00699de871f003aa6 ChangeLog 11303 +SHA256 430cd0ca49b8415c3b6c9f69418a2859b3791c7f3eb4e2b446f2064d23ddbe2a ChangeLog 11303 MISC metadata.xml 655 RMD160 10cac0d0a38ab114ec6f34be1fed837f38a77f40 SHA1 8e04b7ca425f5469ce8515c2ab8fce6cf166b3ca SHA256 bde0b24fe9a295482f3394de9b3d658bbcc2e58504136785fd4a6210b1d2e28b MD5 57ae68ef95b893d172203de06faf380d metadata.xml 655 RMD160 10cac0d0a38ab114ec6f34be1fed837f38a77f40 metadata.xml 655 @@ -51,6 +55,6 @@ SHA256 4595b7abfab1eefc3382a6c8d6f69fd9254483efca957373be64ad49def0eb11 files/di MD5 6a74574703dca366bcf1a246f9bf6e32 files/digest-tcsh-6.14-r5 497 RMD160 28da1915a51453b91b97fe54a3866e7bc589b8c0 files/digest-tcsh-6.14-r5 497 SHA256 92be31902b0ded77904c82ced086d52942e9a5fc4a99a90983091fc22c61b4f5 files/digest-tcsh-6.14-r5 497 -MD5 3a96ebc660ea4c36d850e626fb971902 files/digest-tcsh-6.15 482 -RMD160 7ed4da52803633916c81010d07264954414a3e14 files/digest-tcsh-6.15 482 -SHA256 9262c6b5aaa24453c08d86f9b154ebe21a82c200659cf0098ddba284b5bfc328 files/digest-tcsh-6.15 482 +MD5 3a96ebc660ea4c36d850e626fb971902 files/digest-tcsh-6.15-r1 482 +RMD160 7ed4da52803633916c81010d07264954414a3e14 files/digest-tcsh-6.15-r1 482 +SHA256 9262c6b5aaa24453c08d86f9b154ebe21a82c200659cf0098ddba284b5bfc328 files/digest-tcsh-6.15-r1 482 diff --git a/app-shells/tcsh/files/digest-tcsh-6.15 b/app-shells/tcsh/files/digest-tcsh-6.15 deleted file mode 100644 index 0cefbe779489..000000000000 --- a/app-shells/tcsh/files/digest-tcsh-6.15 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 67a0611620b080bd0eb032b1774382b6 tcsh-6.15.00.tar.gz 870886 -RMD160 8065279e93bd3fddb2a95a3f74a680858d36508c tcsh-6.15.00.tar.gz 870886 -SHA256 dca83e59025f18a9811895cd7cf2a760ab1750240ea7c8c86ea21e24f783acdc tcsh-6.15.00.tar.gz 870886 -MD5 6a4f913dba5bfb71a6b84da43510acb5 tcsh-config-1.4.tar.bz2 2388 -RMD160 30ee8c3957fe1bd83534c06ea0ae634e12f9a683 tcsh-config-1.4.tar.bz2 2388 -SHA256 76500542856e69f66412735cd45c4022d95c713460e4008a215fbe4c2cbafd84 tcsh-config-1.4.tar.bz2 2388 diff --git a/app-shells/tcsh/files/digest-tcsh-6.15-r1 b/app-shells/tcsh/files/digest-tcsh-6.15-r1 new file mode 100644 index 000000000000..0cefbe779489 --- /dev/null +++ b/app-shells/tcsh/files/digest-tcsh-6.15-r1 @@ -0,0 +1,6 @@ +MD5 67a0611620b080bd0eb032b1774382b6 tcsh-6.15.00.tar.gz 870886 +RMD160 8065279e93bd3fddb2a95a3f74a680858d36508c tcsh-6.15.00.tar.gz 870886 +SHA256 dca83e59025f18a9811895cd7cf2a760ab1750240ea7c8c86ea21e24f783acdc tcsh-6.15.00.tar.gz 870886 +MD5 6a4f913dba5bfb71a6b84da43510acb5 tcsh-config-1.4.tar.bz2 2388 +RMD160 30ee8c3957fe1bd83534c06ea0ae634e12f9a683 tcsh-config-1.4.tar.bz2 2388 +SHA256 76500542856e69f66412735cd45c4022d95c713460e4008a215fbe4c2cbafd84 tcsh-config-1.4.tar.bz2 2388 diff --git a/app-shells/tcsh/files/tcsh-6.15.00-normalize-command-fix.patch b/app-shells/tcsh/files/tcsh-6.15.00-normalize-command-fix.patch new file mode 100644 index 000000000000..b3b27ef7f14a --- /dev/null +++ b/app-shells/tcsh/files/tcsh-6.15.00-normalize-command-fix.patch @@ -0,0 +1,14 @@ +http://bugs.gw.com/view.php?id=53 + +diff -uNr tcsh-6.15.00.orig/tw.parse.c tcsh-6.15.00/tw.parse.c +--- tcsh-6.15.00.orig/tw.parse.c 2007-03-01 23:21:42.000000000 +0200 ++++ tcsh-6.15.00/tw.parse.c 2007-06-30 20:10:54.000000000 +0300 +@@ -433,7 +433,7 @@ + Char *p; + int found; + +- found = !cmd_expand(qline.s + wordp, &p); ++ found = cmd_expand(qline.s + wordp, &p); + + if (!found) { + xfree(p); diff --git a/app-shells/tcsh/tcsh-6.15-r1.ebuild b/app-shells/tcsh/tcsh-6.15-r1.ebuild new file mode 100644 index 000000000000..99446ea3b1f3 --- /dev/null +++ b/app-shells/tcsh/tcsh-6.15-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.15-r1.ebuild,v 1.1 2007/07/03 16:49:11 grobian Exp $ + +inherit eutils + +PATCHVER="1.4" + +MY_P="${P}.00" +DESCRIPTION="Enhanced version of the Berkeley C shell (csh)" +HOMEPAGE="http://www.tcsh.org/" +SRC_URI="ftp://ftp.astron.com/pub/tcsh/${MY_P}.tar.gz + mirror://gentoo/tcsh-config-${PATCHVER}.tar.bz2 + http://www.gentoo.org/~grobian/distfiles/tcsh-config-${PATCHVER}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="perl catalogs" + +DEPEND=">=sys-libs/ncurses-5.1 + perl? ( dev-lang/perl ) + !app-shells/csh" # bug #119703 + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${MY_P/15/14}"-debian-dircolors.patch # bug #120792 + epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951 + epatch "${FILESDIR}"/${MY_P}-normalize-command-fix.patch # bug #183754 + + if use catalogs ; then + einfo "enabling NLS catalogs support..." + sed -i -e "s/#undef NLS_CATALOGS/#define NLS_CATALOGS/" \ + config_f.h || die + eend $? + fi +} + +src_compile() { + econf --prefix=/ || die "econf failed" + emake || die "compile problem" +} + +src_install() { + emake DESTDIR="${D}" install install.man || die + + if use perl ; then + perl tcsh.man2html tcsh.man || die + dohtml tcsh.html/*.html + fi + + insinto /etc + doins \ + "${WORKDIR}"/tcsh-config/csh.cshrc \ + "${WORKDIR}"/tcsh-config/csh.login + + insinto /etc/profile.d + doins \ + "${WORKDIR}"/tcsh-config/tcsh-bindkey.csh \ + "${WORKDIR}"/tcsh-config/tcsh-settings.csh + + dodoc FAQ Fixes NewThings Ported README WishList Y2K + + # bug #119703: add csh -> tcsh symlink + dosym /bin/tcsh /bin/csh +} diff --git a/app-shells/tcsh/tcsh-6.15.ebuild b/app-shells/tcsh/tcsh-6.15.ebuild deleted file mode 100644 index 9f1f8c7aa83d..000000000000 --- a/app-shells/tcsh/tcsh-6.15.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.15.ebuild,v 1.2 2007/06/30 21:38:32 lavajoe Exp $ - -inherit eutils - -PATCHVER="1.4" - -MY_P="${P}.00" -DESCRIPTION="Enhanced version of the Berkeley C shell (csh)" -HOMEPAGE="http://www.tcsh.org/" -SRC_URI="ftp://ftp.astron.com/pub/tcsh/${MY_P}.tar.gz - mirror://gentoo/tcsh-config-${PATCHVER}.tar.bz2 - http://www.gentoo.org/~grobian/distfiles/tcsh-config-${PATCHVER}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="perl catalogs" - -DEPEND=">=sys-libs/ncurses-5.1 - perl? ( dev-lang/perl ) - !app-shells/csh" # bug #119703 - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${MY_P/15/14}"-debian-dircolors.patch # bug #120792 - epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951 - - if use catalogs ; then - einfo "enabling NLS catalogs support..." - sed -i -e "s/#undef NLS_CATALOGS/#define NLS_CATALOGS/" \ - config_f.h || die - eend $? - fi -} - -src_compile() { - econf --prefix=/ || die "econf failed" - emake || die "compile problem" -} - -src_install() { - emake DESTDIR="${D}" install install.man || die - - if use perl ; then - perl tcsh.man2html tcsh.man || die - dohtml tcsh.html/*.html - fi - - insinto /etc - doins \ - "${WORKDIR}"/tcsh-config/csh.cshrc \ - "${WORKDIR}"/tcsh-config/csh.login - - insinto /etc/profile.d - doins \ - "${WORKDIR}"/tcsh-config/tcsh-bindkey.csh \ - "${WORKDIR}"/tcsh-config/tcsh-settings.csh - - dodoc FAQ Fixes NewThings Ported README WishList Y2K - - # bug #119703: add csh -> tcsh symlink - dosym /bin/tcsh /bin/csh -} -- cgit v1.2.3-65-gdbad