From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0873B158031 for ; Mon, 27 Feb 2023 19:29:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16887E07C5; Mon, 27 Feb 2023 19:29:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E4FD7E07B2 for ; Mon, 27 Feb 2023 19:29:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2CA94340EC3 for ; Mon, 27 Feb 2023 19:29:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F276D8C7 for ; Mon, 27 Feb 2023 19:29:35 +0000 (UTC) From: "Andreas Sturmlechner" 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" Message-ID: <1677526163.e77ce858041053e89f626994de3f6c239dbe9d73.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/kid3/files/, media-sound/kid3/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/kid3/Manifest media-sound/kid3/files/kid3-3.9.2-musl.patch media-sound/kid3/kid3-3.9.2-r1.ebuild X-VCS-Directories: media-sound/kid3/files/ media-sound/kid3/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e77ce858041053e89f626994de3f6c239dbe9d73 X-VCS-Branch: master Date: Mon, 27 Feb 2023 19:29:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 088ede10-7ff4-495f-b97b-e1578ac93182 X-Archives-Hash: 2ca44c4c34fda397d3bf846be6765b28 commit: e77ce858041053e89f626994de3f6c239dbe9d73 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 27 19:28:11 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 27 19:29:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e77ce858 media-sound/kid3: drop 3.9.2-r1 Signed-off-by: Andreas Sturmlechner gentoo.org> media-sound/kid3/Manifest | 1 - media-sound/kid3/files/kid3-3.9.2-musl.patch | 27 ------- media-sound/kid3/kid3-3.9.2-r1.ebuild | 102 --------------------------- 3 files changed, 130 deletions(-) diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest index 7ed23cbdb72e..93466b386a18 100644 --- a/media-sound/kid3/Manifest +++ b/media-sound/kid3/Manifest @@ -1,2 +1 @@ -DIST kid3-3.9.2.tar.xz 1952344 BLAKE2B 5a44a05f614f97dc7ddab39694a1773e1e6c55af7a9dc4ac7b793a520e54a8892c2181903a58f150885b3b4e17ebf921db719863f7ac4fd540f711a444990df3 SHA512 fc0b9db33ea948a2345968ab5da65f959bea829130f4250604d68df778218173d49f92b015d9be4e43f57ba5ae3388b0e97f558774df590b5959aa6f6293acd3 DIST kid3-3.9.3.tar.xz 1820640 BLAKE2B ea030328d88f583e88959e7536f4e3e086354befc40395700fac8314a1e7c3da7a2f9a614ff9ad98491d9ec4d8b24ead05a2214b94f55786a5e493c1a585056c SHA512 f40c7eaa186eb7d3163635286a8ad89bf6b29dce851b4fadc0814eec7759ed7fbac37e4596365bac4df93c5b655a7e943f8414e7c8f661b29aea7bde5367ed73 diff --git a/media-sound/kid3/files/kid3-3.9.2-musl.patch b/media-sound/kid3/files/kid3-3.9.2-musl.patch deleted file mode 100644 index 05eb15536386..000000000000 --- a/media-sound/kid3/files/kid3-3.9.2-musl.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 15655cd3f19b95d5533bdfd52b0f38c51a4fdf88 Mon Sep 17 00:00:00 2001 -From: Bart Ribbers -Date: Sat, 24 Sep 2022 17:20:06 +0200 -Subject: [PATCH] Fix build on Musl libc - -malloc_trim is only implemented on glibc, so rather than checking if the -OS is Linux and not Android, check if it's Linux and glibc. ---- - src/core/model/kid3application.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/model/kid3application.cpp b/src/core/model/kid3application.cpp -index d40bca83..03409d1b 100644 ---- a/src/core/model/kid3application.cpp -+++ b/src/core/model/kid3application.cpp -@@ -995,7 +995,7 @@ void Kid3Application::unloadAllTags() - taggedFile->closeFileHandle(); - } - } --#if defined Q_OS_LINUX && !defined Q_OS_ANDROID -+#if defined Q_OS_LINUX && defined __GLIBC__ - if (::malloc_trim(0)) { - qDebug("Memory released by malloc_trim()"); - } --- -GitLab - diff --git a/media-sound/kid3/kid3-3.9.2-r1.ebuild b/media-sound/kid3/kid3-3.9.2-r1.ebuild deleted file mode 100644 index 506b585726a8..000000000000 --- a/media-sound/kid3/kid3-3.9.2-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit cmake kde.org python-any-r1 xdg - -DESCRIPTION="Simple tag editor based on Qt" -HOMEPAGE="https://kid3.kde.org/" - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 x86" -fi - -LICENSE="GPL-2+" -SLOT="5" -IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis" - -REQUIRED_USE="flac? ( vorbis )" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sys-libs/readline:= - acoustid? ( - media-libs/chromaprint:= - media-video/ffmpeg:= - ) - flac? ( - media-libs/flac:=[cxx] - media-libs/libvorbis - ) - kde? ( - kde-frameworks/kconfig:5 - kde-frameworks/kconfigwidgets:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/kio:5 - kde-frameworks/kwidgetsaddons:5 - kde-frameworks/kxmlgui:5 - ) - mp3? ( media-libs/id3lib ) - mp4? ( media-libs/libmp4v2 ) - mpris? ( dev-qt/qtdbus:5 ) - taglib? ( >=media-libs/taglib-1.9.1 ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" -BDEPEND="${PYTHON_DEPS} - dev-qt/linguist-tools:5 - kde? ( kde-frameworks/extra-cmake-modules:5 ) -" - -PATCHES=( "${FILESDIR}/${P}-musl.patch" ) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - # overengineered upstream build system - cmake_src_prepare - # applies broken python hacks, bug #614950 - cmake_comment_add_subdirectory doc - - sed -e "/^find_package.*QT NAMES/s/Qt6 //" \ - -i CMakeLists.txt || die # ensure Qt5 build -} - -src_configure() { - local mycmakeargs=( - -DPython3_EXECUTABLE="${PYTHON}" - -DWITH_CHROMAPRINT=$(usex acoustid) - -DWITH_DBUS=$(usex mpris) - -DWITH_FLAC=$(usex flac) - -DWITH_ID3LIB=$(usex mp3) - -DWITH_MP4V2=$(usex mp4) - -DWITH_TAGLIB=$(usex taglib) - -DBUILD_TESTING=$(usex test) - -DWITH_VORBIS=$(usex vorbis) - ) - - if use kde ; then - mycmakeargs+=( "-DWITH_APPS=KDE;CLI" ) - else - mycmakeargs+=( "-DWITH_APPS=Qt;CLI" ) - fi - - cmake_src_configure -}