Add beta2, punt beta1 (most build fixes will be in beta3 so the same compile failures are present here).

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

4 files changed, 35 insertions, 14 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index cc7528d9b9c2..f3183141683e 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,14 @@
 # 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.221 2011/12/18 20:52:15 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.222 2011/12/22 10:52:53 scarabeus Exp $
+
+*libreoffice-3.4.99.2 (22 Dec 2011)
+
+  22 Dec 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libreoffice-3.4.99.1-r1.ebuild, +libreoffice-3.4.99.2.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Add beta2, punt beta1 (most build fixes will be in beta3 so the same compile
+  failures are present here).
 
   18 Dec 2011; Mark Loeser <halcy0n@gentoo.org> libreoffice-3.4.3.2-r1.ebuild:
   Stable for ppc; bug #387187
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 6ddce7b4e193..4cda4e701ca8 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -117,7 +117,7 @@ DIST libreoffice-artwork-3.4.4.2.tar.bz2 13539032 RMD160 e16be6bca3824198cbc6636
 DIST libreoffice-base-3.3.4.1.tar.bz2 2083238 RMD160 a0ea708e67d47d010c7e390b373c78d93eda6e9f SHA1 d5b0d91a6a9fe17930b587c5e42309f52d09095f SHA256 029c2cde055ff2b8e3432f292c565dba6fd1e023cdd39fc9478635cedf006d1e
 DIST libreoffice-base-3.4.3.2.tar.bz2 2068714 RMD160 c689762bd2a5a6bc46efe701c85b798bd01ef248 SHA1 88f1531b11ac49f8bd9c0e70e08b38a7b0aae411 SHA256 93fc103b376a2575efe8b35d64861236e63025b9d3415cee35d845ada7589dfa
 DIST libreoffice-base-3.4.4.2.tar.bz2 2069793 RMD160 83ea70980d99e1d706bd2f37ad6cccfd9f5e2453 SHA1 00d6f941b379925814266ffa1d4b015ccf1d8292 SHA256 92dab1cb9efe2c023a3f9648e0a5eb52c00bb75376a5341c10fc52a4184cdc2c
-DIST libreoffice-binfilter-3.4.99.1.tar.xz 5972748 RMD160 bce02ed49768418c1578cd48de20dbdfc43ce381 SHA1 cd5a05b3b5a28fd87b1d21f956939b9da776f433 SHA256 19a00b79f8f31906d369efd90bb066641ea09e0d8c069fbd013a1e722a15593d
+DIST libreoffice-binfilter-3.4.99.2.tar.xz 5972252 RMD160 ff448ac534967611eb865f7ebda3cfe0a637d9b9 SHA1 97048edacaeeea4aabdb0070b33b1365ef5e8a21 SHA256 9a6f0313b0f978d878d2ed1707d11df685d4d37681a3a8ef49fb9dfc79eecfcf
 DIST libreoffice-bootstrap-3.3.4.1.tar.bz2 2753537 RMD160 6348b4b121159aa74a1b4e9c03f34cc5533a3d72 SHA1 4c7b5b105c29eb5e9dafc8ee59b4f306187f664d SHA256 a83cc7be2211c1dd03f49e1e9c54895852e732e291022c8022470cd057b9b2c6
 DIST libreoffice-bootstrap-3.4.3.2.tar.bz2 2711992 RMD160 5ded24c90e34306a0ae0d5d97578638098879351 SHA1 527db77912dd3c5f41916ad0db8405325f37c621 SHA256 18f253da00974958059dc91ddb17d5ce5c6c41ec48b98f43451609fb2b1faa45
 DIST libreoffice-bootstrap-3.4.4.2.tar.bz2 2715038 RMD160 78955bd82577d2b1a5342b7f30d0541a9d22b4c8 SHA1 3062bb92ae60db0ea333805b3592b2da45329680 SHA256 7e4477795b535656b1f8853a439e74d91a035ff8958d307cbb42c38f209fb548
@@ -129,7 +129,7 @@ DIST libreoffice-calc-3.4.4.2.tar.bz2 9513923 RMD160 697ed0b1020eb2c63603bf19d56
 DIST libreoffice-components-3.3.4.1.tar.bz2 5124325 RMD160 bbd98b77d4b9db5d948526d65f54e3479a9b33a3 SHA1 9ca1d2ad9211cf7df0834f764af28c8e88060f0f SHA256 bb9651370ee239a6fe0f4b52d5b6d3b84aafad64dcf1ccfcb655efb782599fb6
 DIST libreoffice-components-3.4.3.2.tar.bz2 5094591 RMD160 ab3a2cd16340931a124e3d0e783c938a5357f5f9 SHA1 492a0b25128a34c4d75df5ef7b3b5e997c24cf31 SHA256 572fdbff98c1083e5066b15cbc34453cedf7f6ac5a740c07639ef2e65fd61aa7
 DIST libreoffice-components-3.4.4.2.tar.bz2 5095697 RMD160 00b8b3ef13d1c81d60368a7d428a53cb635b4e44 SHA1 36db0c37bb32a52ecc727abbc348b719fe40cdf7 SHA256 d06141b0e078b609406b82db64599618bb7b93efa7841034f4a6cf441a0b442b
-DIST libreoffice-core-3.4.99.1.tar.xz 126857440 RMD160 4981a19752f905c7a8555dd7ca8b30a29180c7b1 SHA1 95c3f16f86652b8f17887c8565f58ac488356f90 SHA256 ca24ea540a4142425289c75dcc830c48dc636d43a314834db2cd4ed7e5ef9fe9
+DIST libreoffice-core-3.4.99.2.tar.xz 102349740 RMD160 34141db87c7ab57c739ad655b72b1a01b6596953 SHA1 27bad1a24c2010475ad7fee0df4790e815439eaf SHA256 e962c3c12fbb12647d65c2b128f1a1c798cf87add6e60e4f30fb399ae0b6e47a
 DIST libreoffice-extensions-3.3.4.1.tar.bz2 4202033 RMD160 1db3d06fcfd6354345e394ddf78f2cae6e0e5573 SHA1 8fbac20fa87e348ad07dc245f48f09ee539d7d80 SHA256 65c4540bd958a5f4dbf5875659d83e40a3d5542aa0cfde7f0f03e5000d16f241
 DIST libreoffice-extensions-3.4.3.2.tar.bz2 4216448 RMD160 07932f5fa49cf32a0efda440cdb074c6ade97f35 SHA1 ca3257362b8b861e7358afe11bc0831739c83f41 SHA256 91ab0d29057c09026ddb380d530ef0656e48b7c558eb2be7a0c4c4f1b793029d
 DIST libreoffice-extensions-3.4.4.2.tar.bz2 4219139 RMD160 43833d5d01d85b7ea0f3039e327fde8a4b7f76d4 SHA1 8eb5895ba78ed13bed144fcef5933f36d38d3fcd SHA256 ff07833ecb59a15cd3aa1e0c74e59fb985e5aae9d7285679e25ed96bbc3fefed
@@ -177,16 +177,26 @@ DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712
 EBUILD libreoffice-3.3.4.ebuild 18266 RMD160 c0204063e1a6bd7621267fd4dc92d8b73340d2c9 SHA1 4ba8289141748a37763049aad453ce8cde277e1b SHA256 7da90f1704e492c9ea60982283868860d96ab7550e7cb6a5806858d68fa15b98
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18514 RMD160 66fdf0ebbb2bbe6c507f97b0d2be87b8c72aa79c SHA1 814410fddd8101148b58924f2f20b899b1925c6a SHA256 89fef1d27d99fe7996dd4675120d5fb180a3bd6798abf51eb8da4d25f83013b9
 EBUILD libreoffice-3.4.4.2-r1.ebuild 16541 RMD160 f08a3b1e7826d489a580087b1638a4b98acfbca8 SHA1 f81fb848f6895c3c947fc56f0aef0963f15c93e3 SHA256 9c8adc1a3c217697dcaa7eb3722ae84b47926a9119c39f53b330243bd4b81ed4
-EBUILD libreoffice-3.4.99.1-r1.ebuild 14001 RMD160 505fab128de6423085171fb8e1d52c588564bbd6 SHA1 ca10ac5d3a4c57b01458482fa6a7f0748dd0852b SHA256 bb95b8c6f8d49d7242f5b317b1235834909adb4035a4300f52b3e68d054d0ce3
+EBUILD libreoffice-3.4.99.2.ebuild 13999 RMD160 84a6c91e16349e4ba547ef29e2e4f6dcbfba3bbd SHA1 321aa53852f1c3eb223b5496373537b90909d216 SHA256 85d4ad9ab4c8031fe15c3f061aac7b8f5d9c7e731d1751268e5f9ebcc802d8fe
 EBUILD libreoffice-3.4.9999-r2.ebuild 14991 RMD160 7abb80f9936495407114fa70260a6fc0f859fa07 SHA1 9f98e13f004793ce15a7285fe7bb2e9860ee31df SHA256 302684d2d6ccdb7ed8a48068f101d0b04037d6ff413bf8b3feccaf9141f19db7
 EBUILD libreoffice-3.5.9999.ebuild 13999 RMD160 a97b9c96b1c0c0f076e945fb12b4f955ec539915 SHA1 c19643e5d0aaa5a9a0cb8feb47038a9202f5917b SHA256 3e428eb8d24f8d690239fb94472dfde6e1c6c63163a8e2a4f4c143ff6dd68e67
-EBUILD libreoffice-9999-r2.ebuild 14041 RMD160 10278b2e82c12f54e15829cf8e09b4d828fef8b4 SHA1 be3ffd220e8f51eb1c994ebff4bb779d2d82033e SHA256 a775686de8c07e1358db5c7f2e9a40fe629bf1ff3b4c46f7232b57101d30c210
-MISC ChangeLog 40182 RMD160 6ce43a3c828311a8859a3a646fe475416a68779b SHA1 3caaf9f1ca804c221413097447c119511c25af03 SHA256 8766ff00e32882072897697c25d9703b84d998ef37278c402adc24d099ec16fb
+EBUILD libreoffice-9999-r2.ebuild 14069 RMD160 46428f00afc92a57e77c3128753c4f8027ac0a98 SHA1 ad89353db2bf4de7553f0482b851051604b05923 SHA256 6fe85994f8c3a6d434a68163e418b50a335c0747b5c889acf6c992a46364ea48
+MISC ChangeLog 40481 RMD160 36e0900da3b9be360d5a647f03b4e9d9ce74e3b5 SHA1 1b5e0cd27d2b00052f39d6bfa66b28c8b01839db SHA256 dd77aa33176d84f425380d04a4a67f29f9591ec21ce61cdab4201fbb050139bf
 MISC metadata.xml 1409 RMD160 9861b490a44757ecaebb14ac28eec292f347ac3f SHA1 268b78192669f12c513fd7b68fe588f140ea2e1b SHA256 862a214105b2f7b07a015d656794aac9b94a3f40b3f8cbf74a5299f990b82b2e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7uUoUACgkQCRZPokWLroQMnwCgp0eNdJssJWVUee7Web3LMvtE
-uuoAn3s05NpUkSrAtpvAeFWJHst5v5ln
-=fkqY
+iQIcBAEBAgAGBQJO8wwoAAoJEOSiRoyO7jvos+MP/ibA6wagZzCJMUawf/hggdje
+2KmrFTNtDHsdczVU848wzcc0IQviP2VlCi1cwz/qcFj+1Oe4AC41zYuleJ5azgNU
+rgYbXe98NGF/QkgtI4iWIUHCzMpeZByWsZfU+bRCpKDPWLYfTLkd1uxzHALG2QNg
+kVG8W2UF5TB/4Ab81BZ/MdKI7mS6LiVwIXsVgm2oiZK6zK8+gwJsOij6EpWYijSb
+iOC4hhYrYjWOuv5gh4FRCMn9lse+fTIyZmWSRDTMfumO+ns7gpzhJlxDUvWP4LEd
+yuMTgGQZQ+kUpHX5G+l+ZiW6rltI8vyVR5FY4y7jxwGqcbUtWMeg3Z3iD3CmwJz2
+q5YlZw9NxTSWvNSrESUhwSMDYuQ43LVKTc5M2weX0xVduwCmeoItKDkjvgsaX3u+
+G7oAdiTwV4aU+vJ2DS8LYb7e+U3yWJzTahIPMuHxfrtEN4gwUc5vEkcatD16gqrq
+elvM/LoKCu+nG+fE1f/Cu1XJNwoGQU6SgXrp/ZyRup/Ko9fCy1ypHBAlEChjD9rf
+IDgQHYf0jvfflWN5R0AAqQtMx+zcGIyDHRoviGRijaQV6J9aXsjVgu8IWSTXr59k
+3I9oWBbGuebRJW/FhwrqFBTVGdgt4Tz6DtUIZfLU03lsBu7xyqKULbnQxzoAvoh6
+GulwiV7+c4XzgZMYclsZ
+=hflp
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.4.99.1-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.99.2.ebuild
index ed3681c42aae..602ca19999a8 100644
--- a/app-office/libreoffice/libreoffice-3.4.99.1-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.99.2.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.99.1-r1.ebuild,v 1.4 2011/12/15 13:01:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.99.2.ebuild,v 1.1 2011/12/22 10:52:53 scarabeus Exp $
 
 EAPI=4
 
@@ -203,7 +203,7 @@ pkg_pretend() {
 
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		CHECKREQS_MEMORY="512M"
-		use debug && CHECKREQS_DISK_BUILD="9G" || CHECKREQS_DISK_BUILD="6G"
+		use debug && CHECKREQS_DISK_BUILD="10G" || CHECKREQS_DISK_BUILD="6G"
 		check-reqs_pkg_pretend
 
 		if [[ $(gcc-major-version) -lt 4 ]]; then
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index b8924e29bd3d..c034b1994e17 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.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-r2.ebuild,v 1.18 2011/12/15 13:01:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.19 2011/12/22 10:52:53 scarabeus Exp $
 
 EAPI=4
 
@@ -118,7 +118,10 @@ COMMON_DEPEND="
 		gnome-base/gconf:2
 		gnome-base/orbit
 	)
-	gtk? ( >=x11-libs/gtk+-2.24:2 )
+	gtk? (
+		x11-libs/gdk-pixbuf[X]
+		>=x11-libs/gtk+-2.24:2
+	)
 	gtk3? ( >=x11-libs/gtk+-3.2:3 )
 	graphite? ( media-gfx/graphite2 )
 	gstreamer? (