[kde-misc/kdiff3] Revbump: EAPI3, add Qt-only support, handle handbook/translations better, merge with live ebuild, slotmove to 4

3 files changed, 67 insertions, 81 deletions

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 58e478f1993..bbc8b6bb77f 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,4 +1,2 @@
-DIST kdiff3-0.9.95.tar.gz 1508467 RMD160 7fc03495f581c9089f6914499c7237b49f053d98 SHA1 1fb27e8b42463ea23ad0169e20819352c1c476b7 SHA256 0372cebc8957f256a98501a4ac3c3634c7ecffb486ece7e7819c90d876202f0f
-EBUILD kdiff3-0.9.95-r1.ebuild 1420 RMD160 a9cf64a700a6285799fe04521daf81a6cec1f0f1 SHA1 723a360919e00acbe8870cbab9c240fdf6ac1cd9 SHA256 a6b66ee0809c6f9a2a740ed2eff98cef75025828a9abb1f7977d340e1c5b2829
-EBUILD kdiff3-9999.ebuild 584 RMD160 cad723ed4e0e232c04a310c09886979e9c157f72 SHA1 cbc6e9bd56300215c5f1d00dcef219af791b499a SHA256 74ea2d6c94f6bf21a673494175567070b9ae8e1bcb067c41710f11bcafdc591a
+EBUILD kdiff3-9999.ebuild 1774 RMD160 3657ffe36a7069c47aeda2c0f31cf095c7c20b48 SHA1 ee135188476917510a4d3fcb070f4fba584ef7e3 SHA256 ac6dfa561e7e447c17c54758efa4414efa93e2d8904ad331f6662c6cb5dec92d
 MISC metadata.xml 272 RMD160 13741b05a0a212384a26dfa158a82c6a370fb522 SHA1 f25ebed93ced9da6bbb189cb5d64e98ed4205236 SHA256 d05363662a508f4e4ec9a8bf9089942548391002a2427b25985232d9c16cce01
diff --git a/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild
deleted file mode 100644
index 726b4606aec..00000000000
--- a/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-KDE_REQUIRED="optional"
-LANGS="ar bg br cs cy da de el en_GB es et fr ga gl hi hu it ja ka lt nb
-nds nl pl pt pt_BR ro ru rw sv ta tg tr uk zh_CN"
-KDE_LINGUAS="${LANGS}"
-QT_MINIMAL="4.4.0"
-
-inherit kde4-base qt4-r2
-
-DESCRIPTION="KDE-based frontend to diff3"
-HOMEPAGE="http://kdiff3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kdiff3/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-SLOT="4"
-IUSE="debug +handbook kde konqueror"
-
-DEPEND="
-	>=x11-libs/qt-core-${QT_MINIMAL}
-	>=x11-libs/qt-gui-${QT_MINIMAL}
-	kde? (
-		$(add_kdebase_dep kdelibs)
-		konqueror? ( $(add_kdebase_dep libkonq) )
-	)
-"
-RDEPEND="${DEPEND}
-	sys-apps/diffutils
-"
-
-src_prepare() {
-	if ! use kde; then
-		# adapt to Gentoo paths
-		sed -e s,documentation.path.*$,documentation.path\ =\ /usr/share/doc/${PF}, \
-			-e s,target.path.*$,target.path\ =\ /usr/bin, \
-			"${S}"/src-QT4/kdiff3.pro > "${S}"/src-QT4/kdiff3_fixed.pro
-	fi
-}
-
-src_configure() {
-	if use kde; then
-		mycmakeargs=( $(cmake-utils_use_with konqueror LibKonq) )
-		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
-}
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 245738bb1ba..b471c0c73d4 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -2,10 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=3
 
-KMNAME="extragear/utils"
-inherit kde4-base
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.4.0"
+
+if [[ ${PV} != *9999* ]]; then
+	KDE_LINGUAS="ar bg br cs cy da de el en_GB es et fr ga gl hi hu it ja ka lt nb
+	nds nl pl pt pt_BR ro ru rw sv ta tg tr uk zh_CN"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KDE_HANDBOOK="optional"
+fi
+
+inherit kde4-base qt4-r2
 
 DESCRIPTION="KDE-based frontend to diff3"
 HOMEPAGE="http://kdiff3.sourceforge.net/"
@@ -13,20 +22,67 @@ HOMEPAGE="http://kdiff3.sourceforge.net/"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="4"
-IUSE="debug konqueror"
+IUSE="debug kde konqueror"
 
 DEPEND="
-	konqueror? ( >=kde-base/libkonq-${KDE_MINIMAL} )
+	>=x11-libs/qt-core-${QT_MINIMAL}
+	>=x11-libs/qt-gui-${QT_MINIMAL}
+	kde? (
+		$(add_kdebase_dep kdelibs)
+		konqueror? ( $(add_kdebase_dep libkonq) )
+	)
 "
 RDEPEND="${DEPEND}
 	sys-apps/diffutils
-	konqueror? ( >=kde-base/konqueror-${KDE_MINIMAL} )
 "
 
+RESTRICT="!kde? ( test )"
+
+src_unpack(){
+	if [[ ${PV} == *9999* ]]; then
+		ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3"
+		subversion_src_unpack
+	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\ =\ /usr/share/doc/${PF}, \
+			-e s,target.path.*$,target.path\ =\ /usr/bin, \
+			"${S}"/src-QT4/kdiff3.pro > "${S}"/src-QT4/kdiff3_fixed.pro
+	else
+		kde4-base_src_prepare
+	fi
+
+	echo "Categories=Qt;KDE;Development;" >> "${S}"/src-QT4/kdiff3.desktop
+}
+
 src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with konqueror LibKonq)
-	)
+	if use kde; then
+		mycmakeargs=( $(cmake-utils_use_with konqueror LibKonq) )
+		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
+}
 
-	kde4-base_src_configure
+src_install() {
+	if use kde; then
+		kde4-base_src_install
+	else
+		qt4-r2_src_install
+	fi
 }