Fix bug #403945 and #398675

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

4 files changed, 35 insertions, 22 deletions

diff --git a/dev-libs/jemalloc/ChangeLog b/dev-libs/jemalloc/ChangeLog
index 271537f69cb0..92846c460d3b 100644
--- a/dev-libs/jemalloc/ChangeLog
+++ b/dev-libs/jemalloc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/jemalloc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/ChangeLog,v 1.9 2012/01/16 11:56:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/ChangeLog,v 1.10 2012/02/26 04:05:32 anarchy Exp $
+
+*jemalloc-2.2.5-r1 (26 Feb 2012)
+
+  26 Feb 2012; Jory A. Pratt <anarchy@gentoo.org> -jemalloc-2.2.3.ebuild,
+  +jemalloc-2.2.5-r1.ebuild, +files/jemalloc-2.2.5_fix_html_install.patch:
+  Fix bug #403945 and #398675
 
   16 Jan 2012; Agostino Sarubbo <ago@gentoo.org> jemalloc-2.2.5.ebuild:
   Stable for amd64, wrt bug #398521
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index bbf3423f22ff..b9e6c43851ff 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -1,22 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 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.3.tar.bz2 224059 RMD160 a1fbb7e58fefb84eaf843a3867cc5d4da212409d SHA1 5bc361b517bc038248c077f9921ceac41ffba151 SHA256 bb042a809f6d7500b7f6bad318de43fbb7e050f11273954ce650d6f27f9cf781
 DIST jemalloc-2.2.5.tar.bz2 224118 RMD160 355d11645d3b4f1a8a82c5455ebf544eab2a2d4e SHA1 0964af950f3e423eec2d04cc1a839149f807dcc9 SHA256 efcc9636757bd7f53a0fde084c2988bfe26f2868e435447f2d41ac42c0b3521e
-EBUILD jemalloc-2.2.3.ebuild 777 RMD160 96757a5e897a72d6498c1a27b728a41dfd5955f7 SHA1 a474cf6a9137472eea4b6393ff4e9fa8ce8d7091 SHA256 6c0e971028b90a6d4d8a04bb6ba9b9168e09d05afa711b96124314c3c291f726
+EBUILD jemalloc-2.2.5-r1.ebuild 1014 RMD160 dd23785d2d1f1b81c673f7ff08fcdbd8869327df SHA1 c87347e8413d7c893833321bc712f1d23f2ab0f1 SHA256 95e421db591ecd827bd2cc48bf71afb3f984d210c6337fb69b157409ca568c7f
 EBUILD jemalloc-2.2.5.ebuild 769 RMD160 8b3c4a126580fc73b4f677c6d142365131c2d372 SHA1 2f9abf157fdab53bc67df01e521455a5debe5d3a SHA256 a996afb269e8f50f2e48a71e606db0c9d34d2afc4de0c59b8d24518c859ca70e
-MISC ChangeLog 1798 RMD160 b0b7caab7c963521dadce4efc5090478dd274d15 SHA1 9df45d4bdefc24c528cb5e8aa6b8adb10629a750 SHA256 68fcec584f85f4c6ed272afd8fcb3df32009d6b92abab32d02a7f57abae6cedd
+MISC ChangeLog 2017 RMD160 15cba2b6eb1c4f10054125a023756608443ba9a8 SHA1 d2c63ec20424d22bd48509fd060e5997c4861ced SHA256 f27f7182ea3f8d8daf9756eebc0d8f19b80e6dcf418c33bec705110f1a268ea9
 MISC metadata.xml 356 RMD160 cbb4582163bc26d5b05649c245c8a5596ace01eb SHA1 c958290d95adafba1aa76ebdf09c002decddb2b9 SHA256 1b1a10ebdd274e8b4c365e29a9a69e4f79d15eb427def15dc12921f97784756b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCgAGBQJPFBBtAAoJEOTDgjZ80txdGBIH/jUk1M0pwTVbb/kIiKGwqw5e
-YVChjMcrAz9Cj4jfSJJkf3CRybTif4LL7qjcP4ODIzTHbg3/TBbO7seK5L/8I924
-5ZrIKNr2/gBnZzXwMY7k+UcSeISyO158DBXHm4r8Q+nW8IiiSAguaOV8XNbVCPXf
-Q5dDn8D8TFYny125yRxPYWlmypEH3eyqijQCl8LxsQfKRT6IqTijoRkCBZK9Twl8
-PRpfOthqIs2NGNGhliJ9cSP+lDhaS7vsAUF/4QeXcmRY7cbBkdRDSDjjO0XOeeyp
-rkHYLSEbundyl0h9Y+0x5U9+V4XLyrqgWvB02uHovDK0wcMWZDLibguBMhmx3Uc=
-=0GGp
------END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..aff4add8b3fe
--- /dev/null
+++ b/dev-libs/jemalloc/files/jemalloc-2.2.5_fix_html_install.patch
@@ -0,0 +1,12 @@
+--- 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/jemalloc-2.2.3.ebuild b/dev-libs/jemalloc/jemalloc-2.2.5-r1.ebuild
index 61c157f43067..73a45e2e693c 100644
--- a/dev-libs/jemalloc/jemalloc-2.2.3.ebuild
+++ b/dev-libs/jemalloc/jemalloc-2.2.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-2.2.3.ebuild,v 1.2 2011/11/09 19:53:21 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-2.2.5-r1.ebuild,v 1.1 2012/02/26 04:05:32 anarchy Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-IUSE="debug stats"
+IUSE="debug static-libs stats"
 
 DEPEND=""
 RDEPEND=""
@@ -22,7 +22,8 @@ RDEPEND=""
 src_prepare() {
 	epatch \
 		"${FILESDIR}/${PN}-strip-optimization.patch" \
-		"${FILESDIR}/${PN}-2.2.1-no-pprof.patch"
+		"${FILESDIR}/${PN}-2.2.1-no-pprof.patch" \
+		"${FILESDIR}/${PN}-2.2.5_fix_html_install.patch" \
 
 	eautoreconf
 }
@@ -33,3 +34,11 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable stats)
 }
+
+src_install() {
+	emake DESTDIR="${ED}" install || die
+	dodoc ChangeLog README
+	dohtml doc/jemalloc.html
+
+	use static-libs || find "${ED}" -name '*.a' -exec rm -f {} +
+}