Add jemalloc useflag.

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

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index e75c42be87af133ae027b1b08c714144fa9a5412..bc35a390509e6a40ae64f1e1dbb3d72a896c062a 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # 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.139 2011/09/17 10:32:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.140 2011/09/17 12:43:29 scarabeus Exp $
+
+  17 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild, metadata.xml:
+  Add jemalloc useflag.
 
   17 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-9999-r1.ebuild:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 1ceb961487fdb1de3c7260f2fc1ba439f9a914c7..5bd03113be367c9dc0fdcd581bda21f78318405f 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -172,24 +172,24 @@ DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712
 EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c009f77 SHA1 572dee87269784bd1864e96e1eca820bfee2d513 SHA256 5452357751a154c65c126e4b3bdea17fd1c2d221734d5859d39808cae91d3599
 EBUILD libreoffice-3.3.4.ebuild 18146 RMD160 1c71a223f37c402ab01d95b71dfa5af2c69f61af SHA1 18c1211e8eaf8c587f52ee303dc264c941e7c045 SHA256 d602a3efffc23cb848b1fdc667a0d7b1c9dde2502dfae0fb537fecb9ee744cc2
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18350 RMD160 54bbfb6be956667016eefe1dad15737cc44e1deb SHA1 59dafcc4461a5c8571f814b41843950420b54fdc SHA256 8f883984653e50045ec2404ce4286950bafd82cf31e97347edc38a61e1fe2b4d
-EBUILD libreoffice-3.4.9999-r1.ebuild 18356 RMD160 51b1cb846c7900663975354fd6f1d7cf0f22a177 SHA1 c7c39420e80a0644d8260db8be7a6df4ac5f6870 SHA256 028fb7cbf31d0e5189d226d7fe6d78a5fed657cddbadb84d3801ba5665f1ea5f
-EBUILD libreoffice-9999-r1.ebuild 16841 RMD160 24f38ffa38b926a50b2f201bbe2388d8d5f70957 SHA1 40619e043a94a9922f56a33075d8580a944607b0 SHA256 9112073c0de0974afdb1aeda2d354eccddadc8f10bae65cbc91549fb53ac79b7
-MISC ChangeLog 27057 RMD160 b61d5464a365cf5673304722c4d344af3d4efce6 SHA1 fa075a3a1491646e1924be656ff346758ed7185b SHA256 0e079b7a29d5ce941f685da79290c63c27ad3acf9f35ce5e9007082b4344a734
-MISC metadata.xml 980 RMD160 5201a4943c69632cf94cfaf309fba261ea5146ec SHA1 069a007c495275783c7a025f44e4f1ab59edb715 SHA256 191a40132b182e7dc3f504055341014664f42d74caa27ee8dda2b5edbbdac6c2
+EBUILD libreoffice-3.4.9999-r1.ebuild 18444 RMD160 6209f79b7aee2ef034810b62a30d80a6c573e683 SHA1 76cd9106979325bbc55127c9a37d83514f179a11 SHA256 578c8666330d5e81c00f11127f6c671e780addb01ac8052dcf508388b691c8fb
+EBUILD libreoffice-9999-r1.ebuild 16928 RMD160 4d1b918411891a3de34ec8eb74e647e57d465752 SHA1 5e1c1439540a016cba6c8de99a1133762eb9584d SHA256 1ae60086a53c1f62747dde698e1c63a1d7c97cffd1e2d1eeddb41fbf388483a3
+MISC ChangeLog 27213 RMD160 882607f0db83813462a9c13dce286e0a4f4d3bfd SHA1 b07823d87ac3d385dd14e4370e329bc273894ea1 SHA256 9859e23bc98ee94d926402b403e021cd067a4f4b2e3ab9c395b80908ad0334f4
+MISC metadata.xml 1060 RMD160 d45f264670abdfa12c42935b489af5f462f70189 SHA1 d3932fab9bb5ab0bc404a95c60fa6a03f08044bd SHA256 f7a39bf4b3077ec5bada9e35940d1a02dcf9a62b77a56cc6346f750528a1e092
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOdHdFAAoJEOSiRoyO7jvopDQP/iSsiHuEDrltxlVyOSp70zjR
-UUPxmqQjZqQ+1Cg88wsQ4YnNQ7k3+duE+sstjut2jzEbcbSIlZfaYwcPtKDf/mkd
-s9WDsNLHx/xxemBB28Vos3NeuXNXI4mOCKcMBUwNbvHfVFBXMgUPvXaKW7LYOvGM
-A8eNqRVdBU5meKfKPumDo4Yw47g13eVOK5MiviKvgslIPbpleQIz35sIReDebJ47
-QPnC0HG1FMaAU8pU2Yd/SuW/LflA60UdyVHOrhIr2buH7ZJXKk69cNQyb66n60ia
-RTdIVA+GUFi+LH7jorKmlM3B8rv5W4e6zHr1nkKbdd/YPjkGnnRAwzYAQ/gQDzoh
-hAaH2v8b4njNs26Rq7Zjuz2E4Wi+XSLlr4K/Ag5lpLBrug8/iGh0YKZG/8uMfWkQ
-I0WM7kTP32EOTF/GDmxebjIM+eyINqbnGx0KWK3Ilb70VPOebNaTbZTeaBzjSqjR
-tCgzl4iGvMn6/RN077Lts/QRPloirLeW8OCTUSDBtRAP/suj2Y2n/Cnoih+qbMg0
-nUq88ReAz9wjbgHezbx407FEIYN1baRhH37Zs4gqQAnE7VowA6s3n9ZJwKNGAAWT
-h4cuzNU6ZRQXQg8z8V95ahjGZ0FxHKOzN40cvN2fD1H/8MHUNLrbZ4yEtuQ4Ka9F
-WJpvB4tVy5ujrkl/bclC
-=jWp8
+iQIcBAEBAgAGBQJOdJX3AAoJEOSiRoyO7jvoXWEQAI52lHvG3nBhF3NedWakzN/8
+6bOyvjLCTe2Yq8fSBa8jegxJjxzbFvTaVErq4Z5dBJA2v+V2TJXWGBpVT+RB2H8Q
+iVoQ1Oa0S439Tu1AKoHkUJwHM2HJbIRauRpRT6HO66VRnDW3o526kQ6xAG8Phabp
+yHlMCVZjExGQvxzF7uGZgc7cfxvM5jyH6aE68SOs+wU04hMlNvSeuPdIASUCD2cU
+s47axl52mY8fP80ptrWNrRCo95sew3HyLBpnYs+QvE7UNOKZ25HNc8CWPZu2lXgb
+1ridzG0Yrdq63EM4ZAws/Gia5VJh2bj++YvZie5WuxlG3VxJcWSCL5yUtRzWOPa/
+pqVYUEIdy0oJoCsDXIfGZbxa3xqyUldinxVqh2YNuIjSsHUAAhktbcGdc+tdRkRt
+UzlBnw5oEzTASQNOEaKqAXoNxM3cfb9OvK0saI8ozOoXujVYtgxU882wYewiR6sa
+ACsvip/J/IX0jQJxZlM05VNZvKlIKVi3XDR2opA1jVBUW1q45JnXV4TH0QM4M/4h
+9iFK35iudWV24Vo1mejY7NwcS0gXfh2wsDDZl9xrKH87SrvER8DVib9n6qch/B19
+vjb7vZIPqEBOEBBVi/0MQD7aj4voeTnWZEfWf1VbTKLklcWIpDE9z+xuHEfc8ars
++R/loS50/mNf/4HYlSiP
+=nhY5
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
index d3f160f2157c2174ea040ce25f30c685861d992b..7b312b14274f027ddd9574632185c57e1b61047f 100644 (file)
--- 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.9 2011/09/08 16:50:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.10 2011/09/17 12:43:29 scarabeus Exp $
 
 EAPI=3
 
@@ -101,8 +101,8 @@ unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
-gstreamer gtk kde ldap mysql nsplugin odk opengl python templates test +vba
-webdav"
+gstreamer gtk jemalloc kde ldap mysql nsplugin odk opengl python templates test
++vba webdav"
 LICENSE="LGPL-3"
 SLOT="0"
 [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
@@ -159,6 +159,7 @@ COMMON_DEPEND="
                dev-java/lucene-analyzers:2.3
                dev-java/saxon:0
        )
+       jemalloc? ( dev-libs/jemalloc )
        ldap? ( net-nds/openldap )
        mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
        nsplugin? (
@@ -466,7 +467,7 @@ src_configure() {
                --disable-static-gtk \
                --disable-strip-solver \
                --disable-zenity \
-               --with-alloc=system \
+               --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
                --with-build-version="Gentoo official package" \
                --with-extension-integration \
                --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \

diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index e9277bdb4e6d8d208cf49661a52292e296b26f3a..58361ba5164967b25132ddc201e87faecd5a98e6 100644 (file)
--- 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.15 2011/09/17 10:32:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.16 2011/09/17 12:43:29 scarabeus Exp $
 
 EAPI=3
 
@@ -99,8 +99,8 @@ unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
-gstreamer gtk kde ldap mysql nsplugin odk opengl svg templates test +vba
-webdav"
+gstreamer gtk jemalloc kde ldap mysql nsplugin odk opengl svg templates test
++vba webdav"
 LICENSE="LGPL-3"
 SLOT="0"
 [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
@@ -159,6 +159,7 @@ COMMON_DEPEND="
                dev-java/lucene-analyzers:2.3
                dev-java/saxon:0
        )
+       jemalloc? ( dev-libs/jemalloc )
        ldap? ( net-nds/openldap )
        mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
        nsplugin? (
@@ -431,7 +432,7 @@ src_configure() {
                --disable-strip-solver \
                --disable-ugly \
                --disable-zenity \
-               --with-alloc=system \
+               --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
                --with-build-version="Gentoo official package" \
                --with-extension-integration \
                --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \

diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 151c1bfb125cc9ffbaa5b25071d5d018474cdbba..890357e7945e0535e68eea7169a9b40178ab6c44 100644 (file)
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -12,6 +12,7 @@ version</longdescription>
                file formats</flag>
                <flag name="graphite">Enable support for non-Roman fonts via
                <pkg>media-gfx/graphite2</pkg></flag>
+               <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
                <flag name="odk">Build the Office Development Kit</flag>
                <flag name="templates">Enable installation of Sun templates</flag>
                <flag name="vba">Enable support for VBA compatibility and ActiveX