1 |
commit: d28e5cb7bd169f42604802f37a52e09b3494a84b |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 28 16:04:04 2016 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 28 16:07:19 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d28e5cb7 |
7 |
|
8 |
sys-cluster/gearmand: use more recent sys-devel/boost-m4 |
9 |
|
10 |
Gentoo-Bug: 574558 |
11 |
|
12 |
Package-Manager: portage-2.2.28 |
13 |
|
14 |
.../gearmand/files/gearmand-0.34-stdbool-h.patch | 26 ++++++++++++++++++++++ |
15 |
sys-cluster/gearmand/gearmand-0.34-r1.ebuild | 25 ++++++++++++++------- |
16 |
sys-cluster/gearmand/metadata.xml | 4 ---- |
17 |
3 files changed, 43 insertions(+), 12 deletions(-) |
18 |
|
19 |
diff --git a/sys-cluster/gearmand/files/gearmand-0.34-stdbool-h.patch b/sys-cluster/gearmand/files/gearmand-0.34-stdbool-h.patch |
20 |
new file mode 100644 |
21 |
index 0000000..37d2db6 |
22 |
--- /dev/null |
23 |
+++ b/sys-cluster/gearmand/files/gearmand-0.34-stdbool-h.patch |
24 |
@@ -0,0 +1,26 @@ |
25 |
+Ignore configure checks and include stdbool.h |
26 |
+unconditionally, we're in 2016. |
27 |
+ |
28 |
+--- gearmand-0.34/libhostile/called.c |
29 |
++++ gearmand-0.34/libhostile/called.c |
30 |
+@@ -41,6 +41,7 @@ |
31 |
+ #include <assert.h> |
32 |
+ #include <stdio.h> |
33 |
+ #include <stdlib.h> |
34 |
++#include <stdbool.h> |
35 |
+ |
36 |
+ __thread bool is_called_= false; |
37 |
+ static __thread char** unique_ptr= NULL; |
38 |
+--- gearmand-0.34/libhostile/called.h |
39 |
++++ gearmand-0.34/libhostile/called.h |
40 |
+@@ -36,9 +36,7 @@ |
41 |
+ |
42 |
+ #pragma once |
43 |
+ |
44 |
+-#ifdef HAVE_STDBOOL_H |
45 |
+-# include <stdbool.h> |
46 |
+-#endif |
47 |
++#include <stdbool.h> |
48 |
+ |
49 |
+ bool is_called(void); |
50 |
+ void set_called(); |
51 |
|
52 |
diff --git a/sys-cluster/gearmand/gearmand-0.34-r1.ebuild b/sys-cluster/gearmand/gearmand-0.34-r1.ebuild |
53 |
index 54ce112..41205c5 100644 |
54 |
--- a/sys-cluster/gearmand/gearmand-0.34-r1.ebuild |
55 |
+++ b/sys-cluster/gearmand/gearmand-0.34-r1.ebuild |
56 |
@@ -1,10 +1,12 @@ |
57 |
-# Copyright 1999-2014 Gentoo Foundation |
58 |
+# Copyright 1999-2016 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
# $Id$ |
61 |
|
62 |
EAPI=5 |
63 |
|
64 |
-inherit flag-o-matic libtool user autotools-utils |
65 |
+AUTOTOOLS_AUTORECONF=1 |
66 |
+ |
67 |
+inherit autotools-utils eutils flag-o-matic libtool user |
68 |
|
69 |
DESCRIPTION="Generic framework to farm out work to other machines" |
70 |
HOMEPAGE="http://www.gearman.org/" |
71 |
@@ -13,31 +15,38 @@ SRC_URI="https://launchpad.net/gearmand/trunk/${PV}/+download/${P}.tar.gz" |
72 |
LICENSE="MIT" |
73 |
SLOT="0" |
74 |
KEYWORDS="~amd64 ~x86" |
75 |
-IUSE="debug tcmalloc +memcache drizzle sqlite tokyocabinet postgres" |
76 |
+IUSE="debug tcmalloc +memcache sqlite tokyocabinet postgres" |
77 |
|
78 |
RDEPEND="dev-libs/libevent |
79 |
>=dev-libs/boost-1.39:=[threads(+)] |
80 |
|| ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) |
81 |
tcmalloc? ( dev-util/google-perftools ) |
82 |
memcache? ( >=dev-libs/libmemcached-0.47 ) |
83 |
- drizzle? ( dev-db/drizzle ) |
84 |
sqlite? ( dev-db/sqlite:3 ) |
85 |
tokyocabinet? ( dev-db/tokyocabinet ) |
86 |
- postgres? ( >=dev-db/postgresql-9.0 )" |
87 |
+ postgres? ( >=dev-db/postgresql-9.0:* )" |
88 |
DEPEND="${RDEPEND} |
89 |
- virtual/pkgconfig" |
90 |
+ virtual/pkgconfig |
91 |
+ >=sys-devel/boost-m4-0.4_p20160328" |
92 |
|
93 |
pkg_setup() { |
94 |
enewuser gearmand -1 -1 /dev/null nogroup |
95 |
} |
96 |
|
97 |
+src_prepare() { |
98 |
+ # fixes bug 574558, which is due to an outdated bundled boost.m4 |
99 |
+ rm m4/boost.m4 || die |
100 |
+ sed -i -e 's/AM_INIT_AUTOMAKE.*//g' m4/pandora_canonical.m4 || die |
101 |
+ epatch -p1 "${FILESDIR}/${P}-stdbool-h.patch" |
102 |
+ autotools-utils_src_prepare |
103 |
+} |
104 |
+ |
105 |
src_configure() { |
106 |
local myeconfargs=( |
107 |
- $(use_enable drizzle libdrizzle) |
108 |
$(use_enable memcache libmemcached) |
109 |
- $(use_enable postgres libpq) |
110 |
$(use_enable tcmalloc) |
111 |
$(use_enable tokyocabinet libtokyocabinet) |
112 |
+ $(use_with postgres postgresql) |
113 |
$(use_with sqlite sqlite3) |
114 |
--disable-mtmalloc |
115 |
--disable-static |
116 |
|
117 |
diff --git a/sys-cluster/gearmand/metadata.xml b/sys-cluster/gearmand/metadata.xml |
118 |
index cc65070..21a9a92 100644 |
119 |
--- a/sys-cluster/gearmand/metadata.xml |
120 |
+++ b/sys-cluster/gearmand/metadata.xml |
121 |
@@ -17,10 +17,6 @@ |
122 |
Support memcache daemon (via <pkg>dev-libs/libmemcached</pkg>) |
123 |
for the queue storage. |
124 |
</flag> |
125 |
- <flag name="drizzle"> |
126 |
- Support <pkg>dev-db/libdrizzle</pkg> for the queue storage. This |
127 |
- also adds support for MySQL storage. |
128 |
- </flag> |
129 |
<flag name="tokyocabinet"> |
130 |
Support <pkg>dev-db/tokyocabinet</pkg> for the queue storage. |
131 |
</flag> |