Version bump.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux i686

3 files changed, 107 insertions, 9 deletions

diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index 62948d51e0e9..842ba9bf896a 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/kdiff3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.57 2012/07/26 17:03:43 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.58 2012/08/15 11:03:41 johu Exp $
+
+*kdiff3-0.9.97 (15 Aug 2012)
+
+  15 Aug 2012; Johannes Huber <johu@gentoo.org> +kdiff3-0.9.97.ebuild:
+  Version bump.
 
   26 Jul 2012; Johannes Huber <johu@gentoo.org> kdiff3-0.9.96.ebuild:
   Add missing slot dependencies on Qt.
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 29b578ca294a..20d1d45c81e2 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA256
 
 DIST kdiff3-0.9.96.tar.gz 1796595 SHA256 10e74ec47d57ccae13f71f836fd5bab85db46a40762398ca3a515b552e75d691 SHA512 1245363ee533486fc385bdff7882b3859ce77101e588867278e3facd6b1bf13ed614c4cfa6997bd6fc59660a3433d8fa7a8e61ab72c93c26f96fab3a485a0955 WHIRLPOOL d95db55f5dbc98c201e63ed4bb10df0be3c58b94457b2c5be60d2650f8ee2e3ab2eb517f291a6a10f35956f3be90ed9b1a0212af343f7be8f8372f41b8d5d744
+DIST kdiff3-0.9.97.tar.gz 1803769 SHA256 e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a SHA512 8f4e89e594894a3fbfaa2e5c9cc345ab16e6787c4efc4324fffe55fbe45b94c2ff10ba411279d2b433a0a5fa752653f7b3e663577cc0d658dfc4d5b797a22fab WHIRLPOOL 190590f3c4290afee73672a77ec4f16a923d156f097bcbb4dce1893f57b1199d1f7ed19166a8173292a7bedda5e54f792474f169a50ed8eb47a92b24f7b1c57c
 EBUILD kdiff3-0.9.96.ebuild 1931 SHA256 c0a7b53c832da8b0b383dd52c57d121fcff6a685a5278f3776b8059e9912d9b6 SHA512 a63f9e15d62dbd45416b2a57f8c7bc795f634252fded83a9187f982302035f9bdc98e84885965f163a242fc77056ea1a9fd4458ee10ce0e06c7194a444069a3f WHIRLPOOL 61ec904b61fc57cdaf43edb5db0681cee1c9b760c7be1856622801423e2882f11c8c7092a2a00a0c0b82921f5acd79df4a46402406546db8326d77423516435a
-MISC ChangeLog 9599 SHA256 c758de3ff26ddda379f94bb8706bf11976672836984796a9bb4ce87069f414ea SHA512 0993ee349524773526e7424d58c14a5560a3d19de562b99ac4d7266307dd42b4f5847f0c68f26900c8ed586e99c3ac5301e2ca50d470d84b895997e9f5d8c4fe WHIRLPOOL 1db47b19f00581aeb617a8abcb61799c8f5c20ffa7907f237bcb3a05f9222bb23cfe5116df8d3c9e9bf08c2dfe2ef6af7931b5744048d119a8cfb0c0bd4794e2
+EBUILD kdiff3-0.9.97.ebuild 1899 SHA256 cd90654cc7189dabfea4d80bc53f9d7fdd7790af2d6f6428978734a8555f9eb2 SHA512 59cf1b1209e5d6c7d81596b5253a93ed58cfb54c9561198c221f0ef11fe27959387c4949a942aa12b15807fe73ba0e91284b5ded29e919cec28c5bba185b89e6 WHIRLPOOL 0e5ea44f4f2c4bd147a034a9e1dc2f24d7f49072e7df00a6a208caada8290bc2f0e42bf7d98b23a380514848ef7ce806c743e057ad633ce5811f1e6e0b28cffa
+MISC ChangeLog 9717 SHA256 99a0b5107ad164e92fd9f00cd121a279f605ca9364a494c80bf2627a3fe244d1 SHA512 60773b374b558e53521c4137c9db620dac94f5306ab502b9d420a5900312c4877248c9c60afc85bc39a16ae74a3f2cdcd48e49ece85760adea9014b54d8d012a WHIRLPOOL b5e1604c6e0a383d4f69d218d7a69c0c7cf7a39b6d968558d78c00a2fbe5a35a5ef4da9c916d99c443930862c86a558629385046a7c8a96d9b6a479cadf6122c
 MISC metadata.xml 256 SHA256 53ee238b560db384f60c055e935009dc11608a62ad34f0aab2657ece46d75839 SHA512 9fde5d60815147e6baff866eec6908cad7a6b1eda5b93daaae21b2aaa8db5e7257276476d46d7bf1164d44afe81cf9c6d20526b2a0b2d2cf65596f550d026c2b WHIRLPOOL 2cd0b5ee996efd9f0d19e77361e7fd354e698aec9547280cdc7ec6e5a2904dfa9e983cddb75b23bac157bed152b331da0dce42908e61d441ef94829b70317a61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQEXhuAAoJEO+t9ga+3I3agpoH/1yBR2RQCvscK23eiZnttPzH
-ePAJX65gOqCgoLAW7py24elrRiIcwQoEbJe6H+oemQyBmckVVyMQyjQ0slLNRkQ7
-2b+mnn2llOJ1Ora2VIqmnG+24onNiIHLT3IYcp7iB2tg8hKCrxEknAJf4sJkZWwx
-NHmzZoBktnUyljoMgZUXsFR70GDRYERB+bxG3F/ZenuA6HFU4L0aU1o//W/pdbkl
-BGBA3ZjZlxO/9p+f+LjvQNGO3BbhnPtemgHNTJjUcbTa4DKF5shPFjwhsMmETYQ9
-SDTL3wf1GvLor4QBtG4cykuaSC9KQ1IJV21fRL9TxaFPWAdFu1nYHmYn9yptOeI=
-=kn0T
+iQEcBAEBCAAGBQJQK4NSAAoJEO+t9ga+3I3a4rsIAJ6VM4O2wtc8QYA36NDgz+xJ
+/FbYyYe9RSyJvBODahkWDsRFnZ8X+tKcXNrY4ezA/bALZ8v1xkZLSBb3e8x9a5aa
+thC8tax73IOtzFMt/4p5HV9C9Zsjw0/QYHpBSdI0u2DxUIJUq173eJCh99IJjLe1
+QxpqnowWIiBki4Za+tKfmCpeyd12on43pynPc0LBMGtkdlD12LCz9LO6ogvnkOz7
+RFKTf+aqWBMLyA85vf1TYVXp/mX0xmZ6mSfBLcik4On03f/E5uDHZLSn9VPqgr+f
+IZgY0NpV+rQiHd2A0l8totFqn+NZrf82bjK+jMPp20FaqjMl2vstJ5sgee3Uk7s=
+=v28a
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kdiff3/kdiff3-0.9.97.ebuild b/kde-misc/kdiff3/kdiff3-0.9.97.ebuild
new file mode 100644
index 000000000000..d6ad36576b94
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-0.9.97.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2012 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.ebuild,v 1.1 2012/08/15 11:03:41 johu Exp $
+
+EAPI=4
+
+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 ~ppc64 ~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="
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	kde? ( $(add_kdebase_dep kdelibs) )
+"
+RDEPEND="${DEPEND}
+	sys-apps/diffutils
+"
+
+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
+
+	echo "Categories=Qt;KDE;Development;" >> "${S}"/src-QT4/kdiff3.desktop
+}
+
+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
+}