gentoo resync : 09.12.2017

4 files changed, 34 insertions, 15 deletions

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