[gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/

[Johannes Huber]

commit:     a6bdd8040ffd4690e48baf52c8fddc6551c30159
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 18:23:38 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 18:24:34 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a6bdd804

kde-misc/kdiff3: KF5, EAPI 6

Package-Manager: portage-2.2.28

 kde-misc/kdiff3/kdiff3-9999.ebuild | 92 ++++++++++----------------------------
 1 file changed, 23 insertions(+), 69 deletions(-)

diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 94b3f55..a4835f6 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -2,93 +2,47 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ar bg br bs ca ca@valencia cs cy da de el en_GB eo es et fr ga
-	gl hi hne hr hu is it ja ka lt mai ml nb nds nl nn pl pt pt_BR ro ru rw sk
-	sv ta tg tr ug uk zh_CN zh_TW"
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
-	KDE_HANDBOOK="optional"
-else
-	KEYWORDS=""
-fi
+EGIT_BRANCH="kf5"
+inherit kde5
 
-KDE_REQUIRED="optional"
-inherit kde4-base qt4-r2
-
-DESCRIPTION="Qt/KDE based frontend to diff3"
+DESCRIPTION="Frontend to diff3 based on Qt/KF5"
 HOMEPAGE="http://kdiff3.sourceforge.net/"
-EGIT_REPO_URI=( "git://git.code.sf.net/p/kdiff3/code" )
+EGIT_REPO_URI="git://anongit.kde.org/scratch/thomasfischer/${PN}"
 
 LICENSE="GPL-2"
-SLOT="4"
-IUSE="debug kde"
+KEYWORDS=""
+IUSE=""
 
 CDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	kde? ( $(add_kdebase_dep kdelibs) )
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtcore)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
 "
 DEPEND="${CDEPEND}
 	sys-devel/gettext
 "
 RDEPEND="${CDEPEND}
 	sys-apps/diffutils
+	!kde-misc/kdiff3:4
 "
 
-RESTRICT="!kde? ( test )"
-
 src_unpack(){
-	if [[ ${PV} == *9999* ]]; then
+	if [[ ${KDE_BUILD_TYPE} = live ]]; then
 		git-r3_src_unpack
 		mv "${S}"/${PN}/* "${S}" || die
-	elif use kde; then
-		kde4-base_src_unpack
-	else
-		qt4-r2_src_unpack
-	fi
-}
-
-src_prepare() {
-	if ! use kde; then
-		# adapt to Gentoo paths
-		sed -e s,documentation.path.*$,documentation.path\ =\
-		"${EPREFIX}"/usr/share/doc/"${PF}", \
-		-e s,target.path.*$,target.path\ =\ "${EPREFIX}"/usr/bin, \
-		"${S}"/src-QT4/kdiff3.pro > "${S}"/src-QT4/kdiff3_fixed.pro
 	else
-		kde4-base_src_prepare
-	fi
-}
-
-src_configure() {
-	if use kde; then
-		kde4-base_src_configure
-	else
-		eqmake4 "${S}"/src-QT4/kdiff3_fixed.pro
-	fi
-}
-
-src_compile() {
-	if use kde; then
-		kde4-base_src_compile
-	else
-		qt4-r2_src_compile
-	fi
-}
-
-src_install() {
-	if use kde; then
-		kde4-base_src_install
-	else
-		qt4-r2_src_install
-	fi
-}
-
-src_test() {
-	if use kde; then
-		kde4-base_src_test
+		kde5_src_unpack
 	fi
 }