gentoo resync : 25.11.2020

3 files changed, 2 insertions, 58 deletions

diff --git a/media-libs/libdca/Manifest b/media-libs/libdca/Manifest
index 40a5f88498b0..0fd4a4ae0ea6 100644
--- a/media-libs/libdca/Manifest
+++ b/media-libs/libdca/Manifest
@@ -1,8 +1,5 @@
 AUX libdca-0.0.5-cflags.patch 492 BLAKE2B 3090b187518cd899b76fff017bc544ccafaac02d00e78903654ca68a4bd3093cd9216c3911eb35223931a6dc69edf248f4952d17d9549eb4a8a9507ae973e83b SHA512 cadc239c379c271db9a62c7a314607612e9b43a18a605e414b9943b962a65d6b760a2558917a2259a3875a07f61adc12a8c2d8767cfa76ff4894f02a0842e383
 AUX libdca-0.0.5-tests-optional.patch 508 BLAKE2B ed77381970c59dee10e0b32d36183b390574acb0cfec1216f83bc4f2af784bc973d303d051f6348fd4d69dcbbcbc8b1bbb2f3dc7857fdaf05c46c885a463aad5 SHA512 0998e84e4855367b4c43e27e73d87c2b12c849a80864de66805e344eb32ad8463d46602d63b92edf1dd177d4fe77aa119c07952c6c2bc5de6add13468a9082a6
-DIST libdca-0.0.5-constant.patch.bz2 3424 BLAKE2B 048d7afd856090b5f9d0db1d5894b78d037fa1c03086271342527a1bf04f41ed379b38fe6d72eb9bbf74a864c67710b5f9abe53177cdb2f4f53a8e7502d77c44 SHA512 37bd56b8c240f16a6ee86b04d44571345278f8b9dd395cbc307e9fb7e6c001487411d1b4775af19dc97f18fcaed63be97fafeb4fe504f0a76b87022ec792d23e
-DIST libdca-0.0.5.tar.bz2 393291 BLAKE2B 093e941e8cd25ca52ae43ab16607f8ff3c5ebb95ffc4b29c3cb771b6bf9ba45da4cc8ebd83cd91ccd66b0dd981c32a6c77cb3e90f46093b64b9a483dd854ffb6 SHA512 d9f0ed34efeb3f27af8424fcb3e6df56744c6735854a65b5709c02b42b4513b9c4618dcc19eb44293afa051bd95616651bda5fc3b49dfabe975d0babfb1bc287
 DIST libdca-0.0.7.tar.bz2 158232 BLAKE2B 943ef3845f6b73d3d7a2cc47fd3c59517544c156f46e1be42b7940e11a164d8c533ba0e1436ea7bee95467bb7fdce95bb390e2816ebe7d8e208821eb325cb9de SHA512 dae15d77d066687c882833d5bed8d65a585c1fc0277b7276563c89ddd5a83b35389ec94cca445f38af28a9b01430b72647e9afd1b08f030959e711de1a08924a
-EBUILD libdca-0.0.5-r3.ebuild 1432 BLAKE2B 10e11663856f32e42876aea5a6ae2acc618681b57827b8ca11af02803ca4f516e5272fe642f70c6b36042b7c660ef1676d77b2bfa01314f2226c2fdd1f2d80b9 SHA512 a49b93d1aa70a8d814dd1a8b00b50e3ef25208f2ae80c458ab501dc891faab77d00b85f11f272baba2f4b88682c50ee93f9354d54371a19776ef296b69b73cec
-EBUILD libdca-0.0.7.ebuild 1340 BLAKE2B 7a42ae834fdfdb55ccaf41e821e5066dbc9de6673f25540ab1cef06ad5d816cba1d016db7643a636152e86206387940b623f4c31f0b6d92a1cb785d7addb0e98 SHA512 570d70930be3bcf4fe87c17cb2ffae47b0d469f1d226eb0aabba988858e94d2305d6f4a72565dfb2f0d7db84a73bfbaee6addb71570ed77b2434029cb0708d77
+EBUILD libdca-0.0.7.ebuild 1332 BLAKE2B c5d519fd41ed30953cd3bcae13daf96894e2c44afb60c6b9364be41c09e4501fff3f88747b53e6686f687d378875b316abc15ca5b840154b36ed48dae0e7c654 SHA512 5fed62a9d3dce9960940c78dc787ee081b5c84375b862b65fddf6a67691b4c147179345c7beb00d52981ecf2f127032acd1657e82f278fc0056ab366432f851d
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libdca/libdca-0.0.5-r3.ebuild b/media-libs/libdca/libdca-0.0.5-r3.ebuild
deleted file mode 100644
index 415454150293..000000000000
--- a/media-libs/libdca/libdca-0.0.5-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic multilib multilib-minimal
-
-DESCRIPTION="library for decoding DTS Coherent Acoustics streams used in DVD"
-HOMEPAGE="https://www.videolan.org/developers/libdca.html"
-SRC_URI="https://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
-	mirror://gentoo/${P}-constant.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="debug oss static-libs"
-
-RDEPEND="!media-libs/libdts"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO doc/${PN}.txt )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags.patch \
-		"${FILESDIR}"/${P}-tests-optional.patch \
-		"${WORKDIR}"/${P}-constant.patch
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-lfs-flags #328875
-
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable oss)
-
-	# Those are thrown away afterwards, don't build them in the first place
-	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-		sed -i -e 's/ libao src//' Makefile || die
-	fi
-}
-
-multilib_src_compile() {
-	emake OPT_CFLAGS=""
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-	rm -f "${ED}"/usr/$(get_libdir)/libdts.a
-}
diff --git a/media-libs/libdca/libdca-0.0.7.ebuild b/media-libs/libdca/libdca-0.0.7.ebuild
index 0e794c3f2109..2761963fd5a7 100644
--- a/media-libs/libdca/libdca-0.0.7.ebuild
+++ b/media-libs/libdca/libdca-0.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug oss"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO doc/${PN}.txt )