From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1271463-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 B96661382C5 for <garchives@archives.gentoo.org>; Thu, 15 Apr 2021 22:36:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECB74E081B; Thu, 15 Apr 2021 22:36:31 +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 B9BC2E081B for <gentoo-commits@lists.gentoo.org>; Thu, 15 Apr 2021 22:36:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 91A9C335CC1 for <gentoo-commits@lists.gentoo.org>; Thu, 15 Apr 2021 22:36:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F132648 for <gentoo-commits@lists.gentoo.org>; Thu, 15 Apr 2021 22:36:29 +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: <1618526173.bee0fb9a140eac9737f1ade27da8bc6d858d6395.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/taglib/, media-libs/taglib/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/taglib/Manifest media-libs/taglib/files/taglib-1.11-install-examples.patch media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch media-libs/taglib/files/taglib-1.11.1_p20181028-version-1.11.2.patch media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild X-VCS-Directories: media-libs/taglib/files/ media-libs/taglib/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: bee0fb9a140eac9737f1ade27da8bc6d858d6395 X-VCS-Branch: master Date: Thu, 15 Apr 2021 22:36:29 +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: 406b7300-a865-43d0-8fe4-5afe1d1888fa X-Archives-Hash: 38ff899a50d7a9ecf177f9400f918007 commit: bee0fb9a140eac9737f1ade27da8bc6d858d6395 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Apr 15 18:55:56 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Apr 15 22:36:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bee0fb9a media-libs/taglib: Drop 1.11.1_p20190920-r1 snapshot Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/taglib/Manifest | 1 - .../files/taglib-1.11-install-examples.patch | 13 ------ .../files/taglib-1.11.1_p20181028-libdir.patch | 25 ---------- .../taglib-1.11.1_p20181028-version-1.11.2.patch | 11 ----- .../taglib/taglib-1.11.1_p20190920-r1.ebuild | 53 ---------------------- 5 files changed, 103 deletions(-) diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest index 29937cf62ab..5a275aba331 100644 --- a/media-libs/taglib/Manifest +++ b/media-libs/taglib/Manifest @@ -1,2 +1 @@ -DIST taglib-1.11.1_p20190920.tar.gz 1290100 BLAKE2B 38f65450b5e7c33b14187ab461bfd18d77f93d1ecab5ccf0c898ca6e67fd05aebac09318d4e1cabf1fdbca38800332ef9d0d5d1317087e69672734d1dec1dfe2 SHA512 4f7ad2a0713d38e8885b10d08041abdfb6c669369edd16e8345d7d679c16c15f191ca378e6690e06347f29e0e9cadebcb95ba26dc583c1127c4531558df27173 DIST taglib-1.12.tar.gz 1364231 BLAKE2B 414a61a302fbdd1af8dae70fcec96311023d3ef85a659b8dc598c8c73cf31142b4a254c843f4d415eff0fda84e62e18f1bb63921f1868400990f023aa01b1a41 SHA512 63c96297d65486450908bda7cc1583ec338fa5a56a7c088fc37d6e125e1ee76e6d20343556a8f3d36f5b7e5187c58a5d15be964c996e3586ea1438910152b1a6 diff --git a/media-libs/taglib/files/taglib-1.11-install-examples.patch b/media-libs/taglib/files/taglib-1.11-install-examples.patch deleted file mode 100644 index fd676c6aec1..00000000000 --- a/media-libs/taglib/files/taglib-1.11-install-examples.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/examples/CMakeLists.txt -+++ b/examples/CMakeLists.txt -@@ -37,3 +37,10 @@ - add_executable(strip-id3v1 strip-id3v1.cpp) - target_link_libraries(strip-id3v1 tag) - -+INSTALL(TARGETS -+ tagreader tagreader_c tagwriter framelist strip-id3v1 -+ LIBRARY DESTINATION ${LIB_INSTALL_DIR} -+ RUNTIME DESTINATION ${BIN_INSTALL_DIR} -+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} -+) -+ diff --git a/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch b/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch deleted file mode 100644 index 0ae6b1cfb9a..00000000000 --- a/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch +++ /dev/null @@ -1,25 +0,0 @@ -From cd9e6b750206417f155574c78d2551242a779a97 Mon Sep 17 00:00:00 2001 -From: jiblime <47689567+jiblime@users.noreply.github.com> -Date: Sat, 19 Oct 2019 15:12:03 -0700 -Subject: [PATCH] Changed libdir/includedir variables to change based on a - user's system and match syntax - ---- - taglib-config.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/taglib-config.cmake b/taglib-config.cmake -index 2a5c19f90..e613fa226 100644 ---- a/taglib-config.cmake -+++ b/taglib-config.cmake -@@ -16,8 +16,8 @@ EOH - - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=@CMAKE_INSTALL_PREFIX@ --libdir=${exec_prefix}/lib --includedir=${prefix}/include -+libdir=@LIB_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ - - flags="" - diff --git a/media-libs/taglib/files/taglib-1.11.1_p20181028-version-1.11.2.patch b/media-libs/taglib/files/taglib-1.11.1_p20181028-version-1.11.2.patch deleted file mode 100644 index 4b8311d24a1..00000000000 --- a/media-libs/taglib/files/taglib-1.11.1_p20181028-version-1.11.2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/taglib/toolkit/taglib.h 2018-10-28 14:43:45.000000000 +0100 -+++ b/taglib/toolkit/taglib.h 2018-11-17 23:40:39.517716254 +0100 -@@ -30,7 +30,7 @@ - - #define TAGLIB_MAJOR_VERSION 1 - #define TAGLIB_MINOR_VERSION 11 --#define TAGLIB_PATCH_VERSION 1 -+#define TAGLIB_PATCH_VERSION 2 - - #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 1)) || defined(__clang__) - #define TAGLIB_IGNORE_MISSING_DESTRUCTOR _Pragma("GCC diagnostic ignored \"-Wnon-virtual-dtor\"") diff --git a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild deleted file mode 100644 index a79a5c9b8e2..00000000000 --- a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -COMMIT=54508df30bc888c4d2359576ceb0cc8f2fa8dbdf -inherit cmake-multilib - -DESCRIPTION="Library for reading and editing audio meta data" -HOMEPAGE="https://taglib.github.io/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1 MPL-1.1" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" -SLOT="0" -IUSE="debug examples test" -RESTRICT="!test? ( test )" - -BDEPEND="virtual/pkgconfig" -RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.11-install-examples.patch - "${FILESDIR}"/${PN}-1.11.1_p20181028-version-1.11.2.patch - "${FILESDIR}"/${PN}-1.11.1_p20181028-libdir.patch -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/taglib-config -) - -S="${WORKDIR}/${PN}-${COMMIT}" - -src_prepare() { - cmake_src_prepare - - sed -e "s/BUILD_TESTS AND NOT BUILD_SHARED_LIBS/BUILD_TESTS/" \ - -i CMakeLists.txt \ - -i ConfigureChecks.cmake || die -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_EXAMPLES=$(multilib_native_usex examples) - -DBUILD_TESTS=$(usex test) - ) - - cmake_src_configure -}