[gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, dev-libs/jemalloc/files/, dev-libs/jemalloc/

[Jory Pratt]

commit:     9a85fcb5eaad8acbb763d59c9a3c4c2773aa8620
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 12:54:17 2012 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Thu May 24 12:54:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=9a85fcb5

jemalloc-3.0.0 update, fix pax-marking in thunderbird

---
 dev-libs/jemalloc/Manifest                         |   10 +++---
 .../jemalloc/files/jemalloc-2.2.1-no-pprof.patch   |   24 -----------------
 .../files/jemalloc-2.2.5_fix_html_install.patch    |   12 ---------
 .../jemalloc/files/jemalloc-3.0.0-no-pprof.patch   |   27 ++++++++++++++++++++
 ...tch => jemalloc-3.0.0-strip-optimization.patch} |   14 ++++++---
 .../files/jemalloc-3.0.0_fix_html_install.patch    |   14 ++++++++++
 ...jemalloc-2.2.5.ebuild => jemalloc-3.0.0.ebuild} |   10 +++---
 mail-client/thunderbird/Manifest                   |    2 +-
 .../thunderbird/thunderbird-12.0.1-r1.ebuild       |    2 +-
 9 files changed, 62 insertions(+), 53 deletions(-)

diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index bb5ea48..7dccca2 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -1,5 +1,5 @@
-AUX jemalloc-2.2.1-no-pprof.patch 702 RMD160 92b697551e7b24cd7f4974b0ab037952b3b0c2ff SHA1 d9c05608769393ad4999cc3e5910a54b3bd7e5ee SHA256 8e5a36505a90eab85bf746d4eb5a27d473ce25396104a0dd01d25368dd0c099d
-AUX jemalloc-2.2.5_fix_html_install.patch 235 RMD160 28cc185627474c3241aff26c9ee66fce2f8435ab SHA1 28323142fa944e73dbe9a36801162a05d25def90 SHA256 900a9c546d56b9a52b4dae9678f62a621c1053357972ce986281da3f44b36d18
-AUX jemalloc-strip-optimization.patch 800 RMD160 a55b49895ceb9cc48f6fe12215b45f5a8c2e7b15 SHA1 ec662a39f02c5f42344ba987e881828c0df0c580 SHA256 a14ee193968e87d0d87a8146050dcad5a33042af119070dbfbac7d4eba9923ce
-DIST jemalloc-2.2.5.tar.bz2 224118 RMD160 355d11645d3b4f1a8a82c5455ebf544eab2a2d4e SHA1 0964af950f3e423eec2d04cc1a839149f807dcc9 SHA256 efcc9636757bd7f53a0fde084c2988bfe26f2868e435447f2d41ac42c0b3521e
-EBUILD jemalloc-2.2.5.ebuild 909 RMD160 d9dba869c0e8474b53e1bcbf169a4e1af7ba7808 SHA1 03477a80152bbd8a17fff2e0c8771ca20c886e2b SHA256 3c177c1167011b707b4213087815351f5f475de1e2e6c7352cc801f1769e28cd
+AUX jemalloc-3.0.0-no-pprof.patch 823 RMD160 f57dcde689101399c08cf19d485af09451ef33e8 SHA1 0e545129bdf41b29ce5a574395da939f8c2206b6 SHA256 63ae4515df9291d8a9407ca91de687347868a0d283fe382397bb0369e34ec995
+AUX jemalloc-3.0.0-strip-optimization.patch 864 RMD160 4c748a8a8f29ca770730531cf016ab70b23d3582 SHA1 dd2414a66cb71af8369af0283afe977953d03c44 SHA256 8937eabe6c24a45decce015a67671ad3e94098a7e0b5be1ab1f27211c50b371c
+AUX jemalloc-3.0.0_fix_html_install.patch 333 RMD160 2ad452b1300d9cafeb6226bca9b5757b2ae117e4 SHA1 a45d624fba927d466c2db305ad41bbe2fb5d61ae SHA256 859aa0ca3e04afc0f17a9d4c74e6ad61d0be8984a526be789ebd22637e4f51e8
+DIST jemalloc-3.0.0.tar.bz2 245192 RMD160 20cbfff210f362ec277b3ba3f38186b8c18f6e33 SHA1 65a66bd1b54ffdd56f5024b45df19d40d6e6f9dd SHA256 cce16f18dd1dc7a087d37d33ae4ca507b5bcba64dabefa228ba801d1a78e4554
+EBUILD jemalloc-3.0.0.ebuild 901 RMD160 6f60119c6c59b5a31b2d85b23e1b02c14f006817 SHA1 2acf27d83feb543ba336a35df19f81dc5462a5c6 SHA256 54f0bb582e17534bb425463fcc5a8c2e73b0df4725c33cb2c92cf17a9c0ef86d

diff --git a/dev-libs/jemalloc/files/jemalloc-2.2.1-no-pprof.patch b/dev-libs/jemalloc/files/jemalloc-2.2.1-no-pprof.patch
deleted file mode 100644
index e10aab4..0000000
--- a/dev-libs/jemalloc/files/jemalloc-2.2.1-no-pprof.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/Makefile.in	2011-04-11 10:42:32.084403330 -0500
-+++ b/Makefile.in	2011-04-11 10:43:23.490760665 -0500
-@@ -42,7 +42,6 @@
- endif
- 
- # Lists of files.
--BINS := @srcroot@bin/pprof
- CHDRS := @objroot@include/jemalloc/jemalloc@install_suffix@.h \
- 	@objroot@include/jemalloc/jemalloc_defs@install_suffix@.h
- CSRCS := @srcroot@src/jemalloc.c @srcroot@src/arena.c @srcroot@src/atomic.c \
-@@ -141,13 +140,6 @@
- 	$(CC) -o $@ $< -L@objroot@lib -ljemalloc@install_suffix@
- endif
- 
--install_bin:
--	install -d $(BINDIR)
--	@for b in $(BINS); do \
--	echo "install -m 755 $$b $(BINDIR)"; \
--	install -m 755 $$b $(BINDIR); \
--done
--
- install_include:
- 	install -d $(INCLUDEDIR)/jemalloc
- 	@for h in $(CHDRS); do \

diff --git a/dev-libs/jemalloc/files/jemalloc-2.2.5_fix_html_install.patch b/dev-libs/jemalloc/files/jemalloc-2.2.5_fix_html_install.patch
deleted file mode 100644
index aff4add..0000000
--- a/dev-libs/jemalloc/files/jemalloc-2.2.5_fix_html_install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -176,7 +176,7 @@
- 	install -m 644 $$d $(MANDIR)/man3; \
- done
- 
--install_doc: install_html install_man
-+install_doc: install_man
- 
- install: install_bin install_include install_lib install_doc
- 
-

diff --git a/dev-libs/jemalloc/files/jemalloc-3.0.0-no-pprof.patch b/dev-libs/jemalloc/files/jemalloc-3.0.0-no-pprof.patch
new file mode 100644
index 0000000..c2fa815
--- /dev/null
+++ b/dev-libs/jemalloc/files/jemalloc-3.0.0-no-pprof.patch
@@ -0,0 +1,27 @@
+diff --git a/Makefile.in b/Makefile.in
+index 6675b59..ce0782f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -69,7 +69,6 @@ endif
+ LIBJEMALLOC := $(LIBPREFIX)jemalloc$(install_suffix)
+ 
+ # Lists of files.
+-BINS := $(srcroot)bin/pprof $(objroot)bin/jemalloc.sh
+ CHDRS := $(objroot)include/jemalloc/jemalloc$(install_suffix).h \
+ 	$(objroot)include/jemalloc/jemalloc_defs$(install_suffix).h
+ CSRCS := $(srcroot)src/jemalloc.c $(srcroot)src/arena.c $(srcroot)src/atomic.c \
+@@ -196,13 +195,6 @@ build_lib_shared: $(DSOS)
+ build_lib_static: $(STATIC_LIBS)
+ build: build_lib_shared build_lib_static
+ 
+-install_bin:
+-	install -d $(BINDIR)
+-	@for b in $(BINS); do \
+-	echo "install -m 755 $$b $(BINDIR)"; \
+-	install -m 755 $$b $(BINDIR); \
+-done
+-
+ install_include:
+ 	install -d $(INCLUDEDIR)/jemalloc
+ 	@for h in $(CHDRS); do \
+

diff --git a/dev-libs/jemalloc/files/jemalloc-strip-optimization.patch b/dev-libs/jemalloc/files/jemalloc-3.0.0-strip-optimization.patch
similarity index 61%
rename from dev-libs/jemalloc/files/jemalloc-strip-optimization.patch
rename to dev-libs/jemalloc/files/jemalloc-3.0.0-strip-optimization.patch
index 60b7d6c..98c09af 100644
--- a/dev-libs/jemalloc/files/jemalloc-strip-optimization.patch
+++ b/dev-libs/jemalloc/files/jemalloc-3.0.0-strip-optimization.patch
@@ -1,6 +1,8 @@
---- a/configure.ac	2010-02-22 12:07:05.000000000 +0100
-+++ b/configure.ac	2010-02-22 12:08:29.000000000 +0100
-@@ -296,21 +296,6 @@
+diff --git a/configure.ac b/configure.ac
+index a72019e..e366e1c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -556,23 +556,6 @@ if test "x$enable_debug" = "x1" ; then
  fi
  AC_SUBST([enable_debug])
  
@@ -13,13 +15,15 @@
 -    if test "x$GCC" = "xyes" ; then
 -      JE_CFLAGS_APPEND([-O3])
 -      JE_CFLAGS_APPEND([-funroll-loops])
+-    elif test "x$je_cv_msvc" = "xyes" ; then
+-      JE_CFLAGS_APPEND([-O2])
 -    else
 -      JE_CFLAGS_APPEND([-O])
 -    fi
 -  fi
 -fi
 -
- dnl Do not enable statistics calculation by default.
+ dnl Enable statistics calculation by default.
  AC_ARG_ENABLE([stats],
-   [AS_HELP_STRING([--enable-stats], [Enable statistics calculation/reporting])],
+   [AS_HELP_STRING([--disable-stats],
 

diff --git a/dev-libs/jemalloc/files/jemalloc-3.0.0_fix_html_install.patch b/dev-libs/jemalloc/files/jemalloc-3.0.0_fix_html_install.patch
new file mode 100644
index 0000000..0f3026d
--- /dev/null
+++ b/dev-libs/jemalloc/files/jemalloc-3.0.0_fix_html_install.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile.in b/Makefile.in
+index 6675b59..3032c6d 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -240,7 +240,7 @@ install_doc_man:
+ 	install -m 644 $$d $(MANDIR)/man3; \
+ done
+ 
+-install_doc: install_doc_html install_doc_man
++install_doc: install_doc_man
+ 
+ install: install_bin install_include install_lib install_doc
+ 
+

diff --git a/dev-libs/jemalloc/jemalloc-2.2.5.ebuild b/dev-libs/jemalloc/jemalloc-3.0.0.ebuild
similarity index 77%
rename from dev-libs/jemalloc/jemalloc-2.2.5.ebuild
rename to dev-libs/jemalloc/jemalloc-3.0.0.ebuild
index f2629ee..b415dca 100644
--- a/dev-libs/jemalloc/jemalloc-2.2.5.ebuild
+++ b/dev-libs/jemalloc/jemalloc-3.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=4
 
-inherit autotools
+inherit autotools eutils
 
 DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
 HOMEPAGE="http://www.canonware.com/jemalloc/"
@@ -21,9 +21,9 @@ RDEPEND=""
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}/${PN}-strip-optimization.patch" \
-		"${FILESDIR}/${PN}-2.2.1-no-pprof.patch" \
-		"${FILESDIR}/${PN}-2.2.5_fix_html_install.patch" \
+		"${FILESDIR}/${P}-strip-optimization.patch" \
+		"${FILESDIR}/${P}-no-pprof.patch" \
+		"${FILESDIR}/${P}_fix_html_install.patch" \
 
 	eautoreconf
 }

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 74f1aa8..8bc641b 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -57,4 +57,4 @@ DIST thunderbird-12.0.1-vi.xpi 436847 RMD160 e40c7ea3c9be776fabad47daaa3980f0eb2
 DIST thunderbird-12.0.1-zh-CN.xpi 431545 RMD160 bd8ea0294775358f1125984417c3ac2190349b4e SHA1 a26aed0508e24f92aa2a51120e0507191c65b1e4 SHA256 267ece6fcafc4886908e80693853be28c745b59b7c57376521f6630ccc8741cd
 DIST thunderbird-12.0.1-zh-TW.xpi 432164 RMD160 4efb04c31feb828d86df5a3b649718f98281e37d SHA1 6d4eff3e899d4d3c5ec34996b264c4660e2182b6 SHA256 e0cb1c64a3b33ba741d46daeeaf3287a1c7d4551dafcda09134d7eb049cee104
 DIST thunderbird-12.0.1.source.tar.bz2 101253776 RMD160 5df12513dd8d3554e666ff938b84a67b18a78144 SHA1 b5fcfe23834722eaa441274e0e2882adf9ed7575 SHA256 d8914f27b0ec71d940475a8942c951b106ecda69fd3a2954047584663a6ab183
-EBUILD thunderbird-12.0.1-r1.ebuild 9551 RMD160 b0de9ec19981d8c844d6f9c7bb1ff68e7dd8fc55 SHA1 11dc404bf9f7e4ff52ae13411f2ab87627473b5f SHA256 4862a34354956f0eaec2d1ffa29d0b686c6ed28117ee4bc8a8f4c2027cf19115
+EBUILD thunderbird-12.0.1-r1.ebuild 9549 RMD160 2124961c290fca1326d7f154dba0613cab58fe58 SHA1 d5f8041b0cdd1918e468ade0615b0eeecb77d82d SHA256 4f02ba828969ccb4895a60b89f510b3e84e1748d29d730bdceb0aa42f1710786

diff --git a/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild b/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild
index 87be81a..97473d2 100644
--- a/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild
+++ b/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild
@@ -288,7 +288,7 @@ src_install() {
 	fi
 
 	if use jit ; then
-		pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin}
+		pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
 	fi
 
 	# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash