gentoo resync : 09.03.2018

3 files changed, 119 insertions, 3 deletions

diff --git a/mail-filter/mailfilter/Manifest b/mail-filter/mailfilter/Manifest
index ba51f7c3d629..b08d83c2a597 100644
--- a/mail-filter/mailfilter/Manifest
+++ b/mail-filter/mailfilter/Manifest
@@ -1,10 +1,11 @@
 AUX 0.8.2-gcc44.patch 709 BLAKE2B 277ee8bd914fa34714a54c37c8f49e8f197234e14df4a57d5c27fe5225b70f9faeb9497549c71b82ad7e46c120dcf76bcdb4a87977dd4ba363d4886f8985f635 SHA512 fa205c8aed42a41adaf7f034f3ebb99e0e0fe10a6b1135cff8c8f8fcf678ababbf5fb7b65ee8f2865404d9b717420f1f23b13c2794f038813d91b3ef7b6c1da9
 AUX 0.8.2-gcc46.patch 530 BLAKE2B f9b35c7aff37be269f54859a9a9adebb9b37710cd1f4b941b38ebc466a6c6c1f42634e65921b962c4227fc97c04c080475cf0f1e7e5ecb7a023fe9de7a73eed6 SHA512 f468f02aa73b6e7262dfbdf52aeb4fb9f14af8198d73b116a9d44d173373e3fc54aa567f0d8c9c38e3a13991a2e0e1fda286e853424cea2388c983773b5671cc
 AUX 0.8.2-openssl-1.patch 297 BLAKE2B 6f025728a77bed4fb5bd7cefb84b61600a152cd115bd1a53f7bf2b3140f76c56e4c4b73d7543499ce42f9266c8b3fecb7f01f636def4356c56be5dfee5e8df09 SHA512 bc3c76861044a50912d26458d026684b21476a94d5b851a587b998bc5cec0a0f89b63f02e2e4ee3fe830e50340ae5eedf8b6b3d719e2555d1f11813417e0fd44
+AUX 0.8.4-fix-parallel-build.patch 4549 BLAKE2B ed49f301046c489538d9e4e5544cf8d61c6f859ea66b9300fcb1f889d687d773f368750b87fdaa3e097bc1c66110cbc198534a720f57fc55f47d0b34d600b7bf SHA512 f947dfc76c7bc1213492d1b17574cb6bab56b5210a184c9a8137189402c607d0145ef85041f65d07dd83729913144d7729b11f8ff9d0939159cb419ca0a70aff
 AUX rcfile.example1 4010 BLAKE2B 83f425417e6c270ace4198bd6f4d4b5ecd1993a5926fa73cc2233986c5a3cfc55946114f535a09ebcd9bb6289ee8db22af2a9b3bf71c35ef71d6764275862b85 SHA512 875d926b525610c129dcbbba0cdaa177b4ea1a004eab853fc1f5f507e7e853923e7dfca58147b65cd403b561b85e3a9acf0da9101b344718f3ae732fae91038f
 AUX rcfile.example2 4554 BLAKE2B f5ea7e21821042e37506c6b43bb8aa0a8e3aa5872c6b24d14ce3e9b920a614590a290614e70e63983dc3438523d3ced08cdcb0820da1e9c047c621d8a1db669a SHA512 d58be80921e3372c9be79d1774a27106a113e710e4d1ee20a60f9ac2d6e8db86dd360df59801ba1c27c46069a341625069fcb36559f9d4c9847656f395f61f21
 DIST mailfilter-0.8.2.tar.gz 382966 BLAKE2B 83051f2b692dfe91865e2c5975a491882f8d167cd038a86e9481ff149be82616fd8be69ed171e8393fc0fff7f602802b0dddd0462a00c0b8cd7c0a3c91ffc2e7 SHA512 fc988fe8e36204e4041ce10d6a87f06c8fd48c311aee0d838c2eec08c0d26c13c082fb44a63e7d9c0610d8be52dbf69e340247241f3c76a209319391969ec387
 DIST mailfilter-0.8.4.tar.gz 424789 BLAKE2B 3ffee855a52b6d85ca7241ab55fd31093ff7dad218b37d2caeaf61dbe0a6ce14a283a60f6bee33409363e516902d8024ec4e5008041ddc28b48d7fc1313d5de3 SHA512 d6cd3399240f60020bf17f460376bfa73132e0714adf1e9b34e2993367440eba28d3cb8ef20b997b1ecf02419f69b761f704598641222d32b3aefdb8a96930e7
 EBUILD mailfilter-0.8.2.ebuild 755 BLAKE2B 6dbed812f71083d23b5cb6dd6e9bc97fbb1220ebf686b19e992d4d44956163d0e6c1e5e3be4d5efe25579d3742824501ff78b52112226fe2432f4d9a688f630a SHA512 ad758e9c232779001819bf6939b78bb689f4c243aa2a9bbeedefa3dc9ef78bf58de3565489be2c704a97a2830bf478158cc10cec5dd786311c5e0b34fe6232e4
-EBUILD mailfilter-0.8.4.ebuild 573 BLAKE2B a4b37e7db8261a47397e932a43f12bdb25d254e8849df3f4d5ae04c5f552a7571e1273b887a2238c3db9231e8fb427a832fbb235d1061cbf44afea3b5b2cf785 SHA512 397aecb6392b44a5bedced1e0ca7c756d5549d16ed7f3cde1aaec203827fd601cb6954dec4b789fa0a7507840ee06e5e348e3c167c7008fb146c0f8dc26c2cc8
+EBUILD mailfilter-0.8.4.ebuild 628 BLAKE2B 694bca058adf9a36d3b956780ab50fb27e06739fd49ccb54e4eee68cab61cc9c76e10bd7252282bac32f45d7eb857b6e273f30340fd136e835a07a34c9069a1b SHA512 d294531afba97b771e326de58db1ffbee519c875e744f51998bd686a8ab033740ca8ee7b1f7583e7ee3448799c09ba33c70431567d4acc602cc836ba9536281d
 MISC metadata.xml 324 BLAKE2B 53d152511faa79f82e7644c5c191b702f516275c592c6e632577b208c0afab09b1965d2ced2a59a94855990615fa84362ecc8006f1a047fdb2040f3fb3358200 SHA512 3a74aa24b93ab3fc97e9f721991170234e3b04646f1c44fc417083da656473af97bbe13d0fc8a80742a08aba0b798e1666141952cf4fe2d00e43de1a9788dbab
diff --git a/mail-filter/mailfilter/files/0.8.4-fix-parallel-build.patch b/mail-filter/mailfilter/files/0.8.4-fix-parallel-build.patch
new file mode 100644
index 000000000000..f697f94e4502
--- /dev/null
+++ b/mail-filter/mailfilter/files/0.8.4-fix-parallel-build.patch
@@ -0,0 +1,113 @@
+https://github.com/nondeterministic/mailfilter/commit/4b3991b1334d83d5f209723ab3ec58d168baff2d
+
+https://bugs.gentoo.org/649514
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -31,15 +31,11 @@ bin_PROGRAMS = mailfilter
+ rcfile.cc: rcfile.ll rcparser.hh
+ 	   $(LEX) $(AM_LFLAGS) -Prc -o$@ $<
+ 
+-# The final `touch' is necessary to be able to invoke flex/bison more
+-# than once and to not confuse the ../ylwrap script.
+-rcparser.hh: y.tab.c
+-y.tab.c: rcfile.yy
+-	   $(YACC) -p rc $(YFLAGS) -o$@ $<;   \
+-	   mv -f y.tab.c rcparser.cc;         \
+-	   mv -f y.tab.h rcparser.hh;         \
+-	   $(CXXCOMPILE) -c rcparser.cc;      \
+-	   touch y.tab.c
++rcparser.hh: rcparser.cc
++rcparser.cc: rcfile.yy
++		   $(YACC) $(YFLAGS) -b rc -p rc $<;  \
++		   mv rc.tab.c rcparser.cc; \
++		   mv rc.tab.h rcparser.hh
+ 
+ # Almost the same as above, but this time for the RFC 822 parser:
+ rfc822.cc: rfc822.ll rfc822parser.hh
+@@ -47,58 +43,41 @@ rfc822.cc: rfc822.ll rfc822parser.hh
+ 
+ rfc822parser.hh: rfc822parser.cc
+ rfc822parser.cc: rfc822.yy
+-		   $(YACC) $(YFLAGS) -p rfc -o$@ $<;  \
+-		   $(CXXCOMPILE) -c rfc822parser.cc;  \
+-		   touch y.tab.c
++		   $(YACC) $(YFLAGS) -b rfc -p rfc $<;  \
++		   mv rfc.tab.c rfc822parser.cc; \
++		   mv rfc.tab.h rfc822parser.hh
+ 
+-# This thing is a workaround to avoid compile errors.
+-# We always re-generate the source from the flex/bison input, so it
+-# always matches the installed versions and does not lead to errors.
+-CLEANFILES = rcfile.cc rcparser.hh rcparser.cc y.tab.c ylwrap    \
+-             rfc822parser.output rfc822parser.cc rfc822parser.hh \
+-	     rfc822.cc y.output
+-
+-nodist_mailfilter_SOURCES = rcfile.cc rcparser.hh y.tab.c rfc822.cc
+-
+-nodist_mailfilter_OBJECTS = y.tab.$(OBJEXT)
+-
+-# Looks like automake still wants to distribute rcfile.cc, even if it
+-# is in nodist_*_sources.
+-dist-hook:
+-	rm -f $(distdir)/rcfile.cc                              \
+-	      $(distdir)/rfc822parser.cc                        \
+-	      $(distdir)/rfcparser.cc
++CLEANFILES = *.output
+ 
+ # If this gets updated, remember to update the doxygen.in config file!
+-mailfilter_SOURCES =	md5c.c md5.h                            \
+-			defines.hh                              \
+-			rcfile.ll rcfile.hh                     \
+-			rfc822.ll                               \
+-			mailfilter.hh mailfilter.cc             \
+-			header.hh header.cc                     \
+-			weeder.hh weeder.cc                     \
+-			preferences.hh preferences.cc           \
+-			feedback.hh feedback.cc                 \
+-			filter.hh filter.cc                     \
+-			score.hh score.cc                       \
+-			account.hh account.cc                   \
+-			protocol.hh protocol.cc                 \
+-			connection.hh                           \
+-			socket.hh socket.cc                     \
+-			pop3.hh pop3.cc                         \
+-			apop.hh apop.cc                         \
++mailfilter_SOURCES =	md5c.c md5.h                              \
++			defines.hh                                \
++			rcfile.ll rcfile.hh                       \
++			rcparser.hh rcparser.cc                   \
++			rfc822.ll rfc822parser.hh rfc822parser.cc \
++			mailfilter.hh mailfilter.cc               \
++			header.hh header.cc                       \
++			weeder.hh weeder.cc                       \
++			preferences.hh preferences.cc             \
++			feedback.hh feedback.cc                   \
++			filter.hh filter.cc                       \
++			score.hh score.cc                         \
++			account.hh account.cc                     \
++			protocol.hh protocol.cc                   \
++			connection.hh                             \
++			socket.hh socket.cc                       \
++			pop3.hh pop3.cc                           \
++			apop.hh apop.cc                           \
+ 			imap.hh imap.cc
+ 
+ if !GETOPT
+ mailfilter_SOURCES += getopt.c getopt1.c getopt.h
+ endif
+ 
+-mailfilter_LDADD = rcparser.o rfc822parser.o
+-
+-INCLUDES = -I$(includedir)                                      \
+-	-I$(srcdir) -I$(top_srcdir)/include -I$(top_srcdir)     \
+-	-DLOCALEDIR=\"$(datadir)/locale\"                       \
+-	-I$(top_srcdir)/intl                                    \
+-	-I$(top_builddir) -I$(top_builddir)/include -I.
++AM_CPPFLAGS = -I$(includedir)                                     \
++	      -I$(srcdir) -I$(top_srcdir)/include -I$(top_srcdir) \
++	      -DLOCALEDIR=\"$(datadir)/locale\"                   \
++	      -I$(top_srcdir)/intl                                \
++	      -I$(top_builddir) -I$(top_builddir)/include -I.
+ 
+ LIBS = @LEXLIB@ @LIBS@
diff --git a/mail-filter/mailfilter/mailfilter-0.8.4.ebuild b/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
index 04c88dc6afc7..f3fccbcc762c 100644
--- a/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
+++ b/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,13 +9,15 @@ SRC_URI="mirror://sourceforge/mailfilter/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc sparc x86 ~x86-fbsd"
 IUSE="+ssl"
 
 DEPEND="sys-devel/flex
 	ssl? ( dev-libs/openssl:* )"
 RDEPEND=""
 
+PATCHES=( "${FILESDIR}"/0.8.4-fix-parallel-build.patch )
+
 src_configure() {
 	econf $(use_with ssl openssl)
 }