gentoo resync : 18.12.2017

4 files changed, 2 insertions, 200 deletions

diff --git a/mail-client/nail/Manifest b/mail-client/nail/Manifest
index e8516550acb5..b63d6cbefc40 100644
--- a/mail-client/nail/Manifest
+++ b/mail-client/nail/Manifest
@@ -1,7 +1,5 @@
 AUX nail-12.4-debian.patch 1060 BLAKE2B dc07866c7871391e9bbddecfb5bb5addec4cffc16b93f03d0b6288a4fb95fdc546813ee16dd7a3eb3a03ded2c6889fe3c3e5a9b5fc8414d53b53079f17642ca4 SHA512 3cf37a64acf205bb8404e87e93cd920ee71ae8a9a2af147c21ef7d7b4684a05c1bf38eb3cf9e7a7fef7c883fb48de2324d3a687064f1adea3ab3949d6dcce513
 AUX nail-12.4-openssl-1.patch 1860 BLAKE2B e91b6a9f334060c6393aaa20120c0ce21bc6048c24aa097d57fd4eb73300ce864d6631e0b3a1202c43a9baab1bc11873e21d91f12d0478f8e81649ca9337bb6c SHA512 6496973734f4a4c724c3dc7c46a8fde160e4bd456405737098d65d193581c891e697d728b7ebc7cb0317f9ede9b39110e1b27b2bce896aee9eec85474758eeca
 DIST mailx-12.4.tar.bz2 271482 BLAKE2B ad011ef648036f10f800097c56a34cc5b882b808a7886eea86fa3dfc6f5a9a5b4e64e86e9b842384e4f55ce998ee8832176ce7e325c646ac26a187cbf26406a0 SHA512 a0e29972f552bd630ce1a14f70e61661815118520bcd4a00b6cad53f3270d3d08c835ff6982ba8800eb380a5b46f54eb6e60fb7533b5f41c916af45d29605af8
-EBUILD nail-12.4-r2.ebuild 2370 BLAKE2B 75c7511b910f99eec39004ac9ad52c5b271568fdffad6c6445261cea1e5bb435db1dc91de92a51ec7974d33a26d140ebfda9f33f2966ff26e81489d5b344e3e8 SHA512 026e36fffa7fe7386aa72fe1ad7fb498d37be430ed31937491edaa0b591d8963aa59597a770f0e0c7042bccf2ae9fbb96ea00d3e4143d1d543801e4c01e69dc2
-EBUILD nail-12.4-r3.ebuild 2436 BLAKE2B 764a0035f1f58447a10a2045553732365669a8de76c9e8542f5ddddeb0f0c24e31a10121d497b416aecfdc10e1c900a6ff3f9a5a0861c646ce7c79536eda5840 SHA512 fb42d0c912a55932d30216ff97ff7aa9832a8745465beb230e8f7cc978358f2da015d77b2fe5bbe76164fb7594c0847ea0d5c98682c672f7b7fba2ca820ac8f0
-EBUILD nail-12.4.ebuild 2177 BLAKE2B c0e767df2c9c19f7976d4eb0eb633fd472dbd8b117fa33735e86861487bccf3e0a9ccd6a4c7bb820957ca67ea2c23465c9eae97038d0d50f13ef9e42cab2f11f SHA512 e8697a8be27325b82aa4ff17b80878bbf0ea9bafa2c5bfa473789538efbb397b1e27c2aaa755f9ccddded1e7daef8262e36d7e2ab561ad78b35fa3a438a24762
+EBUILD nail-12.4-r3.ebuild 2431 BLAKE2B ca5556e0e56597904b4315aadaff3a66df315c0c2f48ca69ccade567241982ba13e3931dba39f16768feef741aa9b0487545d1ad1e656ddaa8c3f2ab692b9bed SHA512 abfd5dceda88571f26a8ae6c79739f4e270e600f8f5b5429b532c0ed84e85fddf2a2e809ea18858c3ed85ed49f7a34b7dae1389414fdd5bc81def832faedf958
 MISC metadata.xml 907 BLAKE2B c93a11b1488fe3c37220f683bdcc5fac0bf8bfb003ef0166c4632bb178047d7ae819294a83442f75e22fedfc2f50a31c24208833962d27158b59bc094e6fba79 SHA512 7f03613e2f7f8621b996d59a63505882925e755bbc8567a2c3dce3db0304e19ee007df2633fde5232877b71161eb51d037cf205a42b926d36d3aad111a9636d3
diff --git a/mail-client/nail/nail-12.4-r2.ebuild b/mail-client/nail/nail-12.4-r2.ebuild
deleted file mode 100644
index ca0cec9d82f5..000000000000
--- a/mail-client/nail/nail-12.4-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-HOMEPAGE="http://heirloom.sourceforge.net/"
-DESCRIPTION="an enhanced mailx-compatible mail client"
-LICENSE="BSD"
-
-MY_PN="mailx"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ssl net kerberos"
-
-RDEPEND="
-	net? (
-		ssl? ( dev-libs/openssl )
-		kerberos? ( virtual/krb5 )
-	)
-	!mail-client/mailx
-	!net-mail/mailutils
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-undef() {
-	sed -i -e "/$1/s:#define:#undef:" config.h || die
-}
-
-droplib() {
-	sed -i -e "/$1/s:^:#:" LIBS || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-debian.patch \
-		"${FILESDIR}"/${P}-openssl-1.patch
-	# Do not strip the binary
-	sed -i -e '/STRIP/d' Makefile
-}
-
-src_configure() {
-	# Build config.h and LIBS, neccesary to tweak the config
-	# use -j1 because it will produce bogus output otherwise
-	emake -j1 config.h LIBS || die
-
-	# Logic to 'configure' the package
-
-	if ! use ssl || ! use net ; then
-		undef 'USE_\(OPEN\)\?SSL'
-		droplib -lssl
-	fi
-
-	if ! use kerberos || ! use net ; then
-		undef 'USE_GSSAPI'
-		droplib -lgssapi_krb5
-	fi
-
-	if ! use net ; then
-		undef 'HAVE_SOCKETS'
-	fi
-}
-
-src_compile() {
-	# No configure script to check for and set this
-	tc-export CC
-
-	emake \
-		CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" \
-		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc \
-		SENDMAIL="${EPREFIX}/usr/sbin/sendmail" \
-		MAILSPOOL='/var/spool/mail' \
-		|| die "emake failed"
-}
-
-src_install () {
-	# Use /usr/sbin/sendmail by default and provide an example
-	cat <<- EOSMTP >> nail.rc
-
-		# Use the local sendmail (/usr/sbin/sendmail) binary by default.
-		# (Uncomment the following line to use a SMTP server)
-		#set smtp=localhost
-
-		# Ask for CC: list too.
-		set askcc
-	EOSMTP
-
-	emake DESTDIR="${D}" \
-		UCBINSTALL=$(type -p install) \
-		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc install \
-		|| die
-
-	dodoc AUTHORS README || die
-
-	dodir /bin
-	dosym ../usr/bin/mailx /bin/mail || die
-	dosym mailx /usr/bin/mail || die
-	dosym mailx /usr/bin/Mail || die
-
-	dosym mailx.1 /usr/share/man/man1/mail.1 || die
-	dosym mailx.1 /usr/share/man/man1/Mail.1 || die
-}
diff --git a/mail-client/nail/nail-12.4-r3.ebuild b/mail-client/nail/nail-12.4-r3.ebuild
index 1c0270cfcb5d..6cd0f0c264bf 100644
--- a/mail-client/nail/nail-12.4-r3.ebuild
+++ b/mail-client/nail/nail-12.4-r3.ebuild
@@ -13,7 +13,7 @@ MY_PN="mailx"
 MY_P="${MY_PN}-${PV}"
 SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="libressl ssl net kerberos"
 
 RDEPEND="
diff --git a/mail-client/nail/nail-12.4.ebuild b/mail-client/nail/nail-12.4.ebuild
deleted file mode 100644
index 00e9a0fd8c72..000000000000
--- a/mail-client/nail/nail-12.4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-HOMEPAGE="http://heirloom.sourceforge.net/"
-DESCRIPTION="an enhanced mailx-compatible mail client"
-LICENSE="BSD"
-
-MY_PN="mailx"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="ssl net kerberos"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )
-	!mail-client/mailx
-	!net-mail/mailutils
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-remove_ssl() {
-	elog "Disabling SSL support"
-	sed -i -e 's~#define USE_\(OPEN\)\?SSL~#undef USE_\1SSL~' config.h
-	sed -i -e 's~-ssl~~' -e 's~-lcrypto~~' LIBS
-}
-
-remove_sockets() {
-	elog "Not enabling sockets (thus disabling IMAP, POP and SMTP)"
-	sed -i -e 's~#define HAVE_SOCKETS~#undef HAVE_SOCKETS~' config.h
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-debian.patch \
-		"${FILESDIR}"/${P}-openssl-1.patch
-	# Do not strip the binary
-	sed -i -e '/STRIP/d' Makefile
-}
-
-src_configure() {
-	# Build config.h and LIBS, neccesary to tweak the config
-	make config.h LIBS
-
-	# Logic to 'configure' the package
-	if use net && ! use ssl ; then
-		remove_ssl
-	elif ! use net ; then
-		# Linking to ssl without net support is pointless
-		remove_ssl
-		remove_sockets
-	fi
-}
-
-src_compile() {
-	# No configure script to check for and set this
-	tc-export CC
-
-	emake \
-		CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"
-		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc \
-		MAILSPOOL='/var/spool/mail' \
-		|| die "emake failed"
-}
-
-src_install () {
-	# Use /usr/lib/sendmail by default and provide an example
-	cat <<- EOSMTP >> nail.rc
-
-		# Use the local sendmail (/usr/lib/sendmail) binary by default.
-		# (Uncomment the following line to use a SMTP server)
-		#set smtp=localhost
-	EOSMTP
-
-	make DESTDIR="${D}" \
-		UCBINSTALL=$(type -p install) \
-		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc install \
-		|| die
-	dodoc AUTHORS README
-	dodir /bin
-	dosym /usr/bin/mailx /bin/mail
-	dosym /usr/bin/mailx /usr/bin/mail
-	dosym /usr/bin/mailx /usr/bin/Mail
-}