Support qt5 build, fixes bug #543286

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x00F7AB331B0F097F

3 files changed, 126 insertions, 7 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/Manifest b/kde-misc/kdiff3/Manifest
index f1f0ce1f9bad..663128a2dfd4 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -5,13 +5,26 @@ AUX kdiff3-0.9.97-relativepath.patch 2542 SHA256 affa8b351b96109748a1909d83d89e3
 DIST kdiff3-0.9.97.tar.gz 1803769 SHA256 e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a SHA512 8f4e89e594894a3fbfaa2e5c9cc345ab16e6787c4efc4324fffe55fbe45b94c2ff10ba411279d2b433a0a5fa752653f7b3e663577cc0d658dfc4d5b797a22fab WHIRLPOOL 190590f3c4290afee73672a77ec4f16a923d156f097bcbb4dce1893f57b1199d1f7ed19166a8173292a7bedda5e54f792474f169a50ed8eb47a92b24f7b1c57c
 DIST kdiff3-0.9.98.tar.gz 1762715 SHA256 802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668 SHA512 867f0b1d5beb421f1bf84e6044d8d9279d434900faa1962fd5417653ef6b1cc71a8f5dd6c29cd4826a1c70a6075786faeaee780548521ce2ce221d83229b52e6 WHIRLPOOL 4099488985182d36fc4ecf532914c1439273036e38b66f7584282b6b232c3c4a738ecab35dd8b1a30b9a368cf6a6f9aeebea38e921063b55ac3972f46e118c98
 EBUILD kdiff3-0.9.97-r2.ebuild 1916 SHA256 8b0cc037a63f8979125a651f84d7c9e292b3ed4101e131c5777ba0a4a040ff8f SHA512 a95d46ae3f39541339692a4c2ac79220371e0505a875174c85d68022ea543fe6c8c96b54b61a9ddb402233e431d6f61ba265dfb7a6842117a0c74fe77cddb994 WHIRLPOOL a271f4adfef9543d587cd6878539100825c47db947ecf3b685014cfe0418c6ea1917446587b70a3c0cc018d7875360d4d2bf0c55744e6282c241213716c777a8
+EBUILD kdiff3-0.9.98-r1.ebuild 2065 SHA256 b7ad1e389e0c819a13544791b2dee0b33eb67937c83b34c49cff6fb527d94142 SHA512 f1831a8faa63e8006a902c561956020f1fd9a2d916d543cc2865dfb647d63c24aca0abb9531e7b00cda8ffd86e6d34daff870182c80832c1599ae5038cc706de WHIRLPOOL ff856eeffbd2ce4cfcf32ca5ea8a31b3b8680d2159ae433ca105f0be76ed065a182fca2476eff1cca382d1ed148ea26b3fd79b4a1242a9fb5d032e5cdd95e477
 EBUILD kdiff3-0.9.98.ebuild 1865 SHA256 040c9a043eccd3cfcf17dd272084adf794293a16dca428432b1aa612734f23a2 SHA512 06124da74e5fed36f6f2394add6062ac284587b3cb2ada59cd4db70c592f66634797e95c111c713395827d2566fbec8135f6f23d41a627cfd9527ae09c644f28 WHIRLPOOL 80cb0afab335818e02148109193843101ece2de9d5c94f64ac039f4c63739ccb7d724232860607e245f872f49827ed479b834feb788676ba657968ac315d3a9d
-MISC ChangeLog 11724 SHA256 cfe79ef44435d50eb11b3ea9394621a2d2cf6ca02b305a07d4026b7da86dbc19 SHA512 065fd0a06fd0764916838074b6d5db9a1829904defb068f6862d5ef021fc64f80c1e612ecb41049aeff3601ed72badebef797f5f07dda607ce3401d165620792 WHIRLPOOL 6ab60f1a26ed0c75903b884388a1227bed3eb51f5ea3afb6538851521c689803130c0a68256eddfb15ff7cd8e38c23b9afb5152a87e4dbc94d191b8bf6046325
+MISC ChangeLog 11880 SHA256 4eb38b54e8514d8450b9693e663d79d01071a387eba9a6823c5006c4a39464fa SHA512 dcf9a7d961d5c1c5ec7f00b7fc2716e8f92c60eda0e5af4d1b524609217ecbed44e2d50dba9a7857d39dde8e90223328d67511e7ddfd67f240f93ef103aab4d2 WHIRLPOOL c0fe501932c4d89e65fadcbe9f7debfb8a91d19823ddbea78237289ba2b1839e58bf7b70ec8019325f6f7eb1a28f3a1fd365af13d4c43b8cb06c6991e3b1864c
 MISC metadata.xml 256 SHA256 53ee238b560db384f60c055e935009dc11608a62ad34f0aab2657ece46d75839 SHA512 9fde5d60815147e6baff866eec6908cad7a6b1eda5b93daaae21b2aaa8db5e7257276476d46d7bf1164d44afe81cf9c6d20526b2a0b2d2cf65596f550d026c2b WHIRLPOOL 2cd0b5ee996efd9f0d19e77361e7fd354e698aec9547280cdc7ec6e5a2904dfa9e983cddb75b23bac157bed152b331da0dce42908e61d441ef94829b70317a61
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlPknPQACgkQFYEBGcdFJfKodgEAiP5mHLQcwhYYhDGmqLBXfoow
-U/FN+762EObRibW2mgYBAKuiaNYqD3owvvo/qK0d3girlgLV0ahdzaMdTFjWarHZ
-=8Xs5
+iQJ8BAEBCABmBQJVCaplXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREMzFDRDFGNEQwRTAyNjc2QzRDNjRFQzAw
+MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/i6YQAI8bC2nuGuGJVv51Fb8YIm93
+kYcw4K6xiwEU9DyV2Bt26y5ZX5dUc/aLp9WvRdcbn8pdbdtTLPC0bfmXaID9VriO
+zHeefi9M9OhaSBKjpSL3PgaUUGQmKGh4xdjfSWgf+LYFF8cjIhg0wjVFV70WcaXW
+aKmUxtOFlKL/w8A4ZvVvd/cwKSbzjYSoMF6IOOv4eWkaOrsZ9fdAOudPGNzslK01
+BHzHVfDpITdFpJhSW44eLhjZNFEfYjrjHkiO+HB+o6cxjWcDjSSfy39tuhC4rSQy
+nqfd8iY3TMLE2CN6DfhLutW4LNcrOYQXSRNCqK+aDZl0GC6sxIfkfb2WdpGdZ98f
+VGeQADEM1/AkgwXv0CKaBkV8nr+qdZbtATpQKlZ0aMIU30jAswtEHNpW2ORW7iNy
+fbv0Ox52VAiSgvUGCmG5TEey4AynqADGMUg5SDKMPvmXioo8iTYcR2abHCwCa7V4
+qyxtDVlVFP8EGlzHzM0qIP2igrGfysIWjAWfp+HNXYAPqKl215Yfd/+tkgVSyK/p
+V9SGk/+0Ql0DX3QXQ57Qlu0lKM2TBclfzIDo+NTeKiKkY1zvXgTBqEWo+eLZSVwj
+K8mE96rNOc+xQmsQP7f1Lz0mOLVXWq767tKV4qq/GEYOzKavRS9L/AcaC0FxPAEf
+Zx56MSmy6IRhHbcL3jav
+=k19J
 -----END PGP SIGNATURE-----
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
+}