From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-871773-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 4EF0559CA6
for <garchives@archives.gentoo.org>; Wed, 23 Mar 2016 14:47:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C176321C09E;
Wed, 23 Mar 2016 14:47:15 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 1CD0D21C09E
for <gentoo-commits@lists.gentoo.org>; Wed, 23 Mar 2016 14:47:15 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 259E6340C34
for <gentoo-commits@lists.gentoo.org>; Wed, 23 Mar 2016 14:47:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D9F9866
for <gentoo-commits@lists.gentoo.org>; Wed, 23 Mar 2016 14:47:09 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" <polynomial-c@gentoo.org>
Message-ID: <1458744425.45f421bb8ef5ba6193b15d4fbe519dc1785fb00c.polynomial-c@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/kid3/, media-sound/kid3/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-sound/kid3/files/kid3-3.3.2-libdir.patch media-sound/kid3/kid3-3.3.2-r1.ebuild media-sound/kid3/kid3-3.3.2.ebuild
X-VCS-Directories: media-sound/kid3/files/ media-sound/kid3/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: 45f421bb8ef5ba6193b15d4fbe519dc1785fb00c
X-VCS-Branch: master
Date: Wed, 23 Mar 2016 14:47:09 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: ea919d28-cd72-4d4e-b466-1eec626cfefd
X-Archives-Hash: a2f7d74d3973588bd1e6429164dff26b
commit: 45f421bb8ef5ba6193b15d4fbe519dc1785fb00c
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 14:46:28 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 14:47:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45f421bb
media-sound/kid3: Fixed location of plugins dir (bug #576946).
Thanks to Gramiel <gentoo.bugs <AT> mailinator.com> for findinf the root
cause and to jjtt <jjtt <AT> mbnet.fi> for providing a patch.
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-sound/kid3/files/kid3-3.3.2-libdir.patch | 44 ++++++++++++++++++++++
.../{kid3-3.3.2.ebuild => kid3-3.3.2-r1.ebuild} | 2 +-
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/media-sound/kid3/files/kid3-3.3.2-libdir.patch b/media-sound/kid3/files/kid3-3.3.2-libdir.patch
new file mode 100644
index 0000000..b54bf12
--- /dev/null
+++ b/media-sound/kid3/files/kid3-3.3.2-libdir.patch
@@ -0,0 +1,44 @@
+Install libraries to the correct directory.
+
+Gentoo-bug: 562624
+Gentoo-bug: 570976
+Gentoo-bug: 576946
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -159,7 +159,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)
+
+@@ -189,6 +189,10 @@
+ set(CMAKE_INSTALL_PREFIX_SLASH "")
+ endif (CMAKE_INSTALL_PREFIX)
+
++if (NOT APPLE AND NOT WIN32)
++ set(WITH_PLUGINSDIR "${WITH_LIBDIR_DEFAULT}/${QTVER}/plugins/kid3")
++endif ()
++
+ if (APPLE)
+ file(RELATIVE_PATH CFG_DATAROOTDIR "/kid3.app/Contents/MacOS" /${WITH_DATAROOTDIR})
+ file(RELATIVE_PATH CFG_DOCDIR "/kid3.app/Contents/MacOS" /${WITH_DOCDIR})
+@@ -241,6 +245,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)
+@@ -276,6 +281,7 @@
+ endif (_qt5Dir)
+ if (Qt5Core_FOUND)
+ set(HAVE_QT5 1)
++ set(QTVER "qt5")
+ set(WITH_PHONON OFF)
+ set(QT_INCLUDES)
+ set(QT_DEFINITIONS)
diff --git a/media-sound/kid3/kid3-3.3.2.ebuild b/media-sound/kid3/kid3-3.3.2-r1.ebuild
similarity index 96%
rename from media-sound/kid3/kid3-3.3.2.ebuild
rename to media-sound/kid3/kid3-3.3.2-r1.ebuild
index 7208870..c52b7b3 100644
--- a/media-sound/kid3/kid3-3.3.2.ebuild
+++ b/media-sound/kid3/kid3-3.3.2-r1.ebuild
@@ -49,7 +49,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-3.2.1-libdir.patch" )
+PATCHES=( "${FILESDIR}/${PN}-3.3.2-libdir.patch" )
src_configure() {
local mycmakeargs=(