version bump, misc fixes

(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key 0x9019241D)

4 files changed, 25 insertions, 10 deletions

diff --git a/dev-libs/jemalloc/ChangeLog b/dev-libs/jemalloc/ChangeLog
index 85ec4f07b2e5..645c6c833854 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.21 2012/08/07 19:36:27 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/ChangeLog,v 1.22 2012/10/21 19:44:32 anarchy Exp $
+
+*jemalloc-3.1.0 (21 Oct 2012)
+
+  21 Oct 2012; <anarchy@gentoo.org> -jemalloc-2.2.5.ebuild,
+  +jemalloc-3.1.0.ebuild:
+  Version bump, multiple bug fixes
 
   07 Aug 2012; Anthony G. Basile <blueness@gentoo.org> jemalloc-2.2.5.ebuild,
   jemalloc-2.2.5-r1.ebuild, jemalloc-3.0.0.ebuild:
diff --git a/dev-libs/jemalloc/jemalloc-2.2.5-r1.ebuild b/dev-libs/jemalloc/jemalloc-2.2.5-r1.ebuild
index 87e17b51dcdd..45323cba6325 100644
--- a/dev-libs/jemalloc/jemalloc-2.2.5-r1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-2.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.5-r1.ebuild,v 1.7 2012/08/07 19:36:27 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-2.2.5-r1.ebuild,v 1.8 2012/10/21 19:44:32 anarchy Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ 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}/${PN}-2.2.5_fix_html_install.patch"
 
 	eautoreconf
 }
diff --git a/dev-libs/jemalloc/jemalloc-3.0.0.ebuild b/dev-libs/jemalloc/jemalloc-3.0.0.ebuild
index 32522101eb95..d165c1185531 100644
--- a/dev-libs/jemalloc/jemalloc-3.0.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # 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-3.0.0.ebuild,v 1.3 2012/08/07 19:36:27 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-3.0.0.ebuild,v 1.4 2012/10/21 19:44:32 anarchy Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}/${P}-strip-optimization.patch" \
 		"${FILESDIR}/${P}-no-pprof.patch" \
-		"${FILESDIR}/${P}_fix_html_install.patch" \
+		"${FILESDIR}/${P}_fix_html_install.patch"
 
 	eautoreconf
 }
diff --git a/dev-libs/jemalloc/jemalloc-2.2.5.ebuild b/dev-libs/jemalloc/jemalloc-3.1.0.ebuild
index 3bc863b426ad..8a80dfbf5822 100644
--- a/dev-libs/jemalloc/jemalloc-2.2.5.ebuild
+++ b/dev-libs/jemalloc/jemalloc-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # 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.5.ebuild,v 1.7 2012/08/07 19:36:27 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-3.1.0.ebuild,v 1.1 2012/10/21 19:44:32 anarchy Exp $
 
 EAPI=4
 
@@ -12,17 +12,18 @@ SRC_URI="http://www.canonware.com/download/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 
-IUSE="debug stats"
+IUSE="debug static-libs stats"
 
 DEPEND=""
 RDEPEND=""
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}/${PN}-strip-optimization.patch" \
-		"${FILESDIR}/${PN}-2.2.1-no-pprof.patch"
+		"${FILESDIR}/${PN}-3.0.0-strip-optimization.patch" \
+		"${FILESDIR}/${PN}-3.0.0-no-pprof.patch" \
+		"${FILESDIR}/${PN}-3.0.0_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 {} +
+}