From 72ed56d099356b1bf90342c205f51c88da0cfc74 Mon Sep 17 00:00:00 2001
From: Pacho Ramos <pacho@gentoo.org>
Date: Tue, 4 Apr 2017 17:37:27 +0200
Subject: 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 ++++++++
 net-mail/mswatch/mswatch-1.2.0-r1.ebuild        | 39 +++++++++++++++++++++++++
 net-mail/mswatch/mswatch-1.2.0.ebuild           | 32 --------------------
 3 files changed, 51 insertions(+), 32 deletions(-)
 create mode 100644 net-mail/mswatch/files/mswatch-1.2.0-gcc6.patch
 create mode 100644 net-mail/mswatch/mswatch-1.2.0-r1.ebuild
 delete mode 100644 net-mail/mswatch/mswatch-1.2.0.ebuild

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 000000000000..2b4fa4ce5d2b
--- /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-r1.ebuild b/net-mail/mswatch/mswatch-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..06d3a3d17125
--- /dev/null
+++ b/net-mail/mswatch/mswatch-1.2.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit linux-info ltprune
+
+DESCRIPTION="A utility to watch mailstores for changes and initiate mailbox syncs"
+HOMEPAGE="http://mswatch.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/glib-2.6:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+CONFIG_CHECK="~INOTIFY_USER"
+ERROR_INOTIFY_USER="${P} requires in-kernel inotify support."
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc47.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
+
+src_configure() {
+	econf \
+		--with-notify=inotify \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/net-mail/mswatch/mswatch-1.2.0.ebuild b/net-mail/mswatch/mswatch-1.2.0.ebuild
deleted file mode 100644
index 7f4ba1a6d786..000000000000
--- a/net-mail/mswatch/mswatch-1.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit linux-info autotools-utils
-
-DESCRIPTION="A utility to watch mailstores for changes and initiate mailbox syncs"
-HOMEPAGE="http://mswatch.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/glib-2.6:2"
-DEPEND="${RDEPEND}
-	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 )
-
-src_configure() {
-	local myeconfargs=(
-		--with-notify=inotify
-	)
-	autotools-utils_src_configure
-}
-- 
cgit v1.2.3-65-gdbad