| 1 |
commit: 2b8cf9a9bdb6e7f414068652963536155ccd791b |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 16 17:17:54 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 16 18:04:28 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b8cf9a9 |
| 7 |
|
| 8 |
net-libs/srt: EAPI-7 bump, missing slot op, missing $MULTILIB_USEDEP |
| 9 |
|
| 10 |
Drop unused USE doc. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.60, Repoman-2.3.12 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
net-libs/srt/{srt-9999.ebuild => srt-1.3.1-r1.ebuild} | 16 ++++++++-------- |
| 16 |
net-libs/srt/srt-9999.ebuild | 18 +++++++++++------- |
| 17 |
2 files changed, 19 insertions(+), 15 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-libs/srt/srt-9999.ebuild b/net-libs/srt/srt-1.3.1-r1.ebuild |
| 20 |
similarity index 82% |
| 21 |
copy from net-libs/srt/srt-9999.ebuild |
| 22 |
copy to net-libs/srt/srt-1.3.1-r1.ebuild |
| 23 |
index 6ba9d871779..c5284092389 100644 |
| 24 |
--- a/net-libs/srt/srt-9999.ebuild |
| 25 |
+++ b/net-libs/srt/srt-1.3.1-r1.ebuild |
| 26 |
@@ -1,7 +1,7 @@ |
| 27 |
# Copyright 1999-2018 Gentoo Authors |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
-EAPI=6 |
| 31 |
+EAPI=7 |
| 32 |
|
| 33 |
inherit cmake-multilib |
| 34 |
|
| 35 |
@@ -18,22 +18,23 @@ fi |
| 36 |
|
| 37 |
LICENSE="LGPL-2.1" |
| 38 |
SLOT="0" |
| 39 |
-IUSE="doc libressl gnutls test" |
| 40 |
+IUSE="gnutls libressl" |
| 41 |
|
| 42 |
-RDEPEND=" |
| 43 |
- gnutls? ( net-libs/gnutls ) |
| 44 |
+DEPEND=" |
| 45 |
+ gnutls? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) |
| 46 |
!gnutls? ( |
| 47 |
!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
| 48 |
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
| 49 |
) |
| 50 |
" |
| 51 |
-DEPEND="${RDEPEND} |
| 52 |
- test? ( dev-cpp/gtest )" |
| 53 |
-RESTRICT="!test? ( test )" |
| 54 |
+RDEPEND="${DEPEND}" |
| 55 |
+ |
| 56 |
DOCS=( README.md ) |
| 57 |
|
| 58 |
PATCHES=( |
| 59 |
"${FILESDIR}/${PN}-always-GNUInstallDirs.patch" |
| 60 |
+ "${FILESDIR}/${P}-no-rpath.patch" |
| 61 |
+ "${FILESDIR}/${P}-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch" |
| 62 |
) |
| 63 |
|
| 64 |
src_prepare() { |
| 65 |
@@ -45,7 +46,6 @@ src_prepare() { |
| 66 |
src_configure() { |
| 67 |
local mycmakeargs=( |
| 68 |
-DUSE_GNUTLS=$(usex gnutls) |
| 69 |
- -DENABLE_UNITTESTS=$(usex test) |
| 70 |
) |
| 71 |
cmake-multilib_src_configure |
| 72 |
} |
| 73 |
|
| 74 |
diff --git a/net-libs/srt/srt-9999.ebuild b/net-libs/srt/srt-9999.ebuild |
| 75 |
index 6ba9d871779..7cdc3dc723e 100644 |
| 76 |
--- a/net-libs/srt/srt-9999.ebuild |
| 77 |
+++ b/net-libs/srt/srt-9999.ebuild |
| 78 |
@@ -1,7 +1,7 @@ |
| 79 |
-# Copyright 1999-2018 Gentoo Authors |
| 80 |
+# Copyright 1999-2019 Gentoo Authors |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
|
| 83 |
-EAPI=6 |
| 84 |
+EAPI=7 |
| 85 |
|
| 86 |
inherit cmake-multilib |
| 87 |
|
| 88 |
@@ -18,18 +18,22 @@ fi |
| 89 |
|
| 90 |
LICENSE="LGPL-2.1" |
| 91 |
SLOT="0" |
| 92 |
-IUSE="doc libressl gnutls test" |
| 93 |
+IUSE="gnutls libressl test" |
| 94 |
|
| 95 |
-RDEPEND=" |
| 96 |
- gnutls? ( net-libs/gnutls ) |
| 97 |
+BDEPEND=" |
| 98 |
+ test? ( dev-cpp/gtest ) |
| 99 |
+" |
| 100 |
+DEPEND=" |
| 101 |
+ gnutls? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) |
| 102 |
!gnutls? ( |
| 103 |
!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
| 104 |
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
| 105 |
) |
| 106 |
" |
| 107 |
-DEPEND="${RDEPEND} |
| 108 |
- test? ( dev-cpp/gtest )" |
| 109 |
+RDEPEND="${DEPEND}" |
| 110 |
+ |
| 111 |
RESTRICT="!test? ( test )" |
| 112 |
+ |
| 113 |
DOCS=( README.md ) |
| 114 |
|
| 115 |
PATCHES=( |
Archives