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

[Michael Palimaka]

commit:     7f16cf6c2880517795a6fffa9724584d9a656729
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Feb 20 16:32:58 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 14:15:18 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f16cf6c

net-libs/libktorrent: Frameworks merged to master

Package-Manager: portage-2.2.27

 net-libs/libktorrent/libktorrent-9999.ebuild | 61 ++++++++++++++++++++--------
 1 file changed, 43 insertions(+), 18 deletions(-)

diff --git a/net-libs/libktorrent/libktorrent-9999.ebuild 
b/net-libs/libktorrent/libktorrent-9999.ebuild
index 996ec7b..8fa2ff0 100644
--- a/net-libs/libktorrent/libktorrent-9999.ebuild
+++ b/net-libs/libktorrent/libktorrent-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 if [[ ${PV} != 9999* ]]; then
        inherit versionator
@@ -10,42 +10,67 @@ if [[ ${PV} != 9999* ]]; then
        MY_PV="${PV/_/}"
        
KTORRENT_VERSION=$(($(get_major_version)+3)).$(get_version_component_range 2-3 
${MY_PV})
        MY_P="${PN}-${MY_PV}"
-       KDE_HANDBOOK="optional"
-       KDE_DOC_DIRS="doc"
 
-       KDE_LINGUAS="ar ast be bg bs ca ca@valencia cs da de el en_GB eo es et 
eu
-               fi fr ga gl hi hne hr hu is it ja km ku lt lv ms nb nds nl nn 
oc pl
-               pt pt_BR ro ru se si sk sl sr sr@ijekavian sr@ijekavianlatin
-               sr@latin sv tr ug uk zh_CN zh_TW"
        
SRC_URI="http://ktorrent.org/downloads/${KTORRENT_VERSION}/${MY_P}.tar.bz2";
        S="${WORKDIR}"/"${MY_P}"
 
-       KEYWORDS="~amd64 ~arm ~ppc x86"
+       KEYWORDS="~amd64 ~arm ~x86"
 else
        KEYWORDS=""
 fi
+
+KDE_DOXYGEN="true"
+KDE_DOX_DIR="doc"
+KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
-inherit kde4-base
+inherit kde5
 
-DESCRIPTION="A BitTorrent library based on KDE Platform"
+DESCRIPTION="A BitTorrent library based on KDE Frameworks"
 HOMEPAGE="http://ktorrent.org/";
 
 LICENSE="GPL-2"
-SLOT="4"
-IUSE="debug"
+IUSE=""
 
-RDEPEND="
-       app-crypt/qca:2[qt4]
-       dev-libs/gmp:0
+COMMON_DEPEND="
+       $(add_frameworks_dep karchive)
+       $(add_frameworks_dep kconfig)
+       $(add_frameworks_dep kcoreaddons)
+       $(add_frameworks_dep kcrash)
+       $(add_frameworks_dep ki18n)
+       $(add_frameworks_dep kio)
+       $(add_frameworks_dep solid)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtnetwork)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
+       app-crypt/qca:2[qt5]
+       >=dev-libs/gmp-6.0.0a:0
        dev-libs/libgcrypt:0=
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
        dev-libs/boost
        sys-devel/gettext
 "
+RDEPEND="${COMMON_DEPEND}
+       !net-libs/libktorrent:4
+"
 
 src_prepare() {
-       kde4-base_src_prepare
+       kde5_src_prepare
+
+       # Gentoo workaround because gmp.h in MULTILIB_WRAPPED_HEADERS is 
breaking this
+       sed -i -e "/^find_package/ s/\"\${LibGMP_MIN_VERSION}\" //" \
+               CMakeLists.txt || die
+       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
+       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
 }