From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 45C311381F4 for ; Wed, 15 Aug 2012 13:34:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD7A421C01B; Wed, 15 Aug 2012 13:33:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AFD5721C01B for ; Wed, 15 Aug 2012 13:33:59 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 21EB81B401E for ; Wed, 15 Aug 2012 13:33:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D42C9E5440 for ; Wed, 15 Aug 2012 13:33:57 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1345029112.04c014b6199d8573f8c4ca5033c58e1ae25f5c42.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/ X-VCS-Repository: proj/kde X-VCS-Files: kde-misc/kdiff3/kdiff3-9999.ebuild X-VCS-Directories: kde-misc/kdiff3/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 04c014b6199d8573f8c4ca5033c58e1ae25f5c42 X-VCS-Branch: master Date: Wed, 15 Aug 2012 13:33:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 400dccd0-7fbe-476c-b3b2-e153ddca9310 X-Archives-Hash: 5759eaa1796ba675ec5a54a4f0ac2183 commit: 04c014b6199d8573f8c4ca5033c58e1ae25f5c42 Author: Johannes Huber gentoo org> AuthorDate: Wed Aug 15 11:11:52 2012 +0000 Commit: Johannes Huber gentoo 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