From a803bf8efae2c196365c1bc4a9fad8d6ded0dd2b Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer@gentoo.org>
Date: Thu, 2 Feb 2017 16:56:01 +0100
Subject: [PATCH] Revert "dev-libs/libevent: Add USE=malloc-replacement (bug
 #545358)."

This reverts commit 9562bcbde92483f01acbc86bddffa2861302a010.

--enable-malloc-replacement was already covered by USE=debug and that
should probably stay that way.
---
 dev-libs/libevent/libevent-2.1.8.ebuild |  7 +++----
 dev-libs/libevent/metadata.xml          | 24 +++++++++++-------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/dev-libs/libevent/libevent-2.1.8.ebuild b/dev-libs/libevent/libevent-2.1.8.ebuild
index b5b65d93a194..ca87a245997e 100644
--- a/dev-libs/libevent/libevent-2.1.8.ebuild
+++ b/dev-libs/libevent/libevent-2.1.8.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
 # libevent-2.1.so.6
 SLOT="0/2.1-6"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug libressl +malloc-replacement +ssl static-libs test +threads"
+IUSE="debug libressl +ssl static-libs test +threads"
 
 DEPEND="
 	ssl? (
@@ -43,14 +43,13 @@ multilib_src_configure() {
 
 	ECONF_SOURCE="${S}" \
 	econf \
+		--disable-samples \
 		$(use_enable debug debug-mode) \
 		$(use_enable debug malloc-replacement) \
-		$(use_enable malloc-replacement) \
 		$(use_enable ssl openssl) \
 		$(use_enable static-libs static) \
 		$(use_enable test libevent-regress) \
-		$(use_enable threads thread-support) \
-		--disable-samples
+		$(use_enable threads thread-support)
 }
 
 src_test() {
diff --git a/dev-libs/libevent/metadata.xml b/dev-libs/libevent/metadata.xml
index bb8ef501bb1a..1d56f5bd377b 100644
--- a/dev-libs/libevent/metadata.xml
+++ b/dev-libs/libevent/metadata.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>jer@gentoo.org</email>
-	<name>Jeroen Roovers</name>
-</maintainer>
-<upstream>
-	<remote-id type="cpe">cpe:/a:niels_provos:libevent</remote-id>
-	<remote-id type="github">libevent/libevent</remote-id>
-	<remote-id type="sourceforge">levent</remote-id>
-</upstream>
-<use>
-	<flag name="debug">Support runtime debug mode and malloc hooks (for programmers)</flag>
-	<flag name="malloc-replacement">Enable support for replacing the memory management functions</flag>
-</use>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:niels_provos:libevent</remote-id>
+		<remote-id type="sourceforge">levent</remote-id>
+	</upstream>
+	<use>
+		<flag name="debug">Support runtime debug mode and malloc hooks (for programmers)</flag>
+	</use>
 </pkgmetadata>
-- 
2.26.2