Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild3
-rw-r--r--dev-lua/luasec/luasec-0.5.ebuild4
-rw-r--r--eclass/ssl-cert.eclass17
-rw-r--r--media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild4
-rw-r--r--media-video/rtmpdump/rtmpdump-9999.ebuild4
-rw-r--r--net-dns/nsd/nsd-4.1.7.ebuild4
-rw-r--r--net-im/bitlbee/bitlbee-3.4.1.ebuild4
-rw-r--r--net-im/bitlbee/bitlbee-9999.ebuild4
-rw-r--r--net-im/prosody/prosody-0.9.10.ebuild4
-rw-r--r--net-irc/irssi/irssi-0.8.17.ebuild4
-rw-r--r--net-irc/irssi/irssi-9999.ebuild4
-rw-r--r--net-libs/ldns/ldns-1.6.17-r1.ebuild15
-rw-r--r--net-libs/serf/serf-1.3.8-r1.ebuild4
-rw-r--r--www-client/lynx/lynx-2.8.9_pre6.ebuild4
14 files changed, 48 insertions, 31 deletions
diff --git a/dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild b/dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild
index a431caab2d5b..56679005404c 100644
--- a/dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild
+++ b/dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild
@@ -13,10 +13,11 @@ SRC_URI="https://github.com/mkottman/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
RDEPEND="
>=dev-lang/lua-5.1:0
- dev-libs/openssl:0"
+ !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/dev-lua/luasec/luasec-0.5.ebuild b/dev-lua/luasec/luasec-0.5.ebuild
index 0a63236d63a1..d456bb528350 100644
--- a/dev-lua/luasec/luasec-0.5.ebuild
+++ b/dev-lua/luasec/luasec-0.5.ebuild
@@ -13,12 +13,12 @@ SRC_URI="https://github.com/brunoos/luasec/archive/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 arm x86"
-IUSE=""
+IUSE="libressl"
RDEPEND="
>=dev-lang/lua-5.1:0[deprecated]
dev-lua/luasocket
- dev-libs/openssl:0"
+ !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
index 33bee2f8ded8..053e10133633 100644
--- a/eclass/ssl-cert.eclass
+++ b/eclass/ssl-cert.eclass
@@ -23,11 +23,18 @@
# Use flag to append dependency to.
: ${SSL_CERT_USE:=ssl}
-if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then
- DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl )"
- IUSE="${SSL_CERT_USE}"
-else
- DEPEND="dev-libs/openssl"
+# @ECLASS-VARIABLE: SSL_DEPS_SKIP
+# @DESCRIPTION:
+# Set to non zero to skip adding to DEPEND and IUSE.
+: ${SSL_DEPS_SKIP:=0}
+
+if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then
+ if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then
+ DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl )"
+ IUSE="${SSL_CERT_USE}"
+ else
+ DEPEND="dev-libs/openssl"
+ fi
fi
# @FUNCTION: gen_cnf
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
index 3141617e1a18..d89eaa00a8f9 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
@@ -14,12 +14,12 @@ SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="gnutls polarssl ssl"
+IUSE="gnutls polarssl ssl libressl"
DEPEND="ssl? (
gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) )
- !gnutls? ( !polarssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) )
+ !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) )
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
)"
RDEPEND="${DEPEND}"
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index ccc1198afaf7..399c53569a7b 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -14,12 +14,12 @@ EGIT_REPO_URI="git://git.ffmpeg.org/rtmpdump"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS=""
-IUSE="gnutls polarssl ssl"
+IUSE="gnutls polarssl ssl libressl"
DEPEND="ssl? (
gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) )
- !gnutls? ( !polarssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) )
+ !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) )
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
)"
RDEPEND="${DEPEND}"
diff --git a/net-dns/nsd/nsd-4.1.7.ebuild b/net-dns/nsd/nsd-4.1.7.ebuild
index 6eeec8b61bfc..b8dab32ad48a 100644
--- a/net-dns/nsd/nsd-4.1.7.ebuild
+++ b/net-dns/nsd/nsd-4.1.7.ebuild
@@ -18,12 +18,12 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl"
+IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl libressl"
RDEPEND="
virtual/yacc
libevent? ( dev-libs/libevent )
- ssl? ( dev-libs/openssl:0= )
+ ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
munin? ( net-analyzer/munin )
"
DEPEND="
diff --git a/net-im/bitlbee/bitlbee-3.4.1.ebuild b/net-im/bitlbee/bitlbee-3.4.1.ebuild
index 4c281c914862..2390ec6e512b 100644
--- a/net-im/bitlbee/bitlbee-3.4.1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.4.1.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinux
- skype ssl test twitter +yahoo xinetd"
+ skype ssl test twitter +yahoo xinetd libressl"
COMMON_DEPEND="
>=dev-libs/glib-2.16
@@ -25,7 +25,7 @@ COMMON_DEPEND="
gnutls? ( net-libs/gnutls )
!gnutls? (
nss? ( dev-libs/nss )
- !nss? ( ssl? ( dev-libs/openssl:0 ) )
+ !nss? ( ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= ) ) )
)
"
DEPEND="${COMMON_DEPEND}
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild
index fb77fd840e35..181f31968bcf 100644
--- a/net-im/bitlbee/bitlbee-9999.ebuild
+++ b/net-im/bitlbee/bitlbee-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.bitlbee.org/"
LICENSE="GPL-2"
SLOT="0"
IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinux
- skype ssl test twitter +yahoo xinetd"
+ skype ssl test twitter +yahoo xinetd libressl"
COMMON_DEPEND="
>=dev-libs/glib-2.16
@@ -31,7 +31,7 @@ COMMON_DEPEND="
gnutls? ( net-libs/gnutls )
!gnutls? (
nss? ( dev-libs/nss )
- !nss? ( ssl? ( dev-libs/openssl:0 ) )
+ !nss? ( ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= ) ) )
)
"
DEPEND="${COMMON_DEPEND}
diff --git a/net-im/prosody/prosody-0.9.10.ebuild b/net-im/prosody/prosody-0.9.10.ebuild
index 91ab49e35ef6..962870a6b5e8 100644
--- a/net-im/prosody/prosody-0.9.10.ebuild
+++ b/net-im/prosody/prosody-0.9.10.ebuild
@@ -15,13 +15,13 @@ SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit"
+IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl"
DEPEND="net-im/jabber-base
!jit? ( >=dev-lang/lua-5.1:0 )
jit? ( dev-lang/luajit:2 )
>=net-dns/libidn-1.1
- dev-libs/openssl:0"
+ !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )"
RDEPEND="${DEPEND}
>=dev-lua/luaexpat-1.3.0
dev-lua/luafilesystem
diff --git a/net-irc/irssi/irssi-0.8.17.ebuild b/net-irc/irssi/irssi-0.8.17.ebuild
index 2663f3364be4..7024abf42724 100644
--- a/net-irc/irssi/irssi-0.8.17.ebuild
+++ b/net-irc/irssi/irssi-0.8.17.ebuild
@@ -18,11 +18,11 @@ SRC_URI="http://irssi.org/files/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ipv6 +perl selinux ssl socks5 +proxy"
+IUSE="ipv6 +perl selinux ssl socks5 +proxy libressl"
CDEPEND="sys-libs/ncurses:0=
>=dev-libs/glib-2.6.0
- ssl? ( dev-libs/openssl:= )
+ ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) )
perl? ( dev-lang/perl )
socks5? ( >=net-proxy/dante-1.1.18 )"
diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index 45f10a91384a..3572a448418d 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -13,11 +13,11 @@ HOMEPAGE="http://irssi.org/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="ipv6 +perl selinux ssl socks5 +proxy"
+IUSE="ipv6 +perl selinux ssl socks5 +proxy libressl"
CDEPEND="sys-libs/ncurses
>=dev-libs/glib-2.6.0
- ssl? ( dev-libs/openssl:= )
+ ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) )
perl? ( dev-lang/perl )
socks5? ( >=net-proxy/dante-1.1.18 )"
DEPEND="${CDEPEND}
diff --git a/net-libs/ldns/ldns-1.6.17-r1.ebuild b/net-libs/ldns/ldns-1.6.17-r1.ebuild
index cf6e735f9b1c..ad7d166e7aa0 100644
--- a/net-libs/ldns/ldns-1.6.17-r1.ebuild
+++ b/net-libs/ldns/ldns-1.6.17-r1.ebuild
@@ -21,10 +21,19 @@ REQUIRED_USE="ecdsa? ( ssl )
python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
- dane? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
- ecdsa? ( >=dev-libs/openssl-1.0.1h-r2:0[-bindist,${MULTILIB_USEDEP}] )
- gost? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
python? ( ${PYTHON_DEPS} )
+ dane? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ )
+ ecdsa? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[-bindist,${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ )
+ gost? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ )
ssl? (
!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
diff --git a/net-libs/serf/serf-1.3.8-r1.ebuild b/net-libs/serf/serf-1.3.8-r1.ebuild
index 93b5314fba11..a6127b0a68ed 100644
--- a/net-libs/serf/serf-1.3.8-r1.ebuild
+++ b/net-libs/serf/serf-1.3.8-r1.ebuild
@@ -13,11 +13,11 @@ SRC_URI="https://serf.googlecode.com/svn/src_releases/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="kerberos static-libs"
+IUSE="kerberos static-libs libressl"
RDEPEND="dev-libs/apr:1=
dev-libs/apr-util:1=
- dev-libs/openssl:0=
+ !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
sys-libs/zlib:0=
kerberos? ( virtual/krb5 )"
DEPEND="${RDEPEND}
diff --git a/www-client/lynx/lynx-2.8.9_pre6.ebuild b/www-client/lynx/lynx-2.8.9_pre6.ebuild
index 265115abd1b2..7aace037d9b7 100644
--- a/www-client/lynx/lynx-2.8.9_pre6.ebuild
+++ b/www-client/lynx/lynx-2.8.9_pre6.ebuild
@@ -25,13 +25,13 @@ SRC_URI="http://lynx.isc.org/current/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode"
+IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl"
RDEPEND="sys-libs/ncurses:0=[unicode?]
sys-libs/zlib
nls? ( virtual/libintl )
ssl? (
- !gnutls? ( >=dev-libs/openssl-0.9.8 )
+ !gnutls? ( !libressl? ( >=dev-libs/openssl-0.9.8 ) libressl? ( dev-libs/libressl ) )
gnutls? (
dev-libs/libgcrypt:0
>=net-libs/gnutls-2.6.4