diff options
| author | Theo Chatzimichos <tampakrap@gentoo.org> | 2011-01-10 14:04:21 +0200 |
|---|---|---|
| committer | Theo Chatzimichos <tampakrap@gentoo.org> | 2011-01-10 14:04:21 +0200 |
| commit | 886cb756795fc6dacaaca369edf3185507b35982 (patch) | |
| tree | e999585ee74af204e7fe6f6c5da20ed0b30ec7a5 /kde-misc/kdiff3 | |
| parent | 552119eb1d46cd72f57da4d0601bfcd192968db1 (diff) | |
| download | kde-886cb756795fc6dacaaca369edf3185507b35982.tar.gz kde-886cb756795fc6dacaaca369edf3185507b35982.tar.bz2 kde-886cb756795fc6dacaaca369edf3185507b35982.zip | |
4.5.5 now in tree
Diffstat (limited to 'kde-misc/kdiff3')
| -rw-r--r-- | kde-misc/kdiff3/Manifest | 3 | ||||
| -rw-r--r-- | kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild | 55 |
2 files changed, 43 insertions, 15 deletions
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest index dd9ab9d8713..58e478f1993 100644 --- a/kde-misc/kdiff3/Manifest +++ b/kde-misc/kdiff3/Manifest @@ -1,3 +1,4 @@ -EBUILD kdiff3-0.9.95-r1.ebuild 832 RMD160 a505e4e10379ff316826b61f05fb8c23c0a92af7 SHA1 1087ed3795a1316fdbdc49b7989fc52c60d25bb2 SHA256 39922055739c6bfafb701db3eedecd6fcd862a02af16e59a6140c7587719ac75 +DIST kdiff3-0.9.95.tar.gz 1508467 RMD160 7fc03495f581c9089f6914499c7237b49f053d98 SHA1 1fb27e8b42463ea23ad0169e20819352c1c476b7 SHA256 0372cebc8957f256a98501a4ac3c3634c7ecffb486ece7e7819c90d876202f0f +EBUILD kdiff3-0.9.95-r1.ebuild 1420 RMD160 a9cf64a700a6285799fe04521daf81a6cec1f0f1 SHA1 723a360919e00acbe8870cbab9c240fdf6ac1cd9 SHA256 a6b66ee0809c6f9a2a740ed2eff98cef75025828a9abb1f7977d340e1c5b2829 EBUILD kdiff3-9999.ebuild 584 RMD160 cad723ed4e0e232c04a310c09886979e9c157f72 SHA1 cbc6e9bd56300215c5f1d00dcef219af791b499a SHA256 74ea2d6c94f6bf21a673494175567070b9ae8e1bcb067c41710f11bcafdc591a MISC metadata.xml 272 RMD160 13741b05a0a212384a26dfa158a82c6a370fb522 SHA1 f25ebed93ced9da6bbb189cb5d64e98ed4205236 SHA256 d05363662a508f4e4ec9a8bf9089942548391002a2427b25985232d9c16cce01 diff --git a/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild index 2d76a4f430c..726b4606aec 100644 --- a/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild +++ b/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild @@ -4,38 +4,65 @@ EAPI="2" -KDE_LINGUAS="ar bg br cs cy da de el en_GB es et fr ga gl hi hu it ja ka lt nb +KDE_REQUIRED="optional" +LANGS="ar bg br cs cy da de el en_GB es et fr ga gl hi hu it ja ka lt nb nds nl pl pt pt_BR ro ru rw sv ta tg tr uk zh_CN" +KDE_LINGUAS="${LANGS}" +QT_MINIMAL="4.4.0" -inherit kde4-base +inherit kde4-base qt4-r2 DESCRIPTION="KDE-based frontend to diff3" HOMEPAGE="http://kdiff3.sourceforge.net/" +SRC_URI="mirror://sourceforge/kdiff3/${P}.tar.gz" LICENSE="GPL-2" -KEYWORDS="" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux" SLOT="4" -IUSE="debug +handbook konqueror" +IUSE="debug +handbook kde konqueror" DEPEND=" - konqueror? ( >=kde-base/libkonq-${KDE_MINIMAL} ) + >=x11-libs/qt-core-${QT_MINIMAL} + >=x11-libs/qt-gui-${QT_MINIMAL} + kde? ( + $(add_kdebase_dep kdelibs) + konqueror? ( $(add_kdebase_dep libkonq) ) + ) " RDEPEND="${DEPEND} sys-apps/diffutils - konqueror? ( >=kde-base/konqueror-${KDE_MINIMAL} ) " src_prepare() { - kde4-base_src_prepare - - # Append missing categories - echo "Categories=Qt;KDE;Development;" >> src/kdiff3.desktop + if ! use kde; then + # adapt to Gentoo paths + sed -e s,documentation.path.*$,documentation.path\ =\ /usr/share/doc/${PF}, \ + -e s,target.path.*$,target.path\ =\ /usr/bin, \ + "${S}"/src-QT4/kdiff3.pro > "${S}"/src-QT4/kdiff3_fixed.pro + fi } src_configure() { - mycmakeargs=( - $(cmake-utils_use_with konqueror LibKonq) - ) + if use kde; then + mycmakeargs=( $(cmake-utils_use_with konqueror LibKonq) ) + kde4-base_src_configure + else + eqmake4 "${S}"/src-QT4/kdiff3_fixed.pro + fi +} + +src_compile() { + if use kde; then + kde4-base_src_compile + else + qt4-r2_src_compile + fi +} - kde4-base_src_configure +src_install() { + if use kde; then + kde4-base_src_install + else + qt4-r2_src_install + fi } |