gentoo resync : 16.02.1018

5 files changed, 3 insertions, 97 deletions

diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 4419f4c3f488..dd192913c832 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,8 +1,5 @@
 AUX taglib-1.11-install-examples.patch 371 BLAKE2B ee42b80e8c6093dbfc4c89c25bcb6bd25e2f5152c14743fa49c6c44a14f93a961f08a4d53337efe0800d98126a8aa58627a330e19386283cc16d8f20c9637262 SHA512 149ce1256ec557ee1e896b56e361f2fcf69633424f9b125666827eda610e84c35bf28e5c3fe5f38d4d87f1eacf977fc5b8b8c2d9c6634997bfe4e4bac122fc37
-AUX taglib-1.11.1-CVE-2017-12678.patch 1340 BLAKE2B 6940c22df9d4d7969253a8755e8050544d733e33cda8fbc1b4991ab94f879d052de31c140c468125b09859625eea84624d6c340f4385a45ee6ca30d8872a556b SHA512 2b5a8854572c572ebdc2e42cb949069d69ada82ba2bf632f08aadb7f603b86352e13a1da80c0e75a2fdeb5c15bd07aa71f558dba35ae098d61aba5e361c2acdf
 AUX taglib-1.11.1_p20181028-version-1.11.2.patch 486 BLAKE2B a0b9021a01268eaeb32cb7a6b333b54df522aaf9d07d9b89870f0dbc38a9648ab9173a916bd8a29537b454631be5cd32c2dfb256ebf2f2b86000fec8d2f32bb6 SHA512 e5c3d814ae7c4b2cb84eded86e909d2db985ec21409767a9bdd502d562b55edf30c74834e2829199f1fd20ca8b1dab832a78b05246ae82fe6ff94cb1266d98d0
-DIST taglib-1.11.1.tar.gz 1261620 BLAKE2B b33212df2a63d8d6bbca62b175812ec52783fdbfed8fb7bc5dedde845ac01e4f89a64d96b231e1db1e5e609e84dd84d83a2266c1f9ed371f1fad7ffca50486ac SHA512 7846775c4954ea948fe4383e514ba7c11f55d038ee06b6ea5a0a1c1069044b348026e76b27aa4ba1c71539aa8143e1401fab39184cc6e915ba0ae2c06133cb98
 DIST taglib-1.11.1_p20181028.tar.gz 1299993 BLAKE2B d281873a87742ba417ea764bb01f9a4c5553a4624d2c257dd82bbb2f0b7e3103ab6ca253f78c0167908f449aac833873ca1cce6f24b1eb5f608131382833262a SHA512 e26439b65ab579455f79e87a94c33a98e17209b31a19b531e5964a2c0ded395c35067655e31ad22b6205149e2e920d7bd145993f064d3ad13e1de8a9f7e37256
-EBUILD taglib-1.11.1-r1.ebuild 1450 BLAKE2B cf7bcbc10d1dd4860d2b86095266fc6b55d8e021edc9a0bd0ae94277b92fe0d360c9937b380a20a9a1c75953c64790ebb46ab6f80a08fddbdc632ac19e982570 SHA512 cc8076635f8c1992d8c27c578336cd96fd502064bdcb9fc21693e966cc79835e96f6b9da72e126c2d2fc87852f38d76f5bf440dc35eb93ba6407afe99004ed27
-EBUILD taglib-1.11.1_p20181028.ebuild 1430 BLAKE2B ade65fa394d6fc063b97990d03db8a85700b87c0fc3dece3bad7df185551ebc8c7c2fee74ee030ea08620d44c222750bee5ce380ce76efa1e64c89b6547f597c SHA512 63697c8ee370e60b8023cabf6780a8f4a9442919d305d01a53ad9d8f1cf242199edee5787c44c353f1140d8bfa527887c13f9452bd342654217f0f6e95ae4755
-MISC metadata.xml 425 BLAKE2B 47fff2e6d248780975e5b7748de1cdce6f09d614b79ee055da57dc9062c7567f46864bc306bfabf17a7c61dbfca0d16df41d9c8a574a8fc220e359d41f247b1e SHA512 31bd061f371cc8f300a22c150b86ef163f0cdd1d5e6b1c0ef0652038a2a1a5372a2910e201df28a70cb57f87945636b1ad352858f75714f3889068f94391c4d0
+EBUILD taglib-1.11.1_p20181028.ebuild 1429 BLAKE2B 38af0c56fe30564d21c0658ac4fa8ccfed00b5dff3170cea2de9637848c442c7dc9864773ed01e2e48333bdcfb4a4e299c3a7d73f365553aa9e8327c2b899c61 SHA512 2f9adede95749f4a7359495f0b5bee05504091c26bb5095bb56594c86383abd8bd75e4e6f79f44ef9c71df961a423ad8efb1edef357e2134bc4a01b875f6db7a
+MISC metadata.xml 327 BLAKE2B 3972cb6de796dc7ba0d48715a30f265c10bfebe2e192d634267ffa0dc2323283b16c38f9bd891dbd1b7c646929e41116a5924d426fb1df46e63f3a4b4f5920be SHA512 05909165d6fff2283a6d55d1c454d97541e4e5ac35a6997123f548b3a86d108231928a4136cea35a323c942a82d50072f66840347fd1b651d4c1f3a53928c721
diff --git a/media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch b/media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch
deleted file mode 100644
index 4b567da19821..000000000000
--- a/media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From eb9ded1206f18f2c319157337edea2533a40bea6 Mon Sep 17 00:00:00 2001
-From: "Stephen F. Booth" <me@sbooth.org>
-Date: Sun, 23 Jul 2017 10:11:09 -0400
-Subject: [PATCH] Don't assume TDRC is an instance of TextIdentificationFrame
-
-If TDRC is encrypted, FrameFactory::createFrame() returns UnknownFrame
-which causes problems in rebuildAggregateFrames() when it is assumed
-that TDRC is a TextIdentificationFrame
----
- taglib/mpeg/id3v2/id3v2framefactory.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp
-index 759a9b7be..9347ab869 100644
---- a/taglib/mpeg/id3v2/id3v2framefactory.cpp
-+++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp
-@@ -334,10 +334,11 @@ void FrameFactory::rebuildAggregateFrames(ID3v2::Tag *tag) const
-      tag->frameList("TDAT").size() == 1)
-   {
-     TextIdentificationFrame *tdrc =
--      static_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front());
-+      dynamic_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front());
-     UnknownFrame *tdat = static_cast<UnknownFrame *>(tag->frameList("TDAT").front());
- 
--    if(tdrc->fieldList().size() == 1 &&
-+    if(tdrc &&
-+       tdrc->fieldList().size() == 1 &&
-        tdrc->fieldList().front().size() == 4 &&
-        tdat->data().size() >= 5)
-     {
diff --git a/media-libs/taglib/metadata.xml b/media-libs/taglib/metadata.xml
index cabb8e8cf5a6..0d251d573cf3 100644
--- a/media-libs/taglib/metadata.xml
+++ b/media-libs/taglib/metadata.xml
@@ -5,9 +5,6 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="boost">Use <pkg>dev-libs/boost</pkg> instead of GCC built-ins</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">taglib/taglib</remote-id>
 	</upstream>
diff --git a/media-libs/taglib/taglib-1.11.1-r1.ebuild b/media-libs/taglib/taglib-1.11.1-r1.ebuild
deleted file mode 100644
index ac42c4b3bf4d..000000000000
--- a/media-libs/taglib/taglib-1.11.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/v${PV}.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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-SLOT="0"
-IUSE="boost debug examples test"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	boost? ( dev-libs/boost:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.11-install-examples.patch
-	"${FILESDIR}"/${P}-CVE-2017-12678.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)
-		$(cmake-utils_use_find_package boost Boost)
-		-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_p20181028.ebuild b/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
index c4e1217ecdc1..39371d8c5f68 100644
--- a/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
+++ b/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
@@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 SLOT="0"
 IUSE="debug examples test"