commit:     b54ecc6f1209455fda54ffd76f985c20700b6043
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 12:43:32 2015 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 12:43:32 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b54ecc6f

dev-lang/swi-prolog: add support for libressl. Closes #565276

Package-Manager: portage-2.2.20.1

 dev-lang/swi-prolog/Manifest                   | 3 ++-
 dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild | 9 ++++++---
 dev-lang/swi-prolog/swi-prolog-7.3.10.ebuild   | 9 ++++++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 1ea3558..5617994 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -2,7 +2,8 @@ DIST pl-6.6.6.tar.gz 14838653 SHA256 
9f80bb274e2f31fd68b0acbe35982c012d5f8311dbe
 DIST swi-prolog-6.6.6-gentoo-patchset-0.tar.gz 1590 SHA256 
2b240d15562603120e0314bb69bde50089326c11876b7a62106c05f9d48ace71 SHA512 
807c7e897dd5b9eef14e063ea53c03047f3acb23174a70a613258adf7f85dc1f7637158fde70aab2e0f40de4bc6ac5e3548dd09dbe3745d916a388f43eb832eb
 WHIRLPOOL 
0a0dbc361cfbe343c8b3562a2c0535905eb1443eea0783b14f96bda43c04e8db6264f476c07da766c6936dc6088e34059f799a3244717390644bf0f5ae83018e
 DIST swi-prolog-7.2.2-gentoo-patchset-0.tar.gz 1414 SHA256 
145f585828da45d89c6abebb7707ef224334a6e102dd50302b1af549d8d8a3c8 SHA512 
32642e5e133971fbcec777791c050dd548545050353e23e08e0457487d3b5ec46e9491be4cdfb8d0a0a8af613dc64b569969aaa31a0d8691e0c3fdd9b5c645d0
 WHIRLPOOL 
f394d4da284e31e4f431cda1af54d3dd4f2995bf04de985750c7b0f89f2ad6ed2fca8c921ffe711ae83b8f0d478c864bf81b531a9fe71ab9be73df20083e5c21
 DIST swi-prolog-7.2.3-gentoo-patchset-0.tar.gz 1418 SHA256 
b8cca09211889c3fdca47bcc3093f0811b773553d457b6d4cd423d0a3483ac8b SHA512 
6fe185bc6a015bdb0c1466818f2e45897c098d98c091854cb86f1756458585724a8d17c1c8a5593ee054cbe0400c322b27bf107194aa1ba91d478623ff468e39
 WHIRLPOOL 
aa9df0ddc7a01e776074c32f381b92f2738c86ac7a3462749cb24954549e1979c5c8c17038a3161772e41c7f39637ee3547efcda52ef2362e03d814af4cd885b
-DIST swi-prolog-7.3.10-gentoo-patchset-0.tar.gz 687 SHA256 
8fcd71ece13e86c4f684d866e70dba5e12a000c542a96ad5f94d054b13cffa81 SHA512 
e91e0dcdb704a61e89a1028d182094f60e575aff5c3dc3b7f62b8e7c686d016f3bd5d37448a0f306911a5622ee5e8b3d7641de6896e3c68ad6b6be549d3d2d49
 WHIRLPOOL 
bda54bd13cd0ff3b94b2c464bb4b64133bb631b6a2e1f72bd0f9006f9f4bae6517d965d9abb8dddfe528ce4f3b6b98d55d0e17185128a09311ba424e2658978f
+DIST swi-prolog-7.2.3-gentoo-patchset-1.tar.gz 1875 SHA256 
c11e48122dc468f21e08da4a65f5a2daa9e0ddbc2e186bbd952626c95b29db04 SHA512 
3506f4168d52f7d3539cd753c5153750df8c3239b78ffac1784c634b585d5fb0c825700e77abc9c1f467af71473ae1861eef629ebdf76b7c783d276c393f40fc
 WHIRLPOOL 
8b70ab91592280d0634c6c897771696c0c63d30680044994cedf69f18cd4f386adf833998e64d4ad892cff97300b5bbfaa8dec8448ea04ebaba7e31f7e9c30d0
+DIST swi-prolog-7.3.10-gentoo-patchset-1.tar.gz 1117 SHA256 
e3596515edc419cca5fed53410d4edbc8bb95eeff206274260916fb348c97f0d SHA512 
2be89c25e9980785760305c9d443a92388ce0bfb09e1f64e5a8029341e9d7cc97bafa32992382c303aa51cf741f989e64bc675f5fdd31d09dac7442ee9b3d3ad
 WHIRLPOOL 
a2d206a564652bff73bd946f9aee386da7b76647e6f93d55c33cf45c8331d8d2afd980746e4a25f40825f6258fc53c926a94279d75e66053e2c21d80dda0eeb8
 DIST swi-prolog-7.3.7-gentoo-patchset-0.tar.gz 1709 SHA256 
81f5f0de37f1fe07c25352caa151b3d13f92265fbbf5476f8713dc349fd214ec SHA512 
88eec4a4a709714bbde2cbf457064adb193dc51b4c7f143cb9ab5526b4cdf6a434aa81b79c7e65537381b9a166a84ae5666776f572952bffc1ead894eb8bac32
 WHIRLPOOL 
00b8c5b637173c2725cae62086b58a2acfd475447232d11fa1d9cf038b0a662bf226fb3a39a3b5bd4d22d8c6b51a67d0fbddb09e88d6f778c84022b6d46be0e7
 DIST swi-prolog-7.3.8-gentoo-patchset-0.tar.gz 1430 SHA256 
e927f0efce19b949fa9f2d4f5ad53488eafdd66891cd71f5051bed997491bb7d SHA512 
989c7d893cc6213f76a9eb5422662dabd9d63489b0a8924a37e3293323d81215ea13510a2fb2a37f07fdee2417aafbd8e07d1f16b2d974da724aebdbb371d47a
 WHIRLPOOL 
b24e68a2e600dbf445202228a411077be3e75c838599a375c85c9185628d9109971c3b43622fbe260688961d52bf30d4a490e5961a43d2378132d339c8961420
 DIST swi-prolog-7.3.9-gentoo-patchset-0.tar.gz 1507 SHA256 
029541109cc60d176b65d12903ee2e06f209c38ff29421674e660d31d6ee44d4 SHA512 
357df9c6e5ce5b046e4ceb7d65b358bd191ff8c912812deba918fe3b76c48a46c9f89f28ddc950de151e47ec57d654c53f537024da5f7f2f373f7466f07f914f
 WHIRLPOOL 
5ac911d2950d4ccffe1db959467215fc8d074b9a842e79aea7d8bc0d14587dce6388707b2c06e3d94474eed8feb939398daa616160642883192e6dbfe7034da2

diff --git a/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild 
b/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild
index 2b1b389..6609433 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit eutils flag-o-matic java-pkg-opt-2 multilib
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 
 DESCRIPTION="free, small, and standard compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/";
@@ -16,7 +16,7 @@ 
SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl 
static-libs test uuid zlib X"
+IUSE="archive debug doc +gmp hardened java libressl minimal odbc +readline ssl 
static-libs test uuid zlib X"
 
 RDEPEND="sys-libs/ncurses:=
        archive? ( app-arch/libarchive )
@@ -24,7 +24,10 @@ RDEPEND="sys-libs/ncurses:=
        odbc? ( dev-db/unixODBC )
        readline? ( sys-libs/readline:= )
        gmp? ( dev-libs/gmp:0 )
-       ssl? ( dev-libs/openssl:0 )
+       ssl? (
+               !libressl? ( dev-libs/openssl:0 )
+               libressl? ( dev-libs/libressl )
+       )
        java? ( >=virtual/jdk-1.5:= )
        uuid? ( dev-libs/ossp-uuid )
        X? (

diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.10.ebuild 
b/dev-lang/swi-prolog/swi-prolog-7.3.10.ebuild
index 1fbae1f..eb74d6f 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.3.10.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.3.10.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit eutils flag-o-matic java-pkg-opt-2 multilib
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 
 DESCRIPTION="free, small, and standard compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/";
@@ -16,7 +16,7 @@ 
SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive berkdb debug doc +gmp hardened java minimal odbc +readline ssl 
static-libs test uuid zlib X"
+IUSE="archive berkdb debug doc +gmp hardened java libressl minimal odbc 
+readline ssl static-libs test uuid zlib X"
 
 RDEPEND="sys-libs/ncurses:=
        archive? ( app-arch/libarchive )
@@ -25,7 +25,10 @@ RDEPEND="sys-libs/ncurses:=
        odbc? ( dev-db/unixODBC )
        readline? ( sys-libs/readline:= )
        gmp? ( dev-libs/gmp:0 )
-       ssl? ( dev-libs/openssl:0 )
+       ssl? (
+               !libressl? ( dev-libs/openssl:0 )
+               libressl? ( dev-libs/libressl )
+       )
        java? ( >=virtual/jdk-1.5:= )
        uuid? ( dev-libs/ossp-uuid )
        X? (

Reply via email to