commit: 9f25b07755c189e681b33438b66c6430daf7a530 Author: Eray Aslan <eras <AT> gentoo <DOT> org> AuthorDate: Mon Jul 3 14:09:51 2017 +0000 Commit: Eray Aslan <eras <AT> gentoo <DOT> org> CommitDate: Mon Jul 3 14:10:43 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f25b077
mail-client/cone: remove old Package-Manager: Portage-2.3.6, Repoman-2.3.2 mail-client/cone/Manifest | 2 - mail-client/cone/cone-0.89.ebuild | 60 ---------------- mail-client/cone/cone-0.90-r1.ebuild | 65 ----------------- mail-client/cone/cone-0.90.ebuild | 61 ---------------- .../cone-0.84.20100819-aspell-automagic.patch | 84 ---------------------- .../cone/files/cone-0.86-skip-rfc2045-test.patch | 11 --- mail-client/cone/files/cone-0.90-gnutls3.patch | 72 ------------------- 7 files changed, 355 deletions(-) diff --git a/mail-client/cone/Manifest b/mail-client/cone/Manifest index c6b21e6f50f..1593f460a0a 100644 --- a/mail-client/cone/Manifest +++ b/mail-client/cone/Manifest @@ -1,5 +1,3 @@ -DIST cone-0.89.tar.bz2 3794802 SHA256 71678cb2a95cd02ce2c734549dee9c542e29c3a29c376b64884022febb0d3fba SHA512 86f9842381702b05446e62f5933bd080b931018f2a7136169fc7a5da1d601f108e83cc6509bc0f0ad53f374df25a45ab68bac38274e4df1f5e40ee04124ada3b WHIRLPOOL de8b3fda5f2eda359260153310364e160f22f26da5feee183370bf0f55ad67ceb587a6d1075bbe72488c84e199b86612d4157f0cbeae5309a4fb3d85096170be -DIST cone-0.90.tar.bz2 3906323 SHA256 b03edfbf3392fb7b8d93574dad2bc4c7cbfca8890afabac8b99b21a9f46d8733 SHA512 6446f868e07a54bda074e403ce48d590a55e97cf25b7e6172ba02df1242a232ade52840a837dd92e70253159cc637c17876876db01445c60374152262329ae27 WHIRLPOOL 30f07794b712650bf2b5715aca912b34471f89cd812ce2a45c7b352c8bca392625c91a74d65917506a8f80e6255534f5ae4ebaa05b269745f1b2bc16c593d838 DIST cone-0.92.tar.bz2 3774451 SHA256 bfc1170565d931ac9b8a674410f44cb2472c7b755b5bb97e9915d37fdfe9d631 SHA512 8d764ed3cb2a22caff21d11beff74131fdbbe0f66dbf1a40293f62862e9af7a472840ff00a069df10143f7154c2db85ac5421999476516f27b8f090e5c1232fc WHIRLPOOL 8520d2b07aaf4d03b4055672fbc8c29b0e50ab2053672187853b9b2f3dfd261cd9e858543b62644aae16504ade70b782d1d85e47f5dd562b754d2be62bc7bc06 DIST cone-0.95.tar.bz2 3748331 SHA256 ae31dddd4f64c50397cae2706ae4505a2df8aafdde2a73bffe08c2362615c89b SHA512 545d17286b937eb33b5fa14c36a480eea0146802f6c8a36e55987206b125bac55b25ab79a4c833ffa1fdcdbe56b2949acd5c8bdfd27c900bf64d5e738677ef4a WHIRLPOOL 6acd7f53d6e749864362096c5ce2703bea617be1a6dcb955979188d13674ac345b58e56cd4836b3d345f79a80e9a1777553b7d405899aa6256b04d58bd1a4882 DIST cone-0.96.tar.bz2 3752115 SHA256 657b16002deae701d5a9ca5572bfe9c05ba40c0da523ecebb8171f48863f6a8e SHA512 6bdc8ac1a8ae8345bb09eb03857cf5db2c55ac57e3f76726a7371fd763a4265f02dbda7bcbf03090d3004bc800a5bb42a328ead900ff71609246aaa4a314609e WHIRLPOOL a96a281c6c46b41707cdd2a6dc64cfc5bdb81a830eee681a89f04806cad7cb7c7ff0e8e7f4cf6941210aee1299125936b5235dffeacb6ca4d33d5f991e9e502e diff --git a/mail-client/cone/cone-0.89.ebuild b/mail-client/cone/cone-0.89.ebuild deleted file mode 100644 index 41f1241f879..00000000000 --- a/mail-client/cone/cone-0.89.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils autotools - -DESCRIPTION="CONE: COnsole News reader and Emailer" -HOMEPAGE="http://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/openssl-0.9.6 - dev-libs/libxml2 - sys-libs/ncurses - crypt? ( >=app-crypt/gnupg-1.0.4 ) - fam? ( virtual/fam ) - gnutls? ( net-libs/gnutls ) - idn? ( net-dns/libidn ) - ipv6? ( net-dns/libidn ) - ldap? ( net-nds/openldap ) - spell? ( app-text/aspell )" -DEPEND="${RDEPEND} - dev-lang/perl" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.84.20100819-aspell-automagic.patch \ - "${FILESDIR}"/${PN}-0.86-skip-rfc2045-test.patch - - cd "${S}"/cone - LIBTOOLIZE="true" eautoreconf - - cd "${S}"/rfc2045 - eautomake -} - -src_configure() { - local myconf - if use spell ; then - myconf="--with-spellcheck=aspell" - else - myconf="--with-spellcheck=none" - fi - - econf \ - ${myconf} \ - $(use_with ldap ldapaddressbook) \ - $(use_with gnutls) \ - $(use_with idn libidn) \ - $(use_with ipv6) -} - -src_install() { - default - emake DESTDIR="${D}" install-configure -} diff --git a/mail-client/cone/cone-0.90-r1.ebuild b/mail-client/cone/cone-0.90-r1.ebuild deleted file mode 100644 index 59883046e6a..00000000000 --- a/mail-client/cone/cone-0.90-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils autotools - -DESCRIPTION="CONE: COnsole News reader and Emailer" -HOMEPAGE="http://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/openssl-0.9.6 - dev-libs/libxml2 - sys-libs/ncurses - crypt? ( >=app-crypt/gnupg-1.0.4 ) - fam? ( virtual/fam ) - gnutls? ( net-libs/gnutls ) - idn? ( net-dns/libidn ) - ipv6? ( net-dns/libidn ) - ldap? ( net-nds/openldap ) - spell? ( app-text/aspell )" -DEPEND="${RDEPEND} - dev-lang/perl" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.84.20100819-aspell-automagic.patch - epatch "${FILESDIR}"/${PN}-0.86-skip-rfc2045-test.patch - epatch "${FILESDIR}"/${P}-gnutls3.patch - - # move local macro to m4 and run eautoreconf - mkdir "${S}/m4" - 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 - sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in */configure.in || die - eautoreconf - # TODO: Find and fix the bug - #514048 - cd cone && eautoreconf -} - -src_configure() { - local myconf - if use spell ; then - myconf="--with-spellcheck=aspell" - else - myconf="--with-spellcheck=none" - fi - - econf \ - ${myconf} \ - $(use_with ldap ldapaddressbook) \ - $(use_with gnutls) \ - $(use_with idn libidn) \ - $(use_with ipv6) -} - -src_install() { - default - emake DESTDIR="${D}" install-configure -} diff --git a/mail-client/cone/cone-0.90.ebuild b/mail-client/cone/cone-0.90.ebuild deleted file mode 100644 index d9b3910b537..00000000000 --- a/mail-client/cone/cone-0.90.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils autotools - -DESCRIPTION="CONE: COnsole News reader and Emailer" -HOMEPAGE="http://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/openssl-0.9.6 - dev-libs/libxml2 - sys-libs/ncurses - crypt? ( >=app-crypt/gnupg-1.0.4 ) - fam? ( virtual/fam ) - gnutls? ( net-libs/gnutls ) - idn? ( net-dns/libidn ) - ipv6? ( net-dns/libidn ) - ldap? ( net-nds/openldap ) - spell? ( app-text/aspell )" -DEPEND="${RDEPEND} - dev-lang/perl" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.84.20100819-aspell-automagic.patch \ - "${FILESDIR}"/${PN}-0.86-skip-rfc2045-test.patch - - # move local macro to m4 and run eautoreconf - mkdir "${S}/m4" - 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 myconf - if use spell ; then - myconf="--with-spellcheck=aspell" - else - myconf="--with-spellcheck=none" - fi - - econf \ - ${myconf} \ - $(use_with ldap ldapaddressbook) \ - $(use_with gnutls) \ - $(use_with idn libidn) \ - $(use_with ipv6) -} - -src_install() { - default - emake DESTDIR="${D}" install-configure -} diff --git a/mail-client/cone/files/cone-0.84.20100819-aspell-automagic.patch b/mail-client/cone/files/cone-0.84.20100819-aspell-automagic.patch deleted file mode 100644 index d6b4d09b5f2..00000000000 --- a/mail-client/cone/files/cone-0.84.20100819-aspell-automagic.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- cone-0.84.20100819/cone/configure.in.orig 2010-11-11 22:08:37.279191265 -0800 -+++ cone-0.84.20100819/cone/configure.in 2010-11-11 23:26:22.685898387 -0800 -@@ -168,19 +168,9 @@ - LIBS="$save_LIBS" - AC_MSG_RESULT($PSPELL) - --ALLSPELLOBJ='spellcheckerNone.$(OBJEXT)' --if test "$ASPELL" = "yes" --then -- ALLSPELLOBJ='spellcheckerAspell.$(OBJEXT)'" $ALLSPELLOBJ" --fi -- --if test "$PSPELL" = "yes" --then -- 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], [ -+ --with-spellcheck=aspell Use aspell for spell checking -+ --with-spellcheck=none Disable spell checking], [ - - case "$withval" in - pspell) -@@ -196,6 +186,10 @@ - AC_MSG_ERROR(aspell library not found) - fi - ;; -+none) -+ SPELL="no" -+ # Spellchecking is not enabled -+ ;; - *) - AC_MSG_ERROR(Invalid --with-spellcheck option) - ;; -@@ -216,24 +210,34 @@ - AC_MSG_RESULT(yes) - ], AC_MSG_RESULT(no)) - --if test "$ASPELL" = "yes" -+if test "$SPELL" = "no" - then -- SPELL_OBJ='spellcheckerAspell.$(OBJEXT)' -- AC_DEFINE_UNQUOTED(USE_ASPELL, 1, [ Use aspell library for spell checking ]) -- SPELL_LIB='-laspell' -+ ALLSPELLOBJ='spellcheckerNone.$(OBJEXT)' -+ SPELL_OBJ='spellcheckerNone.$(OBJEXT)' -+ SPELL_LIB='' -+ AC_MSG_WARN(Disabling spell checking) - else -- if test "$PSPELL" = "yes" -+ if test "$ASPELL" = "yes" - then -- AC_DEFINE_UNQUOTED(USE_PSPELL, 1, [ Use aspell library for spell checking ]) -- SPELL_OBJ='spellcheckerPspell.$(OBJEXT)' -- SPELL_LIB='-lpspell' -+ ALLSPELLOBJ='spellcheckerAspell.$(OBJEXT)'" $ALLSPELLOBJ" -+ SPELL_OBJ='spellcheckerAspell.$(OBJEXT)' -+ AC_DEFINE_UNQUOTED(USE_ASPELL, 1, [ Use aspell library for spell checking ]) -+ SPELL_LIB='-laspell' - else -- AC_MSG_WARN(---------------------------------------------------------------) -- AC_MSG_WARN(Neither pspell nor aspell was found -- disabling spell checking) -- AC_MSG_WARN(---------------------------------------------------------------) -- sleep 5 -- SPELL_OBJ='spellcheckerNone.$(OBJEXT)' -- SPELL_LIB='' -+ if test "$PSPELL" = "yes" -+ then -+ ALLSPELLOBJ='spellcheckerPspell.$(OBJEXT)'" $ALLSPELLOBJ" -+ AC_DEFINE_UNQUOTED(USE_PSPELL, 1, [ Use aspell library for spell checking ]) -+ 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 -+ SPELL_OBJ='spellcheckerNone.$(OBJEXT)' -+ SPELL_LIB='' -+ fi - fi - fi - diff --git a/mail-client/cone/files/cone-0.86-skip-rfc2045-test.patch b/mail-client/cone/files/cone-0.86-skip-rfc2045-test.patch deleted file mode 100644 index 4cd5206a145..00000000000 --- a/mail-client/cone/files/cone-0.86-skip-rfc2045-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cone-0.86/rfc2045/Makefile.am.orig -+++ cone-0.86/rfc2045/Makefile.am -@@ -77,6 +77,6 @@ - endif - - check-am: -- @SHELL@ $(srcdir)/testsuite | cmp -s - $(srcdir)/$(TESTSUITE) -- @SHELL@ $(srcdir)/testsuitemm | cmp -s - $(srcdir)/testsuitemm.txt -+# @SHELL@ $(srcdir)/testsuite | cmp -s - $(srcdir)/$(TESTSUITE) -+# @SHELL@ $(srcdir)/testsuitemm | cmp -s - $(srcdir)/testsuitemm.txt - @SHELL@ $(srcdir)/testrfc3676parsersuite | diff -U 3 $(srcdir)/testrfc3676parsersuite.txt - diff --git a/mail-client/cone/files/cone-0.90-gnutls3.patch b/mail-client/cone/files/cone-0.90-gnutls3.patch deleted file mode 100644 index 23f187bb018..00000000000 --- a/mail-client/cone/files/cone-0.90-gnutls3.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/tcpd/configure.in b/tcpd/configure.in -index 7261515..406914e 100644 ---- a/tcpd/configure.in -+++ b/tcpd/configure.in -@@ -356,7 +356,7 @@ then - - CPPFLAGS="$save_CPPFLAGS" - else -- have_gnutls="no: pkgconfig --modeversion gnutls failed" -+ have_gnutls="no: pkgconfig --modversion gnutls failed" - fi - else - have_gnutls="no: pkg-config not found" -@@ -368,7 +368,15 @@ if test "$have_gnutls" = "yes" - then - LIBCOURIERTLSGNUTLS="libcouriertlsgnutls.la" - CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags gnutls`" -- gnutlsdep="`$PKGCONFIG --libs gnutls` -lgnutls-extra" -+ have_gnutls3=no -+ PKG_CHECK_EXISTS([gnutls >= 3.0], [have_gnutls3=yes]) -+ if test "x$have_gnutls3" = "xno" -+ then -+ gnutlsdep="`$PKGCONFIG --libs gnutls` -lgnutls-extra" -+ else -+ gnutlsdep="`$PKGCONFIG --libs gnutls`" -+ AC_DEFINE([HAVE_GNUTLS3], [1], [Use GnuTLS3]) -+ fi - fi - - AC_CHECK_SIZEOF(gnutls_transport_ptr_t,0, [ -diff --git a/tcpd/libcouriergnutls.c b/tcpd/libcouriergnutls.c -index 4aa4996..ef8cb70 100644 ---- a/tcpd/libcouriergnutls.c -+++ b/tcpd/libcouriergnutls.c -@@ -9,7 +9,9 @@ - #include "tlscache.h" - #include "soxwrap/soxwrap.h" - #include <gnutls/gnutls.h> -+#ifndef HAVE_GNUTLS3 - #include <gnutls/extra.h> -+#endif - #include <gnutls/x509.h> - #include <gnutls/openpgp.h> - #include <stdio.h> -@@ -146,7 +148,11 @@ static const struct intmap { - { NULL, 0} - }, all_comps[]={ - { "DEFLATE", GNUTLS_COMP_DEFLATE}, -+#ifndef HAVE_GNUTLS3 - { "LZO", GNUTLS_COMP_LZO}, -+#else -+ { "ZLIB", GNUTLS_COMP_ZLIB}, -+#endif - { "NULL", GNUTLS_COMP_NULL}, - { NULL, 0} - }, all_certs[]={ -@@ -408,6 +414,7 @@ ssl_context tls_create(int isserver, const struct tls_info *info) - return (NULL); - } - -+#ifndef HAVE_GNUTLS3 - if (gnutls_global_init_extra() < 0) - { - gnutls_global_deinit(); -@@ -416,6 +423,7 @@ ssl_context tls_create(int isserver, const struct tls_info *info) - errno=EINVAL; - return (NULL); - } -+#endif - } - - if (!(words=splitwords(safe_getenv(p, "TLS_PROTOCOL",
