Version bump

Package-Manager: portage-2.1.10.14/cvs/Linux x86_64

3 files changed, 114 insertions, 6 deletions

diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index 244e121cf432..7ec522d2b673 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/kdiff3
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.48 2011/05/04 11:07:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.49 2011/09/08 23:11:09 dilfridge Exp $
+
+*kdiff3-0.9.96 (08 Sep 2011)
+
+  08 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> +kdiff3-0.9.96.ebuild:
+  Version bump
 
   04 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   -files/kdiff3-0.9.95-desktop-entry.patch:
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index fc836bb0767d..7b3a41087129 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 DIST kdiff3-0.9.95.tar.gz 1508467 RMD160 7fc03495f581c9089f6914499c7237b49f053d98 SHA1 1fb27e8b42463ea23ad0169e20819352c1c476b7 SHA256 0372cebc8957f256a98501a4ac3c3634c7ecffb486ece7e7819c90d876202f0f
+DIST kdiff3-0.9.96.tar.gz 1796595 RMD160 c0cfd2e7e30f58c9d6d058c2d8168ef97f1a33b7 SHA1 d7efdacdfd7ea3c7ec9f7dee32aba5962c1709a5 SHA256 10e74ec47d57ccae13f71f836fd5bab85db46a40762398ca3a515b552e75d691
 EBUILD kdiff3-0.9.95-r1.ebuild 1916 RMD160 b698780462689b300269608defa3ac3bbc1849a7 SHA1 66d041c4cb53dffd099a0f9af9d64c5fee952585 SHA256 0948aba8aeb55eadff166dca68078baa1c526b661a1296406958dd08551b49c0
-MISC ChangeLog 8633 RMD160 0bfe4d4e488667a778cb8b2146a5c58c6bce4cb9 SHA1 f485ce23cce99665c5cc54205735da2a78b5c9a6 SHA256 35be845a38f6dce1a73ef6ba10e2077b2ceb3dd43ba75563aef9336b7084c03c
+EBUILD kdiff3-0.9.96.ebuild 1950 RMD160 95921983ad28399fac3fadc6a1eb544a04c8286b SHA1 9b8d88f60dedfcae8e18bce4bebf5db821b6774b SHA256 dee7f35faafc98845e6aec5648e4386c5eaac2fc530ce1f7eaf6fa9a44bd1e36
+MISC ChangeLog 8759 RMD160 e64fa6fd939e0142b66c73da660484cc89564f11 SHA1 59c34ad8f6f6f02d6eff21fb797ea86323731060 SHA256 fc666811082d244a20c0b5bdd1d8d70d7f14e768c772351a699ef63ae2f816b6
 MISC metadata.xml 337 RMD160 987f2ea930df64c8621ce9e9ad2bc3e4b493f87c SHA1 05eb9bceea062c2393a1b12adca0df1cfb3b2c5e SHA256 efb6060c548053f718e7d63581e8a2637b5b5d6ee7f386e628c34292a40f180b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3BM3QACgkQHB6c3gNBRYc66wCfeK9XjR7radcUz/C8f0tw7EYZ
-p6QAn3EDJvhHSnSkvgK0bbmgb1ulr+2S
-=3lfh
+iQIcBAEBCgAGBQJOaUujAAoJENwGBM22xffe9QsP/ibOXAVMv43EFAktccsUCZ35
+ErUr1dAZdw+SPp5a5nDQ+yCaxxY8Lk1a11km2OftDFQEua56LGDMhZE41jlo0kS4
+vLtLqCt9RumMTLnf3cm0hD/TDIZpTyiOvkw6vtGSK2zbJQKCYAvXSHkQiaq2RGkp
+1T1+wZ+6YVbz580c+kQN4Gw4sjzOG8euGDAjYfp+xxGAIDBew38zBKGIX9z96SUq
+7E1Yv6GH9jbnS0+3qvJfVPlhciy8ocz8y6X6l8Wnmf2g1MdQ6Z6G/IO5CnpWUU14
+/Lw1EmquvQdnTPZrMiymhz6mnNQkQiAoj2k+1tpMN6YQ9pFU86poAo46jEZkQbo4
+Y46/MpLd8Yj50HuIkbtI0rXmgdKCqIh/+3QjLVKZBGvN7Pa7urQQhjTrZmTDDs3A
+OCKdSCvVj46zxl59T0E7Dgjxmd6zuUty7AW2ThBQm+QOJtyzHaSRP9l6J4Wvyplg
+4YL+zn9G7cjbF/VLA9n/V4hBGeh5WKwdG+QziyfGpIYDfRRdpZfIZZ1ocDXqcOYS
+ZrJC6zalFuY85ty9lJhBx9LDFQexlEUuPlDCF4rMsEtK3DBiW8A0i8iJCqLa3CyD
+DyJ31m6n+gEWftckjh0z4BFmahp7J8xIYgRL0v/oJwYJgeflPH0Vzx+USa0ZDBF6
+vPKK5D8W9L/n+6B5pOL8
+=l3d9
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kdiff3/kdiff3-0.9.96.ebuild b/kde-misc/kdiff3/kdiff3-0.9.96.ebuild
new file mode 100644
index 000000000000..678b5f269003
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-0.9.96.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild,v 1.1 2011/09/08 23:11:09 dilfridge Exp $
+
+EAPI=4
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.4.0"
+
+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"
+	KDE_HANDBOOK="optional"
+fi
+
+inherit kde4-base qt4-r2
+
+DESCRIPTION="Qt/KDE based frontend to diff3"
+HOMEPAGE="http://kdiff3.sourceforge.net/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+SLOT="4"
+IUSE="debug kde"
+
+DEPEND="
+	>=x11-libs/qt-core-${QT_MINIMAL}
+	>=x11-libs/qt-gui-${QT_MINIMAL}
+	kde? ( $(add_kdebase_dep kdelibs) )
+"
+RDEPEND="${DEPEND}
+	sys-apps/diffutils
+"
+
+RESTRICT="!kde? ( test )"
+
+src_unpack(){
+	if [[ ${PV} == *9999* ]]; then
+		ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3"
+		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\ =\ /usr/share/doc/${PF}, \
+			-e s,target.path.*$,target.path\ =\ /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
+}