diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index f3f49bcf9819..8c4754611829 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,2 +1,3 @@
 DIST pinentry-0.8.0.tar.gz 487629 SHA256 426c7ff9ca7d147d21243dffd72e844d84c1f593e323f1d207ee19bdded0f01a SHA512 2c850f060e7d65a7d4cc19d1fb3b0eed97e1e1f091098a1278a66d9338494f15d07c1ef851fbbfa66ec26e0886675af3941b991c926bb23bc7672e440075d568 WHIRLPOOL bf4085c03f0000b2511a52f5468df41d283785b2b6f18db374b3319760dd9a0003ab7a365ae6261dd3539c4065c5d0a2cef001babc9ca77e9207a72b1ec23af3
 DIST pinentry-0.8.1.tar.gz 504101 SHA256 3e17e1d410686d197f96b61b04e3fad28bd6bcb029077bdfd902780934de9132 SHA512 a7f9a582b1d9c347c65f4a842dc4f3270199dc23eab2487e5150e37b71d666628a8a60d44f85d64bba5b1a7018379dd181e810bc373994c9a94fafe706adf76a WHIRLPOOL ee6ea273cf1307c9d6946f9dabaca076ea563f57e64a044d169200a95944173ae8ac60d9fe167bf5e9e1a21216ac41ff680f8097d5a6431e9e80a0a4ec77d024
+DIST pinentry-0.8.2.tar.bz2 428514 SHA256 5084b7b6aac5725303f3b0185f126daa8b33ee78ade538edf1e20034594a39b1 SHA512 f012ed163b8905e10714e8667a4434eb192e9519e0fa91a686b097224252bf2e73c3b35d682b6fd4a9df80eefcb3afbf2ec763aef58a3ab5a1e71268fd83e158 WHIRLPOOL 0a17bf30390895dddbaad14bcf07b3064fb7e3c1ed97ba22231e13201f24cfc194a8ef110da7316f137ed3942c094c1990aa51a80b352c5572748b42f40a77d7
diff --git a/app-crypt/pinentry/pinentry-0.8.2.ebuild b/app-crypt/pinentry/pinentry-0.8.2.ebuild
new file mode 100644
index 000000000000..566a420db1e1
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-0.8.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.2.ebuild,v 1.1 2012/08/14 12:09:49 scarabeus Exp $
+
+EAPI=3
+
+inherit multilib eutils flag-o-matic
+
+DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="http://gnupg.org/aegypten2/index.html"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="gtk ncurses qt4 caps static"
+
+RDEPEND="app-admin/eselect-pinentry
+	static? ( >=sys-libs/ncurses-5.7-r5[static-libs] )
+	!static? (
+		gtk? ( x11-libs/gtk+:2 )
+		ncurses? ( sys-libs/ncurses )
+		qt4? ( >=x11-libs/qt-gui-4.4.1 )
+		!gtk? ( !qt4? ( !ncurses? ( sys-libs/ncurses ) ) )
+	)
+	caps? ( sys-libs/libcap )"
+DEPEND="${RDEPEND}
+	!static? (
+		gtk? ( virtual/pkgconfig )
+		qt4? ( virtual/pkgconfig )
+	)"
+
+pkg_setup() {
+	use static && append-ldflags -static
+
+	if use static && { use gtk || use qt4; }; then
+		ewarn
+		ewarn "The static USE flag is only supported with the ncurses USE flags, disabling the gtk and qt4 USE flags."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	if use qt4; then
+		local file
+		for file in qt4/*.moc; do
+			"${EPREFIX}"/usr/bin/moc ${file/.moc/.h} > ${file} || die
+		done
+	fi
+}
+
+src_configure() {
+	local myconf=""
+
+	if ! { use qt4 || use gtk || use ncurses; }
+	then
+		myconf="--enable-pinentry-curses --enable-fallback-curses"
+	elif use static
+	then
+		myconf="--enable-pinentry-curses --enable-fallback-curses --disable-pinentry-gtk2 --disable-pinentry-qt4"
+	fi
+
+	# Issues finding qt on multilib systems
+	export QTLIB="${QTDIR}/$(get_libdir)"
+
+	econf \
+		--disable-dependency-tracking \
+		--enable-maintainer-mode \
+		--disable-pinentry-gtk \
+		$(use_enable gtk pinentry-gtk2) \
+		--disable-pinentry-qt \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_enable qt4 pinentry-qt4) \
+		$(use_with caps libcap) \
+		--without-x \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	rm -f "${ED}"/usr/bin/pinentry || die
+}
+
+pkg_postinst() {
+	elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
+	elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
+	elog "The soft resource limit for memory locking specifies the limit an"
+	elog "unprivileged process may lock into memory. You can also use POSIX"
+	elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
+	elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
+	elog "your users."
+	eselect pinentry update ifunset
+}
+
+pkg_postrm() {
+	eselect pinentry update ifunset
+}
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 6fc959f20c14..f3cd9cffb104 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.104 2012/08/13 18:33:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.105 2012/08/14 11:56:15 scarabeus Exp $
 
 EAPI=4
 
@@ -417,7 +417,6 @@ src_configure() {
 	# --enable-graphite: disabling causes build breakages
 	# --enable-*-link: link to the library rather than just dlopen on runtime
 	# --enable-release-build: build the libreoffice as release
-	# --enable-xmlsec: disabling causes build breakages
 	# --disable-fetch-external: prevent dowloading during compile phase
 	# --disable-gnome-vfs: old gnome virtual fs support
 	# --disable-gstreamer: support for 1.0 api, we use gstreamer-0.10 for now
@@ -452,7 +451,6 @@ src_configure() {
 		--enable-randr-link \
 		--enable-release-build \
 		--enable-unix-qstart-libpng \
-		--enable-xmlsec \
 		--disable-ccache \
 		--disable-crashdump \
 		--disable-dependency-tracking \
diff --git a/dev-php/xdebug-client/xdebug-client-2.2.0.ebuild b/dev-php/xdebug-client/xdebug-client-2.2.0.ebuild
index 222704b44b5f..ad00b5c1c9a2 100644
--- a/dev-php/xdebug-client/xdebug-client-2.2.0.ebuild
+++ b/dev-php/xdebug-client/xdebug-client-2.2.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug-client/xdebug-client-2.2.0.ebuild,v 1.2 2012/08/03 13:59:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug-client/xdebug-client-2.2.0.ebuild,v 1.3 2012/08/14 11:32:48 johu Exp $
 
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 MY_PV="${PV/_/}"
 MY_PV="${MY_PV/rc/RC}"
diff --git a/dev-ruby/color/color-1.4.1-r1.ebuild b/dev-ruby/color/color-1.4.1-r1.ebuild
index ce89c796a659..f0eb6fa52ac4 100644
--- a/dev-ruby/color/color-1.4.1-r1.ebuild
+++ b/dev-ruby/color/color-1.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/color/color-1.4.1-r1.ebuild,v 1.4 2012/08/06 17:52:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/color/color-1.4.1-r1.ebuild,v 1.5 2012/08/14 12:13:25 johu Exp $
 
 EAPI="2"
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -15,7 +15,7 @@ DESCRIPTION="Colour management with Ruby"
 HOMEPAGE="http://color.rubyforge.org/"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d05b0ead8253..09df9243db10 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 14 Aug 2012 11:37:47 +0000
+Tue, 14 Aug 2012 12:37:55 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d05b0ead8253..09df9243db10 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 14 Aug 2012 11:37:47 +0000
+Tue, 14 Aug 2012 12:37:55 +0000
diff --git a/metadata/md5-cache/app-crypt/pinentry-0.8.2 b/metadata/md5-cache/app-crypt/pinentry-0.8.2
new file mode 100644
index 000000000000..09158d9e17eb
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/pinentry-0.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=app-admin/eselect-pinentry static? ( >=sys-libs/ncurses-5.7-r5[static-libs] ) !static? ( gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=x11-libs/qt-gui-4.4.1 ) !gtk? ( !qt4? ( !ncurses? ( sys-libs/ncurses ) ) ) ) caps? ( sys-libs/libcap ) !static? ( gtk? ( virtual/pkgconfig ) qt4? ( virtual/pkgconfig ) )
+DESCRIPTION=Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol
+EAPI=3
+HOMEPAGE=http://gnupg.org/aegypten2/index.html
+IUSE=gtk ncurses qt4 caps static
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-admin/eselect-pinentry static? ( >=sys-libs/ncurses-5.7-r5[static-libs] ) !static? ( gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=x11-libs/qt-gui-4.4.1 ) !gtk? ( !qt4? ( !ncurses? ( sys-libs/ncurses ) ) ) ) caps? ( sys-libs/libcap )
+SLOT=0
+SRC_URI=mirror://gnupg/pinentry/pinentry-0.8.2.tar.bz2
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=69539f05a01509c726fbbb40305eebc1
diff --git a/metadata/md5-cache/app-office/libreoffice-9999-r2 b/metadata/md5-cache/app-office/libreoffice-9999-r2
index b3edcc8662b6..7c3d3ee33691 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999-r2
+++ b/metadata/md5-cache/app-office/libreoffice-9999-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=gnome? ( gtk ) eds? ( gnome ) libreoffice_extensions_nlpsolver? ( j
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.6.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	base	d40e074a6349af3ea5e937210630bdc1	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	kde4-base	4488f04eba837294d5144fafa8335663	kde4-functions	9999f350912cbb4e0c6b9546a26025d0	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=85805d40fe92da178a74c3f6dddc9d16
+_md5_=5217e489170a2bccfbb9ab9725ce8a42
diff --git a/metadata/md5-cache/dev-php/xdebug-client-2.2.0 b/metadata/md5-cache/dev-php/xdebug-client-2.2.0
index 40db47450b78..4a8fc2437a2a 100644
--- a/metadata/md5-cache/dev-php/xdebug-client-2.2.0
+++ b/metadata/md5-cache/dev-php/xdebug-client-2.2.0
@@ -3,9 +3,9 @@ DEPEND=libedit? ( dev-libs/libedit )
 DESCRIPTION=Xdebug client for the Common Debugger Protocol (DBGP).
 HOMEPAGE=http://www.xdebug.org/
 IUSE=libedit
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=Xdebug
 RDEPEND=libedit? ( dev-libs/libedit )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.2.0.tgz
-_md5_=8fc4b74df34c95ce3464bc3dcae05019
+_md5_=c1809b6810ec682aa3bfc847b5294166
diff --git a/metadata/md5-cache/dev-ruby/color-1.4.1-r1 b/metadata/md5-cache/dev-ruby/color-1.4.1-r1
index 7d69602b4d3b..150b8d8ce07b 100644
--- a/metadata/md5-cache/dev-ruby/color-1.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/color-1.4.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Colour management with Ruby
 EAPI=2
 HOMEPAGE=http://color.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc doc test test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 SLOT=0
 SRC_URI=mirror://rubygems/color-1.4.1.gem
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	5a5dedb4371ec555e5c2e22877a84cbe	ruby-ng	11b7dd91b6b9c90989dcdba9ea5e9b12	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bf58d90115d2682b3b6c845388d26e19
+_md5_=83e3553c8ea81577f16164f7a41a31cb
diff --git a/metadata/md5-cache/sys-fs/mp3fs-0.32 b/metadata/md5-cache/sys-fs/mp3fs-0.32
index 24c4b6e3a18f..2e07eba0d435 100644
--- a/metadata/md5-cache/sys-fs/mp3fs-0.32
+++ b/metadata/md5-cache/sys-fs/mp3fs-0.32
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DEPEND=sys-fs/fuse media-libs/libid3tag media-libs/flac media-sound/lame media-libs/libogg
 DESCRIPTION=a read-only FUSE filesystem which transcodes FLAC audio files to MP3 when read
 HOMEPAGE=http://khenriks.github.com/mp3fs/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=sys-fs/fuse media-libs/libid3tag media-libs/flac media-sound/lame media-libs/libogg
 SLOT=0
 SRC_URI=https://github.com/downloads/khenriks/mp3fs/mp3fs-0.32.tar.gz
-_md5_=621a24c2de7978a82ec4fbb6b935c39f
+_md5_=66ec660c9e9adca4bfce4c4843125060
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 2a357bb155bb..93e82fae522c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 14 Aug 2012 11:37:49 +0000
+Tue, 14 Aug 2012 12:37:57 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 1413c876dcad..30b9d2ed57ec 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Aug 14 11:37:47 UTC 2012
+Tue Aug 14 12:37:55 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c3606d1a8df0..8cf570ff759e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 14 Aug 2012 12:00:01 +0000
+Tue, 14 Aug 2012 13:00:02 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index e52be599a98a..25fbe8d7746c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1344944101 Tue Aug 14 11:35:01 2012 UTC
+1344947701 Tue Aug 14 12:35:01 2012 UTC
diff --git a/sys-fs/mp3fs/mp3fs-0.32.ebuild b/sys-fs/mp3fs/mp3fs-0.32.ebuild
index 4001d679092d..1b54eda12843 100644
--- a/sys-fs/mp3fs/mp3fs-0.32.ebuild
+++ b/sys-fs/mp3fs/mp3fs-0.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mp3fs/mp3fs-0.32.ebuild,v 1.2 2012/08/03 15:57:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mp3fs/mp3fs-0.32.ebuild,v 1.3 2012/08/14 11:56:24 johu Exp $
 
 DESCRIPTION="a read-only FUSE filesystem which transcodes FLAC audio files to MP3 when read"
 HOMEPAGE="http://khenriks.github.com/mp3fs/"
@@ -8,7 +8,7 @@ SRC_URI="https://github.com/downloads/khenriks/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="sys-fs/fuse