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

["Michael Palimaka" <kensington@gentoo.org>]

commit:     4ca738870de6600a10f41b7f5a258b51264b79cb
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 17 11:41:23 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Oct 17 11:41:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4ca73887

[kde-misc/kdiff3] Upstream has migrated to git, wrt bug #436288.

Package-Manager: portage-2.1.11.28

---
 kde-misc/kdiff3/kdiff3-9999.ebuild |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 31810f4..ebab1ed 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -16,12 +16,11 @@ else
 fi
 
 KDE_REQUIRED="optional"
-KDE_SCM="svn"
 inherit kde4-base qt4-r2
 
 DESCRIPTION="Qt/KDE based frontend to diff3"
 HOMEPAGE="http://kdiff3.sourceforge.net/"
-ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3"
+EGIT_REPO_URI="git://git.code.sf.net/p/kdiff3/code"
 
 LICENSE="GPL-2"
 SLOT="4"
@@ -40,7 +39,8 @@ RESTRICT="!kde? ( test )"
 
 src_unpack(){
 	if [[ ${PV} == *9999* ]]; then
-		subversion_src_unpack
+		git-2_src_unpack
+		mv "${S}"/${PN}/* "${S}" || die
 	elif use kde; then
 		kde4-base_src_unpack
 	else