1 |
commit: a803bf8efae2c196365c1bc4a9fad8d6ded0dd2b |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 2 15:56:01 2017 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 2 15:56:48 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a803bf8e |
7 |
|
8 |
Revert "dev-libs/libevent: Add USE=malloc-replacement (bug #545358)." |
9 |
|
10 |
This reverts commit 9562bcbde92483f01acbc86bddffa2861302a010. |
11 |
|
12 |
--enable-malloc-replacement was already covered by USE=debug and that |
13 |
should probably stay that way. |
14 |
|
15 |
dev-libs/libevent/libevent-2.1.8.ebuild | 7 +++---- |
16 |
dev-libs/libevent/metadata.xml | 24 +++++++++++------------- |
17 |
2 files changed, 14 insertions(+), 17 deletions(-) |
18 |
|
19 |
diff --git a/dev-libs/libevent/libevent-2.1.8.ebuild b/dev-libs/libevent/libevent-2.1.8.ebuild |
20 |
index b5b65d9..ca87a24 100644 |
21 |
--- a/dev-libs/libevent/libevent-2.1.8.ebuild |
22 |
+++ b/dev-libs/libevent/libevent-2.1.8.ebuild |
23 |
@@ -13,7 +13,7 @@ LICENSE="BSD" |
24 |
# libevent-2.1.so.6 |
25 |
SLOT="0/2.1-6" |
26 |
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" |
27 |
-IUSE="debug libressl +malloc-replacement +ssl static-libs test +threads" |
28 |
+IUSE="debug libressl +ssl static-libs test +threads" |
29 |
|
30 |
DEPEND=" |
31 |
ssl? ( |
32 |
@@ -43,14 +43,13 @@ multilib_src_configure() { |
33 |
|
34 |
ECONF_SOURCE="${S}" \ |
35 |
econf \ |
36 |
+ --disable-samples \ |
37 |
$(use_enable debug debug-mode) \ |
38 |
$(use_enable debug malloc-replacement) \ |
39 |
- $(use_enable malloc-replacement) \ |
40 |
$(use_enable ssl openssl) \ |
41 |
$(use_enable static-libs static) \ |
42 |
$(use_enable test libevent-regress) \ |
43 |
- $(use_enable threads thread-support) \ |
44 |
- --disable-samples |
45 |
+ $(use_enable threads thread-support) |
46 |
} |
47 |
|
48 |
src_test() { |
49 |
|
50 |
diff --git a/dev-libs/libevent/metadata.xml b/dev-libs/libevent/metadata.xml |
51 |
index bb8ef50..1d56f5b 100644 |
52 |
--- a/dev-libs/libevent/metadata.xml |
53 |
+++ b/dev-libs/libevent/metadata.xml |
54 |
@@ -1,17 +1,15 @@ |
55 |
<?xml version="1.0" encoding="UTF-8"?> |
56 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
57 |
<pkgmetadata> |
58 |
-<maintainer type="person"> |
59 |
- <email>jer@g.o</email> |
60 |
- <name>Jeroen Roovers</name> |
61 |
-</maintainer> |
62 |
-<upstream> |
63 |
- <remote-id type="cpe">cpe:/a:niels_provos:libevent</remote-id> |
64 |
- <remote-id type="github">libevent/libevent</remote-id> |
65 |
- <remote-id type="sourceforge">levent</remote-id> |
66 |
-</upstream> |
67 |
-<use> |
68 |
- <flag name="debug">Support runtime debug mode and malloc hooks (for programmers)</flag> |
69 |
- <flag name="malloc-replacement">Enable support for replacing the memory management functions</flag> |
70 |
-</use> |
71 |
+ <maintainer type="person"> |
72 |
+ <email>jer@g.o</email> |
73 |
+ <name>Jeroen Roovers</name> |
74 |
+ </maintainer> |
75 |
+ <upstream> |
76 |
+ <remote-id type="cpe">cpe:/a:niels_provos:libevent</remote-id> |
77 |
+ <remote-id type="sourceforge">levent</remote-id> |
78 |
+ </upstream> |
79 |
+ <use> |
80 |
+ <flag name="debug">Support runtime debug mode and malloc hooks (for programmers)</flag> |
81 |
+ </use> |
82 |
</pkgmetadata> |