diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-12-05 07:42:09 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-12-05 07:42:09 +0000 |
| commit | 29cca9ae599f52c29a9d615aed6034f766c7453c (patch) | |
| tree | 22f60df5fc3dc6011e26a67fc36cd7800980ca84 /dev-lang | |
| parent | dev-tcltk/tkimg: Drop old (diff) | |
| download | gentoo-2-29cca9ae599f52c29a9d615aed6034f766c7453c.tar.gz gentoo-2-29cca9ae599f52c29a9d615aed6034f766c7453c.tar.bz2 gentoo-2-29cca9ae599f52c29a9d615aed6034f766c7453c.zip | |
dev-lang/tk: Avoid problems with autotools by only modifying configure.in, #445432
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/tk/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/tk/files/tk-8.5.13-multilib.patch | 12 | ||||
| -rw-r--r-- | dev-lang/tk/tk-8.5.13.ebuild | 5 |
3 files changed, 20 insertions, 3 deletions
diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog index 01a8a70771f3..b578507b3e39 100644 --- a/dev-lang/tk/ChangeLog +++ b/dev-lang/tk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/tk # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.175 2012/11/29 15:23:01 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.176 2012/12/05 07:42:09 jlec Exp $ + + 05 Dec 2012; Justin Lecher <jlec@gentoo.org> tk-8.5.13.ebuild, + +files/tk-8.5.13-multilib.patch: + Avoid problems with autotools by only modifying configure.in, #445432 *tk-8.5.13 (29 Nov 2012) diff --git a/dev-lang/tk/files/tk-8.5.13-multilib.patch b/dev-lang/tk/files/tk-8.5.13-multilib.patch new file mode 100644 index 000000000000..db3d8cc00817 --- /dev/null +++ b/dev-lang/tk/files/tk-8.5.13-multilib.patch @@ -0,0 +1,12 @@ +diff -Naur tk8.4.11.orig/unix/configure.in tk8.4.11/unix/configure.in +--- tk8.4.11.orig/unix/configure.in 2005-06-30 01:43:10.000000000 +0900 ++++ tk8.4.11/unix/configure.in 2005-07-02 23:22:16.000000000 +0900 +@@ -393,7 +393,7 @@ + TCL_STUB_FLAGS="-DUSE_TCL_STUBS" + fi + +-TK_LIBRARY='$(prefix)/lib/tk$(VERSION)' ++TK_LIBRARY='$(libdir)/tk$(VERSION)' + PRIVATE_INCLUDE_DIR='$(includedir)' + HTML_DIR='$(DISTDIR)/html' + TK_PKG_DIR='tk$(VERSION)$(TK_DBGX)' diff --git a/dev-lang/tk/tk-8.5.13.ebuild b/dev-lang/tk/tk-8.5.13.ebuild index 8865fdf2d567..130ca7809dfd 100644 --- a/dev-lang/tk/tk-8.5.13.ebuild +++ b/dev-lang/tk/tk-8.5.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.13.ebuild,v 1.1 2012/11/29 15:23:01 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.13.ebuild,v 1.2 2012/12/05 07:42:09 jlec Exp $ EAPI=4 @@ -37,7 +37,7 @@ src_prepare() { epatch \ "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \ - "${FILESDIR}"/${PN}-8.4.11-multilib.patch + "${FILESDIR}"/${P}-multilib.patch epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch eprefixify unix/Makefile.in @@ -56,6 +56,7 @@ src_prepare() { -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \ -e 's:xft freetype2:xft freetype2 fontconfig:' \ -i unix/configure.in || die + rm -f unix/configure || die cd "${S}"/unix eautoreconf |