Version bump wrt bug #549996. Remove old.

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

4 files changed, 25 insertions, 67 deletions

diff --git a/media-gfx/kphotoalbum/ChangeLog b/media-gfx/kphotoalbum/ChangeLog
index 921a7b99ca47..3fd6848e039b 100644
--- a/media-gfx/kphotoalbum/ChangeLog
+++ b/media-gfx/kphotoalbum/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/kphotoalbum
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.69 2015/04/03 18:45:24 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.70 2015/05/25 11:07:34 kensington Exp $
+
+*kphotoalbum-4.6.2 (25 May 2015)
+
+  25 May 2015; Michael Palimaka <kensington@gentoo.org>
+  +kphotoalbum-4.6.2.ebuild, -files/kphotoalbum-4.6.1-include.patch,
+  -kphotoalbum-4.6.1.ebuild:
+  Version bump wrt bug #549996. Remove old.
 
 *kphotoalbum-4.6.1 (03 Apr 2015)
 
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 49565b747381..06d918f12cd4 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX kphotoalbum-4.6.1-include.patch 1307 SHA256 fa7b53d118ab1dfdea83d43252358863eff910e90dd8e615d7c6a8a830fe8495 SHA512 cf0731ef9217aab4f87cbef89f44d487ebbc2e4430dbffc59f0d64dc9da54181f886defdb334b70f6a6bd2057ada37eebc2a001f9550fec9aa8ee45d69ee6de6 WHIRLPOOL c8d15a1e9276c91f826fe46677c4c07322253762f8fa6e23b7abbc718e26a031dbd19e46e221fa1003d20b79a44904669e857079cdfe5d4cea0cf09379941a9d
 DIST kphotoalbum-4.5.tar.xz 9415984 SHA256 0cdd4e02e9e4f840550a20cc8dca8a017777e4a55db19f0f8b15e903d2c342cd SHA512 57fe89ec55098312ed53b3ba934d42b84de6e5efcb7e30860deaa0162971ba9e2e9eb573268e2918492c79c2b739b5cf7e16bcb0c9a619c189b3b7ccadb9642d WHIRLPOOL 77f2a4c40b84c5e3406f16757d631aaf8968129d99506bed7528cc27216d34980aba246714629a1969a6625a72291596cf115f275d6fdb39ba4bd84cf93d74fe
-DIST kphotoalbum-4.6.1.tar.xz 9499004 SHA256 8d108d643409944e2a901acd1483e2304a7105842895ea7c72fb8701b6bd9632 SHA512 08d2deb6aeb8c50dee94faf759828753104c11f091868becdadd8009902b3d5d4f6600094d37d4a65a6a6da5f6f80b32d4bcfba2f7cae5b4c6ec96964886fbf4 WHIRLPOOL 3de7e490a748526370fc43de4236608edfdcfb4d48f98965b65fc0d85468d07ea54630671604f8c5b8f5447099148735b9ad83df6af412d8a19d810cf22fd6c7
+DIST kphotoalbum-4.6.2.tar.xz 9503920 SHA256 54c256a1943a632f7ff68126dc985e7f434e7b18c762ae40a49181b9d85f34fb SHA512 437fb05a3e2f9f6f2ca97ba3ee17a125185ffe1603f3a37ad1b1bf837c49ee983e7ccf6858ad7243a7cae00eb2175f5a280bfd31cd5ed109ca46fa1ae8170a57 WHIRLPOOL aaab45d3d5f2115206d98cd7db4953df21c3189ffc8f57f3291321f744cdf69fb138ec08f4af0b6b3f2db2b2281e8f468259cf0846784528e6fba64906b93459
 EBUILD kphotoalbum-4.5.ebuild 1318 SHA256 d2a550e040928a2b1881285971b7418e81f370f7ec54305fe355c0531bb1b46c SHA512 100d0afb7d615981777dcd4450add9609a80c7e3995275079340d406624efd138fa2b8d3751143c426fb58cf217183d1cf8188a6b3af7a76edce10764a3fa8fd WHIRLPOOL 0fdabe3ac77fdc55b881ab727f7e5565dbeb945cbd52478ed8aef886528ff97a90d6d06033152fa1f0be9127ccb31ab91cb21beaafef723e66025b4a92900b5e
-EBUILD kphotoalbum-4.6.1.ebuild 1671 SHA256 adcc8616c111ae6003b5c1d4eac4260a2dccd468b9ddac5525e74525a3aa6866 SHA512 60d206a7e7dfb651be267f8ec979d1089b7a1eedf45480253062df7568d621b2c06f7091930ba207cd73ac85806952850f16ecb1389014025816aa1c9f659666 WHIRLPOOL 97430ca60b34e53659de9da28ed03f31b4fcac7d643b480bc5b4904ec2e07432c5bbb8ae4bb5b992831deece68762d750b41c22c92f6a55738aa0dddc38e8187
-MISC ChangeLog 11509 SHA256 af829888c8d1619f4a8ff13ce5200f711306f6c9744634ced62c34a0765c19a4 SHA512 ee4cebe4cea19667fddf9920706274d5e54eb93ed4d8baea1b8737f8ab4903289b777bdc482df43bab04dace490649757bea9ced57529c5c8e397da10117f07f WHIRLPOOL 18413fbe7a850d0566d1beb7b88d4f6610ba65c505555530ab16c8796e366aaf4074292fd49ca70f5b73a4836b621409da173ff276af3f254b535a9f4a327e1d
+EBUILD kphotoalbum-4.6.2.ebuild 1626 SHA256 58f30399a9770c37edf5e6fd56234fe24347f3963be56427770d9f86f8146ddb SHA512 31cfea67e549839f553326b52f281758c63644454979a4e0fc2cbd5baa2f25842f8f3d983ad5e4e6a27fb1236510e5d4ca8b168f49679f1c5a3b54c1b7ddf6d7 WHIRLPOOL bbe1e2ef64f212888dec8f89a0cb7069f77740fb48f1e7fefd3a713fffaf58d04910d8637852428d6fd96860bf15c2ee07abf8c6db6ee6960738155b7622c1fb
+MISC ChangeLog 11742 SHA256 144bb414a9f296d83b64415f29ebcd3486b580a863d61ff37918ef6066609bb7 SHA512 9fa69bc1a5d786b1f5f86d0829e76a82069b0f0e178e40a902e59425053b1f2aa1b4f7d83fd8bc10142749384bf3e2c5f73838e4518f89dc2c9051e29cfa5665 WHIRLPOOL 1509bad7e7532d77f39f6eb98e321e78aa1467e371ddb45274491387926952825bb9f9da0e415d4d79425c4cf558416532e1c5add23d7add6d80bcb45eb01327
 MISC metadata.xml 513 SHA256 e05beb1b6568def7155ad3ed5c7b01f09bf6f83699431a2b607549ace498e453 SHA512 d0778b04af60807b7269013d4918a7497f5fd12bc3be607563a4f59c90632aafe08d01e9bb8555d0674e7e3118334b219c739959690b2d66f3e7cf08ea714b5c WHIRLPOOL 17c273cd612d8e736620b2942b3c440c44d30a187dfd15a83c6a9ef86371075c715351d0c6b7ce647ee25b2d9a090c8fa92b7277c6198c5ef043111dbfabb62a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJVHt/DRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJVYwJ5RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7PCMEACsLOF77mDlAPxDmBgGr794jSG5MrKQYHsEHWCLBFCohFWd89YmJsRFn4NY
-fmPmrHbYIjCzyS4imiZZuL4SuPQ3RC20yj9AaQdT8riSimKRdadUdttOGL8y5MMB
-T11QEVEQ4XhnEoAb/NxAVwztPMw1OZYyFqfP+2kdOMj2KqPM74L0VEK7Ev5Acit2
-VGvdGOGvL/JWC1u92zuP+dmsOHax+5yiKat4z5BlUv66hrhJwP7d4vYiocSjCeYG
-5YMnOKq9gpTy0TtyMr898kSNzsssakgfVYUGTiednoOQIoKI0R7jrVTY5ATPrGwk
-s/ZK1WT7s6KSKe1AJg9pHtMutuYeba7lJsjlRIJGkKyFb71ufffC3Px2FBZKe1Wr
-Oj2Cgo23okFGVQf/BDX2yOVp12gYYr3MQLZuSQSQZjXhI38/YQN+tzgAR5GsjTCO
-VMcr+xQ4DWtw3/0sewbGNhRuJLUtoXP7VGyI8+pe2g5VfJT75NBaVIs8yEWiubBs
-1sHoY75Fddt9A7YFS98N2tJrfdWAU7GEUy4KvPIkeOEB+YcVbAXXa0V9phHikM8R
-+Y3fdX1vkiOSNrWsviSQ6+NOAM5kRZxHEkPJqaFeuqMYU7tMLKmiPV0Q1soctgpu
-s/JedODZ6GapeE4rLw+hwPRsSWbwvyJO9P1Q6vcMpJMc0XDH8w==
-=32on
+7I30D/9wF6yo5RffpqdzQZwb5s8QO6wEYNRqhOJ+IqqhRrTv/jgDuQSTZHO3iF6k
+zJfw3/5YbHfv/3zjzv6NPWKwAV8acWfXCkAYgC7oQ5dsTULMS0to3o+SDcz3CF3U
+rPdrVZfIMi2ur08M38RDR3wjMcJNs0hHB4hVmSsabhAxVcXC3HuI7UVa5vMt/iZm
+PeSjLR9EXlCjk5JmfVWdhSEIVhigNUaqGlnWfCq+9GeR/9iqo6+bLhZhloESJVTR
+nyXwRWVgnwWZuFpm9FIrFTy4nyFFMtUdK3g9agrcqXtlxByv280fzMacOlKNlryh
+lXLEa9i/fWMmB5RgR0xaB6kpEsbQ4zDmEBuFN6jANJVv06Duz8XUYmr6cCETEC7j
+/7aseGWyXPNsD/64UO3RY/4QiA6kL/Rur5Fu0Wamgg/amNDC2SVQS1LxIaiKgfTO
+kjPsbrghXJ4TzlW/QFuPeFLT2j3perdxeovEhLfs0ViRdNVjuEfKCE9weo/cuo/o
+xHuaB2RLE4+QDjDsE6eSwGPk4RpyACyjR/S1hcL5aPGJJlSm4M9pGygpzLMyNl3f
+1Z3SlnuAHOIA7En9W8lBNPsWHR2gu609gbIfUZHH1x1Y3BN8+9O5l4GkIo6hOwF/
+RWIyVGEGZfPfT5IKLBTIC1yf/PEKqblvZ60u5+uxIDCqk9tCmg==
+=QC2J
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-4.6.1-include.patch b/media-gfx/kphotoalbum/files/kphotoalbum-4.6.1-include.patch
deleted file mode 100644
index 6ca48308356e..000000000000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-4.6.1-include.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From cd1235b9f5b15be4b87d3dc1c147510efc0c6728 Mon Sep 17 00:00:00 2001
-From: Tobias Leupold <tobias.leupold@web.de>
-Date: Wed, 18 Mar 2015 18:25:51 +0100
-Subject: [PATCH] Includes cleanup and missing KLocale include added (thanks to
- Michael Palimaka for the hint!)
-
----
- ThumbnailView/GridResizeSlider.cpp | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/ThumbnailView/GridResizeSlider.cpp b/ThumbnailView/GridResizeSlider.cpp
-index 85b4a97..3e84f24 100644
---- a/ThumbnailView/GridResizeSlider.cpp
-+++ b/ThumbnailView/GridResizeSlider.cpp
-@@ -15,20 +15,25 @@
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
- */
--#include "GridResizeSlider.h"
- 
-+// Qt includes
- #include <QScrollBar>
- #include <QTimer>
--#include <KSharedConfig>
- #include <QDebug>
-+
-+// KDE includes
-+#include <KSharedConfig>
- #include <KMessageBox>
-+#include <KLocale>
- 
-+// Local includes
-+#include "MainWindow/Window.h"
-+#include "Settings/SettingsData.h"
-+#include "GridResizeSlider.h"
- #include "CellGeometry.h"
- #include "ThumbnailModel.h"
- #include "ThumbnailWidget.h"
--#include "Settings/SettingsData.h"
- #include "ImageManager/ThumbnailBuilder.h"
--#include "MainWindow/Window.h"
- 
- #ifdef DEBUG_ResizeSlider
- #define Debug qDebug
--- 
-2.0.5
-
diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.6.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
index d56cd6326585..0f400d459b8e 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-4.6.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-4.6.1.ebuild,v 1.1 2015/04/03 18:45:24 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild,v 1.1 2015/05/25 11:07:34 kensington Exp $
 
 EAPI=5
 
@@ -40,7 +40,6 @@ RDEPEND="${COMMON_DEPEND}
 	kipi? ( >=media-plugins/kipi-plugins-4.7.0 )
 "
 
-PATCHES=( "${FILESDIR}/${P}-include.patch" )
 DOCS=( ChangeLog README )
 
 src_configure() {