diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-05-15 14:40:16 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-05-15 14:40:16 +0000 |
commit | 423666eb04688418005596bd31caac449b13e393 (patch) | |
tree | 9bd015e81a427d56cd340e43e1cd2cfe3b004322 /app-text | |
parent | Stable on amd64 wrt bug #317381. Thanks to Roeland Douma <roeland@rullzer.com> (diff) | |
download | gentoo-2-423666eb04688418005596bd31caac449b13e393.tar.gz gentoo-2-423666eb04688418005596bd31caac449b13e393.tar.bz2 gentoo-2-423666eb04688418005596bd31caac449b13e393.zip |
Prevent people from doing silly things by forcing correct slot of libpng for both 1.2 and 1.4
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
-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 | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/app-text/texlive-core/texlive-core-2008-r7.ebuild b/app-text/texlive-core/texlive-core-2008-r7.ebuild index 875c5bc46dff..ecdba3f6c57b 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-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.10 2010/05/14 18:37:24 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2008-r7.ebuild,v 1.11 2010/05/15 14:40:16 ssuominen Exp $ EAPI=1 @@ -71,8 +71,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND} !app-text/xdvipdfmx !app-text/dvibook sys-libs/zlib - >=media-libs/libpng-1.2.1 - <media-libs/libpng-1.4 + >=media-libs/libpng-1.2.43-r2:0 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 6e46e3394f10..267cc5176cae 100644 --- a/app-text/texlive-core/texlive-core-2009-r1.ebuild +++ b/app-text/texlive-core/texlive-core-2009-r1.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-r1.ebuild,v 1.4 2010/03/12 10:58:45 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2009-r1.ebuild,v 1.5 2010/05/15 14:40:16 ssuominen Exp $ EAPI=1 @@ -67,7 +67,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND} sys-libs/zlib app-text/teckit media-libs/silgraphite - >=media-libs/libpng-1.2.1 + >=media-libs/libpng-1.2.43-r2:0 >=app-text/poppler-0.12.3-r3 media-libs/freetype:2 media-libs/fontconfig" |