diff options
author | Danny van Dyk <kugelfang@gentoo.org> | 2005-02-14 19:55:50 +0000 |
---|---|---|
committer | Danny van Dyk <kugelfang@gentoo.org> | 2005-02-14 19:55:50 +0000 |
commit | 9a1b6652b0ac594bd74a60a36f82c6db751ae2d3 (patch) | |
tree | 8fa60e17aad96a36b7d3ddd017168841fd5ed00f /media-libs/pdflib | |
parent | stable on amd64 and x86. (diff) | |
download | gentoo-2-9a1b6652b0ac594bd74a60a36f82c6db751ae2d3.tar.gz gentoo-2-9a1b6652b0ac594bd74a60a36f82c6db751ae2d3.tar.bz2 gentoo-2-9a1b6652b0ac594bd74a60a36f82c6db751ae2d3.zip |
Fixed BUG #81197 (multilib-strict).
(Portage version: 2.0.51-r15)
Diffstat (limited to 'media-libs/pdflib')
-rw-r--r-- | media-libs/pdflib/ChangeLog | 6 | ||||
-rw-r--r-- | media-libs/pdflib/pdflib-5.0.4_p1-r1.ebuild | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/media-libs/pdflib/ChangeLog b/media-libs/pdflib/ChangeLog index 65a96a7e79cc..622b27ee291e 100644 --- a/media-libs/pdflib/ChangeLog +++ b/media-libs/pdflib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/pdflib # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/ChangeLog,v 1.52 2005/02/02 21:49:10 j4rg0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/ChangeLog,v 1.53 2005/02/14 19:55:50 kugelfang Exp $ + + 14 Feb 2005; Danny van Dyk <kugelfang@gentoo.org> + pdflib-5.0.4_p1-r1.ebuild: + Fixed multilib-strict BUG #81197. 02 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> pdflib-5.0.4_p1-r1.ebuild: Stable ppc-macos diff --git a/media-libs/pdflib/pdflib-5.0.4_p1-r1.ebuild b/media-libs/pdflib/pdflib-5.0.4_p1-r1.ebuild index ecfd9ca01771..a81d6b97a462 100644 --- a/media-libs/pdflib/pdflib-5.0.4_p1-r1.ebuild +++ b/media-libs/pdflib/pdflib-5.0.4_p1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/pdflib-5.0.4_p1-r1.ebuild,v 1.3 2005/02/02 21:49:10 j4rg0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/pdflib-5.0.4_p1-r1.ebuild,v 1.4 2005/02/14 19:55:50 kugelfang Exp $ # eutils must be inherited since get_libdir() is only # globally available on baselayout-1.11 (still on ~arch) @@ -16,7 +16,7 @@ SRC_URI="http://www.pdflib.com/products/pdflib/download/504src/${MY_P}.tar.gz" LICENSE="Aladdin" SLOT="5" -KEYWORDS="x86 ppc sparc ~mips alpha arm hppa amd64 ia64 ppc64 ppc-macos s390" +KEYWORDS="x86 ppc sparc ~mips alpha arm hppa amd64 ia64 ppc64 ~ppc-macos s390" IUSE="tcltk perl python java" DEPEND=">=sys-apps/sed-4 @@ -29,7 +29,13 @@ src_compile() { local myconf= PYVER="$(/usr/bin/python -V 2>&1 | cut -d ' ' -f 2 | cut -d '.' -f 1,2)" - use tcltk || myconf="--with-tcl=no" + # Necessary for multilib on amd64. Please keep this in future releases. + # BUG #81197 + # Danny van Dyk <kugelfang@gentoo.org> 2005/02/14 + TCLVER="$(echo 'puts [info tclversion]' | $(which tclsh))" + use tcltk \ + && myconf="--with-tclpkg=/usr/$(get_libdir)/tcl${TCLVER}/" \ + || myconf="--with-tcl=no" use perl || myconf="${myconf} --with-perl=no" use python \ && myconf="${myconf} --with-py=/usr --with-pyincl=/usr/include/python${PYVER}" \ |