From 45f421bb8ef5ba6193b15d4fbe519dc1785fb00c Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Wed, 23 Mar 2016 15:46:28 +0100 Subject: media-sound/kid3: Fixed location of plugins dir (bug #576946). Thanks to Gramiel for findinf the root cause and to jjtt for providing a patch. Package-Manager: portage-2.2.28 Signed-off-by: Lars Wendler --- media-sound/kid3/files/kid3-3.3.2-libdir.patch | 44 ++++++++++++++++ media-sound/kid3/kid3-3.3.2-r1.ebuild | 73 ++++++++++++++++++++++++++ media-sound/kid3/kid3-3.3.2.ebuild | 73 -------------------------- 3 files changed, 117 insertions(+), 73 deletions(-) create mode 100644 media-sound/kid3/files/kid3-3.3.2-libdir.patch create mode 100644 media-sound/kid3/kid3-3.3.2-r1.ebuild delete mode 100644 media-sound/kid3/kid3-3.3.2.ebuild (limited to 'media-sound/kid3') 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 000000000000..b54bf129693c --- /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-r1.ebuild b/media-sound/kid3/kid3-3.3.2-r1.ebuild new file mode 100644 index 000000000000..c52b7b3a61a0 --- /dev/null +++ b/media-sound/kid3/kid3-3.3.2-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +KDE_LINGUAS="cs de es et fi fr it nl pl ru sr sr@ijekavian sr@ijekavianlatin +sr@Latn tr zh_CN zh_TW" +KDE_REQUIRED="optional" +KDE_HANDBOOK="optional" +inherit kde4-base + +DESCRIPTION="A simple tag editor for KDE" +HOMEPAGE="http://kid3.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="4" +KEYWORDS="~amd64 ~x86" +IUSE="acoustid flac kde mp3 mp4 +phonon +taglib vorbis" + +REQUIRED_USE="flac? ( vorbis )" + +RDEPEND=" + dev-qt/qtcore:4 + dev-qt/qtdbus:4 + dev-qt/qtdeclarative:4 + dev-qt/qtgui:4 + sys-libs/readline:0 + acoustid? ( + media-libs/chromaprint + virtual/ffmpeg + ) + flac? ( + media-libs/flac[cxx] + media-libs/libvorbis + ) + mp3? ( media-libs/id3lib ) + mp4? ( media-libs/libmp4v2:0 ) + phonon? ( || ( + media-libs/phonon[qt4] + dev-qt/qtphonon:4 + ) ) + taglib? ( >=media-libs/taglib-1.9.1 ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) +" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-3.3.2-libdir.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_with acoustid CHROMAPRINT) + $(cmake-utils_use_with flac) + $(cmake-utils_use_with mp3 ID3LIB) + $(cmake-utils_use_with mp4 MP4V2) + $(cmake-utils_use_with phonon) + $(cmake-utils_use_with taglib) + $(cmake-utils_use_with vorbis) + "-DWITH_QT5=OFF" + ) + + if use kde; then + mycmakeargs+=("-DWITH_APPS=KDE;CLI") + else + mycmakeargs+=("-DWITH_APPS=Qt;CLI") + fi + + kde4-base_src_configure +} diff --git a/media-sound/kid3/kid3-3.3.2.ebuild b/media-sound/kid3/kid3-3.3.2.ebuild deleted file mode 100644 index 72088708640c..000000000000 --- a/media-sound/kid3/kid3-3.3.2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -KDE_LINGUAS="cs de es et fi fr it nl pl ru sr sr@ijekavian sr@ijekavianlatin -sr@Latn tr zh_CN zh_TW" -KDE_REQUIRED="optional" -KDE_HANDBOOK="optional" -inherit kde4-base - -DESCRIPTION="A simple tag editor for KDE" -HOMEPAGE="http://kid3.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="4" -KEYWORDS="~amd64 ~x86" -IUSE="acoustid flac kde mp3 mp4 +phonon +taglib vorbis" - -REQUIRED_USE="flac? ( vorbis )" - -RDEPEND=" - dev-qt/qtcore:4 - dev-qt/qtdbus:4 - dev-qt/qtdeclarative:4 - dev-qt/qtgui:4 - sys-libs/readline:0 - acoustid? ( - media-libs/chromaprint - virtual/ffmpeg - ) - flac? ( - media-libs/flac[cxx] - media-libs/libvorbis - ) - mp3? ( media-libs/id3lib ) - mp4? ( media-libs/libmp4v2:0 ) - phonon? ( || ( - media-libs/phonon[qt4] - dev-qt/qtphonon:4 - ) ) - taglib? ( >=media-libs/taglib-1.9.1 ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) -" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-3.2.1-libdir.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_with acoustid CHROMAPRINT) - $(cmake-utils_use_with flac) - $(cmake-utils_use_with mp3 ID3LIB) - $(cmake-utils_use_with mp4 MP4V2) - $(cmake-utils_use_with phonon) - $(cmake-utils_use_with taglib) - $(cmake-utils_use_with vorbis) - "-DWITH_QT5=OFF" - ) - - if use kde; then - mycmakeargs+=("-DWITH_APPS=KDE;CLI") - else - mycmakeargs+=("-DWITH_APPS=Qt;CLI") - fi - - kde4-base_src_configure -} -- cgit v1.2.3-65-gdbad