diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-01-04 13:04:02 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-01-04 13:04:02 +0000 |
| commit | b24736136e3e65fcd0d3d70227074e5ecc94037e (patch) | |
| tree | da6fbfce938227b5795a79cf8ae8fd93b988ff5d /dev-lang/tk | |
| parent | Respect compiler and linker, remove uneeded QA_ restriction, remove redundant... (diff) | |
| download | historical-b24736136e3e65fcd0d3d70227074e5ecc94037e.tar.gz historical-b24736136e3e65fcd0d3d70227074e5ecc94037e.tar.bz2 historical-b24736136e3e65fcd0d3d70227074e5ecc94037e.zip | |
Backport correct detection of truetype support
Package-Manager: portage-2.2.0_alpha12/cvs/Linux x86_64
Diffstat (limited to 'dev-lang/tk')
| -rw-r--r-- | dev-lang/tk/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-lang/tk/Manifest | 10 | ||||
| -rw-r--r-- | dev-lang/tk/tk-8.5.8-r1.ebuild | 10 |
3 files changed, 17 insertions, 10 deletions
diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog index c2061d9d3daf..1962d9a33533 100644 --- a/dev-lang/tk/ChangeLog +++ b/dev-lang/tk/ChangeLog @@ -1,6 +1,9 @@ # 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.145 2010/12/29 16:17:29 hwoarang Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.146 2011/01/04 13:04:02 jlec Exp $ + + 04 Jan 2011; Justin Lecher <jlec@gentoo.org> tk-8.5.8-r1.ebuild: + Backport correct detection of truetype support 29 Dec 2010; Markos Chandras <hwoarang@gentoo.org> tk-8.5.8-r1.ebuild: Stable on amd64 wrt bug #332415 diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest index 4c8e765829d9..14c9367bc28f 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 3158 RMD160 398e091f849c6040d8a9fc3ccc620454a74f6897 SHA1 e4963a2e47e7a4fdf89b66658b306d06563eb78e SHA256 eaa373b2f7132f2cfec7bbdad88cea31cc5b99c6771cc743b72e785f944cc17a +EBUILD tk-8.5.8-r1.ebuild 3221 RMD160 822cd7801440a5b8d75e4edb72097e33f73cb442 SHA1 22268ac07761bf95c96649392112e03f03b61072 SHA256 1938bc27d83456243e3ccc641d35410c05f6b4c57e96d344a9f1b2d7099132e8 EBUILD tk-8.5.9-r1.ebuild 3230 RMD160 62bef1a792b991ede48f15c6d1bbfa009909bd85 SHA1 4fd13cbbd5f34a71251f37392a3a633f0367ada5 SHA256 fc0c14744933270370ed2a5d07be4a21723da0abead4f370b3ac100e77776df6 -MISC ChangeLog 19589 RMD160 04a0e60ffef3706be242409a62f6f9269920e254 SHA1 3c522f8efce494ae3da7715a24cffb7ae74ec002 SHA256 7e0bfa16f992c840613a9f27a843c5cc5c39e702937973a2d9f6670b7efad697 +MISC ChangeLog 19702 RMD160 6bd35556712762f64fbe5aa4e519bbbc64720cf6 SHA1 2b05a362cdbe10374416972361630b6f6d22f017 SHA256 c2748b2e1cf7597811717e7c4232b2ea9dd3406341f98f52c39a0a7071bce5a1 MISC metadata.xml 159 RMD160 117cc289391c0477579de68e7347628756673eac SHA1 37f242cbf27c6e859fc63487487fdcae09d6931f SHA256 2cf13398186ae4abcd9f41c51ffb3bcdcc7da32df2c2af5c2de2e2cc8ad194ce -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAk0bXtcACgkQ9/cejkQaxBAOAQCfR+2ml+ce66jBiy4jD16K9Kz6 -qncAn0/Hsxke4mBLkPopp6Kr0TZr0ZS4 -=pkeu +iEYEARECAAYFAk0jGsgACgkQgAnW8HDreRbj/QCePYfPGEp0tFbIhvmcMLrkAhOH +1/cAoJhfMQtfsdIMhJOG3Optn2gQkj3O +=aTtp -----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 062af89500ca..bb5cf3d0e58d 100644 --- a/dev-lang/tk/tk-8.5.8-r1.ebuild +++ b/dev-lang/tk/tk-8.5.8-r1.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 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.12 2010/12/29 16:17:29 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.8-r1.ebuild,v 1.13 2011/01/04 13:04:02 jlec Exp $ EAPI="3" inherit autotools eutils multilib toolchain-funcs prefix MY_P="${PN}${PV/_beta/b}" + DESCRIPTION="Tk Widget Set" HOMEPAGE="http://www.tcl.tk/" SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" @@ -16,7 +17,8 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug threads truetype aqua xscreensaver" -RDEPEND="!aqua? ( +RDEPEND=" + !aqua? ( x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) @@ -36,6 +38,8 @@ src_prepare() { # Bug 125971 epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch + sed -i 's/FT_New_Face/XftFontOpen/g' unix/configure.in || die + cd "${S}"/unix eautoreconf } |