summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-04-11 09:25:05 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-04-11 09:25:05 +0000
commit66cb2006be2bb013850be9c87086cd9a0cdc6f8b (patch)
treee6a5b5935ef8f8db0b7163305506de11de683896 /app-office
parentPin automake to 1.11 slot (bug #465392). Permission kindly granted by patrick... (diff)
downloadhistorical-66cb2006be2bb013850be9c87086cd9a0cdc6f8b.tar.gz
historical-66cb2006be2bb013850be9c87086cd9a0cdc6f8b.tar.bz2
historical-66cb2006be2bb013850be9c87086cd9a0cdc6f8b.zip
Fix libpng dependency to pull in libpng15.so.15 wrt #465484 by Martin von Gagern
Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64 Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice-bin/ChangeLog7
-rw-r--r--app-office/libreoffice-bin/Manifest26
-rw-r--r--app-office/libreoffice-bin/libreoffice-bin-3.6.4.3.ebuild4
3 files changed, 17 insertions, 20 deletions
diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog
index 86ba553e8927..6d54cc2bb0f3 100644
--- a/app-office/libreoffice-bin/ChangeLog
+++ b/app-office/libreoffice-bin/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-office/libreoffice-bin
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.103 2013/04/01 17:54:08 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.104 2013/04/11 09:24:54 ssuominen Exp $
+
+ 11 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
+ libreoffice-bin-3.6.4.3.ebuild:
+ Fix libpng dependency to pull in libpng15.so.15 wrt #465484 by Martin von
+ Gagern
01 Apr 2013; Andreas K. Huettel <dilfridge@gentoo.org>
libreoffice-bin-3.6.4.3.ebuild:
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index ce87b307a8ef..681e7ac7cc0c 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -14,25 +14,17 @@ DIST x86-bin-libreoffice-gnome-3.6.4.3.tar.xz 66472228 SHA256 b5633699b47822b840
DIST x86-bin-libreoffice-gnome-java-3.6.4.3.tar.xz 71313908 SHA256 393ba76e859fc280cd42b9badd03e1501319687737c897a3c98a71b740aed058 SHA512 f1eba32f098af437f85ab7f568985c98bef63bfbde109b16839ee7bcb4e2161937e5593d4269bb25208fd2da6a8a171165a9e320bccfa83d37cb3d90e6e291e7 WHIRLPOOL e1c9f133d673c1d515074e4d1e17d973cf536431c489f7ec5304b777a3cb6fc21cfee9550ddd0b26a79d69b110c203e10e6a06060e04e4300ac7c8bb5101fd39
DIST x86-bin-libreoffice-kde-3.6.4.3.tar.xz 66404920 SHA256 9db9a4232ca68975de4cd81ea6565ce1bc9723ac7a142a2cce5a0b72ee6606bd SHA512 f562373bdeeebe285b211057c08dac69b94b5e75d66d25eb8722d0b572ebc0c75bb5797538ed430ac5f2e5445a81293110564c5d953fb7436e40be6e699a33f1 WHIRLPOOL 57a91d9b5a3eab70a210f047830530c8f3f124670306613bedca401903df62cdd55637995f64e275199d747f3b4998b841458577e0f9b90e52084be90c80b491
DIST x86-bin-libreoffice-kde-java-3.6.4.3.tar.xz 71236384 SHA256 efd08205151102d533fb1b0f21e96716d84295192ed55e5edc51fee5c798b401 SHA512 e4cfc9edc2602cdab9d625dd08a0e722c2b88373c419443493325727662e42f125792c4bc3ac9dd5e3bb9380cac075df12bfa437aea9484fa8b7baab57b3832f WHIRLPOOL 4b91cf07824981dd64b9a2975c85e8e0f916a978cca5ddd88cc6b085c846cec1c35473b6038ac5c9a35eb4b63cb54f7f7648a36594c1bd8b6445a01869e41244
-EBUILD libreoffice-bin-3.6.4.3.ebuild 4580 SHA256 8a8fdb407c0a126883c2741e6a570fb418268bdb1fd830beaf74036b7e0c06a5 SHA512 f80df6e53823eb41ff073278fe3e6d265251f1c359497b97401e5508b7cfdc355055522a841bea7bba42ff97efd53cb104f69752f575876ec3bcb21c1ae6e843 WHIRLPOOL 0dc9a3a75d0ebfafd490fa80286077979a29fd63a3f3cd0362d363d016edada4053de01d68adfdc64720aea5879e076d8f2d0c15c74dcd19141716f62043ed93
-MISC ChangeLog 15832 SHA256 0942c9ccb0dffd47b9315c92d06ced8fa78d934f1a68fcfc6f8e9cc76bd810a2 SHA512 5e783a5719d66e60c4badd7e65c1a7036cdc2c044e64f4b7abc02351312ff34e9b361219742325104e1e9fdc74ac2fad708072b0e86c51dc101badefe66c35ba WHIRLPOOL c6e514c9fa246ea921cf0843daf00f5650a6b4a937b7a2b1ba97518f924f954bc6e29d6dafa8aef9e5a30fae016fddcf2939dd62732eb870fce703027271ab06
+EBUILD libreoffice-bin-3.6.4.3.ebuild 4580 SHA256 64af21fa473f91b833a722747a73df75e0a143fd788438e098f7b6e93824d0d9 SHA512 06992a99efb61aae45bbe13f1b9d0bc10107e548091bb87ce424b48825aa0d3e59c057692b09d155a45ea6ca643e9b8c74b1ed499660122e1b2e3c9d2f6f5830 WHIRLPOOL a35a4080ef85ca11e68655f32ff7aff8980c62395f799c66c6c9d7a94afe71ced0a8daf7664605e8aefaf7a9d8235bfa0ad703f118416f6ca842c02570819dc9
+MISC ChangeLog 16006 SHA256 b44bfc94206f70f12ecd1b1d4a90d3fa9627238181cd5ba4d555ae4446d4c79f SHA512 e14d94b4d81b916c3a645e5fb457a479b543b9d5a0627e4daa463fd347f9858aa7887e242c51796ad3902063b70897a48fee97beb25caec5d242a6f273cff4ef WHIRLPOOL 6839400e9fc9207c1d4cb80423597537287aa84969fdf8190ee16b7f21cf8b7a3e0393d807f4229824ff46b91bd3f1c2c50cc7b3f9be47d5bfcd5f7d188a2116
MISC metadata.xml 409 SHA256 92a42f3ef25ede1bee68ec939cd4e0d88bbada54d90dab225f06bfc02b8bd498 SHA512 5a383da805155e80920620854f04e1bb9fcfe0764d0258ec95267c3229dae50cdb5f2cd83fbdc4cb7a856e079c696bb6f73d9aefec2fabef9317e391fd5db9ab WHIRLPOOL 158b0614005477cb448240a8f36e35fc8768c9ba0b83e71b1502dd1725fabafd4031d7c40a33030c683a14a38dad318f47db90712aab6d7ed4150fd26000193b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQJ8BAEBCABmBQJRWcn+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcmFEP/2S20k8U4uEAKv+2oCUHLVgI
-NT+UqHLyA5XtNQOSt7o7xBjlg18wRa0Zi9hblUThbh43NF15aQrHYvHn3Z7jSPmf
-ozebS5w/aP09ay5LW+xgPcXV8+DU3U7CsjNnZnBkHxiVuJ0/roIBfQU1tcjU4fJN
-dRAz8LabrxnSzIMVixsri3cDCxZeD+cmlkI8UHtBWYy7KiEN6qn/A3VmNke38cYM
-5hUsXVn505JYa+v4ZhFL6wMmNW5mNCnGY61G9zADMPPO/gkrxKQ7x7BQtEoAouov
-A63tduk7YOG44e8AFhojNLDWlW/Pv20H8wmTuqNXWrqRy6DoBlMfkjbq+aHzwSDt
-ZbLQzCq4PMzIIN7XoUgalZpztY3f8id7aN5wjeNwWpESLC0nmUqPz5RxeDQE4004
-qn3e8lt1OG4MSiFcPh6W4q6J/akU24kB7hFwNuV6tbfr5lFLzCieiCBdfQZJy/Du
-PiVnx2Amf4dJzKCod4XARG79Vk3K8f25o/SGZq629QGp4Woyx5ltzU+al7i8jG2Q
-fkWgTCRL6eUYUAjhiQXWbrs91qmXPVkiPJF5MWdmjGCP68ryvWYXDsZzIcJzNVnI
-8gGAvAZDd8h4YZl1kNoFB6m/6s6TkYSHkEB955HTIJ/wg6pLxdGNJIj1X8aa0s37
-lC7wnKAKquQpNbgyfE3+
-=0/TP
+iQEcBAEBCAAGBQJRZoFdAAoJEEdUh39IaPFNY+EH/ikFLBIvfbAX/8SkFr3kDleg
+dVKkkDfqp191t+QxMn73gpxNVfdd03lY/s2QF6qIIvOtCHr5K7IG7Rz6AHVokvnY
+Ho0+VxP0mDMQ4iFCz+57wPGd17XJnrwB74+OKUfxXxSM4081S01KnE2nSYz/fd7V
+LJchAhNBZk/pMuX5+rlFsL6z/CBELXzFZHgkuPHdbtAAZsXGhmoelH8Hfqh0kHuw
+mLSj+Eht5xG5/NJI03rM3opxov3Rp/p1Dqbyde2UFB1MuZuh0c/oEXsgwqHBe/ss
+Eg7CmD095/NEpmw+kb8uZ9NLPHHkw8kb9TeJqf806LyLRpy87BvNCpCYpMTQvow=
+=+okx
-----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.6.4.3.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.6.4.3.ebuild
index eb1a9c8da3d3..329be78318ff 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-3.6.4.3.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.6.4.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.6.4.3.ebuild,v 1.5 2013/04/01 17:54:08 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.6.4.3.ebuild,v 1.6 2013/04/11 09:24:54 ssuominen Exp $
EAPI=5
@@ -89,7 +89,7 @@ COMMON_DEPEND="
>=media-libs/fontconfig-2.8.0
media-libs/freetype:2
media-libs/lcms:2
- >=media-libs/libpng-1.4
+ =media-libs/libpng-1.5*
>=media-libs/libcdr-0.0.5
media-libs/libvisio
>=net-misc/curl-7.21.4