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 | d93a4dc2954870bbae929ec19e78317efd607bf0 (patch) | |
| tree | 384210372cc2007cb13455abf4c6f2456c676861 | |
| parent | Stable on amd64 wrt bug #317381. Thanks to Roeland Douma <roeland@rullzer.com> (diff) | |
| download | historical-d93a4dc2954870bbae929ec19e78317efd607bf0.tar.gz historical-d93a4dc2954870bbae929ec19e78317efd607bf0.tar.bz2 historical-d93a4dc2954870bbae929ec19e78317efd607bf0.zip | |
Prevent people from doing silly things by forcing correct slot of libpng for both 1.2 and 1.4
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
| -rw-r--r-- | app-text/texlive-core/Manifest | 4 | ||||
| -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 |
3 files changed, 6 insertions, 7 deletions
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest index 43293d114b02..b9f8d7c353fa 100644 --- a/app-text/texlive-core/Manifest +++ b/app-text/texlive-core/Manifest @@ -182,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 11587 RMD160 424468d2c8ea6bd8fede0dcd210fcf66353db7c9 SHA1 c81c9b8176f4f6c1f100d17996205fb87bc9baa8 SHA256 395917473e43dee905de1ccc108ab4955cd44eb51a905e2f4f1261131734aa55 -EBUILD texlive-core-2009-r1.ebuild 10904 RMD160 786c9b7f0fd45d1e88486638c45f89a1b0e71c3b SHA1 efafea1809557ec373cceaba1c0ae29a3fdff9a2 SHA256 1e740d6beba20d2d408b2f25cb286f0beaaebbaee7e391ad2f817f8307495e7f +EBUILD texlive-core-2008-r7.ebuild 11569 RMD160 e7e2a5e88c83eed4a8b64bc1d3e1cde677c4f366 SHA1 db4e90987a32665c9539c27167733a6fd4a60d46 SHA256 3f0aa69653fff684d870e5d3b42bc83876372e90980d2433ce898abe56c837d0 +EBUILD texlive-core-2009-r1.ebuild 10910 RMD160 681b12f3fdc1539e62cb4a18f22e32b9b1f1cdde SHA1 5f4d493b46deed1e7cd0d9ffd18f21c89b0caca3 SHA256 96fa4a17d884d56a9d6f6e47f7df62c1db36f998f4465d0123c2f8f089bded31 EBUILD texlive-core-2009.ebuild 10883 RMD160 64eff462137d5547f1b7b325fea83753fc12bac3 SHA1 d845c739f85e1722f483795e4f15c4bd8c64509b SHA256 17e88fa93215d6086c145f2f37eedc7ebbd9f0d9b29400b41717f79a2377feaa MISC ChangeLog 20296 RMD160 bacf8ea50de446f3a46e3446c69e38fac130f72f SHA1 b7801e452103d8b091538a684c894cba51ff3e6c SHA256 f927ca3f3e1ade979b7f9edd4575f68adb383821edafe632ca60d2e738d4a88c 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 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" |