summaryrefslogtreecommitdiff
path: root/kde-misc/kdiff3/kdiff3-9999.ebuild
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2013-11-12 20:45:22 +1100
committerMichael Palimaka <kensington@gentoo.org>2013-11-12 20:45:22 +1100
commitbf0847b6c71d2effd42481721c3cf94de6a5489e (patch)
tree0106dd9d6d51d73d852b05a7f75ea525f7b42314 /kde-misc/kdiff3/kdiff3-9999.ebuild
parent42124be8b0556bf37c215b78e971d5af7c915c92 (diff)
parent00cda536c44b83e9aa7f61913386299cbe6c414b (diff)
downloadkde-bf0847b6c71d2effd42481721c3cf94de6a5489e.tar.gz
kde-bf0847b6c71d2effd42481721c3cf94de6a5489e.tar.bz2
kde-bf0847b6c71d2effd42481721c3cf94de6a5489e.zip
Merge branch 'master' into frameworks
Diffstat (limited to 'kde-misc/kdiff3/kdiff3-9999.ebuild')
-rw-r--r--kde-misc/kdiff3/kdiff3-9999.ebuild7
1 files changed, 4 insertions, 3 deletions
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 825b43fba4f..5c3eccc55a1 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -20,8 +20,7 @@ inherit kde4-base qt4-r2
DESCRIPTION="Qt/KDE based frontend to diff3"
HOMEPAGE="http://kdiff3.sourceforge.net/"
-EGIT_REPO_URI="git://git.code.sf.net/p/kdiff3/code"
-EGIT_PROJECT="${PN}"
+EGIT_REPO_URI=( "git://git.code.sf.net/p/kdiff3/code" )
LICENSE="GPL-2"
SLOT="4"
@@ -38,9 +37,11 @@ RDEPEND="${DEPEND}
RESTRICT="!kde? ( test )"
+PATCHES=( "${FILESDIR}/${PN}-build.patch" )
+
src_unpack(){
if [[ ${PV} == *9999* ]]; then
- git-2_src_unpack
+ git-r3_src_unpack
mv "${S}"/${PN}/* "${S}" || die
elif use kde; then
kde4-base_src_unpack