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

["Johannes Huber" <johu@gentoo.org>]

commit:     04c014b6199d8573f8c4ca5033c58e1ae25f5c42
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 11:11:52 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 11:11:52 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=04c014b6

[kde-misc/kdiff3] Sync with tree.

(Portage version: 2.2.0_alpha120/git/Linux i686, unsigned Manifest commit)

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

diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 5d0d326..ea43d33 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -4,30 +4,31 @@
 
 EAPI=4
 
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.4.0"
-
 if [[ ${PV} != *9999* ]]; then
 	KDE_LINGUAS="ar bg br bs ca ca@valencia cs cy da de el en_GB eo es et fr ga
 	gl hi hne hr hu is it ja ka lt mai ml nb nds nl nn pl pt pt_BR ro ru rw sk
 	sv ta tg tr ug uk zh_CN zh_TW"
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 	KDE_HANDBOOK="optional"
+else
+	ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3"
+	KEYWORDS=""
 fi
 
+KDE_REQUIRED="optional"
 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 kde"
 
 DEPEND="
-	>=x11-libs/qt-core-${QT_MINIMAL}:4
-	>=x11-libs/qt-gui-${QT_MINIMAL}:4
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
 	kde? ( $(add_kdebase_dep kdelibs) )
 "
 RDEPEND="${DEPEND}
@@ -38,7 +39,6 @@ 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