* [gentoo-commits] repo/gentoo:master commit in: media-sound/kid3/, media-sound/kid3/files/
@ 2016-01-04 18:42 Michael Palimaka
0 siblings, 0 replies; 9+ messages in thread
From: Michael Palimaka @ 2016-01-04 18:42 UTC (permalink / raw
To: gentoo-commits
commit: 0c4ee1490794daabb1a3bd59244f3a2a96b2b6cc
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Jan 1 19:33:46 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan 4 18:42:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c4ee149
media-sound/kid3: Fix configure with >=kdelibs-4.14.11
Package-Manager: portage-2.2.24
media-sound/kid3/files/kid3-3.2.1-fix-cmake.patch | 61 +++++++++++++++++++++++
media-sound/kid3/kid3-3.2.1.ebuild | 2 +
2 files changed, 63 insertions(+)
diff --git a/media-sound/kid3/files/kid3-3.2.1-fix-cmake.patch b/media-sound/kid3/files/kid3-3.2.1-fix-cmake.patch
new file mode 100644
index 0000000..0644690
--- /dev/null
+++ b/media-sound/kid3/files/kid3-3.2.1-fix-cmake.patch
@@ -0,0 +1,61 @@
+commit c126ad8142c51476c4a1b78ab9e6d7409656b312
+Author: Michael Palimaka <kensington@gentoo.org>
+Date: Tue Aug 25 00:05:20 2015 +1000
+
+ Fix build with kdelibs-4.14.11.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ab5d20..99cf392 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -473,6 +473,13 @@ else (UNIX AND NOT APPLE)
+ set(KID3_EXECUTABLE kid3)
+ endif (UNIX AND NOT APPLE)
+
++if (BUILD_KDE_APP)
++ if (NOT HAVE_QT5)
++ find_package(KDE4 REQUIRED)
++ include (KDE4Defaults)
++ add_definitions(${KDE4_ENABLE_EXCEPTIONS})
++ endif (NOT HAVE_QT5)
++endif (BUILD_KDE_APP)
+
+ configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
+diff --git a/doc/de/CMakeLists.txt b/doc/de/CMakeLists.txt
+index 6f25b68..70f6793 100644
+--- a/doc/de/CMakeLists.txt
++++ b/doc/de/CMakeLists.txt
+@@ -2,7 +2,6 @@ if (BUILD_KDE_APP)
+ if (HAVE_QT5)
+ kf5_create_handbook(index.docbook)
+ else (HAVE_QT5)
+- find_package(KDE4 REQUIRED)
+ kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/de SUBDIR kid3)
+ endif (HAVE_QT5)
+ endif (BUILD_KDE_APP)
+diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
+index b3751b3..7cff8e1 100644
+--- a/doc/en/CMakeLists.txt
++++ b/doc/en/CMakeLists.txt
+@@ -2,7 +2,6 @@ if (BUILD_KDE_APP)
+ if (HAVE_QT5)
+ kf5_create_handbook(index.docbook)
+ else (HAVE_QT5)
+- find_package(KDE4 REQUIRED)
+ kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kid3)
+ endif (HAVE_QT5)
+ endif (BUILD_KDE_APP)
+diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
+index d19ebb5..516e3f9 100644
+--- a/src/app/CMakeLists.txt
++++ b/src/app/CMakeLists.txt
+@@ -65,8 +65,6 @@ if (BUILD_KDE_APP)
+ )
+ else (HAVE_QT5)
+ set(_cmakeInstallRpath "${CMAKE_INSTALL_RPATH}")
+- find_package(KDE4 REQUIRED)
+- include (KDE4Defaults)
+
+ if (BUILD_SHARED_LIBS)
+ # FindKDE4Internal.cmake will overwrite our RPATH if LIB_INSTALL_DIR (which
diff --git a/media-sound/kid3/kid3-3.2.1.ebuild b/media-sound/kid3/kid3-3.2.1.ebuild
index f6be3bc..3afd6e6 100644
--- a/media-sound/kid3/kid3-3.2.1.ebuild
+++ b/media-sound/kid3/kid3-3.2.1.ebuild
@@ -48,6 +48,8 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/${P}-fix-cmake.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_with acoustid CHROMAPRINT)
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/kid3/, media-sound/kid3/files/
@ 2016-03-23 14:47 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2016-03-23 14:47 UTC (permalink / raw
To: gentoo-commits
commit: 343b7ba0b7b06ce8d6f3c795c475ad5d0a008d09
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 14:22:32 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 14:47:02 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=343b7ba0
media-sound/kid3: Removed old.
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-sound/kid3/Manifest | 2 -
media-sound/kid3/files/kid3-3.2.1-fix-cmake.patch | 61 ------------------
media-sound/kid3/kid3-3.1.2.ebuild | 70 ---------------------
media-sound/kid3/kid3-3.2.1-r1.ebuild | 75 -----------------------
4 files changed, 208 deletions(-)
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 751aca6..af7d4df 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,4 +1,2 @@
-DIST kid3-3.1.2.tar.gz 1109060 SHA256 085097a653877ef56dd719083da1ab005944826ce215141fe3f6d4285e5f6246 SHA512 5f6912bd4e7e2e8e641e001fcb487489e7ea0861a3d6cda02388a3774ef010d6db1803d701e2befc824d86f347d6a29b05750d5d7a186cd7cf877f2848205677 WHIRLPOOL 01dd5e1ae09893058250cf85c24a61ea64cd76a5baa124b32d1f7b13a7f67cc4c11ca1ecfc6eb98a6036ea31be59baa2fa09bb4aecca831d8c1432a9f3018023
-DIST kid3-3.2.1.tar.gz 1215072 SHA256 da686929b5329f910b96b4fd1a10d490ffac4a604be22a795405460871afe494 SHA512 1ef6f432ac9f6e1c9ae1a400f8f8a34f8cabab76e0c501dca5cd56df5e675dc15109f978dc0f1f86ebd873d96194a7f39945f84d1c84385ee523da3680438180 WHIRLPOOL 98dc4e7ce84c14a71bc4b0499d4cb1be385dca1fdd2ef39674cea242b733767cb6b74e3bb69d28b4e6406400c556c4d75cfb4006569cadc3c033719b60acd7a0
DIST kid3-3.3.1.tar.gz 1339124 SHA256 8acf344d3f6651bccc7994d9e3c9602777892c744828fd2e455d617293c8e74d SHA512 fb112f01018bf744dc802c640ef134f539ee603145249ed0db2c3cc2f7ad3ebc96b3c9e9bd3fac3ee85e081f5e567790d68cecd661a7ac340732c03bf3fbfd85 WHIRLPOOL 0d76e181798dbc8432490af40dcd5c48d8e2db0d67da30e2c3227dce639391e2922b76dde1ab27e75cb85301507e713df9efab31550968fd680b2ef7c5edfd72
DIST kid3-3.3.2.tar.gz 1340078 SHA256 d54c164e38ee8ff2c35473a7158e2748cbb6a9472822a96decf6e34a15458957 SHA512 8bd1e003ba1d4f169cf7da8c151040f5e7b993c03ae9d8dfdd3bd8d1dc88fbf4b3fef37c0d3d339da83333b4a60e3ef9362e962e37ae7747c6bd010f4565d025 WHIRLPOOL 07632afee63eab29374bae2207b97713ba808f90b080dc5be12a4a25c3db9e9252c893b4fd1932f10240bb171a029738275a799e06b26c3135661689eaf59a97
diff --git a/media-sound/kid3/files/kid3-3.2.1-fix-cmake.patch b/media-sound/kid3/files/kid3-3.2.1-fix-cmake.patch
deleted file mode 100644
index 0644690..0000000
--- a/media-sound/kid3/files/kid3-3.2.1-fix-cmake.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-commit c126ad8142c51476c4a1b78ab9e6d7409656b312
-Author: Michael Palimaka <kensington@gentoo.org>
-Date: Tue Aug 25 00:05:20 2015 +1000
-
- Fix build with kdelibs-4.14.11.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3ab5d20..99cf392 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -473,6 +473,13 @@ else (UNIX AND NOT APPLE)
- set(KID3_EXECUTABLE kid3)
- endif (UNIX AND NOT APPLE)
-
-+if (BUILD_KDE_APP)
-+ if (NOT HAVE_QT5)
-+ find_package(KDE4 REQUIRED)
-+ include (KDE4Defaults)
-+ add_definitions(${KDE4_ENABLE_EXCEPTIONS})
-+ endif (NOT HAVE_QT5)
-+endif (BUILD_KDE_APP)
-
- configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-
-diff --git a/doc/de/CMakeLists.txt b/doc/de/CMakeLists.txt
-index 6f25b68..70f6793 100644
---- a/doc/de/CMakeLists.txt
-+++ b/doc/de/CMakeLists.txt
-@@ -2,7 +2,6 @@ if (BUILD_KDE_APP)
- if (HAVE_QT5)
- kf5_create_handbook(index.docbook)
- else (HAVE_QT5)
-- find_package(KDE4 REQUIRED)
- kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/de SUBDIR kid3)
- endif (HAVE_QT5)
- endif (BUILD_KDE_APP)
-diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
-index b3751b3..7cff8e1 100644
---- a/doc/en/CMakeLists.txt
-+++ b/doc/en/CMakeLists.txt
-@@ -2,7 +2,6 @@ if (BUILD_KDE_APP)
- if (HAVE_QT5)
- kf5_create_handbook(index.docbook)
- else (HAVE_QT5)
-- find_package(KDE4 REQUIRED)
- kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kid3)
- endif (HAVE_QT5)
- endif (BUILD_KDE_APP)
-diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
-index d19ebb5..516e3f9 100644
---- a/src/app/CMakeLists.txt
-+++ b/src/app/CMakeLists.txt
-@@ -65,8 +65,6 @@ if (BUILD_KDE_APP)
- )
- else (HAVE_QT5)
- set(_cmakeInstallRpath "${CMAKE_INSTALL_RPATH}")
-- find_package(KDE4 REQUIRED)
-- include (KDE4Defaults)
-
- if (BUILD_SHARED_LIBS)
- # FindKDE4Internal.cmake will overwrite our RPATH if LIB_INSTALL_DIR (which
diff --git a/media-sound/kid3/kid3-3.1.2.ebuild b/media-sound/kid3/kid3-3.1.2.ebuild
deleted file mode 100644
index 723169d..0000000
--- a/media-sound/kid3/kid3-3.1.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 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/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}"
-
-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.2.1-r1.ebuild b/media-sound/kid3/kid3-3.2.1-r1.ebuild
deleted file mode 100644
index d1c6226..0000000
--- a/media-sound/kid3/kid3-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,75 +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/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}/${P}-libdir.patch"
- "${FILESDIR}/${P}-fix-cmake.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
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/kid3/, media-sound/kid3/files/
@ 2016-03-23 14:47 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2016-03-23 14:47 UTC (permalink / raw
To: gentoo-commits
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=(
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/kid3/, media-sound/kid3/files/
@ 2016-06-08 20:31 Michael Palimaka
0 siblings, 0 replies; 9+ messages in thread
From: Michael Palimaka @ 2016-06-08 20:31 UTC (permalink / raw
To: gentoo-commits
commit: 23742e65231f617b8ec2d028fe906cacb2dd2825
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 8 20:27:57 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jun 8 20:31:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23742e65
media-sound/kid3: remove old
Package-Manager: portage-2.3.0_rc1
media-sound/kid3/Manifest | 1 -
media-sound/kid3/files/kid3-3.2.1-libdir.patch | 43 ---------------
media-sound/kid3/kid3-3.3.1.ebuild | 73 --------------------------
3 files changed, 117 deletions(-)
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index dde9e96..08844af 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,3 +1,2 @@
-DIST kid3-3.3.1.tar.gz 1339124 SHA256 8acf344d3f6651bccc7994d9e3c9602777892c744828fd2e455d617293c8e74d SHA512 fb112f01018bf744dc802c640ef134f539ee603145249ed0db2c3cc2f7ad3ebc96b3c9e9bd3fac3ee85e081f5e567790d68cecd661a7ac340732c03bf3fbfd85 WHIRLPOOL 0d76e181798dbc8432490af40dcd5c48d8e2db0d67da30e2c3227dce639391e2922b76dde1ab27e75cb85301507e713df9efab31550968fd680b2ef7c5edfd72
DIST kid3-3.3.2.tar.gz 1340078 SHA256 d54c164e38ee8ff2c35473a7158e2748cbb6a9472822a96decf6e34a15458957 SHA512 8bd1e003ba1d4f169cf7da8c151040f5e7b993c03ae9d8dfdd3bd8d1dc88fbf4b3fef37c0d3d339da83333b4a60e3ef9362e962e37ae7747c6bd010f4565d025 WHIRLPOOL 07632afee63eab29374bae2207b97713ba808f90b080dc5be12a4a25c3db9e9252c893b4fd1932f10240bb171a029738275a799e06b26c3135661689eaf59a97
DIST kid3-3.4.0.tar.gz 1355139 SHA256 4dd67023e047d62985339eb3ba75e95dda6cf71c30f58785b57f4823bf11bfbf SHA512 341c32365a9efde067b3c78df9feeda992b650e517fd70fd70a9e0060593f83a35f550a0bbc74d948b5a9013e5d859c3f39f5ef9c482fdcf19556f48d8d67e98 WHIRLPOOL adaa4bdece34f66b668e65db96cca64febe62cd13ad1af12875fbd9ebb1a7cbdc30287a2b7f6ec0496dfb56bf29da6a5cde884ca376c0c046ed5de1cec475401
diff --git a/media-sound/kid3/files/kid3-3.2.1-libdir.patch b/media-sound/kid3/files/kid3-3.2.1-libdir.patch
deleted file mode 100644
index b65eb3b..0000000
--- a/media-sound/kid3/files/kid3-3.2.1-libdir.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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.3.1.ebuild b/media-sound/kid3/kid3-3.3.1.ebuild
deleted file mode 100644
index 58c323a..0000000
--- a/media-sound/kid3/kid3-3.3.1.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
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/kid3/, media-sound/kid3/files/
@ 2017-03-04 0:13 Michael Palimaka
0 siblings, 0 replies; 9+ messages in thread
From: Michael Palimaka @ 2017-03-04 0:13 UTC (permalink / raw
To: gentoo-commits
commit: b2ade6aa95892c2c765c040e992e27efe5d6ccae
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 4 00:13:16 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Mar 4 00:13:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2ade6aa
media-sound/kid3: add patch to fix bogus dependencies
Gentoo-bug: 600816
Package-Manager: Portage-2.3.4, Repoman-2.3.2
media-sound/kid3/files/kid3-3.4.4-deps.patch | 40 ++++++++++++++++++++++++++++
media-sound/kid3/kid3-3.4.4.ebuild | 7 +++--
media-sound/kid3/kid3-3.4.5.ebuild | 5 +++-
3 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/media-sound/kid3/files/kid3-3.4.4-deps.patch b/media-sound/kid3/files/kid3-3.4.4-deps.patch
new file mode 100644
index 00000000000..333645d11b3
--- /dev/null
+++ b/media-sound/kid3/files/kid3-3.4.4-deps.patch
@@ -0,0 +1,40 @@
+From 2f66191a82e60a2b46ead8aa2195346084817e91 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Sun, 27 Nov 2016 20:00:37 +1100
+Subject: [PATCH] Improve KF5 dependencies.
+
+This list was compiled from a cusory include and NEEDED inspection.
+---
+ src/app/CMakeLists.txt | 2 +-
+ src/app/kde/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
+index 516e3f9..7790fde 100644
+--- a/src/app/CMakeLists.txt
++++ b/src/app/CMakeLists.txt
+@@ -33,7 +33,7 @@ if (BUILD_KDE_APP)
+ include(KDECMakeSettings)
+ include(FeatureSummary)
+
+- find_package(KF5 REQUIRED COMPONENTS KIO)
++ find_package(KF5 REQUIRED COMPONENTS Config ConfigWidgets CoreAddons WidgetsAddons XmlGui)
+
+ if (BUILD_SHARED_LIBS)
+ # KDECMakeSettings.cmake will overwrite our RPATH if LIB_INSTALL_DIR is
+diff --git a/src/app/kde/CMakeLists.txt b/src/app/kde/CMakeLists.txt
+index 2f2867a..8a25b43 100644
+--- a/src/app/kde/CMakeLists.txt
++++ b/src/app/kde/CMakeLists.txt
+@@ -13,7 +13,7 @@ if (HAVE_QT5)
+
+ add_executable(kid3 ${kde_SRCS})
+
+- target_link_libraries(kid3 kid3-gui KF5::KIOFileWidgets -lstdc++)
++ target_link_libraries(kid3 kid3-gui KF5::ConfigCore KF5::ConfigGui KF5::ConfigWidgets KF5::CoreAddons KF5::WidgetsAddons KF5::XmlGui -lstdc++)
+
+ install(TARGETS kid3 DESTINATION ${BIN_INSTALL_DIR})
+ install(FILES ../kid3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+--
+2.10.2
+
diff --git a/media-sound/kid3/kid3-3.4.4.ebuild b/media-sound/kid3/kid3-3.4.4.ebuild
index 0b3b01da896..bf68212703b 100644
--- a/media-sound/kid3/kid3-3.4.4.ebuild
+++ b/media-sound/kid3/kid3-3.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -57,7 +57,10 @@ DEPEND="${COMMON_DEPEND}
$(add_qt_dep linguist-tools)
"
-PATCHES=( "${FILESDIR}/${PN}-3.3.2-libdir.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-3.3.2-libdir.patch"
+ "${FILESDIR}/${PN}-3.4.4-deps.patch"
+)
src_prepare() {
# overengineered upstream build system
diff --git a/media-sound/kid3/kid3-3.4.5.ebuild b/media-sound/kid3/kid3-3.4.5.ebuild
index 185eeebb5fb..3d01c46745d 100644
--- a/media-sound/kid3/kid3-3.4.5.ebuild
+++ b/media-sound/kid3/kid3-3.4.5.ebuild
@@ -56,7 +56,10 @@ DEPEND="${COMMON_DEPEND}
$(add_qt_dep linguist-tools)
"
-PATCHES=( "${FILESDIR}/${PN}-3.3.2-libdir.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-3.3.2-libdir.patch"
+ "${FILESDIR}/${PN}-3.4.4-deps.patch"
+)
src_prepare() {
# overengineered upstream build system
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/kid3/, media-sound/kid3/files/
@ 2019-02-22 13:06 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2019-02-22 13:06 UTC (permalink / raw
To: gentoo-commits
commit: 93ec353bfa748645d721e3e54b16cebfcedd22f4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 13:05:32 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 13:05:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ec353b
media-sound/kid3: Drop <3.7.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-sound/kid3/Manifest | 2 -
media-sound/kid3/files/kid3-3.3.2-libdir.patch | 44 ------------
media-sound/kid3/files/kid3-3.4.4-deps.patch | 40 -----------
media-sound/kid3/kid3-3.6.1.ebuild | 97 --------------------------
media-sound/kid3/kid3-3.6.2.ebuild | 96 -------------------------
5 files changed, 279 deletions(-)
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 592a5aab90a..b38ce572d3d 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,3 +1 @@
-DIST kid3-3.6.1.tar.gz 1428799 BLAKE2B 055743c06bf28188c16e627556e1c23cb724f6a1601975f259a912445063a23f3c6d8101cbb3f582fac66c56bbcbaf243e637132b20930f718f2c5b1056b7dc9 SHA512 026be02c3dea1f05af0f24a26ee9d6b775f7e408db6de8afbb3dda5f66ee465263fb1c3763d4e8ab52b1856a58c1ea21228d24cdb754508e68c04f7d5cccfb77
-DIST kid3-3.6.2.tar.gz 1430880 BLAKE2B f27d8e332639b72ccc0ace8afe05391c3edc0b470430477407138a90a2b3b0a6cefe0e740b0862d29cc61c866503b5df9b1333f26cd1f7f67797007d6117ce58 SHA512 96e9686d5af8c06867bc4d3b2ca51ddf89b6ba9a622236f79de53bef6b3ef518ef64fef3ab9af4e63ac9161bea8dc1c79d0417fe1ac433a9dfe36331089ab548
DIST kid3-3.7.0.tar.gz 1466849 BLAKE2B 39bdab9afb187754914ef77326d9c323e5dd4ab13a6f603deca3dfe97acb0d7a81d58a8eb569397c1a094ebaa7449997b729ce008614c8fc9f04d2b9e7995e03 SHA512 3112addba1e0697ae8874bf12336e54c744165a692dc81a99d97194df8511aa540a53085e2be84b3557cd9a2c9d3d887046c06550cef11406b28e6f6e6b507a6
diff --git a/media-sound/kid3/files/kid3-3.3.2-libdir.patch b/media-sound/kid3/files/kid3-3.3.2-libdir.patch
deleted file mode 100644
index b54bf129693..00000000000
--- a/media-sound/kid3/files/kid3-3.3.2-libdir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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/files/kid3-3.4.4-deps.patch b/media-sound/kid3/files/kid3-3.4.4-deps.patch
deleted file mode 100644
index 333645d11b3..00000000000
--- a/media-sound/kid3/files/kid3-3.4.4-deps.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2f66191a82e60a2b46ead8aa2195346084817e91 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Sun, 27 Nov 2016 20:00:37 +1100
-Subject: [PATCH] Improve KF5 dependencies.
-
-This list was compiled from a cusory include and NEEDED inspection.
----
- src/app/CMakeLists.txt | 2 +-
- src/app/kde/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
-index 516e3f9..7790fde 100644
---- a/src/app/CMakeLists.txt
-+++ b/src/app/CMakeLists.txt
-@@ -33,7 +33,7 @@ if (BUILD_KDE_APP)
- include(KDECMakeSettings)
- include(FeatureSummary)
-
-- find_package(KF5 REQUIRED COMPONENTS KIO)
-+ find_package(KF5 REQUIRED COMPONENTS Config ConfigWidgets CoreAddons WidgetsAddons XmlGui)
-
- if (BUILD_SHARED_LIBS)
- # KDECMakeSettings.cmake will overwrite our RPATH if LIB_INSTALL_DIR is
-diff --git a/src/app/kde/CMakeLists.txt b/src/app/kde/CMakeLists.txt
-index 2f2867a..8a25b43 100644
---- a/src/app/kde/CMakeLists.txt
-+++ b/src/app/kde/CMakeLists.txt
-@@ -13,7 +13,7 @@ if (HAVE_QT5)
-
- add_executable(kid3 ${kde_SRCS})
-
-- target_link_libraries(kid3 kid3-gui KF5::KIOFileWidgets -lstdc++)
-+ target_link_libraries(kid3 kid3-gui KF5::ConfigCore KF5::ConfigGui KF5::ConfigWidgets KF5::CoreAddons KF5::WidgetsAddons KF5::XmlGui -lstdc++)
-
- install(TARGETS kid3 DESTINATION ${BIN_INSTALL_DIR})
- install(FILES ../kid3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
---
-2.10.2
-
diff --git a/media-sound/kid3/kid3-3.6.1.ebuild b/media-sound/kid3/kid3-3.6.1.ebuild
deleted file mode 100644
index a187a6615d0..00000000000
--- a/media-sound/kid3/kid3-3.6.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ECM_KDEINSTALLDIRS="false"
-KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
-inherit kde5
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="https://kid3.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 x86"
-IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-COMMON_DEPEND="
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtmultimedia)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- sys-libs/readline:0=
- acoustid? (
- media-libs/chromaprint
- virtual/ffmpeg
- )
- flac? (
- media-libs/flac[cxx]
- media-libs/libvorbis
- )
- kde? (
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- )
- mp3? ( media-libs/id3lib )
- mp4? ( media-libs/libmp4v2:0 )
- taglib? ( >=media-libs/taglib-1.9.1 )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !media-sound/kid3:4
-"
-DEPEND="${COMMON_DEPEND}
- $(add_qt_dep linguist-tools)
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.3.2-libdir.patch"
- "${FILESDIR}/${PN}-3.4.4-deps.patch"
-)
-
-src_prepare() {
- # overengineered upstream build system
- # kde5 eclass src_prepare leads to compile failure
-
- # only enable handbook when required
- if ! use_if_iuse handbook ; then
- cmake_comment_add_subdirectory ${KDE_DOC_DIR}
- fi
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_PHONON=OFF
- -DWITH_QT4=OFF
- -DWITH_QT5=ON
- -DWITH_CHROMAPRINT=$(usex acoustid)
- -DWITH_FLAC=$(usex flac)
- -DWITH_ID3LIB=$(usex mp3)
- -DWITH_MP4V2=$(usex mp4)
- -DWITH_TAGLIB=$(usex taglib)
- -DWITH_VORBIS=$(usex vorbis)
- )
-
- if use kde ; then
- mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
- else
- mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
- fi
-
- kde5_src_configure
-}
diff --git a/media-sound/kid3/kid3-3.6.2.ebuild b/media-sound/kid3/kid3-3.6.2.ebuild
deleted file mode 100644
index 59ad6ac1081..00000000000
--- a/media-sound/kid3/kid3-3.6.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ECM_KDEINSTALLDIRS="false"
-KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
-inherit kde5
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="https://kid3.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-COMMON_DEPEND="
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtmultimedia)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- sys-libs/readline:0=
- acoustid? (
- media-libs/chromaprint
- virtual/ffmpeg
- )
- flac? (
- media-libs/flac[cxx]
- media-libs/libvorbis
- )
- kde? (
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- )
- mp3? ( media-libs/id3lib )
- mp4? ( media-libs/libmp4v2:0 )
- taglib? ( >=media-libs/taglib-1.9.1 )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !media-sound/kid3:4
-"
-DEPEND="${COMMON_DEPEND}
- $(add_qt_dep linguist-tools)
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.3.2-libdir.patch"
-)
-
-src_prepare() {
- # overengineered upstream build system
- # kde5 eclass src_prepare leads to compile failure
-
- # only enable handbook when required
- if ! use_if_iuse handbook ; then
- cmake_comment_add_subdirectory ${KDE_DOC_DIR}
- fi
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_PHONON=OFF
- -DWITH_QT4=OFF
- -DWITH_QT5=ON
- -DWITH_CHROMAPRINT=$(usex acoustid)
- -DWITH_FLAC=$(usex flac)
- -DWITH_ID3LIB=$(usex mp3)
- -DWITH_MP4V2=$(usex mp4)
- -DWITH_TAGLIB=$(usex taglib)
- -DWITH_VORBIS=$(usex vorbis)
- )
-
- if use kde ; then
- mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
- else
- mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
- fi
-
- kde5_src_configure
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/kid3/, media-sound/kid3/files/
@ 2021-01-31 20:15 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2021-01-31 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 542871fe71bcd4488787425a7d634544f146ff16
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 20:07:10 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 20:14:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=542871fe
media-sound/kid3: Make test dependencies optional, add missing BDEPEND
Closes: https://bugs.gentoo.org/768084
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kid3/files/kid3-3.8.5-tests-optional.patch | 64 ++++++++++++++++++++++
media-sound/kid3/kid3-3.8.5.ebuild | 21 +++++--
2 files changed, 81 insertions(+), 4 deletions(-)
diff --git a/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch b/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch
new file mode 100644
index 00000000000..4db47a2f1af
--- /dev/null
+++ b/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch
@@ -0,0 +1,64 @@
+From 4efe62089eff54ac844c70382d432f2abb24c06e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 31 Jan 2021 20:38:41 +0100
+Subject: [PATCH] Use include(CTest) and BUILD_TESTING to make Qt5Test and
+ Python optional
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 25 ++++++++++++++++---------
+ 1 file changed, 16 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 92d50265..557a208d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -211,8 +211,11 @@ endif()
+ set(CFG_QMLSRCDIR "${kid3_SOURCE_DIR}/src/qml")
+
+ find_package(Threads)
+-set(Python_ADDITIONAL_VERSIONS 3)
+-find_package(PythonInterp REQUIRED)
++include(CTest)
++if(BUILD_TESTING)
++ set(Python_ADDITIONAL_VERSIONS 3)
++ find_package(PythonInterp REQUIRED)
++endif()
+ include (CheckCXXSourceCompiles)
+ include (CheckCXXCompilerFlag)
+ include (CheckLibraryExists)
+@@ -256,7 +259,10 @@ else()
+ find_package(Qt5Core)
+ endif()
+ if(Qt5Core_FOUND)
+- set(_qtComponents Core Gui Widgets Network Xml Multimedia LinguistTools Test)
++ set(_qtComponents Core Gui Widgets Network Xml Multimedia LinguistTools)
++ if(BUILD_TESTING)
++ set(_qtComponents ${_qtComponents} Test)
++ endif()
+ if(WITH_DBUS)
+ set(_qtComponents ${_qtComponents} DBus)
+ endif()
+@@ -472,12 +478,13 @@ if(ANDROID)
+ endif()
+
+
+-enable_testing()
+-add_test(NAME test_cli_functions
+- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/test/test_cli_functions.py)
+-add_custom_target(check ${CMAKE_CTEST_COMMAND} --output-on-failure)
+-if(NOT CMAKE_VERSION VERSION_LESS "3.17")
+- list(APPEND CMAKE_CTEST_ARGUMENTS --output-on-failure)
++if(BUILD_TESTING)
++ add_test(NAME test_cli_functions
++ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/test/test_cli_functions.py)
++ add_custom_target(check ${CMAKE_CTEST_COMMAND} --output-on-failure)
++ if(NOT CMAKE_VERSION VERSION_LESS "3.17")
++ list(APPEND CMAKE_CTEST_ARGUMENTS --output-on-failure)
++ endif()
+ endif()
+
+
+--
+2.30.0
+
diff --git a/media-sound/kid3/kid3-3.8.5.ebuild b/media-sound/kid3/kid3-3.8.5.ebuild
index a047ed173a3..40385027d97 100644
--- a/media-sound/kid3/kid3-3.8.5.ebuild
+++ b/media-sound/kid3/kid3-3.8.5.ebuild
@@ -3,7 +3,8 @@
EAPI=7
-inherit kde.org cmake xdg
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake kde.org python-any-r1 xdg
DESCRIPTION="Simple tag editor based on Qt"
HOMEPAGE="https://kid3.kde.org/"
@@ -15,15 +16,17 @@ fi
LICENSE="GPL-2+"
SLOT="5"
-IUSE="acoustid flac kde mp3 mp4 +mpris +taglib vorbis"
+IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis"
REQUIRED_USE="flac? ( vorbis )"
+RESTRICT+=" !test? ( test )"
BDEPEND="
dev-qt/linguist-tools:5
kde? ( kde-frameworks/extra-cmake-modules:5 )
+ test? ( ${PYTHON_DEPS} )
"
-DEPEND="
+COMMON_DEPEND="
dev-qt/qtcore:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5
@@ -57,10 +60,19 @@ DEPEND="
media-libs/libvorbis
)
"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
!media-sound/kid3:4
"
+PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
src_prepare() {
# overengineered upstream build system
cmake_src_prepare
@@ -76,6 +88,7 @@ src_configure() {
-DWITH_ID3LIB=$(usex mp3)
-DWITH_MP4V2=$(usex mp4)
-DWITH_TAGLIB=$(usex taglib)
+ -DBUILD_TESTING=$(usex test)
-DWITH_VORBIS=$(usex vorbis)
)
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/kid3/, media-sound/kid3/files/
@ 2021-01-31 22:58 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2021-01-31 22:58 UTC (permalink / raw
To: gentoo-commits
commit: ab14f16dc381de27c34747e413237bd7d6d79994
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 22:52:46 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 22:57:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab14f16d
media-sound/kid3: Use CMake 3.12's Python3 module to inject PYTHON
Bug: https://bugs.gentoo.org/768084
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kid3/files/kid3-3.8.5-tests-optional.patch | 37 +++++++++++++++++++++-
media-sound/kid3/kid3-3.8.5.ebuild | 1 +
2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch b/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch
index 4db47a2f1af..d5b74ca5613 100644
--- a/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch
+++ b/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch
@@ -1,7 +1,7 @@
From 4efe62089eff54ac844c70382d432f2abb24c06e Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 31 Jan 2021 20:38:41 +0100
-Subject: [PATCH] Use include(CTest) and BUILD_TESTING to make Qt5Test and
+Subject: [PATCH 1/2] Use include(CTest) and BUILD_TESTING to make Qt5Test and
Python optional
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
@@ -62,3 +62,38 @@ index 92d50265..557a208d 100644
--
2.30.0
+
+From 1e264e918686d5d09a5457513f3aadeea25d6e5e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 31 Jan 2021 23:43:49 +0100
+Subject: [PATCH 2/2] Use CMake FindPython3 module if available (CMake >=3.12)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 557a208d..706167e6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -213,8 +213,14 @@ set(CFG_QMLSRCDIR "${kid3_SOURCE_DIR}/src/qml")
+ find_package(Threads)
+ include(CTest)
+ if(BUILD_TESTING)
+- set(Python_ADDITIONAL_VERSIONS 3)
+- find_package(PythonInterp REQUIRED)
++ if(CMAKE_VERSION VERSION_LESS 3.12.0)
++ set(Python_ADDITIONAL_VERSIONS 3)
++ find_package(PythonInterp REQUIRED)
++ # PythonInterp sets PYTHON_EXECUTABLE
++ else()
++ find_package(Python3 COMPONENTS Interpreter REQUIRED)
++ set(PYTHON_EXECUTABLE "${Python3_EXECUTABLE}")
++ endif()
+ endif()
+ include (CheckCXXSourceCompiles)
+ include (CheckCXXCompilerFlag)
+--
+2.30.0
+
diff --git a/media-sound/kid3/kid3-3.8.5.ebuild b/media-sound/kid3/kid3-3.8.5.ebuild
index 40385027d97..734a8c02465 100644
--- a/media-sound/kid3/kid3-3.8.5.ebuild
+++ b/media-sound/kid3/kid3-3.8.5.ebuild
@@ -91,6 +91,7 @@ src_configure() {
-DBUILD_TESTING=$(usex test)
-DWITH_VORBIS=$(usex vorbis)
)
+ use test && mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
if use kde ; then
mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/kid3/, media-sound/kid3/files/
@ 2021-02-12 20:55 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2021-02-12 20:55 UTC (permalink / raw
To: gentoo-commits
commit: 7faa1a85a52f340fdd37c61be71fca4b4d827b21
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 17:56:54 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 20:55:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7faa1a85
media-sound/kid3: Python is always required in BDEPEND
Closes: https://bugs.gentoo.org/769938
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kid3/files/kid3-3.8.5-tests-optional.patch | 75 ++++++++--------------
media-sound/kid3/kid3-3.8.5.ebuild | 5 +-
2 files changed, 30 insertions(+), 50 deletions(-)
diff --git a/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch b/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch
index d5b74ca5613..44af299f13c 100644
--- a/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch
+++ b/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch
@@ -1,33 +1,37 @@
-From 4efe62089eff54ac844c70382d432f2abb24c06e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 31 Jan 2021 20:38:41 +0100
-Subject: [PATCH 1/2] Use include(CTest) and BUILD_TESTING to make Qt5Test and
- Python optional
+From fe096c5d05c95bfdcfae6a5976e242e324f4152d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Fri, 5 Feb 2021 06:17:42 +0000
+Subject: [PATCH] Use include(CTest) and BUILD_TESTING to make tests optional
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
- CMakeLists.txt | 25 ++++++++++++++++---------
- 1 file changed, 16 insertions(+), 9 deletions(-)
+ CMakeLists.txt | 29 ++++++++++++++++++++---------
+ src/CMakeLists.txt | 2 +-
+ 2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 92d50265..557a208d 100644
+index 92d50265..ee476ac5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -211,8 +211,11 @@ endif()
+@@ -211,8 +211,15 @@ endif()
set(CFG_QMLSRCDIR "${kid3_SOURCE_DIR}/src/qml")
find_package(Threads)
-set(Python_ADDITIONAL_VERSIONS 3)
-find_package(PythonInterp REQUIRED)
+include(CTest)
-+if(BUILD_TESTING)
++if(CMAKE_VERSION VERSION_LESS 3.12.0)
+ set(Python_ADDITIONAL_VERSIONS 3)
+ find_package(PythonInterp REQUIRED)
++ # PythonInterp sets PYTHON_EXECUTABLE
++else()
++ find_package(Python3 COMPONENTS Interpreter REQUIRED)
++ set(PYTHON_EXECUTABLE "${Python3_EXECUTABLE}")
+endif()
include (CheckCXXSourceCompiles)
include (CheckCXXCompilerFlag)
include (CheckLibraryExists)
-@@ -256,7 +259,10 @@ else()
+@@ -256,7 +263,10 @@ else()
find_package(Qt5Core)
endif()
if(Qt5Core_FOUND)
@@ -39,7 +43,7 @@ index 92d50265..557a208d 100644
if(WITH_DBUS)
set(_qtComponents ${_qtComponents} DBus)
endif()
-@@ -472,12 +478,13 @@ if(ANDROID)
+@@ -472,12 +482,13 @@ if(ANDROID)
endif()
@@ -59,41 +63,18 @@ index 92d50265..557a208d 100644
endif()
---
-2.30.0
-
-
-From 1e264e918686d5d09a5457513f3aadeea25d6e5e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 31 Jan 2021 23:43:49 +0100
-Subject: [PATCH 2/2] Use CMake FindPython3 module if available (CMake >=3.12)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 557a208d..706167e6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -213,8 +213,14 @@ set(CFG_QMLSRCDIR "${kid3_SOURCE_DIR}/src/qml")
- find_package(Threads)
- include(CTest)
- if(BUILD_TESTING)
-- set(Python_ADDITIONAL_VERSIONS 3)
-- find_package(PythonInterp REQUIRED)
-+ if(CMAKE_VERSION VERSION_LESS 3.12.0)
-+ set(Python_ADDITIONAL_VERSIONS 3)
-+ find_package(PythonInterp REQUIRED)
-+ # PythonInterp sets PYTHON_EXECUTABLE
-+ else()
-+ find_package(Python3 COMPONENTS Interpreter REQUIRED)
-+ set(PYTHON_EXECUTABLE "${Python3_EXECUTABLE}")
-+ endif()
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index c6c703ac..db067265 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -8,6 +8,6 @@ if(WITH_QML)
+ add_subdirectory(qml)
+ endif()
+
+-if(BUILD_TEST_APP)
++if(BUILD_TESTING AND BUILD_TEST_APP)
+ add_subdirectory(test)
endif()
- include (CheckCXXSourceCompiles)
- include (CheckCXXCompilerFlag)
--
-2.30.0
+GitLab
diff --git a/media-sound/kid3/kid3-3.8.5.ebuild b/media-sound/kid3/kid3-3.8.5.ebuild
index 734a8c02465..8ed70dc49ed 100644
--- a/media-sound/kid3/kid3-3.8.5.ebuild
+++ b/media-sound/kid3/kid3-3.8.5.ebuild
@@ -21,10 +21,9 @@ IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis"
REQUIRED_USE="flac? ( vorbis )"
RESTRICT+=" !test? ( test )"
-BDEPEND="
+BDEPEND="${PYTHON_DEPS}
dev-qt/linguist-tools:5
kde? ( kde-frameworks/extra-cmake-modules:5 )
- test? ( ${PYTHON_DEPS} )
"
COMMON_DEPEND="
dev-qt/qtcore:5
@@ -82,6 +81,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
+ -DPython3_EXECUTABLE="${PYTHON}"
-DWITH_CHROMAPRINT=$(usex acoustid)
-DWITH_DBUS=$(usex mpris)
-DWITH_FLAC=$(usex flac)
@@ -91,7 +91,6 @@ src_configure() {
-DBUILD_TESTING=$(usex test)
-DWITH_VORBIS=$(usex vorbis)
)
- use test && mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
if use kde ; then
mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-02-12 20:55 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-23 14:47 [gentoo-commits] repo/gentoo:master commit in: media-sound/kid3/, media-sound/kid3/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2021-02-12 20:55 Andreas Sturmlechner
2021-01-31 22:58 Andreas Sturmlechner
2021-01-31 20:15 Andreas Sturmlechner
2019-02-22 13:06 Andreas Sturmlechner
2017-03-04 0:13 Michael Palimaka
2016-06-08 20:31 Michael Palimaka
2016-03-23 14:47 Lars Wendler
2016-01-04 18:42 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox