Update branding to version 0.3. Fixes bug #377899. Sync the live and release ebuilds.

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

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 50679492e6ffa5da78d2c25339e6d28f5169d3ce..419702c68fc16212d3e678c47e288b80bc6044b7 100644 (file)
--- 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.86 2011/08/05 07:41:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.87 2011/08/06 08:49:09 scarabeus Exp $
+
+  06 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.3.ebuild, libreoffice-3.4.9999.ebuild:
+  Update branding to version 0.3. Fixes bug #377899. Sync the live and release
+  ebuilds.
 
   05 Aug 2011; Michał Górny <mgorny@gentoo.org>
   files/libreoffice-check-for-avx.patch:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 1c6ed32fda29961165813e041f32790090d490f3..1ba5c2f6414549b82dc50dfbddbb18eb2858eed2 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e0bbd2d4635c1da8ec SHA1 413f54a589f910e5e2401dec0025617028fdc361 SHA256 da334268ba47e5b25c72063ececbb0619f2033eab7bfafbd58e981c361b72f3a
 AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
@@ -113,7 +113,7 @@ DIST libreoffice-base-3.4.2.3.tar.bz2 2069337 RMD160 8268e3930992bb0d67cb9c52fea
 DIST libreoffice-bootstrap-3.3.1.2.tar.bz2 2752061 RMD160 6ef3bcaf464d862498c289bcbcd3567c2d7e4d50 SHA1 9fa3d0b659be4b1db51defb064af850a4c001770 SHA256 f8511b5459b9d6cd7f9d0bcdafc13b3e48649ddda91ce8fcd729525832a44a17
 DIST libreoffice-bootstrap-3.3.3.1.tar.bz2 2751295 RMD160 a4cc2f74ff3faa93a4006eadde355aacb1ca0973 SHA1 b12bbb7558086cd49b2f52ee20932f2d0a7e8811 SHA256 f51f0cef73b5657b5a0bb49c67da402e1a96e061da20a1ede35dcf41b3d7461f
 DIST libreoffice-bootstrap-3.4.2.3.tar.bz2 2712799 RMD160 f0eef44d44eb63b319d86f333bb4be3c624c5042 SHA1 838098a47a0c2a13529995a913c41bfe28de9ae3 SHA256 577d85b6aca3b5b3cf72db6545ef79a9a53014c90ec62fd1932a1eeeb40e95be
-DIST libreoffice-branding-gentoo-0.2.tar.xz 130768 RMD160 101e9d1d32841b03a0ca468355c44f5bd6d385f4 SHA1 6f3853faece5aae0292d4154fdf68d363a5e13ac SHA256 0fb64ca18c3200c4bcf8f6ad6e227b990ca13d31e8ae60236b39e09865b8d9ac
+DIST libreoffice-branding-gentoo-0.3.tar.xz 130776 RMD160 acb76ddfd77d9c3093f5da229b9d6703831a97b5 SHA1 12afad81a77bccbaadf5a6a11d6a58d70003432e SHA256 34882717b5cc7e1fbc672e6924b92bb6d5def850209b957003f1e517f08d5598
 DIST libreoffice-build-3.3.1.2.tar.gz 14364811 RMD160 b7e0889a2207cbec388557b02a7e49593a8a8821 SHA1 85c0feaf94f6fb5fe453d289aca4c21d19e04840 SHA256 d0e41398b90edf40125597c0b743c9824b976fabcbd5d578c886ae8e69393cea
 DIST libreoffice-build-3.3.3.1.tar.gz 14608755 RMD160 bdda006de40a39ca257ddc1149d47714d5df58b6 SHA1 846dc655a294e3d382dabd47786d2f414feb4d24 SHA256 2b7b35e461697aa3379bf53181dc05ecc00bfc9b83d366e2f81837ca8d464f13
 DIST libreoffice-calc-3.3.1.2.tar.bz2 9412067 RMD160 8b0b8b6492c4647539a9549b61af25c44ac51538 SHA1 c6d2bfbae5bb21c8c57d753fd81665d39a9fd124 SHA256 48ff8cfacbcc4d407302f04543a4ccd800de45d6d99b2ceecdfad046a1ce92cf
@@ -170,16 +170,14 @@ DIST libreoffice-writer-3.4.2.3.tar.bz2 7294695 RMD160 2a7210c518376d9fe5c6e8a50
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf7b1e0 SHA1 60ef1f62c341ce7997de7ff5bcef04b304f4dfd9 SHA256 a3fae0a7f7da4a92e67d9c86ba4e7f92a92bbfac8f40a2703c64f317b670da6b
 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
-EBUILD libreoffice-3.4.2.3.ebuild 19238 RMD160 87a2e1c737c5cda6413f147ff18c24304b9bb6fc SHA1 2d3fe64537d794de371eb6aeaa1fb065b2785ce4 SHA256 c215656208b86f010b0485c71c2d054a8c7339c2d2883e8a56c905c1d0ec4175
-EBUILD libreoffice-3.4.9999.ebuild 18678 RMD160 c403b7cc30f155a72ae77dbb06dbac43ebc5179b SHA1 36a8cb7cda0572b6122e206abd0072455a71c107 SHA256 962e44162d576603ad052253807b4a000fe6577b0f4058fd64b65f89dd3f71f5
-MISC ChangeLog 17160 RMD160 50eed85e7ce15aa6eb329111667b743ff21f6007 SHA1 ab0df6ebb05f0d7076b6ec28124fbbae2dbd1109 SHA256 ecd986652bd07007a55f7b448720b8db45ebcc58a19a498075db59d31f746400
+EBUILD libreoffice-3.4.2.3.ebuild 19238 RMD160 2b628b6aaf3576ce0a3c8ad3e93041f280c59f97 SHA1 56211d7d47dd90374e0c5c76acf2dbbd425f3fcf SHA256 b1ae77fc7042f2aaa12d509808f238cbdf3d6d5fe72d50b56aedfae72ca3a722
+EBUILD libreoffice-3.4.9999.ebuild 19191 RMD160 f1ea0c786ea13a473b49bfccfc5567780d18db25 SHA1 6ba940e8f4eed9fd41a7a1d53909c934a3dc2a96 SHA256 e4eebdeef286424f26ed66300a2f8cd16185f1fa286da442e30037087b350df7
+MISC ChangeLog 17368 RMD160 fb8dddd75d64f0c6e211f87fa3228766761a5539 SHA1 d8aa19ac69cda97661f5c62a101a9b9e67397cb8 SHA256 3c60913892ca5ef9a149c8bca5ee1e0ef7d2563876db80c5e70a6ea9d17d1a84
 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk47nvoACgkQfXuS5UK5QB1HtQQArI5ic5V1a3G93zDd1U1JbFdl
-WgnNkawoqpLHncgYkvTINTDiuGj1ToJP1U0xprlj+mYnK4Cx5D526J35w3yZ2rSM
-vnZE4d3P9Ut/4Rix2Lbhbe44sGut+WPJgUKjzlv8ZHVoklL0iAe5XwJ9YdOH1X/D
-u1uXp3p9nqsEzfQ/MSs=
-=quYO
+iEYEARECAAYFAk49AAsACgkQHB6c3gNBRYeZCACgg/6HCr/4PJ/aBgLNW3T4tzBm
+ULUAoMc/GJR3/OID2mt5kITvg13P2i94
+=esUY
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
index 3b4c9d6921c54603c2818eab61548bf5e24472b4..864ac11ed251177a99b04a92b90035db891d3fdd 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.3.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.2.3.ebuild,v 1.19 2011/08/04 17:56:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.20 2011/08/06 08:49:09 scarabeus Exp $
 
 EAPI=3
 
@@ -21,7 +21,7 @@ DEV_URI="
 EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
 ADDONS_URI="http://dev-www.libreoffice.org/src/"
 
-BRANDING="${PN}-branding-gentoo-0.2.tar.xz"
+BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
 inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}

diff --git a/app-office/libreoffice/libreoffice-3.4.9999.ebuild b/app-office/libreoffice/libreoffice-3.4.9999.ebuild
index ac7bea8fa40047fe2b2008086a2e9390421f9bad..15559f95277e3b77923915968106b1f12c10abd0 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.9999.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.ebuild,v 1.5 2011/08/04 16:31:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v 1.6 2011/08/06 08:49:09 scarabeus Exp $
 
 EAPI=3
 
@@ -21,7 +21,7 @@ DEV_URI="
 EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
 ADDONS_URI="http://dev-www.libreoffice.org/src/"
 
-BRANDING="${PN}-branding-gentoo-0.2.tar.xz"
+BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
 inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
@@ -235,7 +235,10 @@ PATCHES=(
        "${FILESDIR}/${PN}-translate-toolkit-parallel-solenv.patch"
        "${FILESDIR}/${PN}-gbuild-use-cxxflags.patch"
        "${FILESDIR}/${PN}-installed-files-permissions.patch"
+       "${FILESDIR}/${PN}-check-for-avx.patch"
+       "${FILESDIR}/${PN}-append-no-avx.patch"
        "${FILESDIR}/${PN}-32b-qt4-libdir.patch"
+       "${FILESDIR}/${PN}-binfilter-as-needed.patch"
 )
 
 # Uncoment me when updating to eapi4
@@ -349,7 +352,19 @@ src_unpack() {
 
 src_prepare() {
        strip-linguas ${LANGUAGES}
-       LINGUAS_OOO=$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/;s/_/-/g')
+
+       # HACK: linguas needs special parsing until fixed upstream
+       if [[ -z ${LINGUAS} || ${LINGUAS} == en ]]; then
+               # if empty or just english we want empty
+               LO_LANGUAGES=
+       elif [[ ${LINGUAS} =~ en( |$) ]]; then
+               # otherwise if more then one language and english we
+               # replace en to en-US
+               LO_LANGUAGES="$(sed -e 's/\ben\b/en_US/;s/_/-/g' <<< ${LINGUAS})"
+       else
+               # and finally if no en is set we add en-US
+               LO_LANGUAGES="en-US ${LINGUAS//_/-}"
+       fi
 
        # Now for our optimization flags ...
        export ARCH_FLAGS="${CXXFLAGS}"