gentoo resync 04.02.2018

16 files changed, 13 insertions, 267 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 72d8f16d9a99..163577d3efd6 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 634ce8d943c1..7e0ff7f160f1 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -6,5 +6,5 @@ AUX boost-1.65.0-fix-python.patch 9210 BLAKE2B 31e32cfbc8fa0c4e8a5c142f56a4a7b1d
 DIST boost_1_63_0.tar.bz2 81984414 BLAKE2B 227c4432bd3ca0eb390048ec85047958fcb6ae289996501812cd8b13bf74bbe9b677d0110948265cab59a60deb36c4fc08440af74ac5a5219ea4eaea4fa6918f SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad
 DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
 EBUILD boost-1.63.0.ebuild 12466 BLAKE2B 6fde392860974292dccb109facefae5e06632023b361769815090451d8d216e9028e0466843a87bc24e5e24608f595ffe0841b52e32155f7a7fa2facfe72a494 SHA512 c405a5a6e1ea19e4309227a7c2204b5f0f46ff564644925bfbf02cbd43108422e04b378f24dafcdabdb0154f7f41fb5532594acc61666c8c8aa21a024e04db5c
-EBUILD boost-1.65.0.ebuild 12449 BLAKE2B f5a4a3dc783fdd747ce572cc21a8ddc6408c777b9c30aa3613644388e1766786fc8936c913841bb2204f6c481641ff96c304ddba16819efe599a7204cad33bb7 SHA512 fcbe87aaa97a98c7b4e13fc22e946f9b239e53b0c01721f4f239589a5dfc418825bbdb432b2645d7eed4855d78bdb0414f7f22200630d33e8d04a3f4c08a1fd1
+EBUILD boost-1.65.0.ebuild 12448 BLAKE2B cb38a7d66a524328c469b0362a092ba26fb0c5a434bfd5d6a268e81493d1049e77611423d26a58233d811b5bcdb153f19555b8a8baf9776b073be8ef0c929f0e SHA512 be6d9c9e909661dd3ee28cb9c87ed4aef940b7a643eb938a919e112c3d5a03bf9c5bc425d0c1b7e6ca033395d317754cd5e6eb78bd44eb2e3d3119d41cde53b2
 MISC metadata.xml 1526 BLAKE2B 11c2e9eb5b41e3fa0b100d58d672acefe4a949d0fa428b4ce1d100cc8f95eec7c1279c725741033ca50f61cb258b388270c18361a5b714a684398cc3ae1a445c SHA512 4ba131f2492ae41f642a28dd69e5bd1d5d79c013e42a6c18ba135b36d470990ea20c8aa7cec6e3cb1d6ea8d7f6b6a5b45efb4b3dcba198bcf43809eff0f65ae6
diff --git a/dev-libs/boost/boost-1.65.0.ebuild b/dev-libs/boost/boost-1.65.0.ebuild
index e5f8c570c1b0..c19ef1eaa08a 100644
--- a/dev-libs/boost/boost-1.65.0.ebuild
+++ b/dev-libs/boost/boost-1.65.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
 
 IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
 
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index 27a02a88dd3a..f19f8c339cba 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,9 +1,5 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
-DIST gmime-3.0.2.tar.xz 751944 BLAKE2B e5d8843e209ca589cb1dddb96093fde8727617b8cb6e2012ae047d343c485ee2398398e20be365090af9d7b4afcfe248897ee21181fc79bff376861ac1b4428a SHA512 246f489c168ce7e04fab664b7e9ae7772ae52f0063fb0eac9153460d84fa5d9712457d81fbd1bdcdadb7e03007cf71ed3bad5287f1639214f54167427c9209ca
-DIST gmime-3.0.3.tar.xz 761844 BLAKE2B 5e4a3d0cfc9768b714dc7ee1b80e06d3c2cc0a71269339d43fc9edd341d4b6b269ece347864dc2ffc9e647503e82163bfdd8701036a1db45d278ab169cdc2edd SHA512 7a4c3026a73f4eb5c9b7717fa6dc0010191dd1ce5296792f5fb58c813a843db7377e70c7d36b59461927424f15df2b9ab58cea425b6ce64ca56f75fe8bbfca5d
 DIST gmime-3.0.5.tar.xz 764188 BLAKE2B 71daa5703c7a3e0e209a35908ef9fee40d494a5d2a3819d273408a36caee18dee6852a852a9d8757e2bf9d0b958235acb69cfa7538a8f670deb00c220f77a737 SHA512 658b9008ffdf8055ffa9dfe8a5a6036a487309b0419572a9376397f68a8fc17d36ba6a05d2dfcb2ad23e634dc9e2aedd2479df1bfa0b7f8944d4c294650cb6c8
 EBUILD gmime-2.6.23.ebuild 1735 BLAKE2B 53f9f6f52467235a3de521c880fcf55a6a9f3498000c52557fcac809d7ae118640c35204a61c2f69ac2d99db68b3232c6a672b99dbe658a0d5eac299ea987fa9 SHA512 2fbc586acb1dea60334039199a75f796bdd222ac5451c47ab76b2f8453adb4a2850d52dabb0c9d30af9a31332d5804bcc7891ceff5c58b78a61b2b54d0dd0354
-EBUILD gmime-3.0.2.ebuild 1565 BLAKE2B 7cb85de4a7f06d7e58df10f0c6ee060894c3bea4addea13fc977be57884c42b0c117171b421d7e7b8597882ac2f037a6238c69536ba9f2c3e523201c1f68a80e SHA512 5c887be7059c20a2166771651d5b221e0a228f9b12f0b0f38f1fdf83b00ad3c3d8e94f072c0d00bbff0ee0aef448922acb333b123b5e69f16de75d034eeb8ea3
-EBUILD gmime-3.0.3.ebuild 1565 BLAKE2B 7cb85de4a7f06d7e58df10f0c6ee060894c3bea4addea13fc977be57884c42b0c117171b421d7e7b8597882ac2f037a6238c69536ba9f2c3e523201c1f68a80e SHA512 5c887be7059c20a2166771651d5b221e0a228f9b12f0b0f38f1fdf83b00ad3c3d8e94f072c0d00bbff0ee0aef448922acb333b123b5e69f16de75d034eeb8ea3
 EBUILD gmime-3.0.5.ebuild 1563 BLAKE2B 679f860c55235c49f5a92e5ec36edd7ce2c73bb90453bee7779d9af86f388b68300413b7358bc5f6499b72eef5875dc1c7fc60a2089af50f5956e81dfc0a196b SHA512 5718c00a118e590b92bc9d1bee24304f1da5eb29330d1062e8e87d2c6f262a5d14f810d9726a60ea91c2674286e20b8521f9ead1d9061974074eaf7c2cd0f7b9
 MISC metadata.xml 407 BLAKE2B 6079e838028f6063248e1dfe1b1b720c2bde65fe73512d4749aeda39aa9bd01b5bd047217e51be2ec6ab1050551f6e2f1c1d7162400261c841be312f8538df6e SHA512 0567710e8d8d0a61a0828325440aa243d8517d94767069d165c106fc5d1b96e5f952738874772ef9f28d1a391d3c47939a2ee32ecf3f8321ec00ee81d646d502
diff --git a/dev-libs/gmime/gmime-3.0.2.ebuild b/dev-libs/gmime/gmime-3.0.2.ebuild
deleted file mode 100644
index 8b16292c8a03..000000000000
--- a/dev-libs/gmime/gmime-3.0.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit flag-o-matic gnome2 vala
-
-DESCRIPTION="Utilities for creating and parsing messages using MIME"
-HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/"
-
-SLOT="3.0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="crypt doc idn static-libs test vala"
-
-RDEPEND="
-	>=dev-libs/glib-2.32.0:2
-	sys-libs/zlib
-	crypt? ( >=app-crypt/gpgme-1.8.0:1= )
-	idn? ( net-dns/libidn )
-	vala? (
-		$(vala_depend)
-		>=dev-libs/gobject-introspection-1.30.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.8
-	virtual/libiconv
-	virtual/pkgconfig
-	doc? ( app-text/docbook-sgml-utils )
-	test? ( app-crypt/gnupg )
-"
-# gnupg is needed for tests if --enable-cryptography is enabled, which we do unconditionally
-
-src_prepare() {
-	gnome2_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	if [[ ${CHOST} == *-solaris* ]]; then
-		# bug #???, why not use --with-libiconv
-		append-libs iconv
-	fi
-
-	gnome2_src_configure \
-		$(use_enable crypt crypto) \
-		$(use_enable static-libs static) \
-		$(use_enable vala) \
-		$(use_with idn libidn) \
-		$(usex doc "" DB2HTML=)
-}
-
-src_compile() {
-	gnome2_src_compile
-	if use doc; then
-		emake -C docs/tutorial html
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use doc ; then
-		docinto tutorial
-		dodoc -r docs/tutorial/html/
-	fi
-}
diff --git a/dev-libs/gmime/gmime-3.0.3.ebuild b/dev-libs/gmime/gmime-3.0.3.ebuild
deleted file mode 100644
index 8b16292c8a03..000000000000
--- a/dev-libs/gmime/gmime-3.0.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit flag-o-matic gnome2 vala
-
-DESCRIPTION="Utilities for creating and parsing messages using MIME"
-HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/"
-
-SLOT="3.0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="crypt doc idn static-libs test vala"
-
-RDEPEND="
-	>=dev-libs/glib-2.32.0:2
-	sys-libs/zlib
-	crypt? ( >=app-crypt/gpgme-1.8.0:1= )
-	idn? ( net-dns/libidn )
-	vala? (
-		$(vala_depend)
-		>=dev-libs/gobject-introspection-1.30.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.8
-	virtual/libiconv
-	virtual/pkgconfig
-	doc? ( app-text/docbook-sgml-utils )
-	test? ( app-crypt/gnupg )
-"
-# gnupg is needed for tests if --enable-cryptography is enabled, which we do unconditionally
-
-src_prepare() {
-	gnome2_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	if [[ ${CHOST} == *-solaris* ]]; then
-		# bug #???, why not use --with-libiconv
-		append-libs iconv
-	fi
-
-	gnome2_src_configure \
-		$(use_enable crypt crypto) \
-		$(use_enable static-libs static) \
-		$(use_enable vala) \
-		$(use_with idn libidn) \
-		$(usex doc "" DB2HTML=)
-}
-
-src_compile() {
-	gnome2_src_compile
-	if use doc; then
-		emake -C docs/tutorial html
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use doc ; then
-		docinto tutorial
-		dodoc -r docs/tutorial/html/
-	fi
-}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 0429fa47c42d..d041b2f388f0 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -12,5 +12,5 @@ EBUILD icu-58.1-r1.ebuild 3332 BLAKE2B 951e0963b151c25950a2373a5d68575a14b6f9d06
 EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
 EBUILD icu-59.1.ebuild 3342 BLAKE2B c3f45fbbeeab2cc2a92cae23b5058783f5aec1c7bbbd28f6922e7e091077e7aece5f43365b8b16a54a60c714ac2bad31e18eda24010b7a7b74ac4cc7ab519e0a SHA512 708ec7e483bb078b1d0f7067ba720197b37280de9a09ba1fb92a944aad3613fd1db93f94cc1d53ce457a2ec610afe88232a040a25128d873bc401b91f0bc5911
 EBUILD icu-60.1.ebuild 3721 BLAKE2B 98e5114b569dd89706c2aac9043d63c97822ad37c7b200fd5591843d9c81e1fefc6550d2f094c132cd5a3fc69f9fd42d4383a1774fb12fc2ede47e46dfaccae6 SHA512 622002eecc800f595b159a125a62306ca94b4d3f924a4ab9c31a50bb5b2c2a3bb2aac38a90384a5bfda13347fbe025a39e5538598e706d8b9d34a392e212a3a6
-EBUILD icu-60.2.ebuild 3720 BLAKE2B 3c1ff6958adf973f251a3d27488a646ab0ea2c45c061091df1f36d1272de054b15c595d5a3344d1bef6723f4042c02f7c53ab3c585026529c53570f04b5671c6 SHA512 092c62680d82394e382b539ec3b322e53f10cda373df2a8888413776d0e0dc55629ba65d96282f6791d3f3f077dc45091418a39605ec11f1a770df4cabbe85dc
+EBUILD icu-60.2.ebuild 3718 BLAKE2B 84cfcc76fc1f02350ce7ef664719c77df3b58dec3885981151dc56c347781675fc0607aac3e42487ec7d9bfef49f16f64c9750be4c47e688fc5fc618e8f0b956 SHA512 39d21e0bd19e922e105ce9e35c9caf32528d42a4a45bffe3cef064cb9f78942a40e39ad015a085663592d2674d8f9044f44c8ef3e25651f529657a587ffd2a99
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-60.2.ebuild b/dev-libs/icu/icu-60.2.ebuild
index bce4879eb694..0343d4e9d87b 100644
--- a/dev-libs/icu/icu-60.2.ebuild
+++ b/dev-libs/icu/icu-60.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 DEPEND="
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 5074b9d998f8..abf2a8b0f9ee 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,5 +1,3 @@
-DIST libgweather-3.20.4.tar.xz 3342220 BLAKE2B e9f58b508e67eae0f76849b37cc7ff955a512852d911dfb473b1f28f14112ec21bbbc7910efd39d3752a473774b6fc04fa5de135903882883e3aeb7a0edf5bbb SHA512 65b28a2bf8e9e7d8b02972d1d2f701ac8668b1e91154ba7ee94e9a08bb98d28ce44e88842e2fe78a13ce9f942d79fd2950d8de266dae28bb262c5fc11328ada9
 DIST libgweather-3.24.1.tar.xz 3350680 BLAKE2B 9265cb3c280446d5f380f62b60efb5578a7a401e3291d12e3824d8e7eacc582761226b0aaebb0439318bd48b9ad5429a1b6d89eb0220a82650c43be8aa337e2d SHA512 564464d7a18a8e0320871ea418b1163163941c950c5acea5ee65a087e44c4d81e019e2e3e4cb6751989f823cbb7c5691713d3dcef72aeaf6ff264e61b6f7b4b4
-EBUILD libgweather-3.20.4.ebuild 1304 BLAKE2B 39cbd9270ef604a4c52a70e76374a004a92b952a7ac91463d015228ba8123f382cad9ca71d80d747345ee38ea228498a2aaf94103aa28d131672bc3882c235a0 SHA512 ab933db3ab16ad69d22d2ac2cad259dfc1ea51d9c9c7c87d9ab3eb49a88bfd13eaac9f895752b63de766d1301b1b67d066c1812ee64a25703e0eb8528a99d403
 EBUILD libgweather-3.24.1.ebuild 1304 BLAKE2B e7ef00a8d93612dffc721875d07ec588f21a70a41b55dd6684106300d9e73a838d39a4670d9d096879e026ca4357aa6726578b50acba76a0fb903bc117408723 SHA512 cc354dae7c6e20c66781a972dd224bc65404ee144ac4133c449a34e9ea68e6c89fc9182492ef9d66f7c72ed3bd6c56223274abe4e315fbbb6af70aadefd5a319
 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f
diff --git a/dev-libs/libgweather/libgweather-3.20.4.ebuild b/dev-libs/libgweather/libgweather-3.20.4.ebuild
deleted file mode 100644
index 64344996e2d0..000000000000
--- a/dev-libs/libgweather/libgweather-3.20.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Library to access weather information from online services"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
-
-LICENSE="GPL-2+"
-SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix)
-
-IUSE="glade +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=x11-libs/gtk+-3.13.5:3[introspection?]
-	>=dev-libs/glib-2.35.1:2
-	>=net-libs/libsoup-2.44:2.4
-	>=dev-libs/libxml2-2.6.0:2
-	sci-geosciences/geocode-glib
-	>=sys-libs/timezone-data-2010k
-
-	glade? ( >=dev-util/glade-3.16:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-applets-2.22.0
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	>=dev-util/intltool-0.50
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable glade glade-catalog) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index 887ca73de225..8c73ff941136 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,6 +1,6 @@
 DIST libixion-0.12.2.tar.xz 407280 BLAKE2B f8a9307758f1005bd8dedb7aab9fed7478c963e3fd235c3d1efc29dbc51a3e9c6e92ff6972c8b06b2b90122a400d1f907bb39c67c2c20aa55c46a93e0c783edc SHA512 0a85120a08c79c73a252a997c8b3df461fe1f8ce8b2334aee0e50bfd887a440a220b44922edd18fbd402b1c8ea8be629e6181493bc618eda198f35159813ddcd
 DIST libixion-0.13.0.tar.xz 413756 BLAKE2B 04aef61a1cc691bb159d7e8131e2e47fe2590634adc93f2e5771ed106316eb1c92ee7c4aa05ba753a1751cb5e7c55cba9263515671a26f9bc9983a1cfcacceff SHA512 15784e947164d106e677c59ece53b3cd401d4f9433cc5331a35d3be8332ae4f20a469ca73b30b253433c86da4afde886dfb4ac23e46ed46376a7349e0276c3a0
 EBUILD libixion-0.12.2.ebuild 1141 BLAKE2B fba5cb475f161d3c40f04fff8899fc2911d6533a373927c17339da905446f89a61693407c739b31f1ce77f34267af97506f4df99e145fe158a8b4bfc5ebefff7 SHA512 993232ee16cf3682214bf7b36f1af69354578c0e398ab2e269bb0f511e91ecd622da69ccbdf82187d0bec94bf01f9edad968abdbeedb15202433ab36d756b822
-EBUILD libixion-0.13.0.ebuild 1154 BLAKE2B 06fa4832f2010b14ed49cd3438a5f8b65d87034e07987fb1c556d1e6ad5bf35e391d03302597b61b1375777c0b73fe6b339e4b9caa51bb75a727dd276b00efa4 SHA512 d37e823bdc2226c3e854ed5142c100f300743214ab1ecfc23213bda3dc923c0e26722be301d7e6fa5baeb06109bf376b1327bdc1b9f7c27d189d12c7e5bb3590
+EBUILD libixion-0.13.0.ebuild 1150 BLAKE2B 4484da28a8517c76d373ac787c17394f1f237b3affcf80f45d79e3238b414c00a2664ce86a1af2b19918e3f93a781accb027eacc4785eebc2477a758ebf395c8 SHA512 ea3d4ce8a8cc9b504eed1bf47359fadd7dc850b6c2e3a0f037455b9763b265523b4299fffa99ec4cff2c91faef27b825b5490dbbe0b4a4693ea09a3d637f7a48
 EBUILD libixion-9999.ebuild 1150 BLAKE2B d4d57ba89107e6a3c81ce172ec28a10cf11b133e1423862160ac587fe2de19aca6e216fb8bbfba5620b905856ffcfb73431b15aa9d4af1c31e1fe63145ff4c4d SHA512 46d1e9174374413fa3a9bec611d202420efbfe3e1d6da0da3772775d6a486739cfcc0177c0bf76c13f3a8bc983584a81e3b32c83dd8db102aa67755470d989a5
 MISC metadata.xml 397 BLAKE2B f586541f39dbba914dbeac46a03879649b394183dc117093dd1cac33d506dfb5cd0193a322761c3aebe5801a9851cfebc674e2487c86f03a5f6a53fdac059876 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312
diff --git a/dev-libs/libixion/libixion-0.13.0.ebuild b/dev-libs/libixion/libixion-0.13.0.ebuild
index 1cf9c89f9768..b814fbb37ad3 100644
--- a/dev-libs/libixion/libixion-0.13.0.ebuild
+++ b/dev-libs/libixion/libixion-0.13.0.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
@@ -17,8 +17,8 @@ HOMEPAGE="https://gitlab.com/ixion/ixion"
 
 LICENSE="MIT"
 SLOT="0/0.13" # based on SONAME of libixion.so
-# [[ ${PV} == 9999 ]] || \
-# KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="debug python static-libs +threads"
 
 RDEPEND="
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index f379f78ad7e1..fbc81018e776 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,8 +1,6 @@
 DIST liborcus-0.12.1.tar.xz 1673880 BLAKE2B 6f85f1ce04bd7c797f8fccc9b4d860189b6fa9f51623587a668c343e8897bf17a3e62a5465354776044fabe9347ec35913eb1433dc551e4e509ce260ba92c3b9 SHA512 294b24ad7fccae77070edd9d8e6e1a370f609ec8af9a2c58567431e641fc0f3f27c4cd4b6ac1825a8179a22a1d1a81d84827859eb631d2625194f9e59ca1a8c3
-DIST liborcus-0.13.1.tar.xz 1814552 BLAKE2B 27c31a2a6ab2de392aeb36d72417184c37d6f76707b570a0beed53d4b817fd093758381ad4b0e64258d3d9d7d9d9434dfa0be447d9a6c28f47af6fb7496c1a6e SHA512 1c81332974cada2d3526e86ef564211100fb765b611a2239fe6aaabb8666e38a7c8cb52696e5d7c402794ea5b5ceb23b083f7adf2c4417d2e635007d9baa4420
 DIST liborcus-0.13.2.tar.xz 1816884 BLAKE2B e9e7635969cdeb2dcf7274a9d54774ba3b49a40db203624e7351eaca6dfe8c87605a1a5ff8c844f50faa47b88379504cc48a3aa432f75c1d00e5974ef244b93a SHA512 3f79787a62ee0ab59ee61d5b46e1e777b27529e20d6dde9a98db75c8b6c54a11f5f78fa46d018bb31a9ef9df19a60535936e645e5fa43e71bd4e25d9f3a802b7
 EBUILD liborcus-0.12.1.ebuild 1294 BLAKE2B d5fa81bd750f1376f09116ae40f68c5449ecacc894908bb3e706defbcb3cefe0b0866946e55eab79098d7dba5dbb8feaa39efaed741ea6567609e3f78bd38448 SHA512 86b0e04d7223f2932e913013cff0e42c6c22d1540bbe873a90e59c4828f9a528c3942444a993983aad113e75d4f887160dcd8791a6167e0e750851a37e303df2
-EBUILD liborcus-0.13.1.ebuild 1296 BLAKE2B 3a037ff13bbe11b0128d1c2c76d83544e02eeabe5487ce17578e6faf3a2457f0cec2b509d42e328c4d42172a984d59ca9bdcb9aa1ecf9e390854e2e6f174ce86 SHA512 31797d5cd7192a607d84ad19d7dff3abd1fec016818befcbd31c0fd410eb47fce8f61a0b55c082624aca5cf2733e5ef5033803b6c0efed86d211d7da3c8daed6
-EBUILD liborcus-0.13.2.ebuild 1296 BLAKE2B 44f3a9c2386d50bf86e47e7b4fd8d6c063c10bb66f99d187f4915c731071b7a584ef796b70416ca618c6ea0221f9f76f3f111f611edc078830f30728abe168b0 SHA512 2eed04b7ec34a303c871405a2412f74359afc4376f92eb3e899f6034fe5555dcc8797a2c082300f1e1cfde1230f01482e800b649107565d98abc627bbd1b4fa1
-EBUILD liborcus-9999.ebuild 1292 BLAKE2B 52149e76f11747cc7cb66f05e841038efade9dd9e0b06bf10f93af345461e27f6e9683d7c89d28c83273d153d58f92ba994817f75452f567c249ad3a6cf3430b SHA512 eb81d6e9163ff61123b678f86b4eeee7b7cffb27c8e98e1518e20543c082ac857af9298ea6a997bf69a7876853513b081da755cbbb86c67416741ebef7195e6a
+EBUILD liborcus-0.13.2.ebuild 1299 BLAKE2B 02f09dddd6907115bc5a70523b48e5768b33ef3582b9fe9ca39e23104fbf0aa5f47070df81786ad9857a8049514ec52b91aff527a372c0e60101cb7343bff2b7 SHA512 7db1b63103cae486e1be74992c1094bee3948d86898725d475625e5502987648992441ffdfc25bc796e772fd07a190826023141b863f76a39c51e27229846440
+EBUILD liborcus-9999.ebuild 1299 BLAKE2B 02f09dddd6907115bc5a70523b48e5768b33ef3582b9fe9ca39e23104fbf0aa5f47070df81786ad9857a8049514ec52b91aff527a372c0e60101cb7343bff2b7 SHA512 7db1b63103cae486e1be74992c1094bee3948d86898725d475625e5502987648992441ffdfc25bc796e772fd07a190826023141b863f76a39c51e27229846440
 MISC metadata.xml 556 BLAKE2B f60b17901e0ac564d2d495122a673c6c397e8ca78cc5035b53be81e48d6653d9804fbd337a5e308fb993a28f39aec13f0b8da85bc8e3bf213f0411e08f977a60 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2
diff --git a/dev-libs/liborcus/liborcus-0.13.1.ebuild b/dev-libs/liborcus/liborcus-0.13.1.ebuild
deleted file mode 100644
index 103168023cec..000000000000
--- a/dev-libs/liborcus/liborcus-0.13.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
-inherit python-single-r1 ${GITECLASS}
-unset GITECLASS
-
-DESCRIPTION="Standalone file import filter library for spreadsheet documents"
-HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/0.13" # based on SONAME of liborcus.so
-# [[ ${PV} == 9999 ]] || \
-# KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="python +spreadsheet-model static-libs tools"
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib:=
-	python? ( ${PYTHON_DEPS} )
-	spreadsheet-model? ( >=dev-libs/libixion-0.13.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/mdds-1.2.2:1
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable python) \
-		$(use_enable spreadsheet-model) \
-		$(use_enable static-libs static) \
-		$(use_with tools)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/liborcus/liborcus-0.13.2.ebuild b/dev-libs/liborcus/liborcus-0.13.2.ebuild
index 2f6e72a16cd9..2f6e8414b8d3 100644
--- a/dev-libs/liborcus/liborcus-0.13.2.ebuild
+++ b/dev-libs/liborcus/liborcus-0.13.2.ebuild
@@ -17,8 +17,8 @@ HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
 
 LICENSE="MIT"
 SLOT="0/0.13" # based on SONAME of liborcus.so
-# [[ ${PV} == 9999 ]] || \
-# KEYWORDS="~amd64 ~arm ~ppc ~x86"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="python +spreadsheet-model static-libs tools"
 
 RDEPEND="
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild
index a4d905a62839..2f6e8414b8d3 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
 LICENSE="MIT"
 SLOT="0/0.13" # based on SONAME of liborcus.so
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="python +spreadsheet-model static-libs tools"
 
 RDEPEND="