[gentoo-commits] repo/gentoo:master commit in: net-mail/mswatch/files/, net-mail/mswatch/

[gentoo-commits] repo/gentoo:master commit in: net-mail/mswatch/files/, net-mail/mswatch/

[Pacho Ramos]

commit:     72ed56d099356b1bf90342c205f51c88da0cfc74
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  4 15:37:27 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Apr  4 15:38:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72ed56d0

net-mail/mswatch: Fix gcc6 support, bug #594226 by Peter Levine, drop autotools-utils.eclass usage.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-mail/mswatch/files/mswatch-1.2.0-gcc6.patch    | 12 +++++++++
 ...swatch-1.2.0.ebuild => mswatch-1.2.0-r1.ebuild} | 29 ++++++++++++++--------
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/net-mail/mswatch/files/mswatch-1.2.0-gcc6.patch b/net-mail/mswatch/files/mswatch-1.2.0-gcc6.patch
new file mode 100644
index 00000000000..2b4fa4ce5d2
--- /dev/null
+++ b/net-mail/mswatch/files/mswatch-1.2.0-gcc6.patch
@@ -0,0 +1,12 @@
+--- mswatch-1.2.0/src/lib/util.h.old	2016-09-23 19:09:54.195069503 -0400
++++ mswatch-1.2.0/src/lib/util.h	2016-09-23 19:10:04.663460768 -0400
+@@ -21,9 +21,6 @@
+ 
+ void drain_fd(int fd);
+ 
+-// static assert, for compile-time assertion checking
+-#define static_assert(x) switch (x) case 0: case (x):
+-
+ __END_DECLS
+ 
+ 

diff --git a/net-mail/mswatch/mswatch-1.2.0.ebuild b/net-mail/mswatch/mswatch-1.2.0-r1.ebuild
similarity index 60%
rename from net-mail/mswatch/mswatch-1.2.0.ebuild
rename to net-mail/mswatch/mswatch-1.2.0-r1.ebuild
index 7f4ba1a6d78..06d3a3d1712 100644
--- a/net-mail/mswatch/mswatch-1.2.0.ebuild
+++ b/net-mail/mswatch/mswatch-1.2.0-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-
-inherit linux-info autotools-utils
+EAPI=6
+inherit linux-info ltprune
 
 DESCRIPTION="A utility to watch mailstores for changes and initiate mailbox syncs"
 HOMEPAGE="http://mswatch.sourceforge.net/"
@@ -16,17 +15,25 @@ IUSE="static-libs"
 
 RDEPEND=">=dev-libs/glib-2.6:2"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 CONFIG_CHECK="~INOTIFY_USER"
 ERROR_INOTIFY_USER="${P} requires in-kernel inotify support."
 
-DOCS=( AUTHORS NEWS README THANKS TODO )
-PATCHES=( "${FILESDIR}"/${P}-gcc47.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc47.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
 
 src_configure() {
-	local myeconfargs=(
-		--with-notify=inotify
-	)
-	autotools-utils_src_configure
+	econf \
+		--with-notify=inotify \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
 }