gentoo resync : 09.12.2017

9 files changed, 39 insertions, 20 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 6b7ea6e7374a..a27e7c1f3724 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/automx/Manifest b/net-mail/automx/Manifest
index d3fcdbb0d19c..18b492bc782a 100644
--- a/net-mail/automx/Manifest
+++ b/net-mail/automx/Manifest
@@ -1,4 +1,4 @@
 DIST automx-0.10.2.tgz 410456 SHA256 9ae30696ae691c673399cc0901ab245d3aec76ffe3d74382e6802287e186e4df SHA512 88f844d70439985dd55cc694a58bc1fe313162ba47c7675fb15143c107d76974eee043faf5715d7ba9a5918686d491f5efabe9785e90cf399492871f08b2e38d WHIRLPOOL 4a090b7457d0230944a4855aba1a1811ea1cb8a687efc5ff8bc1abe0506a9dc32f5e77384cb9958a112104729c6e46521ad39ef52ba2dba00492a70e7a65cd3b
 EBUILD automx-0.10.2-r1.ebuild 1421 BLAKE2B 86defecb23efbeaeb61cc27ea10b49cc0952a56c34a03ef631da74f2aaa9c3d947a845d0dd97ca9df7318c22ad072f8b98492aed7ec5a37eb6041249bb580f33 SHA512 ac37eefebdd77d8fd5cc06d138b6413affb8cb0cb81e0037505446de1b5c1c4d23f62add350c1a1d7134c91bef0235eb601ea79d8676d8ec9ab6b2a0c7707f62
-EBUILD automx-0.10.2-r2.ebuild 1462 BLAKE2B 195e42822ce295d23107c029d5e9cf41466f2e3a9dadd23e3b22bf7cb89ebfefe09e49aaa269d200d8cb99d7cb32d4432c81618d3879a020b51c7df56780996d SHA512 1e0ed494942cea9b1151086cd55fbcef173f3eee54f146c49acb219332087dfa3d374aa86395d27a2c472f402e67b80d1ef057a84c600788f69d4ddbd89c850f
+EBUILD automx-0.10.2-r2.ebuild 1461 BLAKE2B d1484455bee8b800fea0319f9cfab46f908578ae88161f1ecf3bdac5fd5fb78543771736384565bb5905f4db08114d3ae78f2674b4424072bf9e38feeb83141d SHA512 a7dd93a75f35cce8a6705e95b678a23d4bf887e39c739fd4becdadd084304c649ff60e5ec3fbb78937eabbc29877a6c75912e75ba47296706daac60c08429d1e
 MISC metadata.xml 538 BLAKE2B 0a90c652c721d0ebda9b6359d0325ed40c8a356b6dada77c550b7f184a3073584c2e232ebab9c8be58f13ba1d93294479528128397a459281236cb4401f5ada4 SHA512 851cb5d749750e3c8b360248d32bdf5c7c5fa626ff329e5104f0e9f8f639a42df12d36ddd93b6cb962567094fa1150666900491b8bcb906aadd427c38fa2c5f2
diff --git a/net-mail/automx/automx-0.10.2-r2.ebuild b/net-mail/automx/automx-0.10.2-r2.ebuild
index f9f23a5e0950..57b4d04b665b 100644
--- a/net-mail/automx/automx-0.10.2-r2.ebuild
+++ b/net-mail/automx/automx-0.10.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/sys4/${PN}/archive/v${PV}.tar.gz -> automx-${PV}.tgz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="ldap memcached sql +tools"
 
 DEPEND="
diff --git a/net-mail/qpopper/Manifest b/net-mail/qpopper/Manifest
index d89bebf79245..93ddc815a9a5 100644
--- a/net-mail/qpopper/Manifest
+++ b/net-mail/qpopper/Manifest
@@ -1,7 +1,8 @@
-AUX qpopper-4.1-parallel-build.patch 464 BLAKE2B bca4da84d75a15da572799573f87942b5195a85e8e465b3b95ec21f2135e1ebd95f58bea0806f0d3d172cc3576021bdc8021abf39af972d51bd4a14678342810 SHA512 b80d0ecf87523a9f52927029f5d11b0937bf27ee634309a02184686ce5077f6da53f4e2cf12d3e2ae76ee45f16720addf2d23d6de7bf0c5b1a1a7b7906a25764
+AUX qpopper-4.1-parallel-build.patch 468 BLAKE2B 5302f6843a528d8f1fa3a138b0ba5429270b28a989860b2fb3e3d8e78f3213cbd8676b689e6a33e391ed3581af60466fa2a37201c489fa156625b1f11bc115dc SHA512 d30ed1421a86e071e1babf7a4212bb72bffb5652f72ee3142e03a738d2ca5f62a261f6cdf998fb580bcef571215923ca150e0116c0bcc9776361364a0ec5ab85
+AUX qpopper-4.1.0-glibc.patch 510 BLAKE2B 79e0ba9d566f043025140a3325c5c36678d4402212e2575d155c10f56a6324149346166076dd30393bdba90ec4134467eef9c874b5dd36d0de1c6afc5889f04f SHA512 5136669fd4f82d927396297fe7f391b79efa4bd646bdc93bb949b9bbf155c07d1b62b6bc47e4818c188d008ce6ef98fb10e57b0bb77304fe686ca750895cd4aa
 AUX qpopper.conf 20457 BLAKE2B df105aacf36092be081639074f600d72e3b30c000a913a688276c4df3fcbfafbd19fa2fd0784164fa5de69497b2ce7c14cd29cb8eb2a7aa484ee519a6cd3dc69 SHA512 d7be7f0528b3059c1c09bcdef5dd519bfae82d1f63bd9316f5f1c86ca2df911a4e91ff87ec50ceb5e6b0e27a0b1f86dd2949800619df0a507f4bbb13a0d895b5
 AUX qpopper.init.d 411 BLAKE2B d9a57c16d531ba4964bd7a7693a92381faf86003e8b5c7be51688f8aa230c95c7c11425be897393dcf85883888c5681194b05325627dc16b92c93fa0b70c1c6e SHA512 06db8105e0e925b5b25a5024e6b4080e64317a0219d3db8e0a75fad1c8271d2aea3f38f7e44a07256a24a3354fb2bebc0a63ef22fc41381ad91239a540240aba
 AUX qpopper.xinetd 408 BLAKE2B bc3f7cc144d7900abf02371e03535150127c520b46f232f9bbde14f171ac1479e24b102b2064b3ed59725c67fd0ba79783fa21ebf932dcc8d3bc73abbbcc40fb SHA512 291c2ab21356210d415fae4816bfc9f295ebb47a75a4d523f81f0d14dd9380fe0ffceac53fa84f0491c68b7082d543f4c6f4e486ca818efc1fbc254ad5926458
-DIST qpopper4.1.0.tar.gz 1239530 SHA256 1bc21f83cda47e9b2d5d8ceecc49f169e10fdb9b99ddddcd543218fad269b0de SHA512 01e3ac13fa446bded84628a29a23849f623d5e5f85fdb77126cc4c2e20785c658fbc3d8a356eafd9f0ed2e879c6b4f6a754b6b685ea51b784c2cd0458c389c8b WHIRLPOOL 1317aaf3726a0406aa3b3bda0316a8fcd859dd681fe961db2233ae3832ad262d5341fa5af42796af2b2d86ac9f9cf32e8ee625c993021eb619df0807f2fff0f5
-EBUILD qpopper-4.1.0.ebuild 3076 BLAKE2B 23fc4242ca586da70f47d9c6dfa66b7902321462af8042d4def387a44d24d8983bd8b6bcef1aca159397612190d14833f7638f1733f52b0dc1b24f55905f8f16 SHA512 73b74e0ca671b77eba35d08d2754811f6e0a0bb0ccc4d58647d8da47e16a0d2b03f05a8064855cf187bcb36c1e83c6612af255e3bed70a213cbc8545e9c1e399
+DIST qpopper4.1.0.tar.gz 1239530 BLAKE2B a82d0ae8cbb5e606b8e0f7f4902b6920e14f404fa78860d4a7e92e0ab9ac354d518aab39f4a32c9b095c9396995e186bde2315d17d9496a7c0231cb1452e1439 SHA512 01e3ac13fa446bded84628a29a23849f623d5e5f85fdb77126cc4c2e20785c658fbc3d8a356eafd9f0ed2e879c6b4f6a754b6b685ea51b784c2cd0458c389c8b
+EBUILD qpopper-4.1.0.ebuild 3114 BLAKE2B b44240828c32df07eced146eabd741939edb6d0190c83d96586bbfa30dc43abc60de74fafcd1ace7bc49d6dcd5be311e1e1e360c5cc446c26e06a4b800c3874b SHA512 cf4eb9672ec519266333c281fdda15c479c6cfcf72db5222f053216e8b67fc5c8df5e6dc803014f855578ae3e5b24d2f12b44f7f45de4538c411d5575fbacfb2
 MISC metadata.xml 476 BLAKE2B 431ab71a9a3aa9f4d62bc5cd37a02f054e560ebdf24d853d15d333e96bea578bcee6fcc718daf6fcaa9a98ae2d23e1b534f6c83e333bb1347cd649c523950102 SHA512 9e8beaacad50c6f2c7397793d61cbe31a85e000aad1d0f161c07f6886705b42b5e1ceae30bd71f4877f461c2c9d46d9b49565a8ac6d662fe0495198f63395e19
diff --git a/net-mail/qpopper/files/qpopper-4.1-parallel-build.patch b/net-mail/qpopper/files/qpopper-4.1-parallel-build.patch
index 23cc7c39cece..16b0c3aff88d 100644
--- a/net-mail/qpopper/files/qpopper-4.1-parallel-build.patch
+++ b/net-mail/qpopper/files/qpopper-4.1-parallel-build.patch
@@ -1,6 +1,6 @@
 === modified file 'popper/Makefile.in'
---- popper/Makefile.in	2011-09-11 13:29:01 +0000
-+++ popper/Makefile.in	2011-09-11 13:29:23 +0000
+--- a/popper/Makefile.in	2011-09-11 13:29:01 +0000
++++ b/popper/Makefile.in	2011-09-11 13:29:23 +0000
 @@ -212,7 +212,7 @@
  	        -I${common_srcdir} ${common_dir}/libcommon.a \
  	        ${LIBS} ${LDFLAGS}
diff --git a/net-mail/qpopper/files/qpopper-4.1.0-glibc.patch b/net-mail/qpopper/files/qpopper-4.1.0-glibc.patch
new file mode 100644
index 000000000000..53e2c6234f9f
--- /dev/null
+++ b/net-mail/qpopper/files/qpopper-4.1.0-glibc.patch
@@ -0,0 +1,12 @@
+glibc-fix.diff:
+--- qpopper4.1.0/popper/popper.h.orig	2011-05-30 21:13:40.000000000 +0200
++++ qpopper4.1.0/popper/popper.h	2016-12-31 09:31:26.910604367 +0100
+@@ -313,7 +313,7 @@
+ #if !( defined(BSD) && (BSD >= 199306) ) && !defined(__USE_BSD)
+    extern int              sys_nerr;
+ #  ifndef FREEBSD
+-     extern char         *   sys_errlist[];
++     extern const char         * const  sys_errlist[];
+ #    ifndef SYS_SIGLIST_DECLARED
+ #      ifndef __linux__
+          extern char         *   sys_siglist[];
diff --git a/net-mail/qpopper/qpopper-4.1.0.ebuild b/net-mail/qpopper/qpopper-4.1.0.ebuild
index e9b1d4e5b43e..a2e67328a12b 100644
--- a/net-mail/qpopper/qpopper-4.1.0.ebuild
+++ b/net-mail/qpopper/qpopper-4.1.0.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-#inherit eutils flag-o-matic ssl-cert
-inherit eutils ssl-cert user
+EAPI=6
+inherit ssl-cert user
 
 MY_P=${PN}${PV}
 
@@ -11,7 +10,7 @@ DESCRIPTION="A POP3 Server"
 HOMEPAGE="http://www.eudora.com/products/unsupported/qpopper/index.html"
 SRC_URI="ftp://ftp.qualcomm.com/eudora/servers/unix/popper/${MY_P}.tar.gz"
 
-LICENSE="qpopper ISOC-rfc"
+LICENSE="qpopper GPL-2 ISOC-rfc"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug drac gdbm mailbox pam ssl xinetd apop"
@@ -22,19 +21,25 @@ DEPEND="virtual/mta
 	gdbm? ( sys-libs/gdbm )
 	drac? ( mail-client/drac )
 	pam? ( >=sys-libs/pam-0.72 )
-	ssl? ( dev-libs/openssl )"
+	ssl? ( dev-libs/openssl:0 )
+"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1-parallel-build.patch
+	"${FILESDIR}"/${PN}-4.1.0-glibc.patch #532254
+)
 
 pkg_setup() {
 	use apop && enewuser pop
 }
 
 src_prepare() {
+	default
 	# Test dirs are full of binary craft. Drop it.
 	rm -rf ./mmangle/test || die
-	epatch "${FILESDIR}"/${PN}-4.1-parallel-build.patch
 	sed -i -e 's:-o popauth:& ${LDFLAGS}:' popper/Makefile.in || die
 }
 
@@ -87,11 +92,12 @@ src_install() {
 		newinitd "${FILESDIR}/qpopper.init.d" qpopper
 	fi
 
-	dodoc README doc/{Release.Notes,Changes}
+	HTML_DOCS="doc/LMOS-FAQ.html"
+	einstalldocs
+	dodoc doc/{Release.Notes,Changes}
 
 	docinto rfc
 	dodoc doc/rfc*.txt
-	dohtml doc/LMOS-FAQ.html
 
 	insinto /usr/share/doc/${PF}
 	doins GUIDE.pdf
diff --git a/net-mail/queue-repair/Manifest b/net-mail/queue-repair/Manifest
index 556c9dceff87..8b915599c1e9 100644
--- a/net-mail/queue-repair/Manifest
+++ b/net-mail/queue-repair/Manifest
@@ -1,4 +1,4 @@
 DIST queue-repair-0.9.0.tar.gz 13913 SHA256 b1a863bbcfbedab348415425df8962a6f936c4ca3f3de72735d38f7d7471a96a SHA512 b7c21de207c80c3f764eddae6e60b4d54869f2037f572f98ff4e0a1e34f55ae1feeab5162b4f0f902a5a3c9d631c687057cdfdc4f646d6843d845f31f5b7bf6f WHIRLPOOL b8601e357e34d3863378c1b365b1ac1f18577a0420b89ac894ab4b982cc8ee926a2673afc050fd92dc9fc144a2e126478ee759d58e7482972ba9478fd9024279
-EBUILD queue-repair-0.9.0-r1.ebuild 747 BLAKE2B 3aaa947303d28ee943c22bc3f19469c46f1661134de9bfc713f4392ca3481347714dcd2e1e9b42471609ce38699377919a0eedeb33511a72c50dcbce784556da SHA512 c45fbeada2812e640e59a9f63ba613dafc67b2559a3e992ebf761b4b52a25ddcc90d31d0938b13419e4a305c2f8f6bf5d9e20cfd2de5fa8cbe87a79609e267be
+EBUILD queue-repair-0.9.0-r1.ebuild 746 BLAKE2B 71bfd0a2712be454b91ccffab020e31538dc697bc05431e4969279ee7ca46328b0c78908a55fe7459b84321a07356b40dc7e9a08ebf6cbf46938d850ce30edd7 SHA512 a25b289c206fad47b48bca4153b98390d0b7fd9bdcd6a730976d2542496affa7f011f5d8328bca02a1868f113641bead78829b90eac1a3de63b4b6bca623b274
 EBUILD queue-repair-0.9.0.ebuild 638 BLAKE2B 286c40dc7a323c7f4068eb4c4dab760bd1891f438c176649120263127c8b7894a2a7710d725bc403adb0fc8d06c43f0115ced3ebbf0a8bea41989268efa0ca0b SHA512 d6eff34fd75b07426d5d52b0ede25aa8be7f2b4b1909607b890cccc0087ee575355e7065dbacfa15637d4360996a0c8e26011544e57efbd5dcd40ee4498eaa4b
 MISC metadata.xml 543 BLAKE2B a2923d984da9728c183f5672e4199d2b0b9ae8c8a90553e6029a631184812a4167ea092f53613eb9266e31b895be8172f201f9347a9a0dcca72ff42bf17f6e62 SHA512 ce15418980c9dd62654e82f4b3ae07e55da17d3efee6bcac1bfa5dbe9a76b25736f51cf38a347783aa33b2ec82e41075de8e98d0ef0720919a0d36180396118e
diff --git a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
index ecb94ffdd881..1538b488e86d 100644
--- a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
+++ b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pyropus.ca/software/queue-repair/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"