Bump to 3.4.5.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 54 insertions, 223 deletions

diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog
index 42b5ae156ade..1fc551d0051c 100644
--- a/app-office/libreoffice-bin/ChangeLog
+++ b/app-office/libreoffice-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/libreoffice-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.44 2012/02/03 14:11:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.45 2012/02/15 10:03:11 scarabeus Exp $
+
+*libreoffice-bin-3.4.5.2 (15 Feb 2012)
+
+  15 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libreoffice-bin-3.4.3-r2.ebuild, -libreoffice-bin-3.4.3.2-r1.ebuild,
+  +libreoffice-bin-3.4.5.2.ebuild:
+  Bump to 3.4.5.
 
   03 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org> metadata.xml:
   Assign to maintainer-needed
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 8bf7f14a7cf6..08efb045ee93 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX 50-libreoffice-bin 158 RMD160 2087dd09f0fb7549f6ecdb0b128558b4f5f74a51 SHA1 4d3560da3c8ca0eef8d9ff9c968d49d49c7cadc7 SHA256 6c6cebcce51b639545a42c0b9cc6268f0ce1e8bb9d7d22bb11e5ebd1448638e9
 AUX wrapper.in 121 RMD160 844912d256e5e5b99e3e7dc7aaa8ed87aa64c29a SHA1 53817a456c83a1543f851ae16e05b4cd6a2be07f SHA256 ae37f02db372b7b26796732a453fbe3b9afe4692ca1591f8e5ad30be71d09980
@@ -419,39 +419,36 @@ DIST LibO_3.3.4_Linux_x86_langpack-rpm_xh.tar.gz 8416214 RMD160 7238dc3a6afd1247
 DIST LibO_3.3.4_Linux_x86_langpack-rpm_zh-CN.tar.gz 1980478 RMD160 ad53613193a2ffeeee28925b6edaf0bf78139fed SHA1 2eec364a7bc0a65212ee39abae19f1a248b9200b SHA256 07386b5e16f4560389f7a6c284b2d6eaa03bc6f369fad9d0d48bf8a9399080b4
 DIST LibO_3.3.4_Linux_x86_langpack-rpm_zh-TW.tar.gz 1969168 RMD160 056f5f75703dfedd386ba4d5cb718557b6cb5fc9 SHA1 3cca9faf7fac2fb4ed42ae26945723448c680420 SHA256 2f008d1fd1aaf25074836ab22df97af4e4e962f05ad7c3749040baefd9c03db8
 DIST LibO_3.3.4_Linux_x86_langpack-rpm_zu.tar.gz 1915795 RMD160 8cca07c2b4fd0c7a3d961573e814a4cf3454ae80 SHA1 cf5a527107146db679a355c5e572fdfb755e6e80 SHA256 f8a07db55ec78fb605823680cde2cc2dead4243fca8581dbb94541cb324419fb
-DIST LibO_3.4.3_Linux_x86-64_install-rpm_en-US.tar.gz 168465443 RMD160 dbc898954190027dfb63bd18d061a497fca03f74 SHA1 228f951a8503100ec94c49def8b4f1cf7f82f893 SHA256 0d9003225816e2d130e9454aad186ce851233abc5a027bc84057420211429db1
-DIST LibO_3.4.3_Linux_x86_install-rpm_en-US.tar.gz 153607902 RMD160 9997288695e57281b518bce94f84b4483c71a07b SHA1 afb281927057b8b3a708291c12013512b816fcdc SHA256 69db7f815ca396fcbeb7d4c37a3f582ea4d150215019a976aad0c6feff14da3d
-DIST libreoffice-base-amd64-3.4.3.2-r1.tbz2 108281243 RMD160 e73c469aa0c2cbc14c65f3d94f549fe106698391 SHA1 1805fcf184ef99e829ef1a0cfb76219f546fad4b SHA256 ecf4ad17cf54efde693070a7a1b16f661777a5fff3acd813866ac7e77f782679
-DIST libreoffice-base-java-amd64-3.4.3.2-r1.tbz2 112050899 RMD160 3ea971397f8dce56c20aa7805c0d8bf6170f5f61 SHA1 e4a374f8893337b21bd11901ebccb58b4daa4f8b SHA256 f7750ce68bdc60309e0e9070d0ff0811781c542ceb16b3a33c43da338bf2fe8b
-DIST libreoffice-base-java-x86-3.4.3.2-r1.tbz2 106601034 RMD160 13f3a48a4e2a78962a62ffe81b2a182def8029a7 SHA1 0c143a178c25da11083c63a64163110f987eb3d1 SHA256 1f2892633665bd19333afadce6bb6d858d26a05f6fea278e24fe68f0823c5cc8
-DIST libreoffice-base-x86-3.4.3.2-r1.tbz2 102704844 RMD160 be5c6eaa69b1508ed963d7c0279e325efc37c8db SHA1 fcc7e487ef10a0adf56f13348dce88a5b0eed593 SHA256 07858588be63b497c935b61d5085ea5825d4fcff659a86b43cae1ad6bf7117a1
-DIST libreoffice-gnome-amd64-3.4.3.2-r1.tbz2 108529941 RMD160 dfbffd5ee1a89541b3f77ae7bccdd7b2d8af3785 SHA1 2f4c49833439d821640db3a49ad22988dfe4847a SHA256 383f387217efe118c679fe2c8a11acde5867364d3b5c94f870721a74939048cd
-DIST libreoffice-gnome-java-amd64-3.4.3.2-r1.tbz2 112394479 RMD160 70554d3af1a92562da896386f25b361492e5a3fe SHA1 cf2580ab095c2efb2ac67eebcaa6acf86dfcb271 SHA256 08cc180a48f3d83474aa7583d57bb57b81e01a0de848d093df859e0e249a5652
-DIST libreoffice-gnome-java-x86-3.4.3.2-r1.tbz2 106886292 RMD160 71080576f44235361862f9887d0c83b41697156c SHA1 360bbcbaf524f01118e8481316cc9a0a8cf2c0ae SHA256 3e16f34ba5f5c938368f5e8f2f3a77b6d5e6005420eacd2b4928dbdd6fffefbc
-DIST libreoffice-gnome-x86-3.4.3.2-r1.tbz2 102925303 RMD160 2c7b5888ad3e3f4cbb4588dcb502195686b8df96 SHA1 18ad343470e3b7b9e62171d62607ccc94777dc1a SHA256 1c739c9d347baa0b2e79fa849963cbf6bb63d6026a5721d7f7afce13907b1dcf
-DIST libreoffice-kde-amd64-3.4.3.2-r1.tbz2 108344861 RMD160 9d40ba4ed8b755a5035baed0c31e732f8baede07 SHA1 6eae58d351f6d22d5977f80c4aa50f3627416fc9 SHA256 cf53f573fc07ab354a6ebf2da3f22bc6193c683f126df087dbf430946736ec41
-DIST libreoffice-kde-java-amd64-3.4.3.2-r1.tbz2 112102862 RMD160 83a0e9685a0cd63fd2a66748172ffb5854a05fe0 SHA1 71e4dcfeab65912692efdba88d5054833ed410d0 SHA256 9f6fdd5b0764d180df488fd37472a8ee00ba212423d0e73c23794dcfabf2049e
-DIST libreoffice-kde-java-x86-3.4.3.2-r1.tbz2 106678671 RMD160 9d9345e48ff3520d51256b646edd7bf1f9214bed SHA1 cd88d9964518579bef0c9a9101a404e0a675c8a2 SHA256 9067a0c488b20f395e227ae32ee3f3f6a1c6fbff38ac3431687fbfb6c0528b88
-DIST libreoffice-kde-x86-3.4.3.2-r1.tbz2 102709911 RMD160 cf191f49ea52a8bcd7726975a7a67f26aa345a8d SHA1 03dd60a770e178ad06353f74423b857ecf5557d3 SHA256 33d0a959382bd080b2929da15161921e65f8252075223d889f0e34212e735137
+DIST libreoffice-base-amd64-3.4.5.2.tbz2 115735186 RMD160 3d0b4d46d547525395070dff56c7f330330aa759 SHA1 25edfa28706c7873622475793d84c15b9b1b7af8 SHA256 5321750559f3baef14124c6c4eea8fe53bc9937d6886fcf78cdeeb7d0ea61428
+DIST libreoffice-base-java-amd64-3.4.5.2.tbz2 115730483 RMD160 82de32f26849ed7486006ca6cd52f69383a2dbb5 SHA1 b4d0e9a9c188a1b6fb494e855c82945b82444c63 SHA256 22f5518f19d8a592a97630bcdb346cd495afa33d5ed26ab6293b7e04cd6e3db8
+DIST libreoffice-base-java-x86-3.4.5.2.tbz2 112644459 RMD160 21ba3d6e4807d96ede4af0b40f20b14408615b83 SHA1 21aed4b6d297786f39a401b93791555a1c90d4ba SHA256 57fcf0152ed9e7f8affb53ed12b3d57b61ad2dbf24022d2e7d1d45829f4a64b0
+DIST libreoffice-base-x86-3.4.5.2.tbz2 108940520 RMD160 87387662291fed16a7dcbc6055882034b2adadec SHA1 2a3258264ad6c9a7bd7950f749afd6654021b29a SHA256 eebdc397cdf6ae4089d222c13a24bb05cbc3b13a0af4bd1050ba4d3cd81d1f97
+DIST libreoffice-gnome-amd64-3.4.5.2.tbz2 115682898 RMD160 9557eaa67b5173e63a964cb4999b75fb3286cf33 SHA1 15c1fbe0ad3ae938e38cba8504c150772706657b SHA256 d00092fd6f23c9aac06742004a4a08e47ea1f5f4c308660a4d1bfa2dbf8806ff
+DIST libreoffice-gnome-java-amd64-3.4.5.2.tbz2 115683438 RMD160 eea1373e56d1eb60e322d9fe42bdf397db76587b SHA1 2d9a74471d24d23416599c8cb9d4bbac8913cef1 SHA256 1da23fbc683d18160806c6acc3cdaa461b444d46ced9db337aedb01b988f56cb
+DIST libreoffice-gnome-java-x86-3.4.5.2.tbz2 112896615 RMD160 3f6354fc262ace5df54a9b7e97d8bb9cd513f446 SHA1 49019bfb3692fae4e18d7166d483388a5f7be614 SHA256 f32eeff2847787cb0afddbfbf8d0acf3ac5053445502fe01a302248e91e16870
+DIST libreoffice-gnome-x86-3.4.5.2.tbz2 109131933 RMD160 9e4117768709fbc3b995c1bcc002a3e19b1abeeb SHA1 f7be200334cdfe15e51276ee835ca2a26259373a SHA256 97c23f80a28d714ac97be49e2e9760581531b4d7344632a5cca972d2a9800f65
+DIST libreoffice-kde-amd64-3.4.5.2.tbz2 115699562 RMD160 3597377156710bd096e841a9436cc7d6eddd0c40 SHA1 e32423c4eaeb5967d03cbe5338b5b9d331753550 SHA256 39fcd44b4108dc3c492d58354d7eb92681fee249fb1a32e3ebdd4ef9d626cd73
+DIST libreoffice-kde-java-amd64-3.4.5.2.tbz2 115706260 RMD160 84567426866bbf89399503d6c14b13e8d4ed59d0 SHA1 ea4caa0bbf7cd1002fbf61818f540f02507bff70 SHA256 b19c6b49e30a6fb6d241081f367a43477308e42f9d6990518c649981854d3bcb
+DIST libreoffice-kde-java-x86-3.4.5.2.tbz2 112899911 RMD160 b45e9c0f688e5b901b8fdb3b419e3fd7df096899 SHA1 252bc81196678cd147b845e30afd7d51ea7d3286 SHA256 925af12a6d7f892e8911b67ee576a7d159d401a1a00b516946259c92bd8a3c32
+DIST libreoffice-kde-x86-3.4.5.2.tbz2 109095011 RMD160 7fdc6b87078640d0263437dd01b3e6af764f0e04 SHA1 e4f9d07305b43538bd2ad2ea50a3a048a6969347 SHA256 98e4c66794d65ba1b00e0e783f28a02b04a4ab95536f53446b661e30d38993a1
 EBUILD libreoffice-bin-3.3.4.ebuild 6998 RMD160 9f03719ba63b9ea10af69581eaebf72e1f5cce16 SHA1 e9cb4f7109067cb2dfcc8cb6fa1aa4e2ef6b80fa SHA256 3336a25cc2729c56fa58ecadcb5d3adf7c5e1eeca1509f708d29ac10d3a79123
-EBUILD libreoffice-bin-3.4.3-r2.ebuild 4875 RMD160 8771489cbd17a4ed37c4de48fb82c40f088974ad SHA1 cc44fa79aa63e475272bdb308f7b125d17e8baaf SHA256 aa9d582b13fd87194fcf724f0d43e712267a4d061cf7b856a0f6301deafae1a9
-EBUILD libreoffice-bin-3.4.3.2-r1.ebuild 4061 RMD160 66e55f13e33f83853b20c2f01dca144723f744ef SHA1 27318cef19d46e24495b5e5b37340642b8345a8c SHA256 0c82feef47fe1aacc88fa125345d3fe114ab941665770b05d42211ed30893b85
-MISC ChangeLog 7869 RMD160 512407e1481fef69c50524853e404a5380e152c7 SHA1 ace9eb54fc434ba324758f0b331d36aa487524bd SHA256 0b8de04cc2e44ea7ccf0552022fb2265ee043cf50c4ab374909d4df0246ead67
+EBUILD libreoffice-bin-3.4.5.2.ebuild 4043 RMD160 be71ab9e201798d9c590cf4da9fba7b6f62bf66d SHA1 c5f1fb169a4d272e75a3fe093f19a664f25da055 SHA256 1c8e3a831835048ff16688684ef0de6e1103a6dcb19aabd84a4ec726164bea49
+MISC ChangeLog 8089 RMD160 09e5315b63f099b8d61f888db2a7425b3f107a1a SHA1 9f069e315b57e96dd045d106b7cebb987cadcc88 SHA256 06dfda16ee079f9d3821a177b74df4d4da8643e87017c8a774ff66ec6d96cc06
 MISC metadata.xml 544 RMD160 aa980a7806dd62f285b2f1abec1e57df8daaa240 SHA1 4f04eb9ecf548bbfd7bc6ea8ea04e591551363fa SHA256 c83082a1c9d0da83397cae8b3feb6488de8a8a7938e2e7fe6fbfa2868e06a2dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPK+s2AAoJEEb+UGWnxTyHNNIP+wdpR/4kEYPOUX2FRzLPu5mA
-1J+iT3w3kVaF3Fs+ml82zSrtyLhdTFmrx8CmdAOcVVF0uPX8uC0eO74i+AP8k9FZ
-yt8o1z8WCgXra51kulHcg9eniJlDBHwTLdYUT6VRcuHtab7vYzc850MPABOjFGJj
-kerTrF9o0RSWY+JDfqQ4NXGsk8wD56iNktALOp7GKj7m3Uz7toK2OS0N8DQJEeQS
-IE1L/JM2PkBtLsDbaVwodI5h94M23PObRj0djGbMUH2RfoBRXM6Aa1GH/bIDZXo+
-uPAbxjmkFYJQ/9pfNnA8wE0cCf463AdgAk2EUchZ0VwUtK8tirUYrBKKb34pRlUq
-oevP1e7RCP10OAC/UY12s80CvA+rjuzczjuKUvtGm9/hPnx//e55AlKDSQmhiuwP
-XeoqsT9VE54c7jzeJKDnCWX1EUuduvBxA3//4da7YBBGBxiFFDUT6tj554XXWBWe
-Rj3FI0NGFVNxNk0AFdSJxSun+XyESDGR4tZW5ZojPhyKFLwWXT9keiOb1QEPwj0J
-7bd/PNDaLBrc6M/cakQks1UKUOZvA9Co1PNPwRS2QM08/bq98VKtrZfgOFKzQct2
-tzH6hLz4wIIK80yf4lo96gxeE/drllk8wnxqjytFPeShxvWnJwgeWNiMkJ/h4h2F
-lUCDkpIPJU68A/bZZSRs
-=pYJT
+iQIcBAEBAgAGBQJPO4LoAAoJEOSiRoyO7jvo/n0P/2j1twdKRHKMrFvppX+ecfcB
+Rq9pj7WWIuRm1va8AYSe4liQAv5Gmn0d+wApkdPDwG3v8UUr0jd5wfbyyLICl4NT
+1Rr83IFlPSqigh4ubMYZXtNHiNw2qrHw4rnyuegnLJpiBeqk92aJYYl0pqzk2rdj
+H0pSwO4IRsOIN14IKBi1zLzsiQFI/MYczgHq3XZ3LGNMXpkAUgAIk1pgYxh2ghLW
+xJR6Vmp267L8EgqNtLdE+SrhCFoTZW1vlkMebHT9S/QlXhez60WvgbBHd4Z8dHo8
+npShIV/tqktmAe1j7HHaLLzelw6rn1V0qsMKXXfs5FimAsbjMrMDkijLbmW+V6MH
+ioKxQh8429lT31gEU/9OsgDJrL1MBKgHWP92tqdBb7VULVkTECnnu1qqnRAenQw+
+EREvq+RIYNOz4VdZmThfMdC/0mOF0bdbiRG+ZK07ETrzAobE+tPL3xPOa5QPt/im
+vIbegFVaAOeEm4+O4A221SE8bmXI/k1JOtWY8RXcRw39mssU91iCO8Jofat+7bw8
+PnyMJFkXo1uEg4YITX7XAZGtYIv9ffMrDy/4apb7+NOFi/kBbIvOZyp9pr8fa8Yz
+dCz6R7uzjbKeSAAXllBNZWlFis6UP1IORuG58ptD8S5CzN2I06e9m3eRFBv6tzDp
+I7oLLcoJjzGlCfhiV83q
+=5aC6
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r2.ebuild
deleted file mode 100644
index d5e841b838a5..000000000000
--- a/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2012 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.4.3-r2.ebuild,v 1.2 2012/01/26 03:23:37 floppym Exp $
-
-EAPI="3"
-
-inherit eutils fdo-mime gnome2-utils pax-utils prefix rpm multilib
-
-IUSE="gnome java"
-
-MY_PV="${PV/_/-}"
-MY_PV2="${PV}rc2"
-BVER="3.4.3-302"
-BVER2="3.4-302"
-BASIS="libobasis3.4"
-BASIS2="basis3.4"
-NM="libreoffice"
-NM1="${NM}"
-NM2="${NM1}3.4"
-FILEPATH="http://download.documentfoundation.org/${NM}/stable/${PV}/rpm/"
-if [ "${ARCH}" = "amd64" ] ; then
-	XARCH="x86_64"
-	PACKED="LibO_${MY_PV2}_Linux_x86-64"
-else
-	XARCH="i586"
-	PACKED="LibO_${MY_PV2}_Linux_x86"
-fi
-UP="${PACKED}_install-rpm_en-US/RPMS"
-
-DESCRIPTION="LibreOffice productivity suite."
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="amd64? ( ${FILEPATH}/x86_64/LibO_${PV}_Linux_x86-64_install-rpm_en-US.tar.gz )
-	x86? ( ${FILEPATH}/x86/LibO_${PV}_Linux_x86_install-rpm_en-US.tar.gz )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="!app-office/libreoffice
-	!app-office/openoffice
-	!app-office/openoffice-bin
-	!prefix? ( sys-libs/glibc )
-	app-arch/unzip
-	app-arch/zip
-	>=dev-lang/perl-5.0
-	>=media-libs/freetype-2.1.10-r2
-	x11-libs/libXaw
-	x11-libs/libXinerama"
-
-DEPEND="${RDEPEND}
-	sys-apps/findutils"
-
-PDEPEND="
-	>=app-office/libreoffice-l10n-${PV}
-	java? ( >=virtual/jre-1.5 )
-"
-
-RESTRICT="strip"
-
-QA_EXECSTACK="usr/$(get_libdir)/${NM}/${BASIS2}/program/*
-	usr/$(get_libdir)/${NM}/ure/lib/*"
-QA_TEXTRELS="usr/$(get_libdir)/${NM}/ure/lib/*"
-QA_PRESTRIPPED="usr/$(get_libdir)/${NM}/${BASIS2}/program/*
-	usr/$(get_libdir)/${NM}/${BASIS2}/program/python-core-2.6.1/lib/lib-dynload/*
-	usr/$(get_libdir)/${NM}/program/*
-	usr/$(get_libdir)/${NM}/ure/bin/*
-	usr/$(get_libdir)/${NM}/ure/lib/*"
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cp "${FILESDIR}"/{50-${PN},wrapper.in} "${T}"
-	eprefixify "${T}"/{50-${PN},wrapper.in}
-
-	for i in base binfilter calc core01 core02 core03 core04 core05 core06 \
-		core07 draw graphicfilter images impress math ogltrans ooofonts \
-		ooolinguistic pyuno testtool writer xsltfilter ; do
-		rpm_unpack "./${UP}/${BASIS}-${i}-${BVER}.${XARCH}.rpm"
-	done
-
-	rpm_unpack "./${UP}/${NM2}-${BVER}.${XARCH}.rpm"
-	rpm_unpack "./${UP}/${NM2}-ure-${BVER}.${XARCH}.rpm"
-
-	for j in base calc draw impress math writer; do
-		rpm_unpack "./${UP}/${NM2}-${j}-${BVER}.${XARCH}.rpm"
-	done
-
-	rpm_unpack "./${UP}/desktop-integration/${NM2}-freedesktop-menus-${BVER2}.noarch.rpm"
-
-	use gnome && rpm_unpack "./${UP}/${BASIS}-gnome-integration-${BVER}.${XARCH}.rpm"
-	use java && rpm_unpack "./${UP}/${BASIS}-javafilter-${BVER}.${XARCH}.rpm"
-
-	# Extensions
-	for k in beanshell-script-provider javascript-script-provider mediawiki-publisher nlpsolver pdf-import presentation-minimizer presenter-screen python-script-provider report-builder; do
-		rpm_unpack "./${UP}/${BASIS}-extension-${k}-${BVER}.${XARCH}.rpm"
-	done
-
-	# English support installed by default
-	rpm_unpack "./${UP}/${BASIS}-en-US-${BVER}.${XARCH}.rpm"
-	rpm_unpack "./${UP}/${NM2}-en-US-${BVER}.${XARCH}.rpm"
-	rpm_unpack "./${UP}/${NM2}-dict-en-${BVER}.${XARCH}.rpm"
-	for s in base binfilter calc math res writer ; do
-		rpm_unpack "./${UP}/${BASIS}-en-US-${s}-${BVER}.${XARCH}.rpm"
-	done
-
-}
-
-src_install () {
-
-	INSTDIR="/usr/$(get_libdir)/${NM}"
-	dodir ${INSTDIR}
-	mv "${WORKDIR}"/opt/${NM2}/* "${ED}${INSTDIR}" || die
-
-	#Menu entries, icons and mime-types
-	cd "${ED}${INSTDIR}/share/xdg/"
-	for desk in base calc draw impress javafilter math printeradmin qstart startcenter writer; do
-		if [ "${desk}" = "javafilter" ] ; then
-			use java || { rm -f javafilter.desktop; continue; }
-		fi
-		mv ${desk}.desktop ${NM1}-${desk}.desktop
-		sed -i -e s/${NM2}/${NM}/g ${NM1}-${desk}.desktop || die
-		domenu ${NM1}-${desk}.desktop
-	done
-	insinto /usr/share
-	doins -r "${WORKDIR}"/usr/share/icons
-	doins -r "${WORKDIR}"/usr/share/mime
-
-	# Install wrapper script
-	newbin "${T}/wrapper.in" ${NM1}
-	sed -i -e s/LIBDIR/$(get_libdir)/g "${ED}/usr/bin/${NM1}" || die
-
-	dosym ${INSTDIR}/program/spadmin /usr/bin/${NM1}-printeradmin
-
-	rm -f "${ED}${INSTDIR}/basis-link" || die
-	dosym ${INSTDIR}/${BASIS2} ${INSTDIR}/basis-link
-
-	# Non-java weirdness see bug #99366
-	use !java && rm -f "${ED}${INSTDIR}/ure/bin/javaldx"
-
-	# install the unopkg binary
-	dosym ${INSTDIR}/program/unopkg /usr/bin/unopkg
-
-	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
-
-}
-
-pkg_preinst() {
-
-	use gnome && gnome2_icon_savelist
-
-}
-
-pkg_postinst() {
-
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	use gnome && gnome2_icon_cache_update
-
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/${NM}/program/soffice.bin
-
-}
-
-pkg_postrm() {
-
-	fdo-mime_desktop_database_update
-	use gnome && gnome2_icon_cache_update
-
-}
diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2.ebuild
index 9aa06495ec9a..84eeafc48bbf 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2012 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.4.3.2-r1.ebuild,v 1.9 2012/01/26 03:23:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2.ebuild,v 1.1 2012/02/15 10:03:11 scarabeus Exp $
 
 EAPI=4
 
 KDE_REQUIRED="optional"
 CMAKE_REQUIRED="never"
 
-BASE_URI="http://dev.gentooexperimental.org/~scarabeus/libreo_binary/"
+BASE_AMD64_URI="http://dev.gentoo.org/~pacho/libreoffice/"
+BASE_X86_URI="http://gentoo-pr.org/libreo/libreo/"
 
 inherit kde4-base java-pkg-opt-2 pax-utils
 
@@ -15,31 +16,31 @@ DESCRIPTION="LibreOffice, a full office productivity suite. Binary package"
 HOMEPAGE="http://www.libreoffice.org"
 SRC_URI_AMD64="
 	kde? (
-		!java? ( ${BASE_URI}/amd64/${PN/-bin}-kde-${PVR}.tbz2 -> ${PN/-bin}-kde-amd64-${PVR}.tbz2 )
-		java? ( ${BASE_URI}/amd64/${PN/-bin}-kde-java-${PVR}.tbz2 -> ${PN/-bin}-kde-java-amd64-${PVR}.tbz2 )
+		!java? ( ${BASE_AMD64_URI}/${PN/-bin}-kde-${PVR}.tbz2 -> ${PN/-bin}-kde-amd64-${PVR}.tbz2 )
+		java? ( ${BASE_AMD64_URI}/${PN/-bin}-kde-java-${PVR}.tbz2 -> ${PN/-bin}-kde-java-amd64-${PVR}.tbz2 )
 	)
 	gnome? (
-		!java? ( ${BASE_URI}/amd64/${PN/-bin}-gnome-${PVR}.tbz2 -> ${PN/-bin}-gnome-amd64-${PVR}.tbz2 )
-		java? ( ${BASE_URI}/amd64/${PN/-bin}-gnome-java-${PVR}.tbz2 -> ${PN/-bin}-gnome-java-amd64-${PVR}.tbz2 )
+		!java? ( ${BASE_AMD64_URI}/${PN/-bin}-gnome-${PVR}.tbz2 -> ${PN/-bin}-gnome-amd64-${PVR}.tbz2 )
+		java? ( ${BASE_AMD64_URI}/${PN/-bin}-gnome-java-${PVR}.tbz2 -> ${PN/-bin}-gnome-java-amd64-${PVR}.tbz2 )
 	)
 	!kde? ( !gnome? (
-		!java? ( ${BASE_URI}/amd64/${PN/-bin}-base-${PVR}.tbz2 -> ${PN/-bin}-base-amd64-${PVR}.tbz2 )
-		java? ( ${BASE_URI}/amd64/${PN/-bin}-base-java-${PVR}.tbz2 -> ${PN/-bin}-base-java-amd64-${PVR}.tbz2 )
+		!java? ( ${BASE_AMD64_URI}/${PN/-bin}-base-${PVR}.tbz2 -> ${PN/-bin}-base-amd64-${PVR}.tbz2 )
+		java? ( ${BASE_AMD64_URI}/${PN/-bin}-base-java-${PVR}.tbz2 -> ${PN/-bin}-base-java-amd64-${PVR}.tbz2 )
 	) )
 "
 
 SRC_URI_X86="
 	kde? (
-		!java? ( ${BASE_URI}/x86/${PN/-bin}-kde-${PVR}.tbz2 -> ${PN/-bin}-kde-x86-${PVR}.tbz2 )
-		java? ( ${BASE_URI}/x86/${PN/-bin}-kde-java-${PVR}.tbz2 -> ${PN/-bin}-kde-java-x86-${PVR}.tbz2 )
+		!java? ( ${BASE_X86_URI}/${PN/-bin}-kde-${PVR}.tbz2 -> ${PN/-bin}-kde-x86-${PVR}.tbz2 )
+		java? ( ${BASE_X86_URI}/${PN/-bin}-kde-java-${PVR}.tbz2 -> ${PN/-bin}-kde-java-x86-${PVR}.tbz2 )
 	)
 	gnome? (
-		!java? ( ${BASE_URI}/x86/${PN/-bin}-gnome-${PVR}.tbz2 -> ${PN/-bin}-gnome-x86-${PVR}.tbz2 )
-		java? ( ${BASE_URI}/x86/${PN/-bin}-gnome-java-${PVR}.tbz2 -> ${PN/-bin}-gnome-java-x86-${PVR}.tbz2 )
+		!java? ( ${BASE_X86_URI}/${PN/-bin}-gnome-${PVR}.tbz2 -> ${PN/-bin}-gnome-x86-${PVR}.tbz2 )
+		java? ( ${BASE_X86_URI}/${PN/-bin}-gnome-java-${PVR}.tbz2 -> ${PN/-bin}-gnome-java-x86-${PVR}.tbz2 )
 	)
 	!kde? ( !gnome? (
-		!java? ( ${BASE_URI}/x86/${PN/-bin}-base-${PVR}.tbz2 -> ${PN/-bin}-base-x86-${PVR}.tbz2 )
-		java? ( ${BASE_URI}/x86/${PN/-bin}-base-java-${PVR}.tbz2 -> ${PN/-bin}-base-java-x86-${PVR}.tbz2 )
+		!java? ( ${BASE_X86_URI}/${PN/-bin}-base-${PVR}.tbz2 -> ${PN/-bin}-base-x86-${PVR}.tbz2 )
+		java? ( ${BASE_X86_URI}/${PN/-bin}-base-java-${PVR}.tbz2 -> ${PN/-bin}-base-java-x86-${PVR}.tbz2 )
 	) )
 "
 
@@ -56,12 +57,11 @@ KEYWORDS="amd64 ~x86"
 COMMON_DEPEND="
 	app-arch/zip
 	app-arch/unzip
-	>=app-text/hunspell-1.3.2-r1
+	>=app-text/hunspell-1.3.2-r3
 	app-text/mythes
 	app-text/libwpd:0.9[tools]
 	app-text/libwpg:0.2
 	>=app-text/libwps-0.2.2
-	>=app-text/poppler-0.12.3-r3[xpdf-headers,cairo]
 	dev-db/unixODBC
 	dev-libs/expat
 	>=dev-libs/glib-2.28
@@ -69,7 +69,7 @@ COMMON_DEPEND="
 	>=dev-libs/icu-4.8.1-r1
 	>=dev-lang/perl-5.0
 	>=dev-libs/openssl-1.0.0e
-	dev-libs/redland[ssl]
+	>=dev-libs/redland-1.0.14[ssl]
 	media-libs/freetype:2
 	>=media-libs/fontconfig-2.8.0
 	>=media-libs/libpng-1.5
@@ -77,7 +77,7 @@ COMMON_DEPEND="
 	sci-mathematics/lpsolve
 	>=sys-libs/db-4.8
 	virtual/jpeg
-	>=x11-libs/cairo-1.10.0
+	>=x11-libs/cairo-1.10.0[X]
 	x11-libs/libXaw
 	x11-libs/libXinerama
 	x11-libs/libXrandr
@@ -97,7 +97,6 @@ COMMON_DEPEND="
 		dev-java/lucene-analyzers:2.3
 		dev-java/saxon:0
 	)
-	net-nds/openldap
 	virtual/opengl
 	net-libs/neon
 "