gentoo resync : 15.10.2017

4 files changed, 1 insertions, 124 deletions

diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index a6896f122c17..65ff220fea67 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -6,10 +6,7 @@ AUX taglib-1.9.1-bytevector-simpler.patch 3685 SHA256 89992db2dd7201bfe1862c1cd1
 AUX taglib-1.9.1-missing-deletes.patch 1194 SHA256 263fbfce5accbcb635b42ae5b7af988a0a8a8d0f2dfdbb6dfd96ebf39421b3fc SHA512 1cc2796401dc1291b19245bd9a6bde9d77549d7ddab96b99b8e0f95c331a1ba7296f7107bd99f6f789cd04dd412d6e330db099ab49344c4dd1a10ccfef203fd1 WHIRLPOOL 8cced81a118f56e36943b1e45aadb234dcd20aa58378bbb5d30a97943b6f0ca4e37ea8381a02d77f8c3f4058fd2598cf450122574420e4627d1b9cedf08b343d
 AUX taglib-1.9.1-order-big-endian.patch 884 SHA256 cc3bd7acfb1c1bbbe0f8299107112bdf572bd716aa3623605f26e4312856ff2f SHA512 4f2c751f03e976da64fc1480e369443d724c420198600ae1a5e9e9cab3172289c73d15b66ec0c95165da30e52dff1d956314fd71fb067e10a11c350566671bd3 WHIRLPOOL dce49ba2b65b4f71a0867104ac81ac3e10cb09e48bf866306d813b03b472e758bc8339dd6135c18b6232a9f6b36369a44c7a6c10a513df537f75f43764fcdc48
 DIST taglib-1.11.1.tar.gz 1261620 SHA256 b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b SHA512 7846775c4954ea948fe4383e514ba7c11f55d038ee06b6ea5a0a1c1069044b348026e76b27aa4ba1c71539aa8143e1401fab39184cc6e915ba0ae2c06133cb98 WHIRLPOOL 243cafaf238303eb2dcdca415ced4dbfb49d4890ba4ad5baec25aff9175bc33e3a20835518d461be946805b7b438c50c86d3999dc98fa648d177ac32a4a0b062
-DIST taglib-1.9.1.tar.gz 654074 SHA256 d4da9aaaddf590ff15273b9b2c4622b6ce8377de0f40bab40155d471ede9c585 SHA512 17523b7ebdd089520289ae817b07f291be93fd0b9d3b2891eb4860a24e45943e94d25b99250c1ac477de5e51b08c39887ca13fdcc2dce17867eb60d1edb26154 WHIRLPOOL 962ec0508d8256a54ea686d4fb8d366f23f82bf10df6406c8012295ceda8416a5f23db6e450551b685798d628623eb5247e6ab7b658f955d897b86340baa5e8e
 EBUILD taglib-1.11.1-r1.ebuild 1394 SHA256 f9b549f00463a60e0194619241b1ecfc4e5360120644db541af8b4b90b957ed1 SHA512 6dc269c47c6f869eb5f0e3e547e6d90f77fd7f81f7170bafe59824a4c1d75d6fab5e4c4fcfa22cea96fb6d8ddbf6da8e9acfe8a2089034484b0215f7f0cdcbac WHIRLPOOL a65fbc88d4e79bdff9b2eb8721b8651735590ebc54ab7c10ad95a003e4f41093f7f1986127a84a44f066470975903bf54bf667838c069170e64935edf2107d00
-EBUILD taglib-1.11.1.ebuild 1360 SHA256 4fa0caebd13d0ef1bb93f0caaf8e7999d674ba9f4dda93358d5441494311a9ae SHA512 8c7dd2aa123e56a94b2799fdea76bca1ee02534c770b3e367317eed4594f40a5ab3a38f13e53e35b9284fd5d80e3db27ff5feadf6262bdfda28d1fc9637f26d6 WHIRLPOOL 69d2d704893a3ecf49a1ccd9677f0be7acd60dd9c1a0da3237834fec6a50f8c4008758357ab63d49d9850731c5d79d3c8e5c4c2f9bbfa23f72e861abf47995fc
-EBUILD taglib-1.9.1-r2.ebuild 1847 SHA256 16a7e7a708a28bc819fb358afbba2757c741705c40b7802c9e4f690336674b2a SHA512 d62e4500fdfd5a4ed713e5c9dcfb6a70b04d658df844a548220e63ebc7fde771c34934a44bd9109c519cbc2374e5b81200ddf5695194ffe53c65e803ed7abd49 WHIRLPOOL ee5b34ba07be0fe160992da2b555867f69d9c64a78d18eb8bc98ca7f232f7664175e4e73bf69d293293eab878ede67b5bec5f422bb01829c2a1811927ac4b7d5
 MISC ChangeLog 3798 SHA256 2d9609463502b43ce4d9cc52606aacfb6b41b10dc8efe8d0db6dfc32b0d211f3 SHA512 8720c7e6d323d656ca8c9862b14285682792d4eb87bfa31d78f6c8ee8acac4fb7b5fbf82ec145a76e41dac68cdb5e8c48987e343f985c1123763bd44e745b57f WHIRLPOOL c17222811035b3d57e691d3fbee7049bf960721c22bc6e33dac0039f73983bbeb7745984b0914d1511ac4c4c4e338bbec17fcb2c4e6362883f30c88205265a41
 MISC ChangeLog-2015 19514 SHA256 669deb727b8b32ccde8fc5de4c54fdb49f02c89077217eedb66571577f7e0cfe SHA512 4ede1ed611e1df9a71e9550888183ace3a7eee4ec443e68a4c7ff3a8db88b93583eafedd0b1f3d3aa06a64cf548614da666f61257a95b680052bc019e5a88689 WHIRLPOOL 23ea9a5a684a9c895245c99c2c4a74e26764d98ebc6ea67c1b23fdf51dd4727a313b3d94fc264f67cd66849aaaac3a64b904ccc43eb0d179b204676277513949
-MISC metadata.xml 526 SHA256 d0fbdcdc8ffb2c1aeabc9f35307a2f2564502bd66603bdc9d25dd85e22c3280f SHA512 2441e8b6de28b8e3c098732e411b0ac0cfe8db518b920f1a247855f0759e36a4d47889c04e9ef8f5e9bb82d00d2cd4b6b7f91efcc51971644fa3284b13e56a1a WHIRLPOOL 5e44172d6ee0b73c88751fd99bdd2fc0d1c903c2407b8ee4a0595748c397839e300cd43f0ef1ae289d3f177e742fb56ceba5465d8a140c9fb38fd4c7f547f054
+MISC metadata.xml 425 SHA256 02f90e390da8a3bf142f71e90b5ee45d9114fc2755e4b0f92dc4cd80e33cdb03 SHA512 31bd061f371cc8f300a22c150b86ef163f0cdd1d5e6b1c0ef0652038a2a1a5372a2910e201df28a70cb57f87945636b1ad352858f75714f3889068f94391c4d0 WHIRLPOOL 709b214bdef1438e1d08c25a642a8d245a9526ada7f47d64ef586a3e1d2b38f9467bd5575fa034b67c2892e4770b9505fd71e7c089a1e477174c92f30c798063
diff --git a/media-libs/taglib/metadata.xml b/media-libs/taglib/metadata.xml
index 6322822c7534..cabb8e8cf5a6 100644
--- a/media-libs/taglib/metadata.xml
+++ b/media-libs/taglib/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="asf">Provide support for Microsoft's 'advanced systems format' media container.</flag>
 		<flag name="boost">Use <pkg>dev-libs/boost</pkg> instead of GCC built-ins</flag>
 	</use>
 	<upstream>
diff --git a/media-libs/taglib/taglib-1.11.1.ebuild b/media-libs/taglib/taglib-1.11.1.ebuild
deleted file mode 100644
index d064b14e30f0..000000000000
--- a/media-libs/taglib/taglib-1.11.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-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
-)
-
-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
-}
-
-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.9.1-r2.ebuild b/media-libs/taglib/taglib-1.9.1-r2.ebuild
deleted file mode 100644
index 807331a20de0..000000000000
--- a/media-libs/taglib/taglib-1.9.1-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib
-
-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="+asf debug examples +mp4 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}] )
-"
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r2
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-install-examples.patch
-	"${FILESDIR}"/${P}-missing-deletes.patch
-	"${FILESDIR}"/${P}-order-big-endian.patch
-	"${FILESDIR}"/${P}-abi-breakage.patch
-	"${FILESDIR}"/${P}-bytevector-simpler.patch
-)
-
-DOCS=( AUTHORS NEWS )
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/taglib-config
-)
-
-multilib_src_configure() {
-	mycmakeargs=(
-		$(multilib_is_native_abi && cmake-utils_use_build examples)
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_with asf)
-		$(cmake-utils_use_with mp4)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	# ctest does not work
-	emake -C "${BUILD_DIR}" check
-}
-
-pkg_postinst() {
-	if ! use asf; then
-		elog "You've chosen to disable the asf use flag, thus taglib won't include"
-		elog "support for Microsoft's 'advanced systems format' media container"
-	fi
-	if ! use mp4; then
-		elog "You've chosen to disable the mp4 use flag, thus taglib won't include"
-		elog "support for the MPEG-4 part 14 / MP4 media container"
-	fi
-}