media-sound/kid3: install libs to correct directory

Package-Manager: portage-2.2.27

diff --git a/media-sound/kid3/files/kid3-3.2.1-libdir.patch b/media-sound/kid3/files/kid3-3.2.1-libdir.patch
new file mode 100644 (file)
index 0000000..b65eb3b
--- /dev/null
+++ b/media-sound/kid3/files/kid3-3.2.1-libdir.patch
@@ -0,0 +1,43 @@
+Install libraries to the correct directory.
+
+Gentoo-bug: 562624
+Gentoo-bug: 570976
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -134,7 +134,7 @@
+   endif (BUILD_KDE_APP OR BUILD_SHARED_LIBS)
+   set(WITH_QMLDIR_DEFAULT "share/kid3/qml")
+   set(WITH_BINDIR_DEFAULT "bin")
+-  set(WITH_LIBDIR_DEFAULT "lib${LIB_SUFFIX}/kid3")
++  set(WITH_LIBDIR_DEFAULT "lib${LIB_SUFFIX}")
+   set(WITH_PLUGINSDIR_DEFAULT "${WITH_LIBDIR_DEFAULT}/plugins")
+ endif (APPLE)
+ 
+@@ -203,6 +203,7 @@
+   find_package(Qt4 COMPONENTS ${_QT4_COMPONENTS})
+   if (Qt4_FOUND OR QT4_FOUND)
+     include (${QT_USE_FILE})
++    set(QTVER "qt4")
+     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)
+@@ -235,6 +236,7 @@
+   endif (_qt5Dir)
+   if (Qt5Core_FOUND)
+     set(HAVE_QT5 1)
++    set(QTVER "qt5")
+     set(WITH_PHONON OFF)
+     set(QT_INCLUDES)
+     set(QT_DEFINITIONS)
+@@ -340,6 +342,10 @@
+   link_directories($ENV{LIB})
+ endif (WIN32)
+ 
++if (NOT APPLE AND NOT WIN32)
++  set(WITH_PLUGINSDIR "${WITH_LIBDIR_DEFAULT}/${QTVER}/plugins/kid3")
++endif ()
++
+ if (BUILD_SHARED_LIBS)
+   add_definitions(-DKID3_SHARED)
+ 

diff --git a/media-sound/kid3/kid3-3.2.1.ebuild b/media-sound/kid3/kid3-3.2.1-r1.ebuild
similarity index 92%
rename from media-sound/kid3/kid3-3.2.1.ebuild
rename to media-sound/kid3/kid3-3.2.1-r1.ebuild
index 3afd6e610bb975000a50758e7df73f9aa0d4e1ba..d1c622602cf952593a25e44cadda8b12506f0b6a 100644 (file)
--- a/media-sound/kid3/kid3-3.2.1.ebuild
+++ b/media-sound/kid3/kid3-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -48,7 +48,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-fix-cmake.patch" )
+PATCHES=(
+       "${FILESDIR}/${P}-libdir.patch"
+       "${FILESDIR}/${P}-fix-cmake.patch"
+)
 
 src_configure() {
        local mycmakeargs=(