gentoo resync : 31.12.2018

6 files changed, 128 insertions, 6 deletions

diff --git a/mail-client/cone/Manifest b/mail-client/cone/Manifest
index 2a26391a94ea..5a1b99aee88a 100644
--- a/mail-client/cone/Manifest
+++ b/mail-client/cone/Manifest
@@ -1,7 +1,10 @@
+AUX cone-1.0-no-spelling.patch 1507 BLAKE2B ccbb1672ff8c623d27a4167e547a365ef808a63c91ff58333e74c10f3c0424a8847a83c3b4cdf3176659ffca8a89f14cacd25d22b89b50b1110cd0916070b314 SHA512 34bb65dd7fbd2a5f4014e9760d5bddf3c0d73962b2acce913bb06c48f3029cb5d13fe4e87fe9e9e6e06ab671b1deef1128349c35cffe937e950123632cdda730
 DIST cone-0.92.tar.bz2 3774451 BLAKE2B 3686ca90249f38c0be83138bf310802f5a5ea1e0694abef5ec9311a00e9c81692abf2148cf23640932ba1fe0c49ea6738689189c618412e985b02a45dba9c7a4 SHA512 8d764ed3cb2a22caff21d11beff74131fdbbe0f66dbf1a40293f62862e9af7a472840ff00a069df10143f7154c2db85ac5421999476516f27b8f090e5c1232fc
 DIST cone-0.95.tar.bz2 3748331 BLAKE2B 9461cc28afb255e7ca4080e4c876f5391e916c493b6596b0bfc0ec2d0cedb837d10cbd6904cd49b0b425e5edddd42c123b952725339b7388fb5a2debd72c04c1 SHA512 545d17286b937eb33b5fa14c36a480eea0146802f6c8a36e55987206b125bac55b25ab79a4c833ffa1fdcdbe56b2949acd5c8bdfd27c900bf64d5e738677ef4a
 DIST cone-0.96.tar.bz2 3752115 BLAKE2B d4548083f86adc096534750e69db648d24fc5b643961041df04257d71f4e8af2c3456948f9227e652d2bdc80f65948bf8b543c3eba738187e17d6d9f5c424e28 SHA512 6bdc8ac1a8ae8345bb09eb03857cf5db2c55ac57e3f76726a7371fd763a4265f02dbda7bcbf03090d3004bc800a5bb42a328ead900ff71609246aaa4a314609e
-EBUILD cone-0.92.ebuild 1204 BLAKE2B ca0a435102023619be0ae90924a3abbdc833a779a2767e72fe5acde4eda3ed4b2a408ce8e25a9c2d8bf7801319d76031d49024492c0edc3a5f99e6b4bf6236d6 SHA512 36969524dfce8c9db756a4c71ca32ed12d8452d12fc5c0f60a858d104db0b151466929c9508e07c933bfc6f8e9f95a5c20b6545e6d7e09862dab6f07b3ebb354
-EBUILD cone-0.95.ebuild 1220 BLAKE2B 768da40078ca1a06e65d43fef138da5163483bef83146ccdb0aa328b0b810b49a36b990687518a418bb1f1646c2bdf6005c8853e0bb77ac4d80777d6d2523644 SHA512 b189801319c1c10422ec5dc9334499421a5b346901ae0b4bbf650ed8d1a1061e7768016675c6f095eb4b6f23f00fbc4c4c4d6d33e2ad968f0673d67e13175715
-EBUILD cone-0.96.ebuild 1218 BLAKE2B 08bbc613c483e6df4f3a67f919969885ec44b7b1568c3fc9f7015a52a470f976b61d7922bdc5d2bbbe460f2593d45b1bb1a88ddf702937510b916552ff089fda SHA512 107f06c03ce2afc5d006ff0e064dd28b2b7456924018121bd7313a344d306390c7ac479bbef1a3afbdcc98563047172048508bf27ae14455f9f07c216d7787dc
+DIST cone-1.0.tar.bz2 3793288 BLAKE2B e2c8aa91adfff77d3f0207a3caca5d13ebae8c9455402c296a98364708acd3d4138ea4642044b2dfe396eaef18c3b90ebf0ef3702bc73351a4317219a4c28863 SHA512 6fc30158cebed62b0598787d53e1936b50a32b6590266e93dbacbd63371d4fa8e43ffe95e0f4ee51991e2d892b26c1531b563203e45108815f05a091b7051161
+EBUILD cone-0.92.ebuild 1205 BLAKE2B 56dddf9144e2a28e656a0926d3eb01114f0c1bd491e295453db4b3d37a8ef5e7eb59f59990dc6ee3373f1bb1c33162e8b01d725afa908e8e4c93108389821cf1 SHA512 35c9ca13e4450fa5e7123989c3e9cdfb078d3de74b415ae55ce262de7180b313cec985cf2fbd2083e4719e54fda43541ea4df44160f2f55cdda558a0b59a0dac
+EBUILD cone-0.95.ebuild 1221 BLAKE2B a9c887d3c02a756b016ef2ef4b494c352414e85562396959d3f2c24dff0db9f2916a62835970b1d5cbe6dabb7f51ae8c43776a286c87be82b790f639098c65a3 SHA512 2f511541c7b2cb23b50ba27ceb51686d0b16eb00e8dfe049f0aa6413153bf4c7b3db6be5c8b3b1d3f1ac6745b6fb779b762e4572e1bec11ae14b99be358876bc
+EBUILD cone-0.96.ebuild 1219 BLAKE2B 6682df0ccda6731aa09ac57254b8837a43e4fdb44892c7c5bc72eee30f85a0d3aab2b4278f20bdd55752cc9b2be89f375e0c20f6a842f5e82f9b10afdb171fac SHA512 3c77e9379cf36d209c29ce202ffdbeb1a1308bc58748d81212865fce2348213c1ec4404642ee57396cf16b625da92b02b8a949241fba73127f535f6be848f5fc
+EBUILD cone-1.0.ebuild 1714 BLAKE2B 6bf758f20974643d00423919e722d9db6ef32cb31a798c0ab665dd851f7f83e0770451e925a7b469eea37e47013161b15bff9a741556250c6c5fc346f636379c SHA512 565554bd82a108a7fac16981fd3ea61d01f5b2b53ca6e3184a0ab67ee922f1cafb4ee425558f8bd6aa58f763ef066260ddda34a284d3e5ce6a403d974cb6afca
 MISC metadata.xml 321 BLAKE2B 1b4f72d7e3b334f295e2952a680130ec7ab532a2c7ffa4af7a21f7dc0691aa537e90132631e0a10fa6cf1c6f162067aa1e6cafe07343352fdd890b36a09a1018 SHA512 fd5c4e74049cbed26f1c75602a0e7f1e42654c5e179bd90d311f745ce93eecaec21682d77b3fc560cd8876298893a72df195e1b90a20cda3dc2538622d110b6d
diff --git a/mail-client/cone/cone-0.92.ebuild b/mail-client/cone/cone-0.92.ebuild
index fdedc7525235..788f47ec24ee 100644
--- a/mail-client/cone/cone-0.92.ebuild
+++ b/mail-client/cone/cone-0.92.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit eutils autotools
 
 DESCRIPTION="CONE: COnsole News reader and Emailer"
-HOMEPAGE="http://www.courier-mta.org/cone/"
+HOMEPAGE="https://www.courier-mta.org/cone/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
diff --git a/mail-client/cone/cone-0.95.ebuild b/mail-client/cone/cone-0.95.ebuild
index ab7e7f1c86fa..255538f548c6 100644
--- a/mail-client/cone/cone-0.95.ebuild
+++ b/mail-client/cone/cone-0.95.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit eutils autotools
 
 DESCRIPTION="CONE: COnsole News reader and Emailer"
-HOMEPAGE="http://www.courier-mta.org/cone/"
+HOMEPAGE="https://www.courier-mta.org/cone/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
diff --git a/mail-client/cone/cone-0.96.ebuild b/mail-client/cone/cone-0.96.ebuild
index c88faa34c377..d3e487679909 100644
--- a/mail-client/cone/cone-0.96.ebuild
+++ b/mail-client/cone/cone-0.96.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit eutils autotools
 
 DESCRIPTION="CONE: COnsole News reader and Emailer"
-HOMEPAGE="http://www.courier-mta.org/cone/"
+HOMEPAGE="https://www.courier-mta.org/cone/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
diff --git a/mail-client/cone/cone-1.0.ebuild b/mail-client/cone/cone-1.0.ebuild
new file mode 100644
index 000000000000..9993625bdfbf
--- /dev/null
+++ b/mail-client/cone/cone-1.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="CONE: COnsole News reader and Emailer"
+HOMEPAGE="https://www.courier-mta.org/cone/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="crypt fam gnutls idn ipv6 ldap spell"
+
+RDEPEND="
+	dev-libs/libxml2
+	sys-libs/ncurses:0=
+	>=net-libs/courier-unicode-2
+	spell? ( app-text/aspell )
+	crypt? ( >=app-crypt/gnupg-1.0.4 )
+	fam? ( virtual/fam )
+	gnutls? (
+		net-libs/gnutls:0=
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	!gnutls? ( >=dev-libs/openssl-0.9.6:0= )
+	idn? ( net-dns/libidn:0= )
+	ipv6? ( net-dns/libidn:0= )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+PATCHES=( "${FILESDIR}"/${P}-no-spelling.patch )
+DOCS=( AUTHORS ChangeLog INSTALL NEWS README )
+
+src_prepare() {
+	default
+
+	# move local macro to m4 and run eautoreconf
+	mkdir "${S}"/m4 || die
+	sed -n -e '/# AC_PROG_SYSCONFTOOL/,+33 p' "${S}"/aclocal.m4 > m4/sysconftool.m4 || die
+	sed -i -e '/^SUBDIRS/i ACLOCAL_AMFLAGS = -I m4' "${S}"/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-notice=unicode
+		--with-spellcheck=$(usex spell aspell none)
+		$(use_with ldap ldapaddressbook)
+		$(use_with gnutls)
+		$(use_with idn libidn)
+		$(use_with ipv6)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	emake DESTDIR="${D}" install-configure
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} ]]; then
+		elog "See the \"Upgrading from version 0.96 and earlier\" section in"
+		elog "${EROOT}/usr/share/doc/${PF}/INSTALL for information on updating"
+		elog "older installs."
+	fi
+}
diff --git a/mail-client/cone/files/cone-1.0-no-spelling.patch b/mail-client/cone/files/cone-1.0-no-spelling.patch
new file mode 100644
index 000000000000..b8985b2a3c51
--- /dev/null
+++ b/mail-client/cone/files/cone-1.0-no-spelling.patch
@@ -0,0 +1,46 @@
+Allow spellchecking support to be disabled.
+
+--- cone-1.0/cone/configure.ac
++++ cone-1.0/cone/configure.ac
+@@ -183,8 +183,10 @@
+ 	ALLSPELLOBJ='spellcheckerPspell.$(OBJEXT)'" $ALLSPELLOBJ"
+ fi
+ 
+-AC_ARG_WITH(spellcheck, [  --with-spellcheck=pspell      Use pspell for spell checking
+-  --with-spellcheck=aspell      Use aspell for spell checking], [
++AC_ARG_WITH(spellcheck, [
++  --with-spellcheck=pspell      Use pspell for spell checking
++  --with-spellcheck=aspell      Use aspell for spell checking
++  --with-spellcheck=none        Disable spell checking], [
+ 
+ case "$withval" in
+ pspell)
+@@ -200,6 +202,10 @@
+ 		AC_MSG_ERROR(aspell library not found)
+ 	fi
+ 	;;
++none)
++	PSPELL="none"
++	ASPELL="none"
++	;;
+ *)
+ 	AC_MSG_ERROR(Invalid --with-spellcheck option)
+ 	;;
+@@ -232,10 +238,13 @@
+ 		SPELL_OBJ='spellcheckerPspell.$(OBJEXT)'
+ 		SPELL_LIB='-lpspell'
+ 	else
+-		AC_MSG_WARN(---------------------------------------------------------------)
+-		AC_MSG_WARN(Neither pspell nor aspell was found -- disabling spell checking)
+-		AC_MSG_WARN(---------------------------------------------------------------)
+-		sleep 5
++		if test "$ASPELL" != "none" && test "$PSPELL" != "none"
++		then
++			AC_MSG_WARN(---------------------------------------------------------------)
++			AC_MSG_WARN(Neither pspell nor aspell was found -- disabling spell checking)
++			AC_MSG_WARN(---------------------------------------------------------------)
++			sleep 5
++		fi
+ 		SPELL_OBJ='spellcheckerNone.$(OBJEXT)'
+ 		SPELL_LIB=''
+ 	fi