gentoo resync : 15.12.2019

3 files changed, 3 insertions, 63 deletions

diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index ba0ac898fc5b..97737fd3b645 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,8 +1,6 @@
 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
-DIST taglib-1.11.1_p20181028.tar.gz 1299993 BLAKE2B d281873a87742ba417ea764bb01f9a4c5553a4624d2c257dd82bbb2f0b7e3103ab6ca253f78c0167908f449aac833873ca1cce6f24b1eb5f608131382833262a SHA512 e26439b65ab579455f79e87a94c33a98e17209b31a19b531e5964a2c0ded395c35067655e31ad22b6205149e2e920d7bd145993f064d3ad13e1de8a9f7e37256
 DIST taglib-1.11.1_p20190920.tar.gz 1290100 BLAKE2B 38f65450b5e7c33b14187ab461bfd18d77f93d1ecab5ccf0c898ca6e67fd05aebac09318d4e1cabf1fdbca38800332ef9d0d5d1317087e69672734d1dec1dfe2 SHA512 4f7ad2a0713d38e8885b10d08041abdfb6c669369edd16e8345d7d679c16c15f191ca378e6690e06347f29e0e9cadebcb95ba26dc583c1127c4531558df27173
-EBUILD taglib-1.11.1_p20181028.ebuild 1406 BLAKE2B 830c53acc2e2f09b53908c5d287a8cb1c7c0ea0d7e7a5c1cd1a63a7c25f6c45082194619ad251eac83adb27d9120612ba615352516b96b942e040f031db96ace SHA512 9c8432a4579e5b55a9b5a825bc6503e4b3cf43cecce312e34f00a8e0b0bd106ec46f6815f3f92126d56895eaa07325df23138546bec09759472f974af6426448
-EBUILD taglib-1.11.1_p20190920-r1.ebuild 1328 BLAKE2B 414d835a744cf0ec1d409b72e78a1859259ac2577b665cb5da0d2acd40d2ccc3ac27cfb667038e8043029495b783b8f56eb10d0854e92c2169be2f7a7d53d941 SHA512 3f2cdfb72e3d1c4e104e270c6ac923eb4bd11910b881438f60b457e20b6df4b8975d5dbcaee420e2fef5d7e15407c5cbb0e47143b8feb271c8c98fbd2dec461a
+EBUILD taglib-1.11.1_p20190920-r1.ebuild 1349 BLAKE2B 372e6d1cb55a390b161c8625c96396319975910a55fb006ea07979f905db6dc40ae5c77bd29f6a5134086cdb59e5647ee0d7aa6f8f6993264a9901c649caf3d0 SHA512 68a8f7c57864b84777fc2d728b255aefb1155eb030e7c80dae892e346c49352c64fa8ec6dca5372420004cfdf939a0426683a51810541dbad83f8083de0d7c1f
 MISC metadata.xml 327 BLAKE2B 3972cb6de796dc7ba0d48715a30f265c10bfebe2e192d634267ffa0dc2323283b16c38f9bd891dbd1b7c646929e41116a5924d426fb1df46e63f3a4b4f5920be SHA512 05909165d6fff2283a6d55d1c454d97541e4e5ac35a6997123f548b3a86d108231928a4136cea35a323c942a82d50072f66840347fd1b651d4c1f3a53928c721
diff --git a/media-libs/taglib/taglib-1.11.1_p20181028.ebuild b/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
deleted file mode 100644
index 09fcc98658bc..000000000000
--- a/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=5cb589a5b82c13ba8f0542e5e79629da7645cb3c
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="A 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-SLOT="0"
-IUSE="debug examples test"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.11-install-examples.patch
-	"${FILESDIR}"/${P}-version-1.11.2.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/taglib-config
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s/BUILD_TESTS AND NOT BUILD_SHARED_LIBS/BUILD_TESTS/" \
-		-i CMakeLists.txt \
-		-i ConfigureChecks.cmake || die
-
-	# bug 651744
-	append-cxxflags -std=c++11
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	# ctest does not work
-	emake -C "${BUILD_DIR}" check
-}
diff --git a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
index 0719d05784e0..5cac4484ce05 100644
--- a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
+++ b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
@@ -11,9 +11,10 @@ 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 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 SLOT="0"
 IUSE="debug examples test"
+RESTRICT="!test? ( test )"
 
 BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"