Version bump

(Portage version: 2.1.10.14/cvs/Linux x86_64)

2 files changed, 97 insertions, 1 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/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
+}