Version bump, remove old.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

6 files changed, 25 insertions, 287 deletions

diff --git a/media-sound/kid3/ChangeLog b/media-sound/kid3/ChangeLog
index c4223f5ecb1b..ae14470d03cc 100644
--- a/media-sound/kid3/ChangeLog
+++ b/media-sound/kid3/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/kid3
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.78 2013/11/25 16:59:47 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.79 2013/11/29 19:26:46 johu Exp $
+
+*kid3-3.0.2 (29 Nov 2013)
+
+  29 Nov 2013; Johannes Huber <johu@gentoo.org> +kid3-3.0.2.ebuild,
+  -files/kid3-3.0.1-empty-linguas.patch, -files/kid3-3.0.1-qt5-automagic.patch,
+  -files/kid3-3.0.1-rpath.patch, -kid3-3.0.1.ebuild:
+  Version bump, remove old.
 
   25 Nov 2013; Johannes Huber <johu@gentoo.org>
   +files/kid3-3.0.1-empty-linguas.patch, kid3-3.0.1.ebuild:
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index bf6d7e93fa10..a3f13c9711bc 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,29 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX kid3-3.0.1-empty-linguas.patch 1247 SHA256 ab73d4e13f9efb35d8fb50c6c18b964fda873a13a90b06c156bd9eee328c77b9 SHA512 05d7f908ef4b42b1671391e9901871578d4c2c84c2c95d9eec07000fb6e68d126ec41d74f4a30743c43b9f05d09537a8f9225263c2a0437984d01f44094da625 WHIRLPOOL 7bcaf7a6c5cba6eb81c8a169bf029d8505a6d291b4bc62f488f7ef73a3d175bfe6e2bd104af1db747f9a46abf15cc101fcd7ffe087d2703dda76602a27de06e9
-AUX kid3-3.0.1-qt5-automagic.patch 7505 SHA256 5508184619c18e66de0a589d2b9011cb03ae8ab3ee6939803a8e73c7ae78205f SHA512 e260e5fa72a5051e4d84185cda3d881d8d79c8f9db6b0f7c2da0ae9e5e6dc05200ab3998cde5a819fdf0d0b5691310b87dbfd1030e84aa4d2639455a37982ca9 WHIRLPOOL d3dc165db092a5645d7b759a82a897e5352313af3779cc0f99e9d5d1ef3f030a0064bf4b06a537555b0d07d2ed54b106e4d439de395754b7741549f62e2e2e95
-AUX kid3-3.0.1-rpath.patch 1182 SHA256 ec29cc4eff8b4bf7a3704ed10efa42412804e8519733954dc87d56e8283de63c SHA512 ed7c310f60f494e040a0c7eadad04d6bf25a97e0a6bf5765891d415b71eefa8e6ea2847ef1cc1489ec8e30d7b193d9586870b1cecdb1d25a592e2c71deb25115 WHIRLPOOL fcf45374ed1b56c77e042355792dbebced9459ffda60fd3bdd21a155e8ee1b40aa000195fa114575fa3e6756256817048f209bdbb8fd4e7fac5332b6942b4093
 DIST kid3-2.2.1.tar.gz 941454 SHA256 2ac3ab6bbf8d2fdcc070a753ebdce868a5e9a2f0b3daddcc7c5b953ff39781b0 SHA512 430b3e001f66803e1ca7f08baa2c802504812e87ca0001282b15a009e1ad4daa78e91f84579347e523d46da440869a6b283edfb93f3dd7803d9ef3e6e1039a51 WHIRLPOOL 02a9479f7b0ec6bf7f6fbf514166a791af2ea7131e965d3bd2c65cdb001a4a91fea55f54d52221b55abb057398c27e3522cd69f455b61883405d6ad7afddc866
-DIST kid3-3.0.1.tar.gz 994466 SHA256 ebbae8b277c14083f87d49bcde5a86295c1874c4004fc5db2d5764ff53f15d59 SHA512 d263ed3cd4152de5e9fe781a51ec0a6f2879f3b08812ec17d37d79fcfc38658afac771574a6ad2fde52081282169982df86702c0cb0eb4bbb6dba6d8dbc692be WHIRLPOOL 4d3c9912b24adc99a96c71b3253cd65cdf27937d6d8e08ca8a3cb82c2a08d8cf200d212a5a38bf1b65e9630d535bec1cd807e3c17101ad1877da078ae75b2377
+DIST kid3-3.0.2.tar.gz 997961 SHA256 31492e01039e78d2e73ba342a2d2c837395597eb48a101366b160c36fcdcfab4 SHA512 e8ca661c74fe677b2f1d1f470c750580c27791e66f2f9817ac36003fac1e33ed05ebe2e8e6ed6cc3b091caf55b25c3784bb8eeac4510b95db6e89b8bb4d51856 WHIRLPOOL 68472f60c31a5b11cf81dcd240114badec8992d4a160b3332407a5dc388399ed3527e43422ff5f2818b44717a51fca439a976d0652c913e39956fbacb531ef28
 EBUILD kid3-2.2.1.ebuild 1240 SHA256 93ee19e1216601fdfbf46d68b058a8265e0e9c075d47026f9fbba82c7e06fe13 SHA512 76f67306c683fd37d5e31ddc781c50daf444d41988e40cf917b874d10538d642d39dcc30f82fb1d9664838769c27f57cad54c4eadf290fbdb71b5229b5c3817c WHIRLPOOL fd9c5198910597bfb4ea1417ed55cedef1afb3a6be45d2bba743cf1d99e2993693f09186a45ed48d53dd33f1618b4b6d9fd501c94b060b57ba2f25829f43ad73
-EBUILD kid3-3.0.1.ebuild 1532 SHA256 cebf988ba188c86ee3c9350f494fa46dc04b105e889308419cd7d57e14de2f03 SHA512 2484ade73e51fc6ae16e2b1bf69dea3197fb9f704d8de9ea6897779956cfeb269f0ad063364294b39d69d407cc4602ac0c5805cba0db34863e02f5fc2b2b6909 WHIRLPOOL 29eb3675be41a0e74b71ddb58db399052fc2f777df2233c46cc61085ca75be9bfb7d8eff3aa3f240f02ccb9819efc8eea92c5bd5c2bfb1ed85d743950b43a6dc
-MISC ChangeLog 10516 SHA256 2ddcaded1d552e64e28df0161fd8745f7ee142b6c023417bf96301729f11f4e0 SHA512 e74cb5c8e3b8bb6cf200dcdb1e4ca6aa3c7ec633d61944193bf7c1f7891faa8e6b813657f783b82ccc548b91c5dc1b69e89aada1a1c5c5e81bb7ed584bf211ee WHIRLPOOL b684d02546c568e3f97cb18f0876e562ce1e64f657d31c376c5c64c86e2d6fc2d7cbdf5e3bf5eadaf467a3e3ed6638d31547c7b2f27119935681a5df93b456bb
+EBUILD kid3-3.0.2.ebuild 1407 SHA256 0c91ca03a713ed2dff1e5c58c8338d83195be19bae8fec5f319eaa69ef55d987 SHA512 9fd391db7e2406d8fc6305bc27ffc35bed3217111440c1a4578e6d07d97ed4e41047b7f8d6c8742c1d9879a0694afb3aa87c437d398146bd0a2721f68ebb7563 WHIRLPOOL 7379623e836744a0d31af428c14ffe744888333c3f683a2af8e513e17604d1c315e0d34e58ef6ad677eda61c07fea3c703b9642910e2e5aedd53c89800be746f
+MISC ChangeLog 10773 SHA256 62cd344bf2dda6ae0ddea07c896ee292b552cb3ad49a0d1f51571175443cb09e SHA512 3432779d023d7ccf1bd8b6553228df7e1bd996b778ce0862bb56b292142cf237de5a11f2705c2893b59365d4d66afa59ab6c36d52b7cd0f5a020245203a0f7dd WHIRLPOOL f52f653d20eaaba10917185ccdc888c65b05e4ba3a2a8e9c78aa9c6fa6efcea457ddd476defa0fbdb267d8724a7dcde5f17e61a514aa3845f2f72b68bb0d66f8
 MISC metadata.xml 475 SHA256 dde0d0079de6cfad661da09b25a6b52bbabad7f4f04ee7c7b138d389a8e56a40 SHA512 b388605658b98f7a1a0a434cdb689d548c92b89936ed39b3d36c2fb35038da022963babafbd884292a8537f14b9d95164b19d71aaaf5521ee11d4f75683fbc69 WHIRLPOOL cf2cc2e08e403190efa4b8aed778c6653ae69a81102dee00d9783a2c650fd23984c8abd0a248b0aaecbfc2315ff9199a11ea3733027a4611e1c8118904773d48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSk4IIAAoJEGVpnaTzz9K9FK0P/17RJZY7PGWPgZfInbKr3uHm
-h9BWI/rtVwRLD2hRducXW+faGsUJB0wmAD/+w8I9tlD7G0lPT3lua3eBLyuf5fSu
-q/wFE/2txh70b3p5drFHiDJea4rhjdcA53ibE25iFlEEd6x2Et6LbrreLBmIx7RG
-hH42tNmiagcrOaVhQLcXqewZ1pjyj97LtDe8i7tTwo8slTNNfSIF83s+AwadU7Rh
-0EnvCVCrb29Cpn79EY6Q7QGJ1V++ftuj6ATaYn29EtZYRAruT9Aiwh3i1aeTY0jE
-YfjtYsKBWMRvliILCzHOIckG8KvZNdX1edRorKBSRvaxQRuO/vW9mErokM0M5Rv3
-cdUxJzeeB1aqADynl96ciJ5ABNN/h5EqrdD+/QKVEgWmtGjs3jR5+KgEe94qUWz4
-NX9hvlRrmGLreVf89P3IY/J696OAYqznSQCV1zoFi/PoMEOWN/rccUn86qkW4MCj
-EsEfKHYoq6Gci0odHpbjPbKBM68dfnAuaXDKM4vNvaPt9CuAW3bKlK2iOua9Q/+3
-glLXkbZJ9sZzYq52BsSEuie0zGU6wHRsSUIFXqkwVl2ylFW929IKqJ8LprWhDQiZ
-Pa2a2Y8W+lC+W83UfmlSxfFQyg4Xmot8u1y9Mi5fwpcVhxs3AoxBerG/S+W5nyGf
-Iq8s+iE4hnbIaAAiTQdY
-=jAUg
+iQIcBAEBCAAGBQJSmOp6AAoJEGVpnaTzz9K9/BkQAKg7j1vj3KNPdbQ+2ijFcWnL
+2OOuzG3/AHzgj9RpwNw4bYsT5wwGCvEcsislrAExb5xVvYEFlfycXsgoCAy1j9Ai
+esOAxbTb/Ob/kbZBfJCGhJwOlEPlsMwnr9HlcY6mxhDQfJa7fFiQ2ln7Fj02y+xe
+MdvJELs/qc/o9Hp2Y3O67DgRJ3IrSlT38IkHJLTKfP81ZP5LZV4cko7SracWylCN
+0nMHZEx5saAETOTbnjxKowhXNG7U0LVVK7Tr+ecJegshR3GgR9/vR2ocx71LK2V5
+JjeczPIcILHlClvNLWrzK+l1kMs0sCz6ykggZUmDZ3ciF+UK/VaMz0lB8u6BGJTb
+29IjZslh6yFilVBSQHdao3eDwGCqauzlvB1FJpv8iKBBkW9vNSRhqQplJlsPZb6D
+IS3uCdbO+2z2yt31XgCtqBtwhChw8mBTneTFcgofVqR6Q6fK4X4VyBDfdDMxzAuB
+REuQ4d3wz66LjbTOaA/w8aqCuSSRLZSwd9zIZk832NMDliMo58RaCWLb32rKBduP
+O6FiZG3ikIWh7yDQiAE1U9udeGFZ9VKWfKDyfCecNtxRmXq1SwvsRG1yXUor6Bru
+/JvPCj2YVXXuKwgwk41CgIzCgvMJzaeQDsyAQpobJ85DTYqGEjLkTIe32kp0OvDS
+LWW5aLIeErbaB4rYwj8i
+=0ShJ
 -----END PGP SIGNATURE-----
diff --git a/media-sound/kid3/files/kid3-3.0.1-empty-linguas.patch b/media-sound/kid3/files/kid3-3.0.1-empty-linguas.patch
deleted file mode 100644
index ad9c1097f1d3..000000000000
--- a/media-sound/kid3/files/kid3-3.0.1-empty-linguas.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 94f91f422fbbaaa4af7e46cdaf8fb55c5f675b93
-Author: Urs Fleisch <ufleisch@users.sourceforge.net>
-Date:   Mon Nov 25 07:55:53 2013 +0100
-
-    Enable building with all translations disabled, [bugs:#84].
-    
-    In Gentoo, it is possible to disable linguas by renaming them from
-    .po to .po.old. If all po files are disabled this way, cmake failed.
-
-diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
-index f036ea6..6cd9fdb 100644
---- a/po/CMakeLists.txt
-+++ b/po/CMakeLists.txt
-@@ -22,13 +22,15 @@ if (APPLE OR WIN32)
-   endforeach (_currentPoFile)
- endif (APPLE OR WIN32)
- 
--add_custom_command(
--   OUTPUT ${_tsFiles}
--   COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/po2ts.pl
--     ${QT_LUPDATE_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}
--     ${CMAKE_CURRENT_SOURCE_DIR}/../src
--   DEPENDS ${_poFiles}
--)
-+if (_tsFiles)
-+  add_custom_command(
-+     OUTPUT ${_tsFiles}
-+     COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/po2ts.pl
-+       ${QT_LUPDATE_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}
-+       ${CMAKE_CURRENT_SOURCE_DIR}/../src
-+     DEPENDS ${_poFiles}
-+  )
-+endif (_tsFiles)
- if (APPLE OR WIN32)
-   qt4_add_translation(_qmFiles ${_tsFiles} ${_qtTsFiles})
-   add_custom_target(translations "ALL" DEPENDS ${_qmFiles})
diff --git a/media-sound/kid3/files/kid3-3.0.1-qt5-automagic.patch b/media-sound/kid3/files/kid3-3.0.1-qt5-automagic.patch
deleted file mode 100644
index 1131a6ddd900..000000000000
--- a/media-sound/kid3/files/kid3-3.0.1-qt5-automagic.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-commit eb0f92737ec44c496b34e6a370a16cda83dc391c
-Author: Urs Fleisch <ufleisch@users.sourceforge.net>
-Date:   Sat Nov 23 10:41:40 2013 +0100
-
-    Fix automagic detection of Qt5, [bugs:#84].
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1f47bc2..c5bd306 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -23,6 +23,8 @@ project(kid3)
- cmake_minimum_required(VERSION 2.8)
- 
- set(BUILD_SHARED_LIBS ON CACHE BOOL "build shared libraries")
-+set(WITH_QT4 OFF CACHE BOOL "force use of Qt4")
-+set(WITH_QT5 OFF CACHE BOOL "force use of Qt5")
- set(WITH_TAGLIB ON CACHE BOOL "build with TagLib")
- set(WITH_MP4V2 OFF CACHE BOOL "build with mp4v2")
- set(WITH_ID3LIB ON CACHE BOOL "build with id3lib")
-@@ -152,83 +154,111 @@ include (CheckCXXSourceCompiles)
- include (CheckCXXCompilerFlag)
- include (CheckLibraryExists)
- 
--
-+# Find Qt
-+set(_qt5Dir)
- set(QT_EXECUTABLE_COMPILE_FLAGS)
--string(REGEX MATCH "^(.*[Qq]t5.*).bin.qmake.*" _qt5Dir "${QT_QMAKE_EXECUTABLE}")
--if (_qt5Dir)
--  set(_qt5Dir ${CMAKE_MATCH_1})
--endif (_qt5Dir)
--
--if (NOT _qt5Dir)
-+if (NOT WITH_QT4)
-+  string(REGEX MATCH "^(.*[Qq]t5.*).bin.qmake.*" _qt5Dir "${QT_QMAKE_EXECUTABLE}")
-+  if (_qt5Dir)
-+    set(_qt5Dir ${CMAKE_MATCH_1})
-+  endif (_qt5Dir)
-+endif (NOT WITH_QT4)
-+
-+if (NOT WITH_QT5 AND NOT _qt5Dir)
-   set(_QT4_COMPONENTS QtCore QtGui QtNetwork QtXml)
-   if (WIN32)
-     set(QT_USE_QTMAIN TRUE)
-   endif (WIN32)
-   set(QT_USE_QTDBUS ${WITH_DBUS})
-   find_package(Qt4 COMPONENTS ${_QT4_COMPONENTS})
--  if (QT_QMAKE_EXECUTABLE)
-+  if (Qt4_FOUND)
-     include (${QT_USE_FILE})
--    message(STATUS "Qt4 found, explicitly set QT_QMAKE_EXECUTABLE to use a different version.")
--  else (QT_QMAKE_EXECUTABLE)
-+    if (NOT WITH_QT4)
-+      message(STATUS "Qt4 found, explicitly set WITH_QT5 or QT_QMAKE_EXECUTABLE to use a different version.")
-+    endif (NOT WITH_QT4)
-+  endif (Qt4_FOUND)
-+endif (NOT WITH_QT5 AND NOT _qt5Dir)
-+
-+if (NOT WITH_QT4 AND NOT Qt4_FOUND)
-+  if (_qt5Dir)
-+    set(Qt5Core_DIR "${_qt5Dir}/lib/cmake/Qt5Core")
-     find_package(Qt5Core)
--    if (Qt5Core_QMAKE_EXECUTABLE)
--      set(_qt5Dir ${_qt5_corelib_install_prefix})
--    else (Qt5Core_QMAKE_EXECUTABLE)
--      message(FATAL_ERROR "Neither Qt4 nor Qt5 found.")
--    endif (Qt5Core_QMAKE_EXECUTABLE)
--  endif (QT_QMAKE_EXECUTABLE)
--endif (NOT _qt5Dir)
--
--if (_qt5Dir)
--  set(HAVE_QT5 1)
--  set(WITH_PHONON OFF)
--  set(Qt5Core_DIR "${_qt5Dir}/lib/cmake/Qt5Core")
--  set(Qt5Gui_DIR "${_qt5Dir}/lib/cmake/Qt5Gui")
--  set(Qt5Widgets_DIR "${_qt5Dir}/lib/cmake/Qt5Widgets")
--  set(Qt5Network_DIR "${_qt5Dir}/lib/cmake/Qt5Network")
--  set(Qt5Xml_DIR "${_qt5Dir}/lib/cmake/Qt5Xml")
--  set(Qt5Multimedia_DIR "${_qt5Dir}/lib/cmake/Qt5Multimedia")
--  set(Qt5LinguistTools_DIR "${_qt5Dir}/lib/cmake/Qt5LinguistTools")
--  set(Qt5Test_DIR "${_qt5Dir}/lib/cmake/Qt5Test")
--  set(QT_INCLUDES)
--  set(QT_DEFINITIONS)
--  set(QT_LIBRARIES)
--  foreach (_qt5Component Core Gui Widgets Network Xml Multimedia LinguistTools Test)
--    find_package("Qt5${_qt5Component}")
--    set(QT_INCLUDES ${QT_INCLUDES} ${Qt5${_qt5Component}_INCLUDE_DIRS})
--    set(QT_DEFINITIONS ${QT_DEFINITIONS} ${Qt5${_qt5Component}_DEFINITIONS})
--    set(QT_LIBRARIES ${QT_LIBRARIES} ${Qt5${_qt5Component}_LIBRARIES})
--  endforeach ()
--  set(QT_EXECUTABLE_COMPILE_FLAGS ${Qt5Core_EXECUTABLE_COMPILE_FLAGS})
--  if (WITH_DBUS)
--    set(Qt5DBus_DIR "${_qt5Dir}/lib/cmake/Qt5DBus")
--    find_package("Qt5DBus")
--    if (Qt5DBus_LIBRARIES)
--      set(QT_INCLUDES ${QT_INCLUDES} ${Qt5DBus_INCLUDE_DIRS})
--      set(QT_DEFINITIONS ${QT_DEFINITIONS} ${Qt5DBus_DEFINITIONS})
--      set(QT_LIBRARIES ${QT_LIBRARIES} ${Qt5DBus_LIBRARIES})
-+    if (Qt5Core_FOUND)
-+      message(STATUS "Qt5Core found in ${_qt5Dir}")
-+      set(Qt5Gui_DIR "${_qt5Dir}/lib/cmake/Qt5Gui")
-+      set(Qt5Widgets_DIR "${_qt5Dir}/lib/cmake/Qt5Widgets")
-+      set(Qt5Network_DIR "${_qt5Dir}/lib/cmake/Qt5Network")
-+      set(Qt5Xml_DIR "${_qt5Dir}/lib/cmake/Qt5Xml")
-+      set(Qt5Multimedia_DIR "${_qt5Dir}/lib/cmake/Qt5Multimedia")
-+      set(Qt5LinguistTools_DIR "${_qt5Dir}/lib/cmake/Qt5LinguistTools")
-+      set(Qt5Test_DIR "${_qt5Dir}/lib/cmake/Qt5Test")
-+      if (WITH_DBUS)
-+        set(Qt5DBus_DIR "${_qt5Dir}/lib/cmake/Qt5DBus")
-+      endif (WITH_DBUS)
-+    endif (Qt5Core_FOUND)
-+  else (_qt5Dir)
-+    find_package(Qt5Core)
-+  endif (_qt5Dir)
-+  if (Qt5Core_FOUND)
-+    set(HAVE_QT5 1)
-+    set(WITH_PHONON OFF)
-+    set(QT_INCLUDES)
-+    set(QT_DEFINITIONS)
-+    set(QT_LIBRARIES)
-+    set(_qt5Components Core Gui Widgets Network Xml Multimedia LinguistTools Test)
-+    if (WITH_DBUS)
-+      set(_qt5Components ${_qt5Components} DBus)
-+    endif (WITH_DBUS)
-+    foreach (_qt5Component ${_qt5Components})
-+      find_package("Qt5${_qt5Component}")
-+      if (Qt5${_qt5Component}_FOUND)
-+        set(QT_INCLUDES ${QT_INCLUDES} ${Qt5${_qt5Component}_INCLUDE_DIRS})
-+        set(QT_DEFINITIONS ${QT_DEFINITIONS} ${Qt5${_qt5Component}_DEFINITIONS})
-+        set(QT_LIBRARIES ${QT_LIBRARIES} ${Qt5${_qt5Component}_LIBRARIES})
-+      endif (Qt5${_qt5Component}_FOUND)
-+    endforeach ()
-+    if (Qt5DBus_FOUND)
-       set(HAVE_QTDBUS 1)
--    endif (Qt5DBus_LIBRARIES)
--  endif (WITH_DBUS)
--  set(QT_LIBRARY_DIR "${_qt5Dir}/lib")
--  set(QT_INCLUDE_DIR "${_qt5Dir}/include")
--  set(QT_LUPDATE_EXECUTABLE ${_qt5Dir}/bin/lupdate)
--  set(QT_PLUGINS_DIR ${_qt5Dir}/plugins)
--
--  macro(qt4_add_translation)
--    qt5_add_translation(${ARGV})
--  endmacro(qt4_add_translation)
--
--  macro(qt4_wrap_cpp)
--    qt5_wrap_cpp(${ARGV})
--  endmacro(qt4_wrap_cpp)
--
--  macro(qt4_add_resources)
--    qt5_add_resources(${ARGV})
--  endmacro(qt4_add_resources)
--
--  message(STATUS "Found Qt5: ${_qt5_corelib_install_prefix} (found version \"${Qt5Core_VERSION_STRING}\")")
--endif (_qt5Dir)
-+    endif (Qt5DBus_FOUND)
-+    set(QT_EXECUTABLE_COMPILE_FLAGS ${Qt5Core_EXECUTABLE_COMPILE_FLAGS})
-+    get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
-+    get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
-+    get_target_property(QT_LUPDATE_EXECUTABLE Qt5::lupdate LOCATION)
-+    get_target_property(QT_PLUGINS_DIR Qt5::QJpegPlugin LOCATION)
-+    if (QT_PLUGINS_DIR)
-+      get_filename_component(QT_PLUGINS_DIR ${QT_PLUGINS_DIR} PATH)
-+      get_filename_component(QT_PLUGINS_DIR ${QT_PLUGINS_DIR} PATH)
-+    elseif (_qt5Dir)
-+      set(QT_PLUGINS_DIR ${_qt5Dir}/plugins)
-+    else (QT_PLUGINS_DIR)
-+      # Before Qt 5.2, there seems to be no way to get the plugins directory.
-+      # Assume it is on the same level as the bin directory.
-+      get_filename_component(QT_PLUGINS_DIR ${QT_LUPDATE_EXECUTABLE} PATH)
-+      get_filename_component(QT_PLUGINS_DIR ${QT_PLUGINS_DIR} PATH)
-+      set(QT_PLUGINS_DIR ${QT_PLUGINS_DIR}/plugins)
-+    endif (QT_PLUGINS_DIR)
-+
-+    macro(qt4_add_translation)
-+      qt5_add_translation(${ARGV})
-+    endmacro(qt4_add_translation)
-+
-+    macro(qt4_wrap_cpp)
-+      qt5_wrap_cpp(${ARGV})
-+    endmacro(qt4_wrap_cpp)
-+
-+    macro(qt4_add_resources)
-+      qt5_add_resources(${ARGV})
-+    endmacro(qt4_add_resources)
-+
-+    get_target_property(_qmakeLocation Qt5::qmake LOCATION)
-+    message(STATUS "Found Qt-Version ${Qt5Core_VERSION_STRING} (using ${_qmakeLocation})")
-+  endif (Qt5Core_FOUND)
-+endif (NOT WITH_QT4 AND NOT Qt4_FOUND)
-+
-+if (NOT Qt4_FOUND AND NOT Qt5Core_FOUND)
-+  message(FATAL_ERROR "Neither Qt4 nor Qt5 found.")
-+endif (NOT Qt4_FOUND AND NOT Qt5Core_FOUND)
-+
- 
- # Check that QT_NO_DEBUG is defined for release configurations
- foreach (_buildType RELWITHDEBINFO RELEASE MINSIZEREL)
diff --git a/media-sound/kid3/files/kid3-3.0.1-rpath.patch b/media-sound/kid3/files/kid3-3.0.1-rpath.patch
deleted file mode 100644
index da3fc2b095f4..000000000000
--- a/media-sound/kid3/files/kid3-3.0.1-rpath.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
-index 3eeaa3b..070d040 100644
---- a/src/app/CMakeLists.txt
-+++ b/src/app/CMakeLists.txt
-@@ -19,6 +19,21 @@ endif (BUILD_QT_APP)
- if (BUILD_KDE_APP)
-   find_package(KDE4 REQUIRED)
-   include (KDE4Defaults)
-+
-+  if (BUILD_SHARED_LIBS)
-+    # FindKDE4Internal.cmake will overwrite our RPATH if LIB_INSTALL_DIR (which
-+    # defaults to ${CMAKE_INSTALL_PREFIX}/lib) is not an implicit link directory.
-+    # In practice this means that most values for CMAKE_INSTALL_PREFIX other
-+    # than /usr will cause the RPATH to be overwritten and the kid3 executable
-+    # will not find its libraries. This happens also for the default value
-+    # /usr/local for CMAKE_INSTALL_PREFIX.
-+    # The RPATH is set again here to reverse this.
-+    list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${WITH_LIBDIR}" _isSystemDir)
-+    if ("${_isSystemDir}" STREQUAL "-1")
-+       set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${WITH_LIBDIR}")
-+    endif ("${_isSystemDir}" STREQUAL "-1")
-+  endif (BUILD_SHARED_LIBS)
-+
-   add_subdirectory(kde)
-   kde4_install_icons(${ICON_INSTALL_DIR})
- endif (BUILD_KDE_APP)
diff --git a/media-sound/kid3/kid3-3.0.1.ebuild b/media-sound/kid3/kid3-3.0.2.ebuild
index 8c4e178e0559..baf8c89c7753 100644
--- a/media-sound/kid3/kid3-3.0.1.ebuild
+++ b/media-sound/kid3/kid3-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-3.0.1.ebuild,v 1.2 2013/11/25 16:59:47 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-3.0.2.ebuild,v 1.1 2013/11/29 19:26:46 johu Exp $
 
 EAPI=5
 
@@ -43,12 +43,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-qt5-automagic.patch"
-	"${FILESDIR}/${P}-rpath.patch"
-	"${FILESDIR}/${P}-empty-linguas.patch"
-)
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with acoustid CHROMAPRINT)