From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0E7561382C5 for ; Mon, 3 May 2021 08:51:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3ED53E07FA; Mon, 3 May 2021 08:51:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10646E07FA for ; Mon, 3 May 2021 08:51:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 99389335D6D for ; Mon, 3 May 2021 08:51:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 10F6047 for ; Mon, 3 May 2021 08:51:50 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1620031879.629d3356501ab24dd091a47d713f1724912a6831.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/neon/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/neon/neon-0.30.2.ebuild net-libs/neon/neon-0.31.0.ebuild net-libs/neon/neon-0.31.1.ebuild net-libs/neon/neon-0.31.2.ebuild X-VCS-Directories: net-libs/neon/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 629d3356501ab24dd091a47d713f1724912a6831 X-VCS-Branch: master Date: Mon, 3 May 2021 08:51:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 97181089-44c1-48e6-b23b-e53dcd98eed3 X-Archives-Hash: c46f0603c5f92a98f97096dd8bb39c8a commit: 629d3356501ab24dd091a47d713f1724912a6831 Author: Mikle Kolyada gentoo org> AuthorDate: Mon May 3 08:51:19 2021 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Mon May 3 08:51:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=629d3356 net-libs/neon: remove libressl support Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Mikle Kolyada gentoo.org> net-libs/neon/neon-0.30.2.ebuild | 12 ++---------- net-libs/neon/neon-0.31.0.ebuild | 12 ++---------- net-libs/neon/neon-0.31.1.ebuild | 12 ++---------- net-libs/neon/neon-0.31.2.ebuild | 12 ++---------- 4 files changed, 8 insertions(+), 40 deletions(-) diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild index 863f2e38958..0579d7c523d 100644 --- a/net-libs/neon/neon-0.30.2.ebuild +++ b/net-libs/neon/neon-0.30.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://webdav.org/neon/${P}.tar.gz" LICENSE="GPL-2" SLOT="0/27" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib" +IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib" RESTRICT="test" RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) @@ -26,8 +26,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) net-libs/gnutls:0=[${MULTILIB_USEDEP}] ) !gnutls? ( - libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) ) @@ -46,13 +45,6 @@ src_prepare() { # Fix compatibility with OpenSSL >=1.1. sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed" - if has_version "app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)\n{\n meth->app_data = app_data;\n return 1;\n}\n#endif" -i src/ne_pkcs11.c || die "sed failed" - fi - eapply_user AT_M4DIR="macros" eautoreconf diff --git a/net-libs/neon/neon-0.31.0.ebuild b/net-libs/neon/neon-0.31.0.ebuild index 1a5b84fea67..adbc8e2dcc7 100644 --- a/net-libs/neon/neon-0.31.0.ebuild +++ b/net-libs/neon/neon-0.31.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://webdav.org/neon/${P}.tar.gz" LICENSE="GPL-2" SLOT="0/27" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib" +IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib" RESTRICT="test" RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) @@ -26,8 +26,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) net-libs/gnutls:0=[${MULTILIB_USEDEP}] ) !gnutls? ( - libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) ) @@ -46,13 +45,6 @@ src_prepare() { # Fix compatibility with OpenSSL >=1.1. sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed" - if has_version "app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)\n{\n meth->app_data = app_data;\n return 1;\n}\n#endif" -i src/ne_pkcs11.c || die "sed failed" - fi - eapply_user AT_M4DIR="macros" eautoreconf diff --git a/net-libs/neon/neon-0.31.1.ebuild b/net-libs/neon/neon-0.31.1.ebuild index 06d89576f8d..a6ad1025fb5 100644 --- a/net-libs/neon/neon-0.31.1.ebuild +++ b/net-libs/neon/neon-0.31.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://notroj.github.io/neon/${P}.tar.gz" LICENSE="GPL-2" SLOT="0/27" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib" +IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib" RESTRICT="test" RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) @@ -26,8 +26,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) net-libs/gnutls:0=[${MULTILIB_USEDEP}] ) !gnutls? ( - libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) ) @@ -46,13 +45,6 @@ src_prepare() { # Fix compatibility with OpenSSL >=1.1. sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed" - if has_version "app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)\n{\n meth->app_data = app_data;\n return 1;\n}\n#endif" -i src/ne_pkcs11.c || die "sed failed" - fi - eapply_user AT_M4DIR="macros" eautoreconf diff --git a/net-libs/neon/neon-0.31.2.ebuild b/net-libs/neon/neon-0.31.2.ebuild index 0cfe9882b5e..27109c64f22 100644 --- a/net-libs/neon/neon-0.31.2.ebuild +++ b/net-libs/neon/neon-0.31.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://notroj.github.io/neon/${P}.tar.gz" LICENSE="GPL-2" SLOT="0/27" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib" +IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib" RESTRICT="test" RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) @@ -26,8 +26,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) net-libs/gnutls:0=[${MULTILIB_USEDEP}] ) !gnutls? ( - libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) ) @@ -46,13 +45,6 @@ src_prepare() { # Fix compatibility with OpenSSL >=1.1. sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed" - if has_version "app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)\n{\n meth->app_data = app_data;\n return 1;\n}\n#endif" -i src/ne_pkcs11.c || die "sed failed" - fi - eapply_user AT_M4DIR="macros" eautoreconf