gentoo resync : 10.11.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-11-10 00:43:02 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-11-10 00:43:02 +0000
commit: a5332b59346f7cbf0fdbd148b54aa8a84aaf8190 (patch)
tree: e6d8d3589fcd01fbc3f1286185639163daa81424 /dev-libs
parent: fceeaf01a28ee71065cf3798b70b77d3bc4ef199 (diff)
54 files changed, 647 insertions, 184 deletions
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index 4cfb95adbeda..53fc15850f86 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,6 +1,6 @@
 DIST appstream-glib-0.6.13.tar.xz 1974864 SHA256 1a3734b2cdaab55ad63c6e3ee31026fdceb122cecae39f9f7126a0305e8836bf SHA512 d7e95a31d3f6fba974af2fab423282c7b0291d1325a634d8040fe2c2c2fcde49981be18900415251b3d71f20bb9e945e16d7c00fa830b27deac2e5547ec4c8b0 WHIRLPOOL 91e8209ff79b564c51328d84ef34301872865ade73d2c85b71ba5dbfddffcd81ad30bce9867d44282822df566a3fa028cd291ee1a896b52612bb80d2f435251c
 DIST appstream-glib-0.6.8.tar.xz 1962132 SHA256 23f009233a96d1246c4c46c9746be126ae9d422753399621445d07bff49cae41 SHA512 dac9e0cc6dd8dfb81cbcdb6796d6890b61d5ede634cbe31768d1cf5746ada3beaf8b46918bab24e72604d52cbf6c6602efa6aedbdf9379f4c10528929f926fe5 WHIRLPOOL d2f2dd1607f4cb03ab501e4e189862cbb5c58b0bc3e63af153d72c7a714e791509dc2981921b1414f11282f7681277b690cb3142ce71c2bacd2799a935bdfdc2
-EBUILD appstream-glib-0.6.13.ebuild 1607 SHA256 94f4c144759adb50df9f957e3b502072edc58016e8b2c13bbc9bafeccfb254ea SHA512 385343c8e3da3bbe636ccbd23fc788726a97ff73b4b6b4baa5fd4c0fe90cab033feddd34dea1b4d7219bb4a191a1b47991b3b99f8fa93d670f84d9bac60c9012 WHIRLPOOL 4bba4c1942d2dd4bd08aa320c526b395af232b6a3e2d7c7809765155cb0ac47ec20a5269b8a6011ba694dfb539e3f06ebabb4fa8e4b6f59232444c5e6c318667
+EBUILD appstream-glib-0.6.13.ebuild 1606 SHA256 f0b71bf278940e989806ed8f4e4e27ecd6d8268f97be4779d1564dc9c0be8afb SHA512 70b55166f6ac1be05f6f6244580d41084cb663bafc738c344fa9c3a9af5b80c2d36e1922c659236da729a9f79f30d5ad968789d1a3ba24ab3173d33b5a6f405a WHIRLPOOL 396117a140580d47453c166bce75db49b4c888a56e739c854304c67dca8ea6ef0f8e9adfb9b32b526fe75910a4200f40bac08a13c44956a04d162dcc4ab96855
 EBUILD appstream-glib-0.6.8.ebuild 1605 SHA256 5ac4f37114ab3e4eb4e1f1bfbf4c2e3cfc3bcd8e6e2dc602ad0c572d196f0b18 SHA512 a068a048dea1e3ee462f86b1597b2f22068f70f7e30ac1fc6cf407a2a0853b1d021c5d985fc670dbb6e3b8773d0a9be9f83d6edef888d8c151b6a49334c2a0ef WHIRLPOOL 5bc9afbda1d2176a5ce7d2d94486bcaa068c734bd1bfd60a388791afbca168d1efe1784512a0c5d52828d1c3d58ac86bbfc1255dc2d6d287570826dae701af74
 MISC ChangeLog 11400 SHA256 69f7c01c5a677fa167ba0cad02289aab64957fa50f34144f575db076656a68a2 SHA512 1aaa5ef4048d403fb842d7069a5cbe0a913c945ec79a162a31f39e4010de15df23820d83ca0eb667182fa12b4ba3c6730f8871d67eca4a56ba1e2906dbaf8408 WHIRLPOOL 8d60db7a5a67571100a206afb9bf6b1091be35e0ae90248ca3f5397056914453e7abffa6a91404943b75782f305862bf4411a5b298bc721e35adfe04efc08ebd
 MISC ChangeLog-2015 3598 SHA256 4577c0ae171b2ae0c896a619c05a6d9e78c4f66d4df3c8afd1ab9d9f37910fdc SHA512 a79b0340662e00790d084e1f6e1b969046ac39297cd589fdc021546ab67835fff0343b40d2df65555c2d33ef6973000c1a7fadf1d15871f3a9d020f1e2f40de6 WHIRLPOOL 412a5af8f8784a4f569703976337824e26d19c777c9509ae31c9dd76092c227562fb5cabcc09cc0f139186dec6c09f27ad8bb289dd98bc5c14091a024ca7e373
diff --git a/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild b/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
index 322b190af430..ccac759a3296 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/8" # soname version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="+introspection nls stemmer"
 
 RDEPEND="
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index 3edcaaf92581..91b9b8492ecc 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -5,8 +5,10 @@ AUX beignet-1.4.0_no-debian-multiarch.patch 862 SHA256 6e30f41b74c24055e97c16683
 AUX llvm-terminfo.patch 788 SHA256 9d39944dc7f3735cb4fe8b4b53ee7c83ee3dbb3c07028ac3187208343a1483b7 SHA512 63706376f086b02be067ab54e818afab55cddb34668bc67c2c3f546142e4ca50f5536be4c15f359b3c1c6f62f36b90b3e76d67095d4bba452cf5b5a2c8891312 WHIRLPOOL 5d02ba52559f8fb996ade5268e213002cc879c03d9e7183f28a2baed360016b8004240d2402bf70fd1143260044c1efc4d76bb32d993b5e59c0a4143db635a48
 AUX no-debian-multiarch.patch 1652 SHA256 0a8d2ed67c3d1d5d56bcf4a5628dff59427f86d1eb9ff3d5fd964828178e7867 SHA512 c77dd485d22e61e558f002a18103bd8dd8091ac51e702335e8713fe7f8fef24e44607744165cf0997e10941b1044d96a4876f251e8e32ffd82781e5c303f0383 WHIRLPOOL fadcd4e0095228ac1c5771ec13f0208143438a9cebf3e7cd259dcee8cdfe6352238757bb9f20127343cf8bba35f4ce000fe00a3a8926e478b6601ed393a903b3
 DIST beignet-1.3.1-source.tar.gz 1136608 SHA256 399b7bc64d674b3092683263f7c085c5592686b9d837817e77857248e5cb561f SHA512 727c8ce68dc39672aa37370ebf2748955925a7cfd58c970c9a641706b45cc31d4a7d3eeebc366ed32ef69add5dd36189814454e5b31f12a6f09ea1a51c810338 WHIRLPOOL 528667a58fbd446e7177edc578543b301205a05fae99d3b1d3782792cac564683e7318fe4e83d81c194ee29fa6cca613e86ce8064f26b551385c8b6c51f4b21e
+DIST beignet-1.3.2-source.tar.gz 1143573 SHA256 c555edba149de23243965a703f39f79fa06f15bcff5a3762b5544b0925010b43 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a WHIRLPOOL 5d1c48bce9e8ffb4928baebce80d5bc50cb6ffb5a6d5f144b7e7258b9d42bdb995a604f98d5d942ef6edea636ba7cd7308b7156b00c9234772d1c1fc597ece02
 EBUILD beignet-1.3.1-r1.ebuild 2473 SHA256 1c0aed3aa482f78e7f8167384fe62edb113add2c6c6a5e8d9d461f6ee2e8e74e SHA512 f3449b8fd6a3b0df42cb22c7dcd97948d1f73710155ce1723e1db19a1f08853c8734b86a57b51c36e1d74713d026105f3d2c6974083de69acd971e589da19148 WHIRLPOOL 9e5e8355ed2fea0b96eb21b56e0a429dbb28a9afb71008d137a61c199b67f2906a01981cfe8cccbb65e6de76ccfb09505309f4a3e9f1229bcd46899d8f46fe0d
 EBUILD beignet-1.3.1.ebuild 2468 SHA256 8cb06cfe8df76d1d734b6548e5d6186ed360581087ed924d8220008bae66559d SHA512 b722fbda796b6776e263b1ed7b09db5e305fff4fa15a0257add357c5f03e8368ec7d3b4eae467a3282d33db71b4a4062e1081bf78779a3ee8ff21a62dbb6ca3c WHIRLPOOL d44e8205adedb09ff458f2b52fb224a9ccd16487e994c35527633727c7fda5c6935deb5719d5e0f5f0cd39984131598ca3e695ab5f8652b20d529fa3ab919053
+EBUILD beignet-1.3.2.ebuild 2436 SHA256 cf87de3f39663d66f48b7c3d6611285ed53d8e8eca627b9e2d2a750d50817426 SHA512 7a883e250b12a816795c74718e3cbf0866453022bfa4779da29475574f15ad730e394048c42825991140ceeb9e990cfffdab569ec9d6518cfcf2742b85aaf934 WHIRLPOOL 552da5bb53adb028abce411068564059582ee7fc01c136353e1d8e67addbc8fd5707bda2bce0213cb01b85aeea0bd50048bb410367f78e4f6963b98214cad335
 EBUILD beignet-9999.ebuild 2448 SHA256 5e2a108e22f7f04bb95e8c97395f70ee65b0953a8a8d06aa09402a5a0aa63aa3 SHA512 32dfb4b910f7bd7d7f1ccddd64b452850c8cd63f9e15f08a1ae2f747ae1c0986dbbfba0be8d6c4b2a08a3f3a24b6ee8fc04c0b02c45281674fe17114a1ef7b11 WHIRLPOOL 2c5faf380f6a5bfdc15b312880afc031fd02c00cd0d5ce942a6b50a99824eed7e588283889e0670be5383843ba5400ec9f89126203268755612ae3581d1afb23
 MISC ChangeLog 4183 SHA256 e29f1e3108d9f3e7570012e1021abbb5c4578b82dd518d03e047cb71c72b87e7 SHA512 1b1364b2021a9d487f30c2486aef075bb5017bb3253d5c5ce33465c912922780c7b63ab208047f54dab14a8181e6c23e44586ced43687bf7f816f745a89d0803 WHIRLPOOL 33297ecde33b42288d62b0fa1ef376b19acab8811c894248ad42134d1093c80f4eb6aabd0cc1107ca6d3a73a5c3f2a9698d8e5bb55e4831f05f950314a969b64
 MISC metadata.xml 473 SHA256 301acbf6b63c787197de626deb9f2c4a482351ed195cb95568abf6e330abe5d7 SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186 WHIRLPOOL d3c585f2651b84b47400eebd62d31e82f09d200815070d02c81e40cf21810d4e032c8373d0e60322a7191b5d865ad99096fd89f17c351222ce974da8122af50e
diff --git a/dev-libs/beignet/beignet-1.3.2.ebuild b/dev-libs/beignet/beignet-1.3.2.ebuild
new file mode 100644
index 000000000000..9b6fbba591aa
--- /dev/null
+++ b/dev-libs/beignet/beignet-1.3.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+CMAKE_BUILD_TYPE="Release"
+
+inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs
+
+DESCRIPTION="OpenCL implementation for Intel GPUs"
+HOMEPAGE="https://01.org/beignet"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="ocl-icd ocl20"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/beignet.git"
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
+	S=${WORKDIR}/Beignet-${PV}-Source
+fi
+
+COMMON="media-libs/mesa
+	sys-devel/clang:=
+	sys-devel/llvm:=
+	>=x11-libs/libdrm-2.4.70[video_cards_intel]
+	x11-libs/libXext
+	x11-libs/libXfixes"
+RDEPEND="${COMMON}
+	app-eselect/eselect-opencl"
+DEPEND="${COMMON}
+	${PYTHON_DEPS}
+	ocl-icd? ( dev-libs/ocl-icd )
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/no-debian-multiarch.patch
+	"${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.patch
+	"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
+	"${FILESDIR}"/llvm-terminfo.patch
+)
+
+DOCS=(
+	docs/.
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if tc-is-gcc; then
+			if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then
+				eerror "Compilation with gcc older than 4.6 is not supported"
+				die "Too old gcc found."
+			fi
+		fi
+	fi
+}
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# See Bug #593968
+	append-flags -fPIC
+
+	cmake-utils_src_prepare
+	# We cannot run tests because they require permissions to access
+	# the hardware, and building them is very time-consuming.
+	cmake_comment_add_subdirectory utests
+}
+
+multilib_src_configure() {
+	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
+		-DOCLICD_COMPAT=$(usex ocl-icd)
+		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
+
+	cmake-utils_src_install
+
+	insinto /etc/OpenCL/vendors/
+	echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
+	doins "${PN}-${ABI}.icd"
+
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so
+}
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 4cc11fbfba2c..3f0ff9dc56ef 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -12,7 +12,7 @@ DIST boost_1_62_0.tar.bz2 84513338 SHA256 36c96b0f6155c98404091d8ceb48319a28279c
 DIST boost_1_63_0.tar.bz2 81984414 SHA256 beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0 SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad WHIRLPOOL 28c241785097272a1e0952e529eef082444e4ef35a8d738161e4a491a986d75359d3afe888b2ea91a4a81b6ec7a5772ebea337c9d09377b43f6eed66cac90378
 DIST boost_1_65_0.tar.bz2 82597718 SHA256 ea26712742e2fb079c2a566a31f3266973b76e38222b9f88b387e3c8b2f9902c SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd WHIRLPOOL ca389eff2ffc4836b88688504c187e57f236a5967654e40377792d59dd2e4fc3d6ccb079174eae095ad610ccd683e795964c5011429845b27ab67166f8a82c19
 EBUILD boost-1.62.0-r1.ebuild 12708 SHA256 c6a95b6d650ece1ac0cb2173e41cb1334160a192ed1d81b423bf80fa8593bd30 SHA512 184f3410137d876afaf09a7090a35911c2e87884469c0c5ddc02627b4f88fc6188813a9c085127d745846b1355254553a2dc311373fbadd4f00c265913d4f946 WHIRLPOOL 33e9304cfe65ebe8bcebea796dbac41bf7e140b547ec9d5786648cb45a225ed46ef0256e27b200b666be864affe958caba16a5635d58ea51bf31d042cdb9b8a6
-EBUILD boost-1.63.0.ebuild 12468 SHA256 0cb4351c91e3e09e874e310f73121e130c9baf40ea0dbe4ce4308065fb7b35b9 SHA512 e58ef637defe0f0f136b965dc4a44d9cf8ca232552bb2a63d2a108923a6033cad1aa6cfbd3a175f58e54fa3d6c07f3930a1884908bb446f1d5e0d935dfe93ca1 WHIRLPOOL 98131c540efa61e3151afb932e93ae4ed70529108a98a7cad6966a12c882fceb1549592318c1c7492fe2f3a9441997aee592526a3bb598d28432dcb0f9e703e7
+EBUILD boost-1.63.0.ebuild 12466 SHA256 e343a06fd83e784ee5119e85b178316ae258dc99450c5c59be07bc40e66ba3a5 SHA512 c405a5a6e1ea19e4309227a7c2204b5f0f46ff564644925bfbf02cbd43108422e04b378f24dafcdabdb0154f7f41fb5532594acc61666c8c8aa21a024e04db5c WHIRLPOOL 2b6052ae14c01921d180df8a04288bdd53647417989a33f33fe55a4845f6402b0d1b14b41c500f87adc4b67f73a6b4067a09aed1df1cff88bc14dee8686179d2
 EBUILD boost-1.65.0.ebuild 12450 SHA256 923fe1e5b6cd957bad0122f9ccaca81e6851ddffbff77641a366f6e939c34961 SHA512 2a7d731578afad051602c25ce8d6d7c14f3dab3c1619f91e83c5edb22ebcca601d2652ff90662945e55f289ab96210e1452a4ffac6473b471d3a4d0618dae0a8 WHIRLPOOL 51360f79c8c5c35ef7e9319231cb9ab621b66e490d6225a2f21c26e23f39eba11f93c10d43686b62c841e7a0441750d890901a45327e46288973aecec40f46cc
 MISC ChangeLog 9975 SHA256 642cfd545560930656783f915297a280e467394d4d2c53a5f81485893701b6ed SHA512 36a87862bce59e58f7af6d02c6eca9fd9169ac7f4736417f64aa941141c800d80c8979c0ed4cd62e55a22f2bcd1a6803bc5daa8393c2f3e9f23060aefafa0c1b WHIRLPOOL e76c059fba7246adcb3e48d0b7f8b58f61ec4e1f95d82d7af4ba021e29fd1a34b9a95b415f7f98d6f03a0e86f549e22f2178ee36e14ace177d73e78d5c6c9697
 MISC ChangeLog-2015 60992 SHA256 f3b1d8b8c4ad6bd080f9b3d18ccb1cc360d47864f4afc95992e171d475d682a1 SHA512 6f29b95e625e1a8a8a7ea2578f07b543329e007443f3b4926e07c913ab21336e1b1332084b090354dcd9899b6f0aa9012b92e0cb5e0457733da4a47da86a818f WHIRLPOOL e11113ea0a8eda558457c7018283f274d10df473c116da67126640d56b49107e05326e0a8a3ef4f9043a22e2fc91f151c1cbed71bfe41cac52f5467e12a7e1d8
diff --git a/dev-libs/boost/boost-1.63.0.ebuild b/dev-libs/boost/boost-1.63.0.ebuild
index 32fc11933ad9..8a8fe19c9edf 100644
--- a/dev-libs/boost/boost-1.63.0.ebuild
+++ b/dev-libs/boost/boost-1.63.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/cdk/Manifest b/dev-libs/cdk/Manifest
index 6bc02569f9b9..a29c0718f261 100644
--- a/dev-libs/cdk/Manifest
+++ b/dev-libs/cdk/Manifest
@@ -6,7 +6,7 @@ DIST cdk-5.0-20160131.tgz 516298 SHA256 c32d075806c231b96ca3778bd24132c7aa0ba9a1
 EBUILD cdk-5.0.20131107.ebuild 1204 SHA256 ae0cb5feb2b8e9f9cd9f3bbb924a145e1144787b66dd11690942fc4cac82fa58 SHA512 d803eca2a215253e1e2ae6aa152fcdf6254597e8d1e53a0b0c0aabf978db17f46061442a77b424f61d38a331f59c0ac64b3b355a05e9cb3544881ff5041667e3 WHIRLPOOL aec988b9d5522e42cc5b3508f43570ad44ab345c120ba46f3b93294e44fcbecd04a3ad0040cc8eeff871b2ce2fdc04873b2d6551c4bc97675ad0e4e0ccc00056
 EBUILD cdk-5.0.20141106.ebuild 1204 SHA256 f8d85985df243d7d6ab38dbec77e05ebbba6a2f67d3ba74ba41e74aa5f640f47 SHA512 0afbc74e48e0633b4c6aabbc44db5a3988319cbb83572de58d0df78350ee43fdd3fcfa21879175891da2d6a3ff6bfb522aa4db27256fdea6a9df652bd896e0fc WHIRLPOOL a630bd4a551adfbbdae8e5e482406a3bc7a913b42577eb9cd23b95e6fe9b7c1e12ee6570d574711d2fe5dfec99cb5a81f7ed2ac39102fa60a04326748744c207
 EBUILD cdk-5.0.20150928.ebuild 1194 SHA256 0a99335682401f5f07fc429ef3148688611dc8af0b67eaa17595e6a0e120e6c6 SHA512 8f44f1589a0e001a27e72d35592ea16479b54cfe800398ab77aed3e4338998fee08214dadd88e7d6f3e5528f57c12066cd42f4245b10fe01fb7acfe6231d3b33 WHIRLPOOL 2850054be346aa29b025d99195bb26f45b2f9938c69462aad12ff845779767998778bccba29bfbcbce3e3236fa30a2d3bc1d7e5af971d635a8631a2700c247d9
-EBUILD cdk-5.0.20160131.ebuild 1188 SHA256 1dafcde4a7ce10defed5682f26aebe2e12ca1d25e56129889b220971410b32c5 SHA512 472de47b189f094ec7d94d187ea079d6e5d4ccbb3d6def867d56f4f05296e79209a827bdb78ef0dcb770397bb39da838b2e6751056f2949404b1d80c855a224c WHIRLPOOL 8da1a9107b20feb0a822a8aab61f2df608333f07471b06dfff706733c63842f7384cacd47678e7aa9b90ebadea6c5b6c1fa6443305c6ef6f2691c7c25db5e4bb
+EBUILD cdk-5.0.20160131.ebuild 1187 SHA256 e4a88983f7287509eba1b8c4fd00f929400b2d9bdcbeb3d14167a2bc96ef3561 SHA512 93033e6e2cae207249b81718e18b9434b6350f32a7be6921a8066a61c47d50304a09bfb485044c21ea551bb91f7d1b45787c89ec3afa982055e8d5db4a5b3d41 WHIRLPOOL 7f70d8bfdc99d6b4cb6e61afe0172695597eb153b0bf38ac54fdc339bf6a7c1d96fa1ef20f727218cc155aaded44cc829664030e4dc6450af2eadc4c92f1f45e
 MISC ChangeLog 4667 SHA256 4077de73189b4ba23ee58df2f6121ac8a826f7ff5cecbf801202359feba53367 SHA512 fa7f0c520ee2159c181a162450931625366b9b31d2f74a9030145a78962df60df799b1f672445575e2b6fb2995ce2d33eec6210a6a0cd1e4678418ea3d5d2266 WHIRLPOOL a0b9ca531dd81df393e7d01cb13940d7b85daff3c753ba226fbd0768173b8b29c6478b943390fd97a72e1e3324cbb8377027914d858a2b27c45e4ebfa858faa6
 MISC ChangeLog-2015 12172 SHA256 8eb1fcd86a74b925cfd3f142925d3bc9007476d96a126857836896425dd70e54 SHA512 4137a42889f59d761180b412fb0402acdd54fca833e1ce7df75e4a9e3819b7f9b53c2c6b6895611476a2179237d51c465c136e6a4d19651054d3c5d5b9d8bc62 WHIRLPOOL 8aff58e014dbc9df113dd67d480cdab88030e5ad355a894ad7b3d3c9b569ce82f19bfc72d53f8d5098c02606d4ba07f4f93e29841bd293be8ebcf4e22dc6aad2
 MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/dev-libs/cdk/cdk-5.0.20160131.ebuild b/dev-libs/cdk/cdk-5.0.20160131.ebuild
index ed224d841c3e..c21e7899a5f9 100644
--- a/dev-libs/cdk/cdk-5.0.20160131.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20160131.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="alpha ~amd64 hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha ~amd64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="examples static-libs unicode"
 
 DEPEND=">=sys-libs/ncurses-5.2:0=[unicode?]"
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 0547859458d9..f144fe5e4941 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,4 +1,3 @@
-AUX check-0.9.10-AM_PATH_CHECK.patch 1287 SHA256 7da055a54dfdb5cb7f3d413d05e1561163422f72191ad52b6a5f84c1833a9177 SHA512 c8c4d667032b62ddc49dee04034a9f6007a13795540b55088df49037d0aa238e0685eaf2b57cd16e6df3ef1e3fc3714a90cf3e40a6972f8c6b164b775aa53c73 WHIRLPOOL 1b6f02cb93139f3c43bf7e61542834e71c3ef7eacb8b52945d4203591a0c43e597686c90feacc4250f734817a3f87cd50fde96b0041d321a02a90b940acb6052
 DIST check-0.10.0.tar.gz 769119 SHA256 f5f50766aa6f8fe5a2df752666ca01a950add45079aa06416b83765b1cf71052 SHA512 82103a98382c41cf16f172ded66c0399d3da6eceb6728aab11120c028e8796f6d545a98dc4aa5f76ee68c0bfd1f842a4dd371f5d670c8ba84ce4209812bf1ac5 WHIRLPOOL d3399a2500a4a1f6fa8865fe75af67e98a22587edd2525d144f4f403dd313cc59b7622cd77cfd885b9e3dfd737e2bef5366d28062b2975c882ffac6253b02b29
 DIST check-0.12.0-github.tar.gz 281127 SHA256 7816b4c38f6e23ff873786f18d966e552837677bfae144041e0587e7c39e04e8 SHA512 f7b6452b69f999a90e86a8582d980c0c1b74ba5629ee34455724463ba62bfe3501ad0415aa771170f5c638a7a253f123bf87cbef25aadc6569a7a3a4d10fce90 WHIRLPOOL b3ef728b1f442a2eafd5cc431de204a6f32d28463543693d25d49e57c53b5c062786b5eae11752515f6d5b4eff35892d483d7b54705354bcea985a58c90b2266
 EBUILD check-0.10.0-r1.ebuild 1797 SHA256 8efdca278e0c901a6accd73f04622487ec50866f04ddc58bc8535b9e633c54fb SHA512 b178160a81d6df74c7ef10f8d4658c6e12759a2b7b416d7c7e724d83a83212b67dfebcf41b15942dc7dc6f1e5b6270463b2088825a84c6c945b8c535151f1881 WHIRLPOOL 519035816d0379722b26b25e15c2a1e50ef18d57ae718fa63482c15fa86e1f30e68411258f6b017a8c34d4d335706cc17843c64dfe1548c635953cc63969c32d
diff --git a/dev-libs/check/files/check-0.9.10-AM_PATH_CHECK.patch b/dev-libs/check/files/check-0.9.10-AM_PATH_CHECK.patch
deleted file mode 100644
index a433549a3639..000000000000
--- a/dev-libs/check/files/check-0.9.10-AM_PATH_CHECK.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: doc/example/tests/Makefile.am
-===================================================================
---- doc/example/tests/Makefile.am	(revision 747)
-+++ doc/example/tests/Makefile.am	(working copy)
-@@ -3,5 +3,5 @@
- TESTS = check_money
- check_PROGRAMS = check_money
- check_money_SOURCES = check_money.c $(top_builddir)/src/money.h
--check_money_CFLAGS = @CHECK_CFLAGS@
--check_money_LDADD = $(top_builddir)/src/libmoney.la @CHECK_LIBS@
-+check_money_CFLAGS = $(CHECK_CFLAGS)
-+check_money_LDADD = $(top_builddir)/src/libmoney.la $(CHECK_LIBS)
-Index: doc/example/configure.ac
-===================================================================
---- doc/example/configure.ac	(revision 747)
-+++ doc/example/configure.ac	(working copy)
-@@ -20,12 +20,10 @@
- 
- # Checks for libraries.
- 
--# This macro is defined in check.m4 and tests if check.h and
--# libcheck.a are installed in your system. It sets CHECK_CFLAGS and
--# CHECK_LIBS accordingly.  
--#  AM_PATH_CHECK([MINIMUM-VERSION,
--#                [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
--AM_PATH_CHECK()
-+# Use pkg-config instead of upstream-provided and possibly-broken
-+# AM_PATH_CHECK. This command sets CHECK_CFLAGS and CHECK_LIBS
-+# appropriately.
-+PKG_CHECK_MODULES([CHECK], [check])
- 
- # Checks for header files.
- AC_HEADER_STDC
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index f8a9c97fce99..36f905f73881 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -2,7 +2,7 @@ AUX geoipupdate-r6.sh 1085 SHA256 daebeb831f1a70e0f926525cc755fc97296dded7d63dd7
 DIST geoip-1.6.10.tar.gz 161506 SHA256 de0d6d037d5e0ad9f7110e7f3b82eb20a24616712d29be0019e28ba7364cdc3e SHA512 5cd527da9d9a921bcc3020e636b410310e6462832804ac2d594b9cb4ceaacac0c31eb64f97e23e77d468da7b63a704084e140c8b69b838e362a188309756a2bf WHIRLPOOL 0b2cfc3ce8b901e731c1f6fbbf36f8ee5487179df3e22ae2bae9c616c9215d93a4c1cb8e975de8e978caa8b4f7e18914cc13bdffdfccfe81a6df5706fe6bb82a
 DIST geoip-1.6.11.tar.gz 161934 SHA256 8859cb7c9cb63e77f4aedb40a4622024359b956b251aba46b255acbe190c34e0 SHA512 9c017a95c7903898b9a2bc10c34e51b390326c181c46e6f99daf3bc4d8f84cfcf640c5cc92d527e4c7428e2b5bfa835cc57040507eb836062139a795726349b9 WHIRLPOOL 8ccd4dd86491e63a3d56958b7410255fb6f16e6bab957dd04f82fb525540799a5f99e6759bd2bdf02615360ffe310661d2bcf1dcf6ec98c2c23746cb93eb3461
 DIST geoip-1.6.9.tar.gz 158576 SHA256 05468adbb6bdbddc588ee6f0df990f47b1b24d278519c35d59f7a8058a2a9825 SHA512 a3a34511ba32e6c7d0b46b0e608c5be54411cf5b095c867c3225941b55e5714ec7c68de64e0aefcf4ee2081fbd626480067d6bc9822d775decef1f8e26d7e976 WHIRLPOOL 4b4a4e4dff60f3b9db456d54b5529c24c93b3e18c4aff0d67d35165e9092fcd7e163ce868f729140f9ee5e3a8f49c19ff8a7324f1b106fd9a81a7896d92288ae
-EBUILD geoip-1.6.10.ebuild 1300 SHA256 cb60d7fb7051e62a9d0323267e574d37cdb2e13701ce036c343625cb758927bd SHA512 54f39ffdc1a66e657ef82641495f8ae735c3e8d5da7eb54e21aeca19af4943350227d3f02a7af6139234bc209b7cf7bae9b0a21369c4d68fcbfbb94e57681e8f WHIRLPOOL fbbf32e14320820b9174d818878e00b3d6fc9c60525a507f4807ced42c72212a226674f30596743df14bef90ef755c274d17dd83ccfafda96b0612638c0ec445
+EBUILD geoip-1.6.10.ebuild 1299 SHA256 18b4557a36a1b7607c23afc634cab0e41204819a4e3e247a327edba428b6cd0e SHA512 bccf0dd6033af8d93acee8a4d0616750c19b8a70e020a924f1da77f85dfbd39df4f9ad9e84f68fd9afd172dc86e8822899fef1fc290f8da68109a4fa706f5267 WHIRLPOOL 2419489ae600ba3415a1413dc259c9652eae8e49138322d6bd162d9d09748353d5989125304455d4993e66bf16a04c510226eb23a6679493e1560dfb0652df61
 EBUILD geoip-1.6.11.ebuild 1307 SHA256 f091bab789ca9938afdab519f067262d6e918704e39b964cd22fa4ea8eaa2f12 SHA512 c204420951256782aead397071b203cf80a20352a96dd225240820c462b40ccbc81fcb062a393f70df89d699569348250ef89ffbc5a93ed2ed704cdda4b38369 WHIRLPOOL c904bfe6cdc2cfa11be80d1e5162dcfeb2f988eaccdebdcf2828b42581943bdab319c94e6f116731ba6e5af088c95a3a3151087b1c8daa4352288bd63cca9b2a
 EBUILD geoip-1.6.9-r1.ebuild 1297 SHA256 41e12ef054418ad24186736011d2ebf97a3de095c8c746a7ae9bb571a36c09b3 SHA512 47e87b89e2477917040b777f8f6d7490984cb4c2124b5d0707b44a41eae80e4e16a4b55eb3264fd280229c06401bed25273edd3599576424b0e96955cb6b19cf WHIRLPOOL bbfd3ccd91d28ff8460b1b0c96f3a66d865e6ad81949ed466a6bff680cbdbea7f72bbdb1545b45367ea8b9e6cc4dd9d7d52a16f95ba4ab315aa69d88c93cef1b
 MISC ChangeLog 6374 SHA256 4e51d95e17cb741fab15807fef6f0c8b144667c76d97a30ecad2577d229cb27d SHA512 6b82ab45ea4f30b7922bdef6dfa8769c782d0f6a0468c7aab98f225f4f566bfcb63a82d6cb60346aa30c9cbad6acebda03f1d500c0ccab8b7475ebbcb83346e4 WHIRLPOOL 5e30b8bc9fe302f6d16861eca7418280fae26f799e4cef90ecde4c7b4696f52611b3f91ea957d0d16f8e6766abc50b62c3a0a479be583d595d9ed37dbc50d3f7
diff --git a/dev-libs/geoip/geoip-1.6.10.ebuild b/dev-libs/geoip/geoip-1.6.10.ebuild
index 1749ade5b07d..cc0afdc572a5 100644
--- a/dev-libs/geoip/geoip-1.6.10.ebuild
+++ b/dev-libs/geoip/geoip-1.6.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/libatasmart/Manifest b/dev-libs/libatasmart/Manifest
index 682ddbf73112..128701b1535a 100644
--- a/dev-libs/libatasmart/Manifest
+++ b/dev-libs/libatasmart/Manifest
@@ -1,7 +1,7 @@
 DIST libatasmart-0.19.tar.xz 251204 SHA256 61f0ea345f63d28ab2ff0dc352c22271661b66bf09642db3a4049ac9dbdb0f8d SHA512 ec9edb019c477873b01289ba365ad0ed0946505d651c1f6f83a63ef61b3976a5db6439c8a0c74d9a55325db9a3a587ad6f655f8d1af9387b0d08356eccabdb62 WHIRLPOOL edb1296494806bbc83054110a12f703e428cfe4f340936b4393d226c702a15e97e5c6c82310fbb745d288202a9036d15eed7dd8b1ef982391dc579814db2669e
 DIST libatasmart_0.19-2.debian.tar.gz 6511 SHA256 dcfe568cd42d952b1eb633894e213f913564a0e0e62e24ae37a4578bc420ac25 SHA512 78e86b0c1d2a56dddc8d9ac97ee325871e319ad2226f1fbd5a048d792cd05e5d8162d282c1f767086da5329cd1ee67b37fbb5a2fd3c950f84e9efab11abcf754 WHIRLPOOL 127e381b100076b9c343603d4ea76cd98264643db2f3240da4a3005a3514365ff0d15f1994e99c2b06c133640f04cc68f9fdb17e7f814a3520cb9b5591a0f8a6
 EBUILD libatasmart-0.19-r1.ebuild 947 SHA256 e4d58848c79c9d719d5a35df4465bd5f4873d7aa76eeb431d950fd5912e80f85 SHA512 9f01383cfd7db79cfa99d76f9a8b8c6fd2eb91d329c1b99ef32103c107fe731286b6103fa4748e304787ef16ff41e10d16db2b29788966b1854a19e7f6e478b0 WHIRLPOOL 14b4ad1a64d2c7366e9dc80e9984744e1c321ce43c646878543f9a4d6110b8bae3535426fb9314737712097c7ad606139ebd2885bf9ceefc46c31f994f870937
-EBUILD libatasmart-0.19-r2.ebuild 965 SHA256 c8dd594172ace7f91c704aa9ac8405f814f26c6a4591f2f5cab09de2fa61da6d SHA512 8bf4826075ee4e72c5409fa28215c8dab835648e63380b771288e371ba067fa3ca3ab0ee39498f10f3a2595c31d65ca67c36afb4e87faed3467733330ddb6c5b WHIRLPOOL 1c6ec71a69df927923d37a7231c4b25aa2b7ffc7a00eebf14df9bebf3fbd225686d210b77eebc8dd3b656955ea044394e6c6a0950fbce3de324f5abb6f8fb6ab
+EBUILD libatasmart-0.19-r2.ebuild 964 SHA256 2e3853737d1061a28b5b28ab465a5fb948f4ef1168f2d2de38a0aeee99eadb05 SHA512 eea299617d04f5e23b500e66ac76ac312350d32eadf796c1beeb6485fe17fd6bee3664d7c652ae9bf7d2884583afbba1fa23865a9396d02744f3dd947687d0dc WHIRLPOOL 3e5fb10adbe56b7604446f3a07141eedd8f3f66692b6e939cbe8a823a458f4d7823ae527e4b727f48caa488d1e4c43cc830e491de501b06a8d9b068026a6af02
 MISC ChangeLog 3267 SHA256 4ec50624502888be40b259e36c00bf3cb6e38727bb86d40c4e21eca4f5bae34e SHA512 2dae7f524871fe7a52abec8bcccb9c85df9f9d04ca7330c0f54f1256a118f9a57751612dcb864e8f6ad61d7bdb18c394bd14fdd0222fdaca3a31e988c6341863 WHIRLPOOL ea90a355df96ff1f493ee92bb8ffa7f0e8994560ff5f46dfcd0db89f37d200a4d3240fa62e28763e92f97d680d41629de613ccafd0909f22c1be26cbcf8fd10e
 MISC ChangeLog-2015 6106 SHA256 338faee31bf33c444c9a0d7f1d6555bf444d408d07942857a2c025e521c5ed86 SHA512 f397e11b91b81010bba91d88f5bb1b5bb00ae9ba28078e0d28400810ed6eea67ddcaa704b5b24db606bc79fdf6dd2489972a55fd8f8ff28d0c9eca86751e8ba0 WHIRLPOOL 748a7eabc16539660d7da2e49ef33cdf9ca3dc9f9c5b105a8781847c630daffa3c1776115f5785f72192d4f4b885dd0c7064f357791014558d035bd24e3da550
 MISC metadata.xml 232 SHA256 6f828dfe6278daec9b0b3a9eeb589d072d79dba873dca6a50422e554c2f3582c SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4 WHIRLPOOL 95b029eb4fea616dbf4f41cb372a67a13b7f5d67d9dad52bc27b4597bd1cf73b00fa34ddd8637495337a469162e3086075e8e69734a2147eb89d940fe048159a
diff --git a/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild b/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild
index 49c61709c625..46c17c3288b7 100644
--- a/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild
+++ b/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://0pointer.de/public/${P}.tar.xz
 
 LICENSE="LGPL-2.1"
 SLOT="0/4"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND="virtual/libudev:="
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index f4cbb341284c..b44c6ebf7131 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -3,7 +3,7 @@ AUX libdbusmenu-16.04.0-configure-fix.patch 1268 SHA256 e6e1dd702dbd97e2cc4c9015
 DIST libdbusmenu-12.10.2.tar.gz 735730 SHA256 9d6ad4a0b918b342ad2ee9230cce8a095eb601cb0cee6ddc1122d0481f9d04c9 SHA512 cf2e50dc3adbf35d0a4ccdd62a3efd9fae2d079b8d06e6522b70f077f89ac2cf72188e380f476e38d184b69549e90b801bf1e32174fa94bbe612dd52aec94496 WHIRLPOOL 3e75fd0bcbadcff8f4e4cd3a2be33a3aa7cf715413b1a67c5430b9420a965d64db2d988fa5c21fc42c6458ad4ed479c400b28b8a94074cb7223ab0a03ad985eb
 DIST libdbusmenu-16.04.0.tar.gz 760376 SHA256 b9cc4a2acd74509435892823607d966d424bd9ad5d0b00938f27240a1bfa878a SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241 WHIRLPOOL 0242614bf02ad9028e0a9c697dd7bf5ad35665b6fd73eaad9669345f8800e841cacb7912ffeb9ee38b7b3568b6d8141a42e4aee2f292e5df2b9a9cab77d869e4
 EBUILD libdbusmenu-12.10.2-r2.ebuild 3455 SHA256 73400e32c2fff281a21df9927e3c354481304b1ddee6c4898a01e260428c86b7 SHA512 a2a38070422f02554b039213ee071f49d8b62578273e9adc87edc643c3550ebdbd67f161544785edec94ae48439f7ee720d11c537cc34aec6a56731c493f925f WHIRLPOOL 324c227978b2b69675737516c298221498436ab72464a22d8705c526c0419be1404bf705119adea8f168cd9ecaa50a2c1c2ce4a86afa32c144cfc2312490c227
-EBUILD libdbusmenu-16.04.0.ebuild 3977 SHA256 2689a6fa4c2df18def77c4664bc187e78ff96f95761968da1cad23b737e8aa00 SHA512 ee207f9dc1deac80441ee2195bb232447ec233a43066383eb00642c4075ef8236663e48eb9f13dbe8c5d22b396e3fef20acfeb6a6df4e0d48d4479e413f9525c WHIRLPOOL 5778823cb2f74301d11ac199e09c1c05be4fa88885eb68075d4663e5350893c1c7be82e8b30a8c4e4aaa64039b3de8c11da6feed12465abfe39603b1b35863ff
+EBUILD libdbusmenu-16.04.0.ebuild 3982 SHA256 3f28a0d48a16e00269876500b8ed0ae203ae314579ae3e1d08a1695a82465ffb SHA512 2813a7f60fb306d68a0e6c387f7cd35f8d0d4ed3accdfd0699ab42f0447eee25d63a0146d9c3f33ad802ceb58f1aab899b49c75c044f153a4751337c7279e130 WHIRLPOOL 713c5984f4249346967a8fe04b6864e759d5d5745b939bc9ea0f9dc70e387b4f8e436aad22a152c66b794c2e8e1d9336464acb59a7b58a045015cd0fef8dc683
 MISC ChangeLog 5285 SHA256 c943c1f41dd4741550f65c4aa98d5785aa2101ee43a4f07e0e8d3155b1866102 SHA512 f1403a75ef4124fb11696608d9d3b5f5e92b67106353e9fb9709e602ab588b63b7eb71d45d75d076f828195d1456ff014144efd841d297f5e96420531957ef2a WHIRLPOOL 50c3e610284a32fef40493d1d85e8114783e3b2d487c534508ac533a9090b15de1f931504c6928412fc035cd04f9e98da66618465b56f05167d996215085668d
 MISC ChangeLog-2015 7840 SHA256 6892b6ef59be8951515d951d7fd0eb9212ba193f844309736f874d927b6f176c SHA512 fb2ef2a3f3045be746616baf23a15237453288c9b818a5a304ed9d7d3a8a1c44c12cb6681eb1cec0b827069c673106327fb433c061090466e32677907dbaef7a WHIRLPOOL d94dad486232602b48c92c58cba56e41eefb56701a9424a50803ff96dd0a8ca98d81617d53b2d47105371141b53dae4114bd5b7389f1ed378c8389219f851a33
 MISC metadata.xml 491 SHA256 f41253a8dae06c7302ff9cc3e3bf61d7cadaba48d36be37bf695f9c4cd878559 SHA512 9183ab899735954d60ecb8b7ca394a72bc519b291fb2032cf5888711ab0f748bed9bc1cfb657ea6c34224b657df5634ab4d54a5bf89fbb0762d5a23d90425d12 WHIRLPOOL 4979f3ea8ba1dde00287a0a3d0fa6cd500d0e80e1323e7aba2cc091026d6820acea96511c12c35edf8703a623cdbc349cf27200360444a669f60443e8bf30079
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild
index 93b4219e284b..26b51ee32b65 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="debug gtk gtk3 +introspection test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index 2aafe6d1c7ad..fdb601285f3b 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -2,7 +2,7 @@ AUX libgdata-0.17.8-disable-demos.patch 1941 SHA256 d56dfa68769f59a75d6080cad784
 DIST libgdata-0.17.8.tar.xz 1464812 SHA256 e5e735bfac219c6cbe4a14df481cb3cb4b1c4b8b5e70f9a105a884035bc3a161 SHA512 dfc4c825a7053a6fd7659d04c7077bed8539b4cf3ef3da1d5ece4da3ce17941900e960a300a50b284010ed890dcab87e4c4726403f04481c672832fd34b975b0 WHIRLPOOL e0772008cdf0816efe118f69f9bcc86d85de2a26fc2fd5127bcdb942af264536764da130ccb194a01f0bb97ad9bb070eec84c659e9e82b64a4f7eeb6b0602797
 DIST libgdata-0.17.9.tar.xz 1434700 SHA256 85c4f7674c0098ffaf060ae01b6b832cb277b3673d54ace3bdedaad6b127453a SHA512 90289309cbdc4ec6932bf385ddbfcc75c0c2f8b9ca356329298aaa37f6c3db7a16de20e5c947c16c595e43e729a664e4d6d3e2c5a60bb1e463a13d1306f374ce WHIRLPOOL c51322d21ba89d4a96c0a52307d760ff0f399bd5cfd62ee6cf02bc0a81aab1a576471e419aff14ebf9a2b6c330e48c3668133930c46f5614799803436798ad56
 EBUILD libgdata-0.17.8.ebuild 1641 SHA256 0ecd744978ccd17b35fae3ed66c126a11e71c874bda4dd00246035270c38857b SHA512 7bce4dfccc02a77a70f0d1ecd8e1c6d121016004138917fa5505aa2cdc33205e5665c367aee3b3b45ee7524ffe041c8f3a561e8c11e835d213fd01f2a2910b6e WHIRLPOOL 2945cd87f4f50ab733c69767e85382da84a0feb5d53d5586a2c9a84cc6040fe22641fe2f020e6b08cad66817a19d1422b9fd4ca406a440d86ad3fd196bf0599b
-EBUILD libgdata-0.17.9-r1.ebuild 1630 SHA256 20e56c6db3b7ea55dc5389bbe6e68e5d18d4c3608627c0c526c0b51f5078d387 SHA512 151c9510222443a193c18f9d9adff3c46efc107d9ddd564259cc63ebf88600b2d712893806cf56246aa4599fe6215886af8fa70e3a3f5ac3d221aaaacfa7b2a0 WHIRLPOOL 1566f282062687b47c72db5840254e0db82cbd3f70f854d5cc01f1b3c9adb20c5b82340184031481966b4e3ebc056654677998abca5052db44bb0074ca677519
+EBUILD libgdata-0.17.9-r1.ebuild 1629 SHA256 3f81137856b90dad60e8947e0ba25d7e73847b6916d6afcf76ce19dc16f9e2a7 SHA512 7005a415f472d5edcadd8be4a8f102cf21b9a49a150526d5a83e1794e3741a01c93734a10f561fb76f516511177dc9aef10cadfd40834187ac421d8b7b0d09de WHIRLPOOL 8f50221aa89a8211d00e0923d3aa9eab2b55ceeac8390b9e00b50af6517a8bdc024330b62becff848e655c3cdcd8fb6fe6b7490a587dcc71a6c1ae285b7ac96d
 MISC ChangeLog 6895 SHA256 778fb184231d2ecab1532a88e9c9d9b9652d8e9cae9b400be567edd3369a4173 SHA512 3baf1efb566ebf71a5a1b59cba6cb43e14ba7920ddbf0d2ed14d2fdaa41c4f5bd55d2a631ff6af58eb7baa5ca53f339a5305113e68df223bdac45855eeddde33 WHIRLPOOL c9619c36c23db0692fb74aeac16ddc2134d795bf021c20ab765153ecd873f22a42e46df58939f99d0fd6490835a45478d965c074b2498c357000623cb8be9f1d
 MISC ChangeLog-2015 12842 SHA256 78a30c9505dc15d06e55760e7285217b9e241fce5cc8a3ab3a19fcd5be4de15c SHA512 0c3b5e452665e5cfae6ea4da261f9d96daaa83c1f4d7130ae6c5b7ff6071e2663cb621c069b07b3ad172c634175ff82cf0f961c7b561ab1ae55aacd6a98c0539 WHIRLPOOL bb93e7091b979f126460abac19bd7ea9bff5bf43b5d427ce4ff954062a1b1d97725fbbc34830ab297f24b9a8cbf228c287b05348e1eb400019f3add89091af56
 MISC metadata.xml 362 SHA256 7d2cbce8c67ff66ad8b135744cba4ff776abb71c6e567e9df2113b92e125272a SHA512 00513b8910b0cf0f0c42b1723c8e22a93c95a702ba3ba9f139ba8e2a25a6c408f1e8f97302ee300189ea534717b1f7d21a909cab0ebf6ba8d6cd19d38df2f30d WHIRLPOOL 176a79a7b6dda1ba23ec3c7665fdf48a88a457f743d5892057f8e03d9a3f54025fdc60b02e45182fdf1c548d42af16da3bfaac35d1b3eb31903cd63b697139fe
diff --git a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
index 11e9b54b1f4c..324857b48837 100644
--- a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	vala? ( introspection )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index 92edeeaae930..409f177b23fc 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -2,7 +2,7 @@ DIST libgee-0.18.1.tar.xz 677908 SHA256 99686bbe5a9c89ba9502c25f61314ee8efa0dd2a
 DIST libgee-0.20.0.tar.xz 678972 SHA256 21308ba3ed77646dda2e724c0e8d5a2f8d101fb05e078975a532d7887223c2bb SHA512 c01611ed34862888fa038111010ec9899465f43423c9c90a18050dc0b0c2a53cf0fe3c7affcbdee91e225622ccbfa08bfd0c08f0eb7935611b3d461b5b919e66 WHIRLPOOL eed68ca240309dc06576dfc03185d74087c6437eb1a2bf6ed291a2448bd3e4b997ccd111796bb05a057748ede3c22880917bba758612690ec6d823001865dfb0
 DIST libgee-0.6.8.tar.xz 443060 SHA256 a61f8d796173d41f6144a030d4bd22461f0bb3fa18a3ebe02341b315feebf5d3 SHA512 b26d36ee9fc0c5c214521ad97bc20f11f1191a3dab72a5f1af2f6435f51ff2f28e81ccb26fac399939c1a7eaad519db98032d3bc593a4052463acd91bb12902a WHIRLPOOL 4c96a3e1dc1c34ca6b23b5b34fae7420ff9215ad07618a9b818d70b12697cac430cee95ab7bd175b4f96fbae99fcd4e1fca8da7f55064962b2cb61c641d22bb2
 EBUILD libgee-0.18.1.ebuild 680 SHA256 e7ea2440807700948b56141be244d8a51a880adbef98664976f3d15dba83a4c4 SHA512 2a7637bc3e7ab859851389a220e3fe1f632772999924ab7e5bab9ae5e1793afc5400f9696c5301c134dc17f70f6702f5ffa1d5f9cfab293d1d152acd687e66f2 WHIRLPOOL ce93fd52b006572524449305f60008eff3322bdba6e5b5130cc782dcc4fffbb7361ae28ca23f8136d6e911021d998a5286c1b2cf01b98204df9f828e47fd91a6
-EBUILD libgee-0.20.0.ebuild 688 SHA256 a7db34b4925d1f537944f15477742aa1bc5ebd2ece6a7cdf17b7d9f1816cc35d SHA512 24768b2f02be8d689c3cbd9a456779d20365b342ee174aa6b247691f39837f9d6035f522fb38fa816f0399b9a2295f742a4b43e85a2b870bd39276fe59ce8d08 WHIRLPOOL 7cec35f2f4544098241c92af28e7a149475dbfba05376c3d57a483b312581024b88717f9572044155f455e9def157df1bd739984c2d3085913fcf3f55e3d3277
+EBUILD libgee-0.20.0.ebuild 686 SHA256 a0d29c4463515c30d1123a695ad7c37d087f392b6519e95087780aa8fb20ff45 SHA512 db462178b88cda6f87c57d044312c0b223089c2cd52dfd4c48f46f686bca4cf1aab6741e94d609298f7888587bb119484da75c1edc69e2992eab16f0229954f3 WHIRLPOOL 0b111d91882ac3964f078be740a4a578b71a78650719ac66c5f0f0bd841894500eb7a2f08460675f2f853174250c34c65cf195b8470561446afc75d7ece09f50
 EBUILD libgee-0.6.8.ebuild 659 SHA256 0ec2eb10b245b5fb716a1e83bfe60ea3cf20756c9e29ff4c01fef43e12a1515b SHA512 be5bb339f217170fa8725f2e02a7c222b023cc3dda19b86bdd67806adf9e6c8197dda762112a702ec72b6d9da5fed335dbc2f32a5bd92dca46fa55379089d79e WHIRLPOOL aa4db9458947e65ef39e68f256498ab7ac852ea37b6863c94c67b54503f2b932a2a33f6064721eccafeb7296162388f9282ac0649dcb0677c4c9adce31b794db
 MISC ChangeLog 3650 SHA256 7ecf749f17a580fa005685a16a55b2bd3e03d8dab3ba1849a358ef338148fe95 SHA512 50b55874e39160b7baab3f6722f751a9328043fb0fe438d1bf95bbae25b1e027e836c5e5d785bea236dc00bb061863f5a316aa9744e27b80b56d804b964031ef WHIRLPOOL d8a2664bea00290b5d630b7bf8c9387b4961c871151f571ebe310570e321a58ba264db82aea520e18c9106bbd40ae265856a12a7e00d71b96431ce6362a5ddd7
 MISC ChangeLog-2015 15415 SHA256 e2f546fe8736777c2f62e2dc614d545b622ccca0714296b8d00ecc20cb957df7 SHA512 0397de9d3cc529605d28b735d076c829fb3beb560d9c8a1c318d95d39bae9f7d062e8760032f302ba08ecfcd8ba11de7b10d38fd17ded3af99a4f59161237f82 WHIRLPOOL c5137115a7e12959834a40a34954e9ef1226c0d70be08dee9345fe551377a815bf40cadc38cbd09094fe08e1bf3c33e60edd5560fd8ea96e3e3496a5e45ff29f
diff --git a/dev-libs/libgee/libgee-0.20.0.ebuild b/dev-libs/libgee/libgee-0.20.0.ebuild
index 72dcbb1104a9..e7e73284ce3c 100644
--- a/dev-libs/libgee/libgee-0.20.0.ebuild
+++ b/dev-libs/libgee/libgee-0.20.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.8/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-linux"
 IUSE="+introspection"
 
 # FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 6ec39d897f80..11a032ca6e0b 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -3,7 +3,7 @@ DIST libgudev-231.tar.xz 270088 SHA256 3b1ef99d4a8984c35044103d8ddfc3cc52c80035c
 DIST libgudev-232.tar.xz 270904 SHA256 ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860 SHA512 f648a41e2a6af7e26634c7cc259fdc47bb6e6ffb329324d157f340e42928e28c2059a0e923b9b0aaecd1ee3ecafbc7b55e5652f1f77bc1b88367b97057a1bedc WHIRLPOOL 73acd3c3597ffe265ebb2e3f9e650c04187c72ee632f661d236f17c04b2ccfb9ef94f1c0c0b926f4fa40b64d355fd245d7470c1a2d9dfe9c209940cd5c272308
 EBUILD libgudev-230-r1.ebuild 981 SHA256 bc7eeafcd322acc4205f6f24a560996404d26cdfcb8303d914986b09400f77cc SHA512 21e41267b5eebd63d9d7417634129988ae780ad8f7563de68466b18841699201b471d92b6566d1bbbd460455214bfc42d7156cd80601af6142585ec963e0985d WHIRLPOOL c00a4271ef45866540bb6cfebca011ba459dbc5f24bd80d64be4b2c48cdce9486f087f3979f17abd8f51193c19177f093f9928ded9b2fc6f3facdc0d05df54ce
 EBUILD libgudev-231.ebuild 1091 SHA256 c78a5d04c80bec58f34cee5e9161fbd80a79438f1d502a3d72d78f460f958eaf SHA512 ee901c98f33607ed81cd0343fddac24e260eccf941d05d478b1f7ae99105d7932f2fdd008feb1cca935c157a675abaa5ce2c2f1a7312f02797ae34d254885e74 WHIRLPOOL b3991c796f7c0239d7ea1c6e11cb0607ae0b55279222f4f8ab6fdc8908d0770c6de8e7bcaeca1f2b04cbf7931de1568d080a1d9f31df2f69729632eb11b122f7
-EBUILD libgudev-232.ebuild 1098 SHA256 53f3982fbb2a3a384bf529744201d608daab31eccbd1ded525156165478e59ed SHA512 0615cb78d860a0f23826c42f3d62c470507eb7f6109c2c0d9fd078c0ed55bdfd7d6e9d177535dbf47542bc13e44d313673ce3d47df1009a5e1ca97bd56c1774d WHIRLPOOL fe25ce74954842a189f41a145accb4b3159b381443aeeb582d6982775bad2433d685757aef93447d0f25c01bcf4b1ad046ff5603641836c663b45c3f46485a96
+EBUILD libgudev-232.ebuild 1095 SHA256 fa4bc6be382c999fb36277d800e7f97027a0efbdf1aac6387e102dd558755500 SHA512 db81959773953ff684a986910f67e85fd7e3042c5be690660fcf2730b81365d8a5637e95596a5d8debdabe07dd3046999faacb9ff3ad10febdb4556db42ec92c WHIRLPOOL b393ac1e45be2ce33954a02916255aeec241be1decddb088ff72a8827815b84a3d4ac2d4256bf1a700b1131363ee61d38540cf955dc9d3aefdc75c89a34dfecc
 MISC ChangeLog 5280 SHA256 6affc6fc955d3e616df90aa3c55e8c5d6a6da8cb5765922e1a621e4a40e097eb SHA512 902ba670bb843b88af78276129882319f82ec54e3fb942549ca07029a6eee0530d5863e558bba701c461cfb1f602a330fcf8c2a0a6a5a8c50205558bbdb57ec5 WHIRLPOOL 8ebf5e7259b14f4dcc945955bdde499d1c66c6cc3374aa529b00cad818464d11fa864cc20e042c6a2c0c2a972aac971b202eeaffa5363ddd94fdcf08d9c28990
 MISC ChangeLog-2015 1583 SHA256 d0dff8d937023d484a662b6f506967444acb670c66624e4d292356fa32cc7e18 SHA512 28b8344cdd7b64503dbbe30d3ce9c63225abd7e95a59a754c179d808de2cc8312dd58c9da0a83f5da6a806c37a077d36b2c4213a524643f0ddf6c636971a7414 WHIRLPOOL f4890968f3746f62a9a22d020fe69d9d3584a3b01c646078fba9049b4ea56ea2fb1e6e5c34893902df1ffd0aa569b5f3fbda22fb6d139ea9fd33813db369c259
 MISC metadata.xml 361 SHA256 5d91253b3f13a4d3d441c1fdeca59f0cf3ab7c6bbadcb40f626d581661591831 SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f WHIRLPOOL 17be7229329754c5c6b4a365497bc42f370ae8a710fa331b2e214adcc120c4f6e32b0912864176121bbbffd46ecd667289d01fae032486c836f9ca39cd5e5067
diff --git a/dev-libs/libgudev/libgudev-232.ebuild b/dev-libs/libgudev/libgudev-232.ebuild
index 56f85ac224e6..852226499524 100644
--- a/dev-libs/libgudev/libgudev-232.ebuild
+++ b/dev-libs/libgudev/libgudev-232.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
 
 LICENSE="LGPL-2.1"
 SLOT="0/0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="introspection static-libs"
 
 COMMON_DEPEND="
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 6a5264c1fab5..2bb4c0d7ac6f 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -2,7 +2,7 @@ DIST libgusb-0.2.11.tar.xz 291992 SHA256 9cb143493fab1dc3d0d0fdba2114b1d8ec8c5b6
 DIST libgusb-0.2.7.tar.xz 275492 SHA256 0be9578f7875cecb6c163ad47eb39bc6bf497e501b08986c0d384748a054c3ee SHA512 9210ddc95458c452fa32c8e11849c6f44e24680485aafe93887a52266c8253e495e5f0584f25e3e67051bb00247d6b658cd2ff3f6a4da167a113974d8fefd5ac WHIRLPOOL 7ce8652167f3bf553d33d2b2504e1b1a8fdbdd0844b9fa8f2b54ad5d91b0db505cdedb3d1b6827212bde36bea39c28160f51f0253c921db4f33dae1e9368c07d
 DIST libgusb-0.2.8.tar.xz 289744 SHA256 a9c269ef21145b228e59fdcb533ef9c4ae214a6f4748d17ecd2e022f79389eed SHA512 83dce9704276f5edbe893b417a569bd62f2d14d8de1730d6e7e48c72170593c471c8354b813668d0736e31ecf48d2efe76a81c5dc485c1fa6ba62c5f8ceff3b4 WHIRLPOOL 878d07f37f79ef59506e76fa995b58b9e00fe75ae9424b86ea47bd5fb6c14868bc95e85e0744ff4d3c6a2f4aecdbf86f6c584c40c8febddd1c754cbc8386f261
 DIST libgusb-0.2.9.tar.xz 290972 SHA256 7320bdcd0ab1750d314fa86f48bd2cc186b9e33332314403779af9772fedde14 SHA512 30e469e6c9561339a002089f732b3a60c02e285c0a166416a833c4c2475028a41c2339fcbc5ef1524b4be6fa09931e177067fa12231a145f1f05a324e343da9d WHIRLPOOL 0e54c0249b957fe56be6746a9e5e3f10c071be2bac08ae4408e112a7c3eb6c7e22c2936737bae500984818b023e526edb24def660a97601b39790203cf74e984
-EBUILD libgusb-0.2.11.ebuild 1281 SHA256 ca4a17c96465d045e15ade23281b1c3d3b4a40d41b9a1d32e6f67ea0c6e00719 SHA512 0d9b71081531f5232cb863d865d68915cceb74a2cbd85ab19c55a23bd0aed3ed59f3c1582f8b3351e13ad559144e8c56ccd4d4ce824cffeb0a0de2c235aa9e02 WHIRLPOOL d78200ba8aad436dce1b6bdfb2ca96db2de348f439147c13a14a9f65936ea3f90f1bf804ef6e1741fd05695fad0820872caa64a5137a0a6e4d13f32edc5bbb47
+EBUILD libgusb-0.2.11.ebuild 1280 SHA256 3deaf027113529529cf044e15b7a2e33402145e7037456c9ada9ea7b70968cb0 SHA512 bfbdf9c38e8b9b0b64701228003c83aada85b78deb1a0478d8a912f8ab915c4caf7668181a1eb8cddfe1b2806a7cddb91822ce7d7aa729aa670e3ac68edb38cf WHIRLPOOL 7b980114cb5374e0327cd12b06b0ba20c627d558480ce3cc92537d77e431c806e1e6a38020cb5ed9111232b79e2b997e37a5dee3ad37c841b1a3402c7a799fe1
 EBUILD libgusb-0.2.7.ebuild 1292 SHA256 f75b78e2106b041fd387330b065a4306e71940428694b0eab90a4c7398ef624b SHA512 bd0137fb2ecab3a68e4e3e2f377a84dbcfb7a31f5620dc974f5a955a9174675d631480490ba879f52706e2a718f0bc68cd3b8c6609794e0744e122e72bd622a1 WHIRLPOOL e0698b0081e0b7438af1023445fbbaa5c757214bd66fb8a1e70bbf5200e37599ec2f71f5a0b97c7e13a06d5321960fcbf461af3fbbfb8362413fce3b4e49cbbf
 EBUILD libgusb-0.2.8.ebuild 1293 SHA256 33577902234ab1b3871d4d3722a4cc5695d98abeedaf6867fb9958fdab285df1 SHA512 c58eef9d2e68eb5e62f0af836737c9cece9c616a8db09be6f73b555f53a257dd450f28885bb0fb4d0bac45206bcf9ec2ce291c727d77e806b76ff362330396cf WHIRLPOOL 5da6226b0f1b89357865d81caa14098b6b08e0f707ddf6207a515ab87debfcf4fb292cbf1699912843c27511916a61099814a241af04649913d86f243c50acdb
 EBUILD libgusb-0.2.9.ebuild 1277 SHA256 a3ef5de47636badcff6eb9e092a2fa4485e013b19f3a52d3aa80e0e3312efe62 SHA512 9bec001d7bc748029561eaf0a5f90f7cb6f0b5f6ad5b141807f87baf3b623ac8499776f0b8ee97c5c1ca136dbf914334331f12bd82873487179be07cbf73d269 WHIRLPOOL 1b5d1323b2e092b0d90fb057915035248c421e8ce8b60be563a54662823aa6b8974ff6349d57951bec045e0fd0cbf0bfafe134c08d3b4ae5cdd1d9ba106747ad
diff --git a/dev-libs/libgusb/libgusb-0.2.11.ebuild b/dev-libs/libgusb/libgusb-0.2.11.ebuild
index aca94f3692bc..f18a4f583e1c 100644
--- a/dev-libs/libgusb/libgusb-0.2.11.ebuild
+++ b/dev-libs/libgusb/libgusb-0.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="+introspection static-libs vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 8e943f839e10..9e7309b78344 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,15 +1,13 @@
 DIST libinput-1.6.2.tar.xz 929180 SHA256 96fc0e0b24a96042b16e561201979dfa4a3f00a642538195c62f72b79f4084fa SHA512 f1e1436ec4259ebddf93a50fe4d39a52713efd246a39a072b44bf296a413bdadbb789d6a4f0107ed3eb37afe34a37a43c9e75dcf814462385011eff2d3f42db7 WHIRLPOOL e9ed43ab8efb5b984a8c431e82880a691f7c94577a7a3789cf1e52c82f8aeee70d56474895a349f286f4d7fc845be8302ca7432b8e4801a6233fbe96b0078db3
-DIST libinput-1.7.2.tar.xz 923720 SHA256 0b1e5a6c106ccc609ccececd9e33e6b27c8b01fc7457ddb4c1dd266e780d6bc2 SHA512 cdbd2994e954aac9538fe907c275e6e23e2bed0e9c4c65f19591bdcdbf5074131c72b92e87de87c03f75a991fcdb7f568b491a12f00031c4eba11082ca44d69f WHIRLPOOL 869623f2ef8da44627f28552f86583a6e6927f4966489f1c59d4b7c5061983d58744be5ea162a97e07e4a79495f56a728faaa273f8d45a8a2ee242819769aae8
 DIST libinput-1.7.3.tar.xz 922464 SHA256 096d612d2711f0caa2de544976ff3729e6233511ab373808644cc2dd5affcb1d SHA512 2262dc56d213a4d3ea765e870af200e2c336a166baa1bbdf5205e3ce70faefc777429ba09563c5dd79feb5442f53abc84e04a0f32a06bb622d6e120bb8ad152b WHIRLPOOL 06ea9038f7b3127b3238fc863b1ec862647a08b1ab4956fcfd433093dc3c68585ba3b166515370681ed158a48ce6a5670c6b8dcb6d536af25f8bda2c84c74286
-DIST libinput-1.8.2.tar.xz 939664 SHA256 013518ee0adb2287e6e1f08412efba2137320738cadb5399b783738f04cbab38 SHA512 555a7680cc8aaf62c5370a865f3aff0a933d42d94a3d8861c072666b02c9e1be45ea39de9a749a9575cdfb613b6150e412e18559d94d4919f21ca4680a3c76a7 WHIRLPOOL c897c788fe29085f2f8f79f0441f4543d4cfa2f5c4af2357539c9ef49662d7eed2e46fa904bc3291a559a5effd091584da71a6e05ab5c11cb03970a27afd7366
 DIST libinput-1.8.3.tar.xz 941832 SHA256 2fe2e2f52f0971a9c43541b8f26582ca8df6ed4bb9050e85eb40d4ff6b13142d SHA512 88006d217e3507858fa6b9ac1f25c267255fb51d1bcf1208d2afd423bf2a9292944bc5526ea91f27fad3ff04c2f9f43ab3aa25fd9fb7ace1231ecd33ddf18de6 WHIRLPOOL ebe128f8e9bce71dc7e878cd7dd7815cb0a358f91945ea47945568a1994f1a80c2d6f8db7d5f8f9c5e554c22fcc13733ca4bdcb68b47a72e16e55098904a93e2
 DIST libinput-1.9.0.tar.xz 455248 SHA256 fd717b1f9cf867b2ca1763a5a4638423af178f3a70aa34d278e8bf42777d108e SHA512 4111dd02ef7778c246da28ead284a77014f6eaa4b7f90f36ee124af809e31c70ac065216ef5648d1d2dc525355176e2aa22788bfbb19f5f6d25276fbba42e150 WHIRLPOOL 7a6da661226ef8721bbad446a75be75a3d556d9e886cf44d2296a0fe17207ac181ebd4a4f25dca7ae4072d97cb9759d626d26a1572f007c6b1e9499a0d71beaf
+DIST libinput-1.9.1.tar.xz 456772 SHA256 f0780de4211b3d09f86c17f619f936261a213ca532f8c9ec8f8e7e43422a65f8 SHA512 e60c401cdec6b862c6c7186e636bba285e229b82998d9f86940659806bb64c295ec1060b5e8065345668e4b3ff95457bd01327351520d9f6cf8cbc98b9b95da0 WHIRLPOOL 3a2b679d5d0f1671281fd689a842ccca1f1750f5af6d004d767364daaf17edc7dd8ec17413f1c05c28d162d03036a2719ac2db02bd253f051a9f82c6a667698d
 EBUILD libinput-1.6.2.ebuild 1535 SHA256 9339885a8bce38fed69defce769b1f337a36be302f37d88881ff0b0ab512b13c SHA512 00505995c95da87e936d1473548efb1d52fd1a593e659aec308e38f937fa391a3a092f2b7e2c1c564e9be9ce506cc021f1c3f590bc5bc39623dabd1e6758187c WHIRLPOOL 4af465c12c12727dba2168f9f2544fe38d9787ad2b343c86eb5734d7e96913dbb8cb485cfbbbaa8f30e02108a32ee813475f45180b74b60fd610b38b8b4d77f6
-EBUILD libinput-1.7.2.ebuild 1536 SHA256 337794ed1591e62bfdc55114724cfb80eea11c7c95086ae290241b1f58a7bf7f SHA512 c5bebcd1026c988bd5b517b76351c0a1326f5e60754a53d25aa73f3c2b7c034623336b0861d8e62254808649fae94bede58a2afd8df415b11327c31bac5e0621 WHIRLPOOL 6259933edd90fb2d2d33d1e1d236958fa85f24588ec29469462db2f4567022bfc8ccce8515660ce3b1cde35e4664e9a17e3778e9a33b27fbd727352d73cdad56
-EBUILD libinput-1.7.3.ebuild 1537 SHA256 a1b13468a7fe62182185628b17e79a4fdb107452d199f356b43f911dc40bb3d0 SHA512 43292245e9e49c706b2565949c696dff71674646fb34d2afa877dc60c29c656d4b749c07cb4a67345a11aa500b27a650574aa6d918466f5f2dacee017fb49a5e WHIRLPOOL 8f7dd2ad95013b5d881d143d3587efe7c95d887c97e9993dd1ebc871d6555a9633006948b4e7467861a6cfe1ac8009bebd6783c9119e42751f99f16745f31f58
-EBUILD libinput-1.8.2.ebuild 1544 SHA256 8b0355468b5985e8b13f94ac0bf2e7812d70e2ec5f4fa696a6424ee37649bc2b SHA512 a0a3a0aaab446d72eda57a04d8af10d5d35f54f4c47e6ee5f9c209fac3682d3d83392ef546255026b5ce774d76d33d06bf940c55da4ade4fe33ae10e9dc0968a WHIRLPOOL f8cec31887f88d7e5c0fdb67a872eb05a2885a6f284aa5143408c77347aac9d49574d622a7cfa6c93bb2020caf0d52c170cd393044d525be62c1a0937924ec42
+EBUILD libinput-1.7.3.ebuild 1536 SHA256 337794ed1591e62bfdc55114724cfb80eea11c7c95086ae290241b1f58a7bf7f SHA512 c5bebcd1026c988bd5b517b76351c0a1326f5e60754a53d25aa73f3c2b7c034623336b0861d8e62254808649fae94bede58a2afd8df415b11327c31bac5e0621 WHIRLPOOL 6259933edd90fb2d2d33d1e1d236958fa85f24588ec29469462db2f4567022bfc8ccce8515660ce3b1cde35e4664e9a17e3778e9a33b27fbd727352d73cdad56
 EBUILD libinput-1.8.3.ebuild 1544 SHA256 8b0355468b5985e8b13f94ac0bf2e7812d70e2ec5f4fa696a6424ee37649bc2b SHA512 a0a3a0aaab446d72eda57a04d8af10d5d35f54f4c47e6ee5f9c209fac3682d3d83392ef546255026b5ce774d76d33d06bf940c55da4ade4fe33ae10e9dc0968a WHIRLPOOL f8cec31887f88d7e5c0fdb67a872eb05a2885a6f284aa5143408c77347aac9d49574d622a7cfa6c93bb2020caf0d52c170cd393044d525be62c1a0937924ec42
 EBUILD libinput-1.9.0.ebuild 1444 SHA256 76962de08b8ffb60dcb7db8191721b4a56ff43bb48c7539692997982b3fb58e0 SHA512 93f60d74e38dbaa5e075348c7ed7174a61c1461af11d29ce63c82c6bb67a2cb65be454d9a843ffed3f9adbb4c231cad13b312a4ec5bb9e24131885b7db732e6d WHIRLPOOL e88296dcdb2e2bce743815258e91c9bddb0b0e9199515c2cf287af94454bf175d6fd290346c2952c8eeee68885bf4e4cb3ad7bf404e7ac423e24679be04c3531
+EBUILD libinput-1.9.1.ebuild 1444 SHA256 76962de08b8ffb60dcb7db8191721b4a56ff43bb48c7539692997982b3fb58e0 SHA512 93f60d74e38dbaa5e075348c7ed7174a61c1461af11d29ce63c82c6bb67a2cb65be454d9a843ffed3f9adbb4c231cad13b312a4ec5bb9e24131885b7db732e6d WHIRLPOOL e88296dcdb2e2bce743815258e91c9bddb0b0e9199515c2cf287af94454bf175d6fd290346c2952c8eeee68885bf4e4cb3ad7bf404e7ac423e24679be04c3531
 MISC ChangeLog 14704 SHA256 90bfde16dec6889083dc8f8a9b741e2ef9333ba05a1f38fa7ae990c257952d23 SHA512 8e45d452518032caa5c130be088e498409c11599298fef9a718368a77cd0b55d08406b0c1b31f36dbb1ddf3030ebe91bbbd91715602f0acc1bf816514388d689 WHIRLPOOL 7838c6e8eef6544342ea963e7abaa2bc4df3c70fe1f4f6daed06274f5456d4e358a80daac308eb0fefd7d33caf92972dcf14c963ec23ae1b5e6063386bae73c0
 MISC ChangeLog-2015 4085 SHA256 3316c764e3b7915215642529f9cf317e25dac5ddd889c1af4ae063fdce21bc76 SHA512 f368002ee0fc4984ef107e3522b24110a6694fd38baa30e353748f20ef71aae09c7c43b0d5837f9c795e2858b1904e63da2737dffa1084e934315e09f1e0583e WHIRLPOOL bdc6c89707548d4336ab365a1afee2bdca7d5689fe5f8b8db4cf252f0cb158aacdc1c9d29de9952302d32f77fc7e6def57cf7de33410e6889509dde51607c553
 MISC metadata.xml 340 SHA256 aec9631d3779808069d2ea623ad89d68d982b1ce2d5b583dbceea573d38edbcb SHA512 04b1dc52c0db95a09aeb061ea0bc579f83ad5971dcdb20cf61bb08ed37bf56999f784db75e6ec2b6cd47e57976c7e0651ffb040b052dd0f5ac8e1a679bee8c09 WHIRLPOOL d7c62ee9f95afc2180efeebd0bc8e40400685721be71516e2f31748abcc6b826a6104ea0cc8611221646b6cdf1e6e41948669a3c43ad362fed3aa82e444c8d60
diff --git a/dev-libs/libinput/libinput-1.7.2.ebuild b/dev-libs/libinput/libinput-1.7.2.ebuild
deleted file mode 100644
index f100733b6afa..000000000000
--- a/dev-libs/libinput/libinput-1.7.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="input_devices_wacom test"
-# Tests require write access to udev rules directory which is a no-no for live system.
-# Other tests are just about logs, exported symbols and autotest of the test library.
-RESTRICT="test"
-
-RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
-	>=dev-libs/libevdev-0.4
-	>=sys-libs/mtdev-1.1
-	virtual/libudev
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-#	test? (
-#		>=dev-libs/check-0.9.10
-#		dev-util/valgrind
-#		sys-libs/libunwind )
-
-src_prepare() {
-	default
-	# Doc handling in kinda strange but everything
-	# is available in the tarball already.
-	sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	# building documentation silently fails with graphviz syntax errors
-	econf \
-		--disable-documentation \
-		--disable-event-gui \
-		$(use_enable input_devices_wacom libwacom) \
-		$(use_enable test tests) \
-		--with-udev-dir="$(get_udevdir)"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc -r doc/html
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/libinput/libinput-1.7.3.ebuild b/dev-libs/libinput/libinput-1.7.3.ebuild
index bc945ad3e268..f100733b6afa 100644
--- a/dev-libs/libinput/libinput-1.7.3.ebuild
+++ b/dev-libs/libinput/libinput-1.7.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="input_devices_wacom test"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libinput/libinput-1.8.2.ebuild b/dev-libs/libinput/libinput-1.9.1.ebuild
index 0c88be02d470..89bf24d7c505 100644
--- a/dev-libs/libinput/libinput-1.8.2.ebuild
+++ b/dev-libs/libinput/libinput-1.9.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit udev
+inherit meson udev
 
 DESCRIPTION="Library to handle input devices in Wayland"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
@@ -10,8 +10,8 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="input_devices_wacom test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
 RESTRICT="test"
@@ -23,33 +23,34 @@ RDEPEND="
 	virtual/libudev
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
 #	test? (
 #		>=dev-libs/check-0.9.10
 #		dev-util/valgrind
 #		sys-libs/libunwind )
 
-src_prepare() {
-	default
-	# Doc handling in kinda strange but everything
-	# is available in the tarball already.
-	sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die
-}
-
 src_configure() {
 	# gui can be built but will not be installed
-	# building documentation silently fails with graphviz syntax errors
-	econf \
-		--disable-debug-gui \
-		--disable-documentation \
-		$(use_enable input_devices_wacom libwacom) \
-		$(use_enable test tests) \
-		--with-udev-dir="$(get_udevdir)"
+	local emesonargs=(
+		-Ddebug-gui=false
+		-Ddocumentation="$(usex doc true false)"
+		-Dlibwacom="$(usex input_devices_wacom true false)"
+		-Dtests="$(usex test true false)"
+		-Dudev-dir="$(get_udevdir)"
+	)
+	meson_src_configure
 }
 
 src_install() {
-	emake install DESTDIR="${D}"
-	dodoc -r doc/html
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/html/.
+	fi
 	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
 }
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index 79b322092bd2..030c449b791b 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,7 +1,7 @@
 DIST libpwquality-1.3.0.tar.bz2 423910 SHA256 74d2ea90e103323c1f2d6a6cc9617cdae6877573eddb31aaf31a40f354cc2d2a SHA512 c3817c7a5ca962b161911b97b413a0db7c34a99ba2cd191435024abdbe060e248c0f88436f24d3992dcb1b00d34b88afb731ef1fd23efc3ad1abe56d4d7d53ea WHIRLPOOL b6451083551a13be259d1a81eb089889d9ee430c30afb2555aa2e5e7c4240febc71b152ce3c210b592a56db8988fc88a827d8e9f368c5aa478d5babf4e316b8c
 DIST libpwquality-1.4.0.tar.bz2 450384 SHA256 1de6ff046cf2172d265a2cb6f8da439d894f3e4e8157b056c515515232fade6b SHA512 b8049f8b71bbfd4d345dbd4c4cffd29e9029b0fca4c95527af54d11a3b06e4708236b630df6c66738368298679c96cb3bf26b1b5d95cb3c5f7e1073cab8a98d9 WHIRLPOOL 07a91601648f2e2404b3cc4f0d81e02e78ee12a012c2efa2843762c87f1d296fb4fe8368a6ff21adca30744eb26ec985a38f2dffa9a4f0fe3d34011e1e3c0d54
 EBUILD libpwquality-1.3.0.ebuild 1971 SHA256 761a4d62588fa180f0159a87bd812f91634bf70fd8f261d3e056a944960c68fd SHA512 c06e54adcfa58128cb98014a3df614955ed00c2939c21a11d56d3dc8e7644e64c10c88876d58397a4c3918690f372f1583120bc75063de733189bdebfba2c137 WHIRLPOOL 201cbbc1c4aa6a3386e35aff23db6351193f513cc8e9121899f0a041c4c8d872a7a522b7197cef1cb436d3fa5d1771623d8b7eb11ffa05b1621ae85ac56a8566
-EBUILD libpwquality-1.4.0.ebuild 1999 SHA256 f912af1973b06c513db25797f0364b3990c19f7bb5f7e822e67bc3d91f0028f6 SHA512 5f00de50f3528a5ed826334d8105ffe59a6944364fca26a71b2e0b314756ef6ee19540f47505a9ca45be6db390345a609b83ca83483b9e6f2fc8fde4cb34eab7 WHIRLPOOL b06f492500c4371410f58cf39b21a262697b9c99f03867c7870f37a66711c74be973e1d7d4d3a478c0c382a0b4bec6a60cdc299b8397519ad684afcf6810b3c3
+EBUILD libpwquality-1.4.0.ebuild 1997 SHA256 85759bb41e05aea29db65d9622058b3dd84c178139998465f4e12b4d43e67d27 SHA512 602684d3ca325d83075e401199cae060589e84e8e78b4ac46d2cf6a7f74ee9d9bdcbe33b5be5b829ec0b52d5702be8a3ba6f4404c1742e01d3977a513486ed98 WHIRLPOOL 524e6600fe260a58ba5b5569e602cf011555241a3efe9cd7171c1c6fcb4e6c899a432cd40be818f5c6766d1c9bdc420381b86967bf625ecb360572459a00920a
 MISC ChangeLog 4723 SHA256 2bda022a2a80e8cd3b5a15d8a86b3cfeeab640dd9d13c0dd346dd51fd148edc8 SHA512 d7e2f0c4b22d51d2e3b80e4128e5d22b66c4001920e0b037320f2b46938635c093c20ffa7fe4f7a46652673ee5225fba281113f78e079a0302bcc6afd7319321 WHIRLPOOL 0a8f25226fbf128f854cb62181947fc343ec75f3e9e441a412523b2d27abc00737951333efb01f8659f38fe2329ac2906aff0498b650e1677dc928490bc94ee6
 MISC ChangeLog-2015 3628 SHA256 9c7c39f5e71e19e1aa493c55b92f262445339731c2b840f342b244b99759862d SHA512 e44ce68f5a0cf02e14ac09b5ac1960446b0eecc84e846fa0f6b45b73f147183588527a2f58d5da1b6300eebab929db1740e35889cc213b28c9f5bedf6b628d86 WHIRLPOOL e8c1a56d0a8882de25903db453ff8d90162a1797b46479ce494b6b97a9c73bba1a692484d4022db4e811f61079b96a5d69369e74ce1cecc01095595711abe538
 MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/dev-libs/libpwquality/libpwquality-1.4.0.ebuild b/dev-libs/libpwquality/libpwquality-1.4.0.ebuild
index 6614ebe88bc4..ff91e223abef 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.0.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="pam python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 0a234ad0cdf8..305c744c2170 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -6,13 +6,15 @@ DIST libressl-2.5.5.tar.gz 3283158 SHA256 e57f5e3d5842a81fe9351b6e817fcaf0a749ca
 DIST libressl-2.6.0.tar.gz 3297288 SHA256 e48d557474571792699000c32ae97dcef34207d13ed93e4126f213d5dcbe8a53 SHA512 e195c6a2c9680cfaaca31bb6d3392fc6f725efd2a2d18b9a24d457d035a581c88630e6a066a4a4e0903e71f3ae3c30a031eb4f58281e483fdf1d877227452e9a WHIRLPOOL b9e481f9ea6c9c35438d093883f2794a3d4a3b4e34beef2df03bf32674cb0b61709381f6810f31fe31f2e4b784c90e1a263e75e5eda2f822ca77969f32a22469
 DIST libressl-2.6.1.tar.gz 3219005 SHA256 c293b3b5f1fc1d6349c019c3905355d577df32734b631d7e656503894e09127e SHA512 89f1a796c14bd479f20407254a0d787b4200b3b633f5c24e23f16751ff973ccbf3167d676ed13a5004614b5c8c3e1c73c89dce3d5b1e81890ef6ef2774df9b72 WHIRLPOOL 8623863d710bba80f5b90802f06e302960a22bc846946b4c5d2581677f59c37cf59a4d1e5fad787b8bd41b2d3d994d60c6065504cdb71a90cf5b299c2081d8cc
 DIST libressl-2.6.2.tar.gz 3229140 SHA256 b029d2492b72a9ba5b5fcd9f3d602c9fd0baa087912f2aaecc28f52f567ec478 SHA512 2896d52185b84edfb23eae73949f5a537966b42e659f00b0b2e0635e69daf546fc41e0e7b97cb52a85e73b2d27ead221a3225977f6b5ee998aefdabf0908a9e4 WHIRLPOOL 780e1b5175a8eed3ee6c5ccb98b77343a004b0dfff614e051a6cbbb315a4cd25e65a6cc99131a4f480368eadf15a7904028f84f5ab60f7f27475124c34ba325a
+DIST libressl-2.6.3.tar.gz 3228661 SHA256 aead6598263171b96970da0d881e616d0813b69b35ebdc5991f87ff2ea7f5c98 SHA512 5c0a0f86ecad1226c2d9a3a8a2e6f412ac0941d402c213ae1d293cd90c6a684198410db8c5250f83b8e2b00968a089afc39e90e053669fc27f82a4eb7c65f5c9 WHIRLPOOL fb62059bdf66259735a3928a93f686c5a2447e7801185388d2056b8095da5aad4150ddbaa5339f6a5dc7b1967ead5518678d2cfc23d67f87c34020968dfacd0b
 EBUILD libressl-2.3.10.ebuild 1286 SHA256 c2b96a336b71b42bf9f226757d1822b03b48e664c4bf7c79f72aad17b23c21df SHA512 76484d1bb29bb2e0bef2e6c536b3083229087ebd7dc23572e747bd130e5a86aa71ea4aabdc1bccb837dc0871f9122c560fc6d7f71f0bcea85ed28030c1599836 WHIRLPOOL da2f3580bbc562e760564ab4ff347d3bc8d3a64430758883ad1358da8676e89d3dbd0b745d59c87874a1031fd52ef32fd234b6b0c3a3f99a9b869939fbfb711a
 EBUILD libressl-2.4.5.ebuild 1286 SHA256 a2710ddfd4122acc0a639d362f2f2698f1e2f9f8af3d7c2688225d97efb326aa SHA512 b623271bfd541eee7eb7dc9931f3bf32f065d6eb812070809a44367b39cf970c388481e5cf7a50395c545bd41052ea87a24e29ed8fe26fc632f460fe2685866c WHIRLPOOL c6afaa6d998826f791343cb461bdd7a8b5a4d1d871d43d741fceb55215d9164d20204521d9d1b5ec16521239243bc565016ef884a6459d1d6600e4e9059f7cc6
 EBUILD libressl-2.5.0.ebuild 1293 SHA256 38fdfe61f3de6c2112832a1caf40658526b7fc50980151d787444d0a3f210e0b SHA512 cf663c2b97f4a3ecd2084861258f382333ca471a84cd767aab5e17c69d42693d946757348ee5b6cccd24ff380d70eb49504a70dec4461afbffb943d8282fc277 WHIRLPOOL 17704602308283a48a51bafc2985f533950703784152f621a877c9410bbd103ab78a580c19e6b0f0fe12a4d40f77fbf95f4016633ab2c4777644b937ae2bf2f4
-EBUILD libressl-2.5.4.ebuild 1306 SHA256 cd517214cd6a7929e41d5d6a1a4dfafb8f9705cacfe25344621b6b6243f0cea1 SHA512 fdc5f6c7c1cd36e3c05aa8036c4d5a8071c17b7580620f47b693a5156414cadee158e077860d0e7b86528038faf45d9454853192f3c255ecb862fe488b9480ed WHIRLPOOL 921f7296a0414d458fc420f5d81ffdb036c7d4b83d340dc39cfa9daa8ae69b4eb3b69afda533aaedcd8e42fb8e7a16e41a4b91a1daf81ab713696ba1f58a193b
+EBUILD libressl-2.5.4.ebuild 1313 SHA256 9b14e0ee466bbdda2c5d2b502cfccd58a30b5a7d35d7ffc9d69f463455454634 SHA512 2f8f2b47af5aa114ecf3ace8552b679c5e5735d0320f0615dc7e4ce7eb3d63b8e3efaaf6379b3e776d363d008370f900f27e38e208e04fbc10ffe516d3ca4ebb WHIRLPOOL c941bce8ee6a3ad64a3d12e57e59e8ee59176710c44a8ed4d0523e800549be6c9157f38b00de6a968390afa159bbedbcfca2e4b8f75a4bd228e5e0119d79ba71
 EBUILD libressl-2.5.5.ebuild 1306 SHA256 cd517214cd6a7929e41d5d6a1a4dfafb8f9705cacfe25344621b6b6243f0cea1 SHA512 fdc5f6c7c1cd36e3c05aa8036c4d5a8071c17b7580620f47b693a5156414cadee158e077860d0e7b86528038faf45d9454853192f3c255ecb862fe488b9480ed WHIRLPOOL 921f7296a0414d458fc420f5d81ffdb036c7d4b83d340dc39cfa9daa8ae69b4eb3b69afda533aaedcd8e42fb8e7a16e41a4b91a1daf81ab713696ba1f58a193b
 EBUILD libressl-2.6.0.ebuild 1302 SHA256 c787b068b05070e84a6536d21ef458119bb746475e0fa511ebe68b32afcbf631 SHA512 3546873fef3a9fb5fc8c5bf4ecf97ee129d270767526a052d4872b624506f3e90b001ade330e4d95e8207e4f4ee4348c2d89e21a4e4948737d103412c4164e5c WHIRLPOOL 6e80f5335955cf4719a42567b5a04c9e923bbaf8d751f5c3a56a2886674eea267017e272367c657499d4ee39e58ef5980a554077af2f494912dc7d8833a8b517
 EBUILD libressl-2.6.1.ebuild 1306 SHA256 d5b29aade2526fd046543ce98192023cc5b0018929f75d9a9eaf5edff9b4bba2 SHA512 68a9d1cafd6961009fb4e702b34cff9ef247c802cf0ee0d7a89f5d72512895edfa5edfca15acedeb22fd6cec234517f3afd84c54b6be06b4adb52985d8a0d6d5 WHIRLPOOL 23d48f878a6221633e137c6694ddb571e3bf1462ee50c489bd002ed051a7428c6880be4122d3a6ceee17f2a75af01a69b2bd25de7d4adc82e3f0a6f9dbac8dd4
 EBUILD libressl-2.6.2.ebuild 1306 SHA256 d5b29aade2526fd046543ce98192023cc5b0018929f75d9a9eaf5edff9b4bba2 SHA512 68a9d1cafd6961009fb4e702b34cff9ef247c802cf0ee0d7a89f5d72512895edfa5edfca15acedeb22fd6cec234517f3afd84c54b6be06b4adb52985d8a0d6d5 WHIRLPOOL 23d48f878a6221633e137c6694ddb571e3bf1462ee50c489bd002ed051a7428c6880be4122d3a6ceee17f2a75af01a69b2bd25de7d4adc82e3f0a6f9dbac8dd4
+EBUILD libressl-2.6.3.ebuild 1377 SHA256 c66c90b6a74e75b6d0e7b2506326938c939dd8effebc677924ce7486f0d2d9dd SHA512 ce509e74001458d7f1b59e4769da2c29d27ff06001ee754f3f8bcd0d0e025dbd27318a72e7e5b610456f627f6706114e6ceed6675109241cbec891763c344c30 WHIRLPOOL 6669b2c49134305694adadd825e74081180f06b620b37db8d6c637a9b3092c9bf1b38090750365fd78a174b2f5b945b68f1aed29a34a870745d84e4a890f155d
 MISC ChangeLog 6269 SHA256 054b8922c785b18cd0daa0a4b6558c0fc7cb1038607ff93025d8325d57b4975a SHA512 4e5e249d7081aa5ce74c0190f6f656196ead36ff3bd1d45bc2717801f691b1d5de456f37a825b59a3f07d3310315fbbdbee1316b099fbd22c17663476eac19f2 WHIRLPOOL ccabaac1a877cba13a4c44df7c6277c3730cff63f5cf256b41e7f7a17210902f9e6ce211d2d7cee709cbfda1703101546db832d5919ef7c123325372400a0ee6
-MISC metadata.xml 986 SHA256 7ae348d550d88fb3adc70de87d9963e378107a62d9b2bee243c2ba209a537724 SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe WHIRLPOOL 204fe8fa33c937c85edaaeed1e995d92489452c93231d1e5fc44b79a620d86c5b79be10245487bad31a35d4bb09458bf7cf3ce55d0b486d092ff7a36abac67de
+MISC metadata.xml 1051 SHA256 92477deb25376da7267b638c5488e99ab8c99da3cc9174dbbfc4698b8cfbde13 SHA512 781e76c37667200d669dcc9057d59a41014916a0e9917595ffe70e5e379a35f86290c547fb63c3f7f8596a3901f602948739874bd1c137e5f9f9b498db4218fe WHIRLPOOL 61c4d264ded6c5d18a0baf16982693da1cc9e61d4769720800f5fc6fceeafac7ab9d105b6f05b3b3416ee07808cc78910b84f4913412b8850ceb0305d10cedbc
diff --git a/dev-libs/libressl/libressl-2.5.4.ebuild b/dev-libs/libressl/libressl-2.5.4.ebuild
index d87e79cad652..c3786d800a14 100644
--- a/dev-libs/libressl/libressl-2.5.4.ebuild
+++ b/dev-libs/libressl/libressl-2.5.4.ebuild
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
 # we'll try to use the max of either.  However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/43"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+asm static-libs"
 
 RDEPEND="!dev-libs/openssl:0"
diff --git a/dev-libs/libressl/libressl-2.6.3.ebuild b/dev-libs/libressl/libressl-2.6.3.ebuild
new file mode 100644
index 000000000000..6372f13faa6a
--- /dev/null
+++ b/dev-libs/libressl/libressl-2.6.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
+# we'll try to use the max of either.  However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/44"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="+asm nc static-libs"
+
+RDEPEND="
+	!dev-libs/openssl:0
+	nc? ( !net-analyzer/openbsd-netcat )"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	# Correct hardcoded paths to use ca-certificates instead of cert.pem
+	find "${S}"/{apps,crypto,tls} -type f -exec \
+		sed -e 's|/cert.pem|/certs/ca-certificates.crt|' -i {} \; || die
+
+	eapply_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_ASM=$(usex asm)
+		-DENABLE_NC=$(usex nc)
+		-DOPENSSLDIR="${EPREFIX}"/etc/ssl
+		-DUSE_SHARED=1
+	)
+
+	cmake-multilib_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# Delete cert.pem
+	rm "${ED}"/etc/ssl/cert.pem || die
+
+	if ! use static-libs ; then
+		find "${D}" -name '*.a' -exec rm -f {} + || die
+	fi
+}
diff --git a/dev-libs/libressl/metadata.xml b/dev-libs/libressl/metadata.xml
index a7201a6f607c..9a56130ae30a 100644
--- a/dev-libs/libressl/metadata.xml
+++ b/dev-libs/libressl/metadata.xml
@@ -11,6 +11,7 @@
 	</longdescription>
 	<use>
 		<flag name="asm">Enables assembly</flag>
+		<flag name="nc">Installs the libtls-based netcat binary</flag>
 	</use>
 	<upstream>
 		<changelog>http://www.libressl.org/releases.html</changelog>
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
new file mode 100644
index 000000000000..be38a724ccc6
--- /dev/null
+++ b/dev-libs/libsass/Manifest
@@ -0,0 +1,4 @@
+DIST libsass-3.4.5.tar.gz 318689 SHA256 fd0cb47479b4eae03154f23e17ab846aa81ba168c9aa5fa493b8fa42d10842c8 SHA512 5e3f56d44d100067d68e338fa97209a78d80c3536d64fdf48d83ec5351f944dbbe50e1050ffc8189b3ae86fd86d7b121229a3866f6e0287abc55af3770ed2bb6 WHIRLPOOL 852c61f4b7f3999a1d9de9e0075a4358e2323054797acbd2dd396b3486fcb655350897c1c65b55a5ec02f24dd62c771648b756911cbbcf48e519775b6afbf736
+EBUILD libsass-3.4.5.ebuild 1098 SHA256 699d4d9db193bc08416a73057f27b312a372873fed94c4acc6b440711c6ea76a SHA512 b3e79bdef665f864fdffc988494a6c2f0d7fc8660bc2193a3ef8f85b7529fa0652a7438ecce32ce1bc040765f9c9747c07c9409aa3c3afe4b7ad475332922596 WHIRLPOOL ca42b16eb351ce244caf7c88deb77c406f26ee6eb5e4cbf91b94d13fac3ca6ff8788a1dfdfe8bd5d793b69be3c602b7cd3c2c97d1026439e95c49f5fa6f3dc00
+EBUILD libsass-9999.ebuild 1098 SHA256 2b5b335ce1781f61411475ed1a58995b540686613675f012f06f55f8b8628bb3 SHA512 48833dfaf5b5c815d7922a93a988a15ea59b5d38d6f6cfb063109b89be479d617df8c8d9ff7394ece9901970c5f569efa59c80a6a3adfe6ecf4baffdcb803b32 WHIRLPOOL 59d89b0be58240166441c70db638113369d2c4375c2e2804e8152048b035994ddf4d39e4e9f6653e2f3537bb2671ef4c0846401a6bc5cf19aee3ea40a35e01d5
+MISC metadata.xml 631 SHA256 dc7ffb9a8fa8d80402db0f9cda1f146dc83bd9f9f72aebbfe441ab3c5d372665 SHA512 b48a370653c205fd753b4a4d23346c58304c78ae9fe2ef4b63316bdeb29d641e5f4e1e2917d96ac05e59be7bef5663713b55ca8ff225bd8fee029da018789ddb WHIRLPOOL 501da53c2dbaa3461fc96f06d8fc285f42f35fd2121e4bbf2f8b1a2fae02916ceed84f0e4b08258681417172e63af6d5834f703b380d74f32e4c075152923db0
diff --git a/dev-libs/libsass/libsass-3.4.5.ebuild b/dev-libs/libsass/libsass-3.4.5.ebuild
new file mode 100644
index 000000000000..a220ac3e1e19
--- /dev/null
+++ b/dev-libs/libsass/libsass-3.4.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils ltprune multilib-minimal
+
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/sass/libsass.git"
+	inherit git-r3
+	KEYWORDS=
+else
+	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+fi
+
+DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
+HOMEPAGE="https://github.com/sass/libsass"
+LICENSE="MIT"
+SLOT="0/0" # libsass soname
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+DOCS=( Readme.md SECURITY.md )
+
+src_prepare() {
+	default
+
+	if [[ ${PV} != *9999 ]]; then
+		[[ -f VERSION ]] || echo "${PV}" > VERSION
+	fi
+	eautoreconf
+
+	# only sane way to deal with various version-related scripts, env variables etc.
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--enable-shared
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc -r "${S}/docs"
+}
diff --git a/dev-libs/libsass/libsass-9999.ebuild b/dev-libs/libsass/libsass-9999.ebuild
new file mode 100644
index 000000000000..6c86860c5d05
--- /dev/null
+++ b/dev-libs/libsass/libsass-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils ltprune multilib-minimal
+
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/sass/libsass.git"
+	inherit git-r3
+	KEYWORDS=
+else
+	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+fi
+
+DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
+HOMEPAGE="https://github.com/sass/libsass"
+LICENSE="MIT"
+SLOT="0/1" # libsass soname
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+DOCS=( Readme.md SECURITY.md )
+
+src_prepare() {
+	default
+
+	if [[ ${PV} != *9999 ]]; then
+		[[ -f VERSION ]] || echo "${PV}" > VERSION
+	fi
+	eautoreconf
+
+	# only sane way to deal with various version-related scripts, env variables etc.
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--enable-shared
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc -r "${S}/docs"
+}
diff --git a/dev-libs/libsass/metadata.xml b/dev-libs/libsass/metadata.xml
new file mode 100644
index 000000000000..60582892ddc8
--- /dev/null
+++ b/dev-libs/libsass/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>tetromino@gentoo.org</email>
+	<name>Alexandre Rostovtsev</name>
+</maintainer>
+<longdescription lang="en">
+	LibSass is a C++ port of the original Ruby Sass CSS compiler with a C
+	API. It is coded with portability and efficiency in mind. You can
+	expect LibSass to be a lot faster than Ruby Sass and on par or faster
+	than the best alternative CSS compilers around.
+</longdescription>
+<upstream>
+	<remote-id type="github">sass/libsass</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 26d39e09b2a2..fdb003236813 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -26,7 +26,7 @@ EBUILD libxml2-2.9.4-r1.ebuild 6888 SHA256 a6acfd3e86bfb9390ac2188ad356fc2cd5bfd
 EBUILD libxml2-2.9.4-r2.ebuild 7391 SHA256 d0249206c88ed6e385aeaf0c321847036648e2e29562eefe30675de9b33649e8 SHA512 4632742786d19c6e81f1e26160ada7862e9ab7b0ac57dcd4fb02d45d403533a2555736c3b7adeb104689e27bf3d7d524916417be633bbf7f96ceb5e69b050a7d WHIRLPOOL 3fdfe5185764b19d4ddb6a0905d02958d5910ab6a4940764f47271d3866d414ac6d53721eecd8196b48aeb0754f9801e9b020f64346d92ce99857cad81666b94
 EBUILD libxml2-2.9.4-r3.ebuild 7671 SHA256 03d0d7b46bddd6230ff5085c8ba48fe91b0d50eb40652d655104c791a0a11e55 SHA512 ce3cd2d3db2a4f489f9024cbe8c7d343fd94b1b8736debbe98084ebe76d828cb1e236169b9ab114e7278c886d58814835f4639b865bf198af528cc681236fa54 WHIRLPOOL b15a69dc76a2925dcf22e137ea7c99192c5e96e47ef597f73ba0e6061d1868d8b05fd1c56713c1efdc05ea0c3eb4d0bf153819b138c004f161b119723bc77d7a
 EBUILD libxml2-2.9.5.ebuild 6387 SHA256 ce6692072d70c62ab5efc2a875d666539834f98e0b1ae621fe18b95b7cbd1f11 SHA512 9740e84ec0ab1fbe1cd3fba542a2f0b8b5dc7341cc6ccaa4f7552f522412921477f1cbc47c3f614a0fd6728d18a0642e50fa31fe46e481bc6e17b5a2e197a9fd WHIRLPOOL cfe313ace49b39cf204340e19778249a1a163b270edc302f8c05410af6b0bf5fbac098f5429fbab4391e797b14ee039828e57e0901e8552673c9f8c842e68057
-EBUILD libxml2-2.9.6.ebuild 6387 SHA256 ce6692072d70c62ab5efc2a875d666539834f98e0b1ae621fe18b95b7cbd1f11 SHA512 9740e84ec0ab1fbe1cd3fba542a2f0b8b5dc7341cc6ccaa4f7552f522412921477f1cbc47c3f614a0fd6728d18a0642e50fa31fe46e481bc6e17b5a2e197a9fd WHIRLPOOL cfe313ace49b39cf204340e19778249a1a163b270edc302f8c05410af6b0bf5fbac098f5429fbab4391e797b14ee039828e57e0901e8552673c9f8c842e68057
+EBUILD libxml2-2.9.6.ebuild 6385 SHA256 d088e46790397a07f2233ca16804878ff4e9313b72a648b269a7fcb44bf178ea SHA512 ba38adb34f7bcb1f2e662c2400155ca3854b65bf2b13d0bdc0b8f04fd891fc8c09df62c4f0ce01ff0704f69b63d2bfbf367ca9c6da0d69b82381c4a97eeb267c WHIRLPOOL 3033fbcb1b0c5ed456d5736ea30a188dcc2afc4fbc59567d2d3f19af2c251d14f89a6bf4030ecf4302e5ef9a2dc68a00cd644be5e4e15a1fed75bb077d438e6e
 MISC ChangeLog 9698 SHA256 1b1fb6fa12f27f404c6a5d2e68e56078877a20539e2150d43ceefaa61c31a251 SHA512 7f51ba012043be6cd6c979ffbf47bbed2d7ab2d4ed25fcde2c3baebb29311178c3d873d7ade799ef167fa8fcfa5cfd29379b6a19f72ba04e1594fa5a4dc3783f WHIRLPOOL 801f2f44fdf6411ec8a8b9df790e04fb8824d9b88623398a3d047c69a690dc9c9f071a2a845329403a1b15fb990f8cc61ebad5e34aeff2d869b932adae4d000b
 MISC ChangeLog-2015 65422 SHA256 6e4ee4a306e6b8c480f681f1846d7879ac86df55d74401e26f1b7cfc5e05f94d SHA512 e030bc367ffae1c8530e1ad171da60bf7034095d81060cbe4286bf0840ef86d17447e8549fbf3a09f39db9ced5476b3b29630d5495647cbe2d55e11b423aa379 WHIRLPOOL 279cff12baa7a881967812c7bf76b54297a39144e2fc9291053662f463faff68db5a8b6420267031ee1afb979669e823989063bf0ac2c7cc820927d6bdfe555c
 MISC metadata.xml 347 SHA256 f67239ca2e57c9729d3be4e84d03d474e382b53c89371617fd97acd8494a5fe7 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d WHIRLPOOL 24e14b8ca1c048a589aec596a844a7e9b9bbf52964b3dd26bab7c03b7ed762f0ea0abbb0832b1fb6c94b7a4cff92b921e61bce9461db3368ab95003501cd3e50
diff --git a/dev-libs/libxml2/libxml2-2.9.6.ebuild b/dev-libs/libxml2/libxml2-2.9.6.ebuild
index dc7fa4d365c0..a2ffa1658283 100644
--- a/dev-libs/libxml2/libxml2-2.9.6.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 42a6af1f4005..c748c0ab14e1 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -9,7 +9,7 @@ DIST libxslt-1.1.29.tar.gz 3428524 SHA256 b5976e3857837e7617b29f2249ebb5eeac34e2
 DIST libxslt-1.1.30.tar.gz 3444029 SHA256 ba65236116de8326d83378b2bd929879fa185195bc530b9d1aba72107910b6b3 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986 WHIRLPOOL 7a346a1cdd340f6ee39b4d8d426dd894164ce4b8c55ee74b832cdcc9e7bb7bd2e13fdabb57a50a206c40be8bf238a57132bd1cf6fe48e77c710d8ec75f1aaffc
 EBUILD libxslt-1.1.29-r1.ebuild 3496 SHA256 646933711df2c10425193358e01f4a2277c1e537a8b3d0091e3f8e92ea118733 SHA512 8881813ff55064e4d37308de04fa30750a54bcc3c0c932954d0930542435241b84f6300655eaf715c2e784086ef6cc400bfa5cf0f5ba256edc38c13d06fea372 WHIRLPOOL 74ae64d1646874adcfab060728c4b13e9482c5a8982d198548dbd624efc02ec857d5498e2fc731dead0e09b33294c77adfd2797b706bd791131d96363553f40a
 EBUILD libxslt-1.1.30-r1.ebuild 3570 SHA256 34e5f78b59d8c0e0215169c99635bdf4524f7a0b4dca5ecebf10a35f3b582b98 SHA512 7899c43b5a0c4933cf44dd583e3c67f34a369a3e7909458545e3c63bc67c36a46389877583e35720ad384014668e5d336ca36eaa105523e1e8643328d8f19bad WHIRLPOOL 7fdabda4d6230f26c62856030957fc41252c01e14dce6552ebea4497c82044e64daf6cb2d9b1e863113d9054eae7ea299f10bbd2fad363d4a20a184e3701237c
-EBUILD libxslt-1.1.30-r2.ebuild 3674 SHA256 2569237c3c19a092a1f04d88732e08b38c62cc93e9b226ec607fa2fa55da113e SHA512 37358f9c889b0e9c62237c48e94b364887fa95b102a139e45f79ef07b48ecadc9c168a577e414e0b0724eb37dbb5dd2d7f8f615da34dacd5d4961e3f4ee10214 WHIRLPOOL 9f7764cee24e75bd80cdea77618c16718cf1c7ac80938428bd36cbec6d5b152094bd9810d0a2920f6775009ea0211a15b26e1dd8cf8041b6c2fdfa7a1d58d9e9
+EBUILD libxslt-1.1.30-r2.ebuild 3672 SHA256 4b9acf6cd1b3f0c2b28607686a6ed8133559ccad8afbc16aab55d6f3ca4f84f6 SHA512 8fccbe015c0a0a797915b9d14ae2c47baea14a7881652da0cfb0eccf1387ccc64a4a81aba94bbdce27e5aa2e1fab46bd4ee8c1f5e7f2683b3a80d6c9582268d0 WHIRLPOOL 4f33feadb7992f8d380a5bba37aaeb091eab2c8b86eb84fdbdf11dda0a3c2dee1d9c78028012593f7e78b0bfffb626cb4311c62693acc3e6cedaf413880f73b1
 EBUILD libxslt-1.1.30.ebuild 3461 SHA256 39915675e1deb05a107e8d90aa38e5cf68701dfe657406309b5663d69f17071b SHA512 b44d3c1f72cfded5bbdbd2ac0de4bec9b5d51945e9697f5fe7d71c01a507e005b77828312634e4095e9433e733a5ede58f4b822e0b2ef34027a3cd6e66542fc0 WHIRLPOOL adde0aa2a69d73c878c18073d15194e6b6f25247371aeff0a434325879f205141c436782832e4c801ca8bace4d1dfa4fe7d08b8201a10d70e6fbf5328aafee37
 MISC ChangeLog 8365 SHA256 b65a2f465bb43a077d88e2d6a9b519f298b0c00ff5332f071fb30ae97509440f SHA512 d6e29b3b6c1fda15a020b17728315bf11b6c208ddd7415d4c107c5777307ed37e43864e9b1feb9772c5257cd5f1df90051fce85944308d9e0a1afcb3d0147664 WHIRLPOOL 13da17ac13ee9bdda67134a6bc9bcb7f6127ced0a8cd8c35ce7df0284f107c079733170915bd73620bffbc3754fd477d907bc120ba8e328e833362aaa4d56d34
 MISC ChangeLog-2015 38221 SHA256 3ac8ca41025991ec887baeb5ad276a1a6fcc5f5a9e0014a50a5ba7c9dae878ec SHA512 d7a28c1e8f8884ae84d5fe11fb150edaadeffb2a3b7e3453a9276a9eb3bda47d529f0b0064ff23a45bd648652b8d82a505fa6f6c358e47bd583f1df8018205cc WHIRLPOOL d0a81a32dd6cb3f975bf3e52cab952531bd5eed4e0460a35c1c2ba2fd950d2b2800ca4bf7db526123d846b7d6b440e8b57285f4e34e41fcdc14c3ad527c7714e
diff --git a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
index 8e852aaf2c52..c71f49983849 100644
--- a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt debug examples python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index d163bdfc9e2d..e73fd224a528 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -14,7 +14,7 @@ DIST onig-6.6.1.tar.gz 943490 SHA256 8f9731f9e48666236a1678e2b4ead69be682eefba39
 EBUILD oniguruma-5.9.5.ebuild 1129 SHA256 fe48f2becf821d0d60f91ce82a8f72260b44fd38cce6dd526e40999a89adaab7 SHA512 0889defa5f3a79337e4bd353f49d19a88870fc4657acddb88b47cc49bd2d54e64e7a10afb393a8e2b93cf196d7ff140d9117c61c7ba0551d0903bcd13703bb6b WHIRLPOOL ad4cfd96d4a9babae36ab975cf2facad5b9f240fbd67ec16ac75897b76647b5c8833a7f87e0c934115b01b6afc568985fe471d37d2f15cc7236dc6175ed7ac0f
 EBUILD oniguruma-5.9.6_p1-r1.ebuild 1379 SHA256 a484fd0dab3622ff12e0d68dc6913ac81292ba1f386970937f7da7f4856518f2 SHA512 6817357097456c702b5488cee375135e54bed44360a2edf0dbad9b2712c8c824b4f5433b73cfc8dcf460075fd95a6a396916a79032de4a69d633c856bd52fbea WHIRLPOOL fa4c0019b4692de04933e002586220cb7c3b1244d4f817fd41f503b3f09b0bb7224d3b88076802bdc4abf06e9390d24b8f9abb24e35206eeaa55da6b21c418e7
 EBUILD oniguruma-6.4.0.ebuild 1167 SHA256 1e05d4de551c9657f3a51ae130602408c256921dede9f5f6f52a69d14c70f1ed SHA512 684194ee689ad9fb79fb2c933f8eb64e8dfa20c79da0c76907cc6b913391f2e4bbd42793a4d11204c66d87651c349f71c75c4169f2ad87808b9f43b6a14b63c1 WHIRLPOOL cbb7c9eae2d7cd5d621e84d95d957b7c978554105ae15d225fb2ce2bfdcb7ed56e6adf2ec255c1730286379152f57d8ea20244cbfa8276af5925ba00e2f24811
-EBUILD oniguruma-6.6.1.ebuild 1129 SHA256 826f31635aa1f38bd285efb8d691b76ad3d828f8b0aa34a0300118e71ff8d172 SHA512 55dcc88d877358307d8d678ba430e3a24f175d5542c3787bc6e75ff3a6ee390dda221473d173b13bf3c04ffb49dc69d8cbba877c786ffedad0dc7fc3d0017f55 WHIRLPOOL 2f390b811d144a4ea580c3ef1cf4162f9e24a83c4955f7ffd0941e580aa944e4df50c28519640151ff62f2c529e0cd7032678caa36876d491646ad59617f7785
+EBUILD oniguruma-6.6.1.ebuild 1128 SHA256 a8736d9e66688629e23515d1aca40afbbeac952fe4e078ffbc0e1f407c34f008 SHA512 59a6c844c0aca5becf3905a23af3933af15190e44841fbf9119fcf12953347a391a25c5ce31c487f9a16594e9229e49669666fa2612d2f48e49562172637f69f WHIRLPOOL c6a31aefaf39be4202f09759366641746096d069b33b4edad0bdcac6854c89516fc35cfe8ff0bfe7e7b0e79ccdd220bfd91677327636f23bc00a6699a70ade76
 MISC ChangeLog 3480 SHA256 017a5b8fa1c2c3efbff36f8fc86700c40dd5f6c4a5cd3111279c460f762140db SHA512 5340377126666c789a2e2445bced19c8348aca7a862da341bd950b737545824e836a567a70f0e99aa7765964eada43980ec761fc16d8868067f2ddd2beb24529 WHIRLPOOL 1f3f3aa4fd8af3724f25c24ec7a371c63b49f85b4965185d6a11a075369a50cdd5970dff0fca833ab618b178dd7bc57f9ad85e4514fbc7336a1f313d34cf4971
 MISC ChangeLog-2015 9089 SHA256 ff4e22531be2af0b4732475ca1e23fef670ee4982fa0d519d1272b98c05fffd3 SHA512 6ab9ec86d19b1644073fa2cc50414f2984c6e51f0658be44f5b2b0172a6f8cdb98aefbfa650621c03d992df3cca4c430489fc8058aa58a40332399ccadb4eb63 WHIRLPOOL 54e80067dd972b53205940d26676d010743507b7269b7470a48878b64a0975e8522551984a0eb56fe7f6bd9f344b4c597a6ae1921374b39527d53e83872f1b71
 MISC metadata.xml 898 SHA256 1dea20487ad239dacee930e91229ad7e1b49bf75597c52567cd1f670cff966f5 SHA512 d9736125e403f64018466a0fd53e19e86552254bfba410d38b7d9d485c50b74a55757de54fee90cdbaf21f6a535b5d765e38019e5fc3adbe5cb1fcf88ab71a2a WHIRLPOOL 130834b5e6ea1a6cfdc30b8e3c0cd81c9cd4bec586ee6ee1a84574e8ddff32bfb490fca959f2dfd44fd90acb5367c1d01cfd3c41f567452b8efeb0c23a197304
diff --git a/dev-libs/oniguruma/oniguruma-6.6.1.ebuild b/dev-libs/oniguruma/oniguruma-6.6.1.ebuild
index a19a0cf234f2..80b681698005 100644
--- a/dev-libs/oniguruma/oniguruma-6.6.1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 3035c07a3071..d9d79aaace55 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -29,7 +29,7 @@ EBUILD openssl-0.9.8z_p8.ebuild 4997 SHA256 68825bbb48e4862340690badf5f4fdffb671
 EBUILD openssl-1.0.2k.ebuild 8334 SHA256 81be072ce297e7426353f5fc5e1021b464aab6c08317ab0798b3f2f3511e25b9 SHA512 69041d575f7542984cdbc9ef32aa04af49610e1e5752ce77e2566b63d0c60d0cfde6aab808d9c32390ca986911de3b67de057d09c1e036204bf119136e386efb WHIRLPOOL 8b5445b07d05613e3003348c5518d1fdd5fdce4415739b0cfbd3589f5a2801747dcbd5bad2c034cc28b6f8bb73916aeeec4d3d3c591462d024147f494180f2b5
 EBUILD openssl-1.0.2l-r1.ebuild 9930 SHA256 78d0509140e5187d636f21320a6bf125d4a1a03d797bf545c7741d31d7ea7864 SHA512 86ffa8e9d2ad2e69fdfdf7888cdc3f885ee3b5fb7bae6af3a9dbcf977d4fe00d1f4fce1642b7c1bc5eab0f7d8a3c2247beb2d80a731d0b14e6aa0b545e323c23 WHIRLPOOL 5765b2ac767c04ccfd1ceb7e5998513aab7e18a80e77124eec63f729f054fc479318612a567b6a8141afabc9e4bdc65101b0811bc25f266960580465e0de0513
 EBUILD openssl-1.0.2l.ebuild 8338 SHA256 072d91bb6cdf1e356a450d995e1a43026f6a86800a601b853f17ab7da1f17c44 SHA512 2435e1f4b4b8f766d1ea5ed0a21fece5109559e16c9d4260d2ef052ab82795bb7005d3f2777bed3978f0f4940521eeb5bd10c85ab2e2037ac2d053f501646f3d WHIRLPOOL bfaedc69471ef1ef1496c2f87de036b29496d903967a66f6a13154aca7b4ecb85eb7abd668dd4652bccee7a8bb6a1a0ab9d5492b19db8ed0e9360f7fbf67b775
-EBUILD openssl-1.0.2m.ebuild 8346 SHA256 b5196e00b3fa4323fc5eb5d764c712764f322ec165401a9452c26f6409357a31 SHA512 8d97084d044eb5bbc347003d46fcd7658bafa9538eae67c9fffb2e4a0ceabba1fc386c797f32509234b8fe0740424b0554eda5b27ffaa4c6ea4f42199393fa3c WHIRLPOOL 509d637955a160124c6cdeacbdeae1bfcbe2ed198fff6b3fb3c5eca86af3828c22919814f1e9e0cc647bec3541ae21d22a92ae450b4896b649dda4c3d73338e8
+EBUILD openssl-1.0.2m.ebuild 8343 SHA256 d13a0f67cd1956eda544226c09e236963cc02960b3536f0c30e0f9fb30b2c7d5 SHA512 c65ecd850a6736ba1d92993c88da976dda36f545d09aa5aefffa6383561bfca79f4d0036c73716110af040964d34fe96246e3b000ec468541f55d0b0afe8aac2 WHIRLPOOL 59d25ece433040a9a80acd1b3e9c3b4c8f72949d30ffb691dbcebd50d1a714d1f4754152ec2e3183e9505680d87255b360b6e24c79d5f161a6f25268db30251a
 EBUILD openssl-1.1.0f-r1.ebuild 8960 SHA256 59b50a19926a7cef6c0d366e40c4e2ee36cf9f8349c3a5be511f974ad1d7036c SHA512 5d7c628faa89d56a58f5d732f30d495743e6cfa94962e036042f396902aeb71d6e997a2ee2db904f7e04e21a6c2d75e879fdb172f74f28d51b0e2569d532d33e WHIRLPOOL ca550601ac03f73ac41e1c10b882b93c3b351a65fddfc6febcee3e5a3a3b545e04cb38bfb3fca8a8b3d32cc36149933772cba764b731141f1a8f4c5a832aa934
 EBUILD openssl-1.1.0f.ebuild 7419 SHA256 553325ec8be13740869ef1416fb62654c7ec6ea1755a55f2eec81db6797d0950 SHA512 30d243d3d3e13571c8b55f9b13abc8b39ad0e719bd482b54d22ee7cb01217e8288cf2594dca1511bd5bd3945acf4e2963a16d3a172c59c11af93008a7a8874b2 WHIRLPOOL 1248a75677f564b74c2f0e575994fe00a8421c12b6a420a5782c3c3646eeb249dc391cc5b3838ee5d5040a9b0d0a4ec281a3af79a1392aefb9455607a21656c5
 EBUILD openssl-1.1.0g.ebuild 7419 SHA256 553325ec8be13740869ef1416fb62654c7ec6ea1755a55f2eec81db6797d0950 SHA512 30d243d3d3e13571c8b55f9b13abc8b39ad0e719bd482b54d22ee7cb01217e8288cf2594dca1511bd5bd3945acf4e2963a16d3a172c59c11af93008a7a8874b2 WHIRLPOOL 1248a75677f564b74c2f0e575994fe00a8421c12b6a420a5782c3c3646eeb249dc391cc5b3838ee5d5040a9b0d0a4ec281a3af79a1392aefb9455607a21656c5
diff --git a/dev-libs/openssl/openssl-1.0.2m.ebuild b/dev-libs/openssl/openssl-1.0.2m.ebuild
index 9514ee98812f..7c115757958f 100644
--- a/dev-libs/openssl/openssl-1.0.2m.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2m.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 2bd383597a8e..6f6f66e633c8 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -5,7 +5,7 @@ DIST vala-0.36.4.tar.xz 2846516 SHA256 e9f23ce711c1a72ce664d10946fbc5953f01b0b7f
 DIST vala-0.36.5.tar.xz 2849320 SHA256 7ae7eb8a976005afecf4f647b9043f2bb11e8b263c7fe9e905ab740b3d8a9f40 SHA512 1059fb52aa0d40fc04e8bc46a8cd54e1538554aa32e0e92e4a27779558fa1a9f460988d27667a613d958f3eb9dbe02fdac7e1632b91e8324bdfb5663e1cf0aac WHIRLPOOL e3248416bfb326408f970bb58d38dcdb738782660d48e16286f79ad54a70f736dd88f6a832c1518885684f17e2cc7adc109fcb74b7d0d6d7edeaee3703199137
 EBUILD vala-common-0.32.1.ebuild 2533 SHA256 1763c780664afc22c30632b158d4c38924c4688d9c5316d06099801a0fbc83e4 SHA512 798a4ab1f0d5b22ee2a3cd259e89a52ef6b122bb9605f1cbcf346f8aba5bdfad4c49d9ac1c19127e3244b011ad914173123a3418121a7c2ece32c8970169c9de WHIRLPOOL b52ba672888c299b6abea8475ea65a066ec6edc711cb342bc970f79bd2a2278e2503c8423c99567a6b1d4ea0d5f7516d8923c343e7c5d3dd6fcef9529c4a67ff
 EBUILD vala-common-0.34.8.ebuild 2533 SHA256 1763c780664afc22c30632b158d4c38924c4688d9c5316d06099801a0fbc83e4 SHA512 798a4ab1f0d5b22ee2a3cd259e89a52ef6b122bb9605f1cbcf346f8aba5bdfad4c49d9ac1c19127e3244b011ad914173123a3418121a7c2ece32c8970169c9de WHIRLPOOL b52ba672888c299b6abea8475ea65a066ec6edc711cb342bc970f79bd2a2278e2503c8423c99567a6b1d4ea0d5f7516d8923c343e7c5d3dd6fcef9529c4a67ff
-EBUILD vala-common-0.34.9.ebuild 2542 SHA256 86364c8d6bf22608cda1ac00a26fb1f3566ca77e4eb80b04518348aad00404af SHA512 dc92e98e84d726421ff40e073ca8218257d2edfedb3d1e45fefdbf1c8a030e27dd4b85bebf5a472e74a93a4bd0e03d5ce5d1e07151965101401590cb2f6306d0 WHIRLPOOL 53669181af5ca5d1896b07139e59153656081e3cfa295775e2902a032e239bf7422d490cdfc8af0d20524e24c2e99d7baaed1eb22f23d351b834b59609a9cca3
+EBUILD vala-common-0.34.9.ebuild 2540 SHA256 b567a8e9901dbe3aedd890d9e27e54f87a40f9de34b228e4cffcb96f18d2ff02 SHA512 9c59fe14ba4d79d7c00c573e3b50aedebf28a57f3f94a8321a587980460b7b8cfc936b9d2b5c0e8d16e31a0efc3a13ade6802559404984a2b7d7ed6b17987456 WHIRLPOOL 94d406a71c1cadbc5264b4ef461f34daa39636d5e492f0dc14a5a7fd90080d4bc990c2c7f7a4c0f27aeac342789e3329d3e460230776f50cf95d611ce44709ae
 EBUILD vala-common-0.36.4.ebuild 2542 SHA256 86364c8d6bf22608cda1ac00a26fb1f3566ca77e4eb80b04518348aad00404af SHA512 dc92e98e84d726421ff40e073ca8218257d2edfedb3d1e45fefdbf1c8a030e27dd4b85bebf5a472e74a93a4bd0e03d5ce5d1e07151965101401590cb2f6306d0 WHIRLPOOL 53669181af5ca5d1896b07139e59153656081e3cfa295775e2902a032e239bf7422d490cdfc8af0d20524e24c2e99d7baaed1eb22f23d351b834b59609a9cca3
 EBUILD vala-common-0.36.5.ebuild 2542 SHA256 86364c8d6bf22608cda1ac00a26fb1f3566ca77e4eb80b04518348aad00404af SHA512 dc92e98e84d726421ff40e073ca8218257d2edfedb3d1e45fefdbf1c8a030e27dd4b85bebf5a472e74a93a4bd0e03d5ce5d1e07151965101401590cb2f6306d0 WHIRLPOOL 53669181af5ca5d1896b07139e59153656081e3cfa295775e2902a032e239bf7422d490cdfc8af0d20524e24c2e99d7baaed1eb22f23d351b834b59609a9cca3
 MISC ChangeLog 7687 SHA256 fc46201f45e945f3a93219fd2c49815af4694f18617c0e096e74c8afe0b5cbfc SHA512 f83e7340557a657f48de83174fc358ac6179d203d81075274ad833300929324d6a9629ee824f7ec3542dec8fc085a957821a578f494ac038b5f348e5d91a5f96 WHIRLPOOL e3a8ec7d5df6671d2196a05f77b40374028e3e3a88e4e9bd3a103c389e4a254bc35b0874456ba3e170f1a02b594ba23df5ab28d773a3087f7130e68e58372e2a
diff --git a/dev-libs/vala-common/vala-common-0.34.9.ebuild b/dev-libs/vala-common/vala-common-0.34.9.ebuild
index 01ce4db1896f..1cb6fb1cf58d 100644
--- a/dev-libs/vala-common/vala-common-0.34.9.ebuild
+++ b/dev-libs/vala-common/vala-common-0.34.9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 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 ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index 4adffbd68224..c0a82e69b8d0 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -1,5 +1,5 @@
 AUX volume_key-0.3.9-config.h.diff 819 SHA256 de5f66ee91a652874dea2e09742c26ea16c41b053eef167f375876deb2b18757 SHA512 ce8fd4fd60baacda3bfd88de86f5251bd9394f4b13dbb0ece494a07c3510429c458cef051cf56d9ef04b97e7120898ab62585fd1966a93724ea0476a9d465c04 WHIRLPOOL 5a6afb754979d2132c7fd02cc7f3aa4e8fb2882456ada6b19364da72df1f620055825b78ff19f6d61c7f2df455516b94cf0e2bedd69daeb680deb16fdb67ecdf
-AUX volume_key-0.3.9-cryptsetup2.patch 2220 SHA256 29d8ac99366fd56810337887baf7d4d4b4620adf1cc633994c82c06fa5e3fdc6 SHA512 abc2438e7da3b92054d7db2cb5ada57079c056552a4c333ad56a9460f6adf09b91c7ff83fde11f113092a7262ac653957253ef75ab245458db445ee0f26f73ff WHIRLPOOL 4accc7bb9ce22b3e73a7b2dece2cd875596ee1ef2f9233f65b1abe5b07ab27c07f6648a41f0cebbe52c12a9c3437d8446852ff9d263d48d202deff7fdb600df9
+AUX volume_key-0.3.9-cryptsetup2.patch 11118 SHA256 f544ec62d74a1c739978cdc79cfcb95243cf06c0f68f435c6cc1256fc7ca3ab3 SHA512 154e8c2860ffb07f367696ed23309910162c23a445e7c46411f63f6a46e65aaf5285559a51320edf3a424d98300058356ef058689c06719e00616f211ac4164a WHIRLPOOL 6d43245a813603deb8ef8da6ba8cbae0e636a8930dc6b829a618d68bfbd20abcc0cb1853838625785d1fd8a6e3a5a8319473c5ba24390dc9c972829fe26b739b
 AUX volume_key-0.3.9-find_python.patch 1845 SHA256 18da65782c7294ea8ddc1bbd06ecf22c6c33e2a474c4614e696265cc5d65e1e5 SHA512 5b2de4c5c18bb17fbf2a7e5de8adc36d919c5e98aafc33bbd3464ab60ce520ee0b4da0447f7e55ae262c9f6243936badd20f8ce5f9f3367188d80ba28932d0d7 WHIRLPOOL dc10ade55e83b7a7183301d105f4771067051dad25d4a840d957d751d1237275ade43481173f41d3afe9707a42b3dfdfe6760682164bffdbf57d8d999b3dbc3d
 DIST volume_key-0.3.9.tar.xz 445092 SHA256 450a54fe9bf56acec6850c1e71371d3e4913c9ca1ef0cdc3a517b4b6910412a6 SHA512 bc0e690997b9fa1c9fff361d04e7eddcac4cac09779d7a1f9e161be117f5c589a7e444ac16dab25fb3e3ce201591f7dc937595ddf2745d7daa625d4ab0a255e0 WHIRLPOOL 928279511717a8fcd94a13b52c1450770f8f22aed4334a4dc87440cf3ffa706e99de6dac21ac8a7e6db990570525e4cf5f163b92351239d95dcf0b3f2b7cd8c7
 EBUILD volume_key-0.3.9.ebuild 987 SHA256 61f303f5e1e656397d3c522ad2e4fbef122daf097f20ad2e3e8a60a2e8abf6ab SHA512 1fe8ab3e149e6f306e288c5952fb4042fe6052bb2d2d0a07e5e46f35122f435f55090271c0a8ad0dbb4536cc04dc437613ca0661275396c8528c09e7145aaa41 WHIRLPOOL 629f19994bc15485592ea72f0b5958e5966fd39dfbbc01a28a48fe935f6e55398bb48ead848633d2336f0ca3234b9abf0e5d79fc49accd06b3372df4b3bf0174
diff --git a/dev-libs/volume_key/files/volume_key-0.3.9-cryptsetup2.patch b/dev-libs/volume_key/files/volume_key-0.3.9-cryptsetup2.patch
index c0386fabf72d..2798e882345b 100644
--- a/dev-libs/volume_key/files/volume_key-0.3.9-cryptsetup2.patch
+++ b/dev-libs/volume_key/files/volume_key-0.3.9-cryptsetup2.patch
@@ -1,25 +1,31 @@
-From a41c53d35b594a7fd8d5b92501b4fe52d7252909 Mon Sep 17 00:00:00 2001
-From: Milan Broz <gmazyland@gmail.com>
-Date: Tue, 17 Oct 2017 13:44:24 +0200
-Subject: [PATCH] volume_key: Switch to libcryptsetup error callback.
+From ecef526a51c5a276681472fd6df239570c9ce518 Mon Sep 17 00:00:00 2001
+From: Miloslav Trmač <mitr@redhat.com>
+Date: Nov 07 2017 15:55:55 +0000
+Subject: Stop using crypt_get_error
 
-This change should be compatible with new libcryptsetup as well.
 
-Note that now is error set even for retry, so the code must
-clear it after successfull (but retried) password query.
+Instead of crypt_get_error, which has been removed in cryptsetup 2.0,
+set up a log callback, which is available in both older and newer
+versions.
+
+Fixes #13.
 
-Signed-off-by: Milan Broz <gmazyland@gmail.com>
 ---
- lib/volume_luks.c | 21 ++++++++++++++-------
- 1 file changed, 14 insertions(+), 7 deletions(-)
 
 diff --git a/lib/volume_luks.c b/lib/volume_luks.c
-index 14794d7..4034cc3 100644
+index 14794d7..f4bf2c8 100644
 --- a/lib/volume_luks.c
 +++ b/lib/volume_luks.c
-@@ -65,13 +65,8 @@ my_strerror (int err_no)
+@@ -61,17 +61,13 @@ my_strerror (int err_no)
+ }
+ 
+ /* Set ERROR based on libcryptsetup error state after returning RES.
+-   Use CODE. */
++   Use CODE and LAST_LOG_ENTRY. */
  static void
- error_from_cryptsetup (GError **error, LIBVKError code, int res)
+-error_from_cryptsetup (GError **error, LIBVKError code, int res)
++error_from_cryptsetup (GError **error, LIBVKError code, int res,
++		       char *last_log_entry)
  {
 -  /* It's not possible to get the error message length from libcryptsetup, just
 -     guess. */
@@ -28,41 +34,298 @@ index 14794d7..4034cc3 100644
 -  crypt_get_error (crypt_msg, sizeof (crypt_msg));
 -  if (crypt_msg[0] != '\0')
 -    g_set_error (error, LIBVK_ERROR, code, "%s", crypt_msg);
-+  if (error && *error && (*error)->message)
-+    (*error)->code = code;
++  if (last_log_entry != NULL && last_log_entry[0] != '\0')
++    g_set_error (error, LIBVK_ERROR, code, "%s", last_log_entry);
    else
      {
        char *s;
-@@ -82,6 +77,16 @@ error_from_cryptsetup (GError **error, LIBVKError code, int res)
+@@ -82,17 +78,33 @@ error_from_cryptsetup (GError **error, LIBVKError code, int res)
      }
  }
  
-+void cryptsetup_log (int level, const char *msg, void *usrptr)
++static void
++record_cryptsetup_log_entry (int level, const char *msg, void *usrptr)
 +{
-+  GError **error = usrptr;
++  char **last_log_entry = usrptr;
 +
-+  if (level != CRYPT_LOG_ERROR)
-+    return;
-+  g_clear_error(error);
-+  g_set_error (error, LIBVK_ERROR, -1, "%s", msg);
++  if (level == CRYPT_LOG_ERROR)
++    {
++      g_free (*last_log_entry);
++      *last_log_entry = g_strdup (msg);
++    }
 +}
 +
  /* Open volume PATH and load its header.
++   Set up *LAST_LOG_ENTRY to be updated to the last logged message for the
++   device.  The caller must g_free(*LAST_LOG_ENTRY) after closing the device.
     Return the volume, or NULL on error. */
  static struct crypt_device *
-@@ -93,6 +98,7 @@ open_crypt_device (const char *path, GError **error)
+-open_crypt_device (const char *path, GError **error)
++open_crypt_device (const char *path, char **last_log_entry, GError **error)
+ {
+   struct crypt_device *cd;
+   int r;
+ 
++  *last_log_entry = NULL;
    r = crypt_init (&cd, path);
    if (r < 0)
      goto err;
-+  crypt_set_log_callback(cd, cryptsetup_log, error);
++  crypt_set_log_callback(cd, record_cryptsetup_log_entry, last_log_entry);
    r = crypt_load (cd, CRYPT_LUKS1, NULL);
    if (r < 0)
      goto err_cd;
-@@ -307,6 +313,7 @@ luks_get_secret (struct libvk_volume *vol, enum libvk_secret secret_type,
+@@ -101,9 +113,12 @@ open_crypt_device (const char *path, GError **error)
+  err_cd:
+   crypt_free (cd);
+  err:
+-  error_from_cryptsetup (error, LIBVK_ERROR_VOLUME_UNKNOWN_FORMAT, r);
++  error_from_cryptsetup (error, LIBVK_ERROR_VOLUME_UNKNOWN_FORMAT, r,
++			 *last_log_entry);
+   g_prefix_error (error, _("Error getting information about volume `%s': "),
+ 		  path);
++  g_free (*last_log_entry);
++  *last_log_entry = NULL;
+   return NULL;
+ }
+ 
+@@ -173,10 +188,11 @@ luks_volume_open (struct libvk_volume *vol, const char *path, GError **error)
+ {
+   struct luks_volume *luks;
+   struct crypt_device *cd;
++  char *last_log_entry;
+   const char *uuid;
+ 
+   (void)vol;
+-  cd = open_crypt_device (path, error);
++  cd = open_crypt_device (path, &last_log_entry, error);
+   if (cd == NULL)
+     return NULL;
+   /* A bit of paranoia */
+@@ -187,6 +203,7 @@ luks_volume_open (struct libvk_volume *vol, const char *path, GError **error)
+ 		   _("UUID mismatch between libblkid and libcryptsetup: `%s' "
+ 		     "vs. `%s'"), vol->uuid, uuid);
+       crypt_free (cd);
++      g_free (last_log_entry);
+       return NULL;
+     }
+ 
+@@ -195,6 +212,7 @@ luks_volume_open (struct libvk_volume *vol, const char *path, GError **error)
+   luks->cipher_mode = g_strdup (crypt_get_cipher_mode (cd));
+   luks->key_bytes = crypt_get_volume_key_size (cd);
+   crypt_free (cd);
++  g_free (last_log_entry);
+ 
+   luks->key = NULL;
+   luks->passphrase = NULL;
+@@ -256,7 +274,7 @@ luks_get_secret (struct libvk_volume *vol, enum libvk_secret secret_type,
+ 		 const struct libvk_ui *ui, GError **error)
+ {
+   struct crypt_device *cd;
+-  char *passphrase;
++  char *last_log_entry, *passphrase;
+   void *key;
+   size_t key_length;
+   int slot;
+@@ -276,7 +294,7 @@ luks_get_secret (struct libvk_volume *vol, enum libvk_secret secret_type,
+ 		   _("Encryption information type unsupported in LUKS"));
+       goto err;
+     }
+-  cd = open_crypt_device (vol->path, error);
++  cd = open_crypt_device (vol->path, &last_log_entry, error);
+   if (cd == NULL)
+     goto err;
+   key_length = crypt_get_volume_key_size (cd);
+@@ -303,7 +321,7 @@ luks_get_secret (struct libvk_volume *vol, enum libvk_secret secret_type,
+       g_free_passphrase (passphrase);
+       if (r != -EPERM)
+ 	{
+-	  error_from_cryptsetup (error, LIBVK_ERROR_FAILED, r);
++	  error_from_cryptsetup (error, LIBVK_ERROR_FAILED, r, last_log_entry);
  	  g_prefix_error (error, _("Error getting LUKS data encryption key: "));
  	  goto err_prompt;
  	}
-+      g_clear_error(error);
+@@ -322,12 +340,14 @@ luks_get_secret (struct libvk_volume *vol, enum libvk_secret secret_type,
+   vol->v.luks->passphrase_slot = slot;
+   g_free (prompt);
+   crypt_free (cd);
++  g_free (last_log_entry);
+   return 0;
+ 
+  err_prompt:
+   g_free (prompt);
+   g_free_key (key, key_length);
+   crypt_free (cd);
++  g_free (last_log_entry);
+  err:
+   return -1;
+ }
+@@ -383,11 +403,12 @@ luks_load_packet (struct libvk_volume *vol, const struct libvk_volume *packet,
+   if (packet->v.luks->key != NULL)
+     {
+       struct crypt_device *cd;
++      char *last_log_entry;
+       int r;
+ 
+       g_return_val_if_fail (vol->v.luks->key_bytes == packet->v.luks->key_bytes,
+ 			    -1);
+-      cd = open_crypt_device (vol->path, error);
++      cd = open_crypt_device (vol->path, &last_log_entry, error);
+       if (cd == NULL)
+ 	return -1;
+       r = crypt_volume_key_verify (cd, packet->v.luks->key,
+@@ -395,21 +416,25 @@ luks_load_packet (struct libvk_volume *vol, const struct libvk_volume *packet,
+       crypt_free (cd);
+       if (r < 0)
+ 	{
+-	  error_from_cryptsetup (error, LIBVK_ERROR_PACKET_VOLUME_MISMATCH, r);
++	  error_from_cryptsetup (error, LIBVK_ERROR_PACKET_VOLUME_MISMATCH, r,
++				 last_log_entry);
+ 	  g_prefix_error (error, _("LUKS data encryption key in packet is "
+ 				   "invalid: "));
++	  g_free (last_log_entry);
+ 	  return -1;
+ 	}
++      g_free (last_log_entry);
+       luks_replace_key (vol, packet->v.luks->key);
+     }
+   if (packet->v.luks->passphrase != NULL)
+     {
+       struct crypt_device *cd;
++      char *last_log_entry;
+       void *key;
+       size_t key_size;
+       int r;
+ 
+-      cd = open_crypt_device (vol->path, error);
++      cd = open_crypt_device (vol->path, &last_log_entry, error);
+       if (cd == NULL)
+ 	return -1;
+       key_size = crypt_get_volume_key_size (cd);
+@@ -420,10 +445,13 @@ luks_load_packet (struct libvk_volume *vol, const struct libvk_volume *packet,
+       crypt_free (cd);
+       if (r < 0)
+ 	{
+-	  error_from_cryptsetup (error, LIBVK_ERROR_PACKET_VOLUME_MISMATCH, r);
++	  error_from_cryptsetup (error, LIBVK_ERROR_PACKET_VOLUME_MISMATCH, r,
++				 last_log_entry);
+ 	  g_prefix_error (error, _("LUKS passphrase in packet is invalid: "));
++	  g_free (last_log_entry);
+ 	  return -1;
+ 	}
++      g_free (last_log_entry);
+       luks_replace_passphrase (vol, packet->v.luks->passphrase);
+       vol->v.luks->passphrase_slot = r;
+       if (packet->v.luks->key == NULL)
+@@ -446,7 +474,7 @@ luks_apply_secret (struct libvk_volume *vol, const struct libvk_volume *packet,
+ 		   GError **error)
+ {
+   struct crypt_device *cd;
+-  char *prompt, *prompt2, *error_prompt, *passphrase;
++  char *last_log_entry, *prompt, *prompt2, *error_prompt, *passphrase;
+   unsigned failed;
+   int res;
+ 
+@@ -498,7 +526,7 @@ luks_apply_secret (struct libvk_volume *vol, const struct libvk_volume *packet,
+   goto err_prompts;
+ 
+  got_passphrase:
+-  cd = open_crypt_device (vol->path, error);
++  cd = open_crypt_device (vol->path, &last_log_entry, error);
+   if (cd == NULL)
+     goto err_passphrase;
+   res = crypt_keyslot_add_by_volume_key (cd, CRYPT_ANY_SLOT,
+@@ -508,10 +536,12 @@ luks_apply_secret (struct libvk_volume *vol, const struct libvk_volume *packet,
+   crypt_free (cd);
+   if (res < 0)
+     {
+-      error_from_cryptsetup (error, LIBVK_ERROR_FAILED, res);
++      error_from_cryptsetup (error, LIBVK_ERROR_FAILED, res, last_log_entry);
+       g_prefix_error (error, _("Error adding a LUKS passphrase"));
++      g_free (last_log_entry);
+       goto err_passphrase;
+     }
++  g_free (last_log_entry);
+ 
+   g_return_val_if_fail (vol->v.luks->key_bytes == packet->v.luks->key_bytes,
+ 			-1);
+@@ -542,6 +572,7 @@ luks_add_secret (struct libvk_volume *vol, enum libvk_secret secret_type,
+ 		 const void *secret, size_t size, GError **error)
+ {
+   struct crypt_device *cd;
++  char *last_log_entry;
+   int res;
+ 
+   if (secret_type != LIBVK_SECRET_PASSPHRASE)
+@@ -562,7 +593,7 @@ luks_add_secret (struct libvk_volume *vol, enum libvk_secret secret_type,
+ 		   _("The passphrase must be a string"));
+       return -1;
      }
-   g_set_error (error, LIBVK_ERROR, LIBVK_ERROR_FAILED,
- 	       _("Too many attempts to get a valid passphrase"));
+-  cd = open_crypt_device (vol->path, error);
++  cd = open_crypt_device (vol->path, &last_log_entry, error);
+   if (cd == NULL)
+     return -1;
+   res = crypt_keyslot_add_by_volume_key (cd, CRYPT_ANY_SLOT, vol->v.luks->key,
+@@ -570,10 +601,12 @@ luks_add_secret (struct libvk_volume *vol, enum libvk_secret secret_type,
+   crypt_free (cd);
+   if (res < 0)
+     {
+-      error_from_cryptsetup (error, LIBVK_ERROR_FAILED, res);
++      error_from_cryptsetup (error, LIBVK_ERROR_FAILED, res, last_log_entry);
+       g_prefix_error (error, _("Error adding a LUKS passphrase"));
++      g_free (last_log_entry);
+       return -1;
+     }
++  g_free (last_log_entry);
+ 
+   luks_replace_passphrase (vol, secret);
+   vol->v.luks->passphrase_slot = res;
+@@ -823,12 +856,13 @@ luks_open_with_packet (struct libvk_volume *vol,
+ 		       GError **error)
+ {
+   struct crypt_device *cd;
++  char *last_log_entry;
+   void *to_free;
+   const void *key;
+   int r;
+   size_t key_size;
+ 
+-  cd = open_crypt_device (vol->path, error);
++  cd = open_crypt_device (vol->path, &last_log_entry, error);
+   if (cd == NULL)
+     goto err;
+   if (packet->v.luks->key != NULL)
+@@ -846,7 +880,7 @@ luks_open_with_packet (struct libvk_volume *vol,
+ 				strlen (packet->v.luks->passphrase));
+       if (r < 0)
+ 	{
+-	  error_from_cryptsetup (error, LIBVK_ERROR_FAILED, r);
++	  error_from_cryptsetup (error, LIBVK_ERROR_FAILED, r, last_log_entry);
+ 	  g_prefix_error (error, _("Error getting LUKS data encryption key: "));
+ 	  goto err_to_free;
+ 	}
+@@ -862,7 +896,7 @@ luks_open_with_packet (struct libvk_volume *vol,
+   r = crypt_activate_by_volume_key (cd, name, key, key_size, 0);
+   if (r < 0)
+     {
+-      error_from_cryptsetup (error, LIBVK_ERROR_FAILED, r);
++      error_from_cryptsetup (error, LIBVK_ERROR_FAILED, r, last_log_entry);
+       g_prefix_error (error, _("Error opening LUKS volume: "));
+       goto err_to_free;
+     }
+@@ -870,6 +904,7 @@ luks_open_with_packet (struct libvk_volume *vol,
+   if (to_free != NULL)
+     g_free_key (to_free, key_size);
+   crypt_free (cd);
++  g_free (last_log_entry);
+   return 0;
+ 
+  err_to_free:
+@@ -877,6 +912,7 @@ luks_open_with_packet (struct libvk_volume *vol,
+     g_free_key (to_free, key_size);
+  err_cd:
+   crypt_free (cd);
++  g_free (last_log_entry);
+  err:
+   return -1;
+ }
+
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index a272ba13f1e7..94df8ab9304d 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -4,7 +4,7 @@ DIST wayland-protocols-1.7.tar.xz 113220 SHA256 635f2a937d318f1fecb97b54074ca211
 DIST wayland-protocols-1.8.tar.xz 112124 SHA256 e3fa5f2812cfec3c1c2573bd34adfe37d4d8950dba572d9ec6c52adcc5fe4b9a SHA512 8d9bbd4eb52c0b727c75f0379e53e29a197ce21f5a0a10a6351c053e26a635b53dcb418fa44f0fa5e0484d1457681a7f69afd3c98f2095be16ae1b0d0aeb0c50 WHIRLPOOL 4974b1c88ab32a3ec334c15c00e3f3dcf09ffeba9d909140d980d037e4edb21cd906699afd83577cc7505f399b2b10e75ca6df157a97e313b1d182cf5a673c5c
 DIST wayland-protocols-1.9.tar.xz 116152 SHA256 666b72de30ca3b70c2b54ccc9e8114cb520e76db224c816b5e23501099174f75 SHA512 16154520dd355ba9d459baf942945c6b7d267ab4463a31eba76f5d300569ffa993641f65d3e2cde89d735767a3bf743382449f58c5f42521dbdc7db1b1d0dc0d WHIRLPOOL 25102072f7b3e7be0a6a860c4992ff301d0afda4d91867daf5e0e848dbb3d986c0f1ba9162210b00acc12ff9af2aa6c19c19718b98c289433c24df18cec780a9
 EBUILD wayland-protocols-1.10.ebuild 882 SHA256 579bf6fad77e623d9c66ac22c63f997ff388b3ce48795f4c2aea9030170f3761 SHA512 6ca78bc30217efaeb3f9075eca5d6bd9afa4ad97c26617e92b2184596b6d25ae0b0f9acad02016cbcdc4a27ce258397b95070e3fdd9e26902fc9eddb2d4c5d9d WHIRLPOOL 08be14ab241e865fdedc9cfdd360cb0adb9914c58c273d4e910730b0635d683ed4cc76c73c1d5b663728b6e1606888cfc50eca15100936c942bdc8292638adc1
-EBUILD wayland-protocols-1.11.ebuild 900 SHA256 616cadbd2d6dd9e82a0c98a75651bd4ff5b0176af514467c776112390cf8ca59 SHA512 fdfbcb2e75363768a2589ba25218181ae2d501131aed11287b3d35c7a0ff03199c5780d94cb8b10e0ac278d81d145cc7ef19a4556debc107312e32948dee509c WHIRLPOOL cd7b830b51efd75368da98f6571791e226de6bfe7f76d887e3bbee4ab098e573f80300e617e2e95d97456537c38c535c3491666f1eed9de5a4e960ec5fe92555
+EBUILD wayland-protocols-1.11.ebuild 897 SHA256 3bb104ccb9324e410ce72d571442f1630c48f4b513df100275c1187ce6a80987 SHA512 d8a596b4b27128ec602e22c69ce84f73e48e372a277f046d7c52cb0935bb0a566b865ab894409f66fb6464e38d48f2a1c85a048a41b6c31107659fb0c543ebfa WHIRLPOOL bb87c1105d7e9c927c66e0fcd7e335ccd12af9f8ae4fc21b5a9c62b403a82f71ded5b7b770e6b7975c89044044b809f15dfe6027631286e8ef96a4bf21d7ee84
 EBUILD wayland-protocols-1.7.ebuild 891 SHA256 8f21440df3010475626b10c1f55f9c7e3dc39b9e123a634db554d4f3fdf9e16a SHA512 d246c9ff9a9520dbf039f67cede7150892366748a26f8f3eb7d6f4650efa1f43a2bfcfe33961a98174061dbbb74665edd7cd74d0b2a1b2e7acd971862a60791f WHIRLPOOL fe4c6278642fa2f42f8745938d1cf2077567c38b03899c322f2c7f86dcbef1ffcecbf8444c77a41686e1b03fe1ca4f1916b9abb203004d0af554105caf8f033e
 EBUILD wayland-protocols-1.8.ebuild 900 SHA256 616cadbd2d6dd9e82a0c98a75651bd4ff5b0176af514467c776112390cf8ca59 SHA512 fdfbcb2e75363768a2589ba25218181ae2d501131aed11287b3d35c7a0ff03199c5780d94cb8b10e0ac278d81d145cc7ef19a4556debc107312e32948dee509c WHIRLPOOL cd7b830b51efd75368da98f6571791e226de6bfe7f76d887e3bbee4ab098e573f80300e617e2e95d97456537c38c535c3491666f1eed9de5a4e960ec5fe92555
 EBUILD wayland-protocols-1.9.ebuild 900 SHA256 616cadbd2d6dd9e82a0c98a75651bd4ff5b0176af514467c776112390cf8ca59 SHA512 fdfbcb2e75363768a2589ba25218181ae2d501131aed11287b3d35c7a0ff03199c5780d94cb8b10e0ac278d81d145cc7ef19a4556debc107312e32948dee509c WHIRLPOOL cd7b830b51efd75368da98f6571791e226de6bfe7f76d887e3bbee4ab098e573f80300e617e2e95d97456537c38c535c3491666f1eed9de5a4e960ec5fe92555
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.11.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.11.ebuild
index 15cac561d897..8975a7369525 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.11.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.11.ebuild
@@ -19,7 +19,7 @@ if [[ $PV = 9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/zthread/Manifest b/dev-libs/zthread/Manifest
index 055c3710ea69..d76a4c5fb21f 100644
--- a/dev-libs/zthread/Manifest
+++ b/dev-libs/zthread/Manifest
@@ -7,7 +7,7 @@ AUX zthread-2.3.2-no-fpermissive-r1.diff 2008 SHA256 d7fa1ef2d7c5c75860d4f38745f
 AUX zthread-2.3.2-no-fpermissive.diff 2010 SHA256 f1f37cffbff4c3dd825ff482b80686672902b817529519851f1b554d50ce29d3 SHA512 95f89cad5f531bb5374ae1e300080977defb69bf304221188204f3cbfbf4e23a1445cbe4174e279453a005ab410925b0111ce56ffac4aaf8656b50483a9f1a8d WHIRLPOOL 2ff99434d56f9c7a31ff98657f13f23245a3a5fdd11a5c65c045e82eed94b80029ef1b41b30bc3c88d4a28c1de2b4ea8c2c3c660e79b6af738274bef93eab364
 DIST ZThread-2.3.2.tar.gz 412527 SHA256 950908b7473ac10abb046bd1d75acb5934344e302db38c2225b7a90bd1eda854 SHA512 e17e12746d16f32f6f1dc8ec041795f3c05a541c015b9579252599b51de9f97dc780946e6e83b41ca78d1af892455e6f00169a089f6e1a7c3196d6a4f49a7f7b WHIRLPOOL c5ceca4639b26a86936ff49e781737b9b7e59abcd0ececa5a0799b01460a23c88c18c84027dcdbf16cd5c98549dfceba3a4d30a71c0052f8ffdbe0a824e2c254
 EBUILD zthread-2.3.2-r3.ebuild 1461 SHA256 ec1db4baee921f16b6d5b6982fc51b5cacac8dc7ff7493d19d48c2d3daee9ce8 SHA512 0001e221cf7368c9f6ec9174a6792f53e4bd7174244e4eaaaa6d81cd95a260afaef647a58fccaa60e0be20aa3ccdc2a9d30cfe8483f0e40e6ffd5f7de06378b0 WHIRLPOOL 00f62338f7e52ead46e454c5e9b489028224ebfef853e0baadc0147fc8b18a172de54268e19533233ef8f5bb7a1b40591bf0145376d1f18d949cc8286dcbae26
-EBUILD zthread-2.3.2-r4.ebuild 1402 SHA256 e477cc5eaff7cdc87a627ad4cc7417a04709b1198e10100878ee925edf89289c SHA512 2451e61155ca7b57f6e058677326a0829b5d63bd24949238de4f3824e1c33240b4ad55a20f4f08256fbb7c13c157c22ecccee78bdcb8862b9faae37c76bd16f8 WHIRLPOOL 52f2ba0cd2c2024e2f11af2758e505bb370ca711357d52cd80470475fb6e7aa0b8674d949d6dc4e567b7cf99c5ba71d180cdbb3635bba22f2e57e5e56d73008d
+EBUILD zthread-2.3.2-r4.ebuild 1401 SHA256 2a3f903de1c3bd8c5874d49bf09494358852359d7b9afb670114191324bbd31f SHA512 33c5d1f95e833d04180e402e113ed2a6e95c77b55bf9870e05d53f6180fadc2141d9b45d19b8c76366e775d0eaacc035f2659e814553b77d164110dbd0607ab4 WHIRLPOOL 53580ce50f325f40582830a5c016f57f18451ee06aa45608d9790dd8825dc3351581378294310dee2a1b85dedd1ea16bac720d7f1b7003b4c0d16a11b3eab2de
 MISC ChangeLog 3226 SHA256 d5915a5bedcf9b990e1379c8222124a75f1aa9e2f3db4156e57bc8a87c14e65c SHA512 cde125ab210c5745ea5ba4c706e5574196cdccb7261253c8caab2056572d12cf15b4cb61f6108a3a9acbe3b64fdcf6c13807e672182f417760ab3eb578fa596b WHIRLPOOL ff9aa4de83c97865a8ccaa89b6c8fa7789f23c7f91af4ebb774cdec1ddb15281120d1ec90a18314e41d472b6d0da60ab6148b39e1ad2fdb0a5b5f640100f5344
 MISC ChangeLog-2015 5897 SHA256 e4da5a1ecc0aed3a55bd26f150a22db8a6e9fc2c559e2b6e01c4835c5b53d979 SHA512 339a109d1d89ad83de913c9bfa27f7198c67fa6434a295bd01c65e54ed3d816fa26008247eb5dff843e1cc38c3b49e4170a2896c6a100f99e76d0f7b27494a0e WHIRLPOOL 05f109e36e70e16af6b1961c32f2c3533de9bd84b80b0c3c0740113f6f85881ea9fdec74fe8ec49f17cec311658b05c80644a2d09730c4b740758def833cf41d
 MISC metadata.xml 326 SHA256 210c8d16f72efbe69a7bc2954b22d48d4156610695762609f56a00a6d6269096 SHA512 b01487803f5222c80e0bec2b0acf7bc85a30c7314642ae8e178274b4872a17986ca88ef324700a732b1afb573b74eee64c2e1bf95c08e8fddeee5910969f2230 WHIRLPOOL 868f905de7f37b162a44695e01f15ce8f23f2a512f6431597bbf7b77fe9c839d64398550fe3ca3223ad4d16a40fa4a6dc9dddb9bcc0ad61c2efce3d3cbdec7f6
diff --git a/dev-libs/zthread/zthread-2.3.2-r4.ebuild b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
index 6f31d0242103..33b3ecb1670d 100644
--- a/dev-libs/zthread/zthread-2.3.2-r4.ebuild
+++ b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ~mips ~ppc ~sparc x86"
 IUSE="debug doc kernel_linux static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
author	V3n3RiX <venerix@redcorelinux.org>	2017-11-10 00:43:02 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-11-10 00:43:02 +0000
commit	a5332b59346f7cbf0fdbd148b54aa8a84aaf8190 (patch)
tree	e6d8d3589fcd01fbc3f1286185639163daa81424 /dev-libs
parent	fceeaf01a28ee71065cf3798b70b77d3bc4ef199 (diff)