gentoo resync : 14.04.2018

12 files changed, 141 insertions, 71 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index b0ae196529a3..78b6d73e25dc 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index d637be4b4945..cd31aa3a2268 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -3,6 +3,9 @@ AUX 2.36.11-fix-libtiff-disable.patch 879 BLAKE2B bc50115c3255892187a3e78b5f0277
 AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d
 DIST gdk-pixbuf-2.36.10.tar.xz 5772196 BLAKE2B 542df9a5b9d3e790cb592b714a402633eaf37ecd4a21d597f307bdc3f5a0a35e3c3d9e3f6c822e163d0d64b9de62d7b120cb2b174f3109bdffc5e08225506f0c SHA512 d080d20baa20efe58cc5e5d043532f57e7950c0f7a3661998f924ae2a819f6bf1113e1da7785ac2063dfa582576d418eea5b3c80ea3db16057de43cc3f911d35
 DIST gdk-pixbuf-2.36.11.tar.xz 5675908 BLAKE2B 1b111c2866b06ff5da5d5e043481956d6ffbc69fa66236d91b29a6e923c01b91054eb491d2ba15a2e5d2d694f143eb0cc472bbed9bfce0bc015d6602449920fa SHA512 231e13ef2339fc6953788e8597a0c455143273338793ed835dac6ccf42e26e0292dec4121a4976b859ba8ffaa81b3ca5b250b54bd4897dbd3146a1874a59d4e3
+DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf513241eacae97c5bc582f7ebd8870e8b67ce4af4e57134b8b4ae0ed579eb4cf0f57db2891e95a673d2129a1bafefe5ab8e2a8dd5f66da271 SHA512 d27197d2395446cd3c970841381958f7eb1b8df78913f7da70bec5f09af6edfc5dd74cd809c37ec8cf69f0eba504e0cc6354f1ec6ce3ec2192ad316cb64b69c9
+DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
 EBUILD gdk-pixbuf-2.36.10-r2.ebuild 3795 BLAKE2B e3a6b029120e43a6395096782c3d73599ef953321e3f46480b7211199e7b7326017b0674f71cae3298a81c183b602545294de14d351edb0fee53970f4e8421fd SHA512 737a797da5cec04c2f61c6cf5df869f87e1050dd608cb2f1a670c28364c349f3aba6b51b45adeda36bb5f58f1a7a39c3b9d989d61c2b118c50a409a622d381c2
 EBUILD gdk-pixbuf-2.36.11.ebuild 3884 BLAKE2B 8b406fc21b510a6f5fe4303f13a3c4cebc1948f491e6c3ac2648b0beed032b23437e76b96e4d18b4d1fab61c9763b85e95fb43307cb7e6b4e6ec77a3e5389bd7 SHA512 c0f6d46fec0dcb975a86dcac09e583d43126c845c59fe937a7c628f247a0b98ecee4c0e90ebafeeedb696758324824da4f42c3418531bb3c39b33732746c5469
+EBUILD gdk-pixbuf-2.36.12.ebuild 4080 BLAKE2B fb4b3b110c5cb0a687cc1727afd8d0b865562e13e4b58c481f8b364b54eaa1ae1a374b14121635d5f660881dafa92f8d7243ce611f63cfa83664bac89942a67f SHA512 f8c1641c0018e5f010350b458bae9a866b642fd9b19a94733909f68fbf0267fe32bca4203b50ad040905c897b7f133ec0285114b5bbc58ac7dc0ca52f23efc7b
 MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
new file mode 100644
index 000000000000..0e686ea61619
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2 multilib multilib-minimal
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="X debug +introspection jpeg jpeg2k tiff test"
+
+# Remove SRC_URI when gnome bug #795069 is fixed
+SRC_URI="${SRC_URI} test? ( https://git.gnome.org/browse/gdk-pixbuf/plain/tests/bug753605-atsize.jpg?h=2.36.12 -> ${PN}-2.36.12-bug753605-atsize.jpg )"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.19
+	virtual/pkgconfig
+"
+# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gail-1000
+	!<gnome-base/librsvg-2.31.0
+	!<x11-libs/gtk+-2.21.3:2
+	!<x11-libs/gtk+-2.90.4:3
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
+)
+
+PATCHES=(
+	# Do not run lowmem test on uclibc
+	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
+	"${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+)
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=795069
+	if use test ; then
+		cp -v "${DISTDIR}"/${P}-bug753605-atsize.jpg "${S}"/tests/bug753605-atsize.jpg || die
+	fi
+
+	# This will avoid polluting the pkg-config file with versioned libpng,
+	# which is causing problems with libpng14 -> libpng15 upgrade
+	# See upstream bug #667068
+	# First check that the pattern is present, to catch upstream changes on bumps,
+	# because sed doesn't return failure code if it doesn't do any replacements
+	grep -q  'l in libpng16' configure || die "libpng check order has changed upstream"
+	sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
+	[[ ${CHOST} == *-solaris* ]] && append-libs intl
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# png always on to display icons
+	ECONF_SOURCE="${S}" \
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes "") \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with tiff libtiff) \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X x11) \
+		--with-libpng
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
+	fi
+}
+
+multilib_src_install() {
+	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	multilib_foreach_abi gnome2_pkg_postinst
+
+	# Migration snippet for when this was handled by gtk+
+	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
+		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 7c6d31df250a..f5c7e98be98f 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -3,5 +3,5 @@ DIST QScintilla_gpl-2.10.2.tar.gz 2665138 BLAKE2B 1c6349ea717997681e678cdfa6cc59
 DIST QScintilla_gpl-2.10.3.tar.gz 2721287 BLAKE2B cc85eea17e563ae5f4a130d26ca88bec3e1a6cbff7bc0af096c63789384d03149105641d6324f53b37a2bd8ab4681a285ccb76e6063a06e5db30d070d3fd8219 SHA512 a1b9d6869797ec074e4e0727164804779792fb77b2230aae80e6d6b5fb3a3ff9d84e17d775d18ab74c97b78bac454511fd2cb49be1fa36f71d9097abf88045b6
 EBUILD qscintilla-2.10.1.ebuild 2392 BLAKE2B 8949f6e08aa13e41ec7ba1d8a0a2d029b3601c8cdb3c71e44a34a728cc05a923b5162c2f657df06bc564bd4042760f1229409f2e9e8420441731e769251e1522 SHA512 c53488e751beb5a52dfc6e9903442f436e976f26afaa4a765e9bada3d0621fec6acecf4df5c98e7434f206f04336b21f0a07dccb09372cd8a693ac6c0930ebec
 EBUILD qscintilla-2.10.2.ebuild 2396 BLAKE2B 28f458ac59aa6a8fe3dea42ad42e4fb0e85d0f385c72c6afc8e67c64e95ae18c65b0b92b9498a8d7fd6808b430fbf74c82eb7e2e2dfaf962fc4d2f48f996b540 SHA512 ec04a36a7db01686439adb97aad938eb966928c4ba1b3f7df23365f59e2401efe35fff12de86016937cf1cb4fc03c9e5f2e3226d5410b13bda0c1d8d1f85c4e8
-EBUILD qscintilla-2.10.3.ebuild 1794 BLAKE2B 7534837d23437f19694a0680a848d63efa32410a7364ba95299ba67ac7fb7c5225bf9a7daba18d7d82f83225930954b7247be5b87d5f164da255de5382b4c256 SHA512 d534b0cb763f4e6d33691566af4e6db5e9da051951a5706b05105350a9ffb46a4c0532f3ef8644c4f303dc219b1c74999ce77c6f62ae2184452eebd4b757d4d6
+EBUILD qscintilla-2.10.3.ebuild 1793 BLAKE2B 1972dde3e7161b985c329e54afeb22f19735af3cf207f506df08329e25b66f6a0bb8048cfafc9777975e0957c9e317af7d48ee6d958bcc54bd4962e6ac14b8b6 SHA512 dc28d37297321c35131e096f47ad972b13e2bd7e8a24f6637890d1b6f1a375438c01ec14dad391775ddbd361faf23e637fff32e64613bda06cbaa44d7f0a29f6
 MISC metadata.xml 741 BLAKE2B 0ad895f5e6b73a5a89f527ceea61f323c13ec9329352b84a78982594a2bcdca2bd13bd67f4a4f60f21786cebef6da2bb233718fe0a90376c703de510b25e416f SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a
diff --git a/x11-libs/qscintilla/qscintilla-2.10.3.ebuild b/x11-libs/qscintilla/qscintilla-2.10.3.ebuild
index b921763859ec..29852a22c94b 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.3.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/13"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="designer doc"
 
 DEPEND="
diff --git a/x11-libs/qwtpolar/Manifest b/x11-libs/qwtpolar/Manifest
index 7662fca4fc40..4cb635a441e7 100644
--- a/x11-libs/qwtpolar/Manifest
+++ b/x11-libs/qwtpolar/Manifest
@@ -1,4 +1,3 @@
 DIST qwtpolar-1.1.1.tar.bz2 565546 BLAKE2B 7067a006c44d49fab1dc16e115c528aaf72fa172d92487bd38e112bdff99e8ea4d83f0dafcb7f17af4bad9190c809468e47db652ca712645504b350dc9f03ed3 SHA512 5b752e5426ae15740737277c2ba244cab947c54d573b4eedd1f54359b6eab1fa738d40f68f6c806106d01596eabc9f6d7ee825dde11a4925bebd643f42021621
-EBUILD qwtpolar-1.1.1-r1.ebuild 1511 BLAKE2B e9813d90fa313f8c4323353ce613aabfc38e2dede7763b74f8529456909dd536a19c58dc957e77c2774107274260809806f3cd993bf6d795436ebac02c20a8bf SHA512 67dc81e5899408b04ff6a4164aedaf128e5035053e39d5ff9d42ae3d24914e3e62c5ca7a78b9e6af9fc0fcadda83066a73f3fde803b66a1c4d2caadfc4994063
-EBUILD qwtpolar-1.1.1-r2.ebuild 1442 BLAKE2B 9a00c1d7a39f0490c03e58235d4a1507094ca92a41494a36b0623ed90303dedbdf797df200ad9f3f0272c03bf3d4ea64cce941b7a59eaca84ae67b251349cfee SHA512 89fd40d5c9af004d792b1a6c65c7ff88ffeec039ab7d36e598a21cca84193b4091aa7f16e71f44d009a7af068058e16345d4ae185927e6ffd1dda51233efb400
+EBUILD qwtpolar-1.1.1-r2.ebuild 1441 BLAKE2B fc2164438a0db2b0a5c0d49757c0387af8d32aa710474d4f74423de3e509847bf5e9c4e65d1eb698ff4a32044e12849e5c1ed5834a61714149a67ee17148c5c2 SHA512 474574fa866d9efc3afa074deed099a34a5813383cd4d050fdc6f7a8071e8143b3309eb642a580af579179639ebe8eee430024849c7b28740e2a10ac2585a338
 MISC metadata.xml 347 BLAKE2B e21decebd423f18e461da054cc36d026ebbb79da6419b31602b0ce8abd33922cd6d82a60c86a0d2eabfdf3eddd9aeaaed03a93cb83dec0a4a725d85c6b4dc794 SHA512 854d3d9237d44a1afc6926805c9efb4444326a87bf68fd0c2e636d44b4f3e012490f327921f0e3174579657b7177e231d64c983412d8f09cd4b99592d311986e
diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild b/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
deleted file mode 100644
index 92b8ca54a3b0..000000000000
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Library for displaying values on a polar coordinate system"
-HOMEPAGE="http://qwtpolar.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="qwt"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+qt4 qt5"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND="
-	qt4? ( x11-libs/qwt:6=[designer,qt4(+),svg] )
-	qt5? ( x11-libs/qwt:6=[designer,qt5,svg] )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	local qtplugindir="${EPREFIX}$(qt4_get_plugindir)"
-	use qt5 && qtplugindir="${EPREFIX}$(qt5_get_plugindir)"
-
-	sed \
-		-e "/QWT_POLAR_INSTALL_PREFIX /s:=.*$:= ${EPREFIX}/usr:g" \
-		-e "/QWT_POLAR_INSTALL_LIBS/s:lib:$(get_libdir):g" \
-		-e "/QWT_POLAR_INSTALL_DOCS/s:doc:share/doc/${PF}:g" \
-		-e "/QWT_POLAR_INSTALL_PLUGINS/s:=.*$:= ${qtplugindir}/designer/:g" \
-		-e "/QWT_POLAR_INSTALL_FEATURES/s:=.*$:= ${qtplugindir}/features/:g" \
-		-e "/= QwtPolarDesigner/ d" \
-		-e "/= QwtPolarExamples/d" \
-		-i ${PN}config.pri || die
-
-	sed \
-		-e "s:{QWT_POLAR_ROOT}/lib:{QWT_POLAR_ROOT}/$(get_libdir):" \
-		-i src/src.pro || die
-	echo "INCLUDEPATH += ${EPREFIX}/usr/include/qwt6" >> src/src.pro
-	cat >> designer/designer.pro <<- EOF
-	INCLUDEPATH += "${EPREFIX}"/usr/include/qwt6
-	LIBS += -L"${S}/$(get_libdir)"
-	EOF
-}
-
-src_configure() {
-	if use qt5; then
-		eqmake5
-	else
-		eqmake4
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
index 0d0c1346e7b2..2206f2747bf8 100644
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="qwt"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/rep-gtk/Manifest b/x11-libs/rep-gtk/Manifest
index 6563615f6b4f..71dfc9c9180e 100644
--- a/x11-libs/rep-gtk/Manifest
+++ b/x11-libs/rep-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST rep-gtk-0.90.8.1.tar.xz 251652 BLAKE2B b10a2a88b1950da4cb0f85d7dea53167184fcbf28a515b68de70f9ffc6e6cb9a2e2208020f8d6a9a52235cf4b1454901a0edeae990a2bb7227ba7eaa5da6db45 SHA512 033c148b34591672f29b0a1636b4c962ff82423f627243db07746899bfbf0ccd479322743d0822903bf954cdb3bae662ef7b2f8064cbe2741c5e8cf886e56d1b
 DIST rep-gtk_0.90.8.3.tar.xz 120616 BLAKE2B a0ada2bb13a8104d0dd532f35b64e6b049711284b60b4c4960b730909061ecce058a0ee79517cc508db95647d93f9af95c5ca73cf76e26b59467c8441064ac07 SHA512 d33de562c94731c0ce0fbca574952b9f36c2f2cb084783976486c8751daba5de0d20bc781a06ebd2005e541bbbec3f984453ef65ba6233bb7acfefa31b1acaac
 EBUILD rep-gtk-0.90.8.1.ebuild 1163 BLAKE2B 29f07de2e6265aa82b35d8d9398714edb2edb62c0f201632404428e5a12debbddc8bfc7dada51b30c8ec1475738b28a2e6e23a4cf41fb9e3681cd2c7631e658f SHA512 f66f4e7bad2ef1611fe5aa64379706011d91f3962a078cb9c3448e152e2796bdff99c4e05352df61c5dc243c1ec4c3031fa99e4610560f5d64ee6b82e55dd0c4
-EBUILD rep-gtk-0.90.8.3.ebuild 994 BLAKE2B eb6d147664766257e9b94b6fbc336929b14462f0f4df18138945962f2a26a875c2e6f4f93c7aa662ed1c18715b028311b126fda14cd919f2776ddf1c1680ef7a SHA512 a680bd36763cb451d765e4aacdacba3576f7bed21f784234a651a80255fbaaaac1566cb68f3cb4a97e7838aa8d7cf01233c3f77d312d23a627caccfe7d0daea8
+EBUILD rep-gtk-0.90.8.3.ebuild 993 BLAKE2B c970247cbf3a55fb67e559bd32b78cd058d85f42a045bba996fe476eb229f300cb9fb1ae57ef89bf7d99b9d422c4c8dd5d916942a8cb497aa2e7bea4f4dbc738 SHA512 ce67c3205d6a5975d6208a020cfd96a0c7e67ddeabcc62efca00b73b0a74d79c809bb00e170b5c37b8567b13b0b35f7e424496a839278a2ebaf85266ec8d6771
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild b/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
index ac8bad14f5ba..b639e968f95b 100644
--- a/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
+++ b/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.tuxfamily.org/librep/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="gtk-2.0"
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="examples"
 
 RDEPEND=">=dev-libs/librep-0.90.5
diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index e22ed87bec57..da0a8d873e3f 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -3,5 +3,5 @@ DIST xapps-1.0.3.tar.gz 121490 BLAKE2B e3a5b81cdce5938da0829d16726df3f33e2908924
 DIST xapps-1.0.4.tar.gz 129497 BLAKE2B d668ff840fa83b4a037c4b0f1c502e1851236d7998c4e5c7161a779e170eee6f6f47a2a17e71f332edf3f42f6ccb88c20379ad3b12847277f5e57a3b3765f2ef SHA512 1b735167f8edf15be1093255691c67ee1ae99664a714b75d46b1b782b00a6d1da72befc484ee66f070a829b6b8fd4dfa50bec5033220f66a1a4b577363b673b7
 EBUILD xapps-1.0.2-r1.ebuild 1102 BLAKE2B b217f0b1eb77c992fa84f830a1754daab0ff2831e449b7963d118fa38aceed79b0edf95835487b63ddd7bb01e3bedd1962943cdb20c804ed74c11b013fda63a0 SHA512 a2e535740527a0063a1df101c89b4588af6ec7eab08e88796436dd1d91462bcb8ab2dd61dfb6b69afd9b0cda25318c6d7feedb04263b312f9e957a87c037c9a3
 EBUILD xapps-1.0.3.ebuild 1188 BLAKE2B 3a1c341688c759e9e6bb275eee36140ba29cfdc175f45775c819ca31a6b487a51bc872d0c21644bad369f53af2a2f634db352dbf71aa4461942d7529e282d38d SHA512 51c355fb4fd5fdb102c974036a5f14ef634492c07f0a5f2515e328631e5f46b8d7fd00b6ceab8735f94cdef176f2c3bb44753c5398fe3dfdc4039eba293b25f7
-EBUILD xapps-1.0.4.ebuild 1187 BLAKE2B ccce8e87cf2d88ee55c17b55014f2b8be7c08adb3d5e814dbe50f02ea7d98b0e53cf7ba0b21966f35a428043af074a4f057f823ba8eedefbb7d6dfe97f448c21 SHA512 b0d601a6cad2e9dfeb94b617c81aa88dae43a2138593d81692ce40266ecaba71952cbdf6c7b9245b7a839ff58d1bc1911c0c6674e706ec0362726ff1377dcec6
+EBUILD xapps-1.0.4.ebuild 1186 BLAKE2B e207f0937b415d8c2adb357c4b170e3e1613c4859a82f1b8bc488caa9370343dae1be41352d02ab8b729fafd4934a9c488d1236792af9db4b953b86e7249e29f SHA512 e70d855da7293f8aefd5bdf10f0d43e7cd489d34852333b391a485d03a10006d8d6840562c13e72992370b6f617c55cc431df00bc2a94211e105af2ac5bd0948
 MISC metadata.xml 332 BLAKE2B 63c6409ca74c859140b77f0075049a181a636bf7179d4d6f5ca508740ae75009d9dcd4472e33bde6c66033400670f5a730ffc975d30d798a865c6e1228686892 SHA512 fe3c09b76536049881c6c9de9c0ebe702a7fc29400649eb5f4b7d26a4642a08ff07bb69bb4020aa552c594ee5942bbf5e6c2df9a7754f485a97c5f5bfd6d8aa2
diff --git a/x11-libs/xapps/xapps-1.0.4.ebuild b/x11-libs/xapps/xapps-1.0.4.ebuild
index 395c05a67e1e..b7f4f76e989a 100644
--- a/x11-libs/xapps/xapps-1.0.4.ebuild
+++ b/x11-libs/xapps/xapps-1.0.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/linuxmint/xapps/"
 LICENSE="GPL-3"
 
 SRC_URI="https://github.com/linuxmint/xapps/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 SLOT="0"
 IUSE="introspection static-libs"