commit: 96aebb235660d6223e1041f3d1d3183632cadb2c Author: Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru> AuthorDate: Sun Jan 3 12:53:07 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jan 21 23:23:00 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96aebb23
net-libs/libmicrohttpd: fixed deps for stable versions libmicrohttpd doesn't need libgcrypt if recent enough GnuTLS is used. curl is always required for testing. Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru> Closes: https://github.com/gentoo/gentoo/pull/18925 Signed-off-by: Sam James <sam <AT> gentoo.org> ...ibmicrohttpd-0.9.65.ebuild => libmicrohttpd-0.9.65-r1.ebuild} | 9 ++------- ...ibmicrohttpd-0.9.68.ebuild => libmicrohttpd-0.9.68-r1.ebuild} | 9 ++------- ...ibmicrohttpd-0.9.70.ebuild => libmicrohttpd-0.9.70-r1.ebuild} | 9 ++------- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.65-r1.ebuild similarity index 91% rename from net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild rename to net-libs/libmicrohttpd/libmicrohttpd-0.9.65-r1.ebuild index e8edd69c90f..86899485385 100644 --- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild +++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.65-r1.ebuild @@ -17,17 +17,12 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" IUSE="+epoll messages ssl static-libs test" RESTRICT="!test? ( test )" -RDEPEND="ssl? ( - dev-libs/libgcrypt:0= - net-libs/gnutls - )" +RDEPEND="ssl? ( >net-libs/gnutls-2.12.20 )" # We disable tests below because they're broken, # but if enabled, we'll need this. DEPEND="${RDEPEND} - test? ( - ssl? ( net-misc/curl[ssl] ) - )" + test? ( net-misc/curl[ssl?] )" S=${WORKDIR}/${MY_P} diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild similarity index 91% rename from net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild rename to net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild index 455a6c307e1..d8c18603ae0 100644 --- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild +++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild @@ -17,17 +17,12 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86" IUSE="+epoll ssl static-libs test" RESTRICT="!test? ( test )" -RDEPEND="ssl? ( - dev-libs/libgcrypt:0= - net-libs/gnutls - )" +RDEPEND="ssl? ( >net-libs/gnutls-2.12.20 )" # We disable tests below because they're broken, # but if enabled, we'll need this. DEPEND="${RDEPEND} - test? ( - ssl? ( net-misc/curl[ssl] ) - )" + test? ( net-misc/curl[ssl?] )" S=${WORKDIR}/${MY_P} diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.70-r1.ebuild similarity index 91% rename from net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild rename to net-libs/libmicrohttpd/libmicrohttpd-0.9.70-r1.ebuild index e131da4973d..67cf3c34f33 100644 --- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild +++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.70-r1.ebuild @@ -17,17 +17,12 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" IUSE="+epoll ssl static-libs test" RESTRICT="!test? ( test )" -RDEPEND="ssl? ( - dev-libs/libgcrypt:0= - net-libs/gnutls - )" +RDEPEND="ssl? ( >net-libs/gnutls-2.12.20 )" # We disable tests below because they're broken, # but if enabled, we'll need this. DEPEND="${RDEPEND} - test? ( - ssl? ( net-misc/curl[ssl] ) - )" + test? ( net-misc/curl[ssl?] )" S=${WORKDIR}/${MY_P}
