[kde-misc/kdiff3] Restore the live ebuild, it was probably reverted to

an old version during the kde-git merge to master. Now i wonder if more
ebuilds broke

2 files changed, 74 insertions, 12 deletions

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 1dca6756c11..a7efeb7c7e1 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1,2 @@
-EBUILD kdiff3-9999.ebuild 582 RMD160 da6dd3fbe65dedf0d5917a34744681614ab50216 SHA1 04e11a8a504e59c95c1fdeeb251bd25bd129731b SHA256 6af16e1122807d4943771176d6970929ccfbe4d93c61ecbb20fa704e1b47fe9a
+EBUILD kdiff3-9999.ebuild 1940 RMD160 7e76360e8044979229df1404bc22a4a1631edd8a SHA1 56ac529af2c28639bb884f5163263c9617c88ef0 SHA256 588df7ae0938f8de9f45de816f83cb17c9f06f33f31220f11131043924b7a8b0
 MISC metadata.xml 272 RMD160 13741b05a0a212384a26dfa158a82c6a370fb522 SHA1 f25ebed93ced9da6bbb189cb5d64e98ed4205236 SHA256 d05363662a508f4e4ec9a8bf9089942548391002a2427b25985232d9c16cce01
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 5debf790abe..4aa3b8f151f 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -1,32 +1,94 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $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
 
-KMNAME="extragear/utils"
-inherit kde4-base
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.4.0"
 
-DESCRIPTION="KDE-based frontend to diff3"
+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=""
 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
+}
+
+src_install() {
+	if use kde; then
+		kde4-base_src_install
+	else
+		qt4-r2_src_install
+	fi
+}
 
-	kde4-base_src_configure
+src_test() {
+	if use kde; then
+		kde4-base_src_test
+	fi
 }