Revision bump to EAPI 5.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

3 files changed, 116 insertions, 19 deletions

diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index 2c717fd4fccf..27b7851a41d4 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/kdiff3
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.69 2013/03/02 21:29:51 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.70 2014/03/20 22:08:32 johu Exp $
+
+*kdiff3-0.9.97-r2 (20 Mar 2014)
+
+  20 Mar 2014; Johannes Huber <johu@gentoo.org> +kdiff3-0.9.97-r2.ebuild:
+  Revision bump to EAPI 5.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> kdiff3-0.9.97-r1.ebuild:
   Move Qt dependencies to the new category
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 607f5ea8ba66..4c1202bc2805 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -4,24 +4,23 @@ Hash: SHA256
 AUX kdiff3-0.9.97-relativepath.patch 2542 SHA256 affa8b351b96109748a1909d83d89e32c9ff51308f7cce438c314486793035e7 SHA512 dfff58aa2bd277eb771fbfd09270532a03ec9d534d28b199499b626ea6467aba3bd116dd5a74e0709f7c24a98cc4a2c2ab807a4762b1a547af706ce01961e19b WHIRLPOOL fe4fcd896df8d9a64e24bbe1aad73aa6a79d241dba8327b07d2781cf17f63029b170645537523d846e81383d31967b709a2b1992252146cdbee03f794d518eba
 DIST kdiff3-0.9.97.tar.gz 1803769 SHA256 e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a SHA512 8f4e89e594894a3fbfaa2e5c9cc345ab16e6787c4efc4324fffe55fbe45b94c2ff10ba411279d2b433a0a5fa752653f7b3e663577cc0d658dfc4d5b797a22fab WHIRLPOOL 190590f3c4290afee73672a77ec4f16a923d156f097bcbb4dce1893f57b1199d1f7ed19166a8173292a7bedda5e54f792474f169a50ed8eb47a92b24f7b1c57c
 EBUILD kdiff3-0.9.97-r1.ebuild 1878 SHA256 bfa1d311a8d14043178b160f6111bd8edfceeff45659488c26c777336106a21c SHA512 ee21d7c239a6631650d7a3cc8ea232b0a8407f9341320db174ce7e191c175072cc326fc8080f9ffb1b233e14a705c482684e051552b869db3ad969620b1af1f4 WHIRLPOOL e550e58a82f2e35ff5b913e9426015f4656ecf5857431aa3b71654e9aa7f6a265800b1403abc689ba541fe3f7aa0b20c97bbb815476c235f855368fb9141a950
-MISC ChangeLog 11058 SHA256 9baa0eab83529145315c188caea5c7a7890ed5dab51d50742f4321f971efa9b5 SHA512 e774b0f6b4b61fa37679d066e789fba73d80bcc19b59f409d8fecf7448acf36d20bccfb148b71525b4a3de26ef3df0858b2ba334e6286f12f993499d3c2663fe WHIRLPOOL a06838608e6e3ae69cf3f44178e90cad0fa083f886aee6fc5deb4c660ed184d08509311cd4db0e070179c8cf27543731d4471319e62d3e622ad05ce3fa78783c
+EBUILD kdiff3-0.9.97-r2.ebuild 1876 SHA256 3266467294dcdf19e2b360417f350a632b68ba17872866bbb6b08d33d302b4c9 SHA512 040e4eeadcdd8df49d5fb4032e2eb45137d9c96d8d9a806ed4086ecf494c425e3a0f1ea90572ba97cf57a4e4d47e7c32339e1051112b71682e1ddf92bbd43bb8 WHIRLPOOL 2f3e161e4c5a2b68228036ad78548d6b2cc981e18a47a732040df065bf4bdaa52c6a834ff2a51246ca6697bbec842ecdae2f77ac7e6177208368a9204c7684fa
+MISC ChangeLog 11189 SHA256 bc6658bec1d3889fe950922be363e63bf97ed413f10a73ebe41d92860f2c3394 SHA512 d50c0c9a30ed4e6d44758f7bbcb1a3755b1edcd1930506a2ace9c6b34434d779c5f73d445b75cfd0dc4e181a83aa15598520a39f1d014b583ac9387396dfccf6 WHIRLPOOL 006b4c31fb566240ea46b94bcb03746dd1f8a71419b7d092c671dffbfeae4f875b9dbf422df1ccb458e7bee93942bf2934d5fa16fff647630d5e7166fd925597
 MISC metadata.xml 256 SHA256 53ee238b560db384f60c055e935009dc11608a62ad34f0aab2657ece46d75839 SHA512 9fde5d60815147e6baff866eec6908cad7a6b1eda5b93daaae21b2aaa8db5e7257276476d46d7bf1164d44afe81cf9c6d20526b2a0b2d2cf65596f550d026c2b WHIRLPOOL 2cd0b5ee996efd9f0d19e77361e7fd354e698aec9547280cdc7ec6e5a2904dfa9e983cddb75b23bac157bed152b331da0dce42908e61d441ef94829b70317a61
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMm9OXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88T0EQANDEE5n8qVM8wV5lLttjE5bG
-OjNvyM9ndObDuyrYay4mzj0yWGWZwY5K6lH/09kpKHxHs/8oYDwAGT2hFAJhQ5YD
-vPERniA8YxZqtNIYH2GRlBRJ1gnLDLB47Z4SuX0yWJPRUGTxvzjpVubW9GGhCum/
-q+pDgauJvDVGdaBjpWvn7dgb5ZU8CfL1NhTQYqcSzzGRvEhs/3jwOl2urwSzDZO6
-YWIbKDF0LK3FUPdk8agPgJ0GDO4gdSYSJr0U8LIlWg5aom6VBsyKx9K8e3F9Nu/j
-QK4muegOfDnQWiIci6hez21N/6viM8m6I+NC08EuhlR/3z/NcowoFvKUoheKNJt9
-qieSLEzu0XyE5EvX+A+sPqaCKSWfJG9sTvqJJbx8MR8VkgGYDh/lSS+ww31avMQ3
-Q+Wr8g1lENHavnjODG/qEY/vVJ2H2OEu0lNSNc5HwgbGFzPoa/60SODCxj/0I1xv
-2nB6DAiW997qpc8xAPRQRAxq4M1//maZnHzLL+H4jAFkpj5BgJlYrTJHQF0Gj+Pe
-+88PGY/WY1SFg4UuTWxSkl++iU2UE1TgSYg23oJuLSeUPdH9q89RVeYUR8VxsMpE
-vdF5Sx47cipaKrOu9Z2rH33fxynOh3wyJeQb2l7IlKiojrTETBVR2GtS19n+cnY8
-WkKS5Se+g9sWUVWDWjMu
-=zfsj
+iQIcBAEBCAAGBQJTK2bhAAoJEGVpnaTzz9K9etoQALtbmx3KNRJtSzEJnfiBHxnf
+5DgVtAb6MxVcwJekOMg5gWGVHfgZSmckdVPp36bKCkSaB5XWCHPEb3NUj6pL+yRG
+ogu/NVcx7kqHo9m3NPGpWV14JC1dq20ZUG3pa3KaebDqMn8Loi0PoSK9ih3Ahlvr
+xiDUCNRboBqx1ANFaQIVDi0LPFFk0//uAOiCVXsU1zdmKicZsWV7VFvNgMNNSsef
+q25luRRAA9LUR/3I4ImfVwfNezafRZ0W7Y9mvmfqzseC2+1qhbYdU8zHOHTuVffl
+utrpgBZAxR9X7bye4Gjpp1C+SBdXwZi93sktFtoP1auk1WWtRc5x3x9MxAh/3w1N
+Y7EnjNqM/vgYxGcyiXJjTruOAHQtX4dzJD2vNZMuh07DDQQNceWpstYBHjcL03/6
+KbMP1D14K2hgjYW7zw63oaFubj0QArltHDhDTNuxa1f6LZOJznk/K59V7jql6aWp
+eBEJ86uuroe6ObA3I4Jr3I/1KWbuyXmRzOlUB9wOftQgkNRQggOClHuqVwWjK9XA
+NDGyamxrVfCDwDT5/OmFhczW5P6EWIPyg3zoMfDwT/+b13IxV5Fck3Xk7F73ivNl
+jbSBNCwKDmVC2oBnKvC6blNo4OpF3KUURbr/uaFb6VQZyqs+2KJ+Kd25KqNTk8xJ
+Lwq65/P/9rCPEMBat7OX
+=DshB
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild b/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
new file mode 100644
index 000000000000..09e05ef59848
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild,v 1.1 2014/03/20 22:08:31 johu 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
+	ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3"
+	KEYWORDS=""
+fi
+
+KDE_REQUIRED="optional"
+inherit kde4-base qt4-r2
+
+DESCRIPTION="Qt/KDE based frontend to diff3"
+HOMEPAGE="http://kdiff3.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="debug kde"
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	kde? ( $(add_kdebase_dep kdelibs) )
+"
+RDEPEND="${DEPEND}
+	sys-apps/diffutils
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.97-relativepath.patch"
+)
+
+RESTRICT="!kde? ( test )"
+
+src_unpack(){
+	if [[ ${PV} == *9999* ]]; then
+		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\ =\ "${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
+	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
+}
+
+src_install() {
+	if use kde; then
+		kde4-base_src_install
+	else
+		qt4-r2_src_install
+	fi
+}
+
+src_test() {
+	if use kde; then
+		kde4-base_src_test
+	fi
+}