From 7048847cfc9bda7b89526545a7dcc50f5bf5f0d1 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 22 Apr 2020 10:32:58 +0200 Subject: [PATCH] net-libs/srt: [QA] Do not install static library Closes: https://github.com/gentoo/gentoo/pull/13290 Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Alessandro Barbieri Signed-off-by: David Seifert --- net-libs/srt/{srt-1.3.2.ebuild => srt-1.3.2-r1.ebuild} | 6 ++---- net-libs/srt/{srt-1.4.1.ebuild => srt-1.4.0-r1.ebuild} | 4 +--- net-libs/srt/{srt-1.4.0.ebuild => srt-1.4.1-r1.ebuild} | 6 ++---- net-libs/srt/srt-9999.ebuild | 8 +++----- 4 files changed, 8 insertions(+), 16 deletions(-) rename net-libs/srt/{srt-1.3.2.ebuild => srt-1.3.2-r1.ebuild} (87%) rename net-libs/srt/{srt-1.4.1.ebuild => srt-1.4.0-r1.ebuild} (91%) rename net-libs/srt/{srt-1.4.0.ebuild => srt-1.4.1-r1.ebuild} (88%) diff --git a/net-libs/srt/srt-1.3.2.ebuild b/net-libs/srt/srt-1.3.2-r1.ebuild similarity index 87% rename from net-libs/srt/srt-1.3.2.ebuild rename to net-libs/srt/srt-1.3.2-r1.ebuild index 6e2cd2ff5ef9..864f007208ac 100644 --- a/net-libs/srt/srt-1.3.2.ebuild +++ b/net-libs/srt/srt-1.3.2-r1.ebuild @@ -32,20 +32,18 @@ DEPEND=" " RDEPEND="${DEPEND}" -DOCS=( README.md ) - PATCHES=( "${FILESDIR}/${PN}-always-GNUInstallDirs.patch" ) src_prepare() { cmake-utils_src_prepare - sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die - sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die + sed -i -e "s:hcrypt_ut.c::" haicrypt/*.maf || die } src_configure() { local mycmakeargs=( + -DENABLE_STATIC=OFF -DUSE_GNUTLS=$(usex gnutls) ) cmake-multilib_src_configure diff --git a/net-libs/srt/srt-1.4.1.ebuild b/net-libs/srt/srt-1.4.0-r1.ebuild similarity index 91% rename from net-libs/srt/srt-1.4.1.ebuild rename to net-libs/srt/srt-1.4.0-r1.ebuild index 715e4cbdfed9..7a9dff6b43c1 100644 --- a/net-libs/srt/srt-1.4.1.ebuild +++ b/net-libs/srt/srt-1.4.0-r1.ebuild @@ -32,8 +32,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -DOCS=( README.md ) - PATCHES=( "${FILESDIR}/${PN}-always-GNUInstallDirs.patch" ) @@ -41,11 +39,11 @@ PATCHES=( src_prepare() { cmake-utils_src_prepare sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die - sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die } src_configure() { local mycmakeargs=( + -DENABLE_STATIC=OFF -DUSE_GNUTLS=$(usex gnutls) ) cmake-multilib_src_configure diff --git a/net-libs/srt/srt-1.4.0.ebuild b/net-libs/srt/srt-1.4.1-r1.ebuild similarity index 88% rename from net-libs/srt/srt-1.4.0.ebuild rename to net-libs/srt/srt-1.4.1-r1.ebuild index 7188ae1c913e..7a9dff6b43c1 100644 --- a/net-libs/srt/srt-1.4.0.ebuild +++ b/net-libs/srt/srt-1.4.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018-2019 Gentoo Authors +# Copyright 2018-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -32,8 +32,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -DOCS=( README.md ) - PATCHES=( "${FILESDIR}/${PN}-always-GNUInstallDirs.patch" ) @@ -41,11 +39,11 @@ PATCHES=( src_prepare() { cmake-utils_src_prepare sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die - sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die } src_configure() { local mycmakeargs=( + -DENABLE_STATIC=OFF -DUSE_GNUTLS=$(usex gnutls) ) cmake-multilib_src_configure diff --git a/net-libs/srt/srt-9999.ebuild b/net-libs/srt/srt-9999.ebuild index 05f29c86c32e..283aff3244f8 100644 --- a/net-libs/srt/srt-9999.ebuild +++ b/net-libs/srt/srt-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018-2019 Gentoo Authors +# Copyright 2018-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -36,20 +36,18 @@ DEPEND="${RDEPEND} RESTRICT="!test? ( test )" -DOCS=( README.md ) - PATCHES=( "${FILESDIR}/${PN}-always-GNUInstallDirs.patch" ) src_prepare() { cmake-utils_src_prepare - sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die - sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die + sed -i -e "s:hcrypt_ut.c::" haicrypt/*.maf || die } src_configure() { local mycmakeargs=( + -DENABLE_STATIC=OFF -DUSE_GNUTLS=$(usex gnutls) -DENABLE_UNITTESTS=$(usex test) ) -- 2.26.2