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

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

4 files changed, 76 insertions, 5 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/Manifest b/dev-vcs/kdesvn/Manifest
index 1d7c1590e368..57529d56e952 100644
--- a/dev-vcs/kdesvn/Manifest
+++ b/dev-vcs/kdesvn/Manifest
@@ -1,15 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX kdesvn-1.5.5-gcc-4.7.patch 252 RMD160 0952201997cfa7589a676c18b64a56bfca8f2bbf SHA1 a5d27a222fde3bff56d3683512b0b55a8136d08e SHA256 f41b918683637cddef305fb8c4a1ef6dd51c044bd8da430e43762819ba1180d3
 AUX kdesvn-1.5.5-qt48.patch 439 RMD160 61ab28449b2dfdc6d3d95c7bfbc23a927f204f7b SHA1 cce992e049d7475bfd70e866ef3ae6caa3251ebe SHA256 94dae568c51a05d44e1fc7c56e2b0fb0af0eee2a1cc49620a20e10f05b3ba00f
 DIST kdesvn-1.5.5.tar.bz2 1746344 RMD160 916d0c6509e68c27dd60c1fc64ef2f8ad4934c72 SHA1 eb9bd624e387b07c215cb4247ec0133399d64604 SHA256 67fee0374c9e3ac0514d2ef2b0fdd0b072dca173f1eeae2742cd37022e194b0b
 EBUILD kdesvn-1.5.5-r1.ebuild 1038 RMD160 e77befe0d4ec42e28d9c8063e102d7fcac3280d5 SHA1 044ab1db3ddd5a4a3b2275240b275922ba6d75e2 SHA256 016bf4197dafdb611880848c3cfbf3b14979ad2e40792f221a84c766c3a23759
-MISC ChangeLog 15113 RMD160 e3c7d5dd8c1343bbd1654fa7d93431e316e358c1 SHA1 ff65aa0ffe5ccf48a81d3f82a5a967f8f8d6e074 SHA256 6e8904a7deb16d73fcec01cb597f16acbd7286b81e7328b89ef1919adf935ced
+EBUILD kdesvn-1.5.5-r2.ebuild 1115 RMD160 86c4abab4040825081dfda910f754cb9e103418d SHA1 12cae83e167ed94ba9386949b2b1f679d19401b4 SHA256 2548e2f0d4502f50526d52bc5617e1c0dcdefd6e42a5ccc0a16180e73d1aeb8a
+MISC ChangeLog 15372 RMD160 fbc131d04a7c0800b7ba54669e8746e273058280 SHA1 e7d7c18c06a6c02f6be653520a71bc9748692c59 SHA256 1d10a1aa2d41fd5caa3530c08bd341eaa781db9edbb047dc67e14353ea39aa42
 MISC metadata.xml 278 RMD160 d5cbffad72f423ea293d1087de275b64401ff3b0 SHA1 524a08b06317bc7693d29b839dd10c757f41ccdf SHA256 40fc319a0a33f1bb62b01b9b7b170f779aac27d9ec4e8909cc5c14ae4aa7e63b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/RJyIACgkQ/ejvha5XGaPAFACgq4p14OM3nzlxu1S/cGnEZQ8o
-kmIAoIQtHqacK/40oeT9d2W6mKfQbPbg
-=0qAM
+iQEcBAEBAgAGBQJP5FgAAAoJEMbwO6tnXQ0sd3oH/09qTnbc68YPQrQgFM8Oz1Ma
+cCZsiefQNxSj8Pb871fQMIGOK3CYShgthbp67pK+B38Bh+E8NmEGHPQQxBTWUcca
+Ci2ymkuXyb2uKRErJpFtNnLQr2QJjlvpYl8GRH3L9+5NeZjGDjcFE8N33Hj+rlCG
+FiDIy2m4iSPfwnuUUdNF3VgYu92v3g6IhvfgYxCwuVANlb62z/TysFVWizILUk1F
+FxiavZ2mpvxc/RoFIjESvRs4rleDFuw1KfbJ78JEgy6GRsCyICCTE/aipAbEmFN7
+pEktvltDPOLIiBnBHYx/S3qleBJ5BGZwUevbnwjB50NwOYl+8S53S5LTvBbypjE=
+=wKsI
 -----END PGP SIGNATURE-----
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
+}