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

Package-Manager: portage-2.2.0_alpha101/cvs/Linux i686

4 files changed, 74 insertions, 17 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/Manifest b/kde-misc/krusader/Manifest
index 7539df397211..d420b4432d38 100644
--- a/kde-misc/krusader/Manifest
+++ b/kde-misc/krusader/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX krusader-2.4.0_beta1-gcc47.patch 688 RMD160 0bd4484fee02a1212bee92261d37f843f48c438b SHA1 2b5b21972963aec19d8d905054281417814cda7c SHA256 a25a73e3aaf02b000d0201f0f4263348b4a8becfceb2d0b9d71f45bea2b8c557
 DIST krusader-2.4.0-beta1.tar.bz2 3430913 RMD160 03b83cf56be0efeedaf32fcc05242965523b0973 SHA1 fd2975b9f8ec5b1a903090b2d60733cbefd2f942 SHA256 469e6ce593b2c54acca6009c55d001291df659d499db7edb0da48aff252335e0
+EBUILD krusader-2.4.0_beta1-r1.ebuild 933 RMD160 252b6cc1ed25b776c3b323661f0ad8a95ee68676 SHA1 8df9c9950c315a2c38c161e33a9cb1face4ca77a SHA256 5f521ebccf4f5a2ad48fab25f4788cd29793be08588e1296f9573f4d6db1d9dd
 EBUILD krusader-2.4.0_beta1.ebuild 889 RMD160 6c91abfdb67135931f6eeb3a84af8bdfc34a77d1 SHA1 6d2d663b4cfffb4b15c464d69e8c8781b18de852 SHA256 f6d3d913cdd40de61cdf6d22c66b4982c956f85afc0bf50b546cde0b1ec5d2eb
-MISC ChangeLog 8345 RMD160 bd9dc9f1163cc2e57a508b95e3f27c8ae27fad0c SHA1 3ae38fdac0dd1cf9e641e6a32b6bd61711972201 SHA256 d7414b799a43bd618474aade0b79d757285bfa5b9b7bb3f53bb23b47698cc60b
+MISC ChangeLog 8645 RMD160 e602b8b6a0ec2f9bc91a26529633c2fc839ba87b SHA1 9652420d34d3aa66a958755ad71dd03122c4326c SHA256 5db47e3e38701c50629d2c225d1447eb7d6cc7aa16ebca7a0e60f45a097e48fa
 MISC metadata.xml 240 RMD160 e2e17acce7cdee8f4572dd6767b3fec8949cd123 SHA1 b8b7b0283e625a212ebf11fb70f77dc2f8890b6a SHA256 3940acd26451de238b92c9602337472a3343be5d392bf7c3e72abddbf8b7ecd5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPXfuNAAoJEOSiRoyO7jvobQgQAKZgSmsF12ZPWlB4M4CZa3/x
-+nJ4G5wMHcCKbhCegj7BmcNdT/RHRAFU/MuCKf84SZTkbIqvaKJM5ikkQdVtHR1G
-1sM7nuVC9IJmryCcyXplo10XJvzNIIiIURTEkAeHa0x4DVi+78NEuqoXAypEoloP
-8Trc2mYAC3izQhu2ORk8HiF/YhEyIxJgecqerobeQpmRYsnFnWRd+JEhwUUQSKOl
-0oaQwJ9XLpfks6gvQieAKwk9Hz4BYsxWm0HUOT0TxPaRYB1ijt2faArUVvFNOu+O
-wSd09XczZHE0EGb6OJVJg+//MO+UkVNOBkh7uaPmiqkC7MwXI8qYOT6bzMvkysaV
-qu/jf1OF+5zARTX5ZghB3hX4qLTI8OKsgM6oIOhRiRXwz+vNbsdo8VYY1Kcu6wxz
-xmV9ruZAU4WDyRZV3fH8gomfbg1Fuib2CGhSXUxwbCRffKCBJdSYcyAsSHd08ppc
-qoAmhMrNi1iLKv28VZdsw7KfPLJB4rVe1wJWha7ZwzI9NxA+mP+ya+uBwiqssObx
-hrEtmmV6HTDuD8LAHiA4Ng7xTP2hA5B93XEY3hKki9SNZGGv5ROTpvpdgmeMZokI
-qc+q/cXY0BM+gaQUwwtDFwM/DayWGQAXtcZnZjSDAAxohz4ZgJ9sdNLgcOAkz8lv
-c9H6Tqi8jsMP74x7AwTF
-=Y/yk
+iQEcBAEBCgAGBQJPoZZzAAoJEO+t9ga+3I3atzcH/R9u0y0U/tq8bvFVAkr0aC5+
+TDW0URT/EsulQZhfFBU/SXy5Vq/dsZw/T547x5Eaw675pA+r3hwRaEPO8lEs3L3s
+q4DfUOYMpWziCQzSvlLDJsDN+jI910uExOfjXHSChdbwdWXzqjQLtEJCYLuSV7ow
+ijo/196TITwVDv27dIC7YifNSr/3WM8s9V0I5BqBWcZH07Agj97FDH0ZInJOcX+N
+obPu28ifqR1VXQZjdYhV3uuxk+7b6fccfCeyLfo1XJL9CDn7eJR/MIIG4Zq6WPUr
+MsYjtfsJVj2YESXp+JkJS7UiGrkvbCtLJxIBfHpuELifYCJeKj8eOVrPSWoKnI4=
+=ymF2
 -----END PGP SIGNATURE-----
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" )