gentoo resync : 15.12.2019

4 files changed, 3 insertions, 75 deletions

diff --git a/media-libs/fidlib/Manifest b/media-libs/fidlib/Manifest
index 5cb646096cfe..88814d7041f7 100644
--- a/media-libs/fidlib/Manifest
+++ b/media-libs/fidlib/Manifest
@@ -1,6 +1,4 @@
-AUX fidlib-0.9.10-cpp-extern.patch 456 BLAKE2B 62e4465fa85f52cbe3855fd16b538a142c4f6b8cf9a83d98bb7f34b58b709a9d265dac605972d30d6109886eaa2d7d7932dc057ef6502a15ce54f7515c49ffb6 SHA512 3134dd872d6ca6bf518eb5b72337a8ff8476acc1c65f1c7b3a7b65aad7373f38c8e7a3f92e5e1bfbddb2ead3b4348677891750b2258986c827c70fee885f406b
 AUX fidlib-0.9.10-extern.patch 525 BLAKE2B 6a018a1e1c58d4c0457546955c88152a3d6e72aa0379d4787c0c3dcc85c409e8cef2e3f9d493bf4121521119eaf70cefa5c1d35ca03d01d060dc2246e8414e4c SHA512 e47f4814b181047d998d533ace997977ea32c7c1fbcce25c41cf775eacba8abb4360bc0a63335355453300e17fd314e5c5da59897afd68345ab97c7d53eeb14c
 DIST fidlib-0.9.10.tgz 87082 BLAKE2B 1a8c2c9abaf1d8d0855466af2c3243a4253f505b488822852d49c702f0904beb599bfa7a023d4be925d1d245b8357ebef05dd6c4051bdc9c9c3eeae96bbf0b46 SHA512 77600acd665407b4d786b406a4f20b2f6c30c74775f5777d5054420b80c74e5bfa316bf7bd90df1669c09cef0ff9b552a0338cd138bf7d9bcf1df7cbff9fea4b
-EBUILD fidlib-0.9.10-r1.ebuild 1112 BLAKE2B 8ce38e8658eba5c4a1e8f13e26f8d124080a104d7865d3b0d399c43f9e4ec3f544f91847b197ee743031ea1c6aaa584bcbd111edcf6f6fbbd4d2a07a10bed7ee SHA512 e20854ab0377b9a05350903950b9d96fa2ed85916aba61e69a652e36f4c5dee2c4d42ee1baaacdab05ccfebf78a06ebfa6fb294f6447df75eb9144a340ee1194
-EBUILD fidlib-0.9.10.ebuild 1122 BLAKE2B 28ad3b24850ef30bc2ea1f39cf13bb3bee81eb3bd2ef6f603829c21820d5f9e4363acfb2646ef5bdb81d16f557cc18da8ec8cc946214ba8a6eeabfe6bdeef766 SHA512 17bd54f6cf95a7fb39fedd8c5752aca884682515163453f54f13017c8130083218fbd01afb9d9bcd7765efe562b4f0021c079f33bc1c6dcc103fc914828c0598
+EBUILD fidlib-0.9.10-r1.ebuild 1107 BLAKE2B 514896ac94d4ec18fef4a801aabd02f48217c921f702ee10bd8d51fcdf61b52848f6ab8b3a5c137bd45ac1845e75e38fd7aa49aa5cd02a838053d5deeb1a8b1c SHA512 016d8decb9df92fc632dda85ed6a56369f3ada565179813eb4bdee53f9aa058c9a71dabd9716ff535718fbaf337f9a7f7deb2559c69e07235a55f25ded593a1b
 MISC metadata.xml 265 BLAKE2B e3dedcada43b8145986c6c9f3ed1d374d3e93d2a1f6bdf5d83af1a43e24d01ee0ea4b6efd67ffee46d585e6d37272cbacec69e66e21b22af6a5e01878003e44a SHA512 5b875b5d0a59914316df520eee72ee3c5f931b8513424120281657bbc266c777214a924e4c6c867cdd7a61cb66037c7b9b501225cc06d890abb8ca04c13f5fba
diff --git a/media-libs/fidlib/fidlib-0.9.10-r1.ebuild b/media-libs/fidlib/fidlib-0.9.10-r1.ebuild
index 9782a86864d2..939921d2acf6 100644
--- a/media-libs/fidlib/fidlib-0.9.10-r1.ebuild
+++ b/media-libs/fidlib/fidlib-0.9.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://uazu.net/fidlib/${P}.tgz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 doecho() {
 	echo "$@"
diff --git a/media-libs/fidlib/fidlib-0.9.10.ebuild b/media-libs/fidlib/fidlib-0.9.10.ebuild
deleted file mode 100644
index eb2c394daffb..000000000000
--- a/media-libs/fidlib/fidlib-0.9.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs flag-o-matic eutils multilib
-
-DESCRIPTION="Run-time filter design and execution library"
-HOMEPAGE="http://uazu.net/fidlib/"
-SRC_URI="http://uazu.net/fidlib/${P}.tgz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cpp-extern.patch
-
-	# Avoid ICE under gcc-4.6, fixed in 4.6.3
-	if [[ $(gcc-version) == "4.6" && $(gcc-micro-version) -le 2 ]] ; then
-		replace-flags -O? -O0
-	fi
-}
-
-src_compile() {
-	# build library
-	doecho $(tc-getCC) ${CFLAGS} -DT_LINUX ${LDFLAGS} -Wl,-soname,libfidlib.so.${PV:0:1} \
-		-fPIC -shared fidlib.c -lm -o libfidlib.so.${PV:0:1}
-
-	# build command-line tool
-	doecho $(tc-getCC) ${CFLAGS} ${LDFLAGS} firun.c -lm ./libfidlib.so.${PV:0:1} -o firun
-}
-
-src_install() {
-	dobin firun
-	dolib.so libfidlib.so.${PV:0:1}
-	dosym libfidlib.so.${PV:0:1} /usr/$(get_libdir)/libfidlib.so
-
-	insinto /usr/include/fidlib
-	doins fidlib.h
-
-	dodoc NEWS README fidlib.txt firun.txt
-}
diff --git a/media-libs/fidlib/files/fidlib-0.9.10-cpp-extern.patch b/media-libs/fidlib/files/fidlib-0.9.10-cpp-extern.patch
deleted file mode 100644
index 221ec825f174..000000000000
--- a/media-libs/fidlib/files/fidlib-0.9.10-cpp-extern.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- fidlib-0.9.10/fidlib.h
-+++ fidlib-0.9.10/fidlib.h
-@@ -2,6 +2,10 @@
- //	fidlib include file
- //
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- typedef struct FidFilter FidFilter;
- struct FidFilter {
-    short typ;		// Type of filter element 'I' IIR, 'F' FIR, or 0 for end of list
-@@ -66,3 +70,7 @@
- extern void fid_run_zapbuf(void *buf);
- extern void fid_run_freebuf(void *runbuf);
- extern void fid_run_free(void *run);
-+
-+#ifdef __cplusplus
-+}
-+#endif