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

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x8EEE3BE8

5 files changed, 30 insertions, 62 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/Manifest b/kde-misc/krusader/Manifest
index efc0f6420990..f0dfec44ac36 100644
--- a/kde-misc/krusader/Manifest
+++ b/kde-misc/krusader/Manifest
@@ -1,7 +1,24 @@
-AUX krusader-2.4.0_beta1-gcc47.patch 688 SHA256 a25a73e3aaf02b000d0201f0f4263348b4a8becfceb2d0b9d71f45bea2b8c557 SHA512 99a00efb86c4f8b24600b49be9397cdea5e4530ede090d04c380ec7d4539f8d5cbd1f78dfcc8db86b23b3a9f6fb87616707bc8d22b41db9e6bafdbea3bc7dadd WHIRLPOOL effec51e776396c0714f33861dcf263a477c7744d781142de2e1274971ac0cc0fbd955e245c13bb2413e0d4b1e83a836b90d4ad738c372f0a276b6a231c9e0ea
-DIST krusader-2.4.0-beta1.tar.bz2 3430913 SHA256 469e6ce593b2c54acca6009c55d001291df659d499db7edb0da48aff252335e0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST krusader-2.4.0-beta3.tar.bz2 4305463 SHA256 ca43ddeef91e2821142b723d13c0be4bf0d138a9718cccd914cecb675cc97dae SHA512 a0288b0a5d37ade197120f6d96054b5eb9da9bae746969b041f6692a1377e6732a46cf3a672d2a24a5b1eb514ec74ba98695255af39057c4dabe1d935a6f720a WHIRLPOOL 08184cb69dd66ab6738bded5d2c7b470d2659110cb406a9779b61a0dbc28d41b334f86525e6d1a5570c82e751b9bfe3a135d0c35943837a814a3e6746464a4dd
-EBUILD krusader-2.4.0_beta1-r1.ebuild 933 SHA256 10826d8bac3fc4f4ccc38448a088b030cb250bdaaee24219f64176031ffa7df9 SHA512 0eb4a228a928dd698168857b8dfa13650a8b9efbc2a5ec1389132baf5500ca68ea1ac1dab095d1c5b8970be219932ea7424cf3d2f9ca4e19ca53212053818852 WHIRLPOOL 97349fae5ccd914818c0d06997b6193c5112249dd2e1d8276044dae5a4056418bb3110cbb4f12f46e95c25666c03be842b33845e47988705155d211b6d27aca3
-EBUILD krusader-2.4.0_beta3.ebuild 933 SHA256 7ce572f1b794df73d3939e1350b62593ba19fb4b3855bb2b26d3f5c73cf448a8 SHA512 3b2abd95cc3cb0374595916bc245a12abbe50638d9fe6e85fc7ece6cdbfa4c409a63cd4bc333c277683e031991fb40aa8a3f725a21a0f5b60b7326f5afd8db74 WHIRLPOOL f276281230e99c867dc00cbf3e7af6219b38763794affc63c4f04d166afa313645aeb9af7431f517106e9be8542b5e879abc8e4fee3566dba9901a72eb47ffe5
-MISC ChangeLog 9450 SHA256 a29aa95ebfcef47d9b8c3f3891c75472f66efd640f1b99e8cbde919269deb004 SHA512 54b31baa3d8e0ba1898714c69a11898974965da665f5dccfacc69dc2c219bd1046b51a0ab144a21a143b3e48b10bf21dade69fb4bad3de8fb2cfd221cbe82293 WHIRLPOOL 2c0664f6ae5bf2389e79cc8aed2a63a9204cf62e0e8dd005326e90b640c88d59887d8df1c12b8c6e736fe4786f08f80a3cf9adbfadb5e4c0eeb857cd7654f108
+EBUILD krusader-2.4.0_beta3.ebuild 938 SHA256 811fde0b20c974343ab6160923d715517be656f290c4d8ab6583a1b34c2d0499 SHA512 4facadec6cfed4f74b5d2ce717b9c9b954d681cdc1016a336533072d1c15aa3846b0c346f15c84a38ad239215111b6e65a2f918cdec1f2424e8edf495ab1d25e WHIRLPOOL d84b7dcc71850d05c333cf21b1dc2b17156086123df3875287b5c9eaafcd1ef42e94b666463e32708ac44acc557e1f54c94a086dd05c75a651d7540ed116ad87
+MISC ChangeLog 9689 SHA256 815473880c556d4828933bf50bcc3199fd78ad76ccd6f8f475b2d6adc3abe77a SHA512 234e9475eb1e38a8761258397886f7fd51ca0316ccb420acff6d2e767827429c28f27b3922c712d8abcb24d6767913ab9e7941a443a30f67769a93ff97890605 WHIRLPOOL 902a4bb26a93bd08f605ab8f3be8123adc30a7af3e3c8d9fa52bd9450536ae2f85d50b42d40b7e75d69c34a67681797a796782704b3c49253fca9d7ab40bd62b
 MISC metadata.xml 240 SHA256 3940acd26451de238b92c9602337472a3343be5d392bf7c3e72abddbf8b7ecd5 SHA512 d026b15c9e065629d39d0d595856f6ab43bc6c6d1957ae3d76431026e83cb956acb09ff40b57e40474e839f6cf005bdcc331e0adf40b733a6aa6bec17a14148b WHIRLPOOL ff98af2213775171dee0634ff26b026a798b5900d44bc90e40b1a9c9990dcfb8bd979bc7195ab185269bccf4550abee8daeeb3de2f6bfb41ed2ca0355e9b6507
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQ2cVUAAoJEOSiRoyO7jvoLwkP/3I++4JUHEYCaeNmSb75tSc7
+eodWYnR7GADzFWBGTJ9dPG8g+Wpbw331g3sL7xBd88wsfvB50/i3gMMJD1iWfNUs
+oGKpG3RN0SIMGgfa2IqI/KzMG7203Jbt7FQy2yvRQLWzpkrY+cT67OOgrIqL6d9c
+iGqgmv0aHWuhPKiMRUogBAL9l9i3DWuZ9zxi58XZ7UsrCa9b6tpcO3tmO2Js85EQ
+pAqqXL00rxxWRrQRCj6zb9u4IG0NfAnf475myP9sj4RGQ1Js/lZwsXBAEjl+VMtM
+uasvK6RGfuTBUJklGbyS1YZz3Wtw2b4+FkAJA6TcU/BR25kxjkv0IoqShPL8Dfii
+79N8v1suvDwHbiCOaQNmRTVXGFPQp36xlfC35CSSZNVN3hgPWHfrOta5Z5i/LeT9
+kTJ9iogjTvW81m4ghWs8rYQew7vRw+U8cPeQ8hkTakvfXsymU3c9pnLzttddtYH8
+nkM77/5hpMov/JgyRzoZEGRlTPKLzp6ZPEYKxUfeKA3TZkN/U40d00Ss8FmSactB
+04g7frtauyS2hV+ucI6TJkBBsPqD2NrBCpx1uOA+iO4OMM34nGWDKAMvQQEqBKn8
+3bLFnESsmDP91vo5Z8Qlnisudaon3TpWdO/4wTC4gUzXK+quyyWPoSt3vUrtXqnT
++GZydVda+tT9QaJRhEMK
+=wJd3
+-----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
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="