summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-11-30 22:38:01 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-11-30 22:38:01 +0000
commitb1d5c56f0276cf987ea73a490fe8b1d0ea460842 (patch)
tree0802f567036b7bd5312996015190cf9c3ef7bd97 /app-office
parentVersion bump. (diff)
downloadhistorical-b1d5c56f0276cf987ea73a490fe8b1d0ea460842.tar.gz
historical-b1d5c56f0276cf987ea73a490fe8b1d0ea460842.tar.bz2
historical-b1d5c56f0276cf987ea73a490fe8b1d0ea460842.zip
Always force librsvg system to be on. Otherwise we get nasty crashers.
Package-Manager: portage-2.2.0_alpha143/cvs/Linux x86_64 RepoMan-Options: --force Manifest-Sign-Key: 0x8EEE3BE8
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice/ChangeLog5
-rw-r--r--app-office/libreoffice/Manifest30
-rw-r--r--app-office/libreoffice/libreoffice-3.6.9999.ebuild8
3 files changed, 23 insertions, 20 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index a920c5f71a31..f2c18b197602 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.409 2012/11/30 21:33:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.410 2012/11/30 22:37:57 scarabeus Exp $
+
+ 30 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.9999.ebuild:
+ Always force librsvg system to be on. Otherwise we get nasty crashers.
30 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org>
files/generate_libreoffice_package.sh:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index c78e11cbdd15..d497032742cf 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -31,24 +31,24 @@ DIST libreoffice-help-3.5.7.2.tar.xz 1905872 SHA256 b8a645053eaf05195beaa9118f4a
DIST libreoffice-help-3.6.3.2.tar.xz 1864084 SHA256 954edba6f6109037a001af97ecd3d755a17fb3d68e5cba688313bbbdf8a500d2 SHA512 d9747a34d36fc5eb806c9cd294fef927b802185301f7f1a98b50ebae8411d3f9b2abe4b8d16514e14d3e8fe748e53a111c783120944161d24ca662da0b05de51 WHIRLPOOL 14ed04624657a095b8cbaa2cd07fa9f96faac1a3d2af45081b12beeb66948efa3868f9729095b57c3a55cc19cdc4bb4dc492df4e57dacacd70fc41d9230bda91
EBUILD libreoffice-3.5.7.2.ebuild 15682 SHA256 d86d6b532a7d1c8b66a7671e4db14d0f5bf25d61f2d0fa3fc01d9eb701d99c9d SHA512 b8388601186c29d43b26222a8f0a8f77c3f0ac468c068f284f7498a26d42685eabc61b22047bc94c5509fd796f1b95d3ee9d6a5e88370932ec1d9c37327a23b5 WHIRLPOOL 4a1bd0e270e83d3282ab768ee19c8a07ff79566bf9d3d0010dd6aca55ed5479aca48f4c577e6d90ba47af7bea4b40e2ae0c33f8e8ef4f9388c56ca5c1bb7887a
EBUILD libreoffice-3.6.3.2.ebuild 17750 SHA256 65361f853058c7d10c737afc8fe5152e7c11a3ddaf4d7294cd812cef35a0a306 SHA512 1b268a23ddc28369123a3bd3408c703c105354244ed98b3e6336f37c0de55b32f7b26dab92c1dcec4faa12e9464e762870155a1ad7a506d17451099b3ad4cd4a WHIRLPOOL d6dcc0d184862c1cbcfcb120cfd30681c43a6a987c8c06a92daa522074460a059bc43c6b09bf07229fdd3c6a2113e5cab998680b0de852dbb0b2ee54349bdace
-EBUILD libreoffice-3.6.9999.ebuild 17496 SHA256 30b985a9e985a9763efe851648a336151178eb0483a02d74f6647020b7cf0761 SHA512 7269e9736fd31116f51569642f13e318c9b802ff53d493cc9f98d82422e3e21d6dd8bf40760f52f55a43c4f6e0fb6e3d4ee2945cf7fc0534967e267351eeb3d0 WHIRLPOOL e5abd0eeb5846ef8dffa3468a48a993e4322019ac787ced1cb9773c043f05672f43f5ab3f045f56f73bba994b7541985855b47ceb167cc07f3ca2a1a76e13015
+EBUILD libreoffice-3.6.9999.ebuild 17474 SHA256 f9ef876bcfd4f1bb99995fcae1a9882a5ac34e73df2c8e343f23d544b0acb5ab SHA512 9322420f0922f973967462dfe51d539de7b10277a17802b619ebe32bf36719849e52a68fcafd3234194fc9c5effedf92d577f092783a97995980d3c4052f7037 WHIRLPOOL e9b61fa503b354c1b5d764ab0f69ab676c46c34defa80fa585d85b7d04a5088fba9119c0693c5a543a31bc820d8c854a4d18aaa69bc2af7f18c078237b943046
EBUILD libreoffice-9999-r2.ebuild 17538 SHA256 bfc5a75b1c53beb79baad5d1ba6e9881957614cb79eab8f92af87c4d734fc88e SHA512 8130493e7a0f3b56306ec6d94e5d89c975300c40f3ad6824fff76c444ed782c1f95b03f2c63e521990ff66530d81dd0f87739d93ab0699bf9f5dd4d6ef00581b WHIRLPOOL 70bd14532bdddbf2c9dce1b1d3c5074e1bbb892a18deae0472053189406c96c16ef48e54a528eba0c1a5c09c551cec8dd60f966946cc5c422da9fac3fed06002
-MISC ChangeLog 74045 SHA256 900fb206c7847b5ebb6c07512f2b08eeb288fb735dbc0ef24a5bba2112d35a4e SHA512 c8a03b0ac9b95802609ab90678837d3e7292e2beb31b42ae25b95955a5218f87670cfef6f17ee80e76d974f3d2c7a73ac187439fe0003c99089f92833de7ca5e WHIRLPOOL 05c88c7797400ebe3fb1c35b6d630dd6ff7cc6b3128dbaf2c9852710095af28bb353e4244ea3dc8d5bd671b544cb8c7b68f62370078a71312130725f1430f7e0
+MISC ChangeLog 74203 SHA256 f628459af0585a9abab5c7e3b7f6868d0842b94c6dcc882167981fbe1019a160 SHA512 b85b91e46e02c1f756d21b523240c3b6e4dc31c45027bcc5eff570710922eac5d96c668e9b051adee7fc5931a9adc695e39ecd46492e2f494acc1fe0e7ef299e WHIRLPOOL 4a5416d45e9e4bc92deef80238a3b81d875e0803985c9d7d80cafd68cdfa7089f742aeb127c01e3f414936ec448c40d72f475ce93b04b933c9b3a24306783b02
MISC metadata.xml 1645 SHA256 24887289646f2058654a7701555baf8afabcffa2223f5bece682d537a43fdcda SHA512 dbf85074a9bc3b984a6f8188dee88a19123d0b6fed5131a70592f31769c317b8eb5ea1095fb72a406dad9fe5214ac51e33203c162a6891a63b9cbedb0d1affc0 WHIRLPOOL 7cbfb1f8644f8cf36efc4ddd8bdb0f757483c7fce7da0e2d61922d0a5e9ab4dd968c5120064ec3307fd547544cdb9501a4bedabf905f7a7d201f972534b41172
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJQuSY6AAoJEOSiRoyO7jvoHUsP/0mD4tET6R0qnZZh1SZATxNm
-SGCvD96R2LwAoxiL96bjD2GwNYoqH6Xe1U90qMv2F+LLUh+3fFCJN7GmC5P2h8Ib
-WIgWP996+U5bFMjXx7Xo6WAMEW2CoU+QFXEFmWeEuLFYsVVdafcT4AewfQETeC91
-c+MQuXg4xoajTLTSvAqeir0Sdo09YQDxcI6Ngmmwran7759rpo1H3V1iih/qhqJL
-SSGqvpmNX6BW7RBz4r2qP+2k8Rl994imXSUIruENeSy0M2ZDH9kTS6xvQyiQ+zQE
-ha8xcoyV5gIkSFmWWgFuXQ9CK/AR+oj3WG1q3W9xSEVh381XM98is66Bj9rtxsN/
-sc6uZVsYhkBcGI1nVwCAZBxfS4tBaPDkYtnrhFD7+M7mBdOZBBpDAFfQo2S48CiY
-CBK/gGtEu9FaaJh24mkWdWCWkvSH2TzgMPSB5k5xwe79I7rEl2/XRxqu+olxck0k
-n/kQDEqrtQlCV7DeX/LPNQWR7bWG0JKw4CzpvYAOsVVAWrpwgfzX98XMJpCzjoR4
-IEhwRUYiSjUhV+T+UkgAlGKSK5uiXc82qJJOiw/zcepwXf0l3iuuqlzxwIcW9JvQ
-KmmCr4zvLUgTw/LrVltscbq3kXf6YM0emA1B2JD3Po4hZ/v4u483CbFr65eCjqj1
-s6nCYBaVRrGwxa5+48dp
-=y3gX
+iQIcBAEBCAAGBQJQuTVHAAoJEOSiRoyO7jvomTAQAIq5G9C6UFFCMNrmZwvjUBxX
+qmSAJQXUEajsMkGScqFTzDtw0kvDySz4+8aq+4peD+F6cbo0nNyOwWPRMlhzTqwz
+5zf/thXhBAhGULOAmVx2OyTFTL9JhBqHJ63SOCnqYBAOKPrNZ+9pMu7RWhkZLB4u
+Xd/SN/JykzPnHp1CxAqKlW6hiwBkahl4yDtNN0l8wd7iju/IUBsspCkxD5Zc1yLS
+hC+2HMBLstivn0bLxuMsCt/lgdW5M+hB175MiYaNx+kVvRebuY/jF1j/Bco3DGLI
+gw9MebISMEBrN5uJ9qQDNFnzi54AK9EbJ98IPCfB31kM5iO8+1toAg3kVJOmssTY
+hnK/91S6UhTE8lCAzOOJ1lGr3eFpmOeIBy1JinwDkqD+KHUCh2eLCXEbMPokRWnk
+sPMjHcqXCbvxv+EHRg8ivjgfXPigfw4wPqvVu60Dq1+bpsVXMZl96K2YPKmPdiJ4
+0P02SR925t/dDKwhgsi/vqGvn0VB0wy2puO6kubcwppL6j+JiCFk8T2xfnzgFgNj
+ji1hVRr2hG8/wXSsV186f3oe2aNV6PgD4OVZdJlvr7r3oreWZw2IDDvNiNhvx22Q
+s3PNtOZM+Ji5Z5MlJFYrfAYWr61D+0KzTgHCJbohXhdrkFRy6K83s4s4GoRQTW/f
+/mfQq19vTVqC2e7OZtEX
+=8KP2
-----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.6.9999.ebuild b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
index b898817d5706..2b371d118305 100644
--- a/app-office/libreoffice/libreoffice-3.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.34 2012/11/24 13:47:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.35 2012/11/30 22:37:57 scarabeus Exp $
EAPI=4
@@ -73,7 +73,7 @@ unset EXT_URI
unset ADDONS_SRC
IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome gstreamer +gtk
-jemalloc kde mysql odk opengl postgres svg test +vba +webdav"
+jemalloc kde mysql odk opengl postgres test +vba +webdav"
LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
# Unpackaged separate extensions:
@@ -113,6 +113,7 @@ COMMON_DEPEND="
>=dev-lang/perl-5.0
>=dev-libs/openssl-1.0.0d
>=dev-libs/redland-1.0.14[ssl]
+ gnome-base/librsvg
media-gfx/graphite2
>=media-libs/fontconfig-2.8.0
media-libs/freetype:2
@@ -157,7 +158,6 @@ COMMON_DEPEND="
virtual/opengl
)
postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
- svg? ( gnome-base/librsvg )
webdav? ( net-libs/neon )
"
@@ -441,6 +441,7 @@ src_configure() {
--enable-largefile \
--enable-mergelibs \
--enable-python=system \
+ --enable-librsvg=system \
--enable-randr \
--enable-randr-link \
--enable-release-build \
@@ -499,7 +500,6 @@ src_configure() {
$(use_enable odk) \
$(use_enable opengl) \
$(use_enable postgres postgresql-sdbc) \
- $(use_enable svg librsvg system) \
$(use_enable test linkoo) \
$(use_enable vba) \
$(use_enable webdav neon) \