Stable x86 wrt bug#446088. Punt older. Force due to unupdated tree.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 8EEE3BE8)

4 files changed, 8 insertions, 57 deletions

diff --git a/kde-misc/krusader/ChangeLog b/kde-misc/krusader/ChangeLog
index 936f6e29f480..928cbcf29ddf 100644
--- a/kde-misc/krusader/ChangeLog
+++ b/kde-misc/krusader/ChangeLog
@@ -1,6 +1,11 @@
 # 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.109 2012/12/07 11:15:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/ChangeLog,v 1.110 2012/12/25 15:25:50 scarabeus Exp $
+
+  25 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/krusader-2.4.0_beta1-gcc47.patch, -krusader-2.4.0_beta1-r1.ebuild,
+  krusader-2.4.0_beta3.ebuild:
+  Stable x86 wrt bug#446088. Punt older. Force due to unupdated tree.
 
   07 Dec 2012; <ago@gentoo.org> krusader-2.4.0_beta3.ebuild:
   Stable for amd64, wrt bug #446088
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
deleted file mode 100644
index 1ad24adf9d4c..000000000000
--- a/kde-misc/krusader/files/krusader-2.4.0_beta1-gcc47.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index 2eaecf94a830..000000000000
--- a/kde-misc/krusader/krusader-2.4.0_beta1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.3 2012/06/22 21:17:30 jdhore 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" )
diff --git a/kde-misc/krusader/krusader-2.4.0_beta3.ebuild b/kde-misc/krusader/krusader-2.4.0_beta3.ebuild
index e7e1091db02e..75b0b99aa9b6 100644
--- a/kde-misc/krusader/krusader-2.4.0_beta3.ebuild
+++ b/kde-misc/krusader/krusader-2.4.0_beta3.ebuild
@@ -1,6 +1,6 @@
 # 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_beta3.ebuild,v 1.2 2012/12/07 11:15:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/krusader-2.4.0_beta3.ebuild,v 1.3 2012/12/25 15:25:50 scarabeus Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/krusader/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="4"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="+bookmarks debug"
 
 RDEPEND="