gentoo resync : 31.10.2017

14 files changed, 79 insertions, 357 deletions

diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index afb02f16b31d..1a61b181561c 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -5,9 +5,12 @@ DIST albert-0.14.3-plugins.tar.gz 537751 SHA256 400613894457d8514e1a492726db9966
 DIST albert-0.14.3.tar.gz 83217 SHA256 39a121098db261d7fd2f48ec0f5b7b3bfc8a032430d796a6dedc92713aef5fa2 SHA512 f9d137477c830c92b457480acd095617b4281e4f26e4c547a0bf208459fa11964485328f3c04d92aeadb9c6ca134834b2b216935ad8fb72e6538e02ad230aeb2 WHIRLPOOL 4db02ee5cdbdc5c5bdbfdcd61b8cdd2451fce95f8dfe77693bb651a61e2dfa9022934584eda00044dcd0ec0f06fae9b5e456144dc3c8589c24eb6ef91b62acfd
 DIST albert-0.14.4-plugins.tar.gz 537929 SHA256 1b19f231738a84480abef1f80cecf910cd701eedac53c01c378c80cfa030068a SHA512 faa4d51ed18c3e68d255cedaccfe2f4c79bcfce844a2e9e289b197223f0b3898760bd217b76b5a0631899a76f870889726027fca5e80840c81f6d14264feed73 WHIRLPOOL 1e0f11befb6fedb95085d3abd0596087d8199f4861baed04d754d5e974ca96ac6027eb328b16cc84ee655eb5d5911708050f98257421379816699d8721280ca7
 DIST albert-0.14.4.tar.gz 83284 SHA256 fc89736a1ac34bb8a6e0db75dc9186fc266bdb63ce0cdbd699f94b373ea58d3e SHA512 c30430ac7255830781e27dbdf24a0aed90e509454feaff3ff1c95839cf05b3de641021a255087ac66bda051f34243e4a79eb6e08d8f6027ee1b8bc6564ee9d93 WHIRLPOOL 5934bcf0a87aa8232f8b10b2c74320fa0d11837d75b2472dc921924b7956c645d4a1bd8a0fa5c7b142c3e73f2944ccb74b8ec05c55564c3240f1a9c800798b77
+DIST albert-0.14.6-plugins.tar.gz 538025 SHA256 b00acc7b8b9dab47fad9dc24d768eec91d406aeba86c72516833ee1721bf92d3 SHA512 42f96495876611fedf60bb6a2793bda7f48ea2b4cf67c23f864d74ce201d0af861a93bd904c58699b5b7c23f0121f9e6009953530750cc002133d148f3a32f79 WHIRLPOOL 07fc95c61668ab2aab5e294cb2d14b6f0654960a9c141350ff15375848f5886327e24e3005599f0c51ede06aec8a7bff11093a409b9edd80dabb68097dce4335
+DIST albert-0.14.6.tar.gz 83749 SHA256 1160699c2dcd3648f265e313aec063e900597e3c4c1b748328750c2b76f0aa2a SHA512 ea0504bee62e022ad90f25b3752f3668e31463741ceb0392ad70c9ae586986cc55a99d92cd4b8e252acb4aea3324798a91a185fbc9a47577b703d98e891b195f WHIRLPOOL 7dadb3ec1c6b1c005bd1aea97d40b4cb2e1211ccd73266c4d05d526ec57637fcf230bbf1cd56f8887fb9c1e15c0cfb8c327250296600ddc4e61d8bbf2ad101c8
 EBUILD albert-0.12.0.ebuild 1016 SHA256 1cab307f195331df200e3a0f556d432e87c990cbd3840e869f680a0248b67818 SHA512 7047299581650cf9f31a3c71259dcab00707b73e9ae22115c512c47b536bf3103cdb120691e80caaef98714d3f70b1467930600f5c911565f4e5658a7cc11796 WHIRLPOOL 36416b53116da5b65e45f81d9b8453c4621aa34edadee0e7ea340d8b862b4f5bff112b9debf01cad82feccb7283daede77bd8d2c6fa9c34d0bd2d8d3f76d3f54
 EBUILD albert-0.14.2.ebuild 1470 SHA256 4cd15bcb7da45e9116e1c4cbca2f7fa0e95e74c29a3a91fc161542936562c9cf SHA512 fecd07d6030d2530cae20f5802d8106a5068e78af31db7bd75b3ab2f905cd4e62207922e98a64d5a6e0433ec76d6f19efe4cc2b1fce051ea325567539fa6e82d WHIRLPOOL 67b8678c0c7bc8743a2f51e48afbcf5d77944ca6b7ac6ecd654efa74eae06c9186b20caaa7245ca899b584b29174da32d53603cdaa14ba6f7261e9a15ccd2b91
 EBUILD albert-0.14.3.ebuild 1470 SHA256 4cd15bcb7da45e9116e1c4cbca2f7fa0e95e74c29a3a91fc161542936562c9cf SHA512 fecd07d6030d2530cae20f5802d8106a5068e78af31db7bd75b3ab2f905cd4e62207922e98a64d5a6e0433ec76d6f19efe4cc2b1fce051ea325567539fa6e82d WHIRLPOOL 67b8678c0c7bc8743a2f51e48afbcf5d77944ca6b7ac6ecd654efa74eae06c9186b20caaa7245ca899b584b29174da32d53603cdaa14ba6f7261e9a15ccd2b91
 EBUILD albert-0.14.4.ebuild 1347 SHA256 64216c04f15f367183ad144d3b63d896620d5d2e9bf815d04e358ec8ee4e2818 SHA512 8a527eaa9eb5846a6b5b9b4f427c30d89b2f743f5d22cad7b084990e751f9c00c0969e230eac2ae1a4fcb25d7910bf57d453da06ecf733a5200d9434bec11a50 WHIRLPOOL fa1bb0d4f832921382d9df71515124cd29ab92816f970d15f8766a90c6393dc299cd4a687dd673d19b30c4b784dc8d5dba5743a2f2433afb84acbb0c55337a21
+EBUILD albert-0.14.6.ebuild 1347 SHA256 743c3a3407519a880230d511218dedc970c02ad5b9c24ad072121dd52635df3e SHA512 9f5357e46f3a874135d9e5683b02571e79d707d1a7348213333f9f23e1c526c34a32e0951712037d0114578b4a64cfe0d8f33fe9e18542503746ef7631ce10fd WHIRLPOOL aa4e6e05683fe2a71abe9723134cb084cefdc505714454723c30b54171d0f6eb21429b9f8743a443db2121b5eedfbacd31a0afb2fd9deeaaecf699455bed8a7f
 MISC ChangeLog 3337 SHA256 77b2d91b88be117fb4af3e2f36d5cb3a6f84f0f7cd3316eb28fcf1bc3fc5aadd SHA512 de2e9d98bcbf76b463639af93de11bba73a9c864424c4b5b38a58064455538ba94c35ac26fd5d648ff109ffaa0ff7428158e1c78eb2a4e2fbdc5bac45a7ddf18 WHIRLPOOL a93474a14231b0d36622bcc5d4a77e94a8974dd730a8936a59f521ef353fd61bdd9579380e2b1b1eb8db5051b10a2a585f776662f65416e422c775c3b9986479
 MISC metadata.xml 307 SHA256 728a1470edc4c4c30294e89649427e1d28e7773532fffbf05a75b5ef27b426a2 SHA512 2e041e46839e742b36835304388ab2504f46a1a0f9fde76bca26e06e5db570a55e929310a7a06661ee115f5957c089a39125c5c41e42927263551e07d1c5b31a WHIRLPOOL 76f3d0838d1d6511dde2a36abd7e36752b21660eaf17b17802d68136e7d8a861c6b2f487aca7d3f6d56b168fa1b2a49ec0d4cc0e8c37fb5260711dbf09e54fec
diff --git a/x11-misc/albert/albert-0.14.6.ebuild b/x11-misc/albert/albert-0.14.6.ebuild
new file mode 100644
index 000000000000..157c9abd62a1
--- /dev/null
+++ b/x11-misc/albert/albert-0.14.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLUGINS_HASH="b1521e33fb9071c989103783b884a92d1f28f664"
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Desktop agnostic launcher"
+HOMEPAGE="https://albertlauncher.github.io/"
+# plugins is a git submodule. the hash is taken from the submodule reference in the ${PV} tag.
+SRC_URI="https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${P}-plugins.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+RDEPEND="
+	dev-cpp/muParser
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins/ || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DEBUG=$(usex debug)
+		-DBUILD_PYTHON=OFF #plugin directory is empty causing build failure
+		-DBUILD_VIRTUALBOX=OFF #plugin needs virtualbox installed to build, untested
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index e0a61156d44a..4644bf0dd967 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,8 +1,4 @@
-DIST colord-1.2.12.tar.xz 1214992 SHA256 d5241864c16a37f9e40d38d5009255456495a67f170ce0dc9250774442d68c3a SHA512 5ce8f4fd10b92ec0cb54a05017ab050753381663a43e40d959606bb5f71ddce5456a3d67f8ce0538a2c945136834c66615f3615fdfb3e1eaaf5f5ca7a9e9c4eb WHIRLPOOL 5b04acfc8de34758252f0215371f75b9ccab8f80194a9624d6b4c3651929266032f3e9e1e05b48fb82572891e93d6082739c022b2624978b0f8ece7e323e1b48
-DIST colord-1.3.3.tar.xz 1240104 SHA256 d1848e797106a036b0d6ebed99a789a6ae07d60f1d9cc59be5b257efe7ec31a4 SHA512 12ebeec00e5a5fd43fbcd97cb2cd725f300843b3c12559fbf0d41f50fc4a80e89c1b5814502c60d92b09a3fb5b0ada9c76a723f89640262a511448085199fb8d WHIRLPOOL 18385812f9fc1f0dcf54c447ba82bf67eececbeda1f1aa15b1fe6792bc1ff1fd8787f9af31530119765518cd20633c4b2574b4d37eb44638ad02a3944b8390d1
 DIST colord-1.3.4.tar.xz 1259256 SHA256 7e79ba022148900da7c72033f8232eefeab8373da25768f4b32f5aeba53b2238 SHA512 5556cc12cc72bceefd075274a1734b884e88b1a0777f7efde15118cf5d1597aa12c44680bc814dd230f39f39c9ea2dd309bc79170b19ca782488b90cda631937 WHIRLPOOL 3a74fb4a04d959efbda0d180747a90d4dcf10d2e4492d561d70e2c9316868c2c5d899b8e9fe9aab93476e4a58b4f6ab0269d7286061ec67f5ea9efb9240b4626
-EBUILD colord-1.2.12.ebuild 4463 SHA256 9129d909c35608bfa96e7ad585507e495284db848e596a8e1beef9aa3d6ad0f9 SHA512 7171fc8e01655f343159f48049615a9136d0cde8321c1082a1e39b8f863fd5a44b5b5b1294aec34442a4b31f3a07da63e416fc81e67075252b9cc3a809470909 WHIRLPOOL 6c9ec5bdfd89cbdad04bc556be1a048a111bebd55cc85ef7582163ef70f6c104b9aaa97691db5087f2f87d131ff81d65a0d6f5268408d49d56d32a5f85285bad
-EBUILD colord-1.3.3.ebuild 4347 SHA256 4373b8c89bcd0ee6b3488b36d051472bed7bee70e61d732463f7961be172718a SHA512 bb09786290204f89d229b8d9a920a4e04df0ccbee3c0c3bab1c42dd36a089800c8f5350d23e08c52dfad78d682be934a4d2b627687a56c1eaa3227210f15499c WHIRLPOOL 332a185110b662220a4b907ed7ef4fd3ae8a040f3eecf96b717a8e666836cf85e2a60afba38f267084a97cb836f4ea3ab6c53df7eac5ccadd45373443f1d2e49
 EBUILD colord-1.3.4.ebuild 4354 SHA256 0824522ed21d3856764bbb17c92ccf8f32cc376e82afaba50c4aeadd57ae803a SHA512 c3f7d55cf967c6dcd5fc909919477b900694afc5c0cfbfd527a90cd2b924941fd25c150e4279bfec7f5d850e9e35479950dcee77360efd4fef04c8eddaf8df3a WHIRLPOOL 30e74a2d780966abe120539a20068e32c902bbaa34387ed80ff7e84d496c5df25e42ad36262a3209c481292103fd61481ce30641c0bd9becd73c5ed7e6649875
 MISC ChangeLog 5827 SHA256 c6c97e1f064a46e0df024ca0989f5d71dfb33b78920aaf73bef03d92189af549 SHA512 fe8a717f36452b8f84b1e70f99a62491a2d74a5a7cd3de510c555b56c89f2de0f14779b3fe43c289de26f03dabd287f90f7d1cc4e87c7cb7d06bb2e987a9ae90 WHIRLPOOL a8fc51e1f0325251ad80e78ed257670775d85e93f10361c191b38727b990c47d90138408ba3e4511b0450a20ae249ece1b1b479876f68896b41ae6146d59cc3a
 MISC ChangeLog-2015 16525 SHA256 ab19e89b806b179811403ce3ee95b85147386bc3ceca5903819bb7f7115f873a SHA512 89d8cb886e6231bca007afa98ce79662561062a1cb66187e3e65fbff56a77c194e3cbd8f574154304d11ade6e04ef806934f3cae649b9b07c309efed88de9ac9 WHIRLPOOL a3a07cccc8a9176a37aaf1f1bf4b36d0c0222f3072fb883681129c25a874faa9c2094f2afac49f6d193a6b2f8b5f73a167a5c4ea24d1a0414b28e68fc87f1013
diff --git a/x11-misc/colord/colord-1.2.12.ebuild b/x11-misc/colord/colord-1.2.12.ebuild
deleted file mode 100644
index 9001e282150a..000000000000
--- a/x11-misc/colord/colord-1.2.12.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 check-reqs eutils gnome2 user systemd udev vala multilib-minimal
-
-DESCRIPTION="System service to accurately color manage input and output devices"
-HOMEPAGE="https://www.freedesktop.org/software/colord/"
-SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-# We prefer policykit enabled by default, bug #448058
-IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
-REQUIRED_USE="
-	gusb? ( udev )
-	scanner? ( udev )
-	vala? ( introspection )
-"
-
-COMMON_DEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
-	>=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
-	argyllcms? ( media-gfx/argyllcms )
-	gusb? ( >=dev-libs/libgusb-0.2.2[introspection?,${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
-	policykit? ( >=sys-auth/polkit-0.103 )
-	scanner? (
-		media-gfx/sane-backends
-		sys-apps/dbus )
-	systemd? ( >=sys-apps/systemd-44:0= )
-	udev? (
-		virtual/udev
-		virtual/libgudev:=
-		virtual/libudev:=[${MULTILIB_USEDEP}]
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-gfx/shared-color-profiles
-	!<=media-gfx/colorhug-client-0.1.13
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	extra-print-profiles? ( media-gfx/argyllcms )
-	vala? ( $(vala_depend) )
-"
-
-# FIXME: needs pre-installed dbus service files
-RESTRICT="test"
-
-# According to upstream comment in colord.spec.in, building the extra print
-# profiles requires >=4G of memory
-CHECKREQS_MEMORY="4G"
-
-pkg_pretend() {
-	use extra-print-profiles && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use extra-print-profiles && check-reqs_pkg_setup
-	enewgroup colord
-	enewuser colord -1 -1 /var/lib/colord colord
-}
-
-src_prepare() {
-	# Adapt to Gentoo paths
-	sed -i -e 's/spotread/argyll-spotread/' \
-		src/sensors/cd-sensor-argyll.c \
-		configure.ac || die
-
-	eautoreconf
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# Reverse tools require gusb
-	# bash-completion test does not work on gentoo
-	local myconf=(
-		--disable-bash-completion
-		--disable-examples
-		--disable-static
-		--enable-libcolordcompat
-		--with-daemon-user=colord
-		--localstatedir="${EPREFIX}"/var
-		$(multilib_native_use_enable argyllcms argyllcms-sensor)
-		$(multilib_native_use_enable extra-print-profiles print-profiles)
-		$(multilib_native_usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "")
-		$(use_enable gusb)
-		$(multilib_native_use_enable gusb reverse)
-		$(multilib_native_use_enable introspection)
-		$(multilib_native_use_enable policykit polkit)
-		$(multilib_native_use_enable scanner sane)
-		$(multilib_native_use_enable systemd systemd-login)
-		$(use_enable udev)
-		--with-udevrulesdir="$(get_udevdir)"/rules.d
-		$(multilib_native_use_enable vala)
-		"$(systemd_with_unitdir)"
-	)
-
-	if ! multilib_is_native_abi; then
-		# disable some extraneous checks
-		myconf+=(
-			SQLITE_{CFLAGS,LIBS}=' '
-			GUDEV_{CFLAGS,LIBS}=' '
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		gnome2_src_compile
-	else
-		emake -C lib/colord
-		use gusb && emake -C lib/colorhug
-		emake -C lib/compat
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -C lib/colord check
-		use gusb && emake -C lib/colorhug check
-		emake -C lib/compat check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		gnome2_src_install
-	else
-		gnome2_src_install -C lib/colord
-		use gusb && gnome2_src_install -C lib/colorhug
-		gnome2_src_install -C lib/compat
-		gnome2_src_install -C contrib/session-helper install-libcolord_includeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README.md TODO"
-	einstalldocs
-
-	newbashcomp data/colormgr colormgr
-
-	# Ensure config and profile directories exist and /var/lib/colord/*
-	# is writable by colord user
-	keepdir /var/lib/color{,d}/icc
-	fowners colord:colord /var/lib/colord{,/icc}
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
diff --git a/x11-misc/colord/colord-1.3.3.ebuild b/x11-misc/colord/colord-1.3.3.ebuild
deleted file mode 100644
index aab58ce6894c..000000000000
--- a/x11-misc/colord/colord-1.3.3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 check-reqs gnome2 user systemd udev vala multilib-minimal
-
-DESCRIPTION="System service to accurately color manage input and output devices"
-HOMEPAGE="https://www.freedesktop.org/software/colord/"
-SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-# We prefer policykit enabled by default, bug #448058
-IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
-REQUIRED_USE="
-	gusb? ( udev )
-	scanner? ( udev )
-	vala? ( introspection )
-"
-
-COMMON_DEPEND="
-	dev-db/sqlite:3=[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
-	argyllcms? ( media-gfx/argyllcms )
-	gusb? ( >=dev-libs/libgusb-0.2.7[introspection?,${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
-	policykit? ( >=sys-auth/polkit-0.104 )
-	scanner? (
-		media-gfx/sane-backends
-		sys-apps/dbus )
-	systemd? ( >=sys-apps/systemd-44:0= )
-	udev? (
-		virtual/udev
-		virtual/libgudev:=[${MULTILIB_USEDEP}]
-		virtual/libudev:=[${MULTILIB_USEDEP}]
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-gfx/shared-color-profiles
-	!<=media-gfx/colorhug-client-0.1.13
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	extra-print-profiles? ( media-gfx/argyllcms )
-	vala? ( $(vala_depend) )
-"
-
-# FIXME: needs pre-installed dbus service files
-RESTRICT="test"
-
-# According to upstream comment in colord.spec.in, building the extra print
-# profiles requires >=4G of memory
-CHECKREQS_MEMORY="4G"
-
-pkg_pretend() {
-	use extra-print-profiles && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use extra-print-profiles && check-reqs_pkg_setup
-	enewgroup colord
-	enewuser colord -1 -1 /var/lib/colord colord
-}
-
-src_prepare() {
-	# Adapt to Gentoo paths
-	sed -i -e 's/spotread/argyll-spotread/' \
-		src/sensors/cd-sensor-argyll.c \
-		configure.ac || die
-
-	eautoreconf
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# Reverse tools require gusb
-	# bash-completion test does not work on gentoo
-	local myconf=(
-		--disable-bash-completion
-		--disable-examples
-		--disable-static
-		--enable-libcolordcompat
-		--with-daemon-user=colord
-		--localstatedir="${EPREFIX}"/var
-		$(multilib_native_use_enable argyllcms argyllcms-sensor)
-		$(multilib_native_use_enable extra-print-profiles print-profiles)
-		$(multilib_native_usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "")
-		$(use_enable gusb)
-		$(multilib_native_use_enable gusb reverse)
-		$(multilib_native_use_enable introspection)
-		$(multilib_native_use_enable policykit polkit)
-		$(multilib_native_use_enable scanner sane)
-		$(multilib_native_use_enable systemd systemd-login)
-		$(use_enable udev)
-		--with-udevrulesdir="$(get_udevdir)"/rules.d
-		$(multilib_native_use_enable vala)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		gnome2_src_compile
-	else
-		emake -C lib/colord
-		use gusb && emake -C lib/colorhug
-		emake -C lib/compat
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -C lib/colord check
-		use gusb && emake -C lib/colorhug check
-		emake -C lib/compat check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		gnome2_src_install
-	else
-		gnome2_src_install -j1 -C lib/colord
-		use gusb && gnome2_src_install -j1 -C lib/colorhug
-		gnome2_src_install -j1 -C lib/compat
-		gnome2_src_install -j1 -C contrib/session-helper install-libcolord_includeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	newbashcomp data/colormgr colormgr
-
-	# Ensure config and profile directories exist and /var/lib/colord/*
-	# is writable by colord user
-	keepdir /var/lib/color{,d}/icc
-	fowners colord:colord /var/lib/colord{,/icc}
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 0ce5c3579fa0..29a20dc28d05 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -4,8 +4,8 @@ AUX dmenu-9999-gentoo.patch 1039 SHA256 0498d9bb4a27c7fdf18db10ed0f3d49eafa7cf6b
 DIST dmenu-4.6.tar.gz 15057 SHA256 4a7a24008a621c3cd656155ad91ab8136db8f0d3b9ec56dafeec518cabda96b3 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3 WHIRLPOOL b4354552356ab5ab93b20c44a313f0d8e626c22c589cf4376f82f876dc742b961a07bad45d12b5fe749b03354dfa76acf36e4089a701754e341ec0383232fa5d
 DIST dmenu-4.7.tar.gz 15597 SHA256 a75635f8dc2cbc280deecb906ad9b7594c5c31620e4a01ba30dc83984881f7b9 SHA512 67a184f3ddb018e7b372e049052662955403e3367639b9c2284939d6f105ae74c995fe38f126d8ff75886831c8add8b50e338a1bfb0d8620b7fb1457cf88a00c WHIRLPOOL 6acb632c06374c92bce2a2951bebbcd81c9f5529c6a44859e86d92d8aace52c847a542bb2a0c34d69cb0a8e4cdb525bbe9d82885c0ae8f79004c90094d21069b
 EBUILD dmenu-4.6.ebuild 1304 SHA256 c7603b5833570749eb095a0e7566b81309051bcfdf3e114a34cda2203304dac1 SHA512 7f18e03b71c1624a8e12d3afaac86471d45fbd1112474d13c3e09f32d05f08aa70104e694e467b98f22ea7174396c682e2febefa78d4104a16dc063c421a5e3f WHIRLPOOL 3b597ba5a8ff62e93213e9b88f58a518bd676504ab02eeb7187d8328c0994cdee3243300ed0e319bc5f9c828d7965bdc9eeb57baa7a3fcb7da9fe2087b93e0a8
-EBUILD dmenu-4.7.ebuild 1302 SHA256 91b9ffed6ceb0875f956714558ab94eca9d5454776dda92ae7312166f4f80d3a SHA512 283f8a77e9465a4653ae535a238e0810af0a3e352971adfab43d25e678bb47071a9fff7a052fbb91efacd8f65630a1ccb4932e31cb98826f81a6a36be7d9ac8e WHIRLPOOL 757dc3f23d7dc2298762e947900d3e0e45273bc8e26c86caa764cc8d236e94e52ce5c4eb0b7ce570f6877f4308b1b88b084af1f1ae48ecc39175988b6b001928
-EBUILD dmenu-9999.ebuild 1324 SHA256 a8d79398476e6bd7508c8bfd371ece25250e904be32a4b03b16a04afe6a782af SHA512 2e2140d652568a9fb9a09e1c51ca8170e29b508d0980ba42e94fb1549c952483c34ef24dea524035692c875529802d189cef49ada040648c3d6f6d18beb6fa3f WHIRLPOOL c8985fa2e00635629752ca5c530da71f97918c5463188a8eb4a779d0412e944078b633e65d5f8845c53c4666164be27acd30b1a80c541528b0a9415c20847c07
+EBUILD dmenu-4.7-r1.ebuild 1363 SHA256 77030fdf184d77f464571cd4c4c5dc69d2a594812da65f371281500be273341c SHA512 ce758035973b61c24c01d23e96cae27e519698a2230ebd5366daf8126a7e065bbc3bc300467264c6f658042834f1fa4d46839894593c2bbd6caf3054f3fc15ac WHIRLPOOL ed70807515a83255d049fd8b757423af5b20557c04092703424af69c1a5038a78d82eca94f191f36a18a4d327c4ccdd2d05d788521d849168253a608727cdd68
+EBUILD dmenu-9999.ebuild 1316 SHA256 ddea2ca63020bc625cae055cba7d873f07a6507cebdef77ac0d3a45c301c0211 SHA512 84690f28a5a3e65b933e8340d46adfe93ddc7c08f088d4af999118b1c6d13d796b1ba80c4e22507f5be0f586a66ab355c6fa193e31e1fa535c0a24f6ce52011b WHIRLPOOL ebd2f12e02c6fc574d22d18ae04ef9ab657287473cacf8fee2e39fb539c6c4411c300c46cacf8083b1253632400950e505b93254659ae9af6ace83a0447af479
 MISC ChangeLog 4831 SHA256 468ac7522e00c7ea68f5b7d6a7c4819afff27ae891026a7a5dcd0e6a4b3c3a31 SHA512 f7281c270889bb598c9e94294ee7a16ef2ef0292a12fbceef9be76b60e70897056ca757272faa7d301fc345120cb488d052cd84e29d13d29103293b028a0d553 WHIRLPOOL 2126db4dd07b6f80624f24975802bb99adc203509ab9c24f0f2d48706241f813c0e5f699b66f8c10036e6f71a3489109ad931f521cb6104e50013dc31a8f8068
 MISC ChangeLog-2015 12846 SHA256 589a246ea7e73bbe10b5351404966d6a0eab4d8d252efc7102ef0b8549fe36d8 SHA512 837f61b7a2c39aaced2178ae733738305f50d0fd4a3a5f09b056d2a2d0e8f9af0fceaf9f7387cf3bd3adaee85f8942fdbc59b6b31039c65b6c0341761a6c8a61 WHIRLPOOL 4df426814e80259c1b25e53581479f0cb73ae2d48f8a1f7c3fc00aaec83613c3ebd3fb3142597b62d4db5b4d1613860792bb8223c753a4c70e896c6206ec860d
 MISC metadata.xml 361 SHA256 c1f52ae4430599b171ae573b75e63d240afd6140e79456197f24264398fee204 SHA512 0be9c5e4fa1f72b02220088179c79f53e07928ee2890f78a24659e47961470d12ed7b8fe56b78ac4b493a2f42ebd491a8ebff405b013e7b7943de74892eed476 WHIRLPOOL f9e3d50557c4d5830633c331f5a037b769adf581e55486a79a877f3d98483c9aed0e4a5b2bc9a7a0d8d3df57feeb6dbd0fd628e16241baa37cd729397fc834de
diff --git a/x11-misc/dmenu/dmenu-4.7.ebuild b/x11-misc/dmenu/dmenu-4.7-r1.ebuild
index 47042fad0e71..05dc375cb2ba 100644
--- a/x11-misc/dmenu/dmenu-4.7.ebuild
+++ b/x11-misc/dmenu/dmenu-4.7-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs
+inherit savedconfig toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
 HOMEPAGE="https://tools.suckless.org/dmenu/"
@@ -36,6 +36,8 @@ src_prepare() {
 		-e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
 		-e '/^	echo/d' \
 		Makefile || die
+
+	restore_config config.h
 }
 
 src_compile() {
@@ -54,4 +56,6 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" PREFIX="/usr" install
+
+	save_config config.h
 }
diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild
index ebd674d62328..e55ea2292231 100644
--- a/x11-misc/dmenu/dmenu-9999.ebuild
+++ b/x11-misc/dmenu/dmenu-9999.ebuild
@@ -37,7 +37,7 @@ src_prepare() {
 		-e '/^	echo/d' \
 		Makefile || die
 
-	restore_config config.def.h
+	restore_config config.h
 }
 
 src_compile() {
@@ -57,5 +57,5 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" PREFIX="/usr" install
 
-	save_config config.def.h
+	save_config config.h
 }
diff --git a/x11-misc/kapow/Manifest b/x11-misc/kapow/Manifest
index 751138b02fbf..1a06458ab427 100644
--- a/x11-misc/kapow/Manifest
+++ b/x11-misc/kapow/Manifest
@@ -1,7 +1,7 @@
-DIST kapow-1.5.2-src.tar.bz2 718144 SHA256 29d7a83f9351bd83dfc9e2c933187e6fa3274be1530976e05d201bb65bce23cf SHA512 a5f7edd6880ba01c7f0be60045a3ff05f8a09e39f8315acf68b258bdc4a7484954fc6d1dc3acd184b9ebcfe6830a053777a9e0399bb8241fcef0519dbfc53c0d WHIRLPOOL 050ec50bd30fea815783b7ce84d86ec5c765356a01553ade9357221c970c6a6edeb2799ef711846a66b894db5c6ceabed37bdc2661a30d0f7ba69de42ebf9877
 DIST kapow-1.5.3-src.tar.bz2 720315 SHA256 73953d980e248ccf74c8b94c62ee1dbeaa9843481ca87a8e6af7fe1c2eb8c712 SHA512 1f8dcd570f6ed3b9fc1605a25628a06720839a5558b1564341bb775ebc99796b1124e498dced279aef30ba6fe3bb9d4f3b956685d07b481e79d66c7f197ae201 WHIRLPOOL 7bb0b41bc001ec101efcc1e93598e68ff4f55c10ae634b8208693062d66fbb3ab528ebba9e6c088a7c1d97d9d494bc26d384fa6bd7d7f4a13d3c7902e9373624
-EBUILD kapow-1.5.2.ebuild 652 SHA256 657c9e4cc7aebfaa30c714c21e2f28702787265620c75508d64355cfa2d70aba SHA512 0f7e97465d03dcd8ebbeba6782b22775f3c89e4ba6b7ad0883634757f5c68e1c7b01cf97890d47e3d5bb7b5a829cf472d30b7608fdce3c98e4866328a12a208e WHIRLPOOL fd8ac95469f3bf7a164683ac67d3567160a1df4cf1fbe2d0bd8702cf18e4bc72aef785f4b06ff519a183768df50762e906f072ccb83389f7658c9191e2997d95
+DIST kapow-1.5.4-src.tar.bz2 722095 SHA256 c2dc66cf90c6397d6fd23f16e51c4bbdea3bbfe9d4ecbde6605f651f2853060b SHA512 03683e7a4f904c4b6efdf47401d8a15ba979484d52d58e4dea52a890351ba9342ef5fe383876c5cb8138c6d578122936ca7e9ffda0fc5eb090e719eb751764eb WHIRLPOOL 6589a2954222561e02b7f04d1940a7319e5fac5f4b0080970703aa03c3db34e10ddb95ce43f9780c2c62eca4d69dbbf5f4611ee52899c5c8215ddb8dd947bff8
 EBUILD kapow-1.5.3.ebuild 652 SHA256 657c9e4cc7aebfaa30c714c21e2f28702787265620c75508d64355cfa2d70aba SHA512 0f7e97465d03dcd8ebbeba6782b22775f3c89e4ba6b7ad0883634757f5c68e1c7b01cf97890d47e3d5bb7b5a829cf472d30b7608fdce3c98e4866328a12a208e WHIRLPOOL fd8ac95469f3bf7a164683ac67d3567160a1df4cf1fbe2d0bd8702cf18e4bc72aef785f4b06ff519a183768df50762e906f072ccb83389f7658c9191e2997d95
+EBUILD kapow-1.5.4.ebuild 652 SHA256 657c9e4cc7aebfaa30c714c21e2f28702787265620c75508d64355cfa2d70aba SHA512 0f7e97465d03dcd8ebbeba6782b22775f3c89e4ba6b7ad0883634757f5c68e1c7b01cf97890d47e3d5bb7b5a829cf472d30b7608fdce3c98e4866328a12a208e WHIRLPOOL fd8ac95469f3bf7a164683ac67d3567160a1df4cf1fbe2d0bd8702cf18e4bc72aef785f4b06ff519a183768df50762e906f072ccb83389f7658c9191e2997d95
 MISC ChangeLog 3153 SHA256 d9cce20b995027403165224073d9094260a5b1e8b540ed479b9a2e27ca0a43f8 SHA512 f8d27db931bf475c97c8773ad934bbd519e0377311c620e7cb18c521ddd0033bc7386b12fad3863537aa6dcf9929c57059fc8370ac579750ead525677ea46b7b WHIRLPOOL b00f1dd27a0ff11b12734940b6ceacca02b2b4fc72120031e8b206f28adc2d09dafd038448a482d2a92f3f432e8da171438b09cb7b83050eaa1169c0568bc696
 MISC ChangeLog-2015 1198 SHA256 ae4b942cf7875e101c42d38b5518482304cd1c2655a6277f17ec2ada44320501 SHA512 dc019408a35a667723846a5074b9a50319bd9e4f61a9e0fb6d2930c78ad873075d540a027ffa1614a3cef9afc2ee129254716b9dd498b73eca295b1306e18f9c WHIRLPOOL 4ce4f80e9b273580553c306be463092ee060ace4058418684f42c3c1384c8a507ebf85ce31f30ecd35cc0b6a4e209415d004e4a63d679625b525c539de875f55
 MISC metadata.xml 282 SHA256 ac9236162462e1562a26e596e7dd457a448f9367ff1a5a27ec3513ecade3026b SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4 WHIRLPOOL 615c807081b4bef1734f1dbf9a182cb27b7de0e9bcdebd880c6b9c1ab01b95721076ddc4b4e75e93b8f777020bfd52459e9e4b1a9deb41baacc44f6cde05fd36
diff --git a/x11-misc/kapow/kapow-1.5.2.ebuild b/x11-misc/kapow/kapow-1.5.4.ebuild
index 4d8914e38d21..4d8914e38d21 100644
--- a/x11-misc/kapow/kapow-1.5.2.ebuild
+++ b/x11-misc/kapow/kapow-1.5.4.ebuild
diff --git a/x11-misc/sunflower/Manifest b/x11-misc/sunflower/Manifest
index 0e145c215298..b9f2bfb4153f 100644
--- a/x11-misc/sunflower/Manifest
+++ b/x11-misc/sunflower/Manifest
@@ -3,4 +3,4 @@ DIST sunflower-0.2-59.tgz 790126 SHA256 f0497c18870487361780a776bf31235473c20ef6
 EBUILD sunflower-0.2_alpha59.ebuild 2229 SHA256 87d1ef8a2333d7f241864e1f3107e658a1ba713f9d8dcd261e5baf1d1aa798d3 SHA512 7f9dd3d6cc75f6c4a24bf6a37079c10d5c1759a473a1f6dac861b9fc03d581aacc8210e9227f59417bd6fc2f1b5c817539329870f6f937b21d1adf75b2aa8ca7 WHIRLPOOL 8beec862866fe4dce2bc97e58977deed5a4bd9b5b9bc56fcca0ad132e5c5ce40dc5377af4edc93372085c8216b0bd602c3c29c2f81e1d6078df674e0bc179cd2
 MISC ChangeLog 2926 SHA256 982e97dd4f012f6a418d5171906113184d2f42fb4f0766d84a9afd699558f858 SHA512 b9c6ead943e8144745eaad76d2c71f4436ece53a550ff8774a0bf2ba2417d6379f63577af0c58f837c939c7dc8667d8c5d6bb484f3756bec0fdc937988143df9 WHIRLPOOL 3f4c9f978a605f0f957fb2ad91a8236dc879e2b14a7d83c58494bc5bf8476a5031da35a53440fa2256574cc868e6b528e9b29c46f41d192c72d4c01a412093a8
 MISC ChangeLog-2015 2790 SHA256 433a6f286f2f37e9f41dd9ec74ab60f432eb1fcd1ec7c00a5403424765b8c81f SHA512 0cc541df80e908256f9e7c1b3feb291fe2ae188d0ee6204bd402cec969bcb8187f22981155179e91110bf4bd9ee2ccc38c872c08875560f61ad30d455b38e240 WHIRLPOOL a462f07a85b0d6340cfb3ef9a804d53091b3ed6419d8ccc1b9a0c78890f0716cda418f95f47592c3c12f06ecaed501b9ee2524c5d43255ef980f356fa6c0534d
-MISC metadata.xml 521 SHA256 b6c10ea086bc05c2809e0b07ff446ef7ce947a2dc3d56cda6e6bc5b86749fc63 SHA512 7d99a90e35ce3fe213a527b9fac2474f4e7733b237d6026e4ba7915a44b806d5c0730da21885c83c20c05e0b331294c0515b9750561d54dafa90ffab8e987683 WHIRLPOOL c4ada9af989b85db70707f263eb992acd911541461c5ebe423f9e0dc96347fa13bceed668c839680251c04e8d1044b9529a15c7226a72764dfb3bee85fa554f4
+MISC metadata.xml 246 SHA256 45d3be4dd4b30072a3fefa8d12b083c35c59040b5d2315469833ffee2bf64a33 SHA512 01388829c888be4f666cb2b98b60d02645f4546bb87d5bf0064f3af8845c324f91b658a4f003cf472d1da25811f5006bd88bae25e01377330e2f8949dd9fa75d WHIRLPOOL 8ab80bb0ee61ed1a280e365d127235c4cf44664b93194f559827fe2f660db9d71e0b01dabe5c1d19a6587b0f01ded868e97ee18e9b2277a87e7aa2cf83aa6998
diff --git a/x11-misc/sunflower/metadata.xml b/x11-misc/sunflower/metadata.xml
index f583c66eaf6a..1ba4c2fe874e 100644
--- a/x11-misc/sunflower/metadata.xml
+++ b/x11-misc/sunflower/metadata.xml
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>henrique.ribeiro.dias@gmail.com</email>
-		<name>Henrique Dias</name>
-		<description>Proxy maintainer. CC him on bugs</description>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">MeanEYE/Sunflower</remote-id>
-	</upstream>
+<!-- maintainer-needed -->	
+<upstream>
+	<remote-id type="github">MeanEYE/Sunflower</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xdg-user-dirs-gtk/Manifest b/x11-misc/xdg-user-dirs-gtk/Manifest
index df01658c6fb6..c5fa81d73db7 100644
--- a/x11-misc/xdg-user-dirs-gtk/Manifest
+++ b/x11-misc/xdg-user-dirs-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST xdg-user-dirs-gtk-0.10.tar.xz 116528 SHA256 739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e SHA512 c3ef070244cd1c87312c2c2602dbe7bc3dd26eed632b0d8d779580d7ee6259efdda453ab7bdf4415cc72fad7a74d9dd36476189fe446d5627e4db75d905302f5 WHIRLPOOL 5fc149fd8f08569cf5d1223f6c1b7d7162a3b40554dd7af765b757fb2fad555dc6630ccbdbaf740a715c21519a5a168c303a3fd18ef1971728fad828628465f7
-EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1126 SHA256 88e94a78b1b7b3cbcbf5f39ae89003e02fcbd0e531644d9414a73ac7b8793edd SHA512 77cafd940c9a7f9611b8dbe284f73002022d4ee9c634551b0115d31b48a495da9dc3bc0207eb90a328e238ce7eaf193936962c47367be91618dec77e859c77a8 WHIRLPOOL 734b1a9a03ce119e698d20fb0764b230288181cfc0214756231e4f67d645e124031ccd19cd5a0eb035409a3134ecdceedb01353e767acf712ad7a6ac141beeac
+EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1125 SHA256 07874525928b0e2675ef4688e1a85b23eea9f04ac558903efc85398213d38fc9 SHA512 1de4972c583fdd3bc0cf2382318e9c841d9197e03abefd34988d50466cf964f7c9ccf1ace85c7ddb9e83c53f67efee1afc502cda3683335a66c37c33a4e4610f WHIRLPOOL 544e4308685dae022f762ee2e1c99c373c962001b7ba1acf505ad5f0f8a9075ec2104766cf3dfa4cd3d05d172c682fde03f30e64d00c0528ffbdacd7ef83eff6
 EBUILD xdg-user-dirs-gtk-0.10.ebuild 971 SHA256 f52a79962c86b8846eb53fb0b1e89f7b2ebcb9214a264dbd87e84020f7627572 SHA512 a0329ae6018e58854ee3af912f16b079f919c3a90628d3cdc683774b7a5ec54baf8149746d16eb75c0628e093bfadbfef0df7700886783d0b660877194a49f0f WHIRLPOOL b4956ca8eba8ff2b9a2f905d13164dbe636da470dbbcc8d1d489773b084b6e77db4751eac9e51cf7c916e9112f595edb38e5933c6f23c4e771ae98af45abc4ac
 MISC ChangeLog 3869 SHA256 868ad2d1b7416c04716a22e4593c3256bc34e58a76decc6fafb0ea2f3c3cfe0d SHA512 c7feddf3771c854dedec23eec1ba23c1fd977194f152a7b79c7edf66fa05d45f8dd0d342e2bd068387dc10e4c15021d8f998d0c0575208e50061e1a87ee4bfb4 WHIRLPOOL 8de541d9fddb2765bd06ecc1db088400c9571e938c5fc3773025b6517815a0cb8be60ba5ca4c07e4dec0b4cc3c068329720272c5fd357a633c6cc3d50c9dd998
 MISC ChangeLog-2015 4961 SHA256 6a56a36e887c416d9f0f98486606870679dedc0190cf3d9de644b895bf7a02b7 SHA512 001db61d95ef1c728ef3b206e3d1b2224c1006112ac8aec2e84407f0fd6f697c6ee01e0c7f48d550857e395672346c5022f408d4439d106be11a753bc985040b WHIRLPOOL e387632128a6cf0b93ecfa7b42a9b35c6530fd30221cd4c4f5cb9b61bd5610d3e718a2b14eb640962ad55eedb9cf4b3f7060048f522a24dde40f55b8f9377d8e
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
index b07dd966b812..29421204e00d 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="