diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2010-12-07 09:11:06 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2010-12-07 09:11:06 +0000 |
| commit | f798554509b25eb9600322aa6e4c2a7a1f0bfe4b (patch) | |
| tree | 15baa4b15967aac5ec03149761a9b86e93912503 /dev-lang/tk | |
| parent | Use virtual/jpeg (#347956) (diff) | |
| download | gentoo-2-f798554509b25eb9600322aa6e4c2a7a1f0bfe4b.tar.gz gentoo-2-f798554509b25eb9600322aa6e4c2a7a1f0bfe4b.tar.bz2 gentoo-2-f798554509b25eb9600322aa6e4c2a7a1f0bfe4b.zip | |
Corrected logic on die, thanks Guilherme Amadio for the patch #347929
(Portage version: 2.2.0_alpha7/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/tk')
| -rw-r--r-- | dev-lang/tk/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/tk/tk-8.5.8-r1.ebuild | 13 | ||||
| -rw-r--r-- | dev-lang/tk/tk-8.5.9.ebuild | 13 |
3 files changed, 21 insertions, 11 deletions
diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog index 3c8e999c003e..d4fc8c6ddc36 100644 --- a/dev-lang/tk/ChangeLog +++ b/dev-lang/tk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/tk # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.142 2010/12/06 17:16:55 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.143 2010/12/07 09:11:06 jlec Exp $ + + 07 Dec 2010; Justin Lecher <jlec@gentoo.org> tk-8.5.8-r1.ebuild, + tk-8.5.9.ebuild: + Corrected logic on die, thanks Guilherme Amadio for the patch #347929 *tk-8.5.9 (06 Dec 2010) diff --git a/dev-lang/tk/tk-8.5.8-r1.ebuild b/dev-lang/tk/tk-8.5.8-r1.ebuild index f52050b4d860..3b5d6a5d2d74 100644 --- a/dev-lang/tk/tk-8.5.8-r1.ebuild +++ b/dev-lang/tk/tk-8.5.8-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.8-r1.ebuild,v 1.10 2010/12/06 17:16:55 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.8-r1.ebuild,v 1.11 2010/12/07 09:11:06 jlec Exp $ EAPI="3" @@ -79,10 +79,13 @@ src_install() { -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \ -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \ "${ED}"/usr/${mylibdir}/tkConfig.sh || die - [[ ${CHOST} != *-darwin* ]] && sed -i \ - -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \ - -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \ - "${ED}"/usr/${mylibdir}/tkConfig.sh + + if [[ ${CHOST} != *-darwin* ]]; then + sed -i \ + -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \ + -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \ + "${ED}"/usr/${mylibdir}/tkConfig.sh || die + fi # install private headers insinto /usr/${mylibdir}/tk${v1}/include/unix diff --git a/dev-lang/tk/tk-8.5.9.ebuild b/dev-lang/tk/tk-8.5.9.ebuild index dc2c32f563d4..1f2cf7ede295 100644 --- a/dev-lang/tk/tk-8.5.9.ebuild +++ b/dev-lang/tk/tk-8.5.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.9.ebuild,v 1.1 2010/12/06 17:16:55 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.9.ebuild,v 1.2 2010/12/07 09:11:06 jlec Exp $ EAPI="3" @@ -81,10 +81,13 @@ src_install() { -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \ -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \ "${ED}"/usr/${mylibdir}/tkConfig.sh || die - [[ ${CHOST} != *-darwin* ]] && sed -i \ - -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \ - -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \ - "${ED}"/usr/${mylibdir}/tkConfig.sh || die + + if [[ ${CHOST} != *-darwin* ]]; then + sed -i \ + -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \ + -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \ + "${ED}"/usr/${mylibdir}/tkConfig.sh || die + fi # install private headers insinto /usr/${mylibdir}/tk${v1}/include/unix |