[gentoo-commits] repo/gentoo:master commit in: x11-misc/synergy/

[Anthony G. Basile]

commit:     d22154bf60f830b553fa95d084043820c5b35013
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  4 09:42:56 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Dec  4 09:50:41 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d22154bf

x11-misc/synergy: add libressl support

Package-Manager: portage-2.2.20.1

 x11-misc/synergy/synergy-1.7.4.ebuild                     |  2 +-
 .../{synergy-1.7.4.ebuild => synergy-1.7.5-r1.ebuild}     | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/x11-misc/synergy/synergy-1.7.4.ebuild 
b/x11-misc/synergy/synergy-1.7.4.ebuild
index 9b2e2c0..5c7762e 100644
--- a/x11-misc/synergy/synergy-1.7.4.ebuild
+++ b/x11-misc/synergy/synergy-1.7.4.ebuild
@@ -20,7 +20,7 @@ IUSE="qt4 test"
 S=${WORKDIR}/${P}-stable
 
 COMMON_DEPEND="
-       dev-libs/openssl
+       dev-libs/openssl:*
        x11-libs/libICE
        x11-libs/libSM
        x11-libs/libX11

diff --git a/x11-misc/synergy/synergy-1.7.4.ebuild 
b/x11-misc/synergy/synergy-1.7.5-r1.ebuild
similarity index 87%
copy from x11-misc/synergy/synergy-1.7.4.ebuild
copy to x11-misc/synergy/synergy-1.7.5-r1.ebuild
index 9b2e2c0..363c22b 100644
--- a/x11-misc/synergy/synergy-1.7.4.ebuild
+++ b/x11-misc/synergy/synergy-1.7.5-r1.ebuild
@@ -15,12 +15,13 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd 
~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="qt4 test"
+IUSE="libressl qt4 test"
 
 S=${WORKDIR}/${P}-stable
 
 COMMON_DEPEND="
-       dev-libs/openssl
+       !libressl? ( dev-libs/openssl:* )
+       libressl? ( dev-libs/libressl )
        x11-libs/libICE
        x11-libs/libSM
        x11-libs/libX11
@@ -50,9 +51,9 @@ RDEPEND="
 "
 
 PATCHES=(
-       "${FILESDIR}/${PN}-1.4.16_p1969-pthread.patch"
-       "${FILESDIR}/${PN}-1.4.17_p2055-test.patch"
-       "${FILESDIR}/${PN}-1.4.17_p2055-gentoo.patch"
+       "${FILESDIR}"/${PN}-1.4.16_p1969-pthread.patch
+       "${FILESDIR}"/${PN}-1.4.17_p2055-test.patch
+       "${FILESDIR}"/${PN}-1.7.5-gentoo.patch
 )
 
 src_prepare() {
@@ -60,7 +61,9 @@ src_prepare() {
 }
 
 src_configure() {
-       local mycmakeargs=$(cmake-utils_use_with test GENTOO_TEST)
+       local mycmakeargs=(
+               "$(cmake-utils_use_with test GENTOO_TEST)"
+       )
        cmake-utils_src_configure
 
        if use qt4 ; then