Add patch from upstream to fix build with GCC 4.7, wrt bug #422583. Migrate to EAPI 4. Correct deps.

(Portage version: 2.1.10.65/cvs/Linux x86_64)

3 files changed, 66 insertions, 1 deletions

diff --git a/dev-vcs/kdesvn/ChangeLog b/dev-vcs/kdesvn/ChangeLog
index e575fb0a1132..d56dbc39fc5a 100644
--- a/dev-vcs/kdesvn/ChangeLog
+++ b/dev-vcs/kdesvn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/kdesvn
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/kdesvn/ChangeLog,v 1.22 2012/06/07 22:11:40 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/kdesvn/ChangeLog,v 1.23 2012/06/22 11:33:10 kensington Exp $
+
+*kdesvn-1.5.5-r2 (22 Jun 2012)
+
+  22 Jun 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/kdesvn-1.5.5-gcc-4.7.patch, +kdesvn-1.5.5-r2.ebuild:
+  Add patch from upstream to fix build with GCC 4.7, wrt bug #422583. Migrate to
+  EAPI 4. Correct deps.
 
   07 Jun 2012; Zac Medico <zmedico@gentoo.org> kdesvn-1.5.5-r1.ebuild:
   inherit flag-o-matic for append-cppflags
diff --git a/dev-vcs/kdesvn/files/kdesvn-1.5.5-gcc-4.7.patch b/dev-vcs/kdesvn/files/kdesvn-1.5.5-gcc-4.7.patch
new file mode 100644
index 000000000000..cb2cd294dbe6
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-1.5.5-gcc-4.7.patch
@@ -0,0 +1,10 @@
+--- src/svnfrontend/maintreewidget.cpp
++++ src/svnfrontend/maintreewidget.cpp
+@@ -55,6 +55,7 @@
+ #include <kio/copyjob.h>
+ #include <kfiledialog.h>
+ #include <knotification.h>
++#include <unistd.h>
+ 
+ #include <QSortFilterProxyModel>
+ #include <QEvent>
diff --git a/dev-vcs/kdesvn/kdesvn-1.5.5-r2.ebuild b/dev-vcs/kdesvn/kdesvn-1.5.5-r2.ebuild
new file mode 100644
index 000000000000..b4ef205da4d4
--- /dev/null
+++ b/dev-vcs/kdesvn/kdesvn-1.5.5-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/kdesvn/kdesvn-1.5.5-r2.ebuild,v 1.1 2012/06/22 11:33:10 kensington Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_LINGUAS="de es fr ja lt pt_BR ro"
+KDE_LINGUAS_LIVE_OVERRIDE="true"
+inherit flag-o-matic kde4-base
+
+DESCRIPTION="KDESvn is a frontend to the subversion vcs."
+HOMEPAGE="http://kdesvn.alwins-world.de/"
+if [[ ${PV} = 9999* ]]; then
+	ESVN_REPO_URI="http://www.alwins-world.de/repos/kdesvn/trunk/"
+	ESVN_PROJECT="kdesvn"
+else
+	SRC_URI="http://kdesvn.alwins-world.de/downloads/${P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug"
+
+DEPEND="
+	dev-libs/apr:1
+	dev-libs/apr-util:1
+	>=dev-vcs/subversion-1.4
+	sys-devel/gettext
+	x11-libs/qt-sql:4[sqlite]
+"
+RDEPEND="${DEPEND}"
+
+add_blocker "kdesdk-kioslaves[subversion(+)]"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc-4.7.patch"
+	"${FILESDIR}/${P}-qt48.patch"
+)
+
+src_configure() {
+	append-cppflags -DQT_THREAD_SUPPORT
+
+	[[ ${PV} = 9999* ]] && mycmakeargs=(-DDAILY_BUILD=ON)
+
+	kde4-base_src_configure
+}