gentoo resync : 04.05.2019

3 files changed, 2 insertions, 54 deletions

diff --git a/media-libs/libofa/Manifest b/media-libs/libofa/Manifest
index a4ad436b75de..6ad3c4f5b325 100644
--- a/media-libs/libofa/Manifest
+++ b/media-libs/libofa/Manifest
@@ -3,6 +3,5 @@ AUX libofa-0.9.3-gcc-4.4.patch 251 BLAKE2B 89e4dbfb168e528a753e7c114f8568411a2c5
 AUX libofa-0.9.3-gcc-4.7.patch 651 BLAKE2B 52a20e9242f5899ad0c08b91ae2d9169642ceb51b87a22ddc0ca641f57f1ae6a342d3b658265caf1d1d3b938fc13b3b717c118839adbcf3e10a78d35cf68827c SHA512 ec337bb839ef2b7477cc4a5c45cf751c1d0371898591865725fe6db05ab25fd8c0297ecbe44d1157b2de56d9bf7284634c668cf5b72ff03a7dca66dba8d99522
 AUX libofa-0.9.3-gcc-4.patch 818 BLAKE2B c49d0f1bc2c364a25c20792ad79d53a5a8abdc9370c272e4159c5a37844061cbc03aecf97933d0c2e2c4b18225d004fb0484456169f78f5caee0fa5ae5a1145b SHA512 7e80ddb700da74d1e2b6c5e65588e6329e8ae231534b3d74b98815bc4919964a9fad87fcdfa2bef0d4adf9d478efd5c1649d018fb347a93c7ae1685cccab8834
 DIST libofa-0.9.3.tar.gz 384043 BLAKE2B 1b4c89e1a26e3bec1b2bde16c5d2c86ae7a66cbe8e450b96974ffd8be434062ccf21779c0eed5a809012a419d65f9de327c6b94fe6ac5365270fe382dbfa2c08 SHA512 058fb43ea296325d2f7ad1762e1fd3f2ad772754b5d53dbaa1c5cd91ac5041ef82c7ea9ac580825e2391fa7db6803ff7fd5b24faf319280211a4641516126967
-EBUILD libofa-0.9.3-r1.ebuild 1225 BLAKE2B 64aa485bf1431f2998034bf693030e4340c259646fde1fb76a453f57d78bbf908197e7b6a26c9ff84314dd40cf07fcb42c9a97201d2940fc0f1cd69360e6c561 SHA512 d1fe57bcd6c8c778b4f940ccd8d8b480cdab008cb93ccd8f39ccf371e9cde85d85ee327ddb7562b72783bd3c4bb2e3e690bc2e3192f9c868abfabb19018a16b3
-EBUILD libofa-0.9.3-r2.ebuild 1114 BLAKE2B afea9f75820526fb172334a1d43b4a5a368f29f4425cbf97bba77e166fcbc7afa411b8e99f39f2ec538fc923c22260df19af0ce32de4fe39eb22f2e2337c3ac8 SHA512 6f1cf4f49160cdd22fa8dc9ce1fc7c14621f1dafa84d56402e313d7265300395bcbe467235516df70ecff336dd398331b24ec30bf13841da9beae531c2ed7c0e
+EBUILD libofa-0.9.3-r2.ebuild 1112 BLAKE2B b6bc28f46bb36cbd78846a4c76e67915e1d6eaf85ed669da11139be417bc9c9dd7c138774e35192a369df18000f8a1c78c433161978eb7ba4d606a29d04d1c6f SHA512 5882b91f05c053f66d6b6776237fc055bbbb28c2d5f7460c6f92df6b73782a093fb959b8270fcc0883ecf6af7ff6546ad456ab7f1d575dab2a54224ad2b1ece4
 MISC metadata.xml 337 BLAKE2B 3cf5fbbe6cea6c48b832cd4be4ae506a319b7d21d27b1e98c83602adf8ff4948736a7eb46e7156bb328fae2fd27886d4af194f340e06488a7f5adf266bf84e7b SHA512 ccfab3198ba95caba25340c8254d465b23aae4edff3f63a0acbc0fc7283efb45b5ad4fd250df09e1e2442b5cb2977a228375daf25ffde08004eb887f624941c8
diff --git a/media-libs/libofa/libofa-0.9.3-r1.ebuild b/media-libs/libofa/libofa-0.9.3-r1.ebuild
deleted file mode 100644
index e85125f172c6..000000000000
--- a/media-libs/libofa/libofa-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib-minimal
-
-DESCRIPTION="Open Fingerprint Architecture"
-HOMEPAGE="https://code.google.com/p/musicip-libofa/"
-SRC_URI="https://musicip-libofa.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="|| ( APL-1.0 GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/expat
-	net-misc/curl
-	>=sci-libs/fftw-3.3.3-r2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-4.patch
-	"${FILESDIR}"/${P}-gcc-4.3.patch
-	"${FILESDIR}"/${P}-gcc-4.4.patch
-	"${FILESDIR}"/${P}-gcc-4.7.patch
-)
-
-src_prepare() {
-	# disable building non-installed examples
-	sed -i -e '/SUBDIRS/s:examples::' Makefile.{am,in} || die
-
-	epatch "${PATCHES[@]}"
-	epatch_user
-
-	is-flag -ffast-math && append-flags -fno-fast-math
-}
-
-multilib_src_configure() {
-	# disable dependencies that were used for the noinst_ example only
-
-	ECONF_SOURCE=${S} \
-	econf \
-		ac_cv_lib_expat_XML_ExpatVersion=yes \
-		ac_cv_lib_curl_curl_global_init=yes
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS README
-}
diff --git a/media-libs/libofa/libofa-0.9.3-r2.ebuild b/media-libs/libofa/libofa-0.9.3-r2.ebuild
index 57e6cbfcbbc6..b86f6a31617b 100644
--- a/media-libs/libofa/libofa-0.9.3-r2.ebuild
+++ b/media-libs/libofa/libofa-0.9.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://musicip-libofa.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="|| ( APL-1.0 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"