diff options
Diffstat (limited to 'kde-misc/kdiff3')
| -rw-r--r-- | kde-misc/kdiff3/Manifest | 2 | ||||
| -rw-r--r-- | kde-misc/kdiff3/kdiff3-9999.ebuild | 78 |
2 files changed, 12 insertions, 68 deletions
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest index bbc8b6bb77f..5f68958d809 100644 --- a/kde-misc/kdiff3/Manifest +++ b/kde-misc/kdiff3/Manifest @@ -1,2 +1,2 @@ -EBUILD kdiff3-9999.ebuild 1774 RMD160 3657ffe36a7069c47aeda2c0f31cf095c7c20b48 SHA1 ee135188476917510a4d3fcb070f4fba584ef7e3 SHA256 ac6dfa561e7e447c17c54758efa4414efa93e2d8904ad331f6662c6cb5dec92d +EBUILD kdiff3-9999.ebuild 584 RMD160 9fad3cc63bdf4d247094c26e2880415f3c7e4627 SHA1 1d28e63a314b945565560ad6f6e5e07330dcba1f SHA256 6e8565a7c2a260075504b3990ffdec7e1922d22bbe3645f842eb524f2b991348 MISC metadata.xml 272 RMD160 13741b05a0a212384a26dfa158a82c6a370fb522 SHA1 f25ebed93ced9da6bbb189cb5d64e98ed4205236 SHA256 d05363662a508f4e4ec9a8bf9089942548391002a2427b25985232d9c16cce01 diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild index b471c0c73d4..0fa882ccf1b 100644 --- a/kde-misc/kdiff3/kdiff3-9999.ebuild +++ b/kde-misc/kdiff3/kdiff3-9999.ebuild @@ -1,20 +1,11 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=3 +EAPI="3" -KDE_REQUIRED="optional" -QT_MINIMAL="4.4.0" - -if [[ ${PV} != *9999* ]]; then - KDE_LINGUAS="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" - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KDE_HANDBOOK="optional" -fi - -inherit kde4-base qt4-r2 +KMNAME="extragear/utils" +inherit kde4-base DESCRIPTION="KDE-based frontend to diff3" HOMEPAGE="http://kdiff3.sourceforge.net/" @@ -22,67 +13,20 @@ HOMEPAGE="http://kdiff3.sourceforge.net/" LICENSE="GPL-2" KEYWORDS="" SLOT="4" -IUSE="debug kde konqueror" +IUSE="debug konqueror" DEPEND=" - >=x11-libs/qt-core-${QT_MINIMAL} - >=x11-libs/qt-gui-${QT_MINIMAL} - kde? ( - $(add_kdebase_dep kdelibs) - konqueror? ( $(add_kdebase_dep libkonq) ) - ) + konqueror? ( >=kde-base/libkonq-${KDE_MINIMAL} ) " RDEPEND="${DEPEND} sys-apps/diffutils + konqueror? ( >=kde-base/konqueror-${KDE_MINIMAL} ) " -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 - else - qt4-r2_src_unpack - fi -} - -src_prepare() { - 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 - else - kde4-base_src_prepare - fi - - echo "Categories=Qt;KDE;Development;" >> "${S}"/src-QT4/kdiff3.desktop -} - src_configure() { - 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 -} + mycmakeargs=( + $(cmake-utils_use_with konqueror LibKonq) + ) -src_install() { - if use kde; then - kde4-base_src_install - else - qt4-r2_src_install - fi + kde4-base_src_configure } |