Version bump, bug #519162.

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

3 files changed, 117 insertions, 16 deletions

diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index 8922d932c9d3..82fcdd937b9c 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,11 @@
 # 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.72 2014/04/25 16:58:23 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.73 2014/08/06 16:56:52 johu Exp $
+
+*kdiff3-0.9.98 (06 Aug 2014)
+
+  06 Aug 2014; Johannes Huber <johu@gentoo.org> +kdiff3-0.9.98.ebuild:
+  Version bump, bug #519162.
 
   25 Apr 2014; Johannes Huber <johu@gentoo.org> kdiff3-0.9.97-r2.ebuild:
   DEPEND on sys-devel/gettext by Nikoli <nikoli@gmx.us>, bug #508702.
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 77c016bb2d5c..dc71396052ee 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -3,23 +3,25 @@ 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
+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
-MISC ChangeLog 11467 SHA256 1da5dc9dcf0dc5b5555b765e74274d092392df8d254079655935de3fb39bf2dd SHA512 922117a4412ea08efeaea0d93223368d2473819a84c996e2b5734a67c57cbc54a0bbae122c07f4696aef4eef785d5aeec8a57804a9e3ccdb3a3321a91ddc5cd3 WHIRLPOOL e6cd71603eaf0878eda220d05127d180c461b630783798225f33cc07967e591bac2190d55ea26acda9dda73f18a51c99ce3dc900af738a468b08e06248ec110d
+EBUILD kdiff3-0.9.98.ebuild 1863 SHA256 bf81e99cf66f09a15dd830d2dd0d7a2b2912383405429fa43b739ff7a5b614d6 SHA512 206d66901fa3e3a74aded62bbadc5ecb5db9373785d212ec881ad0cc44a4ef0e509343b2b709896ed4cabe82b99b4e49ac6c23b7a2aa9a57b9614c3bf4ea3752 WHIRLPOOL b414fccfe8a440762fdccdd52acf5d5a54294709554d3101385f36a1460553e96d17025eeb051a136219de1718e0c2d612a054343962d100a6afba05b9acdddc
+MISC ChangeLog 11598 SHA256 4de6f9abab49efd1ed0036ce61d03e008450fafc00252555fc70e59f9ebdb4f4 SHA512 06478bc18f1ea054f4b6655530282999615db3cb98d5aafd69b8cdd3ab8f4f95f2fea0221200ac7034819d88bafd8776286467df422d17367e04ddbd4f7b6d82 WHIRLPOOL 80b8dd6701dee4c1205e2e244864ca3d78308e68ce71ec5b639c3f91011bf0c59d6f7699b59f11f4673a1df58f9684a4d9dd5aa51e247b0f38f0a99a6ca8357c
 MISC metadata.xml 256 SHA256 53ee238b560db384f60c055e935009dc11608a62ad34f0aab2657ece46d75839 SHA512 9fde5d60815147e6baff866eec6908cad7a6b1eda5b93daaae21b2aaa8db5e7257276476d46d7bf1164d44afe81cf9c6d20526b2a0b2d2cf65596f550d026c2b WHIRLPOOL 2cd0b5ee996efd9f0d19e77361e7fd354e698aec9547280cdc7ec6e5a2904dfa9e983cddb75b23bac157bed152b331da0dce42908e61d441ef94829b70317a61
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTWpQzAAoJEGVpnaTzz9K9NvUP/0iDPVyKgu1iASYYM3jzBQSJ
-fRvSdHxIj9Yuvg80PILhN/nMr2PiYw2RZJ1ocnPoY33J3J7PskAjn/UHEHGAAU+N
-JZZ8sxzBFGxQvkJO7bhSX3aDa82Fr2nBf5bivua0KItTm2aagj62ATc/dnMSQdEL
-PhC2TIRyFBrHmZC0GLjkWDkGFNHBoR7b4jAz+sPhj9Xo/LDWpYyVJhU0rugpsm+7
-DfyUa8rSaXulEcl5DfThoQLCBVYsbuKTnLL9dQsKMf9UIXQlYRcbNI0TM2llqVdF
-6974gLg3gDQgDFZkMKmDPbGMR8TktDcqIKAydjfxvsVMEKe+g7CKXEal5Y4kWYBv
-fJBi/I1PKh3j24AtYjNnwvqvsWqbL3rlqRBmWChinXBSlgWgy9U8KRrI12MUPsEB
-nJQGitdw5hUhN8GSwVU3BtuJcUVL1EE+nKdwVqnbkC6491+hAL7ubxRKJ3gV01Vq
-6tkAdKwUf6vzF/y6ZDyomXkf6Te9fuJ1cmz43VC178msOaLbFHo8ejDcCgiiIKqY
-uI4yk69uSjr133eQokLGan48COymiMrfM3KJb9v9CychQoC03KlIv0EcdU8W6bdI
-nrGcKWVmEfxQ9XKaS+mp4L7Uer2VVY7YK0DvpNpUmRj0mVrkvB6KfphkCtJ9w9C9
-iOJQMt4DR0DExh7tfomW
-=yzvN
+iQIcBAEBCAAGBQJT4l5VAAoJEGVpnaTzz9K9s8IP/Av/i26DwVCxAUqfk4aSy01U
+B6zVy63GFGdiHAvXSWjGRLvS9fhqyT97tFcB8g8hOoKA4PVxvb2PO6BraKQlozLG
+x0OsV4h29rZWYKbQhzaeR8Ly+PcQaz/k4JQswFoJkEX0pYEZUonm17kOqlwht45z
+5Wvu1PWmKx68DO/7aF+FunC9sQ9C9A5l03iI7gCbaGVg6R+ZBgux1ewTnbdI13hb
+lO1p4glEMhKTMHHXA53//XdhfsFZLRokxiRrgD8EawrRQDQBIMkUg7AqOwPhZUMH
+6+tDR+eCst78VKJO1pr4XwAHlZHJBkr3iuC/mhIngrQl6Ej0iEmzMM6sYx6HsBwD
+kw6H0zvXHZoebsLmL+RjocjdCK3A4dV2sQI7yCMc+aJr7ZWuWE6kEPnXUGQlPHiF
+3qGJsriG+KueNRfG5NEvlEi/OIoJdlpp5DA9zE2ABpPw02WbxXJ6QQQRF879it/B
+a94JAQ725BvW4RJE+/DCsS7NPWsv1aWMswZI8KQ8pQxqvvuF73jwENloEveGcWjK
+Yk/Yu2Ky1YuMZ+RVelgWUXIqvQpKWm1SBhnDfCgsk+K8BZVAwhhyjgKM05gt804+
++FMOJXqDFuh7crcWEFSbu1OfE6bBd4utzo79RY3M02gPO/pBruO8yeSJIo7LT/2i
++h4pQmwsFM5uhM96XgVA
+=Dnuh
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kdiff3/kdiff3-0.9.98.ebuild b/kde-misc/kdiff3/kdiff3-0.9.98.ebuild
new file mode 100644
index 000000000000..29e8cde66f22
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-0.9.98.ebuild
@@ -0,0 +1,94 @@
+# 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.98.ebuild,v 1.1 2014/08/06 16:56:52 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
+	KEYWORDS=""
+fi
+
+KDE_REQUIRED="optional"
+inherit kde4-base qt4-r2
+
+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"
+
+CDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	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
+	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
+}