Version bump, multiple bug fixes, bug #461582

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

4 files changed, 10 insertions, 78 deletions

diff --git a/dev-libs/jemalloc/ChangeLog b/dev-libs/jemalloc/ChangeLog
index 44caf0f3c561..00cf4e605cc9 100644
--- a/dev-libs/jemalloc/ChangeLog
+++ b/dev-libs/jemalloc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/jemalloc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/ChangeLog,v 1.27 2013/01/28 20:17:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/ChangeLog,v 1.28 2013/03/24 19:18:31 anarchy Exp $
+
+*jemalloc-3.3.1 (24 Mar 2013)
+
+  24 Mar 2013; Jory A. Pratt <anarchy@gentoo.org> -jemalloc-3.2.0.ebuild,
+  -jemalloc-3.3.0.ebuild, -files/jemalloc-3.3.0-s390.patch,
+  +jemalloc-3.3.1.ebuild:
+  Version bump, multiple bug fixes, bug #461582
 
   28 Jan 2013; Mike Frysinger <vapier@gentoo.org>
   +files/jemalloc-3.3.0-s390.patch, jemalloc-3.3.0.ebuild:
diff --git a/dev-libs/jemalloc/files/jemalloc-3.3.0-s390.patch b/dev-libs/jemalloc/files/jemalloc-3.3.0-s390.patch
deleted file mode 100644
index 49da7336f44e..000000000000
--- a/dev-libs/jemalloc/files/jemalloc-3.3.0-s390.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0b0774d2bc6092ca5ad07f0653c569b6fa55c6fe Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 28 Jan 2013 15:14:26 -0500
-Subject: [PATCH] fix building for s390 systems
-
-Checking for __s390x__ means you work on s390x, but not s390 (32bit)
-systems.  So use __s390__ which works for both.
-
-With this, `make check` passes on s390.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- include/jemalloc/internal/jemalloc_internal.h.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in
-index c606c12..74a8bd5 100644
---- a/include/jemalloc/internal/jemalloc_internal.h.in
-+++ b/include/jemalloc/internal/jemalloc_internal.h.in
-@@ -287,7 +287,7 @@ static const bool config_ivsalloc =
- #  ifdef __powerpc__
- #    define LG_QUANTUM		4
- #  endif
--#  ifdef __s390x__
-+#  ifdef __s390__
- #    define LG_QUANTUM		4
- #  endif
- #  ifdef __SH4__
--- 
-1.8.0.2
-
diff --git a/dev-libs/jemalloc/jemalloc-3.2.0.ebuild b/dev-libs/jemalloc/jemalloc-3.2.0.ebuild
deleted file mode 100644
index 0ec5f2d2eee4..000000000000
--- a/dev-libs/jemalloc/jemalloc-3.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.2.0.ebuild,v 1.3 2012/12/29 19:28:18 armin76 Exp $
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
-HOMEPAGE="http://www.canonware.com/jemalloc/"
-SRC_URI="http://www.canonware.com/download/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE="debug static-libs stats"
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	epatch \
-		"${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
-}
-
-src_configure() {
-	econf \
-		$(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 {} +
-}
diff --git a/dev-libs/jemalloc/jemalloc-3.3.0.ebuild b/dev-libs/jemalloc/jemalloc-3.3.1.ebuild
index 1b97ac6278bb..03e4f81d8981 100644
--- a/dev-libs/jemalloc/jemalloc-3.3.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-3.3.0.ebuild,v 1.2 2013/01/28 20:17:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-3.3.1.ebuild,v 1.1 2013/03/24 19:18:31 anarchy Exp $
 
 EAPI=4
 
@@ -19,8 +19,7 @@ src_prepare() {
 	epatch \
 		"${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" \
-		"${FILESDIR}/${PN}-3.3.0-s390.patch"
+		"${FILESDIR}/${PN}-3.0.0_fix_html_install.patch"
 
 	eautoreconf
 }