--- /dev/null
+--- a/matchbox-keyboard.desktop
++++ b/matchbox-keyboard.desktop
+@@ -3,6 +3,6 @@
+ Comment=Virtual Keyboard
+ Exec=matchbox-keyboard
+ Type=Application
+-Icon=matchbox-keyboard.png
+-Categories=Panel;Utility;MB
++Icon=matchbox-keyboard
++Categories=Utility;X-MB;X-Panel;
+ X-MB-INPUT-MECHANSIM=True
--- /dev/null
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit versionator eutils
+
+DESCRIPTION="Matchbox-keyboard is an on screen 'virtual' or 'software' keyboard"
+HOMEPAGE="http://matchbox-project.org/"
+SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+IUSE="debug cairo"
+
+DOCS=( AUTHORS ChangeLog INSTALL NEWS README )
+PATCHES=( "${FILESDIR}"/${PN}-0.1-r1-modernize_desktop.patch )
+
+DEPEND="x11-libs/libfakekey
+ cairo? ( x11-libs/cairo[X] )
+ !cairo? ( x11-libs/libXft )"
+RDEPEND="$DEPEND"
+
+src_configure() {
+ econf $(use_enable debug) $(use_enable cairo)
+}