rhill       15/07/19 10:14:07

  Modified:             ChangeLog
  Added:                tcsh-6.18.01-r3.ebuild
  Log:
  Fix hang with gcc-5 (bug #545176).
  
  Signed-off-by: Ryan Hill <rh...@gentoo.org>
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
957A8463)

Revision  Changes    Path
1.137                app-shells/tcsh/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/tcsh/ChangeLog?rev=1.137&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/tcsh/ChangeLog?rev=1.137&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/tcsh/ChangeLog?r1=1.136&r2=1.137

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- ChangeLog   17 Feb 2015 15:03:26 -0000      1.136
+++ ChangeLog   19 Jul 2015 10:14:06 -0000      1.137
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/tcsh
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.136 
2015/02/17 15:03:26 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.137 
2015/07/19 10:14:06 rhill Exp $
+
+*tcsh-6.18.01-r3 (19 Jul 2015)
+
+  19 Jul 2015; Ryan Hill <rh...@gentoo.org> +tcsh-6.18.01-r3.ebuild,
+  +files/tcsh-6.18.01-gcc5.patch:
+  Fix hang with gcc-5 (bug #545176).
 
   17 Feb 2015; Michael Haubenwallner <ha...@gentoo.org> tcsh-6.18.01-r2.ebuild,
   +files/tcsh-6.18.01-aix.patch:



1.1                  app-shells/tcsh/tcsh-6.18.01-r3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/tcsh/tcsh-6.18.01-r3.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/tcsh/tcsh-6.18.01-r3.ebuild?rev=1.1&content-type=text/plain

Index: tcsh-6.18.01-r3.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.18.01-r3.ebuild,v 1.1 
2015/07/19 10:14:06 rhill Exp $

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
        
http://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 ~x64-freebsd ~x86-freebsd ~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
        epatch "${FILESDIR}"/${PN}-6.18.01-gcc5.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) \
                || die
}

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
}




Reply via email to