Fix building with libpng14.

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

5 files changed, 18 insertions, 11 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/Manifest b/app-text/texlive-core/Manifest
index 8e9bc9e34a6b..28f876edb79d 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -6,6 +6,7 @@ DIST texlive-core-2009-texmf.d-1.tar.xz 10172 RMD160 175821a4f18a654a5ee8ebd59bc
 DIST texlive-core-2009.tar.xz 29672256 RMD160 eaca6de9844c587e7c93c27064ebe30dc2f60ad8 SHA1 3e11287f16595209181dc2e0ae7c23809e2e73ee SHA256 ae86afdc6a62cc025c98c054f2944de915c627876d3e39a25c7f6689d4f968b2
 DIST texlive-core-patches-15.tar.lzma 30872 RMD160 2e66f1a05432f447835e1dec95cddb830619c704 SHA1 48567742c5cc550d3282a11112948cb35b71bdf3 SHA256 7bc693d923a8f291bffea695df3d4945b692d1f8b71340048529b96acaafa9e1
 DIST texlive-core-patches-16.tar.xz 6064 RMD160 0b83d6265e64d9fd52735bc7ae4e2e3e8798c2a9 SHA1 91d67b707e0a1c75055ab5aa3835636951b28f9e SHA256 54bb6c3fe35ec039e29efcf8ead0718b9486ff67eb4c4e353cc74c772c605b89
+DIST texlive-core-patches-17.tar.xz 6288 RMD160 388a8b56a5bab07f4bbc47154304bf401f88c41f SHA1 923ca0edf69c66351b3bece6a4944489ba17a04f SHA256 aaf18bbb78a32f0dda8ad18856674cdaa49d65ac697d822bc3ac39da5ca9da32
 DIST texlive-module-a2ping-2008.tar.lzma 31077 RMD160 d9a156c3e063831bc66fe3bf444903e7a5344d03 SHA1 2c7cbfb771fcb6f3b522fe7879de6904b34bb602 SHA256 e69a466b698a3c08fbb0cd7e8edf3d591d4d50d81b1a213e0d614aff78c77697
 DIST texlive-module-a2ping-2009.tar.xz 31132 RMD160 9c414487d510455b9e3d86914f2777390818ec73 SHA1 55334cd2a44c91f53bd46845377a9671a5cb185b SHA256 3f1cc29edcf4991381bc539fb8481266b0d7686bdbb1375e914c28ce461a52d1
 DIST texlive-module-a2ping.doc-2008.tar.lzma 17451 RMD160 09ab10c94617e5e52f06b45f159a187cdc542f05 SHA1 c0686da95317a2e1bd3dc78dba72ff825e7282cf SHA256 75eb1e8bddc5dcf2e08271a7a038332087103f99b21f5802378f0da28c6e19d7
@@ -181,8 +182,8 @@ DIST texlive-module-tpic2pdftex-2009.tar.xz 428 RMD160 9e7fc3a36b0c8ab7c34ec39ee
 DIST texlive-module-tpic2pdftex.doc-2009.tar.xz 41940 RMD160 a4c11886322f7b7a6f4f907820d77a29d76ecc3f SHA1 09d6b5cf1d7989965483278632cf2b3526607dc5 SHA256 8d27efe6302aa7ea41b12e545f45baea33cccd1454c76b7a49268cc46a076680
 DIST texlive-module-web-2009.tar.xz 532 RMD160 1e64cafcb5d53b3e2df7d4ec23e91e6460c01910 SHA1 dfe4da403c090e4d8aa31fab7972936dc47d6dad SHA256 fd909cd2f62254ace1bcef41d6ccf9c0a9171d07d32ed07767743944ec424aa7
 DIST texlive-module-web.doc-2009.tar.xz 11068 RMD160 cd2d0e6d6caa068a63e87fbd3e9a699bf96ea7ed SHA1 c69760b0631771182d596c1bf8c3acb8ca1d48d1 SHA256 0edcbe24fc397bad809ab9837c50f7804a884effab3322fbfae543d5c331f79b
-EBUILD texlive-core-2008-r7.ebuild 11558 RMD160 4252318e6fa3a65de971a669817edbed181112c0 SHA1 0e11fc1bc70965a157a63344b9f9f32c16e81411 SHA256 7ef8c62be49592fbebe8208f9e0604fe3059f5b6fdcc51308cb0c4ace163ed72
-EBUILD texlive-core-2009-r1.ebuild 10904 RMD160 26cb550e6375778c47d04ae8d30cc516c5008c58 SHA1 fc242538316d0f10b0e132144c99708c3a5e301e SHA256 56e44c028a9f295c9ed37f95ff74c9c8ce275f95068f08c5b16c47f9c38d2c52
-EBUILD texlive-core-2009.ebuild 10859 RMD160 26ff512d613d3054462ea0bcf53fb8bc9c02571b SHA1 7ae4cb5e8d88cfeac725b632307b91adbf3d0bc3 SHA256 8e617cda64cab0ec9cc3e8ef1b9abb7e9a895ffab498a65d2552ad05b929ea3c
-MISC ChangeLog 20059 RMD160 4df62b57d76025fd1d7d8fced54819b85270033e SHA1 f4804ee8cbd9b610d7c9dac0cd06cf7ab981b4d0 SHA256 fbf171a6e5b6e6149dd454b656671da6fcab42465ad7786981a3d3069e372aca
+EBUILD texlive-core-2008-r7.ebuild 11585 RMD160 9c404ebc82531c17bcefc500a4067222d519fa0d SHA1 ab08fcf7f12ea0e7a5c5ebf311f4d9da0619c5d7 SHA256 c2fde9220c4dd42cb92324b7ac4eae2ea725de8de7035087512ab85d8081f007
+EBUILD texlive-core-2009-r1.ebuild 10921 RMD160 203bdbfbaee5fbedff8d3d124a13b07ad121be7d SHA1 e8468830ae810f737de2d0f9a84f2c5ddf1864d6 SHA256 7c36181cc7f63dee96d34665756251fec8af73fe7c381b49c2e13e80355d883f
+EBUILD texlive-core-2009.ebuild 10883 RMD160 64eff462137d5547f1b7b325fea83753fc12bac3 SHA1 d845c739f85e1722f483795e4f15c4bd8c64509b SHA256 17e88fa93215d6086c145f2f37eedc7ebbd9f0d9b29400b41717f79a2377feaa
+MISC ChangeLog 20175 RMD160 39b7e58aff8d4df5589f170965a0f555f95499b8 SHA1 a79285096903f09b1cc8a3ea8cd8f8b55de6fcdc SHA256 e0fe76267c02e862e3d2c521f08bf624d099c0b88764a6346e24bb5777f589ce
 MISC metadata.xml 327 RMD160 10186cf048d44753bf4cec722eed45d2ade12316 SHA1 0254321c012da0e8f80aec6f29a0fb5b17675d4d SHA256 e520223493249c261b48f7f7460ed7c262d35383484e730cfefba51fde1195be
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"