9 files changed, 11 insertions, 39 deletions
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 637b58633a8b..9bc8c88988ea 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 8c546d73c31d..67feff0e605d 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -4,6 +4,6 @@ DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f
 DIST ibus-1.5.17.tar.gz 2522960 BLAKE2B a0d19eaae809549d678b42394e76107b8869232c90932bfaa5072621598e83db0569084e931c51c15b7179d9d8e0a2ce144b726229dae81a009665a5de87afc4 SHA512 8a7e4fabbcb2096e647b1fb7487c92882bd320a4d777f2765817378abec2e60cafd63364c881fefc2805ff2baa6b28b15ee0710587662a3e65eeb60ead19496c
 EBUILD ibus-1.5.12.ebuild 3695 BLAKE2B b22d441277f55324c4d5ecc6d592f3057900a46e0f4bed4ccc90c14ec10890fa26bab18c5ded5649f9bb83c3485899bcea8e9d0fc80410e55199ad97b51f2009 SHA512 2593129b58c41301ea94f7b7761cc40e13f3b6458230478067d6a0a1c6a23ad8aa5f225d4203259ad54eb38d87b3bbac1a029a4de5282aee82147891b3c2b394
 EBUILD ibus-1.5.15.ebuild 3552 BLAKE2B 040902ad38258aab1ff4b0d2b3eb495a6f7a3b5148b1cbd06378773b1c421da8e3240395d4412a712243663b1d70754b33356c2316d072dcc847f80a902d04ea SHA512 dec56dc700cc9e8fbe2280cf75e2550cc92d51e7ecbae307b87ef6e5707a2a7e31c5b82e8228818290bc94527f3c2bbdb34e0a4b61a0c8d5f1bafe5ebd00d485
-EBUILD ibus-1.5.16.ebuild 3966 BLAKE2B 32a687f21c7d82899df11fc6e5b1c22667c08480e1feb0dd14375df34f64d307c749a5fc00dd9380ffed4e981934eaf3d8bf8c2f336124066200d32aa854cc01 SHA512 05fb124b8bcc40cf950788287b478bdde9fc2932c92b529dad66e7bde288f325c5e73bf86647e85400fdf0632f39f5973c031e7b2b4d1aa3c2c4406cb04a20d2
-EBUILD ibus-1.5.17.ebuild 3972 BLAKE2B aeee5376eca0ae7859b0bcc8243d820083548b044fc3ce7cb2f3617bd7ad62e4acadfeb227e4cf1e149108ac7a0af04cdbea7191cb92eb554c5b4b978c5f5513 SHA512 b77d80f9e2622609c4523428532c8ea3b7b6f2825258ce1f688c86f323597740bcbdc695241b985511167e0e3f4825640cf7698e14fc65ccc63ee2f1e7914394
+EBUILD ibus-1.5.16.ebuild 3976 BLAKE2B 6bede6434d30b0fe6f07bb5f447b783dd0ac4a999d34afced1dd37039e949d1da06d3eadd1e08180bafdba274253d188099c3dd4747389a5f1fcc1009fbe3b04 SHA512 706833bf159c29c8045f686f2a11a4daa1672ab69c5925bc70952b3bacad641a61175c6898bec036fb7eb26b3d8b9fbf520ed2e9e5fcf32bac228992e6506e97
+EBUILD ibus-1.5.17.ebuild 3982 BLAKE2B 48c3ae5d7a6b0772ef0343ceb98f61ab9c384f0854af6e39500679a383df9c77e785e10e57c88f936fa72d8bccb4a75fb349e12584f6b02345150de3c676a560 SHA512 2c079b15bdc95da7b831c5da1d1094424644d18553732aae323c957d09228b41233de03a5c5641ff0a65d70e6ff81771c1d398af2a97c5e0c04a858c0a3987ef
 MISC metadata.xml 876 BLAKE2B 0594f787b71a972b67f1f52fde4e6e6c4eead1f604a1152ea9af2a15cd678677a29adaaba1a53251efbb95f0d12baa7d3dc63e54676757bbc7d9bf6235cf7e1e SHA512 eff80e5a8db4276c1138de9e661e5735c42abfc32950bc439eda9f342e5d2a68a8d5c848dc0000a2960a315ac38dbeda6b9fc44de8b9d526e7dddd94122f9f32
diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index 25bed25d177b..4dcb90a62639 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )
diff --git a/app-i18n/ibus/ibus-1.5.17.ebuild b/app-i18n/ibus/ibus-1.5.17.ebuild
index f7900a15eefd..43eff2df2a0c 100644
--- a/app-i18n/ibus/ibus-1.5.17.ebuild
+++ b/app-i18n/ibus/ibus-1.5.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )
diff --git a/app-i18n/man-pages-ro/Manifest b/app-i18n/man-pages-ro/Manifest
deleted file mode 100644
index 3cd5f51f8452..000000000000
--- a/app-i18n/man-pages-ro/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST man-pages-ro-0.2.tar.gz 42764 BLAKE2B 1bdc89f8a2d04322ec0d65eb48eb070d96d8dc9f692a80dfb60053fe3b96051101f4cce048e3f159a6394ff4e333dbf38f6b255399a0d02805ae5044755004cb SHA512 d45deab53dbc34ef9809c19c00cded7f67bf78979cd9a8dc4a5e418465a2d56327822a07736d38fdfc34d036909866b67fdd78d1c2dcbbdb7e60d5bfbfb2599a
-EBUILD man-pages-ro-0.2.ebuild 536 BLAKE2B e77ecf867771cdf0ded10cab9f5a40589bf5df6d0a500e746ea8fbedd7e652e0ccbf7c853296a94efff778c5a31e0e25a9426eb41941800ec8c9953063c8bf46 SHA512 0ad3d532810074b6e4b4fd97eccc84e1a347d92fcc3df07a8d6a3db6311c33e2105c2177d829cbc0faf0f3fff933003e70e377857c5688fe334cc00fa1a2c3aa
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-i18n/man-pages-ro/man-pages-ro-0.2.ebuild b/app-i18n/man-pages-ro/man-pages-ro-0.2.ebuild
deleted file mode 100644
index 21b78f0722e3..000000000000
--- a/app-i18n/man-pages-ro/man-pages-ro-0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A somewhat comprehensive collection of Romanian Linux man pages"
-HOMEPAGE="http://www.rolix.org/man/arhiva/"
-SRC_URI="http://www.rolix.org/man/arhiva/${P}.tar.gz"
-
-LICENSE="LDP-1 GPL-2+ man-pages"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-S=${WORKDIR}/man-ro
-
-src_install() {
-	insinto /usr/share/man/ro/man1
-	doins man1/*.1
-}
diff --git a/app-i18n/man-pages-ro/metadata.xml b/app-i18n/man-pages-ro/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-i18n/man-pages-ro/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-i18n/unicode-emoji/Manifest b/app-i18n/unicode-emoji/Manifest
index 599e7183bfd6..d370b5574a6a 100644
--- a/app-i18n/unicode-emoji/Manifest
+++ b/app-i18n/unicode-emoji/Manifest
@@ -8,6 +8,6 @@ DIST unicode-emoji-variation-sequences-11.0.txt 36333 BLAKE2B c32b674969a102d246
 DIST unicode-emoji-variation-sequences-5.0.txt 36120 BLAKE2B 50e19bd7147486437dc4fd7784ec9bd5869e58f934738fa1d46edc030202fb9490ddebd6f1cefb98dd78b3be2c4da7e3f2acef0ce54487a183123311efbf7205 SHA512 484509ed56c5ea5e73160e211643a938d3fa08474281d316e5ed2d2346f38f5140a147454a9cb81c9f463d6c62befd98a8b70b695ee50effdbcfc6085dcaa520
 DIST unicode-emoji-zwj-sequences-11.0.txt 126959 BLAKE2B 82d78fd5fd47bb4201001903c0610e3950a2fa1c315fe8494e15977999ba0b8f0d4431eb842db6f01ab765fd181067b07258ddb4c547ddfc01fc0da7680ea540 SHA512 a2a50cd5451d3ba1da0f3b46e18a10d621ead0372599b98dad0fd47fdb271407f72bd72854136c93311b13950cedc2b1594f06d460e551ab120ed30ba8abce4d
 DIST unicode-emoji-zwj-sequences-5.0.txt 115207 BLAKE2B beb8f304be16ffe34fde4cab20bfb981f3ae61ffc6827ced0b3160de7e405459fdf38c6e7fcafdd3887da16da7870b84520f1c68e661480efbd0cb9510a04649 SHA512 26398ac77035d2f5df7a61f4c2a8a098af8e551576c9c9f157379c05aa8f75de5a0827c9bc476eb20f32c38b0c3605f6a1d9e07fe27f0e75df359ed2a7e6d25b
-EBUILD unicode-emoji-11.0.ebuild 950 BLAKE2B d110d84d78d73537a9eb88337e4291ddd0f551de709d6cb20ca2b9369e05330d6cc6289364139e7ce9a4c2ef86943211cff284c11848c136b7364a2032a7e892 SHA512 91ca9016c7d22cc16f1fdb233f3c931a4fcbada09eb2026348aee712fe5ce05dfd7b22a8969b38831eb6e3b51f34af8db2d5680e50c93ac59e9fcdad191bdd43
+EBUILD unicode-emoji-11.0.ebuild 1031 BLAKE2B 68f74394355740b377a5b81554522f153b6e4c40010646662c69ddd3fead6c3a56711fdf42724d8b8a0e9206d46f7a903d1a2bb1e8ba8634994d2d946c739942 SHA512 aabc122ce67d5f0ed853ff8e0a8555d12e8a2f8b92b5506144a039e15f6326c38388ea3949f1d839142ff7fa5e77440da881e7f62cc877d7ab1d62fcb89c362e
 EBUILD unicode-emoji-5.0.ebuild 878 BLAKE2B 6ba9e72ea96c5e0f747bdf09c1fb172b30a36e4195ec50c7f6c598370b25f0a9227a26a31eebc71c0e84d651599df8f2e9163ff42651a1aa55cec98dbaac7bb5 SHA512 be5759f2f41f8640817ee94ddc21e6f9cd58dec8253d5c7c147c1870ec01814e420c0d2ab72c6681b408774865157d2d3bd8766b090fcf28a62092351ef64ba0
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
index 8a9a211570ba..68f27b9b7b12 100644
--- a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
+++ b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
@@ -28,8 +28,10 @@ src_unpack() {
 
 src_install() {
 	insinto /usr/share/unicode/emoji
-	local file
-	for file in ${A}; do
-		newins "${DISTDIR}/${file}" "$(sed -e "s/${PN%-*}-\(.*\)-${PV}/\1/" <<< "${file}")"
+	local source_file target_file
+	for source_file in ${A}; do
+		target_file="${source_file#${PN%-*}-}"
+		target_file="${target_file%-${PV}.txt}.txt"
+		newins "${DISTDIR}/${source_file}" "${target_file}"
 	done
 }