gentoo resync : 31.12.2018

3 files changed, 2 insertions, 44 deletions

diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 423d9d2dd74b..f1462e1302a0 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,5 +1,3 @@
-DIST fribidi-0.19.7.tar.bz2 648299 BLAKE2B 496d010f29dd8fc3d349ad3f89d60a596dfceaa5350663442d5965cb09bc7a23e2ab8a876d7ca5b05ec3f4c5e178060cae2b493ccc46a6cdfc022d139e778259 SHA512 4bfdda43d961030a8a2ae2c98d2ca5d43c1b59633fa0987920c5537ec69f3f624204ceacc4c474d878cbb417ee2d9e708dfe169cfce6ad584d2f2d5122678b63
 DIST fribidi-1.0.5.tar.bz2 2082617 BLAKE2B 99b088a37600d1b3e556b4dd978cafb04af0fea9c7db8ed9b0aa90d6a6a60f8ca312c214151ce386d2d61ae382d6ff0e6ae240bd44dfde28eb8c25a5c5f4cd1e SHA512 c8fb32468be4c461832d586d6c6af65fad1cfe9d5b2fed405f247d6974425ccedeb21ad11609fbcabc3ae5d635d78d88c12d201a4d19ef997e9497054afcdeb2
-EBUILD fribidi-0.19.7.ebuild 1206 BLAKE2B 69477c5d99446c25db1abc77cffb07ea695e3e57b1474311038e1991c3c6ae387752cd18f5b0a24d9e022e95aadab597baa38f9fe9350a796a45f852286019a5 SHA512 c49e9a76d0a3c41bb03c74ad9af627969ea5c462cd837366a7df52343d7f02a3fc05bd62e2ffcdb57ded1a58c20bd9426469e0ef736ea0210db43e34512ba024
-EBUILD fribidi-1.0.5.ebuild 942 BLAKE2B 4257173da79df01b3299fad960d859399947394c3e90e49a4da9381c22b8715ded60e7f4d787d8154d9be3bc7518a8966af42367e3f27e79661a94aa48e3ab1e SHA512 ba3cc76da7dce98d48e53cf956e139579049c8b6ea26454d612264ca06512a5fb1e2907bb5e32d3f35979a0987ed58350b3d45df22462eb2ca2d9d9a1c59de59
+EBUILD fribidi-1.0.5.ebuild 971 BLAKE2B 23b208bb3e27108ec33623166f546878c44b3b2261c3b3519270eecb2dd474343eda57b351ed12a6bf3db96c5b8b52219bed65cd1ac0454c1d8ca1969743566b SHA512 e77a470f58afa0b647087c90109d009cacffebbe0bdec475a449973eec0f94f3249bfd384c8e69d31df09edec523569afe8021a6610fea642f96f1cdd0fcbb50
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-libs/fribidi/fribidi-0.19.7.ebuild b/dev-libs/fribidi/fribidi-0.19.7.ebuild
deleted file mode 100644
index b6a42a4fab1a..000000000000
--- a/dev-libs/fribidi/fribidi-0.19.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools autotools-multilib
-
-DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
-HOMEPAGE="https://fribidi.org/"
-SRC_URI="https://github.com/fribidi/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README ChangeLog THANKS TODO )
-
-src_prepare() {
-	# Fix compability with dev-libs/glib >= 2.31
-	sed -i \
-		-e '/include/s:<glib/gstrfuncs.h>:<glib.h>:' \
-		-e '/include/s:<glib/gmem.h>:<glib.h>:' \
-		charset/fribidi-char-sets.c lib/mem.h || die
-
-	autotools-multilib_src_prepare
-}
-
-src_configure() {
-	# --with-glib=yes is required for #345621 to ensure "Requires: glib-2.0" is
-	# present in /usr/lib/pkgconfig/fribidi.pc
-	local myeconfargs=( --with-glib=yes )
-	autotools-multilib_src_configure
-}
diff --git a/dev-libs/fribidi/fribidi-1.0.5.ebuild b/dev-libs/fribidi/fribidi-1.0.5.ebuild
index 195aac1146bc..9d560ef1b28d 100644
--- a/dev-libs/fribidi/fribidi-1.0.5.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=""