diff options
Diffstat (limited to 'net-libs/neon')
| -rw-r--r-- | net-libs/neon/Manifest | 2 | ||||
| -rw-r--r-- | net-libs/neon/neon-0.30.2.ebuild | 45 |
2 files changed, 26 insertions, 21 deletions
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest index 3882cec690d9..22be2f5efa0c 100644 --- a/net-libs/neon/Manifest +++ b/net-libs/neon/Manifest @@ -1,3 +1,3 @@ DIST neon-0.30.2.tar.gz 932779 BLAKE2B 0536e4f1c8634ede9a1806180c315772a65b9cb1ead0ae3674d58aba855905b6a7c7684ef930ca1998c1163c662d642a687cc704922981dbc4a89efaa83f4cd9 SHA512 634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631 -EBUILD neon-0.30.2.ebuild 3428 BLAKE2B 0b6d26febcd80cc8289c51abbf7ceae84bd88622808fc0fca3da19131e6ce3ceef4e071b80815b8b6ab8a837c0b60133bd9239173ec3122da47864e35794b258 SHA512 e5b6370cae0b9cb4195cc52ade60e753309d7a3c558e1af5fcfdffcae221c80ff4076da6466e24fc2f1702ff491f7aa0c526809c76bffa8bb3dd898e10952c15 +EBUILD neon-0.30.2.ebuild 3445 BLAKE2B 90f7d22b993069c635213cfe7f75cc82f3934e15e4b68cd3cabbf90f23c5142917c96447fc870b9472f9112a1f4842d48e9d4829563d898190f0dd84acbed0a0 SHA512 2fdddea57b50983eba7fb01a87734d1618a43f031c52c06381ad232080442284c1c2cea83632d811bf15b2d172691fdcaae96e55d748d3f6e9ef55d8b792e3af MISC metadata.xml 1341 BLAKE2B c2bec964f34a0d9be01935bd3d78d3e4afcc0101f9d31eefa44106c13d3e8c1f91b227b5f15449d71785a889dfe801768c8b2aee361b919aede85e0d41602a17 SHA512 9b40394e7a103b87d61c0ac004dbb7294bc977ccb69d2669f186ceb1980fca2e2def5ac097ae2364c4e2c762e5170d06a5b281bbd870ebe00559cb5cb17d87f8 diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild index 506f311c68b3..f227074a1761 100644 --- a/net-libs/neon/neon-0.30.2.ebuild +++ b/net-libs/neon/neon-0.30.2.ebuild @@ -11,25 +11,26 @@ 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 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib" RESTRICT="test" RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) !expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) - gnutls? ( - app-misc/ca-certificates - net-libs/gnutls:0=[${MULTILIB_USEDEP}] - pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) - ) - !gnutls? ( ssl? ( - libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) - ) ) kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] ) libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] ) nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + app-misc/ca-certificates + net-libs/gnutls:0=[${MULTILIB_USEDEP}] + ) + !gnutls? ( + libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) + !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + ) + pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) + ) zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} virtual/pkgconfig[${MULTILIB_USEDEP}]" @@ -45,10 +46,12 @@ 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" - # Support LibreSSL. - # Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.1. - sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& || defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c || die "sed failed" - sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void *RSA_meth_get0_app_data(const RSA_METHOD *meth)\n{\n return meth->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" + if has_version "<dev-libs/libressl-3.0.0"; then + # Support LibreSSL. + # Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.2. + sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& || defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c || die "sed failed" + sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void *RSA_meth_get0_app_data(const RSA_METHOD *meth)\n{\n return meth->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 @@ -73,10 +76,12 @@ multilib_src_configure() { myconf+=(--with-libxml2) fi - if use gnutls; then - myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt") - elif use ssl; then - myconf+=(--with-ssl=openssl) + if use ssl; then + if use gnutls; then + myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt") + else + myconf+=(--with-ssl=openssl) + fi fi econf \ @@ -103,7 +108,7 @@ multilib_src_install() { } multilib_src_install_all() { - find "${ED}" -name "*.la" -delete + find "${D}" -name "*.la" -type f -delete || die dodoc AUTHORS BUGS NEWS README THANKS TODO } |