diff options
author | 2015-03-18 16:40:00 +0000 | |
---|---|---|
committer | 2015-03-18 16:40:00 +0000 | |
commit | 4d8988bb2c835f8f82cacd6f37ad1cba50fafa1b (patch) | |
tree | 35f393de86dae9d5e4e97d1ff5810d72a725c87f /kde-misc | |
parent | Version bump. Add new dep on dev-perl/CPAN-Changes for tests. (diff) | |
download | gentoo-2-4d8988bb2c835f8f82cacd6f37ad1cba50fafa1b.tar.gz gentoo-2-4d8988bb2c835f8f82cacd6f37ad1cba50fafa1b.tar.bz2 gentoo-2-4d8988bb2c835f8f82cacd6f37ad1cba50fafa1b.zip |
Support qt5 build, fixes bug #543286
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 00F7AB331B0F097F)
Diffstat (limited to 'kde-misc')
-rw-r--r-- | kde-misc/kdiff3/ChangeLog | 10 | ||||
-rw-r--r-- | kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild | 100 |
2 files changed, 108 insertions, 2 deletions
diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog index 17cf3ee88d55..67a1dc12674e 100644 --- a/kde-misc/kdiff3/ChangeLog +++ b/kde-misc/kdiff3/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-misc/kdiff3 -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.74 2014/08/08 09:48:23 voyageur Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.75 2015/03/18 16:40:00 voyageur Exp $ + +*kdiff3-0.9.98-r1 (18 Mar 2015) + + 18 Mar 2015; Bernard Cafarelli <voyageur@gentoo.org> + +kdiff3-0.9.98-r1.ebuild: + Support qt5 build, fixes bug #543286 08 Aug 2014; Bernard Cafarelli <voyageur@gentoo.org> kdiff3-0.9.98.ebuild: Fix sed command for USE=-kde, bug #519370 diff --git a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild new file mode 100644 index 000000000000..11a232450284 --- /dev/null +++ b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild,v 1.1 2015/03/18 16:40:00 voyageur Exp $ + +EAPI=5 + +if [[ ${PV} != *9999* ]]; then + KDE_LINGUAS="ar bg br bs ca ca@valencia cs cy da de el en_GB eo es et fr ga + gl hi hne hr hu is it ja ka lt mai ml nb nds nl nn pl pt pt_BR ro ru rw sk + sv ta tg tr ug uk zh_CN zh_TW" + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux" + KDE_HANDBOOK="optional" +else + KEYWORDS="" +fi + +KDE_REQUIRED="optional" +inherit base kde4-base qmake-utils + +DESCRIPTION="Qt/KDE based frontend to diff3" +HOMEPAGE="http://kdiff3.sourceforge.net/" +EGIT_REPO_URI=( "git://git.code.sf.net/p/kdiff3/code" ) + +LICENSE="GPL-2" +SLOT="4" +IUSE="debug kde +qt4 qt5" + +REQUIRED_USE="kde? ( qt4 ) + ^^ ( qt4 qt5 )" + +CDEPEND=" + qt4? ( dev-qt/qtcore:4 + dev-qt/qtgui:4 ) + qt5? ( dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 ) + kde? ( $(add_kdebase_dep kdelibs) ) +" +DEPEND="${CDEPEND} + sys-devel/gettext +" +RDEPEND="${CDEPEND} + sys-apps/diffutils +" + +RESTRICT="!kde? ( test )" + +src_unpack(){ + if [[ ${PV} == *9999* ]]; then + git-r3_src_unpack + mv "${S}"/${PN}/* "${S}" || die + else + base_src_unpack + fi +} + +src_prepare() { + if ! use kde; then + # adapt to Gentoo paths + sed -e s,documentation.path.*$,documentation.path\ =\ "${EPREFIX}"/usr/share/doc/"${PF}", \ + -e s,target.path.*$,target.path\ =\ "${EPREFIX}"/usr/bin, \ + "${S}"/src-QT4/kdiff3.pro > "${S}"/src-QT4/kdiff3_fixed.pro + else + kde4-base_src_prepare + fi +} + +src_configure() { + if use kde; then + kde4-base_src_configure + elif use qt4; then + eqmake4 "${S}"/src-QT4/kdiff3_fixed.pro + else + eqmake5 "${S}"/src-QT4/kdiff3_fixed.pro + fi +} + +src_compile() { + if use kde; then + kde4-base_src_compile + else + base_src_compile + fi +} + +src_install() { + if use kde; then + kde4-base_src_install + else + base_src_install INSTALL_ROOT="${D}" + fi +} + +src_test() { + if use kde; then + kde4-base_src_test + fi +} |