diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-03-06 07:52:42 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-03-06 07:52:42 +0000 |
| commit | 004b76c3643d983996b40c7a841df1bbac6b4bd1 (patch) | |
| tree | 2e755e9ccf0cfad5e3e7e3bfe8f4493a291e3324 /dev-lang | |
| parent | Set the darcs-2.5.2 keywords the same as darcs-2.5.2-r1 (diff) | |
| download | gentoo-2-004b76c3643d983996b40c7a841df1bbac6b4bd1.tar.gz gentoo-2-004b76c3643d983996b40c7a841df1bbac6b4bd1.tar.bz2 gentoo-2-004b76c3643d983996b40c7a841df1bbac6b4bd1.zip | |
Fix logix after added || die from rev 1.4, thanks Charles Davis in bug #407059
(Portage version: 2.2.01.20271-prefix/cvs/Darwin i386)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/tcl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/tcl/tcl-8.5.10.ebuild | 12 | ||||
| -rw-r--r-- | dev-lang/tcl/tcl-8.5.11.ebuild | 12 |
3 files changed, 19 insertions, 11 deletions
diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog index 22b5aa65fbaa..f385e68c2804 100644 --- a/dev-lang/tcl/ChangeLog +++ b/dev-lang/tcl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/tcl # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.147 2012/03/05 10:35:13 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.148 2012/03/06 07:52:42 grobian Exp $ + + 06 Mar 2012; Fabian Groffen <grobian@gentoo.org> tcl-8.5.10.ebuild, + tcl-8.5.11.ebuild: + Fix logix after added || die from rev 1.4, thanks Charles Davis in bug #407059 05 Mar 2012; Agostino Sarubbo <ago@gentoo.org> tcl-8.5.10.ebuild: Stable for amd64, wrt bug #406607 diff --git a/dev-lang/tcl/tcl-8.5.10.ebuild b/dev-lang/tcl/tcl-8.5.10.ebuild index 53f75071a1a9..222cd75e7b98 100644 --- a/dev-lang/tcl/tcl-8.5.10.ebuild +++ b/dev-lang/tcl/tcl-8.5.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.10.ebuild,v 1.7 2012/03/05 10:35:13 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.10.ebuild,v 1.8 2012/03/06 07:52:42 grobian Exp $ EAPI=4 @@ -79,10 +79,12 @@ src_install() { -e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \ -e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \ "${ED}"/usr/${mylibdir}/tclConfig.sh || die - [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] && sed -i \ - -e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \ - -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \ - "${ED}"/usr/${mylibdir}/tclConfig.sh || die + if [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then + sed -i \ + -e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \ + -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \ + "${ED}"/usr/${mylibdir}/tclConfig.sh || die + fi # install private headers insinto /usr/${mylibdir}/tcl${v1}/include/unix diff --git a/dev-lang/tcl/tcl-8.5.11.ebuild b/dev-lang/tcl/tcl-8.5.11.ebuild index 5a52d4ab8e6a..287d4141397e 100644 --- a/dev-lang/tcl/tcl-8.5.11.ebuild +++ b/dev-lang/tcl/tcl-8.5.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.11.ebuild,v 1.2 2012/03/04 20:11:13 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.11.ebuild,v 1.3 2012/03/06 07:52:42 grobian Exp $ EAPI=4 @@ -79,10 +79,12 @@ src_install() { -e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \ -e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \ "${ED}"/usr/${mylibdir}/tclConfig.sh || die - [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] && sed -i \ - -e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \ - -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \ - "${ED}"/usr/${mylibdir}/tclConfig.sh || die + if [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then + sed -i \ + -e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \ + -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \ + "${ED}"/usr/${mylibdir}/tclConfig.sh || die + fi # install private headers insinto /usr/${mylibdir}/tcl${v1}/include/unix |