[gentoo-commits] proj/kde:master commit in: net-libs/libktorrent/

[Michael Palimaka]

commit:     1ace7540e87cd0ce0ca963811acedcb0c43c3052
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Aug 21 19:56:18 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug 21 20:02:16 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1ace7540

net-libs/libktorrent: Use KDE_TEST=forceoptional-recursive

examples subdir is already disabled by kde5.eclass

Package-Manager: portage-2.2.28

 net-libs/libktorrent/libktorrent-9999.ebuild | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/net-libs/libktorrent/libktorrent-9999.ebuild 
b/net-libs/libktorrent/libktorrent-9999.ebuild
index a4bf5df..ac3ee82 100644
--- a/net-libs/libktorrent/libktorrent-9999.ebuild
+++ b/net-libs/libktorrent/libktorrent-9999.ebuild
@@ -15,11 +15,9 @@ if [[ ${PV} != 9999* ]]; then
        S="${WORKDIR}"/"${MY_P}"
 
        KEYWORDS="~amd64 ~arm ~x86"
-else
-       KEYWORDS=""
 fi
 
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
@@ -60,13 +58,5 @@ src_prepare() {
        sed -i -e "/^find_dependency/ s/ \"@LibGMP_MIN_VERSION@\"//" \
                LibKTorrentConfig.cmake.in || die
 
-       # do not build non-installed example binary
-       sed -i -e "/add_subdirectory(examples)/d" CMakeLists.txt || die
-
-       if ! use test ; then
-               sed -i -e "/add_subdirectory(testlib)/d" CMakeLists.txt || die
-               sed -i -e "/add_subdirectory(tests)/d" \
-                       
src/{datachecker,dht,diskio,download,magnet,mse,net,peer,util,utp,torrent}/CMakeLists.txt
 \
-                       || die "Failed to remove tests"
-       fi
+       use test || cmake_comment_add_subdirectory testlib
 }