From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1073781-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7C70B138334 for <garchives@archives.gentoo.org>; Fri, 22 Feb 2019 13:06:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48236E07C9; Fri, 22 Feb 2019 13:06:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 01946E07C9 for <gentoo-commits@lists.gentoo.org>; Fri, 22 Feb 2019 13:06:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 44D1033BE69 for <gentoo-commits@lists.gentoo.org>; Fri, 22 Feb 2019 13:06:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B253954E for <gentoo-commits@lists.gentoo.org>; Fri, 22 Feb 2019 13:06:32 +0000 (UTC) From: "Andreas Sturmlechner" <asturm@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, "Andreas Sturmlechner" <asturm@gentoo.org> Message-ID: <1550840732.93ec353bfa748645d721e3e54b16cebfcedd22f4.asturm@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/Manifest media-sound/kid3/files/kid3-3.3.2-libdir.patch media-sound/kid3/files/kid3-3.4.4-deps.patch media-sound/kid3/kid3-3.6.1.ebuild media-sound/kid3/kid3-3.6.2.ebuild X-VCS-Directories: media-sound/kid3/ media-sound/kid3/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 93ec353bfa748645d721e3e54b16cebfcedd22f4 X-VCS-Branch: master Date: Fri, 22 Feb 2019 13:06:32 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: aa846ba9-9b87-405f-a53d-db23dab367e4 X-Archives-Hash: 5e17fc3d2dda96c61c3e3d9edc24665b 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 -}