| 1 |
commit: d22154bf60f830b553fa95d084043820c5b35013 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 4 09:42:56 2015 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 4 09:50:41 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d22154bf |
| 7 |
|
| 8 |
x11-misc/synergy: add libressl support |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
|
| 12 |
x11-misc/synergy/synergy-1.7.4.ebuild | 2 +- |
| 13 |
.../{synergy-1.7.4.ebuild => synergy-1.7.5-r1.ebuild} | 15 +++++++++------ |
| 14 |
2 files changed, 10 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/x11-misc/synergy/synergy-1.7.4.ebuild b/x11-misc/synergy/synergy-1.7.4.ebuild |
| 17 |
index 9b2e2c0..5c7762e 100644 |
| 18 |
--- a/x11-misc/synergy/synergy-1.7.4.ebuild |
| 19 |
+++ b/x11-misc/synergy/synergy-1.7.4.ebuild |
| 20 |
@@ -20,7 +20,7 @@ IUSE="qt4 test" |
| 21 |
S=${WORKDIR}/${P}-stable |
| 22 |
|
| 23 |
COMMON_DEPEND=" |
| 24 |
- dev-libs/openssl |
| 25 |
+ dev-libs/openssl:* |
| 26 |
x11-libs/libICE |
| 27 |
x11-libs/libSM |
| 28 |
x11-libs/libX11 |
| 29 |
|
| 30 |
diff --git a/x11-misc/synergy/synergy-1.7.4.ebuild b/x11-misc/synergy/synergy-1.7.5-r1.ebuild |
| 31 |
similarity index 87% |
| 32 |
copy from x11-misc/synergy/synergy-1.7.4.ebuild |
| 33 |
copy to x11-misc/synergy/synergy-1.7.5-r1.ebuild |
| 34 |
index 9b2e2c0..363c22b 100644 |
| 35 |
--- a/x11-misc/synergy/synergy-1.7.4.ebuild |
| 36 |
+++ b/x11-misc/synergy/synergy-1.7.5-r1.ebuild |
| 37 |
@@ -15,12 +15,13 @@ SRC_URI=" |
| 38 |
LICENSE="GPL-2" |
| 39 |
SLOT="0" |
| 40 |
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris" |
| 41 |
-IUSE="qt4 test" |
| 42 |
+IUSE="libressl qt4 test" |
| 43 |
|
| 44 |
S=${WORKDIR}/${P}-stable |
| 45 |
|
| 46 |
COMMON_DEPEND=" |
| 47 |
- dev-libs/openssl |
| 48 |
+ !libressl? ( dev-libs/openssl:* ) |
| 49 |
+ libressl? ( dev-libs/libressl ) |
| 50 |
x11-libs/libICE |
| 51 |
x11-libs/libSM |
| 52 |
x11-libs/libX11 |
| 53 |
@@ -50,9 +51,9 @@ RDEPEND=" |
| 54 |
" |
| 55 |
|
| 56 |
PATCHES=( |
| 57 |
- "${FILESDIR}/${PN}-1.4.16_p1969-pthread.patch" |
| 58 |
- "${FILESDIR}/${PN}-1.4.17_p2055-test.patch" |
| 59 |
- "${FILESDIR}/${PN}-1.4.17_p2055-gentoo.patch" |
| 60 |
+ "${FILESDIR}"/${PN}-1.4.16_p1969-pthread.patch |
| 61 |
+ "${FILESDIR}"/${PN}-1.4.17_p2055-test.patch |
| 62 |
+ "${FILESDIR}"/${PN}-1.7.5-gentoo.patch |
| 63 |
) |
| 64 |
|
| 65 |
src_prepare() { |
| 66 |
@@ -60,7 +61,9 @@ src_prepare() { |
| 67 |
} |
| 68 |
|
| 69 |
src_configure() { |
| 70 |
- local mycmakeargs=$(cmake-utils_use_with test GENTOO_TEST) |
| 71 |
+ local mycmakeargs=( |
| 72 |
+ "$(cmake-utils_use_with test GENTOO_TEST)" |
| 73 |
+ ) |
| 74 |
cmake-utils_src_configure |
| 75 |
|
| 76 |
if use qt4 ; then |
Archives