diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 14:28:23 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 14:28:23 +0000 |
commit | efdad0aaaa75e8968319a6a336eda5bbc7779233 (patch) | |
tree | 961ad9a675a5fe71311e72f29080e0e7a328b989 /app-text | |
parent | Drop redudant has_version, png_sig_cmp is already available in 1.2.x series (diff) | |
download | gentoo-2-efdad0aaaa75e8968319a6a336eda5bbc7779233.tar.gz gentoo-2-efdad0aaaa75e8968319a6a336eda5bbc7779233.tar.bz2 gentoo-2-efdad0aaaa75e8968319a6a336eda5bbc7779233.zip |
Fix building with libpng14.
(Portage version: 2.2_rc65/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
-rw-r--r-- | app-text/texlive-core/ChangeLog | 6 | ||||
-rw-r--r-- | app-text/texlive-core/texlive-core-2008-r7.ebuild | 5 | ||||
-rw-r--r-- | app-text/texlive-core/texlive-core-2009-r1.ebuild | 6 | ||||
-rw-r--r-- | app-text/texlive-core/texlive-core-2009.ebuild | 3 |
4 files changed, 13 insertions, 7 deletions
diff --git a/app-text/texlive-core/ChangeLog b/app-text/texlive-core/ChangeLog index 33949d10a57f..bb205c02bef9 100644 --- a/app-text/texlive-core/ChangeLog +++ b/app-text/texlive-core/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/texlive-core # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.120 2010/02/10 21:29:36 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.121 2010/03/08 14:28:23 ssuominen Exp $ + + 08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> + texlive-core-2009-r1.ebuild: + Fix building with libpng14. 10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> texlive-core-2009.ebuild, texlive-core-2009-r1.ebuild: diff --git a/app-text/texlive-core/texlive-core-2008-r7.ebuild b/app-text/texlive-core/texlive-core-2008-r7.ebuild index d1f4859d9320..bb2b30aad67b 100644 --- a/app-text/texlive-core/texlive-core-2008-r7.ebuild +++ b/app-text/texlive-core/texlive-core-2008-r7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2008-r7.ebuild,v 1.7 2009/09/20 18:44:44 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2008-r7.ebuild,v 1.8 2010/03/08 14:28:23 ssuominen Exp $ EAPI=1 @@ -72,6 +72,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND} !app-text/dvibook sys-libs/zlib >=media-libs/libpng-1.2.1 + <media-libs/libpng-1.4 media-libs/freetype:2 media-libs/fontconfig" diff --git a/app-text/texlive-core/texlive-core-2009-r1.ebuild b/app-text/texlive-core/texlive-core-2009-r1.ebuild index 346a5a2d1a10..3c04385b82db 100644 --- a/app-text/texlive-core/texlive-core-2009-r1.ebuild +++ b/app-text/texlive-core/texlive-core-2009-r1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2009-r1.ebuild,v 1.2 2010/02/10 21:29:36 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2009-r1.ebuild,v 1.3 2010/03/08 14:28:23 ssuominen Exp $ EAPI=1 inherit eutils flag-o-matic toolchain-funcs libtool texlive-common -PATCHLEVEL="16" +PATCHLEVEL="17" TEXMFD_VERSION="1" DESCRIPTION="A complete TeX distribution" @@ -17,7 +17,7 @@ LICENSE="GPL-2 LPPL-1.3c TeX" SRC_URI="mirror://gentoo/${P}.tar.xz" # Fetch patches -SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz +SRC_URI="${SRC_URI} http://dev.gentoo.org/~ssuominen/${PN}-patches-${PATCHLEVEL}.tar.xz mirror://gentoo/${P}-texmf.d-${TEXMFD_VERSION}.tar.xz" TL_CORE_BINEXTRA_MODULES="a2ping asymptote bibtex8 ctie cweb dtl dvi2tty dviasm dvicopy dvidvi dviljk dvipng dvipos findhyph fragmaster hyphenex lacheck latex2man latexdiff latexmk listings-ext mkind-english mkjobtexmf patgen pdfcrop pdftools pkfix pkfix-helper purifyeps seetexk synctex texcount texdiff texdirflatten texdoc texloganalyser texware tie tpic2pdftex web collection-binextra" diff --git a/app-text/texlive-core/texlive-core-2009.ebuild b/app-text/texlive-core/texlive-core-2009.ebuild index 843f79da60ea..efc0f5ec6bb3 100644 --- a/app-text/texlive-core/texlive-core-2009.ebuild +++ b/app-text/texlive-core/texlive-core-2009.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2009.ebuild,v 1.2 2010/02/10 21:29:36 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2009.ebuild,v 1.3 2010/03/08 14:28:23 ssuominen Exp $ EAPI=1 @@ -68,6 +68,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND} app-text/teckit media-libs/silgraphite >=media-libs/libpng-1.2.1 + <media-libs/libpng-1.4 >=app-text/poppler-0.12.3-r3 media-libs/freetype:2 media-libs/fontconfig" |