diff options
| -rw-r--r-- | dev-lang/tk/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/tk/Manifest | 12 | ||||
| -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 |
4 files changed, 27 insertions, 17 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/Manifest b/dev-lang/tk/Manifest index 2308014b4ce1..99acef7a4665 100644 --- a/dev-lang/tk/Manifest +++ b/dev-lang/tk/Manifest @@ -20,14 +20,14 @@ EBUILD tk-8.4.18.ebuild 3172 RMD160 92277145a90076904705c1793f8edacedf4dbed6 SHA EBUILD tk-8.4.19-r1.ebuild 3262 RMD160 c9fe9b3b572d4b0e1933bd095a9fba8c850a3d19 SHA1 32826f74e838ec3ad09bdf54811cb2c75f59d6f2 SHA256 4853aa1c968cc14c369e105bfce4f4c5b3b28fdee97757dbb49681ad65d0390e EBUILD tk-8.5.7-r1.ebuild 2880 RMD160 445ae6825eb80c09dade8b9eb834697662be1ab1 SHA1 89ec94ed94dbd33245b451c319beeb0037878afd SHA256 efd70fe2b92b24ce91ccc8b03e99f20dc830f8ebe7bf4a2bbd6836de8eb24e15 EBUILD tk-8.5.7.ebuild 2776 RMD160 ac64048b9fd4113d5fc5bc4f888156e32901617b SHA1 766e18f181acd1d269bd38062ae2c0c2b4909c62 SHA256 8201c25e9a294908c000bd4e897f7a9e61d28b0df2b0fbc39e50e5ccec8d647b -EBUILD tk-8.5.8-r1.ebuild 3129 RMD160 3d8c8f434f3b05e17c821f2a4d65f610af0bbfb2 SHA1 c246f304cfa986c25dbe7f37bc312dda21b0cdb0 SHA256 a713ef3a7f517ae3563467806d755763ae53bf57b1cf8b56ba62c650b1cc85e0 -EBUILD tk-8.5.9.ebuild 3144 RMD160 ecfbadc629c0077d406bfe1ebf75a838a26897ba SHA1 6938f8c65cd3ae9ab1bdf419a18fd55c45f90101 SHA256 52ee8bc10422e9d953e565ae0503dc39fc340d6b13e2160b1ca98e9551c621ea -MISC ChangeLog 19162 RMD160 ef10c2f56846713af8ed19376da3ad49af434cd2 SHA1 dfca0e0156fe8279b60391597bc9998cb95c18e0 SHA256 b5cf4dce736481f23af59587dc72468f29939bf0effc76705ec109659b491b36 +EBUILD tk-8.5.8-r1.ebuild 3155 RMD160 b9bf413b9074f95217dd89669efa3ea80cbf1755 SHA1 b038f17353803f10b93a8dcb1753b6b9f42bcf14 SHA256 121964dcc64b1c222353c4a4dd617d5738379fd8bc0ada2b8bee429680ab5186 +EBUILD tk-8.5.9.ebuild 3163 RMD160 920f586609c39b745fdc0094a37ed306180bb309 SHA1 b1a8696ce585d79f16775dac95c2836c06fa0ddd SHA256 c4fa1adebb8629ec693a9bf01decdda0b37a8820782c69a27201cb3cbca2f1ee +MISC ChangeLog 19321 RMD160 791c1e13b3b3b42b5702c0d8f3ae65b8da0c8f13 SHA1 c838736e53ccb20bd485ffdd7a62e44cb5541b99 SHA256 c110611434ccd237e67611206ab80b32d152474b6a5da0831aac55e0408d5c14 MISC metadata.xml 159 RMD160 117cc289391c0477579de68e7347628756673eac SHA1 37f242cbf27c6e859fc63487487fdcae09d6931f SHA256 2cf13398186ae4abcd9f41c51ffb3bcdcc7da32df2c2af5c2de2e2cc8ad194ce -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkz9Go0ACgkQgAnW8HDreRY7jwCgjXA5SwypxI2YvBwb2MR6uDrc -35QAoLERDYcF1ea5pz0Lm9Ahk/AHYI4a -=DuzW +iEYEARECAAYFAkz9+i8ACgkQgAnW8HDreRac6QCZAe8kqp1cH6dnXjZyjKWEgPe9 +nscAn0qhOkKLEEH7Yu8hmBr1OclvnCx9 +=O9yx -----END PGP SIGNATURE----- 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 |