3 files changed, 101 insertions, 6 deletions
diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index db814c073840..03f7eb69f113 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-misc/kdiff3
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.43 2010/07/29 23:08:35 darkside Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.44 2011/01/12 22:46:57 tampakrap Exp $
+
+*kdiff3-0.9.95-r1 (12 Jan 2011)
+
+  12 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org> kdiff3-0.9.95.ebuild,
+  +kdiff3-0.9.95-r1.ebuild:
+  Revbump: EAPI3, add Qt-only support, handle handbook/translations better,
+  merge with live ebuild, slotmove to 4
 
   29 Jul 2010; Jeremy Olexa <darkside@gentoo.org> kdiff3-0.9.95.ebuild:
   Add ~amd64-linux, bug 330427
diff --git a/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild
new file mode 100644
index 000000000000..a5fccd09be71
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild,v 1.1 2011/01/12 22:46:57 tampakrap Exp $
+
+EAPI=3
+
+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="Qt/KDE based frontend to diff3"
+HOMEPAGE="http://kdiff3.sourceforge.net/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+SLOT="4"
+IUSE="debug 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
+"
+
+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() {
+	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-0.9.95.ebuild b/kde-misc/kdiff3/kdiff3-0.9.95.ebuild
index 5030438d9db5..be36a44ff55e 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.95.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.95.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.95.ebuild,v 1.9 2010/07/29 23:08:35 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.95.ebuild,v 1.10 2011/01/12 22:46:57 tampakrap Exp $
 
 EAPI="2"
 
@@ -8,11 +8,11 @@ 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"
 inherit kde4-base
 
-DESCRIPTION="KDE-based frontend to diff3"
+DESCRIPTION="Qt/KDE based frontend to diff3"
 HOMEPAGE="http://kdiff3.sourceforge.net/"
 SRC_URI="mirror://sourceforge/kdiff3/${P}.tar.gz"
 
-SLOT="1"
+SLOT="4"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="debug handbook konqueror"