commit: 2b8cf9a9bdb6e7f414068652963536155ccd791b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 16 17:17:54 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 18:04:28 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b8cf9a9
net-libs/srt: EAPI-7 bump, missing slot op, missing $MULTILIB_USEDEP
Drop unused USE doc.
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/srt/{srt-9999.ebuild => srt-1.3.1-r1.ebuild} | 16 ++++++++--------
net-libs/srt/srt-9999.ebuild | 18 +++++++++++-------
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/net-libs/srt/srt-9999.ebuild b/net-libs/srt/srt-1.3.1-r1.ebuild
similarity index 82%
copy from net-libs/srt/srt-9999.ebuild
copy to net-libs/srt/srt-1.3.1-r1.ebuild
index 6ba9d871779..c5284092389 100644
--- a/net-libs/srt/srt-9999.ebuild
+++ b/net-libs/srt/srt-1.3.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit cmake-multilib
@@ -18,22 +18,23 @@ fi
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="doc libressl gnutls test"
+IUSE="gnutls libressl"
-RDEPEND="
- gnutls? ( net-libs/gnutls )
+DEPEND="
+ gnutls? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
!gnutls? (
!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
)
"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )"
-RESTRICT="!test? ( test )"
+RDEPEND="${DEPEND}"
+
DOCS=( README.md )
PATCHES=(
"${FILESDIR}/${PN}-always-GNUInstallDirs.patch"
+ "${FILESDIR}/${P}-no-rpath.patch"
+
"${FILESDIR}/${P}-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch"
)
src_prepare() {
@@ -45,7 +46,6 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
-DUSE_GNUTLS=$(usex gnutls)
- -DENABLE_UNITTESTS=$(usex test)
)
cmake-multilib_src_configure
}
diff --git a/net-libs/srt/srt-9999.ebuild b/net-libs/srt/srt-9999.ebuild
index 6ba9d871779..7cdc3dc723e 100644
--- a/net-libs/srt/srt-9999.ebuild
+++ b/net-libs/srt/srt-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit cmake-multilib
@@ -18,18 +18,22 @@ fi
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="doc libressl gnutls test"
+IUSE="gnutls libressl test"
-RDEPEND="
- gnutls? ( net-libs/gnutls )
+BDEPEND="
+ test? ( dev-cpp/gtest )
+"
+DEPEND="
+ gnutls? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
!gnutls? (
!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
)
"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )"
+RDEPEND="${DEPEND}"
+
RESTRICT="!test? ( test )"
+
DOCS=( README.md )
PATCHES=(
