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 | 5ffae7241f50f4b23572524a1efe68070dc89f66 (patch) | |
| tree | a1f66d188b517ee30b40c78afbffad3c578cd3c2 /kde-misc | |
| parent | Bump to 3.4.0. Closes #271173. Patch and ebuild fixes by Sergey Morozov (diff) | |
| download | historical-5ffae7241f50f4b23572524a1efe68070dc89f66.tar.gz historical-5ffae7241f50f4b23572524a1efe68070dc89f66.tar.bz2 historical-5ffae7241f50f4b23572524a1efe68070dc89f66.zip | |
libkonq is optional, bug #274189
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'kde-misc')
| -rw-r--r-- | kde-misc/kdiff3/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-misc/kdiff3/Manifest | 6 | ||||
| -rw-r--r-- | kde-misc/kdiff3/kdiff3-0.9.95.ebuild | 12 | ||||
| -rw-r--r-- | kde-misc/kdiff3/metadata.xml | 3 |
4 files changed, 20 insertions, 7 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/Manifest b/kde-misc/kdiff3/Manifest index e6aae35a9fff..2b7e1672d1c3 100644 --- a/kde-misc/kdiff3/Manifest +++ b/kde-misc/kdiff3/Manifest @@ -4,6 +4,6 @@ DIST kdiff3-0.9.92.tar.gz 2220173 RMD160 3757fe678e944755164cdc62bfca9f0214acdbb DIST kdiff3-0.9.95.tar.gz 1508467 RMD160 7fc03495f581c9089f6914499c7237b49f053d98 SHA1 1fb27e8b42463ea23ad0169e20819352c1c476b7 SHA256 0372cebc8957f256a98501a4ac3c3634c7ecffb486ece7e7819c90d876202f0f EBUILD kdiff3-0.9.92-r1.ebuild 635 RMD160 78a6c93d90c2ee40293c83095069d8614924fd01 SHA1 fd7c3b062b015b03504b1d085fefb6ea2a54f326 SHA256 6f62b6f203afabcf40bde95799a1f387515ba0aea858353e17ab21d8936d8494 EBUILD kdiff3-0.9.92.ebuild 1992 RMD160 e53917aa05aa473992e0e1df172a959b4b9795d0 SHA1 7748d1d0005962a60e4f24dc89fa3330da98f88a SHA256 a0b154234054886070afe7741926ae3248ccfc9272b9fd354f1b87e7f6dc1e7f -EBUILD kdiff3-0.9.95.ebuild 682 RMD160 72b9afbda5fce3f53ffe1e9f3e9f3e1659041345 SHA1 8c6fdf5a4005995336fa62003cab3b74de307ebe SHA256 29603a7851b4fe5afa739b68a6cf98af4afcc0304dd84f6bbb60b151711aa1ea -MISC ChangeLog 7321 RMD160 dc37171f9602a9b378b1e26990dbabe36d8250ea SHA1 d2ea0901297c5cfe90a7bb723e17cb884efec65b SHA256 f17079d382d2253ab73c3f7add9bcfcb2679553aaca069eda462152290920c00 -MISC metadata.xml 256 RMD160 3526c65ba29a53056fed7f794bf33e65fe65ea29 SHA1 c0eb80e73ccee8051579d03bf1f468fc98167e1e SHA256 53ee238b560db384f60c055e935009dc11608a62ad34f0aab2657ece46d75839 +EBUILD kdiff3-0.9.95.ebuild 825 RMD160 4303be7fa391fd439213bf0daa956b9feed3a56a SHA1 3404246bf58feeef81d75935c92c1230561730fc SHA256 2cdcbbbe478b0e20fa799721444ac3b756329c2c83581a2da9e924d5b8de0998 +MISC ChangeLog 7449 RMD160 1b901a626d3189b778cdf4c7836031cb696c8efd SHA1 d035fac656bf7bdaa1a53a43a7663fa0a9d57687 SHA256 848ac62bef088b4d87f009e6c38fcd6c600506dc925b2f2b6a5d895985076d88 +MISC metadata.xml 337 RMD160 987f2ea930df64c8621ce9e9ad2bc3e4b493f87c SHA1 05eb9bceea062c2393a1b12adca0df1cfb3b2c5e SHA256 efb6060c548053f718e7d63581e8a2637b5b5d6ee7f386e628c34292a40f180b 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> |