Revision bump adds upstream patch to fix build with gcc47 spotted by Michael (kensington) <gentoo@scribeofthenile.com> wrt bug #414135.

(Portage version: 2.2.0_alpha101/cvs/Linux i686)

3 files changed, 62 insertions, 1 deletions

diff --git a/kde-misc/krusader/ChangeLog b/kde-misc/krusader/ChangeLog
index 4c0e0d00c80a..0999f8b3f73d 100644
--- a/kde-misc/krusader/ChangeLog
+++ b/kde-misc/krusader/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-misc/krusader
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/ChangeLog,v 1.102 2012/03/12 13:34:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/ChangeLog,v 1.103 2012/05/02 20:16:36 johu Exp $
+
+*krusader-2.4.0_beta1-r1 (02 May 2012)
+
+  02 May 2012; Johannes Huber <johu@gentoo.org>
+  +files/krusader-2.4.0_beta1-gcc47.patch, +krusader-2.4.0_beta1-r1.ebuild:
+  Revision bump adds upstream patch to fix build with gcc47 spotted by Michael
+  (kensington) <gentoo@scribeofthenile.com> wrt bug #414135.
 
   12 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org>
   -krusader-2.3.0_beta1.ebuild, krusader-2.4.0_beta1.ebuild:
diff --git a/kde-misc/krusader/files/krusader-2.4.0_beta1-gcc47.patch b/kde-misc/krusader/files/krusader-2.4.0_beta1-gcc47.patch
new file mode 100644
index 000000000000..1ad24adf9d4c
--- /dev/null
+++ b/kde-misc/krusader/files/krusader-2.4.0_beta1-gcc47.patch
@@ -0,0 +1,20 @@
+--- a/krusader/UserAction/tstring.h
++++ b/krusader/UserAction/tstring.h
+@@ -125,7 +125,7 @@ TagString_t<T>& TagString_t<T>::operator
+     str += s.str;
+     const unsigned disp = length();
+     for (typename taglist::const_iterator it = s.tags.begin(), end = s.tags.end();it != end;++it) {
+-        tags.push_back(make_pair((*it).first + disp, (*it).second));
++        tags.push_back(std::make_pair((*it).first + disp, (*it).second));
+     }
+     return *this;
+ }
+@@ -134,7 +134,7 @@ template <class T>
+ void TagString_t<T>::insertTag(uint pos, const T& t)
+ {
+     assert(pos <= length());
+-    tags.push_back(make_pair(pos, t));
++    tags.push_back(std::make_pair(pos, t));
+ }
+ 
+ #endif
diff --git a/kde-misc/krusader/krusader-2.4.0_beta1-r1.ebuild b/kde-misc/krusader/krusader-2.4.0_beta1-r1.ebuild
new file mode 100644
index 000000000000..763af6b13f08
--- /dev/null
+++ b/kde-misc/krusader/krusader-2.4.0_beta1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/krusader-2.4.0_beta1-r1.ebuild,v 1.1 2012/05/02 20:16:36 johu Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fr ga gl hr hu it
+ja ko lt mai nb nds nl pl pt pt_BR ro ru sk sl sv tr ug uk zh_CN zh_TW"
+inherit kde4-base
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="An advanced twin-panel (commander-style) file-manager for KDE with many extras."
+HOMEPAGE="http://www.krusader.org/"
+SRC_URI="mirror://sourceforge/krusader/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+bookmarks debug"
+
+RDEPEND="
+	$(add_kdebase_dep libkonq)
+	sys-libs/zlib
+	bookmarks? ( $(add_kdebase_dep keditbookmarks) )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${P}-gcc47.patch" )