gentoo resync : 28.04.2019

4 files changed, 5 insertions, 174 deletions

diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index d8c61288c69e..e06658ee70c6 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -4,10 +4,8 @@ AUX mailman-2.1.14_rc1-directory-check.patch 786 BLAKE2B 24cde989fac774ecaea2707
 AUX mailman-2.1.9-icons.patch 555 BLAKE2B c000931d44321f0eb9fabdf1a49cfcd05b2c68a3809f302f9275eade918135bc231860cf9c2ab798827b9f1e5baf59a74cbaabc3787e95f3001426425ebf6de2 SHA512 caec3eb1abdb29e92ebd6a589f93870ffc91bbcc7bd2e0115e38f48ae0a31e564037a4a828395229ee238d215e72e19a31d53c8bca6c39a48b5c08a327e663a6
 AUX mailman.rc 488 BLAKE2B 76f35e4e1a5257b6aa058b0cea29cf53640322d436a195140cd71b7bc749d4205fc4555b611b1713663604c08ca929b3aa57d60355d8e9e5e9b7056b9dc1c5f1 SHA512 bb97f6fec48cf474be66c1aa73adc874ceaeee894acc3fad76f4b3f5e6f82dcd4238a6915de941fe87f815668dfb6c5ffe90926c5aaaddedf7dc06dfa4c1a126
 AUX mailman.service 288 BLAKE2B 64dad97b16458f9d9b64f249f9096e4217ce78e9a33e9d3ea55ef27d11daea102a1ecae30ddda095c1bbf1b175def17b9ad2db5a3e0b8e694ab02ed94a557e87 SHA512 c4a5532666afbebc5aa69463ec9b9eaa2dcb03fdd8fd62307920a4572d0c795c1d93478236240746018be617c0eec0fcfcc1c711e8810140fb8ffbc0a9b71009
-DIST mailman-2.1.26.tgz 9264592 BLAKE2B 04aad3d39724a01df313bebbb3b20bee0e991893f1a17342afb18f3fbe8099178260c176a6d3542a7bb82adee417105aac34783683b205bbb1377e65c982d598 SHA512 9662623beaf4653db809a4bd57cb8377ae5894d78ba7576cf2c555620daf2db79b01599e8445ef732f1e023e72deb16f51554a39226d59742ec73f9e6e7895b2
 DIST mailman-2.1.29.tgz 9376258 BLAKE2B 63ae740abed79d2887eef35ddfd8b51f22ee984a0eaacddeb34afb8147c0d239e5eaf93579face987b3c604653fed4c13233de78298914b4eacf5a33f769a997 SHA512 ed25179a4580092629890664c5502908b20e326c2ed06ad4e597fb4e8de84076c369ecd7a272be5ed8a1cb4479413d0e004d87804de763ee850e4d04d9a83376
 DIST mailman-3.1.1.tar.gz 749014 BLAKE2B 00cf756de1a6ce5a05f30b033ad7d1ebc5664bb1c6fadb5d602c4e34e373ee7a0df0801e6b68b0816ee819f77caef33bbc4b8490df1c8f01fd2fb35664fd3757 SHA512 b09962ec99ca1ce1eafd40409a00f976dc47d82adb707313f4516400db6439af8597a1c4e30262fb228c102508ede688912480dbb1dcca9721bb0333693f1d85
-EBUILD mailman-2.1.26.ebuild 5835 BLAKE2B 4e5d1cb9f5f7ea8a1a6e2cf4bdf43844d4db46d1ef3922ed7f6966e5b7447975c305a81be37bdf3310255dc7b0aa7eae7a3118ddd5b1394c2a1adc205c81a97e SHA512 0ed97a6103dabe7475a788d0bd7163e1e16588137f3d4567f953e1657d1ba44610a2dd158202997e37ddea2fc2414c5cf4174943def1daefdcf06bfd5fb4e0da
-EBUILD mailman-2.1.29.ebuild 5833 BLAKE2B 5333375de0e639a590baa82cb59f8f48054b3c0035d55900f6f659066098173db92e8cf182a0af7e52c86a56b98f9e3c75bc4831b901efa915c7a5a863b4bf6e SHA512 d270fefc384c455196f848ecd8f74f5d94679f98ca2b3cb8268e259e1c98592acd6ffe3529fd045c2d40cc4f10d64b034403b4fc08c48287a0e6d44f656dfbf8
-EBUILD mailman-3.1.1.ebuild 1188 BLAKE2B 6271605c5bc4701a59ed960c62d472cf1c54ce8b9e7cb69dc186e2c7f1dac33eb974ed71fb3e51cbdbabd7c14088aa18b036463c218e3e0a0ad5cb4190a8396c SHA512 ba9ad78e647b12e3b6eb56d619ddeeddd2143c41f7c0b4e526ee917d23e9a1cc4db0c8d8bf3a28c0ac41fb1838500d0088cb5bb201938541b2ecca2e373e0fc8
+EBUILD mailman-2.1.29.ebuild 5832 BLAKE2B 68d8429399df0b719d06bf07e1fad7d06197448ef982a33c1cdff5c4a22cb0c7b13e53821d0c6ff2ff0ecc0a8b63897dd52861b055b745a3440504d2dedc4ca6 SHA512 ba1d579986222b1a5d1e4a6e01aad29afd6ce97b33e1836dc48c57bd5f8e24b4eb0144e751ce250dc6e7150885302a0a6fedeec62f519dd62d0221c81305de76
+EBUILD mailman-3.1.1.ebuild 1175 BLAKE2B 792fafc9caf1d8bfc6b67c7042e09d605101166c9471e3d61f0342239e0d463441122b325802b794fa13871373c1ce4968c769be40d4fccac8beb8e2a0af4faa SHA512 184e4cc446e80f449909410a5522a20198a1a645821044b189c989fcee14bfb889e6a1bd535bb5f50b57848354371933b176177e2f41b93e4a9cb3bbad6be5a0
 MISC metadata.xml 293 BLAKE2B 374d60f4c201126bc672a15e1d2cc0e8ddac567760932fd51bf0abd758378c92d9c0c9bba81fdee2d30cfcf14c067f46a38e1b55f3ca09ed3c002316b48c1b74 SHA512 9be4ca21301ae46b1c80f63b365a69a855858f3b0f51b5f5dd88f572cce940f068d6de17261de1828b068bbef9061124840b66bd370e120c73b3589048653b8c
diff --git a/net-mail/mailman/mailman-2.1.26.ebuild b/net-mail/mailman/mailman-2.1.26.ebuild
deleted file mode 100644
index 7d21b70b7bac..000000000000
--- a/net-mail/mailman/mailman-2.1.26.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 multilib systemd user
-
-DESCRIPTION="A python-based mailing list server with an extensive web interface"
-SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tgz"
-HOMEPAGE="http://www.list.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="selinux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	virtual/mta
-	virtual/cron
-	virtual/httpd-cgi
-	virtual/python-dnspython[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-mailman )
-"
-
-S="${WORKDIR}/${P/_p/-}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
-	VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"}
-	CGIUID=${MAILMAN_CGIUID:-apache}
-	CGIGID=${MAILMAN_CGIGID:-apache}
-	MAILUSR=${MAILMAN_MAILUSR:-mailman}
-	MAILUID=${MAILMAN_MAILUID:-280}
-	MAILGRP=${MAILMAN_MAILGRP:-mailman}
-	MAILGID=${MAILMAN_MAILGID:-280}
-
-	# Bug #58526: switch to enew{group,user}.
-	# need to add mailman here for compile process.
-	# Duplicated at pkg_postinst() for binary install.
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman,cron
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch"
-	epatch "${FILESDIR}/${PN}-2.1.9-icons.patch"
-}
-
-src_configure() {
-	econf \
-		--without-permcheck \
-		--prefix="${INSTALLDIR}" \
-		--with-mail-gid=${MAILGID} \
-		--with-cgi-gid=${CGIGID} \
-		--with-cgi-ext="${MAILMAN_CGIEXT}" \
-		--with-var-prefix="${VAR_PREFIX}" \
-		--with-username=${MAILUSR} \
-		--with-groupname=${MAILGRP} \
-		--with-python="${PYTHON}"
-}
-
-src_install () {
-	emake "DESTDIR=${D}" doinstall
-
-	insinto /etc/apache2/modules.d
-	newins "${FILESDIR}/50_mailman.conf-r2" 50_mailman.conf
-	sed \
-		-e "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" \
-		-e "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" \
-		-e "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" \
-		-i "${D}/etc/apache2/modules.d/50_mailman.conf" || die
-
-	newdoc "${FILESDIR}/README.gentoo-r3" README.gentoo
-
-	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL contrib/mailman.mc \
-		contrib/README.check_perms_grsecurity contrib/virtusertable
-
-	exeinto ${INSTALLDIR}/bin
-	doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
-		contrib/mm-handler*
-
-	dodir /etc/mailman
-	mv "${D}/${INSTALLDIR}/Mailman/mm_cfg.py" "${D}/etc/mailman"
-	dosym /etc/mailman/mm_cfg.py ${INSTALLDIR}/Mailman/mm_cfg.py
-
-	# Save the old config for updates from pre-2.1.9-r2
-	# To be removed some distant day
-	for i in /var/mailman /home/mailman /usr/local/mailman ${INSTALLDIR}; do
-		if [ -f ${i}/Mailman/mm_cfg.py ] && ! [ -L ${i}/Mailman/mm_cfg.py ]; then
-			cp ${i}/Mailman/mm_cfg.py "${D}/etc/mailman/mm_cfg.py" || die
-		fi
-	done
-
-	newinitd "${FILESDIR}/mailman.rc" mailman
-	cp "${FILESDIR}/mailman.service" "${T}/mailman.service" || die
-	sed -i "s/^User=.*/User=${MAILUSR}/" "${T}/mailman.service" || die
-	systemd_dounit "${T}/mailman.service"
-
-	keepdir ${VAR_PREFIX}/logs
-	keepdir ${VAR_PREFIX}/locks
-	keepdir ${VAR_PREFIX}/spam
-	keepdir ${VAR_PREFIX}/archives/public
-	keepdir ${VAR_PREFIX}/archives/private
-	keepdir ${VAR_PREFIX}/lists
-	keepdir ${VAR_PREFIX}/qfiles
-
-	chown -R ${MAILUSR}:${MAILGRP} "${D}/${VAR_PREFIX}" "${D}/${INSTALLDIR}" "${D}"/etc/mailman/* || die
-	chown ${CGIUID}:${MAILGRP} "${D}/${VAR_PREFIX}/archives/private" || die
-	chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \
-		"${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public} || die
-	chmod 2770 "${D}/${VAR_PREFIX}/archives/private" || die
-	chmod 2770 "${D}/${VAR_PREFIX}/qfiles" || die
-	chmod 2755 "${D}/${INSTALLDIR}"/cgi-bin/* "${D}/${INSTALLDIR}/mail/mailman" || die
-
-	python_optimize "${D}/${INSTALLDIR}/bin/" \
-		"${D}/${INSTALLDIR}/Mailman/" \
-		"${D}/${INSTALLDIR}/Mailman/*"
-}
-
-pkg_postinst() {
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman,cron
-	echo
-	elog "Please read /usr/share/doc/${PF}/README.gentoo.bz2 for additional"
-	elog "Setup information, mailman will NOT run unless you follow"
-	elog "those instructions!"
-	echo
-
-	elog "An example Mailman configuration file for Apache has been installed into:"
-	elog "  ${APACHE2_MODULES_CONFDIR}/50_mailman.conf"
-	echo
-	elog "To enable, you will need to add \"-D MAILMAN\" to"
-	elog "/etc/conf.d/apache2."
-	echo
-
-	ewarn "Default-Configuration has changed deeply in 2.1.9-r2. You can configure"
-	ewarn "mailman with the following variables:"
-	ewarn "MAILMAN_PREFIX (default: /usr/$(get_libdir)/mailman)"
-	ewarn "MAILMAN_VAR_PREFIX (default: /var/lib/mailman)"
-	ewarn "MAILMAN_CGIUID (default: apache)"
-	ewarn "MAILMAN_CGIGID (default: apache)"
-	ewarn "MAILMAN_CGIEXT (default: empty)"
-	ewarn "MAILMAN_MAILUSR (default: mailman)"
-	ewarn "MAILMAN_MAILUID (default: 280)"
-	ewarn "MAILMAN_MAILGRP (default: mailman)"
-	ewarn "MAILMAN_MAILGID (default: 280)"
-	ewarn
-	ewarn "Config file is now symlinked in /etc/mailman, so etc-update works."
-	ewarn
-	ewarn "If you're upgrading from below 2.1.9-r2 or changed MAILMAN_PREFIX, you"
-	ewarn "NEED to make a few manual updates to your system:"
-	ewarn
-	ewarn "1.  Update your mailman users's home directory: usermod -d ${INSTALLDIR} mailman"
-	ewarn "2.  Re-import the crontab: su - mailman -c 'crontab cron/crontab.in'"
-	ewarn "3.  Copy your old mm_cfg.py file to /etc/mailman/mm_cfg.py"
-	ewarn
-	ewarn "Additionally if you've modified MAILMAN_VAR_PREFIX (or upgraded from"
-	ewarn "a pre 2.1.9-r2 installation), you should move your old lists/ and"
-	ewarn "archives/ directory to the new location, ensuring that the"
-	ewarn "permissions is correct.  See bug #208789 for a discussion."
-}
diff --git a/net-mail/mailman/mailman-2.1.29.ebuild b/net-mail/mailman/mailman-2.1.29.ebuild
index 93a1812879a4..e6eaf2e1a7e4 100644
--- a/net-mail/mailman/mailman-2.1.29.ebuild
+++ b/net-mail/mailman/mailman-2.1.29.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.list.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="selinux"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-mail/mailman/mailman-3.1.1.ebuild b/net-mail/mailman/mailman-3.1.1.ebuild
index e8c5877caad4..296fa1c5bfab 100644
--- a/net-mail/mailman/mailman-3.1.1.ebuild
+++ b/net-mail/mailman/mailman-3.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python3_5 python3_6 )
 
 inherit distutils-r1