diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2009-06-22 12:35:42 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2009-06-22 12:35:42 +0000 |
| commit | caccbf8904bdfa620cfee16d4781dec965ce9621 (patch) | |
| tree | 7842d196e2d9f6d186854822efeff296ea583e02 /kde-misc/kdiff3 | |
| parent | Bump to 3.4.0. Closes #271173. Patch and ebuild fixes by Sergey Morozov (diff) | |
| download | gentoo-2-caccbf8904bdfa620cfee16d4781dec965ce9621.tar.gz gentoo-2-caccbf8904bdfa620cfee16d4781dec965ce9621.tar.bz2 gentoo-2-caccbf8904bdfa620cfee16d4781dec965ce9621.zip | |
libkonq is optional, bug #274189
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'kde-misc/kdiff3')
| -rw-r--r-- | kde-misc/kdiff3/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-misc/kdiff3/kdiff3-0.9.95.ebuild | 12 | ||||
| -rw-r--r-- | kde-misc/kdiff3/metadata.xml | 3 |
3 files changed, 17 insertions, 4 deletions
diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog index c37a6bc8a0dc..273a3910de10 100644 --- a/kde-misc/kdiff3/ChangeLog +++ b/kde-misc/kdiff3/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-misc/kdiff3 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.39 2009/06/14 10:49:33 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.40 2009/06/22 12:35:42 voyageur Exp $ + + 22 Jun 2009; Bernard Cafarelli <voyageur@gentoo.org> kdiff3-0.9.95.ebuild, + metadata.xml: + libkonq is optional, bug #274189 14 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org> kdiff3-0.9.95.ebuild: Remove wrong src_prepare. Will be handled by eclass soon enought. diff --git a/kde-misc/kdiff3/kdiff3-0.9.95.ebuild b/kde-misc/kdiff3/kdiff3-0.9.95.ebuild index f0eefc3abe51..347b0ac93430 100644 --- a/kde-misc/kdiff3/kdiff3-0.9.95.ebuild +++ b/kde-misc/kdiff3/kdiff3-0.9.95.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.95.ebuild,v 1.4 2009/06/14 10:49:33 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.95.ebuild,v 1.5 2009/06/22 12:35:42 voyageur Exp $ EAPI="2" @@ -15,8 +15,14 @@ SRC_URI="mirror://sourceforge/kdiff3/${P}.tar.gz" SLOT="1" LICENSE="GPL-2" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="debug handbook" +IUSE="debug handbook konqueror" -RDEPEND=">=kde-base/libkonq-${KDE_MINIMAL} +RDEPEND="konqueror? ( >=kde-base/libkonq-${KDE_MINIMAL} ) sys-apps/diffutils !kde-misc/kdiff3:0" + +src_configure() { + mycmakeargs="${mycmakeargs} $(cmake-utils_use_with konqueror LibKonq)" + kde4-base_src_configure +} + diff --git a/kde-misc/kdiff3/metadata.xml b/kde-misc/kdiff3/metadata.xml index 37dfd561dd5f..018f2005a60c 100644 --- a/kde-misc/kdiff3/metadata.xml +++ b/kde-misc/kdiff3/metadata.xml @@ -6,4 +6,7 @@ <email>voyageur@gentoo.org</email> <name>Bernard Cafarelli</name> </maintainer> + <use> + <flag name="konqueror">Enable integration with konqueror</flag> + </use> </pkgmetadata> |