New binpkg, with a lot of help from Matthew Summers

Package-Manager: portage-2.1.10.48/cvs/Linux x86_64

3 files changed, 183 insertions, 16 deletions

diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog
index 259aaa88e34f..f3310c5ddb78 100644
--- a/app-office/libreoffice-bin/ChangeLog
+++ b/app-office/libreoffice-bin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.52 2012/02/19 12:31:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.53 2012/02/22 09:43:46 dilfridge Exp $
+
+*libreoffice-bin-3.4.5.2-r1 (22 Feb 2012)
+
+  22 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libreoffice-bin-3.4.5.2-r1.ebuild:
+  New binpkg, with a lot of help from Matthew Summers
 
   19 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-bin-3.4.5.2.ebuild:
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 4cb56efcfa03..a9747749a0f9 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 50-libreoffice-bin 158 RMD160 2087dd09f0fb7549f6ecdb0b128558b4f5f74a51 SHA1 4d3560da3c8ca0eef8d9ff9c968d49d49c7cadc7 SHA256 6c6cebcce51b639545a42c0b9cc6268f0ce1e8bb9d7d22bb11e5ebd1448638e9
 AUX wrapper.in 121 RMD160 844912d256e5e5b99e3e7dc7aaa8ed87aa64c29a SHA1 53817a456c83a1543f851ae16e05b4cd6a2be07f SHA256 ae37f02db372b7b26796732a453fbe3b9afe4692ca1591f8e5ad30be71d09980
@@ -419,6 +419,12 @@ 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 amd64-bin-libreoffice-base-3.4.5.2-r1.tbz2 102456784 RMD160 01884c87c01696efdbb8d325bd0945b3c592030e SHA1 9813ec75f1fc1c891c33c860cbe69191e179b496 SHA256 917ef76018c1da257963a5eaf6e3616885551f497c995d8bfb7213a0eeb6498e
+DIST amd64-bin-libreoffice-base-java-3.4.5.2-r1.tbz2 106370003 RMD160 74a10408f77736a880ed796d4ca57e0166f20e90 SHA1 50ea9a599ed9fbc31b2f9650d73dca2a2323241c SHA256 58bce9c40926386449084e73c3b4cd598bf4fc5015906b200e8d196dda90ed91
+DIST amd64-bin-libreoffice-gnome-3.4.5.2-r1.tbz2 102603395 RMD160 e5a11ffbaa373039e5895086cdbbaaf64d25fccf SHA1 23533db8705ada814f02007533a0ce15f57763bb SHA256 5461681fb66925e14be303b80c10cf8f0b5f944807af6407ff857e3cc634f28b
+DIST amd64-bin-libreoffice-gnome-java-3.4.5.2-r1.tbz2 106295303 RMD160 d5f5cd2d8093ba68ae0f9fd72c60ef51eb69d990 SHA1 82b243b67a8856fe3450d30cf471a48f9e23f1e1 SHA256 4ceaeca7b6be516f85cf00835fc5412c1eda080e63b9d9c50b054e3ad0ab231b
+DIST amd64-bin-libreoffice-kde-3.4.5.2-r1.tbz2 102494764 RMD160 ec10478a64f9a865190da2239f1f07c1a55d5d18 SHA1 d5bc68bc52880dc8baca1cd4e57b55f166a4f0fd SHA256 6d273dbb937272e8f72fb0079d53abc587a905ac2e132ec35072b9a4f93e2049
+DIST amd64-bin-libreoffice-kde-java-3.4.5.2-r1.tbz2 106330946 RMD160 76e5a8e83eb48e0b993a4480e3c7ade268fefd19 SHA1 64cdea01d776775f80f6636860a4ef5f075277f9 SHA256 7951e2179159fbc923fe0f0e95b9e4d114090804354f452a2a40f535d1586275
 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
@@ -432,23 +438,24 @@ DIST libreoffice-kde-java-amd64-3.4.5.2.tbz2 115706260 RMD160 84567426866bbf8939
 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.5.2-r1.ebuild 3277 RMD160 40b58a18712f37640eff3c7bed01862db2f0cbc8 SHA1 fbf21440c40cd212197b29132d85f27b86329c4c SHA256 12b2b48e37e0d75fa4b17a89ca51d03859d5d557a280c6a2b34f4c0ec9b70954
 EBUILD libreoffice-bin-3.4.5.2.ebuild 4254 RMD160 dca62db093becd58dcdae883bad72ee875ff72cd SHA1 3bd111407c96e14fe10f39d5c93ffd75d21b2246 SHA256 1d434bcb7f3b32f4c16b6777f4c3043c025c3b20c28383d1cd00ef7ad0b061e9
-MISC ChangeLog 8751 RMD160 e5677d9d0fc09046b6373328c898c567161a0cba SHA1 f45841ae2d8382c819ef05aeb3ef5796d7270d6e SHA256 15ae39d9114974021b7d67d155dc76fa30877dd79ebb13ce26f19034b139d09d
+MISC ChangeLog 8944 RMD160 71a0bb8650f18e41acf2747e2755963eaf19cd1d SHA1 58861edd9f494d1079ef860ea59fa967100d7b5b SHA256 2f0e51706adfc54d24e9e53dddc0b98412f178de3e939ef06ab932a0a68d6712
 MISC metadata.xml 474 RMD160 7104bf15d70449529df6259b71620443392a14e9 SHA1 a4055e99444213fea16f282b2fa7c25ec0b21be6 SHA256 b92b55b2aec0028aaac8afdb01f4b9ea416c8e00a2207dd8d0db317e4fad48b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPQOvPAAoJEOSiRoyO7jvoIw4P/3yMzRvzOrBuA8ZB5/YLMUcM
-GSJtNGegHqXzOnfq1tGs66QAOhUwbUGQJqteo3CaTBkOMKLADTbOeEpbJVnHcXA9
-MvKfg+cOuEBIdMp8LI7hnYqk3IGYRckuYNPBzUaYD/4V1Ua2Y5/STxn2qzpCuLh/
-cCmnz2A473++SS8zCcrXppOnwtH1Z7eNKPlV3NRMjoZ7ei8wow0u6nw6QXqyCBft
-0GVJmSmLXsi3GBPkcf7CWgkkU1Nk6ekhmTLXOMrr53+DH6P6XNsDINq7+RJLArIb
-OHbqZwWZDkpRhAIhUKEmPfN5AjZgbGgvFp771dSNQiWIUPuz+ZF6Ws0Pa/TZ4fXU
-9NElSzYzKaC5AyXK4R9gPappYZxkSrrzUXHvo/4cMdG//f9VgOatKT04yLwJxWTa
-I1EPKeRxRvF5qQ+3rwXS2aeaJw6SZkkLVYUJqhC5BrlGVH2zvbsm4Upq8hkxFDPX
-p2sdoVunOsVnlL9ANQeY4DkYCkMy3q9D6svRCsM85TN5OC0Yf9745kIyKddAhoIq
-acp4vEvrP3KK0p04RiSz7QFezMQEyzi+cDrDvN/dzpet55Xq91eNBzhSRAg4dzAO
-2tEfXHGtwNSjDzL/yruVkIYEhaV5/7/mJ16FHl19K0/WZv9H9G5gMF/rGKtm7weN
-FU8w+1GgaxgTH3qCmxZ8
-=b84V
+iQIcBAEBCgAGBQJPRLlEAAoJENwGBM22xffef10QAJiQel9ILwezLZLwNQ8gUh5U
+10Bo4Qqq1x4cX154x0rT0buiC77WXJN/jbMhu8p7l7thtfueD9S1anZfOgkxgJIp
+3QoGhUc5jn5OG+UOyqd0S5gqSu9xjuh1uxsBJcqNQHqn30lUZUVNeqZspdC32v8H
+c0E0BAHIqJ4SdIS/pD/Nz6cSGy9a+6yT6+TdMgPzy/BjdQy3hFeDESXxaRYIO9QL
+vlbzVYCIghSX7lTWzqD6lFn9QKpbA+nkgRpKk0rrjfRWFG5XQo94pXt4EpOK15S2
+cxiiKur2jJmPtCL1DQlt7nVmAG9MbWxIP0m6c4lTqHd+M0G3kXze1Do/w1lZHj6I
+bKOtaOBJpvCjeRpvUY5pip1Frha/rNWY8L84K4+hCqWjU/M8VaQH3S2mukiA7+TS
+9LssWIcxUGQqr2QjzJQ6w2QWA0EIs+qZSDu+CZnNYeRbfmdhRBr4iP+aAUEzORu+
+nexPfyHQI6YTv3jYmRL/rgDlv+TwlGWyogPhzAd0cIZfMS8F+P4pVk0TWFGno6dL
+DoPpQ2Ktfxfjai6GjJaAocj7azt85bNWxgRrPlz7XKqDi/Bs9uK0vhFSubG2cMoq
+z/Yt/Zagi1XEQA0zWiJpr7v9A7DuibXsTO5LHnykbfUebd7T96j4080NuoHw1jxt
+WlBRN9v9sZ7zbVTLw6e1
+=Z5TS
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild
new file mode 100644
index 000000000000..ec062bb47c01
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild
@@ -0,0 +1,154 @@
+# 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.5.2-r1.ebuild,v 1.1 2012/02/22 09:43:46 dilfridge Exp $
+
+EAPI=4
+
+KDE_REQUIRED="optional"
+CMAKE_REQUIRED="never"
+
+BASE_AMD64_URI="mirror://gentoo/amd64-bin-"
+
+inherit kde4-base java-pkg-opt-2 pax-utils prefix
+
+DESCRIPTION="LibreOffice, a full office productivity suite. Binary package"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI_AMD64="
+	kde? (
+		!java? ( ${BASE_AMD64_URI}${PN/-bin}-kde-${PVR}.tbz2 )
+		java? ( ${BASE_AMD64_URI}${PN/-bin}-kde-java-${PVR}.tbz2 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}${PN/-bin}-gnome-${PVR}.tbz2 )
+		java? ( ${BASE_AMD64_URI}${PN/-bin}-gnome-java-${PVR}.tbz2 )
+	)
+	!kde? ( !gnome? (
+		!java? ( ${BASE_AMD64_URI}${PN/-bin}-base-${PVR}.tbz2 )
+		java? ( ${BASE_AMD64_URI}${PN/-bin}-base-java-${PVR}.tbz2 )
+	) )
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+COMMON_DEPEND="
+	app-arch/zip
+	app-arch/unzip
+	>=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
+	dev-db/unixODBC
+	dev-libs/expat
+	>=dev-libs/glib-2.28
+	>=dev-libs/hyphen-2.7.1
+	>=dev-libs/icu-4.8.1-r1
+	>=dev-lang/perl-5.0
+	>=dev-libs/openssl-1.0.0e
+	>=dev-libs/redland-1.0.14[ssl]
+	media-libs/freetype:2
+	>=media-libs/fontconfig-2.8.0
+	>=media-libs/libpng-1.5
+	net-print/cups
+	sci-mathematics/lpsolve
+	>=sys-libs/db-4.8
+	virtual/jpeg
+	>=x11-libs/cairo-1.10.0[X]
+	x11-libs/libXaw
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	>=dev-libs/dbus-glib-0.92
+	gnome? (
+		gnome-base/gconf:2
+		gnome-extra/evolution-data-server
+	)
+	>=x11-libs/gtk+-2.24:2
+	media-gfx/graphite2
+	>=media-libs/gstreamer-0.10
+	>=media-libs/gst-plugins-base-0.10
+	java? (
+		>=dev-java/bsh-2.0_beta4
+		dev-java/lucene:2.9
+		dev-java/lucene-analyzers:2.3
+		dev-java/saxon:0
+	)
+	virtual/opengl
+	net-libs/neon
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice
+	!app-office/openoffice-bin
+	!app-office/openoffice
+	java? ( >=virtual/jre-1.6 )
+"
+
+PDEPEND="
+	=app-office/libreoffice-l10n-$(get_version_component_range 1-3)*
+"
+
+DEPEND="${COMMON_DEPEND}"
+
+# only one flavor at a time
+REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde )"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+PYTHON_UPDATER_IGNORE="1"
+
+pkg_pretend() {
+	[[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
+		&& die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)."
+}
+
+pkg_setup() {
+	kde4-base_pkg_setup
+}
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/50-${PN} "${T}"
+	eprefixify "${T}"/50-${PN}
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/
+
+	# prevent revdep-rebuild from attempting to rebuild all the time
+	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}