1 |
commit: 72ed56d099356b1bf90342c205f51c88da0cfc74 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 4 15:37:27 2017 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 4 15:38:46 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72ed56d0 |
7 |
|
8 |
net-mail/mswatch: Fix gcc6 support, bug #594226 by Peter Levine, drop autotools-utils.eclass usage. |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
net-mail/mswatch/files/mswatch-1.2.0-gcc6.patch | 12 +++++++++ |
13 |
...swatch-1.2.0.ebuild => mswatch-1.2.0-r1.ebuild} | 29 ++++++++++++++-------- |
14 |
2 files changed, 30 insertions(+), 11 deletions(-) |
15 |
|
16 |
diff --git a/net-mail/mswatch/files/mswatch-1.2.0-gcc6.patch b/net-mail/mswatch/files/mswatch-1.2.0-gcc6.patch |
17 |
new file mode 100644 |
18 |
index 00000000000..2b4fa4ce5d2 |
19 |
--- /dev/null |
20 |
+++ b/net-mail/mswatch/files/mswatch-1.2.0-gcc6.patch |
21 |
@@ -0,0 +1,12 @@ |
22 |
+--- mswatch-1.2.0/src/lib/util.h.old 2016-09-23 19:09:54.195069503 -0400 |
23 |
++++ mswatch-1.2.0/src/lib/util.h 2016-09-23 19:10:04.663460768 -0400 |
24 |
+@@ -21,9 +21,6 @@ |
25 |
+ |
26 |
+ void drain_fd(int fd); |
27 |
+ |
28 |
+-// static assert, for compile-time assertion checking |
29 |
+-#define static_assert(x) switch (x) case 0: case (x): |
30 |
+- |
31 |
+ __END_DECLS |
32 |
+ |
33 |
+ |
34 |
|
35 |
diff --git a/net-mail/mswatch/mswatch-1.2.0.ebuild b/net-mail/mswatch/mswatch-1.2.0-r1.ebuild |
36 |
similarity index 60% |
37 |
rename from net-mail/mswatch/mswatch-1.2.0.ebuild |
38 |
rename to net-mail/mswatch/mswatch-1.2.0-r1.ebuild |
39 |
index 7f4ba1a6d78..06d3a3d1712 100644 |
40 |
--- a/net-mail/mswatch/mswatch-1.2.0.ebuild |
41 |
+++ b/net-mail/mswatch/mswatch-1.2.0-r1.ebuild |
42 |
@@ -1,9 +1,8 @@ |
43 |
-# Copyright 1999-2013 Gentoo Foundation |
44 |
+# Copyright 1999-2017 Gentoo Foundation |
45 |
# Distributed under the terms of the GNU General Public License v2 |
46 |
|
47 |
-EAPI="4" |
48 |
- |
49 |
-inherit linux-info autotools-utils |
50 |
+EAPI=6 |
51 |
+inherit linux-info ltprune |
52 |
|
53 |
DESCRIPTION="A utility to watch mailstores for changes and initiate mailbox syncs" |
54 |
HOMEPAGE="http://mswatch.sourceforge.net/" |
55 |
@@ -16,17 +15,25 @@ IUSE="static-libs" |
56 |
|
57 |
RDEPEND=">=dev-libs/glib-2.6:2" |
58 |
DEPEND="${RDEPEND} |
59 |
- virtual/pkgconfig" |
60 |
+ virtual/pkgconfig |
61 |
+" |
62 |
|
63 |
CONFIG_CHECK="~INOTIFY_USER" |
64 |
ERROR_INOTIFY_USER="${P} requires in-kernel inotify support." |
65 |
|
66 |
-DOCS=( AUTHORS NEWS README THANKS TODO ) |
67 |
-PATCHES=( "${FILESDIR}"/${P}-gcc47.patch ) |
68 |
+PATCHES=( |
69 |
+ "${FILESDIR}"/${P}-gcc47.patch |
70 |
+ "${FILESDIR}"/${P}-gcc6.patch |
71 |
+) |
72 |
|
73 |
src_configure() { |
74 |
- local myeconfargs=( |
75 |
- --with-notify=inotify |
76 |
- ) |
77 |
- autotools-utils_src_configure |
78 |
+ econf \ |
79 |
+ --with-notify=inotify \ |
80 |
+ --enable-shared \ |
81 |
+ $(use_enable static-libs static) |
82 |
+} |
83 |
+ |
84 |
+src_install() { |
85 |
+ default |
86 |
+ prune_libtool_files |
87 |
} |