diff options
| author |   Aron Griffis <agriffis@gentoo.org> | 2006-03-24 19:50:34 +0000 |
|---|---|---|
| committer | Aron Griffis <agriffis@gentoo.org> | 2006-03-24 19:50:34 +0000 |
| commit | 55736997f6320cf2a3443274b5c6b2f79e37a23a (patch) | |
| tree | d5686fc84c8567da2f2ba035e60d42069b50402a /dev-lang/tk | |
| parent | Bump to 2.02.02 (from 2.02.01). #120511 (diff) | |
| download | gentoo-2-55736997f6320cf2a3443274b5c6b2f79e37a23a.tar.gz gentoo-2-55736997f6320cf2a3443274b5c6b2f79e37a23a.tar.bz2 gentoo-2-55736997f6320cf2a3443274b5c6b2f79e37a23a.zip | |
Copy bash-3 fix from tk-8.4.11-r1.ebuild to tk-8.4.9.ebuild #117982. Port
tk-8.3.4-r1 to modular X
(Portage version: 2.1_pre5-r4)
Diffstat (limited to 'dev-lang/tk')
| -rw-r--r-- | dev-lang/tk/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-lang/tk/tk-8.3.4-r1.ebuild | 11 | ||||
| -rw-r--r-- | dev-lang/tk/tk-8.4.9.ebuild | 6 |
3 files changed, 18 insertions, 6 deletions
diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog index 3b5683285b38..6ad18fcec513 100644 --- a/dev-lang/tk/ChangeLog +++ b/dev-lang/tk/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/tk # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.67 2006/03/03 16:15:17 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.68 2006/03/24 19:50:33 agriffis Exp $ + + 24 Mar 2006; Aron Griffis <agriffis@gentoo.org> tk-8.3.4-r1.ebuild, + tk-8.4.9.ebuild: + Copy bash-3 fix from tk-8.4.11-r1.ebuild to tk-8.4.9.ebuild #117982. Port + tk-8.3.4-r1 to modular X *tk-8.4.12 (03 Mar 2006) diff --git a/dev-lang/tk/tk-8.3.4-r1.ebuild b/dev-lang/tk/tk-8.3.4-r1.ebuild index 9c3ae9519256..012e88ddd684 100644 --- a/dev-lang/tk/tk-8.3.4-r1.ebuild +++ b/dev-lang/tk/tk-8.3.4-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.3.4-r1.ebuild,v 1.11 2005/03/19 05:53:01 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.3.4-r1.ebuild,v 1.12 2006/03/24 19:50:34 agriffis Exp $ inherit eutils @@ -16,8 +16,11 @@ KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64" DEPEND=">=sys-apps/sed-4.0.5 >=sys-apps/portage-2.0.47-r10 - virtual/x11 - =dev-lang/tcl-${PV}*" + =dev-lang/tcl-${PV}* + || ( + ( x11-libs/libXt x11-proto/xproto ) + virtual/x11 + )" S=${WORKDIR}/${PN}${PV} diff --git a/dev-lang/tk/tk-8.4.9.ebuild b/dev-lang/tk/tk-8.4.9.ebuild index abe032f5cf36..d7b979c4da87 100644 --- a/dev-lang/tk/tk-8.4.9.ebuild +++ b/dev-lang/tk/tk-8.4.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.9.ebuild,v 1.14 2006/02/26 19:30:21 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.9.ebuild,v 1.15 2006/03/24 19:50:34 agriffis Exp $ inherit eutils @@ -42,6 +42,10 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/remove-control-v-${PV}.diff || die epatch ${FILESDIR}/${P}-man.patch || die + + # bug 117982 + sed -i -e "s/relid'/relid/" "${S}"/unix/{configure,tcl.m4} || die + local d for d in */configure ; do cd "${S}"/${d%%/*} |