gentoo resync : 28.04.2021

6 files changed, 2 insertions, 109 deletions

diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 76d7e9f76756..a2e573d8de58 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,9 +1,4 @@
-AUX taglib-1.11-install-examples.patch 371 BLAKE2B ee42b80e8c6093dbfc4c89c25bcb6bd25e2f5152c14743fa49c6c44a14f93a961f08a4d53337efe0800d98126a8aa58627a330e19386283cc16d8f20c9637262 SHA512 149ce1256ec557ee1e896b56e361f2fcf69633424f9b125666827eda610e84c35bf28e5c3fe5f38d4d87f1eacf977fc5b8b8c2d9c6634997bfe4e4bac122fc37
-AUX taglib-1.11.1_p20181028-libdir.patch 721 BLAKE2B de84d157b6da665c6e2dee504bfd68409500fa00366d83adc67735bfb7962cdadcfa6e3ff838115521f66db12ae2d8ef9963981f452944b100e475653fb9064c SHA512 fa9082f58257a3250a54eba49dc1b0d6f25e59f2fa500a7d41571b7c5fa8b2e8e5a7d4426ee2046dbe556c3dd2cf1c271cb4e0e1e9b78b8733a84de9420974ab
-AUX taglib-1.11.1_p20181028-version-1.11.2.patch 486 BLAKE2B a0b9021a01268eaeb32cb7a6b333b54df522aaf9d07d9b89870f0dbc38a9648ab9173a916bd8a29537b454631be5cd32c2dfb256ebf2f2b86000fec8d2f32bb6 SHA512 e5c3d814ae7c4b2cb84eded86e909d2db985ec21409767a9bdd502d562b55edf30c74834e2829199f1fd20ca8b1dab832a78b05246ae82fe6ff94cb1266d98d0
 AUX taglib-1.12-cmake.patch 18074 BLAKE2B f4f9dedd614d7bb2f981f7e4e8dc0b257847e9627e1fdc24d85a615cac7d894402b6901e39297a5a9473d9b1eecb6bc0be6183950abc3196245c1c8921f930aa SHA512 2003f02a843c3982c7c50db77bbda9ca75c36f25a371df03cca5139bd78e2efd7b083672bb06c5f9b0d114253fdaf6adeb995304877ff84085d8d1b07ef2c779
-DIST taglib-1.11.1_p20190920.tar.gz 1290100 BLAKE2B 38f65450b5e7c33b14187ab461bfd18d77f93d1ecab5ccf0c898ca6e67fd05aebac09318d4e1cabf1fdbca38800332ef9d0d5d1317087e69672734d1dec1dfe2 SHA512 4f7ad2a0713d38e8885b10d08041abdfb6c669369edd16e8345d7d679c16c15f191ca378e6690e06347f29e0e9cadebcb95ba26dc583c1127c4531558df27173
 DIST taglib-1.12.tar.gz 1364231 BLAKE2B 414a61a302fbdd1af8dae70fcec96311023d3ef85a659b8dc598c8c73cf31142b4a254c843f4d415eff0fda84e62e18f1bb63921f1868400990f023aa01b1a41 SHA512 63c96297d65486450908bda7cc1583ec338fa5a56a7c088fc37d6e125e1ee76e6d20343556a8f3d36f5b7e5187c58a5d15be964c996e3586ea1438910152b1a6
-EBUILD taglib-1.11.1_p20190920-r1.ebuild 1328 BLAKE2B 43e1d33fa7e6b77bfab239ccfb2ba01c46ee9feb9977839e8525ed465f7c3eb4d4f1fdb61c6885d7873b76fb7cb6057c5c68ee51a5079e5852dcf98c24f863c5 SHA512 477b4ed7c0665740e450c346e9b5bcf3be976181490ce443d10aed7bae1114984848342774a2f7a2c3cec1cad006ba89d7a361c2cf4d4e84eae6a68b5e25a982
-EBUILD taglib-1.12.ebuild 1308 BLAKE2B c976322a2b8442f6e17a75b72ab2940c64c54bb427777080b17d7314f2b856c5deb8aa4a0154fae06de2d6cee3e7c86dd2cc8ba90671f35a26ee7f13a297b4c0 SHA512 3760f6b71d648921a629c0999727d0313e2a04cc1972c125afba818737de4909bfee9820f5d7972874c27d00c10e65c6c8c7e6d52d3a48d2015763ed5db2e104
+EBUILD taglib-1.12.ebuild 1301 BLAKE2B a31dac83d51c9d079803131d9b12b764e7d7f6d105c881bf1a3118ac8771d781ae535a5e75418524c71935dc41c1cc214304661e346f56c040cfb7179ec6d83f SHA512 238500ddf60d11940516aae0d6c595ed7d5bad9bdd0275a572fcda9fbd1922fbcd2846b4f2a1d68489dba1f080ec370422306270c24438ad4b46dc2302acc5a1
 MISC metadata.xml 327 BLAKE2B 3972cb6de796dc7ba0d48715a30f265c10bfebe2e192d634267ffa0dc2323283b16c38f9bd891dbd1b7c646929e41116a5924d426fb1df46e63f3a4b4f5920be SHA512 05909165d6fff2283a6d55d1c454d97541e4e5ac35a6997123f548b3a86d108231928a4136cea35a323c942a82d50072f66840347fd1b651d4c1f3a53928c721
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 fd676c6aec14..000000000000
--- 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 0ae6b1cfb9af..000000000000
--- 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 4b8311d24a13..000000000000
--- 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 a79a5c9b8e23..000000000000
--- 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
-}
diff --git a/media-libs/taglib/taglib-1.12.ebuild b/media-libs/taglib/taglib-1.12.ebuild
index 22ad368018c4..5735acbbaab0 100644
--- a/media-libs/taglib/taglib-1.12.ebuild
+++ b/media-libs/taglib/taglib-1.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://taglib.github.io/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 SLOT="0"
 IUSE="debug doc examples test"