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 | 0b9bdf149bf2c61ac6b15f4e10c5d3c4ed085371 (patch) | |
tree | 1a25794b383dadf3777ce96194bb17667345d7b2 /dev-lang/tk | |
parent | Respect compiler and linker, remove uneeded QA_ restriction, remove redundant... (diff) | |
download | gentoo-2-0b9bdf149bf2c61ac6b15f4e10c5d3c4ed085371.tar.gz gentoo-2-0b9bdf149bf2c61ac6b15f4e10c5d3c4ed085371.tar.bz2 gentoo-2-0b9bdf149bf2c61ac6b15f4e10c5d3c4ed085371.zip |
Backport correct detection of truetype support
(Portage version: 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/tk-8.5.8-r1.ebuild | 10 |
2 files changed, 12 insertions, 5 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/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 } |