dev-java/icedtea: Resolve #573276 by adding libressl USE flag.

Package-Manager: portage-2.2.27

6 files changed, 20 insertions, 10 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index cdef374d..7d69b761 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Mar 2016; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  icedtea-3.0.0_pre09.ebuild, icedtea-6.1.13.10.ebuild, icedtea-6.9999.ebuild,
+  icedtea-7.2.6.4.ebuild, icedtea-7.2.7.0_pre00-r1.ebuild:
+  dev-java/icedtea: Resolve #573276 by adding libressl USE flag.
+
 *icedtea-3.0.0_pre09 (22 Feb 2016)
 
   22 Feb 2016; Andrew John Hughes <gnu_andrew@member.fsf.org>
diff --git a/dev-java/icedtea/icedtea-3.0.0_pre09.ebuild b/dev-java/icedtea/icedtea-3.0.0_pre09.ebuild
index f1f57630..35b67ab6 100644
--- a/dev-java/icedtea/icedtea-3.0.0_pre09.ebuild
+++ b/dev-java/icedtea/icedtea-3.0.0_pre09.ebuild
@@ -63,7 +63,7 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M
 KEYWORDS="~amd64"
 
 IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
-	jamvm +jbootstrap nsplugin pax_kernel
+	jamvm +jbootstrap libressl nsplugin pax_kernel
 	pulseaudio sctp selinux smartcard +source +sunec test +webstart zero"
 
 REQUIRED_USE="gtk? ( !headless-awt )"
@@ -147,7 +147,8 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
 	app-arch/zip
 	app-misc/ca-certificates
 	dev-lang/perl
-	dev-libs/openssl
+	!libressl? ( dev-libs/openssl )
+	libressl? ( dev-libs/libressl )
 	sys-apps/attr
 	sys-apps/lsb-release
 	x11-libs/libXt
diff --git a/dev-java/icedtea/icedtea-6.1.13.10.ebuild b/dev-java/icedtea/icedtea-6.1.13.10.ebuild
index cdc3d44b..70488a02 100644
--- a/dev-java/icedtea/icedtea-6.1.13.10.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.10.ebuild
@@ -41,7 +41,7 @@ KEYWORDS="~amd64"
 RESTRICT="test"
 
 IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
-	jamvm javascript +jbootstrap kerberos nsplugin +nss pax_kernel
+	jamvm javascript +jbootstrap kerberos libressl nsplugin +nss pax_kernel
 	pulseaudio selinux smartcard source systemtap test +webstart zero"
 
 REQUIRED_USE="gtk? ( !headless-awt )"
@@ -112,7 +112,8 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
 	>=dev-java/ant-core-1.8.2
 	dev-lang/perl
 	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
+	!libressl? ( dev-libs/openssl )
+	libressl? ( dev-libs/libressl )
 	sys-apps/lsb-release
 	virtual/pkgconfig
 	pax_kernel? ( sys-apps/elfix )"
diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild b/dev-java/icedtea/icedtea-6.9999.ebuild
index 0e573cca..c20221d4 100644
--- a/dev-java/icedtea/icedtea-6.9999.ebuild
+++ b/dev-java/icedtea/icedtea-6.9999.ebuild
@@ -39,7 +39,7 @@ KEYWORDS=""
 RESTRICT="test"
 
 IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
-	jamvm javascript +jbootstrap kerberos nsplugin +nss pax_kernel
+	jamvm javascript +jbootstrap kerberos libressl nsplugin +nss pax_kernel
 	pulseaudio selinux smartcard source systemtap test +webstart zero"
 
 REQUIRED_USE="gtk? ( !headless-awt )"
@@ -110,7 +110,8 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
 	>=dev-java/ant-core-1.8.2
 	dev-lang/perl
 	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
+	!libressl? ( dev-libs/openssl )
+	libressl? ( dev-libs/libressl )
 	sys-apps/lsb-release
 	virtual/pkgconfig
 	pax_kernel? ( sys-apps/elfix )"
diff --git a/dev-java/icedtea/icedtea-7.2.6.4.ebuild b/dev-java/icedtea/icedtea-7.2.6.4.ebuild
index ceac4b66..4910d111 100644
--- a/dev-java/icedtea/icedtea-7.2.6.4.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.4.ebuild
@@ -61,7 +61,7 @@ KEYWORDS="~amd64"
 RESTRICT="test"
 
 IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality
-	jamvm javascript +jbootstrap kerberos nsplugin nss pax_kernel
+	jamvm javascript +jbootstrap kerberos libressl nsplugin nss pax_kernel
 	pulseaudio sctp selinux smartcard source +sunec test +webstart zero"
 
 REQUIRED_USE="gtk? ( !headless-awt )"
@@ -146,7 +146,8 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
 	>=dev-java/ant-core-1.8.2
 	dev-lang/perl
 	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
+	!libressl? ( dev-libs/openssl )
+	libressl? ( dev-libs/libressl )
 	sys-apps/attr
 	sys-apps/lsb-release
 	virtual/pkgconfig
diff --git a/dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild b/dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild
index 547e0bac..38a1c5f0 100644
--- a/dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild
@@ -61,7 +61,7 @@ KEYWORDS=""
 RESTRICT="test"
 
 IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality
-	jamvm javascript +jbootstrap kerberos nsplugin nss pax_kernel
+	jamvm javascript +jbootstrap kerberos libressl nsplugin nss pax_kernel
 	pulseaudio sctp selinux smartcard source +sunec test +webstart zero"
 
 REQUIRED_USE="gtk? ( !headless-awt )"
@@ -146,7 +146,8 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
 	>=dev-java/ant-core-1.8.2
 	dev-lang/perl
 	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
+	!libressl? ( dev-libs/openssl )
+	libressl? ( dev-libs/libressl )
 	sys-apps/attr
 	sys-apps/lsb-release
 	virtual/pkgconfig