gentoo resync : 04.05.2019

3 files changed, 2 insertions, 46 deletions

diff --git a/media-sound/opus-tools/Manifest b/media-sound/opus-tools/Manifest
index 6498c98eece2..6f0bb8292225 100644
--- a/media-sound/opus-tools/Manifest
+++ b/media-sound/opus-tools/Manifest
@@ -1,5 +1,3 @@
-DIST opus-tools-0.1.10.tar.gz 312093 BLAKE2B d96377f3c56990bafef58f0eacdf8795302400eb986e6408b2eb1af67eae59194709b9e1ef86b420b4adab767be329278cc60c1fcc7da4b3f461b532ebf8bdb1 SHA512 4ead97b9fe4658968a4b5cbe4bde5e2d8cbfaaea18dd0d817597cc6b6b11f26937b9eee7358ade63568f0213131aa80ecbed169d1b3885980a556871a4a7fe98
 DIST opus-tools-0.2.tar.gz 457680 BLAKE2B c5896a6303aa1e1626097622e671bc96fd292a0f0c40a56410ef1f7699f8d18540d71e70f1cace6a91bb430886f1ddb07ba08503bdf82aa81758793bcea5b530 SHA512 6fdde8d938e8fadc9391b5d188883dab0aecf8b27d40d00b5d67d8fac9cfd9d5107b1934bfe6310587400f277c99d1db5cabf3d26f340ce2141873dec238e5ce
-EBUILD opus-tools-0.1.10.ebuild 944 BLAKE2B 128013973365bd4de9d4f11cbc536b3868935482cb24a7998b5ec6f73195497d28d5622d6ad9186849ba2850882ee4a0179bb04098f9d8471a1c2ae2fe884d52 SHA512 844133cf0a6077d13cc85eec31dc47af94c25bd3dac6eea41eb396b9a36a27d6b0d67e86be0fc53dea8bd3ea03595ef47aba87d06482f3ddf144bc70466b7c38
-EBUILD opus-tools-0.2.ebuild 1004 BLAKE2B 36bdd5cde5b7a6c30cc28d2be883b5d0e8fa07cb55b424c1e2ad9b149cc9c12accb53de2c8eec1a7f7d7858a55c21dc865b2b6d7553f871dca9b79d98646ea26 SHA512 332691fd5dc0dbc2296fd0c3a901709deecf32f069b16f0fbf555c5f8c2e3e24c93637a7a9912c2e92ba9383a48964de44690c21ff064c2ea5011ae8d3f485c1
+EBUILD opus-tools-0.2.ebuild 1003 BLAKE2B efb6eed0682ecb5adfb85a83f6a5b8cad7d27636e61561f51136c04fc760553f6b871dc09d4009c2590cb399dfff47ac9b60c7a80cd9a4560c3066cd06d34eac SHA512 6a70ca44e6f26fe7a5c6d1f0fa9148d18701d1035319496b2b6cbd4e38c825efe4709ea6f294fa398ab590e385f5deec4c904ea2d20d3228426962adfa56c6d9
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/opus-tools/opus-tools-0.1.10.ebuild b/media-sound/opus-tools/opus-tools-0.1.10.ebuild
deleted file mode 100644
index 652f98ca9693..000000000000
--- a/media-sound/opus-tools/opus-tools-0.1.10.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Royalty-free, highly versatile audio codec"
-HOMEPAGE="https://opus-codec.org/"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.xiph.org/opus-tools.git"
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="https://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.xz"
-else # Official release
-	SRC_URI="https://downloads.xiph.org/releases/opus/${P}.tar.gz"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="flac"
-
-RDEPEND=">=media-libs/libogg-1.3.0
-	 >=media-libs/opus-1.0.3
-	 flac? ( >=media-libs/flac-1.1.3 )"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf $(use_with flac)
-}
-
-src_install() {
-	default
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/media-sound/opus-tools/opus-tools-0.2.ebuild b/media-sound/opus-tools/opus-tools-0.2.ebuild
index c62c01416a15..7111b11302d1 100644
--- a/media-sound/opus-tools/opus-tools-0.2.ebuild
+++ b/media-sound/opus-tools/opus-tools-0.2.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="flac"
 
 RDEPEND="