| 1 |
voyageur 09/06/22 12:35:42 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog kdiff3-0.9.95.ebuild |
| 4 |
Log: |
| 5 |
libkonq is optional, bug #274189 |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.4 kde-misc/kdiff3/metadata.xml |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-misc/kdiff3/metadata.xml?rev=1.4&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-misc/kdiff3/metadata.xml?rev=1.4&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-misc/kdiff3/metadata.xml?r1=1.3&r2=1.4 |
| 14 |
|
| 15 |
Index: metadata.xml |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/metadata.xml,v |
| 18 |
retrieving revision 1.3 |
| 19 |
retrieving revision 1.4 |
| 20 |
diff -u -r1.3 -r1.4 |
| 21 |
--- metadata.xml 9 Feb 2009 23:24:08 -0000 1.3 |
| 22 |
+++ metadata.xml 22 Jun 2009 12:35:42 -0000 1.4 |
| 23 |
@@ -6,4 +6,7 @@ |
| 24 |
<email>voyageur@g.o</email> |
| 25 |
<name>Bernard Cafarelli</name> |
| 26 |
</maintainer> |
| 27 |
+ <use> |
| 28 |
+ <flag name="konqueror">Enable integration with konqueror</flag> |
| 29 |
+ </use> |
| 30 |
</pkgmetadata> |
| 31 |
|
| 32 |
|
| 33 |
|
| 34 |
1.40 kde-misc/kdiff3/ChangeLog |
| 35 |
|
| 36 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.40&view=markup |
| 37 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.40&content-type=text/plain |
| 38 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-misc/kdiff3/ChangeLog?r1=1.39&r2=1.40 |
| 39 |
|
| 40 |
Index: ChangeLog |
| 41 |
=================================================================== |
| 42 |
RCS file: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v |
| 43 |
retrieving revision 1.39 |
| 44 |
retrieving revision 1.40 |
| 45 |
diff -u -r1.39 -r1.40 |
| 46 |
--- ChangeLog 14 Jun 2009 10:49:33 -0000 1.39 |
| 47 |
+++ ChangeLog 22 Jun 2009 12:35:42 -0000 1.40 |
| 48 |
@@ -1,6 +1,10 @@ |
| 49 |
# ChangeLog for kde-misc/kdiff3 |
| 50 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 51 |
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.39 2009/06/14 10:49:33 scarabeus Exp $ |
| 52 |
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.40 2009/06/22 12:35:42 voyageur Exp $ |
| 53 |
+ |
| 54 |
+ 22 Jun 2009; Bernard Cafarelli <voyageur@g.o> kdiff3-0.9.95.ebuild, |
| 55 |
+ metadata.xml: |
| 56 |
+ libkonq is optional, bug #274189 |
| 57 |
|
| 58 |
14 Jun 2009; Tomáš Chvátal <scarabeus@g.o> kdiff3-0.9.95.ebuild: |
| 59 |
Remove wrong src_prepare. Will be handled by eclass soon enought. |
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.5 kde-misc/kdiff3/kdiff3-0.9.95.ebuild |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.95.ebuild?rev=1.5&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.95.ebuild?rev=1.5&content-type=text/plain |
| 67 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.95.ebuild?r1=1.4&r2=1.5 |
| 68 |
|
| 69 |
Index: kdiff3-0.9.95.ebuild |
| 70 |
=================================================================== |
| 71 |
RCS file: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.95.ebuild,v |
| 72 |
retrieving revision 1.4 |
| 73 |
retrieving revision 1.5 |
| 74 |
diff -u -r1.4 -r1.5 |
| 75 |
--- kdiff3-0.9.95.ebuild 14 Jun 2009 10:49:33 -0000 1.4 |
| 76 |
+++ kdiff3-0.9.95.ebuild 22 Jun 2009 12:35:42 -0000 1.5 |
| 77 |
@@ -1,6 +1,6 @@ |
| 78 |
# Copyright 1999-2009 Gentoo Foundation |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.95.ebuild,v 1.4 2009/06/14 10:49:33 scarabeus Exp $ |
| 81 |
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.95.ebuild,v 1.5 2009/06/22 12:35:42 voyageur Exp $ |
| 82 |
|
| 83 |
EAPI="2" |
| 84 |
|
| 85 |
@@ -15,8 +15,14 @@ |
| 86 |
SLOT="1" |
| 87 |
LICENSE="GPL-2" |
| 88 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
| 89 |
-IUSE="debug handbook" |
| 90 |
+IUSE="debug handbook konqueror" |
| 91 |
|
| 92 |
-RDEPEND=">=kde-base/libkonq-${KDE_MINIMAL} |
| 93 |
+RDEPEND="konqueror? ( >=kde-base/libkonq-${KDE_MINIMAL} ) |
| 94 |
sys-apps/diffutils |
| 95 |
!kde-misc/kdiff3:0" |
| 96 |
+ |
| 97 |
+src_configure() { |
| 98 |
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_with konqueror LibKonq)" |
| 99 |
+ kde4-base_src_configure |
| 100 |
+} |
| 101 |
+ |
Archives