Remove older. Stabilise 4.2 on amd64 and x86.

Package-Manager: portage-2.2.0_alpha122/cvs/Linux x86_64

6 files changed, 28 insertions, 350 deletions

diff --git a/media-gfx/kphotoalbum/ChangeLog b/media-gfx/kphotoalbum/ChangeLog
index 868d0c62459b..fc3b22caebec 100644
--- a/media-gfx/kphotoalbum/ChangeLog
+++ b/media-gfx/kphotoalbum/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/kphotoalbum
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.54 2012/04/26 08:00:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.55 2012/08/25 20:12:47 scarabeus Exp $
+
+  25 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/kphotoalbum-4.1.1-docbook_fix.patch,
+  -files/kphotoalbum-4.1.1-exiv2.patch, -kphotoalbum-4.1.1-r1.ebuild,
+  kphotoalbum-4.2.ebuild:
+  Remove older. Stabilise 4.2 on amd64 and x86.
 
 *kphotoalbum-4.2 (26 Apr 2012)
 
@@ -282,4 +288,3 @@
 
   18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kimdaba-1.0.1.ebuild:
   Initial import, closes bug #35132
-
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index ba203d2581e9..3653875302bb 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,22 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX kphotoalbum-4.1.1-docbook_fix.patch 9256 RMD160 8e1bdf3f31d796f3de4cb0a1130422ae50952b5e SHA1 adf5734f415b0bb09ab54382e458f75559e150d1 SHA256 0d9f875573abb4c5517309e6531254cea47d5a817bbe2fa9e484511349ffe54c
-AUX kphotoalbum-4.1.1-exiv2.patch 1517 RMD160 0ff5ebfbe29e1eafb099961418c2848df3411d16 SHA1 2810b28f7d400a057710c652a3e9b13e4e88bbde SHA256 7c529890d226c3cb7ec6bb8f6f7b8633efce41b512f0ba24b4b186c22e277395
-DIST kphotoalbum-4.1.1.tar.bz2 8158759 RMD160 dc34fe0c2ce75b8aa036b60e4b99689bb946323e SHA1 14b9374e0c18a5ada225e6cc059eda54ec0ee49e SHA256 9338a7438f72f9599b41b35081c15a2c03e31341e6cdd8abf4f3d1e396331b0c
-DIST kphotoalbum-4.2.tar.bz2 10522580 RMD160 e46ea7818d4072e943a13f158f35e0f5466fa001 SHA1 bfdaf91af4fcc5b99d80f5fd561f1ea87908f3ee SHA256 faab9d8bd8df65166ecc18a8a3d0173bb42e45bad8bafdafa7ac09824710cdb1
-EBUILD kphotoalbum-4.1.1-r1.ebuild 1447 RMD160 0b1a71fe7d17e953de4813dcf3f0a51efd60aa08 SHA1 735549c8723cbe948cf0ef98f6f4f0dfd1942143 SHA256 811cf0f6e5bf48d44cf8d117a936f364c2b740c272bf11d0a9c510dd7d2da2ea
-EBUILD kphotoalbum-4.2.ebuild 1411 RMD160 6a611405ad2a0ba09f88341769b07b6a751ad0e8 SHA1 b801321ed79bc2ca96fd87e7b5079321a433f6e1 SHA256 f30fa469331ad6fb8344bd080590019c9da5cd8247b4c3001b184404173a6b74
-MISC ChangeLog 9294 RMD160 4796eac142ef4f4494ec3b1cddcdfa512f25cce7 SHA1 0e9bf11e1df1d431f8ea526af78e62313062fba9 SHA256 d1f335a052ef52acffa15757ec7d1e32fd7bbd52a028de6738e8affbb7ae00ca
-MISC metadata.xml 314 RMD160 86c8be7f3bb3eb91e01f247d2afca6b3acb264c2 SHA1 241cadfe8e56936304177ac60fcc31c6f83c3dec SHA256 356aa0127738afc738c007b41abf84e5f93730741eb05176f7f525e04c36e73c
+DIST kphotoalbum-4.2.tar.bz2 10522580 SHA256 faab9d8bd8df65166ecc18a8a3d0173bb42e45bad8bafdafa7ac09824710cdb1
+EBUILD kphotoalbum-4.2.ebuild 1414 SHA256 74f09263c9315af351efe8c629ce6cfc10e517ea8d161ff7f779c86fd0194905 SHA512 615008579fb1fd6e23c88de9ce1508d6d2ddff64949ee13a889b15408fd80d3b0d7258209c4e01ec624a2b649b06288d5dd0da9e6f9e1d8bd4cc716db1d587d5 WHIRLPOOL e3b4c168a8c03345354a0124eb90808f71c83119924ae4fe6f1b1cc8ab063a5775f19a7081287121d7cb8907806750b68be44fad351fe2e40cce9479807fc7dd
+MISC ChangeLog 9544 SHA256 78e834dc1ed431fc1e8d8a411735103cb4f9af53a480dff05a34a4d05a8afb14 SHA512 4b1ac71567f8d2fb5312abd853b50a0e30562cb9bf983dc6ddcb2b46503f8d43a6aafe4e95dddc4304c0268ee99dc866a348b7c7955b66c38d1fc92b320d6326 WHIRLPOOL 0741cb4c2cec2302f4e407c5c51ea335da7a69f81578b302953bc2abbbc4e8104ed69015d4fa6a14ac9052dc565ef41934fda063a579b5bb250bf87431039c8b
+MISC metadata.xml 314 SHA256 356aa0127738afc738c007b41abf84e5f93730741eb05176f7f525e04c36e73c SHA512 b97db24970fb787619385288917c07e97fa32b15c019225365f4d5980507d8af9802b65caaeb8b394b79d6144946398b020d1e42598fffd03d9495ebe8f37980 WHIRLPOOL a742bd08f24dbdbb39c69e9a07ab8ecf798510d7fa315d4cda56665116afb031a1fa96ae80472f1beb4390ccd32d0829233aa678039d0680759ba31f5ce866b4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPmQDzAAoJEO+t9ga+3I3aBtEH/RB8b6mcxzFxJ2A4BPRduOF7
-H01g1JrAT5hdji/M1DQbXrYJmanND0fJAfqUplyh4Q9CgCAMQt1HZTc34KYHLxTm
-f0FbKYmrNcUWTlswtEZ6xjSlOV3P5ZHquJwwjXQzUBKJJOqU7/JoLKhR0fWDDo8D
-NxGg9hiEPc/u3K13Jikbhex25++zMKJy2uZiYQz6LPsqC+EOCatx8tGGGh1R6mSa
-YlcmSrXWNNIkS1agCHRYIFS9EXmffkQrLmknQ8sjlKGSfxeb1Fd8P0UdGFSw26zD
-aRNm8KNqDZbKUOr4WNEYWCaRvRM8kZYyEJpxhmvba80IHflbJS7CSlicH38NZkA=
-=n88A
+iQIcBAEBCAAGBQJQOTHMAAoJEOSiRoyO7jvobd4P/2cBiGptbx7lvOzTcJeVZhay
+awYppfEbpugDOta2sVlSAZ2IQKpiDmR8bc8pYMeW+lL8BprwUjyulOlPLxrYMTxJ
+JrN1UltsOxYIm5EOfKeu7am3lqtUMO0gFqkJ6Pzu5uDzkweGPstMVSjcqtCvBCXE
+AH7OLNPoV9xwj984pi3hUT24NPHBTYicPBO2yZmAjIkXZ8BmSA76IyvldHPz20af
+OtBWP8URENG3m6TzAgZ3SCPlcE4O+yX8R7Ez+z4XzzYFQFGedQhw5NjHcv6v/tw5
+YV+C/zOimyeWQSdxjg2+nJFUFGBofBIXa6ezg8Nie43dLpJg12l7HmRx5W6p1/+D
+A5yG5fj7UFcB9kpdwreuXaByHyasKbjTPXJB0Od3xjZ8+TfiuZWBLpJ9zcrTs+FB
+6/CDT2ETagvMf8CJ3AxejIo4yTaBUcHAmkmkppSQ9b38DKG5A/A+QRIerd+IqHCc
+NAAiSdtiErZGbhktNDJHDlDT2TZSdgIqUma/0QfSCfl7FoVAMP+pzhLJCpILe6yD
+rL8Xt6NkbMjF+CRHNhRqwFH8rlnybEfCFkS+RELwhzxX2Gz/ReGnTHrD7ZLsCzb5
+4/5RuuLxSAg5eisvO6EmCFZktJyK1Uc2qpZEICn0LRHRslpAD300DclO3BSBJabu
+IbedQ8kceEvtzs1C8a6F
+=beqG
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-4.1.1-docbook_fix.patch b/media-gfx/kphotoalbum/files/kphotoalbum-4.1.1-docbook_fix.patch
deleted file mode 100644
index 575a4271ebfe..000000000000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-4.1.1-docbook_fix.patch
+++ /dev/null
@@ -1,236 +0,0 @@
-diff -up kphotoalbum-4.1.1/doc/index.docbook.docbook_fix kphotoalbum-4.1.1/doc/index.docbook
---- kphotoalbum-4.1.1/doc/index.docbook.docbook_fix	2009-11-15 15:16:29.000000000 -0600
-+++ kphotoalbum-4.1.1/doc/index.docbook	2010-06-13 13:03:02.815174744 -0500
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kphotoalbum "<application>KPhotoAlbum</application>">
-   <!ENTITY kappname "&kphotoalbum;">
-   <!ENTITY package "kdeextragear-2">
-@@ -41,12 +41,6 @@
-     <date>2004-08-06</date>
-     <releaseinfo>2.0</releaseinfo>
-     
--    <keywordset>
--      <keyword>KDE</keyword>
--      <keyword>kdeextragear-2</keyword>
--      <keyword>KPhotoAlbum</keyword>
--      <keyword>Image Database</keyword>
--    </keywordset>
-     <abstract><para>
-   This is the user manual for &kphotoalbum;. If you are
-   not the type who likes reading documentation, but rather just want to try
-@@ -64,6 +58,12 @@ menu and select <guimenuitem>Run &kphoto
- on long HTML document at <ulink
- url="http://www.kphotoalbum.org/">&kphotoalbum;'s Homepage</ulink></para>
- </abstract>
-+    <keywordset>
-+      <keyword>KDE</keyword>
-+      <keyword>kdeextragear-2</keyword>
-+      <keyword>KPhotoAlbum</keyword>
-+      <keyword>Image Database</keyword>
-+    </keywordset>
-   </bookinfo>
-   
-   &introduction;
-diff -up kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook
---- kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:17:07.000000000 -0600
-+++ kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:10:06.145165665 -0500
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kphotoalbum "<application
- >KPhotoAlbum</application
- >">
-@@ -65,16 +65,6 @@
-     <releaseinfo
- >2.0</releaseinfo>
-     
--    <keywordset>
--      <keyword
-->KDE</keyword>
--      <keyword
-->kdeextragear-2</keyword>
--      <keyword
-->KPhotoAlbum</keyword>
--      <keyword
-->Bilddatenbank</keyword>
--    </keywordset>
-     <abstract
- ><para
- >Dies ist das Benutzerhandbuch für &kphotoalbum;. Wenn Sie nicht gerne Handbücher lesen, sondern lieber gleich Funktionen ausprobieren möchten, haben Sie folgende Alternativen zu diesem Handbuch: <itemizedlist>
-@@ -102,6 +92,12 @@
- >HTML</acronym
- >-Dokument zum Herunterladen.</para>
- </abstract>
-+    <keywordset>
-+      <keyword>KDE</keyword>
-+      <keyword>kdeextragear-2</keyword>
-+      <keyword>KPhotoAlbum</keyword>
-+      <keyword>Bilddatenbank</keyword>
-+    </keywordset>
-   </bookinfo>
-   
-   &introduction;
-diff -up kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook
---- kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:17:20.000000000 -0600
-+++ kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:11:18.860165964 -0500
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kphotoalbum "<application
- >KPhotoAlbum</application
- >">
-@@ -65,16 +65,6 @@
-     <releaseinfo
- >2.0</releaseinfo>
-     
--    <keywordset>
--      <keyword
-->KDE</keyword>
--      <keyword
-->kdeextragear-2</keyword>
--      <keyword
-->KPhotoAlbum</keyword>
--      <keyword
-->Piltide andmebaas</keyword>
--    </keywordset>
-     <abstract
- ><para
- >See on &kphotoalbum;i käsiraamat. Kui sa ei armasta eriti käsiraamatuid lugeda, vaid soovid lihtsalt proovida, mis mida teeb, siis on sinu ees lahti mitu võimalust: <itemizedlist>
-@@ -100,6 +90,12 @@
- >&kphotoalbum;i koduleheküljelt</ulink
- >.</para>
- </abstract>
-+    <keywordset>
-+      <keyword>KDE</keyword>
-+      <keyword>kdeextragear-2</keyword>
-+      <keyword>KPhotoAlbum</keyword>
-+      <keyword>Piltide andmebaas</keyword>
-+    </keywordset>
-   </bookinfo>
-   
-   &introduction;
-diff -up kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook
---- kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:17:57.000000000 -0600
-+++ kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:12:00.978165382 -0500
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kphotoalbum "<application
- >KPhotoAlbum</application
- >">
-@@ -65,16 +65,6 @@
-     <releaseinfo
- >2.0</releaseinfo>
-     
--    <keywordset>
--      <keyword
-->KDE</keyword>
--      <keyword
-->kdeextragear-2</keyword>
--      <keyword
-->KPhotoAlbum</keyword>
--      <keyword
-->Banca dati immagini</keyword>
--    </keywordset>
-     <abstract
- ><para
- >Questo è il manuale utente di &kphotoalbum;. Se non sei il tipo a cui piace leggere la documentazione, ma che preferisce provare a far funzionare le cose, eccoti delle alternative: <itemizedlist>
-@@ -100,6 +90,12 @@
- >homepage di &kphotoalbum;</ulink
- ></para>
- </abstract>
-+    <keywordset>
-+       <keyword>KDE</keyword>
-+       <keyword>kdeextragear-2</keyword>
-+       <keyword>KPhotoAlbum</keyword>
-+       <keyword>Banca dati immagini</keyword>
-+    </keywordset>
-   </bookinfo>
-   
-   &introduction;
-diff -up kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook
---- kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:19:13.000000000 -0600
-+++ kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:12:45.765165840 -0500
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kphotoalbum "<application
- >KPhotoAlbum</application
- >">
-@@ -65,16 +65,6 @@
-     <releaseinfo
- >2.0</releaseinfo>
-     
--    <keywordset>
--      <keyword
-->KDE</keyword>
--      <keyword
-->kdeextragear-2</keyword>
--      <keyword
-->Kfotoalbum</keyword>
--      <keyword
-->Bilddatabas</keyword>
--    </keywordset>
-     <abstract
- ><para
- >Det här är användarmanualen för Kfotoalbum. Om du inte är den som gillar att läsa dokumentation, utan istället bara vill försöka dig på saker och ting, ges här några alternativ: <itemizedlist>
-@@ -100,6 +90,12 @@
- >Kfotoalbums hemsida</ulink
- ></para>
- </abstract>
-+    <keywordset>
-+      <keyword>KDE</keyword>
-+      <keyword>kdeextragear-2</keyword>
-+      <keyword>Kfotoalbum</keyword>
-+      <keyword>Bilddatabas</keyword>
-+    </keywordset>
-   </bookinfo>
-   
-   &introduction;
-diff -up kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook
---- kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:19:26.000000000 -0600
-+++ kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:13:28.217166055 -0500
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kphotoalbum "<application
- >KPhotoAlbum</application
- >">
-@@ -65,16 +65,6 @@
-     <releaseinfo
- >2.0</releaseinfo>
-     
--    <keywordset>
--      <keyword
-->KDE</keyword>
--      <keyword
-->kdeextragear-2</keyword>
--      <keyword
-->KPhotoAlbum</keyword>
--      <keyword
-->База даних зображень</keyword>
--    </keywordset>
-     <abstract
- ><para
- >Це інструкція користувача для &kphotoalbum;. Якщо ви не любитель або любителька читання документації і надаєте перевагу самостійному вивченню програми шляхом експериментів, ви можете піти одним з таких шляхів: <itemizedlist>
-@@ -100,6 +90,12 @@
- >домашній сторінці &kphotoalbum;</ulink
- ></para>
- </abstract>
-+    <keywordset>
-+      <keyword>KDE</keyword>
-+      <keyword>kdeextragear-2</keyword>
-+      <keyword>KPhotoAlbum</keyword>
-+      <keyword>База даних зображень</keyword>
-+    </keywordset>
-   </bookinfo>
-   
-   &introduction;
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-4.1.1-exiv2.patch b/media-gfx/kphotoalbum/files/kphotoalbum-4.1.1-exiv2.patch
deleted file mode 100644
index 89283fd3f509..000000000000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-4.1.1-exiv2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- trunk/extragear/graphics/kphotoalbum/Exif/Info.cpp	2011/01/09 06:47:21	1213127
-+++ trunk/extragear/graphics/kphotoalbum/Exif/Info.cpp	2011/01/09 06:50:40	1213128
-@@ -106,6 +106,28 @@
-         return res;
- 
-     QList<const Exiv2::TagInfo*> tags;
-+    std::ostringstream s;
-+
-+#if (EXIV2_TEST_VERSION(0,21,0))
-+    const Exiv2::GroupInfo* gi = Exiv2::ExifTags::groupList();
-+    while (gi->tagList_ != 0) {
-+	    Exiv2::TagListFct tl     = gi->tagList_;
-+	    const Exiv2::TagInfo* ti = tl();
-+
-+	    while (ti->tag_ != 0xFFFF) {
-+		    tags << ti;
-+		    ++ti;
-+	    }
-+        ++gi;
-+    }
-+
-+    for (QList<const Exiv2::TagInfo*>::iterator it = tags.begin(); it != tags.end(); ++it) {
-+        while ( (*it)->tag_ != 0xffff ) {
-+            res.insert(QString::fromLatin1(Exiv2::ExifKey(**it).key().c_str()));
-+            ++(*it);
-+        }
-+    }
-+#else
-     tags <<
-         Exiv2::ExifTags::ifdTagList() <<
-         Exiv2::ExifTags::exifTagList() <<
-@@ -121,7 +143,6 @@
-     // Now the ugly part -- exiv2 doesn't have any way to get a list of
-     // MakerNote tags in a reasonable form, so we have to parse it from strings
- 
--    std::ostringstream s;
-     for ( Exiv2::IfdId kind = Exiv2::canonIfdId; kind < Exiv2::lastIfdId;
-             kind = static_cast<Exiv2::IfdId>( kind + 1 ) ) {
- #if EXIV2_TEST_VERSION(0,17,0)
-@@ -130,6 +151,7 @@
-         Exiv2::ExifTags::makerTaglist( s, kind );
- #endif
-     }
-+#endif
- 
-     // IPTC tags use yet another format...
-     Exiv2::IptcDataSets::dataSetList( s );
diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.1.1-r1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-4.1.1-r1.ebuild
deleted file mode 100644
index 21bff77da329..000000000000
--- a/media-gfx/kphotoalbum/kphotoalbum-4.1.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-4.1.1-r1.ebuild,v 1.3 2011/08/24 19:54:59 maekke Exp $
-
-EAPI=3
-KDE_LINGUAS="ar be bg ca cs da de el en_GB eo es et fi fr ga gl hi hne is it ja
-km lt nb nds nl nn pa pl pt pt_BR ro se sk sv tr uk vi zh_CN zh_TW"
-inherit kde4-base
-
-DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing images."
-HOMEPAGE="http://www.kphotoalbum.org/"
-SRC_URI="http://www.kphotoalbum.org/data/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="amd64 x86"
-SLOT="4"
-IUSE="debug +exif +geolocation +kipi +raw +semantic-desktop"
-
-DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-	virtual/jpeg
-	>=x11-libs/qt-sql-4.4:4[sqlite]
-	exif? ( >=media-gfx/exiv2-0.17 )
-	geolocation? ( $(add_kdebase_dep marble) )
-	kipi? ( $(add_kdebase_dep libkipi) )
-	raw? ( $(add_kdebase_dep libkdcraw) )
-"
-RDEPEND="${DEPEND}
-	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
-"
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with raw Kdcraw)
-		$(cmake-utils_use_with kipi)
-		$(cmake-utils_use_with geolocation Marble)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-	)
-
-	kde4-base_src_configure
-}
-
-DOCS="ChangeLog README TODO"
-
-PATCHES=( "${FILESDIR}/${P}"-{docbook_fix,exiv2}.patch )
diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.2.ebuild b/media-gfx/kphotoalbum/kphotoalbum-4.2.ebuild
index 7c9bfa7d7edb..3844662acb99 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-4.2.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.2.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/media-gfx/kphotoalbum/kphotoalbum-4.2.ebuild,v 1.1 2012/04/26 08:00:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-4.2.ebuild,v 1.2 2012/08/25 20:12:47 scarabeus Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.kphotoalbum.org/"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="4"
 IUSE="debug +exif +geolocation +kipi +raw +semantic-desktop"