From 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Mar 2019 13:42:34 +0000 Subject: gentoo resync : 03.03.2019 --- media-sound/kid3/Manifest | 8 +-- 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 ------------------------- media-sound/kid3/kid3-3.7.0.ebuild | 2 +- 6 files changed, 2 insertions(+), 285 deletions(-) delete mode 100644 media-sound/kid3/files/kid3-3.3.2-libdir.patch delete mode 100644 media-sound/kid3/files/kid3-3.4.4-deps.patch delete mode 100644 media-sound/kid3/kid3-3.6.1.ebuild delete mode 100644 media-sound/kid3/kid3-3.6.2.ebuild (limited to 'media-sound/kid3') diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest index b5240cbba7c0..ff311830d0cc 100644 --- a/media-sound/kid3/Manifest +++ b/media-sound/kid3/Manifest @@ -1,9 +1,3 @@ -AUX kid3-3.3.2-libdir.patch 1506 BLAKE2B 1265271633d61cab6d4ebb49284645a1528dedde7700145fb59c100b9fc209a84a021c2069291b6fcfb3030e0afa569016151e0545ce6f5375cc485881ecec44 SHA512 b987463eb82b499af757ba2865bfe57f9f9d405eb005822d08521f89700bfcfbb1bd46f9caa8c436b6d73d0b12284db08299d5425299f5803612e7b75b6c12ec -AUX kid3-3.4.4-deps.patch 1485 BLAKE2B a2c4b9ac6e956dcc2e6415b502e0ca34814d668ceb3e2e315f4da8da382041cf55f6b5531d298ecc00ee242433c09d2095e4357a9814fd9eda60d501672c5a74 SHA512 af386071836e542e178cda38297091817943a3f754e4d14b3cca2ec628bd7c13980932e77b1f9e3c578b095d88ea2b24e89e58b6f726c6f656989fc08bc8a808 -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 -EBUILD kid3-3.6.1.ebuild 2039 BLAKE2B 916f9cc8c38797be544521a1547f32bfdfb92b657eb82ee7cbf04caaab44aedc2aa210c343dc07e061d832ca86ff9540d9926f79cd9977b05c805f4162a55ca3 SHA512 3c9579683274c70f5ab977887eab2973da50fce3aad59ecbc58cdeb653689422cbc3d87fe31aae262fde7241f5f41dedfd79bf52cfb99b5b4a269dd1a07661cb -EBUILD kid3-3.6.2.ebuild 2003 BLAKE2B 20a0e16d6f891f9324d48a8473aee6261008dcab59611cd2fa62d113dc0c655a00f5a84b7f2bb313c13c74fbcbc13a132ae958ad12c80d04c6035754b16fc060 SHA512 8925b27536284c425677e45bf9f87881f663ff366939aed729d21443e95f55ab40d98d10922b893d1d07d6e13f8ed816b488a6d322998c87975094e545f7b37b -EBUILD kid3-3.7.0.ebuild 1893 BLAKE2B d76ca9819da22f31299838f60e611376a40b8f9b68e7d67046c6615c64053f21708f19cf4ae8fcc5d7203a09b7b90ad04d52bb9abc1ae31246fff926061ca247 SHA512 95fa08b26981b8a9dc604c389cc2a318f76fa2ce28f26b761c391c0965d870908efb1db76ec69629ce595665453cfacf10a8557e165961f83f493d7117cdbc77 +EBUILD kid3-3.7.0.ebuild 1892 BLAKE2B a0136ed5d6f8bf649a7ef068ba5cbfc928ab480dfe258b6d70b8d0f9b94ebd7d2e7d0e574ef4f8e2414d2cd6ddb2aacd29ab5e4ee79dbee22e2e09e255f505d9 SHA512 d152bf282c735e9e302a99464c6056346dc0616bb4fbe282446da4ea87934891eabb2f1b08dca677ff628b7ab08391305434dc0019d332808710038e32657460 MISC metadata.xml 661 BLAKE2B 5a16df625ed1a34a04f7cd00cae636ec4dc2867cf1bab477c4a2fd99e21777ac949391c0c940da1235ee976a00b3812a84db1fb58c8c089aed983668f9ff49fb SHA512 d27b8c077e8363864d6d4baa217bd7813a01c520cba943bf25996823b944ed07c7b78205d5c77c1610566e2aa55cf03624633e4abef86e4378f6386b7bfb89c9 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 b54bf129693c..000000000000 --- 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 333645d11b39..000000000000 --- 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 -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 a187a6615d05..000000000000 --- 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 59ad6ac10814..000000000000 --- 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 -} diff --git a/media-sound/kid3/kid3-3.7.0.ebuild b/media-sound/kid3/kid3-3.7.0.ebuild index 6f7a2722027e..737a79bd331d 100644 --- a/media-sound/kid3/kid3-3.7.0.ebuild +++ b/media-sound/kid3/kid3-3.7.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="5" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="acoustid flac kde mp3 mp4 +taglib vorbis" REQUIRED_USE="flac? ( vorbis )" -- cgit v1.2.3