Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-09-04 09:24:02 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-09-04 09:24:02 +0000
commit117186f7250d4f58cfbd17257b0d696305b871da (patch)
treeff856c45ea9a4645950aa51461220b101b46eff0
parentBackport patches to fix esissues with non-existant /dev/root. Fixes bug #381491. (diff)
downloadhistorical-117186f7250d4f58cfbd17257b0d696305b871da.tar.gz
historical-117186f7250d4f58cfbd17257b0d696305b871da.tar.bz2
historical-117186f7250d4f58cfbd17257b0d696305b871da.zip
Ensure that helppack is not integrated.
Package-Manager: portage-2.2.0_alpha53/cvs/Linux x86_64
Diffstat
-rw-r--r--app-office/libreoffice/ChangeLog7
-rw-r--r--app-office/libreoffice/Manifest34
-rw-r--r--app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild3
-rw-r--r--app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild3
-rw-r--r--app-office/libreoffice/libreoffice-9999-r1.ebuild3
5 files changed, 29 insertions, 21 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 6dcc4c381950..100d26f5f113 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.122 2011/09/03 21:01:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.123 2011/09/04 09:24:02 scarabeus Exp $
+
+ 04 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.9999-r1.ebuild,
+ libreoffice-9999-r1.ebuild:
+ Ensure that helppack is not integrated.
*libreoffice-9999-r1 (03 Sep 2011)
*libreoffice-3.4.9999-r1 (03 Sep 2011)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 965ed072dd80..ffb93249c230 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -169,25 +169,25 @@ DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6a
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c009f77 SHA1 572dee87269784bd1864e96e1eca820bfee2d513 SHA256 5452357751a154c65c126e4b3bdea17fd1c2d221734d5859d39808cae91d3599
EBUILD libreoffice-3.3.4.ebuild 18141 RMD160 50ac48e5cc3206f2cfc35c69a098fba8e38da4b7 SHA1 a2bb549a0c6c66c477db08bae202d581ecfea5b4 SHA256 1233871084a7fb29500478bc3891f23c398d30811c06224c3da4344f3c4fd280
-EBUILD libreoffice-3.4.3.2-r1.ebuild 18541 RMD160 23d46e3340eee591dc4e2048b5155518ebc04b3a SHA1 18faaeb261112f655f2a8457af9698c223719879 SHA256 ac8cf1a4b33c5b030861f629b2dc31137b7ece7a2aaf1a2490ca21973fa65164
-EBUILD libreoffice-3.4.9999-r1.ebuild 18545 RMD160 5452ac0ffb4cbe0989c5b13a5844d07f694224ff SHA1 5179b662cfac7fb99ebcbe98c1e50052d3b9968f SHA256 8b2a4b410639405fc9255d987d404e121d750a70cf8c7da6558e76f4efacb172
-EBUILD libreoffice-9999-r1.ebuild 17872 RMD160 382c864585bf56ec666fe6f79d8c8ada013bb554 SHA1 93306b41cd779c1a9424bedd6b6bc11aa5f0489b SHA256 ff72ddb1a5fe18eee4d6ec6ee650f1327e56343ba2b778d500c7de584cbb1656
-MISC ChangeLog 24096 RMD160 13a0171aa7f8177470f8e207aa5c7414792d1678 SHA1 3eae0125d0d539ee4d943ac53ba0d53ed70f0f34 SHA256 2ae2086f07851e0935a0aa534b60d7f2ce9d6aac861084ab206619d8c573a767
+EBUILD libreoffice-3.4.3.2-r1.ebuild 18576 RMD160 c156c44f4af61587a2dc75288e5af38247a61cda SHA1 f26e95bd92c1e5acda5a65047789a81babd7e747 SHA256 c579569dcd4211af308f2b1898ca80b9577d34d085ddf1663d2e19fc0a2faee1
+EBUILD libreoffice-3.4.9999-r1.ebuild 18580 RMD160 eef9e40a572102ab0bc616e61e1937fa654604ef SHA1 5db5d1b948f0d8a584aa9950070cfbde7925b8b3 SHA256 dbd13dc7d55ecd9b9f07096b63673962beb8b5564f2bfe545417e2456896f7a0
+EBUILD libreoffice-9999-r1.ebuild 17907 RMD160 60546265036d2a494fa6e9e7de7f3c67ca9d2a00 SHA1 d7f2efc74675957d4adf56eea85f5e41e9bb612e SHA256 2d476e0c83c574958f610c786f1d32de1743faa010cdbe14dc96f2a914b22160
+MISC ChangeLog 24289 RMD160 02e7d335a27de33e4e568e1fe8776f9b1bec5f15 SHA1 15531da521c4e18c2d5265fe024fbd9cad69ea27 SHA256 01bf082d5e7b9776d8a1405cbc518bcba072a175f6599c01683b6539675c227d
MISC metadata.xml 980 RMD160 5201a4943c69632cf94cfaf309fba261ea5146ec SHA1 069a007c495275783c7a025f44e4f1ab59edb715 SHA256 191a40132b182e7dc3f504055341014664f42d74caa27ee8dda2b5edbbdac6c2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBAgAGBQJOYpWsAAoJEOSiRoyO7jvoE/4QAJ9EHRhCkfhz4pq7ZGo2k1CD
-vnx6TnGweDu5JrIOw9z0W1QDIJxkM9Wjw3obZfFpE1F6Rmi2Q3N31ZOKEt/t8S5p
-YNTCIUVWsTczAtUOGo9CH0iztja6AdCpZPibJkevQaG05hAHKyZg7jq+MPdUNhlm
-RWiuHGvmFGuC5KiIrdDx/1US3csVg9zjdqqrBCxSZ1OUz9ZzRAYYBoW9W7tFxf30
-WZcn8bJ3k8NaOinLl5yNBhjFZsO5s5GotHWRWyUH4N8IJjvEIXqU2ACS/QQVTbDb
-WG9s4RDPYsjoKKR+3osN/CDm8H+IYAU9zXdR2e6a2gcTHicd3x9KvsNVNKyS1zM6
-3rshVb1ZkLbbyatLWOLdFLVF6DjkG5V2isutOpxCqWnj+Rx133Y/5vkt6VGOsF0B
-QakrjR2USlwxDodWpiHe7GjQ5NXY/MySk5yVCG2yj0wV9vxcydQfmlVhDSLHr9cV
-etWgb8XN1XaVkpVV32X9B0vBkDQ1rr5ZP7U0/Tx2RB/B6DjrZrfJCZpxCDa31SXQ
-A67iumbNCR0BKWpjiDP1OiiCie2P5rmMJhVVg8zesd5DLzT5e7Ezh2nqHuOm219C
-N3y0sK4C+8etub4j29JYJYKlQ9Zvk40oZODFWJcJq8GvTBbgjzfFJaXL7GJUdlt/
-eEZ50gB4f4l5HTzm4yP1
-=obzA
+iQIcBAEBAgAGBQJOY0O3AAoJEOSiRoyO7jvodHIP+QFqf50zlxCjkgeMvQOSj5F3
+XyA/+Wwn8eiFFuk++hJPj20KPxMULHNfGeP32vHdmK00iQJAdwI82V7hBp2PmmSG
+5XREtK5JLlsrXxkmmGjTKdH/1emzia1cn3UxZ9zhAif7JLN1/agbSadrBE9Mo+KW
+6HYAwtJXjC3HeW94d3TD/epDEuheji2c1tsuNN4e5HSxx0wXY9ZBboHil8eGjWNp
+o0RKCGnCnfZLCWS5SZkn70x5y0LV+3MpTdOA3fc1WmXrqIomVPJIFjO4dlcJJLCX
+HReSDN4EMOf1ZLG988fol25z8CpJRoB+v0vsvlMknKuHquGu/fxl+0jElkKhUK3k
+TcLNmzoGBHV6JWImCtzrVNZtHW5fUs4bFAyVu4Shdfp1ha3oE+qMPGoyNfu4eQG2
+UbD2w8Fgr51X2jEOStOgm4puOPDmQ5H+h7EoGFnN7QfiVJhZ74QyhxMzWJCg7QWU
+k0Y9loh6BUEQCVKZqmcB80V45gK4wqqGt7jXohskWmUFMzhurpMmoV1X9jfvAG5h
+GqJy/4vLR4t8hBisaiQyLwO2DGQ/x0xW1EkVDI/KoHpn6kyBA0ckquMxgPN/JOdQ
+Rat14jUOQkdcWPdbrLZ2o2AEhW56UuhmDCe3ag1o5pwBkjh/fyj4Wzc6EphcCkXL
+NZVopyVcFSUeYO5vgbuw
+=Syta
-----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
index 591201adebdc..e495b1dc8c8b 100644
--- a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.1 2011/09/03 21:01:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.2 2011/09/04 09:24:02 scarabeus Exp $
EAPI=3
@@ -489,6 +489,7 @@ src_configure() {
--without-myspell-dicts \
--without-ppds \
--without-stlport \
+ --without-helppack-integration \
$(use_enable binfilter) \
$(use_enable cups) \
$(use_enable dbus) \
diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
index 66a595c7b5ae..41b732ea35c9 100644
--- a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.1 2011/09/03 21:01:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.2 2011/09/04 09:24:02 scarabeus Exp $
EAPI=3
@@ -489,6 +489,7 @@ src_configure() {
--without-myspell-dicts \
--without-ppds \
--without-stlport \
+ --without-helppack-integration \
$(use_enable binfilter) \
$(use_enable cups) \
$(use_enable dbus) \
diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index 286ba79536f9..07e51915ad02 100644
--- a/app-office/libreoffice/libreoffice-9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.1 2011/09/03 21:01:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.2 2011/09/04 09:24:02 scarabeus Exp $
EAPI=3
@@ -481,6 +481,7 @@ src_configure() {
--without-myspell-dicts \
--without-ppds \
--without-stlport \
+ --without-helppack-integration \
$(use_enable binfilter) \
$(use_enable dbus) \
$(use_enable debug crashdump) \