gentoo resync : 24.12.2018

13 files changed, 3 insertions, 1263 deletions

diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 6cd83bcb381f..bf400cba550b 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/inn/Manifest b/net-nntp/inn/Manifest
deleted file mode 100644
index bd9d021bf1f1..000000000000
--- a/net-nntp/inn/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX inn-2.5.3-ar.patch 788 BLAKE2B db16d6853cf9c1ad955dcb212e12ec3db016c530e36e34340c85aee0404a2e276ca4b1cb6416a8a73c100c7c478074e955257c8b8cd06c3cd82f41a9dac1adaa SHA512 ebe00878b159f6af9e3a378acf369bf5b2d06fcde1f4b3f7c721f8947a555d6a8f6a871e995d32cd0c83df151e338168c7dfbeaf0270b5dd8d98c5a9d2969ed3
-AUX inn-2.5.3-tests.patch 654 BLAKE2B cbc79f1016f8c2e6357a841c7def4e70cd027805f13240828f45d25c2bdbe0a1dbf87d4acd7e0275eb9e5dcea5a74ab622fa7cef9f5c11fe293646522271236c SHA512 31a998b61c80583cd63cc3310fdf86605e5e0ce604056896d96aa255caba9ff1e3fa045b70f73e1157587fa6f3dae66789b7f6877204d6b6d4a096935ac80892
-AUX innd 451 BLAKE2B 8ce41583a7377a4cc0fe0de2abbc9bfd8890347cb92c9907b5b6abeb7db80c3fac0faa250c89c5a47ab56c32e407d7033e360606937a637791c1490a9b0797b7 SHA512 48539184eb549d068d07ccab999df9e2fc49cd08ecd9dd340ef6250a081f40938a11bf9535f4abbe35fd34ba757fc1c35e71e0d0f1646db77e369b02f27ce511
-AUX innd-r1 498 BLAKE2B ac914b58e3983d21f17810c17ef3d0fd321209f3ac2ffc8eca4e8c72c0845a753a8dd87be8f640012a7eeb7331b641840ea7620327624015c49a412e11c745d1 SHA512 c013dee0629be01d93d981bf4c551a48f8f40b1baeef2a21a076ad12f8afba68517d2ef82712790b9f2e35b7090d18645faf7706b2b7690bcc1d665cd620d312
-DIST inn-2.5.3.tar.gz 2412119 BLAKE2B 8958744b6a54842ee888e89fe9a25152968a2e66196c78338d9a1f25d8e079d57e2d161d947e1d9bd44180c9e7f9b5af3d5a116050f7e92b3e0420f551623a7e SHA512 e579944571f0ec4fcdbf86de8458342075ce08f60df046bc8c45969b39f396ede8f5034f734542e1c64fb7792ae01c117c6a7af170fe5a43e1d0b2693f34d392
-DIST inn-2.5.4.tar.gz 2408600 BLAKE2B 0515ebc655aa7efdcb22a28037cba607d58056e04dd44b57473dd352823f4780272cd3a8064c0af7f7116c65def01eb417936f2a03d4c9d40ad26df26945e3f2 SHA512 f632599d009e8965d1b0ce7fef84dfbe48034c3a86825694a5ca4311123347647f9a4b534cff59820437f619ec09867bcff16f8f18c705e056eeea6493bc5441
-DIST inn-2.5.5.tar.gz 2419841 BLAKE2B c28a16883200429f179e114d62b2599900de2c5e54e85a0cdc16f7765d3419d5d09522c0e4d46f920c495f81d49cede50dc2251dd842178b2cc704fae88c66dc SHA512 aada60b15952810fa31c3b2078b4ca1b1e560cee348cc81d076e0ba1f8b785497310d60aca89b9ecc4af85a1493eefa8a2b976cb349b8ea96482c93cbcf049f1
-EBUILD inn-2.5.3-r1.ebuild 8386 BLAKE2B 794c856de622be99feac6201f0c5bffdb3befc100de698e867be3da0151ee7f7c647868b6b19222ae482d4ae6ef3e2ce9247f26815e3d2ac50fac5d85f439244 SHA512 921e78b54b446d5a7450cbb225d99b4878f5194d86ea1e648eb55797c6e9fb7730367a2d54090fc68c39dc2017eca5ea8af60038b4a3e8cf9cbb021c018932c5
-EBUILD inn-2.5.3-r3.ebuild 8581 BLAKE2B a045aba963e19c62f12aae5835037151aeb81e4ee17ace11ab6cccec62587031d9bb43741a5945b25be69406c7536627a429b7203f9753a678380fa64062c1ee SHA512 58c9aaa76592a8f7c56180fd0d4c063e608846a8a3ed7a59df66c74f0ac78fda85b823e40bcd088b4e4022e054b2ab2fa6e67145597f6a65496e0be8b2be8537
-EBUILD inn-2.5.4-r1.ebuild 8595 BLAKE2B e1b2a4721ccf90e156f6428940f8e13a98cb8d9ca4c2b1568ba52df698e036fcc564be11ec9246f762e2e8d11303b8e8db715075a15a793113c7ac2fb0dc859f SHA512 c128b4cddb36edf2fbe82a56da63428aad03111c9250e0582acdf72abb8dee271676bb17a2e2e9dc6303a7d638c31d906afc6039b82b1d1994281ee288c254e5
-EBUILD inn-2.5.5-r1.ebuild 8595 BLAKE2B e1b2a4721ccf90e156f6428940f8e13a98cb8d9ca4c2b1568ba52df698e036fcc564be11ec9246f762e2e8d11303b8e8db715075a15a793113c7ac2fb0dc859f SHA512 c128b4cddb36edf2fbe82a56da63428aad03111c9250e0582acdf72abb8dee271676bb17a2e2e9dc6303a7d638c31d906afc6039b82b1d1994281ee288c254e5
-MISC metadata.xml 357 BLAKE2B 3f483922b1a852065c839e3c075050111b8da9f9500ade91cce906eaa10656fce5bdd1e4376f829d7df71a8791e9828a1e17e07c1c91edf0ff5bf83962308b72 SHA512 3df88419d7abb8ed51b8b54746aa5de3e750f9666c250bdca0aef2741dcd462dd2b6bf979106a437af7c6245d8447fea2d2c2988df83d9d73379e04643634397
diff --git a/net-nntp/inn/files/inn-2.5.3-ar.patch b/net-nntp/inn/files/inn-2.5.3-ar.patch
deleted file mode 100644
index ac4f8158c44f..000000000000
--- a/net-nntp/inn/files/inn-2.5.3-ar.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Use system AR.
-
-Gentoo bug #461254.
-
---- lib/Makefile
-+++ lib/Makefile
-@@ -53,7 +53,7 @@
- 	    -rpath $(PATHLIB) -version-info 2:0:0
- 
- libinn.a: $(OBJECTS)
--	ar r $@ $(OBJECTS)
-+	$(AR) r $@ $(OBJECTS)
- 	$(RANLIB) libinn.a
- 
- .c.o .c.lo:
---- storage/Makefile
-+++ storage/Makefile
-@@ -55,7 +55,7 @@
- 	    -rpath $(PATHLIB) -version-info 2:0:0
- 
- libstorage.a: $(OBJECTS)
--	ar r $@ $(OBJECTS)
-+	$(AR) r $@ $(OBJECTS)
- 	$(RANLIB) libstorage.a
- 
- # Make.methods is included in the distribution tarball since some non-GNU
---- history/Makefile
-+++ history/Makefile
-@@ -51,7 +51,7 @@
- 	    -rpath $(PATHLIB) -version-info 2:0:0
- 
- libinnhist.a: $(OBJECTS)
--	ar r $@ $(OBJECTS)
-+	$(AR) r $@ $(OBJECTS)
- 	$(RANLIB) libinnhist.a
- 
- # Try to set up these rules so that buildconfig is only run once.
diff --git a/net-nntp/inn/files/inn-2.5.3-tests.patch b/net-nntp/inn/files/inn-2.5.3-tests.patch
deleted file mode 100644
index 6511508308d6..000000000000
--- a/net-nntp/inn/files/inn-2.5.3-tests.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Certain filesystems (such as reiserfs) cannot properly report
-the number of free inodes. In this case, inndf reports an absurdly
-high number instead of nothing, which standard df does.
-There seems to be some confusion about which FOO_MAX is returned,
-so this patch adds an actual value known to be returned.
-
-See bug #348490.
-
---- tests/util/inndf.t
-+++ tests/util/inndf.t
-@@ -62,7 +62,7 @@
-         real=`df -i . | sed 1d | awk '{ print $4 }'`
-     fi
-     try=`$inndf -i .`
--    if [ "$try" = 4294967295 ] ; then
-+    if [ "$try" = 4294967295 ] || [ "$try" = 2147483647 ] ; then
-         printcount "ok"
-     else
-         diff=`expr "$real" - "$try"`
diff --git a/net-nntp/inn/files/innd b/net-nntp/inn/files/innd
deleted file mode 100644
index c45d45b830cb..000000000000
--- a/net-nntp/inn/files/innd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting innd"
-	checkpath -d -m 0755 -o news:news /var/run/news
-	start-stop-daemon --start --user news --exec /usr/lib/news/bin/rc.news
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping innd"
-	start-stop-daemon --start --user news --exec /usr/lib/news/bin/rc.news -- stop
-	sleep 2
-	eend $?
-}
diff --git a/net-nntp/inn/files/innd-r1 b/net-nntp/inn/files/innd-r1
deleted file mode 100644
index 071797e50796..000000000000
--- a/net-nntp/inn/files/innd-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	checkpath -d -m 0755 -o news:news /run/news
-	start-stop-daemon --start --user news --pidfile /run/news/${SVCNAME}.pid \
-		--exec /usr/lib/news/bin/rc.news
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --start --user news --exec /usr/lib/news/bin/rc.news -- stop
-	sleep 2
-	eend $?
-}
diff --git a/net-nntp/inn/inn-2.5.3-r1.ebuild b/net-nntp/inn/inn-2.5.3-r1.ebuild
deleted file mode 100644
index 48edc30bd817..000000000000
--- a/net-nntp/inn/inn-2.5.3-r1.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib python-single-r1 ssl-cert
-
-DESCRIPTION="The Internet News daemon, fully featured NNTP server"
-HOMEPAGE="https://www.isc.org/software/inn"
-SRC_URI="ftp://ftp.isc.org/isc/inn/${P}.tar.gz"
-
-# GPL-2 only for init script
-LICENSE="ISC GPL-2+ public-domain BSD-4 BSD-2 RSA BSD MIT GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="berkdb innkeywords inntaggedhash ipv6 kerberos perl python sasl ssl"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	virtual/mta
-	dev-perl/MIME-tools
-	sys-libs/pam
-	sys-libs/zlib
-	kerberos? ( virtual/krb5 )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	ssl? ( dev-libs/openssl:0= )
-	python? ( ${PYTHON_DEPS} )
-	berkdb? ( sys-libs/db:* )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tests.patch
-
-	sed -e 's: -B .OLD::' -i Makefile.global.in || die
-
-	# Do not treat LDFLAGS as if it contained libraries to link to
-	sed -e 's:LDFLAGS::g' -i m4/python.m4 || die
-
-	# We do not have the biff service, but we do have comsat
-	sed -e 's:"biff":"comsat":g' -i tests/lib/getnameinfo-t.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--prefix=/usr/$(get_libdir)/news \
-		--sysconfdir=/etc/news \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--with-control-dir=/usr/$(get_libdir)/news/bin/control \
-		--with-filter-dir=/usr/$(get_libdir)/news/bin/filter \
-		--with-db-dir=/var/spool/news/db \
-		--with-doc-dir=/usr/share/doc/${PF} \
-		--with-spool-dir=/var/spool/news \
-		--with-log-dir=/var/log/news \
-		--with-run-dir=/var/run/news \
-		--with-tmp-dir=/var/spool/news/tmp \
-		--disable-libtool \
-		--with-gnu-ld \
-		--enable-setgid-inews \
-		--enable-uucp-rnews \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with kerberos kerberos /usr) \
-		$(use_with sasl) \
-		$(use_with ssl openssl) \
-		$(use_with berkdb berkeleydb /usr) \
-		$(use_enable ipv6) \
-		$(use_enable !inntaggedhash largefiles) \
-		$(use_enable inntaggedhash tagged-hash) \
-		$(use_enable innkeywords keywords)
-}
-
-src_install() {
-	emake DESTDIR="${D}/" P="" SPECIAL="" install
-
-	chown -R root:0 \
-		"${D}"/usr/$(get_libdir)/news/$(get_libdir) \
-		"${D}"/usr/$(get_libdir)/news/include \
-		"${D}"/usr/share/doc \
-		"${D}"/usr/share/man \
-		|| die
-	chmod 644 "${D}"/etc/news/* || die
-	chmod 640 \
-		"${D}"/etc/news/control.ctl \
-		"${D}"/etc/news/expire.ctl \
-		"${D}"/etc/news/incoming.conf \
-		"${D}"/etc/news/nntpsend.ctl \
-		"${D}"/etc/news/passwd.nntp \
-		"${D}"/etc/news/readers.conf \
-		|| die
-
-	# Prevent old db/* files from being overwritten
-	insinto /usr/share/inn/dbexamples
-	newins site/active.minimal active
-	newins site/newsgroups.minimal newsgroups
-
-	keepdir \
-		/var/log/news \
-		/var/spool/news/archive \
-		/var/spool/news/articles \
-		/var/spool/news/db \
-		/var/spool/news/incoming \
-		/var/spool/news/incoming/bad \
-		/var/spool/news/innfeed \
-		/var/spool/news/outgoing \
-		/var/spool/news/overview \
-		/var/spool/news/tmp
-
-	fowners news:news /var/log/news
-
-	dodoc ChangeLog MANIFEST README* doc/checklist
-	use ipv6 && dodoc doc/IPv6-info
-
-	# So other programs can build against INN
-	insinto /usr/$(get_libdir)/news/include
-	doins include/*.h
-
-	doinitd "${FILESDIR}"/innd
-
-	rm -r "${D}"/var/run
-}
-
-pkg_postinst() {
-	for db_file in active newsgroups
-	do
-		[[ -f ${ROOT}/var/spool/news/db/${db_file} ]] && continue
-
-		if [[ -f ${ROOT}/usr/share/inn/dbexamples/${db_file} ]]
-		then
-			cp "${ROOT}"/usr/share/inn/dbexamples/${db_file} \
-				"${ROOT}"/var/spool/news/db/${db_file}
-		else
-			touch "${ROOT}"/var/spool/news/db/${db_file}
-		fi
-
-		chown news:news "${ROOT}"/var/spool/news/db/${db_file}
-		chmod 664 "${ROOT}"/var/spool/news/db/${db_file}
-	done
-
-	elog "Do not forget to update your cron entries, and also run"
-	elog "makedbz if you need to.  If this is a first-time installation"
-	elog "a minimal active file has been installed.  You will need to"
-	elog "touch history and run 'makedbz -i' to initialize the history"
-	elog "database.  See INSTALL for more information."
-	elog
-	elog "You need to assign a real shell to the news user, or else"
-	elog "starting inn will fail. You can use 'usermod -s /bin/bash news'"
-	elog "for this."
-
-	if use ssl
-	then
-		install_cert /etc/news/cert/cert
-		chown news:news \
-			"${ROOT}"/etc/news/cert/cert.{crt,csr,key,pem}
-
-		elog
-		elog "You may want to start nnrpd manually for native ssl support."
-		elog "If you choose to do so, automating this with a bootscript might"
-		elog "also be a good choice."
-		elog "Have a look at man nnrpd for valid parameters."
-		elog
-		elog "The certificate location in /etc/news/sasl.conf has been changed"
-		elog "to /etc/news/cert!"
-
-	fi
-}
-
-pkg_postrm() {
-	elog
-	elog "If you want your newsspool or altered configuration files"
-	elog "to be removed, please do so now manually."
-	elog
-}
-
-pkg_config() {
-	NEWSSPOOL_DIR="${ROOT}/var/spool/news"
-	NEWS_SHELL="$( awk -F':' '/^news:/ {print $7;}' ${ROOT}/etc/passwd )"
-	NEWS_ERRFLAG="0"
-
-	if [[ ${NEWS_SHELL} == /bin/false || ${NEWS_SHELL} == /dev/null ]]; then
-		einfo "Changing shell to /bin/bash for user news..."
-		usermod -s /bin/bash news
-	else
-		einfo "Shell for user news unchanged ('${NEWS_SHELL}')."
-		if [[ ${NEWS_SHELL} != /bin/sh && ${NEWS_SHELL} != /bin/bash ]]; then
-			ewarn "You might want to change it to '/bin/bash', though."
-		fi
-	fi
-
-	if [[ ! -e ${NEWSSPOOL_DIR}/db/history ]]; then
-		if [[ ! -f ${NEWSSPOOL_DIR}/db/history.dir \
-			&& ! -f ${NEWSSPOOL_DIR}/db/history.pag \
-			&& ! -f ${NEWSSPOOL_DIR}/db/history.hash \
-			&& ! -f ${NEWSSPOOL_DIR}/db/history.index ]]
-		then
-			einfo "Building history database ..."
-
-			touch "${NEWSSPOOL_DIR}"/db/history
-			chown news:news "${NEWSSPOOL_DIR}"/db/history
-			chmod 644 "${NEWSSPOOL_DIR}"/db/history
-
-			einfo "Running makedbz -i ..."
-			su - news -c "/usr/$(get_libdir)/news/bin/makedbz -i"
-
-			einfo "Moving files into place ..."
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.dir ]] && \
-				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.dir \
-				"${NEWSSPOOL_DIR}"/db/history.dir
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.pag ]] && \
-				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.pag \
-				"${NEWSSPOOL_DIR}"/db/history.pag
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.hash ]] && \
-				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.hash \
-				"${NEWSSPOOL_DIR}"/db/history.hash
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.index ]] && \
-				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.index \
-				"${NEWSSPOOL_DIR}"/db/history.index
-
-			einfo "Running makehistory ..."
-			su - news -c /usr/$(get_libdir)/news/bin/makehistory
-		else
-			NEWS_ERRFLAG="1"
-			eerror "Your installation seems to be screwed up."
-			eerror "${NEWSSPOOL_DIR}/db/history does not exist, but there's"
-			eerror "one of the files history.dir, history.hash or history.index"
-			eerror "within ${NEWSSPOOL_DIR}/db."
-			eerror "Use your backup to restore the history database."
-		fi
-	else
-		einfo "${NEWSSPOOL_DIR}/db/history found."
-		einfo "Leaving history database as it is."
-	fi
-
-	INNCFG_INODES=$(
-		sed /etc/news/inn.conf \
-			-e '/innwatchspoolnodes/ ! d; s:[^ ]*[ ]*\([^ ]*\):\1:'
-	)
-	INNSPOOL_INODES=$(
-		df -Pi ${NEWSSPOOL_DIR} | \
-			sed -e 's:[^ ]*[ ]*\([^ ]*\).*:\1:; 1 d'
-	)
-	if [[ ${INNCFG_INODES} -gt ${INNSPOOL_INODES} ]]; then
-		ewarn "Setting innwatchspoolinodes to zero, because the filesystem behind"
-		ewarn "$NEWSSPOOL_DIR works without inodes."
-		ewarn
-		cp /etc/news/inn.conf /etc/news/inn.conf.OLD
-		einfo "A copy of your old inn.conf has been saved to /etc/news/inn.conf.OLD."
-		sed -i /etc/news/inn.conf \
-			-e '/innwatchspoolnodes/ s:\([^ ]*\)\([ ]*\).*:\1\20:'
-		chown news:news /etc/news/inn.conf
-		chmod 644 /etc/news/inn.conf
-	fi
-
-	INNCHECK_LINES=$(
-		su - news -c "/usr/$(get_libdir)/news/bin/inncheck | wc -l"
-	)
-	if [[ ${INNCHECK_LINES} -gt 0 ]]; then
-		NEWS_ERRFLAG="1"
-		ewarn "inncheck most certainly found an error."
-		ewarn "Please check its output:"
-		eerror "`su - news -c /usr/$(get_libdir)/news/bin/inncheck`"
-	fi
-
-	if [[ ${NEWS_ERRFLAG} -gt 0 ]]; then
-		eerror "There were one or more errors/warnings checking your"
-		eerror "configuration. Please read inn's documentation and"
-		eerror "fix them accordingly."
-	else
-		einfo "INN configuration tests passed successfully."
-		ewarn "Please ensure you have configured inn properly."
-	fi
-}
diff --git a/net-nntp/inn/inn-2.5.3-r3.ebuild b/net-nntp/inn/inn-2.5.3-r3.ebuild
deleted file mode 100644
index e356b6892f48..000000000000
--- a/net-nntp/inn/inn-2.5.3-r3.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib python-single-r1 ssl-cert toolchain-funcs
-
-DESCRIPTION="The Internet News daemon, fully featured NNTP server"
-HOMEPAGE="https://www.isc.org/software/inn"
-SRC_URI="ftp://ftp.isc.org/isc/inn/${P}.tar.gz"
-
-# GPL-2 only for init script
-LICENSE="ISC GPL-2+ public-domain BSD-4 BSD-2 RSA BSD MIT GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="berkdb innkeywords inntaggedhash ipv6 kerberos perl python sasl ssl"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	virtual/mta
-	dev-perl/MIME-tools
-	sys-libs/pam
-	sys-libs/zlib
-	kerberos? ( virtual/krb5 )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	ssl? ( dev-libs/openssl:0= )
-	python? ( ${PYTHON_DEPS} )
-	berkdb? ( sys-libs/db:* )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ar.patch
-	epatch "${FILESDIR}"/${P}-tests.patch
-
-	sed -e 's: -B .OLD::' -i Makefile.global.in || die
-
-	# Do not treat LDFLAGS as if it contained libraries to link to
-	sed -e 's:LDFLAGS::g' -i m4/python.m4 || die
-
-	# We do not have the biff service, but we do have comsat
-	sed -e 's:"biff":"comsat":g' -i tests/lib/getnameinfo-t.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export AR
-
-	econf \
-		--prefix=/usr/$(get_libdir)/news \
-		--sysconfdir=/etc/news \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--with-control-dir=/usr/$(get_libdir)/news/bin/control \
-		--with-filter-dir=/usr/$(get_libdir)/news/bin/filter \
-		--with-db-dir=/var/spool/news/db \
-		--with-doc-dir=/usr/share/doc/${PF} \
-		--with-spool-dir=/var/spool/news \
-		--with-log-dir=/var/log/news \
-		--with-run-dir=/run/news \
-		--with-tmp-dir=/var/spool/news/tmp \
-		--disable-libtool \
-		--with-gnu-ld \
-		--enable-setgid-inews \
-		--enable-uucp-rnews \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with kerberos kerberos /usr) \
-		$(use_with sasl) \
-		$(use_with ssl openssl) \
-		$(use_with berkdb berkeleydb /usr) \
-		$(use_enable ipv6) \
-		$(use_enable !inntaggedhash largefiles) \
-		$(use_enable inntaggedhash tagged-hash) \
-		$(use_enable innkeywords keywords)
-}
-
-src_install() {
-	emake DESTDIR="${D}/" P="" SPECIAL="" install
-
-	chown -R root:0 \
-		"${D}"/usr/$(get_libdir)/news/$(get_libdir) \
-		"${D}"/usr/$(get_libdir)/news/include \
-		"${D}"/usr/share/doc \
-		"${D}"/usr/share/man \
-		|| die
-	chmod 644 "${D}"/etc/news/* || die
-	chmod 640 \
-		"${D}"/etc/news/control.ctl \
-		"${D}"/etc/news/expire.ctl \
-		"${D}"/etc/news/incoming.conf \
-		"${D}"/etc/news/innfeed.conf \
-		"${D}"/etc/news/nntpsend.ctl \
-		"${D}"/etc/news/passwd.nntp \
-		"${D}"/etc/news/readers.conf \
-		|| die
-
-	# Prevent old db/* files from being overwritten
-	insinto /usr/share/inn/dbexamples
-	newins site/active.minimal active
-	newins site/newsgroups.minimal newsgroups
-
-	keepdir \
-		/var/log/news \
-		/var/spool/news/archive \
-		/var/spool/news/articles \
-		/var/spool/news/db \
-		/var/spool/news/incoming \
-		/var/spool/news/incoming/bad \
-		/var/spool/news/innfeed \
-		/var/spool/news/outgoing \
-		/var/spool/news/overview \
-		/var/spool/news/tmp
-
-	fowners news:news /var/log/news
-
-	dodoc ChangeLog MANIFEST README* doc/checklist
-	use ipv6 && dodoc doc/IPv6-info
-
-	# So other programs can build against INN
-	insinto /usr/$(get_libdir)/news/include
-	doins include/*.h
-
-	newinitd "${FILESDIR}"/innd-r1 innd
-}
-
-pkg_postinst() {
-	for db_file in active newsgroups
-	do
-		[[ -f ${ROOT}var/spool/news/db/${db_file} ]] && continue
-
-		if [[ -f ${ROOT}usr/share/inn/dbexamples/${db_file} ]]
-		then
-			cp "${ROOT}"usr/share/inn/dbexamples/${db_file} \
-				"${ROOT}"var/spool/news/db/${db_file}
-		else
-			touch "${ROOT}"var/spool/news/db/${db_file}
-		fi
-
-		chown news:news "${ROOT}"var/spool/news/db/${db_file}
-		chmod 664 "${ROOT}"var/spool/news/db/${db_file}
-	done
-
-	elog "It is recommended to run emerge --config ${CATEGORY}/${PN}"
-	elog "now to finish setting up this package."
-	elog
-	elog "Do not forget to update your cron entries, and also run"
-	elog "makedbz if you need to.  If this is a first-time installation"
-	elog "a minimal active file has been installed.  You will need to"
-	elog "touch history and run 'makedbz -i' to initialize the history"
-	elog "database.  See INSTALL for more information."
-	elog
-	elog "You need to assign a real shell to the news user, or else"
-	elog "starting inn will fail. You can use 'usermod -s /bin/bash news'"
-	elog "for this."
-
-	if use ssl
-	then
-		install_cert /etc/news/cert/cert
-		chown news:news \
-			"${ROOT}"etc/news/cert/cert.{crt,csr,key,pem}
-
-		elog
-		elog "You may want to start nnrpd manually for native ssl support."
-		elog "If you choose to do so, automating this with a bootscript might"
-		elog "also be a good choice."
-		elog "Have a look at man nnrpd for valid parameters."
-		elog
-		elog "The certificate location in /etc/news/sasl.conf has been changed"
-		elog "to /etc/news/cert!"
-
-	fi
-}
-
-pkg_postrm() {
-	elog
-	elog "If you want your newsspool or altered configuration files"
-	elog "to be removed, please do so now manually."
-	elog
-}
-
-pkg_config() {
-	NEWSSPOOL_DIR="${ROOT}var/spool/news"
-	NEWS_SHELL="$( awk -F':' '/^news:/ {print $7;}' ${ROOT}etc/passwd )"
-	NEWS_ERRFLAG="0"
-
-	if [[ ${NEWS_SHELL} == /bin/false || ${NEWS_SHELL} == /dev/null ]]; then
-		einfo "Changing shell to /bin/bash for user news..."
-		usermod -s /bin/bash news
-	else
-		einfo "Shell for user news unchanged ('${NEWS_SHELL}')."
-		if [[ ${NEWS_SHELL} != /bin/sh && ${NEWS_SHELL} != /bin/bash ]]; then
-			ewarn "You might want to change it to '/bin/bash', though."
-		fi
-	fi
-
-	if [[ ! -e ${NEWSSPOOL_DIR}/db/history ]]; then
-		if [[ ! -f ${NEWSSPOOL_DIR}/db/history.dir \
-			&& ! -f ${NEWSSPOOL_DIR}/db/history.pag \
-			&& ! -f ${NEWSSPOOL_DIR}/db/history.hash \
-			&& ! -f ${NEWSSPOOL_DIR}/db/history.index ]]
-		then
-			einfo "Building history database ..."
-
-			touch "${NEWSSPOOL_DIR}"/db/history
-			chown news:news "${NEWSSPOOL_DIR}"/db/history
-			chmod 644 "${NEWSSPOOL_DIR}"/db/history
-
-			einfo "Running makedbz -i ..."
-			su - news -c "/usr/$(get_libdir)/news/bin/makedbz -i"
-
-			einfo "Moving files into place ..."
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.dir ]] && \
-				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.dir \
-				"${NEWSSPOOL_DIR}"/db/history.dir
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.pag ]] && \
-				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.pag \
-				"${NEWSSPOOL_DIR}"/db/history.pag
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.hash ]] && \
-				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.hash \
-				"${NEWSSPOOL_DIR}"/db/history.hash
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.index ]] && \
-				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.index \
-				"${NEWSSPOOL_DIR}"/db/history.index
-
-			einfo "Running makehistory ..."
-			su - news -c /usr/$(get_libdir)/news/bin/makehistory
-		else
-			NEWS_ERRFLAG="1"
-			eerror "Your installation seems to be screwed up."
-			eerror "${NEWSSPOOL_DIR}/db/history does not exist, but there's"
-			eerror "one of the files history.dir, history.hash or history.index"
-			eerror "within ${NEWSSPOOL_DIR}/db."
-			eerror "Use your backup to restore the history database."
-		fi
-	else
-		einfo "${NEWSSPOOL_DIR}/db/history found."
-		einfo "Leaving history database as it is."
-	fi
-
-	INNCFG_INODES=$(
-		sed /etc/news/inn.conf \
-			-e '/innwatchspoolnodes/ ! d; s:[^ ]*[ ]*\([^ ]*\):\1:'
-	)
-	INNSPOOL_INODES=$(
-		df -Pi ${NEWSSPOOL_DIR} | \
-			sed -e 's:[^ ]*[ ]*\([^ ]*\).*:\1:; 1 d'
-	)
-	if [[ ${INNCFG_INODES} -gt ${INNSPOOL_INODES} ]]; then
-		ewarn "Setting innwatchspoolinodes to zero, because the filesystem behind"
-		ewarn "$NEWSSPOOL_DIR works without inodes."
-		ewarn
-		cp /etc/news/inn.conf /etc/news/inn.conf.OLD
-		einfo "A copy of your old inn.conf has been saved to /etc/news/inn.conf.OLD."
-		sed -i /etc/news/inn.conf \
-			-e '/innwatchspoolnodes/ s:\([^ ]*\)\([ ]*\).*:\1\20:'
-		chown news:news /etc/news/inn.conf
-		chmod 644 /etc/news/inn.conf
-	fi
-
-	INNCHECK_LINES=$(
-		su - news -c "/usr/$(get_libdir)/news/bin/inncheck | wc -l"
-	)
-	if [[ ${INNCHECK_LINES} -gt 0 ]]; then
-		NEWS_ERRFLAG="1"
-		ewarn "inncheck most certainly found an error."
-		ewarn "Please check its output:"
-		eerror "`su - news -c /usr/$(get_libdir)/news/bin/inncheck`"
-	fi
-
-	if [[ ${NEWS_ERRFLAG} -gt 0 ]]; then
-		eerror "There were one or more errors/warnings checking your"
-		eerror "configuration. Please read inn's documentation and"
-		eerror "fix them accordingly."
-	else
-		einfo "INN configuration tests passed successfully."
-		ewarn "Please ensure you have configured inn properly."
-	fi
-}
diff --git a/net-nntp/inn/inn-2.5.4-r1.ebuild b/net-nntp/inn/inn-2.5.4-r1.ebuild
deleted file mode 100644
index 19a769d0a7cd..000000000000
--- a/net-nntp/inn/inn-2.5.4-r1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib python-single-r1 ssl-cert toolchain-funcs
-
-DESCRIPTION="The Internet News daemon, fully featured NNTP server"
-HOMEPAGE="https://www.isc.org/software/inn"
-SRC_URI="ftp://ftp.isc.org/isc/inn/${P}.tar.gz"
-
-# GPL-2 only for init script
-LICENSE="ISC GPL-2+ public-domain BSD-4 BSD-2 RSA BSD MIT GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="berkdb innkeywords inntaggedhash ipv6 kerberos perl python sasl ssl"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	virtual/mta
-	dev-perl/MIME-tools
-	sys-libs/pam
-	sys-libs/zlib
-	kerberos? ( virtual/krb5 )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	ssl? ( dev-libs/openssl:0= )
-	python? ( ${PYTHON_DEPS} )
-	berkdb? ( sys-libs/db:* )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.5.3-ar.patch
-	epatch "${FILESDIR}"/${PN}-2.5.3-tests.patch
-
-	sed -e 's: -B .OLD::' -i Makefile.global.in || die
-
-	# Do not treat LDFLAGS as if it contained libraries to link to
-	sed -e 's:LDFLAGS::g' -i m4/python.m4 || die
-
-	# We do not have the biff service, but we do have comsat
-	sed -e 's:"biff":"comsat":g' -i tests/lib/getnameinfo-t.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export AR
-
-	econf \
-		--prefix=/usr/$(get_libdir)/news \
-		--sysconfdir=/etc/news \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--with-control-dir=/usr/$(get_libdir)/news/bin/control \
-		--with-filter-dir=/usr/$(get_libdir)/news/bin/filter \
-		--with-db-dir=/var/spool/news/db \
-		--with-doc-dir=/usr/share/doc/${PF} \
-		--with-spool-dir=/var/spool/news \
-		--with-log-dir=/var/log/news \
-		--with-run-dir=/run/news \
-		--with-tmp-dir=/var/spool/news/tmp \
-		--disable-libtool \
-		--with-gnu-ld \
-		--enable-setgid-inews \
-		--enable-uucp-rnews \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with kerberos kerberos /usr) \
-		$(use_with sasl) \
-		$(use_with ssl openssl) \
-		$(use_with berkdb berkeleydb /usr) \
-		$(use_enable ipv6) \
-		$(use_enable !inntaggedhash largefiles) \
-		$(use_enable inntaggedhash tagged-hash) \
-		$(use_enable innkeywords keywords)
-}
-
-src_install() {
-	emake DESTDIR="${D}/" P="" SPECIAL="" install
-
-	chown -R root:0 \
-		"${D}"/usr/$(get_libdir)/news/$(get_libdir) \
-		"${D}"/usr/$(get_libdir)/news/include \
-		"${D}"/usr/share/doc \
-		"${D}"/usr/share/man \
-		|| die
-	chmod 644 "${D}"/etc/news/* || die
-	chmod 640 \
-		"${D}"/etc/news/control.ctl \
-		"${D}"/etc/news/expire.ctl \
-		"${D}"/etc/news/incoming.conf \
-		"${D}"/etc/news/innfeed.conf \
-		"${D}"/etc/news/nntpsend.ctl \
-		"${D}"/etc/news/passwd.nntp \
-		"${D}"/etc/news/readers.conf \
-		|| die
-
-	# Prevent old db/* files from being overwritten
-	insinto /usr/share/inn/dbexamples
-	newins site/active.minimal active
-	newins site/newsgroups.minimal newsgroups
-
-	keepdir \
-		/var/log/news \
-		/var/spool/news/archive \
-		/var/spool/news/articles \
-		/var/spool/news/db \
-		/var/spool/news/incoming \
-		/var/spool/news/incoming/bad \
-		/var/spool/news/innfeed \
-		/var/spool/news/outgoing \
-		/var/spool/news/overview \
-		/var/spool/news/tmp
-
-	fowners news:news /var/log/news
-
-	dodoc ChangeLog MANIFEST README* doc/checklist
-	use ipv6 && dodoc doc/IPv6-info
-
-	# So other programs can build against INN
-	insinto /usr/$(get_libdir)/news/include
-	doins include/*.h
-
-	newinitd "${FILESDIR}"/innd-r1 innd
-}
-
-pkg_postinst() {
-	for db_file in active newsgroups
-	do
-		[[ -f ${ROOT}var/spool/news/db/${db_file} ]] && continue
-
-		if [[ -f ${ROOT}usr/share/inn/dbexamples/${db_file} ]]
-		then
-			cp "${ROOT}"usr/share/inn/dbexamples/${db_file} \
-				"${ROOT}"var/spool/news/db/${db_file}
-		else
-			touch "${ROOT}"var/spool/news/db/${db_file}
-		fi
-
-		chown news:news "${ROOT}"var/spool/news/db/${db_file}
-		chmod 664 "${ROOT}"var/spool/news/db/${db_file}
-	done
-
-	elog "It is recommended to run emerge --config ${CATEGORY}/${PN}"
-	elog "now to finish setting up this package."
-	elog
-	elog "Do not forget to update your cron entries, and also run"
-	elog "makedbz if you need to.  If this is a first-time installation"
-	elog "a minimal active file has been installed.  You will need to"
-	elog "touch history and run 'makedbz -i' to initialize the history"
-	elog "database.  See INSTALL for more information."
-	elog
-	elog "You need to assign a real shell to the news user, or else"
-	elog "starting inn will fail. You can use 'usermod -s /bin/bash news'"
-	elog "for this."
-
-	if use ssl
-	then
-		install_cert /etc/news/cert/cert
-		chown news:news \
-			"${ROOT}"etc/news/cert/cert.{crt,csr,key,pem}
-
-		elog
-		elog "You may want to start nnrpd manually for native ssl support."
-		elog "If you choose to do so, automating this with a bootscript might"
-		elog "also be a good choice."
-		elog "Have a look at man nnrpd for valid parameters."
-		elog
-		elog "The certificate location in /etc/news/sasl.conf has been changed"
-		elog "to /etc/news/cert!"
-
-	fi
-}
-
-pkg_postrm() {
-	elog
-	elog "If you want your newsspool or altered configuration files"
-	elog "to be removed, please do so now manually."
-	elog
-}
-
-pkg_config() {
-	NEWSSPOOL_DIR="${ROOT}var/spool/news"
-	NEWS_SHELL="$( awk -F':' '/^news:/ {print $7;}' ${ROOT}etc/passwd )"
-	NEWS_ERRFLAG="0"
-
-	if [[ ${NEWS_SHELL} == /bin/false || ${NEWS_SHELL} == /dev/null ]]; then
-		einfo "Changing shell to /bin/bash for user news..."
-		usermod -s /bin/bash news
-	else
-		einfo "Shell for user news unchanged ('${NEWS_SHELL}')."
-		if [[ ${NEWS_SHELL} != /bin/sh && ${NEWS_SHELL} != /bin/bash ]]; then
-			ewarn "You might want to change it to '/bin/bash', though."
-		fi
-	fi
-
-	if [[ ! -e ${NEWSSPOOL_DIR}/db/history ]]; then
-		if [[ ! -f ${NEWSSPOOL_DIR}/db/history.dir \
-			&& ! -f ${NEWSSPOOL_DIR}/db/history.pag \
-			&& ! -f ${NEWSSPOOL_DIR}/db/history.hash \
-			&& ! -f ${NEWSSPOOL_DIR}/db/history.index ]]
-		then
-			einfo "Building history database ..."
-
-			touch "${NEWSSPOOL_DIR}"/db/history
-			chown news:news "${NEWSSPOOL_DIR}"/db/history
-			chmod 644 "${NEWSSPOOL_DIR}"/db/history
-
-			einfo "Running makedbz -i ..."
-			su - news -c "/usr/$(get_libdir)/news/bin/makedbz -i"
-
-			einfo "Moving files into place ..."
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.dir ]] && \
-				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.dir \
-				"${NEWSSPOOL_DIR}"/db/history.dir
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.pag ]] && \
-				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.pag \
-				"${NEWSSPOOL_DIR}"/db/history.pag
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.hash ]] && \
-				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.hash \
-				"${NEWSSPOOL_DIR}"/db/history.hash
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.index ]] && \
-				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.index \
-				"${NEWSSPOOL_DIR}"/db/history.index
-
-			einfo "Running makehistory ..."
-			su - news -c /usr/$(get_libdir)/news/bin/makehistory
-		else
-			NEWS_ERRFLAG="1"
-			eerror "Your installation seems to be screwed up."
-			eerror "${NEWSSPOOL_DIR}/db/history does not exist, but there's"
-			eerror "one of the files history.dir, history.hash or history.index"
-			eerror "within ${NEWSSPOOL_DIR}/db."
-			eerror "Use your backup to restore the history database."
-		fi
-	else
-		einfo "${NEWSSPOOL_DIR}/db/history found."
-		einfo "Leaving history database as it is."
-	fi
-
-	INNCFG_INODES=$(
-		sed /etc/news/inn.conf \
-			-e '/innwatchspoolnodes/ ! d; s:[^ ]*[ ]*\([^ ]*\):\1:'
-	)
-	INNSPOOL_INODES=$(
-		df -Pi ${NEWSSPOOL_DIR} | \
-			sed -e 's:[^ ]*[ ]*\([^ ]*\).*:\1:; 1 d'
-	)
-	if [[ ${INNCFG_INODES} -gt ${INNSPOOL_INODES} ]]; then
-		ewarn "Setting innwatchspoolinodes to zero, because the filesystem behind"
-		ewarn "$NEWSSPOOL_DIR works without inodes."
-		ewarn
-		cp /etc/news/inn.conf /etc/news/inn.conf.OLD
-		einfo "A copy of your old inn.conf has been saved to /etc/news/inn.conf.OLD."
-		sed -i /etc/news/inn.conf \
-			-e '/innwatchspoolnodes/ s:\([^ ]*\)\([ ]*\).*:\1\20:'
-		chown news:news /etc/news/inn.conf
-		chmod 644 /etc/news/inn.conf
-	fi
-
-	INNCHECK_LINES=$(
-		su - news -c "/usr/$(get_libdir)/news/bin/inncheck | wc -l"
-	)
-	if [[ ${INNCHECK_LINES} -gt 0 ]]; then
-		NEWS_ERRFLAG="1"
-		ewarn "inncheck most certainly found an error."
-		ewarn "Please check its output:"
-		eerror "`su - news -c /usr/$(get_libdir)/news/bin/inncheck`"
-	fi
-
-	if [[ ${NEWS_ERRFLAG} -gt 0 ]]; then
-		eerror "There were one or more errors/warnings checking your"
-		eerror "configuration. Please read inn's documentation and"
-		eerror "fix them accordingly."
-	else
-		einfo "INN configuration tests passed successfully."
-		ewarn "Please ensure you have configured inn properly."
-	fi
-}
diff --git a/net-nntp/inn/inn-2.5.5-r1.ebuild b/net-nntp/inn/inn-2.5.5-r1.ebuild
deleted file mode 100644
index 19a769d0a7cd..000000000000
--- a/net-nntp/inn/inn-2.5.5-r1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib python-single-r1 ssl-cert toolchain-funcs
-
-DESCRIPTION="The Internet News daemon, fully featured NNTP server"
-HOMEPAGE="https://www.isc.org/software/inn"
-SRC_URI="ftp://ftp.isc.org/isc/inn/${P}.tar.gz"
-
-# GPL-2 only for init script
-LICENSE="ISC GPL-2+ public-domain BSD-4 BSD-2 RSA BSD MIT GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="berkdb innkeywords inntaggedhash ipv6 kerberos perl python sasl ssl"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	virtual/mta
-	dev-perl/MIME-tools
-	sys-libs/pam
-	sys-libs/zlib
-	kerberos? ( virtual/krb5 )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	ssl? ( dev-libs/openssl:0= )
-	python? ( ${PYTHON_DEPS} )
-	berkdb? ( sys-libs/db:* )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.5.3-ar.patch
-	epatch "${FILESDIR}"/${PN}-2.5.3-tests.patch
-
-	sed -e 's: -B .OLD::' -i Makefile.global.in || die
-
-	# Do not treat LDFLAGS as if it contained libraries to link to
-	sed -e 's:LDFLAGS::g' -i m4/python.m4 || die
-
-	# We do not have the biff service, but we do have comsat
-	sed -e 's:"biff":"comsat":g' -i tests/lib/getnameinfo-t.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export AR
-
-	econf \
-		--prefix=/usr/$(get_libdir)/news \
-		--sysconfdir=/etc/news \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--with-control-dir=/usr/$(get_libdir)/news/bin/control \
-		--with-filter-dir=/usr/$(get_libdir)/news/bin/filter \
-		--with-db-dir=/var/spool/news/db \
-		--with-doc-dir=/usr/share/doc/${PF} \
-		--with-spool-dir=/var/spool/news \
-		--with-log-dir=/var/log/news \
-		--with-run-dir=/run/news \
-		--with-tmp-dir=/var/spool/news/tmp \
-		--disable-libtool \
-		--with-gnu-ld \
-		--enable-setgid-inews \
-		--enable-uucp-rnews \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with kerberos kerberos /usr) \
-		$(use_with sasl) \
-		$(use_with ssl openssl) \
-		$(use_with berkdb berkeleydb /usr) \
-		$(use_enable ipv6) \
-		$(use_enable !inntaggedhash largefiles) \
-		$(use_enable inntaggedhash tagged-hash) \
-		$(use_enable innkeywords keywords)
-}
-
-src_install() {
-	emake DESTDIR="${D}/" P="" SPECIAL="" install
-
-	chown -R root:0 \
-		"${D}"/usr/$(get_libdir)/news/$(get_libdir) \
-		"${D}"/usr/$(get_libdir)/news/include \
-		"${D}"/usr/share/doc \
-		"${D}"/usr/share/man \
-		|| die
-	chmod 644 "${D}"/etc/news/* || die
-	chmod 640 \
-		"${D}"/etc/news/control.ctl \
-		"${D}"/etc/news/expire.ctl \
-		"${D}"/etc/news/incoming.conf \
-		"${D}"/etc/news/innfeed.conf \
-		"${D}"/etc/news/nntpsend.ctl \
-		"${D}"/etc/news/passwd.nntp \
-		"${D}"/etc/news/readers.conf \
-		|| die
-
-	# Prevent old db/* files from being overwritten
-	insinto /usr/share/inn/dbexamples
-	newins site/active.minimal active
-	newins site/newsgroups.minimal newsgroups
-
-	keepdir \
-		/var/log/news \
-		/var/spool/news/archive \
-		/var/spool/news/articles \
-		/var/spool/news/db \
-		/var/spool/news/incoming \
-		/var/spool/news/incoming/bad \
-		/var/spool/news/innfeed \
-		/var/spool/news/outgoing \
-		/var/spool/news/overview \
-		/var/spool/news/tmp
-
-	fowners news:news /var/log/news
-
-	dodoc ChangeLog MANIFEST README* doc/checklist
-	use ipv6 && dodoc doc/IPv6-info
-
-	# So other programs can build against INN
-	insinto /usr/$(get_libdir)/news/include
-	doins include/*.h
-
-	newinitd "${FILESDIR}"/innd-r1 innd
-}
-
-pkg_postinst() {
-	for db_file in active newsgroups
-	do
-		[[ -f ${ROOT}var/spool/news/db/${db_file} ]] && continue
-
-		if [[ -f ${ROOT}usr/share/inn/dbexamples/${db_file} ]]
-		then
-			cp "${ROOT}"usr/share/inn/dbexamples/${db_file} \
-				"${ROOT}"var/spool/news/db/${db_file}
-		else
-			touch "${ROOT}"var/spool/news/db/${db_file}
-		fi
-
-		chown news:news "${ROOT}"var/spool/news/db/${db_file}
-		chmod 664 "${ROOT}"var/spool/news/db/${db_file}
-	done
-
-	elog "It is recommended to run emerge --config ${CATEGORY}/${PN}"
-	elog "now to finish setting up this package."
-	elog
-	elog "Do not forget to update your cron entries, and also run"
-	elog "makedbz if you need to.  If this is a first-time installation"
-	elog "a minimal active file has been installed.  You will need to"
-	elog "touch history and run 'makedbz -i' to initialize the history"
-	elog "database.  See INSTALL for more information."
-	elog
-	elog "You need to assign a real shell to the news user, or else"
-	elog "starting inn will fail. You can use 'usermod -s /bin/bash news'"
-	elog "for this."
-
-	if use ssl
-	then
-		install_cert /etc/news/cert/cert
-		chown news:news \
-			"${ROOT}"etc/news/cert/cert.{crt,csr,key,pem}
-
-		elog
-		elog "You may want to start nnrpd manually for native ssl support."
-		elog "If you choose to do so, automating this with a bootscript might"
-		elog "also be a good choice."
-		elog "Have a look at man nnrpd for valid parameters."
-		elog
-		elog "The certificate location in /etc/news/sasl.conf has been changed"
-		elog "to /etc/news/cert!"
-
-	fi
-}
-
-pkg_postrm() {
-	elog
-	elog "If you want your newsspool or altered configuration files"
-	elog "to be removed, please do so now manually."
-	elog
-}
-
-pkg_config() {
-	NEWSSPOOL_DIR="${ROOT}var/spool/news"
-	NEWS_SHELL="$( awk -F':' '/^news:/ {print $7;}' ${ROOT}etc/passwd )"
-	NEWS_ERRFLAG="0"
-
-	if [[ ${NEWS_SHELL} == /bin/false || ${NEWS_SHELL} == /dev/null ]]; then
-		einfo "Changing shell to /bin/bash for user news..."
-		usermod -s /bin/bash news
-	else
-		einfo "Shell for user news unchanged ('${NEWS_SHELL}')."
-		if [[ ${NEWS_SHELL} != /bin/sh && ${NEWS_SHELL} != /bin/bash ]]; then
-			ewarn "You might want to change it to '/bin/bash', though."
-		fi
-	fi
-
-	if [[ ! -e ${NEWSSPOOL_DIR}/db/history ]]; then
-		if [[ ! -f ${NEWSSPOOL_DIR}/db/history.dir \
-			&& ! -f ${NEWSSPOOL_DIR}/db/history.pag \
-			&& ! -f ${NEWSSPOOL_DIR}/db/history.hash \
-			&& ! -f ${NEWSSPOOL_DIR}/db/history.index ]]
-		then
-			einfo "Building history database ..."
-
-			touch "${NEWSSPOOL_DIR}"/db/history
-			chown news:news "${NEWSSPOOL_DIR}"/db/history
-			chmod 644 "${NEWSSPOOL_DIR}"/db/history
-
-			einfo "Running makedbz -i ..."
-			su - news -c "/usr/$(get_libdir)/news/bin/makedbz -i"
-
-			einfo "Moving files into place ..."
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.dir ]] && \
-				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.dir \
-				"${NEWSSPOOL_DIR}"/db/history.dir
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.pag ]] && \
-				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.pag \
-				"${NEWSSPOOL_DIR}"/db/history.pag
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.hash ]] && \
-				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.hash \
-				"${NEWSSPOOL_DIR}"/db/history.hash
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.index ]] && \
-				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.index \
-				"${NEWSSPOOL_DIR}"/db/history.index
-
-			einfo "Running makehistory ..."
-			su - news -c /usr/$(get_libdir)/news/bin/makehistory
-		else
-			NEWS_ERRFLAG="1"
-			eerror "Your installation seems to be screwed up."
-			eerror "${NEWSSPOOL_DIR}/db/history does not exist, but there's"
-			eerror "one of the files history.dir, history.hash or history.index"
-			eerror "within ${NEWSSPOOL_DIR}/db."
-			eerror "Use your backup to restore the history database."
-		fi
-	else
-		einfo "${NEWSSPOOL_DIR}/db/history found."
-		einfo "Leaving history database as it is."
-	fi
-
-	INNCFG_INODES=$(
-		sed /etc/news/inn.conf \
-			-e '/innwatchspoolnodes/ ! d; s:[^ ]*[ ]*\([^ ]*\):\1:'
-	)
-	INNSPOOL_INODES=$(
-		df -Pi ${NEWSSPOOL_DIR} | \
-			sed -e 's:[^ ]*[ ]*\([^ ]*\).*:\1:; 1 d'
-	)
-	if [[ ${INNCFG_INODES} -gt ${INNSPOOL_INODES} ]]; then
-		ewarn "Setting innwatchspoolinodes to zero, because the filesystem behind"
-		ewarn "$NEWSSPOOL_DIR works without inodes."
-		ewarn
-		cp /etc/news/inn.conf /etc/news/inn.conf.OLD
-		einfo "A copy of your old inn.conf has been saved to /etc/news/inn.conf.OLD."
-		sed -i /etc/news/inn.conf \
-			-e '/innwatchspoolnodes/ s:\([^ ]*\)\([ ]*\).*:\1\20:'
-		chown news:news /etc/news/inn.conf
-		chmod 644 /etc/news/inn.conf
-	fi
-
-	INNCHECK_LINES=$(
-		su - news -c "/usr/$(get_libdir)/news/bin/inncheck | wc -l"
-	)
-	if [[ ${INNCHECK_LINES} -gt 0 ]]; then
-		NEWS_ERRFLAG="1"
-		ewarn "inncheck most certainly found an error."
-		ewarn "Please check its output:"
-		eerror "`su - news -c /usr/$(get_libdir)/news/bin/inncheck`"
-	fi
-
-	if [[ ${NEWS_ERRFLAG} -gt 0 ]]; then
-		eerror "There were one or more errors/warnings checking your"
-		eerror "configuration. Please read inn's documentation and"
-		eerror "fix them accordingly."
-	else
-		einfo "INN configuration tests passed successfully."
-		ewarn "Please ensure you have configured inn properly."
-	fi
-}
diff --git a/net-nntp/inn/metadata.xml b/net-nntp/inn/metadata.xml
deleted file mode 100644
index c3c5f1546ad1..000000000000
--- a/net-nntp/inn/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-	<flag name="innkeywords">Enable automatic keyword generation support</flag>
-	<flag name="inntaggedhash">Use tagged hash table for history (disables large
-		file support)</flag>
-</use>
-</pkgmetadata>
diff --git a/net-nntp/pan/Manifest b/net-nntp/pan/Manifest
index 3d1fed135479..ae882756f117 100644
--- a/net-nntp/pan/Manifest
+++ b/net-nntp/pan/Manifest
@@ -1,5 +1,5 @@
 DIST pan-0.142.tar.bz2 2302780 BLAKE2B 5360b24dc3939bd440ed72e0d7e95d005a8155c784e7fc003369750d13bf5971b5549b76ab9b558bc8d3ebe6f946b6986854e1224ee41e0feb3cdf8bc840f591 SHA512 285e140c2d24297bbe14d6bcd995fa0e736c21ae541348a726988d4d42cd92e563671eb607aefb54d12b2afdba311b9b55f88d5a7c61e782503ab894f85fd06a
 DIST pan-0.145.tar.bz2 2307162 BLAKE2B 09535013d8c2fb511b8c79ef185880b69a3f948d0e168b4fb8acc4d3d07d94fb756df171d003b12e1baef3201e2b8be22d583bb9ff551a5ae22f464feaa6f077 SHA512 3dc92d519158ddd480fc43250bf7a3ec67a877e58b0877c02b99f1dfd968bf18c9a20c3d8c4b6acab4132da89b6b91dd2992616ddf46c1c3f9aa0de8f8ee1949
 EBUILD pan-0.142.ebuild 1151 BLAKE2B dc9de811f13f44b4ef41841cf43f480460e336790d4f6be76c80cef1002452c6978f1e5b530fb3e15b86b12ac7ed2cc1bb66fc582350d54b2006abd8598bd055 SHA512 f05d5fe9b37c446470dea50e3f377479663e0c52ee81974a0235427a9cad65599e0ae83748336c5a84e5432d7a148d5d1b092af26d643e94d43661af5822549f
-EBUILD pan-0.145.ebuild 1325 BLAKE2B 6e8d57f165542fb42af4b726aaf9753f884b9ded4200ee2e771c862531b0382dd33b889a3f19b4481d96e096b2d7e207600051b6b7b4b76fc0c4f44487c38c68 SHA512 5ed7d0ff3bfe135c922fae8415a12fcc76cd40042c562f7d86534bdba7ec48cfa5e5425f039b947128d67aba72eaba2a466f0c3f8ddef1ef0ed698b6f2c4245a
+EBUILD pan-0.145.ebuild 1320 BLAKE2B abce2cdc47365682a5c015123d748bc30ccf5c1b3f445ede635782ba641b35462ac2aafe38df2826cc21f9b7a47249f4c4def8d5dffd5391cfdcda353e30a825 SHA512 6b13fc1d318c1ad6abcd45e6b364b5ebdae195032df6a6902b31cd771357f49b19078faa2ba5d50c5fe666ea2e7b1ac6b638a381a47eb395d6afa7595fedcdb5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-nntp/pan/pan-0.145.ebuild b/net-nntp/pan/pan-0.145.ebuild
index 4dbc935e14a1..fbb998ba87a6 100644
--- a/net-nntp/pan/pan-0.145.ebuild
+++ b/net-nntp/pan/pan-0.145.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://pan.rebelbase.com/download/releases/${PV}/source/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="dbus gnome-keyring libnotify spell ssl"
 
 RDEPEND="