commit: 1c4359204f469941faaedf177d43a5cb1f15f82b Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Tue Feb 21 07:31:17 2017 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Tue Feb 21 07:31:35 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c435920
app-shells/tcsh: cleanup Package-Manager: portage-2.3.3 app-shells/tcsh/files/tcsh-6.18.01-gcc5.patch | 31 -------- app-shells/tcsh/tcsh-6.17-r1.ebuild | 2 +- app-shells/tcsh/tcsh-6.18.01-r2.ebuild | 99 ------------------------ app-shells/tcsh/tcsh-6.18.01-r4.ebuild | 107 -------------------------- app-shells/tcsh/tcsh-6.18.01.ebuild | 2 +- 5 files changed, 2 insertions(+), 239 deletions(-) diff --git a/app-shells/tcsh/files/tcsh-6.18.01-gcc5.patch b/app-shells/tcsh/files/tcsh-6.18.01-gcc5.patch deleted file mode 100644 index d9501572fe..0000000000 --- a/app-shells/tcsh/files/tcsh-6.18.01-gcc5.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://bugs.gentoo.org/545176 -http://mx.gw.com/pipermail/tcsh-bugs/2015-May/000945.html -https://github.com/tcsh-org/tcsh/commit/624d3aebb6e6afadb4f35e894d11b5ebe290cd87 - -From 624d3aebb6e6afadb4f35e894d11b5ebe290cd87 Mon Sep 17 00:00:00 2001 -From: christos <christos> -Date: Thu, 28 May 2015 11:47:03 +0000 -Subject: [PATCH] avoid gcc-5 optimization malloc + memset = calloc (Fridolin - Pokorny) - ---- - tc.alloc.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/tc.alloc.c -+++ b/tc.alloc.c -@@ -348,10 +348,13 @@ calloc(size_t i, size_t j) - { - #ifndef lint - char *cp; -+ volatile size_t k; - - i *= j; - cp = xmalloc(i); -- memset(cp, 0, i); -+ /* Stop gcc 5.x from optimizing malloc+memset = calloc */ -+ k = i; -+ memset(cp, 0, k); - - return ((memalign_t) cp); - #else diff --git a/app-shells/tcsh/tcsh-6.17-r1.ebuild b/app-shells/tcsh/tcsh-6.17-r1.ebuild index daf15e8541..293e36473d 100644 --- a/app-shells/tcsh/tcsh-6.17-r1.ebuild +++ b/app-shells/tcsh/tcsh-6.17-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.astron.com/pub/tcsh/old/${MY_P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="m68k" IUSE="catalogs doc" RESTRICT="test" diff --git a/app-shells/tcsh/tcsh-6.18.01-r2.ebuild b/app-shells/tcsh/tcsh-6.18.01-r2.ebuild deleted file mode 100644 index a771a8a06a..0000000000 --- a/app-shells/tcsh/tcsh-6.18.01-r2.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="3" - -inherit eutils flag-o-matic autotools prefix - -CONFVER="1.9" - -DESCRIPTION="Enhanced version of the Berkeley C shell (csh)" -HOMEPAGE="http://www.tcsh.org/"; -SRC_URI="ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz - https://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="nls doc" -RESTRICT="test" - -# we need gettext because we run autoconf (AM_ICONV) -RDEPEND=">=sys-libs/ncurses-5.1 - virtual/libiconv" -DEPEND="${RDEPEND} - sys-devel/gettext - doc? ( dev-lang/perl )" - -CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-6.14.00-debian-dircolors.patch # bug #120792 - epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951 - epatch "${FILESDIR}"/${PN}-6.14-use-ncurses.patch - epatch "${FILESDIR}"/${PN}-6.18.01-aix.patch - - # fix dependency on ncurses[tinfo], #459484 - sed \ - -e "s:\(ncurses\):\1 tinfo:g" \ - -i configure.in || die - - eautoreconf - - # fix gencat usage - sed -i -e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \ - nls/Makefile.in || die - - # use sysmalloc (for larger alloc sets) on Darwin also - sed -i -e 's/__MACHTEN__/__MACH__/' config_f.h || die - - # unify ECHO behaviour - echo "#undef ECHO_STYLE" >> config_f.h - echo "#define ECHO_STYLE BOTH_ECHO" >> config_f.h - - eprefixify "${CONFDIR}"/* - # activate the right default PATH - if [[ -z ${EPREFIX} ]] ; then - sed -i \ - -e 's/^#MAIN//' -e '/^#PREFIX/d' \ - "${CONFDIR}"/csh.login || die - else - sed -i \ - -e 's/^#PREFIX//' -e '/^#MAIN/d' \ - "${CONFDIR}"/csh.login || die - fi -} - -src_configure() { - # make tcsh look and live along the lines of the prefix - append-cppflags -D_PATH_DOTCSHRC="'"'"${EPREFIX}/etc/csh.cshrc"'"'" - append-cppflags -D_PATH_DOTLOGIN="'"'"${EPREFIX}/etc/csh.login"'"'" - append-cppflags -D_PATH_DOTLOGOUT="'"'"${EPREFIX}/etc/csh.logout"'"'" - append-cppflags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'" - append-cppflags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'" - - econf \ - --prefix="${EPREFIX:-/}" \ - --datarootdir='${prefix}/usr/share' \ - $(use_enable nls) -} - -src_install() { - emake DESTDIR="${D}" install install.man || die - - if use doc ; then - perl tcsh.man2html tcsh.man || die - dohtml tcsh.html/*.html - fi - - insinto /etc - doins \ - "${CONFDIR}"/csh.cshrc \ - "${CONFDIR}"/csh.login - - 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.18.01-r4.ebuild b/app-shells/tcsh/tcsh-6.18.01-r4.ebuild deleted file mode 100644 index ce871385a3..0000000000 --- a/app-shells/tcsh/tcsh-6.18.01-r4.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils flag-o-matic autotools prefix - -CONFVER="1.9" - -DESCRIPTION="Enhanced version of the Berkeley C shell (csh)" -HOMEPAGE="http://www.tcsh.org/"; -SRC_URI=" - ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz - https://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="nls doc" -RESTRICT="test" - -# we need gettext because we run autoconf (AM_ICONV) -RDEPEND=" - >=sys-libs/ncurses-5.1:0= - virtual/libiconv" -DEPEND="${RDEPEND} - sys-devel/gettext - doc? ( dev-lang/perl )" - -CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER} - -PATCHES=( - "${FILESDIR}"/${PN}-6.14.00-debian-dircolors.patch # bug #120792 - "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951 - "${FILESDIR}"/${PN}-6.14-use-ncurses.patch - "${FILESDIR}"/${PN}-6.18.01-aix.patch - "${FILESDIR}"/${PN}-6.18.01-gcc5.patch -) - -src_prepare() { - epatch "${PATCHES[@]}" - - # fix dependency on ncurses[tinfo], #459484 - sed \ - -e "s:\(ncurses\):\1 tinfo:g" \ - -i configure.in || die - - eautoreconf - - # fix gencat usage - sed \ - -e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \ - -i nls/Makefile.in || die - - # use sysmalloc (for larger alloc sets) on Darwin also - sed -i -e 's/__MACHTEN__/__MACH__/' config_f.h || die - - # unify ECHO behaviour - echo "#undef ECHO_STYLE" >> config_f.h - echo "#define ECHO_STYLE BOTH_ECHO" >> config_f.h - - eprefixify "${CONFDIR}"/* - # activate the right default PATH - if [[ -z ${EPREFIX} ]] ; then - sed -i \ - -e 's/^#MAIN//' -e '/^#PREFIX/d' \ - "${CONFDIR}"/csh.login || die - else - sed -i \ - -e 's/^#PREFIX//' -e '/^#MAIN/d' \ - "${CONFDIR}"/csh.login || die - fi -} - -src_configure() { - # make tcsh look and live along the lines of the prefix - append-cppflags -D_PATH_DOTCSHRC="'"'"${EPREFIX}/etc/csh.cshrc"'"'" - append-cppflags -D_PATH_DOTLOGIN="'"'"${EPREFIX}/etc/csh.login"'"'" - append-cppflags -D_PATH_DOTLOGOUT="'"'"${EPREFIX}/etc/csh.logout"'"'" - append-cppflags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'" - append-cppflags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'" - - econf \ - --prefix="${EPREFIX:-/}" \ - --datarootdir='${prefix}/usr/share' \ - $(use_enable nls) -} - -src_install() { - emake DESTDIR="${D}" install install.man - - DOCS=( FAQ Fixes NewThings Ported README WishList Y2K ) - if use doc ; then - perl tcsh.man2html tcsh.man || die - HTML_DOCS=( tcsh.html/*.html ) - fi - einstalldocs - - insinto /etc - doins \ - "${CONFDIR}"/csh.cshrc \ - "${CONFDIR}"/csh.login - - # bug #119703: add csh -> tcsh symlink - dosym /bin/tcsh /bin/csh -} diff --git a/app-shells/tcsh/tcsh-6.18.01.ebuild b/app-shells/tcsh/tcsh-6.18.01.ebuild index 8ba222e54c..c4ad219f4c 100644 --- a/app-shells/tcsh/tcsh-6.18.01.ebuild +++ b/app-shells/tcsh/tcsh-6.18.01.ebuild @@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="s390 sh" IUSE="nls doc" RESTRICT="test"
