gentoo resync : 06.01.2018

16 files changed, 204 insertions, 103 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 86e5bc65c00d..0ff485baaf27 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 0e1a9aa4d4b4..a20d52b9c0a7 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,4 +1,6 @@
 DIST gnucash-2.6.15.tar.bz2 13406483 BLAKE2B 927838c5c9c11a19eb9f8e11726825458d5b414f4ef24baf1a7ae15c33825eeed2fd87892e728b37c43385360fd06a60df0bade4244b5c93dac5522f09849c92 SHA512 6ec0652565025ac8281152ed64f2f820ecdb17ead5f17738728e094d116e638a08af57a46c0d5b59679f30f142ce372a5f61bd164f68f6b608d09de37cec38c6
+DIST gnucash-2.6.19.tar.bz2 13612124 BLAKE2B cc66e4d7994274bb2ad97437333dbe62b0e9228e20e05e01fc7861bc45a8f07bc56d2a69850eda301d5e7f679d96a9d28c24c56a4860cff6727b66867482deae SHA512 0a979caf48ba96d6f37a929036e7172855cfb03af8832f479966bce72fad3400903925134d33aaa31eb6b36a2041f5e0d3f74b88e95b83c7d76e96b1503bec13
 EBUILD gnucash-2.6.15-r1.ebuild 3216 BLAKE2B 1989921ba59e5fdf7da887aa85e9a9ad966ab7b037df69fa2827703652e679180762785ef20cc7f0c12b99a20eccb61d4cb30d70a23cc88060690fc55e5ea424 SHA512 8823d1681347cf1f4b52dce75302ca431c0b9b675c5bd6e2e97978237027511acf7f25309755f02d329aa62814881f5df927948c432339c47ef7387ed2bbbe54
 EBUILD gnucash-2.6.15.ebuild 3238 BLAKE2B 5f11f80f426e510fb46e8cdedc0dd9a8ba7f783e5d9eada1185cd4507b34945be105083a28eefacfe91f692e49436cfec3dd7747bd1a60dd87226897cb7e4098 SHA512 00fb4c31296021b9cbb7bc1a83662ff04c89aa5425f4a814ba91cab19ca6ebf8ffd29f60f641770a56b8af48d7ba8c195c0d641c3046e8d2365a841639ef74fb
-MISC metadata.xml 583 BLAKE2B 1d2f9396652fcef554d54b127fc5e278abeb128a085b74cb0cc5d257cf638a862683b98d8595d211216e26742c27e85a6fa0650ac35f5d8f0fe6652494e55986 SHA512 1fce9a3ed2f6aaa121810308f75eab97b156d7c4278cb6d123f1f0f34415b467097907086c006bda1232ad48b3a47db572a7db28b78a01032014cfae70af2a9d
+EBUILD gnucash-2.6.19.ebuild 3331 BLAKE2B 67b53dbb60ab5b8160c0e73d3135a200e41f21fd5cfceb7e7f652967af5fcf0381bcd5436f9120fb025bf4ab22a4bd4eae94ac9dacfcdfcda9efec5375fd52d4 SHA512 3c928dd6a952c570f744bae0d843b5dfd48548e12b40c15f73cc4651e49d81989eb845643ec99b175b3eaf01a042f8bf5ceadb02917ea2e998595db0b3e68b8b
+MISC metadata.xml 697 BLAKE2B 49ebf92faf650b5ff054cb7f23f907b8a6cab2d26889acf57fb55e67164c468b37a70e830c903c5041df8e48e47bfef4ef7248c52e889f3d3c168ad678c5d6ec SHA512 f58b4f51e04ed60f4d84265592fe4f49753ba00e621181f89e9a447c5138435aa277918c0111c1034c9d1a3ec6378de00a9943c5f9c14032a98306a12cca6aad
diff --git a/app-office/gnucash/gnucash-2.6.19.ebuild b/app-office/gnucash/gnucash-2.6.19.ebuild
new file mode 100644
index 000000000000..b9f08f0f1f42
--- /dev/null
+++ b/app-office/gnucash/gnucash-2.6.19.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools gnome2 python-single-r1
+
+DESCRIPTION="A personal finance manager"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# README.dependencies mentions qof, but ${PN} has their own fork in the
+# source code that appears to have deviated from that project.
+#
+# libdbi version requirement for sqlite taken from bug #455134
+RDEPEND="
+	>=dev-libs/glib-2.32.0:2
+	>=dev-libs/libxml2-2.5.10:2
+	>=dev-libs/popt-1.5
+	>=dev-scheme/guile-1.8.5:12=[deprecated,regex]
+	<dev-scheme/guile-2.2
+	>=net-libs/webkit-gtk-1.2:2
+	>=sys-libs/zlib-1.1.4
+	>=x11-libs/goffice-0.7.0:0.8[gnome]
+	>=x11-libs/gtk+-2.24:2
+	dev-libs/libxslt
+	dev-scheme/guile-www
+	gnome-base/dconf
+	gnome-base/libgnomecanvas
+	x11-libs/pango
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	hbci? (
+		>=net-libs/aqbanking-5[gtk,ofx?]
+		sys-libs/gwenhywfar[gtk]
+		chipcard? ( sys-libs/libchipcard )
+	)
+	mysql? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[mysql]
+	)
+	ofx? ( >=dev-libs/libofx-0.9.1 )
+	postgres? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[postgres]
+	)
+	python? ( ${PYTHON_DEPS} )
+	quotes? (
+		>=dev-perl/Finance-Quote-1.11
+		dev-perl/Date-Manip
+		dev-perl/HTML-TableExtract
+	)
+	sqlite? (
+		>=dev-db/libdbi-0.9.0
+		>=dev-db/libdbi-drivers-0.9.0[sqlite]
+	)
+"
+
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	gnome-base/gnome-common
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+PDEPEND="doc? (
+	~app-doc/gnucash-docs-${PV}
+	gnome-extra/yelp
+)"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Skip test that needs some locales to be present
+	sed -i -e '/test_suite_gnc_date/d' src/libqof/qof/test/test-qof.c || die
+
+	# We need to run eautoreconf to prevent linking against system libs,
+	# this can be noticed, for example, when updating an old version
+	# compiled against guile-1.8 to a newer one relying on 2.0
+	# https://bugs.gentoo.org/show_bug.cgi?id=590536#c39
+	# https://bugzilla.gnome.org/show_bug.cgi?id=775634
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf
+
+	DOCS="doc/README.OFX doc/README.HBCI"
+
+	if use sqlite || use mysql || use postgres ; then
+		myconf+=" --enable-dbi"
+	else
+		myconf+=" --disable-dbi"
+	fi
+
+	# gtkmm is experimental and shouldn't be enabled, upstream bug #684166
+	gnome2_src_configure \
+		--disable-doxygen \
+		--disable-error-on-warning \
+		--disable-gtkmm \
+		--enable-locale-specific-tax \
+		$(use_enable debug) \
+		$(use_enable gnome-keyring password-storage) \
+		$(use_enable hbci aqbanking) \
+		$(use_enable ofx) \
+		$(use_enable python) \
+		${myconf}
+}
+
+src_install() {
+	# Parallel installation fails from time to time, bug #359123
+	# Usually reproducible after removing any gnucash installed copy
+	MAKEOPTS="${MAKEOPTS} -j1" GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF} \
+	gnome2_src_install
+
+	rm -rf "${ED}"/usr/share/doc/${PF}/{examples/,COPYING,INSTALL,*win32-bin.txt,projects.html}
+	mv "${ED}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die
+	dodoc "${T}"/cantuseprepalldocs/*
+}
diff --git a/app-office/gnucash/metadata.xml b/app-office/gnucash/metadata.xml
index 7053dc6a9c58..97283552223d 100644
--- a/app-office/gnucash/metadata.xml
+++ b/app-office/gnucash/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index dcc8d4d3f7fb..5f99cf07f8b3 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -4,10 +4,10 @@ DIST lyx-2.0.8.1.tar.xz 10481988 BLAKE2B 121a2f5a86f9b2f92fc211c052a26dfeb0c89c3
 DIST lyx-2.1.5.tar.xz 10361112 BLAKE2B ddc6e10974f495bb465fced0bfe95e0530831e924c12323267feec59e49900efefda154abac927f3129ab0820706a870fb463e749cff2b5c4b47368d954c9d20 SHA512 6f8c62ff96458d0c8c8057ae1e587be4c63bd3bdf2d4f095c24d447017034eda8c6b645efbd258f0956a9bbfe5fde2f90df36515be7b8a94cb63674bc3a58672
 DIST lyx-2.2.2.tar.xz 15490148 BLAKE2B 16d9b1448da76dd0b02ee4cdec38831a0c3aa7a0798b4f99bb6c93717223dfd3c62145afa76324177ed162d4c45ab341a963831855c9607d8544574ae88766da SHA512 5057a06f0c37cb2beadb92414eec495ba0619f6c8a9fb5372a9feb90fe0d8bf850de5c94bbf618c8e27bd64404ae6687c48ee24aa6e1bd35580eb3b77d71d45e
 DIST lyx-2.2.3.tar.xz 15501856 BLAKE2B 08606f0c18d9cb5891bd7d612361597e3efc7e7855f7607c2620f10ddb22b7078d5085f725911496198d2d8a47ece54cbfe67cfbf4ec8eb15450271cd133b095 SHA512 b5a4a16b22680022651a0f3911c2c24bcd3541a573e672e541cb0af6572089e4b0e0ec1cafb40850e75c377e7da5b286d0314886e0c57d55f57645d8e4a07708
-EBUILD lyx-2.0.8.1-r1.ebuild 4336 BLAKE2B 3215a65172c1925c8cba5587f25e53ff7d605ecfa80130553c7facf228dfe1f065cc481d366d171c8a13174fb7151af175aed650b3fe6622096587859a587a72 SHA512 4c4a3850b0b078b6b03eeb12a83c26534c8ee35d1e66da820dac6a5eae6f638f8723dded3d10fcf7b5559ab68e19754eb9019a7553ccd40e59bf7a69f44126be
-EBUILD lyx-2.1.5-r1.ebuild 4252 BLAKE2B c9d8bab2db9d974209b6cc0e13971c59cf86ec10defc7083b824446ee6dc2e07d6d72a79697b7b4a2642c6c7bdac35730b14402d9adc474d727d964e2f03c17b SHA512 2cc4841356eb3cd3e2ddbb92efa3d113ad31477ca711f210338cfa7cbeb9eccf79a32ccc453a0fcdac55be5caea0feeaae870d42229936e2301c21f9345716f7
-EBUILD lyx-2.2.2-r1.ebuild 4649 BLAKE2B 2cba6ae6c37be6a8dfb9c7c68718a68445ee4d87f9c93782927ce1c9e4d088a7cfa6c2c5e60da0cf7597f88ff4546155fbca15d11d68962f0ef9844b265aed1c SHA512 67750bf312cbbe65639ba0293bbb3aac4460ec42fc74478b82a3bbe7eb6ede4749d895b0d8038105943d3906c048f234cfec15ff248df6d15789c09493d00c19
-EBUILD lyx-2.2.3-r1.ebuild 4550 BLAKE2B d5323277ebc540115a633820f38729ec28ab256179c86537b965a06a967d34da0802902da31ce797c0db73c4b6d8bd81be9ec7ded97ea6a5c718b2cf2d95a736 SHA512 e951bbdbfbd13aca1b63492f95188bc0f68ca025fef457b2ea610b571955d0678a8a95ea86c5e7449db4cfcf392c2d017bf9ea9ea6fa7952d18bb91ab56a0140
-EBUILD lyx-2.2.3-r2.ebuild 4520 BLAKE2B a2b67d675bd8e11331e1d3da9034585f475390d9125f47ae820d1caf16ffa9e0c78f985eea9089c51f248e8f6effba75e5e2de8fa009416c3b7cb23807be4c33 SHA512 217b879d325a4c7bdbdfaa581e219fd212ac356284590c2da7a663890e3108fde7f92ed94af49bc161d50b1c34da8840f4ee76c954ab0494151b1e34d5cebb1c
-EBUILD lyx-2.2.3.ebuild 4649 BLAKE2B 2cba6ae6c37be6a8dfb9c7c68718a68445ee4d87f9c93782927ce1c9e4d088a7cfa6c2c5e60da0cf7597f88ff4546155fbca15d11d68962f0ef9844b265aed1c SHA512 67750bf312cbbe65639ba0293bbb3aac4460ec42fc74478b82a3bbe7eb6ede4749d895b0d8038105943d3906c048f234cfec15ff248df6d15789c09493d00c19
+EBUILD lyx-2.0.8.1-r1.ebuild 4194 BLAKE2B ccf3ba79b10a2e4ff8a7617e2383b6b306aa54b8bfe1ccb7be8e372043f6db5dde54f94e0ed8c6daed24319f7bda01b63d7deadedef8ff3c55f26075f4b78527 SHA512 a87a0a8e36eba81fba7f854c24da04b4403ba711aeeece27dd73d56e2db4e72219e2be50994c1c70bfc6f0c4cb7b3b9eb8913cb22cac3b900498c84b526329f0
+EBUILD lyx-2.1.5-r1.ebuild 4110 BLAKE2B b2e1a28dc3a86d58e44e8b6a2ed00123c2047c21eb7703a3b35d476b6fa40dc10d28f98240ba4a4943cab15c57a66327d93cf613ddff381156f47b32fc5684ea SHA512 e75260bbde4c3de28071e3d1fd15c49435cc9edc2fd0e48cf4ecee09b783fb698dae23e5489ee0dbc8de53501e1fb4624e7359a948b110342855a6c5c48fa8b2
+EBUILD lyx-2.2.2-r1.ebuild 4498 BLAKE2B 950059aebdda269d057fcbd40f502d9651d651e65699146af5ac451c0488ff62d3c422af7480aeb25518ea5895d8dff25698d6a33ead5e1a81a81cd319d0adef SHA512 fb0d4b84ad1ad1b82b0f84ae6ca8480e2dc8a2e3b6e47cc4b901ab14d797ffa38b849fc40e471038c12519c42dd40862a208ef8347769a09b3228c9d37f4ef42
+EBUILD lyx-2.2.3-r1.ebuild 4399 BLAKE2B 754fed823766e2927b7dabec8f8488974a17a2b7141e9b3d15f05128ede7f32a720ff35f09741607833d5bfe48bb5a10647c2150edab8c4f21d9e2d3b8d93592 SHA512 8ab5677b4759e000dc913e869234abcb3c3de155f069f007c19be932722c5a9a23cf8d646a921b82d2e063518de312d30adcd564d73f13a81dd3e04ade9f82d2
+EBUILD lyx-2.2.3-r2.ebuild 4369 BLAKE2B a1d9af492e94b1471f8755756cebfb057eebf98f4cfe4c1b16d8b3e520aaee384fe8175cd44ee7e58ecf25b0ce566a1713250e340287d673c2b8fe4c6ba35d01 SHA512 23f0ff39ee3efc573663e6769ecad71b215d2893428170abf346c606e9506667ad0657a4673300da736abefa920cc21b31a8868729d0d9dbf67ddeea7eb13093
+EBUILD lyx-2.2.3.ebuild 4498 BLAKE2B 950059aebdda269d057fcbd40f502d9651d651e65699146af5ac451c0488ff62d3c422af7480aeb25518ea5895d8dff25698d6a33ead5e1a81a81cd319d0adef SHA512 fb0d4b84ad1ad1b82b0f84ae6ca8480e2dc8a2e3b6e47cc4b901ab14d797ffa38b849fc40e471038c12519c42dd40862a208ef8347769a09b3228c9d37f4ef42
 MISC metadata.xml 1876 BLAKE2B 873befa20f6827e2938d5673b4db4bf56d8e501f98a64ce53acd1cfa55a44341fcd9660bd22494244a73e6e7b5a5efcb257916cf0130f4d40c8907aa3f6bb55c SHA512 5d76edc1d253fc60f7eb3f72548685fcc305a1bd51b12d034ef9bd32a74ef53c8b662e5938cc4353d6862f3f6f7d4a52cd4ad03c2d0d906c50e8b118b13d70f7
diff --git a/app-office/lyx/lyx-2.0.8.1-r1.ebuild b/app-office/lyx/lyx-2.0.8.1-r1.ebuild
index 6d3194d8af99..3e87c826bd1c 100644
--- a/app-office/lyx/lyx-2.0.8.1-r1.ebuild
+++ b/app-office/lyx/lyx-2.0.8.1-r1.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=5
@@ -19,14 +19,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${MY_P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
-IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant"
-
-LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW"
-
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
+IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant l10n_he"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
@@ -66,7 +59,7 @@ RDEPEND="${COMMONDEPEND}
 			app-text/unrtf
 			dev-tex/html2latex
 		)
-	linguas_he? ( dev-tex/culmus-latex )
+	l10n_he? ( dev-tex/culmus-latex )
 	docbook? ( app-text/sgmltools-lite )
 	dot? ( media-gfx/graphviz )
 	dia? ( app-office/dia )
@@ -112,7 +105,7 @@ src_configure() {
 src_install() {
 	default
 
-	if use linguas_he ; then
+	if use l10n_he ; then
 		echo "\bind_file cua" > "${T}"/hebrew.bind
 		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
 
@@ -156,7 +149,7 @@ pkg_postinst() {
 	fi
 
 	# instructions for RTL support. See also bug 168331.
-	if use linguas_he || use linguas_ar; then
+	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
 		elog
 		elog "Enabling RTL support in LyX:"
 		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
diff --git a/app-office/lyx/lyx-2.1.5-r1.ebuild b/app-office/lyx/lyx-2.1.5-r1.ebuild
index 3e4ad4766551..13dd28fd8d63 100644
--- a/app-office/lyx/lyx-2.1.5-r1.ebuild
+++ b/app-office/lyx/lyx-2.1.5-r1.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=5
@@ -19,14 +19,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/${MY_P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
-IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant"
-
-LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW"
-
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
+IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant l10n_he"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
@@ -66,7 +59,7 @@ RDEPEND="${COMMONDEPEND}
 			app-text/unrtf
 			dev-tex/html2latex
 		)
-	linguas_he? ( dev-tex/culmus-latex )
+	l10n_he? ( dev-tex/culmus-latex )
 	docbook? ( app-text/sgmltools-lite )
 	dot? ( media-gfx/graphviz )
 	dia? ( app-office/dia )
@@ -112,7 +105,7 @@ src_configure() {
 src_install() {
 	default
 
-	if use linguas_he ; then
+	if use l10n_he ; then
 		echo "\bind_file cua" > "${T}"/hebrew.bind
 		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
 
@@ -155,7 +148,7 @@ pkg_postinst() {
 	fi
 
 	# instructions for RTL support. See also bug 168331.
-	if use linguas_he || use linguas_ar; then
+	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
 		elog
 		elog "Enabling RTL support in LyX:"
 		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
diff --git a/app-office/lyx/lyx-2.2.2-r1.ebuild b/app-office/lyx/lyx-2.2.2-r1.ebuild
index fdc8702116dc..8463d9662259 100644
--- a/app-office/lyx/lyx-2.2.2-r1.ebuild
+++ b/app-office/lyx/lyx-2.2.2-r1.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=5
@@ -19,14 +19,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
-IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant +qt4 qt5"
-
-LANGS="ar ca cs da de el en es eu fi fr gl he hu ia id it ja nb nn pl pt_BR pt_PT ro ru sk sr sv tr uk zh_CN zh_TW"
-
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
+IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant +qt4 qt5 l10n_he"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	qt4? ( !qt5 )
 	qt5? ( !qt4 )"
@@ -68,7 +61,7 @@ RDEPEND="${COMMONDEPEND}
 			app-text/unrtf
 			dev-tex/html2latex
 		)
-	linguas_he? ( dev-tex/culmus-latex )
+	l10n_he? ( dev-tex/culmus-latex )
 	docbook? ( app-text/sgmltools-lite )
 	dot? ( media-gfx/graphviz )
 	dia? ( app-office/dia )
@@ -126,7 +119,7 @@ src_configure() {
 src_install() {
 	default
 
-	if use linguas_he ; then
+	if use l10n_he ; then
 		echo "\bind_file cua" > "${T}"/hebrew.bind
 		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
 
@@ -169,7 +162,7 @@ pkg_postinst() {
 	fi
 
 	# instructions for RTL support. See also bug 168331.
-	if use linguas_he || use linguas_ar; then
+	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
 		elog
 		elog "Enabling RTL support in LyX:"
 		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
diff --git a/app-office/lyx/lyx-2.2.3-r1.ebuild b/app-office/lyx/lyx-2.2.3-r1.ebuild
index 80ff95ca3942..62965b98bfc2 100644
--- a/app-office/lyx/lyx-2.2.3-r1.ebuild
+++ b/app-office/lyx/lyx-2.2.3-r1.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
@@ -19,14 +19,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x86-macos"
-IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls +qt5 rcs rtf subversion svg"
-
-LANGS="ar ca cs da de el en es eu fi fr gl he hu ia id it ja nb nn pl pt_BR pt_PT ro ru sk sr sv tr uk zh_CN zh_TW"
-
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
+IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls +qt5 rcs rtf subversion svg l10n_he"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
@@ -64,7 +57,7 @@ RDEPEND="${PYTHON_DEPS}
 			dev-tex/tth
 		)
 	)
-	linguas_he? ( dev-tex/culmus-latex )
+	l10n_he? ( dev-tex/culmus-latex )
 	!qt5? (
 		dev-qt/qtcore:4
 		dev-qt/qtgui:4
@@ -130,7 +123,7 @@ src_configure() {
 src_install() {
 	default
 
-	if use linguas_he ; then
+	if use l10n_he ; then
 		echo "\bind_file cua" > "${T}"/hebrew.bind
 		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
 
@@ -173,7 +166,7 @@ pkg_postinst() {
 	fi
 
 	# instructions for RTL support. See also bug 168331.
-	if use linguas_he || use linguas_ar; then
+	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
 		elog
 		elog "Enabling RTL support in LyX:"
 		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
diff --git a/app-office/lyx/lyx-2.2.3-r2.ebuild b/app-office/lyx/lyx-2.2.3-r2.ebuild
index d1fbcd95e534..edd854b92386 100644
--- a/app-office/lyx/lyx-2.2.3-r2.ebuild
+++ b/app-office/lyx/lyx-2.2.3-r2.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
@@ -19,14 +19,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
-IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls +qt5 rcs rtf subversion svg"
-
-LANGS="ar ca cs da de el en es eu fi fr gl he hu ia id it ja nb nn pl pt_BR pt_PT ro ru sk sr sv tr uk zh_CN zh_TW"
-
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
+IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls +qt5 rcs rtf subversion svg l10n_he"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
@@ -64,7 +57,7 @@ RDEPEND="${PYTHON_DEPS}
 			dev-tex/tth
 		)
 	)
-	linguas_he? ( dev-tex/culmus-latex )
+	l10n_he? ( dev-tex/culmus-latex )
 	!qt5? (
 		dev-qt/qtcore:4
 		dev-qt/qtgui:4
@@ -130,7 +123,7 @@ src_configure() {
 src_install() {
 	default
 
-	if use linguas_he ; then
+	if use l10n_he ; then
 		echo "\bind_file cua" > "${T}"/hebrew.bind
 		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
 
@@ -173,7 +166,7 @@ pkg_postinst() {
 	fi
 
 	# instructions for RTL support. See also bug 168331.
-	if use linguas_he || use linguas_ar; then
+	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
 		elog
 		elog "Enabling RTL support in LyX:"
 		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
diff --git a/app-office/lyx/lyx-2.2.3.ebuild b/app-office/lyx/lyx-2.2.3.ebuild
index fdc8702116dc..8463d9662259 100644
--- a/app-office/lyx/lyx-2.2.3.ebuild
+++ b/app-office/lyx/lyx-2.2.3.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=5
@@ -19,14 +19,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
-IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant +qt4 qt5"
-
-LANGS="ar ca cs da de el en es eu fi fr gl he hu ia id it ja nb nn pl pt_BR pt_PT ro ru sk sr sv tr uk zh_CN zh_TW"
-
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
+IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant +qt4 qt5 l10n_he"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	qt4? ( !qt5 )
 	qt5? ( !qt4 )"
@@ -68,7 +61,7 @@ RDEPEND="${COMMONDEPEND}
 			app-text/unrtf
 			dev-tex/html2latex
 		)
-	linguas_he? ( dev-tex/culmus-latex )
+	l10n_he? ( dev-tex/culmus-latex )
 	docbook? ( app-text/sgmltools-lite )
 	dot? ( media-gfx/graphviz )
 	dia? ( app-office/dia )
@@ -126,7 +119,7 @@ src_configure() {
 src_install() {
 	default
 
-	if use linguas_he ; then
+	if use l10n_he ; then
 		echo "\bind_file cua" > "${T}"/hebrew.bind
 		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
 
@@ -169,7 +162,7 @@ pkg_postinst() {
 	fi
 
 	# instructions for RTL support. See also bug 168331.
-	if use linguas_he || use linguas_ar; then
+	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
 		elog
 		elog "Enabling RTL support in LyX:"
 		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index ac333bfdcf3e..4b7d04f198ef 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -160,6 +160,6 @@ DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_tr.tar.gz 12192098 BLAKE2B 8
 DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_vi.tar.gz 13435858 BLAKE2B ab60a610cd30d3ea0726f0a6111fa47c2409b9c7347d51b2aa10d8a09f4281e053595e017db5a5f98de338f9937237988163c7d31274ec494893dc04447cb919 SHA512 648af13c4c1aa8e68e765afdca078203ec08edd130bfd65cd1e81b45e0ee7c6ebf1c06a114b82cb36a1bbef9148bf9c2dccbd090fa1e8d828c67bd42d0872a36
 DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_zh-CN.tar.gz 13870834 BLAKE2B 6eebb98351195f3712ac5db2134bfe97df9f3c5df12015f998d3b8dac18394c4b5f079f7274ba1d755350118f5159190c4735161dfaa652b75d8b1d20e6c00b8 SHA512 5a63e88278b18d76a497fc60829f533da8c9ac1c1af11d9b217942e57f14516784022fddbd1943ec4ed49efd64616f4496de11de9626e6787b8b35b6a06f9634
 DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_zh-TW.tar.gz 14082525 BLAKE2B 3799b4c5a5d282dd78e7d93687acacd0a4c0c08f9558c2baa2aa444425c5eeffd0616c0312b65b326619ac8865c505bcad6cf813a5bc338e424862273ede5617 SHA512 f82ec54a570c81180b0b98e026ca0009ec1ae890e25d92fde07a83bb285515db59c70fc7859c470233bedbb823b092ce94e7040589b37a24a6cec7ea042fdcca
-EBUILD openoffice-bin-4.1.4.ebuild 5117 BLAKE2B c02187358b1f646505617b9ea0c18c0d8da603a56e75f9575709c5ceeed066213402624705658f969194a9cbe7133da5d43c0aa62ec5b166d8852be6cbbc2dbc SHA512 844969f1fb2b2a4f8ecd483c55f7e290dd30ba3e228d779a0a5963016e35850e12fa082d28b342f6d1d1998cfddbcc97f4118e4c0ae1a399cd675ddc2b569757
-EBUILD openoffice-bin-4.1.5.ebuild 5119 BLAKE2B f9cd076226127af082a46ce0d042d3bf65447bb05f0625f22537b52f89b9a0e9dab08dd938efa8c6057a5c32fbe6987552b7663847ecef2cfb33f37610f27606 SHA512 56c3944f29135ab27f9a3eb32914fec1a599205e97eda658b24d42649143db0635dbb6ec74f836c3306a14a37fe5d7ff28f3950dfc02ff5c1b602e0433c230ad
+EBUILD openoffice-bin-4.1.4.ebuild 5183 BLAKE2B b16a34e620c9292c59e187acfcf05fb4899991b7f0e1d625143fed9701d54f00e9f7bf5f78605bee9cc61ee045b6b4c8c10582d8120ab3fcefeac80c6affd196 SHA512 59f864f576ef11230a0cdfd343e7d5fda2b2ffa4e89f37302935a9aa4987477acb35d4af6e33ecf004f1eb1e87fc908b82fabfcffd741211e1b26ecd94dd716a
+EBUILD openoffice-bin-4.1.5.ebuild 5185 BLAKE2B 64a3a11d3175d4baa08dbaaa0e75e7c074bbf1991053ddb7f8c4803c6da71667c7b908ff88ea4d997b565133b041eae8ef88d6e73f406fbfcaadda346bb75a1b SHA512 0484d1e29bd2f20f5a178c8ec9ca1f670848b92b68372ff3f958bbbab7c03df44ff753061d78b37fecbc6b7cf4fb3eee09d53d833366d83ff5f8a0bc3c4d70d1
 MISC metadata.xml 654 BLAKE2B 2373a48bc130966ace2a26ec4b666e4e5c0e533922ac41be7b13983cf8a905ae8b62c59f06b0d7c0eaa0219e2eefaf0d1f1edb8b57d9ad4a37687f807401e93c SHA512 e797f235f01e6f92a5bf7f10db539429aceca40b1c2fb703b736e83ee356126671977a8145907a43e84eb05e3914923ded9b0db4d4755954d9f4f519040b7162
diff --git a/app-office/openoffice-bin/openoffice-bin-4.1.4.ebuild b/app-office/openoffice-bin/openoffice-bin-4.1.4.ebuild
index e0f27b38176c..d1c65d191cd4 100644
--- a/app-office/openoffice-bin/openoffice-bin-4.1.4.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-4.1.4.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="5"
@@ -30,13 +30,13 @@ SRC_URI="amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_install-rpm
 	x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_install-rpm_en-US.tar.gz )"
 
 # TODO: supports ca_XR (Valencian RACV) locale too
-LANGS="ast eu bg ca ca_XV zh_CN zh_TW cs da nl en_GB fi fr gd gl de el he hi hu it ja km ko lt nb pl pt_BR pt ru sr sk sl es sv ta th tr vi"
+LANGS="ast eu bg ca ca-valencia zh-CN zh-TW cs da nl en-GB fi fr gd gl de el he hi hu it ja km ko lt nb pl pt-BR pt ru sr sk sl es sv ta th tr vi"
 
 for X in ${LANGS} ; do
-	[[ ${X} != "en" ]] && SRC_URI="${SRC_URI} linguas_${X}? (
-		amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_langpack-rpm_${X/_/-}.tar.gz )
-		x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_langpack-rpm_${X/_/-}.tar.gz ) )"
-	IUSE="${IUSE} linguas_${X}"
+	IUSE="${IUSE} l10n_${X}"
+	SRC_URI+=" l10n_${X}? (
+		amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_langpack-rpm_${X/ca-valencia/ca-XV}.tar.gz )
+		x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_langpack-rpm_${X/ca-valencia/ca-XV}.tar.gz ) )"
 done
 
 LICENSE="Apache-2.0"
@@ -97,10 +97,13 @@ src_unpack() {
 	done
 
 	# Localization
-	strip-linguas ${LANGS}
-	for l in ${LINGUAS}; do
-		m="${l/_/-}"
-		if [[ ${m} != "en" ]] ; then
+	for l in ${LANGS}; do
+		if use l10n_${l}; then
+			# Map ca-valencia to ca-XV used by upstream
+			case ${l} in
+				ca-valencia) m=ca-XV ;;
+				*) m=${l} ;;
+			esac
 			LANGDIR="${m}/RPMS/"
 			rpm_unpack "./${LANGDIR}/${NM}-${m}-${BVER}.${XARCH}.rpm"
 			rpm_unpack "./${LANGDIR}/${NM1}-${m}-${BVER}.${XARCH}.rpm"
diff --git a/app-office/openoffice-bin/openoffice-bin-4.1.5.ebuild b/app-office/openoffice-bin/openoffice-bin-4.1.5.ebuild
index aafe4dbbad2f..6f9e2d38cea1 100644
--- a/app-office/openoffice-bin/openoffice-bin-4.1.5.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-4.1.5.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="5"
@@ -30,13 +30,13 @@ SRC_URI="amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_install-rpm
 	x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_install-rpm_en-US.tar.gz )"
 
 # TODO: supports ca_XR (Valencian RACV) locale too
-LANGS="ast eu bg ca ca_XV zh_CN zh_TW cs da nl en_GB fi fr gd gl de el he hi hu it ja km ko lt nb pl pt_BR pt ru sr sk sl es sv ta th tr vi"
+LANGS="ast eu bg ca ca-valencia zh-CN zh-TW cs da nl en-GB fi fr gd gl de el he hi hu it ja km ko lt nb pl pt-BR pt ru sr sk sl es sv ta th tr vi"
 
 for X in ${LANGS} ; do
-	[[ ${X} != "en" ]] && SRC_URI="${SRC_URI} linguas_${X}? (
-		amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_langpack-rpm_${X/_/-}.tar.gz )
-		x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_langpack-rpm_${X/_/-}.tar.gz ) )"
-	IUSE="${IUSE} linguas_${X}"
+	IUSE="${IUSE} l10n_${X}"
+	SRC_URI+=" l10n_${X}? (
+		amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_langpack-rpm_${X/ca-valencia/ca-XV}.tar.gz )
+		x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_langpack-rpm_${X/ca-valencia/ca-XV}.tar.gz ) )"
 done
 
 LICENSE="Apache-2.0"
@@ -97,10 +97,13 @@ src_unpack() {
 	done
 
 	# Localization
-	strip-linguas ${LANGS}
-	for l in ${LINGUAS}; do
-		m="${l/_/-}"
-		if [[ ${m} != "en" ]] ; then
+	for l in ${LANGS}; do
+		if use l10n_${l}; then
+			# Map ca-valencia to ca-XV used by upstream
+			case ${l} in
+				ca-valencia) m=ca-XV ;;
+				*) m=${l} ;;
+			esac
 			LANGDIR="${m}/RPMS/"
 			rpm_unpack "./${LANGDIR}/${NM}-${m}-${BVER}.${XARCH}.rpm"
 			rpm_unpack "./${LANGDIR}/${NM1}-${m}-${BVER}.${XARCH}.rpm"
diff --git a/app-office/orage/Manifest b/app-office/orage/Manifest
index e09b99d34f48..e66089c5c108 100644
--- a/app-office/orage/Manifest
+++ b/app-office/orage/Manifest
@@ -1,4 +1,4 @@
 DIST orage-4.12.1.tar.bz2 2590788 BLAKE2B 0f00b5704e11923c2ceaac81f0956457402a90f65709c165c98b6942745ea3adee176691555a18548ead258951693187e1b3ce9a718abb3b13c2a1c2a4754e7e SHA512 3fec0201171140586cdc9bcf151450a7086515e18b5815afe4fe4c4726ba554c50582b0479e52985b330140c51b7233ef81f678f986f848afbeee74c66b2d196
-EBUILD orage-4.12.1-r1.ebuild 1544 BLAKE2B dc51c2888bdcf2de961ad47e50e4160e20e3528c78de31cc30473eb3d7d097f8d7174a60d390c5b20c756d336886ca04325fd8784129833a8e3f9076685223da SHA512 b2376df9a1c1bf4fa1a2cbf91b5ece5558bb43d3ad79740c0d04ea59db1cb1ca11e5aaa259a22ba404c9d8af567c0ab1ffe3ac571ba94bad99798280daddd978
+EBUILD orage-4.12.1-r1.ebuild 1543 BLAKE2B c9d48a700621a1856e03093769729dc37675d6ff8c9dc37888e6857e8975584ea4d22740e7660ff373084f4a9c09ef26ff22552912eb65d9e2ea8785ec8f5a1b SHA512 85a96bee0251a2106c92936a9a66a241658abc6b83778f52cb5fc941a7983467013026a00108a8b13d1cd137f7730705732f4483861fe20f5ba35a74100deed6
 EBUILD orage-4.12.1.ebuild 1605 BLAKE2B 9a1afcbf79c3f71a2f825f5688f8f719623294416edb18cee1cdb37dc0aa12e412189d82c2885e272237e316f52e42612692f3849baea43e810c1940c46d908a SHA512 25d2a0f1aa8e63c3b8246efe5ac49ac86c861bef8dc4ee3287dc502a2b09bd6e908684d1ec788d7667ae25ed4e48f84da0b8c3ba53ff8fc65dc44eed6d400128
 MISC metadata.xml 355 BLAKE2B 4ddbf38a80be81b7e131d7c616dfb88dff1e900952c17c4cc4dd26711e720351177d92d8225825dd57354399ecdb8b7bccd18f883fcd927846e8614dd4ac4a99 SHA512 a5d3f875ac31caa10ca77ce8eb38449b3007094d1b9d7d307bd15ee29644c09530d44ac6a4953e10adfa3bd45b6a3fe44dbbb3b80ab7d0c8572c48523ef287eb
diff --git a/app-office/orage/orage-4.12.1-r1.ebuild b/app-office/orage/orage-4.12.1-r1.ebuild
index caecfde6c87f..ab5482d4e4d4 100644
--- a/app-office/orage/orage-4.12.1-r1.ebuild
+++ b/app-office/orage/orage-4.12.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="berkdb +clock-panel-plugin dbus libnotify"
 
 RDEPEND=">=dev-libs/libical-0.48:=